+ 
+ |
+
+ Harmonogram Produkcji+ |
+
+ + + + + + + + + + +
+
+
+
+
diff --git a/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js b/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js
index e72f5bce..ffdaccbb 100644
--- a/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js
+++ b/modules/EcmReports/BimIT-Reports/productsBySales/productsBySales.js
@@ -1,15 +1,4 @@
$(document).ready(function () {
- $.tablesorter.addParser({
- id: 'production_date',
- is: function (s, table, cell, $cell) {
- return false;
- },
- format: function (s, table, cell, cellIndex) {
- return $(cell).find("input[id^=production-date]").val() || "1970-01-01";
- },
- parsed: false,
- type: 'text'
- });
$("#allTable").tablesorter({
sortList: [[13, 1]],
theme: 'blue',
@@ -51,9 +40,6 @@ $(document).ready(function () {
},
},
},
- headers: {
- 16: { sorter: 'production_date'},
- },
});
$("#allTable").bind('filterEnd', function (event, config) {
updateAllPositions();
@@ -202,7 +188,14 @@ function drawComponents(data) {
$("#componentsTableContainer").html(componentsTablePrototype());
data.forEach((el, index) => {
var tr = $("| + | Indeks | +Nazwa | +Data produkcji | +Ilość | +Ilość ZS | +Stan | +ZS E5 | +Typ | +Status | +Zamawiający | +Odbiorca | +Forma | +Marka | +Data wysyłki | +Uwagi | +
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + + + | ++ + {$ROW.productCode} + + | ++ {$ROW.productName} + | +
+
+ 
+
+ |
+
+
+
+ {$ROW.qty}
+
+
+ |
+ + {$ROW.productQty} + | ++ {$ROW.productStockState} + | ++ + {$ROW.orderNo} + + | ++ {$ROW.orderType} + | ++ {$ROW.orderStatus} + | ++ + {$ROW.orderParent} + + | ++ {$ROW.shippingTo} + | ++ {$ROW.productShape} + | ++ {$ROW.productBrand} + | ++ {$ROW.orderSendDate} + | +
+
+
+ {$ROW.description}
+
+
+ |
+
'; + } + position += "
![\"\"](\"modules/EcmQuotes/images/add_position.gif\")
";
+ tr.append(position);
tr.append("| Pozycja | Indeks | Nazwa | Ilość | JM. | Stan | Zamówiono | Dostawca | Zamówienie | |
|---|---|---|---|---|---|---|---|---|---|
| 0 | |||||||||
+ {if $ROW.scheduled > 0}
+
+ {/if}
-
- {$ROW.description}
-
-
- 
';
+ }
+
+ function get_summary_text()
+ {
+ return "$this->name";
+ }
+
+ function create_list_query($order_by, $where, $show_deleted = 0)
+ {
+ // Fill in the assigned_user_name
+ $custom_join = $this->custom_fields->getJOIN();
+ $query = "SELECT ";
+ $query .= "ecmsales.*
,wz.id as wzid
,users.user_name as assigned_user_name";
- if ($custom_join) {
- $query .= $custom_join ['select'];
- }
- $query .= " FROM ecmsales
+ if ($custom_join) {
+ $query .= $custom_join ['select'];
+ }
+ $query .= " FROM ecmsales
LEFT JOIN users
ON ecmsales.assigned_user_id=users.id
LEFT JOIN ecmstockdocouts as wz
ON wz.ecmsale_id=ecmsales.id";
- $query .= " ";
- if ($custom_join) {
- $query .= $custom_join ['join'];
- }
- $where_auto = '1=1';
- if ($show_deleted == 0) {
- $where_auto = " $this->table_name.deleted=0 ";
- } else if ($show_deleted == 1) {
- $where_auto = " $this->table_name.deleted=1 ";
- }
- if($_GET['show_empty_wz'])$where_auto.=" AND wz.id is null";
- if ($where != "")
- $query .= "where $where AND " . $where_auto;
- else
- $query .= "where " . $where_auto;
- if (substr_count ( $order_by, '.' ) > 0) {
- $query .= " ORDER BY $order_by";
- } else if ($order_by != "")
- $query .= " ORDER BY $order_by";
- else
- $query .= " ORDER BY ecmsales.date_entered";
- return $query;
- }
- function create_export_query($order_by, $where) {
- $custom_join = $this->custom_fields->getJOIN ();
- $query = "SELECT
+ $query .= " ";
+ if ($custom_join) {
+ $query .= $custom_join ['join'];
+ }
+ $where_auto = '1=1';
+ if ($show_deleted == 0) {
+ $where_auto = " $this->table_name.deleted=0 ";
+ } else if ($show_deleted == 1) {
+ $where_auto = " $this->table_name.deleted=1 ";
+ }
+ if ($_GET['show_empty_wz']) $where_auto .= " AND wz.id is null";
+ if ($where != "")
+ $query .= "where $where AND " . $where_auto;
+ else
+ $query .= "where " . $where_auto;
+ if (substr_count($order_by, '.') > 0) {
+ $query .= " ORDER BY $order_by";
+ } else if ($order_by != "")
+ $query .= " ORDER BY $order_by";
+ else
+ $query .= " ORDER BY ecmsales.date_entered";
+ return $query;
+ }
+
+ function create_export_query($order_by, $where)
+ {
+ $custom_join = $this->custom_fields->getJOIN();
+ $query = "SELECT
ecmsales.*,
users.user_name assigned_user_name";
- if ($custom_join) {
- $query .= $custom_join ['select'];
- }
- $query .= " FROM ecmsales ";
- $query .= " LEFT JOIN users
+ if ($custom_join) {
+ $query .= $custom_join ['select'];
+ }
+ $query .= " FROM ecmsales ";
+ $query .= " LEFT JOIN users
ON ecmsales.assigned_user_id=users.id";
- if ($custom_join) {
- $query .= $custom_join ['join'];
- }
- $query .= "";
- $where_auto = " ecmsales.deleted=0
+ if ($custom_join) {
+ $query .= $custom_join ['join'];
+ }
+ $query .= "";
+ $where_auto = " ecmsales.deleted=0
";
- if ($where != "")
- $query .= " where $where AND " . $where_auto;
- else
- $query .= " where " . $where_auto;
- if ($order_by != "")
- $query .= " ORDER BY $order_by";
- else
- $query .= " ORDER BY ecmsales.name";
- return $query;
- }
- function fill_in_additional_list_fields() {
- }
- function fill_in_additional_detail_fields() {
- // FILL IN THE ASSIGNED_USER_NAME
- $this->assigned_user_name = get_assigned_user_name ( $this->assigned_user_id );
- $this->created_by_name = get_assigned_user_name ( $this->created_by );
- $this->modified_by_name = get_assigned_user_name ( $this->modified_user_id );
- /*
- $result = $this->db->query ( "SELECT status, parent_id, contact_id, template_id, assigned_user_id FROM ecmsales WHERE id='$this->id'" );
- if (is_resource ( $result )) {
- $row = $this->db->fetchByAssoc ( $result );
- if ($row) {
- $this->status = $row ['status'];
- $this->parent_id = $row ['parent_id'];
- $this->contact_id = $row ['contact_id'];
- $this->template_id = $row ['template_id'];
- $this->assigned_user_id = $row ['assigned_user_id'];
- }
- }
- */
- /*
- * $query = "select `number`, `template_id` from `ecmsales` where `id`='$this->id' limit 1"; $r = $this->db->query($query); if($r) { $r = $this->db->fetchByAssoc($r); $this->template_id = $r['template_id']; $this->number = $r['number']; $this->setTemplate(); $this->document_no = $this->formatNumber(); }
- */
- }
- function get_list_view_data() {
- global $current_language;
- $this->fill_in_additional_detail_fields ();
- $app_list_strings = return_app_list_strings_language ( $current_language );
- $mod_strings = return_module_language ( $current_language, 'EcmSales' );
- $the_array = parent::get_list_view_data ();
- // THE NEW LISTVIEW CODE ONLY FETCHES COLUMNS THAT WE'RE DISPLAYING AND NOT ALL
- // THE COLUMNS SO WE NEED THESE CHECKS.
- if($this->ecmproduct_id!=''){
- //add subpanel data
- $tmp=$this->getPriceFromDocument($this->ecmproduct_id);
-
- $the_array ['QUANTITY'] = format_number ( $tmp['quantity'] );
- $the_array ['PRICE_NETTO'] = format_number ( $tmp['price_netto'] );
- $the_array ['TOTAL_NETTO'] = format_number ( $tmp['total_netto'] );
- }
- $this->retrieve($this->id);
- $the_array ['NAME'] = (($this->name == "") ? $this->document_no : $this->name);
-
- $a = new EcmStockDocOut();
- $a->retrieve_by_string_fields(['ecmsale_id'=>$this->id]);
-
- if($a->id)$the_array ['WZ'] = "".$a->document_no."";
- else $the_array ['WZ'] = $this->wz_name;
-
- $a = new EcmInvoiceOut();
- $a->retrieve_by_string_fields(['so_id'=>$this->id]);
- $the_array ['FV'] = "".$a->document_no."";
-
- $the_array ['TOTAL'] = format_number ( $this->total_netto );
- $a = new Account();
- $a->retrieve($this->parent_id);
- $the_array ['SHOP_NUMBER'] =($this->shop_number!="" ? $this->shop_number:$a->shop_number);
- //create image options
- $op = '
';
-
- $the_array ['ZS'] = "".$this->edi_zs_document_no."";
-
- $the_array['OPTIONS'] = $op;
+ if ($where != "")
+ $query .= " where $where AND " . $where_auto;
+ else
+ $query .= " where " . $where_auto;
+ if ($order_by != "")
+ $query .= " ORDER BY $order_by";
+ else
+ $query .= " ORDER BY ecmsales.name";
+ return $query;
+ }
- return $the_array;
- }
- function getPriceFromDocument($product){
- $zap=$this->db->query("select quantity,price_netto,total_netto from ecmsaleitems where id='".$product."'");
- $dane=$this->db->fetchByAssoc($zap);
- return $dane;
- }
- function getStatusMenuInfo($inJSON = true) {
- global $app_list_strings;
- $arr = array ();
- foreach ( $app_list_strings ['ecmsales_status_dom'] as $key => $value ) {
- $arr [$key] = array (
- 'enabled' => '
' . $value . '' . $value . '';
- }
-
- /**
- * BUILDS A GENERIC SEARCH BASED ON THE QUERY STRING USING OR.
- * DO NOT INCLUDE ANY $THIS-> BECAUSE THIS IS CALLED ON WITHOUT HAVING THE CLASS INSTANTIATED.
- */
- function build_generic_where_clause($the_query_string) {
- $where_clauses = Array ();
- $the_query_string = PearDatabase::quote ( from_html ( $the_query_string ) );
- array_push ( $where_clauses, "ecmsales.name like '$the_query_string%'" );
- $the_where = "";
- foreach ( $where_clauses as $clause ) {
- if ($the_where != "")
- $the_where .= " or ";
- $the_where .= $clause;
- }
- return $the_where;
- }
- function set_notification_body($xtpl, $simplemodule) {
- global $mod_strings, $app_list_strings;
- $xtpl->assign ( "NAME", $simplemodule->name );
- $xtpl->assign ( "DESCRIPTION", $simplemodule->description );
- return $xtpl;
- }
- function bean_implements($interface) {
- switch ($interface) {
- case 'ACL' :
- return true;
- }
- return false;
- }
- function save($check_notify = FALSE) {
- global $current_user;
- if (!$this->id || $this->id=='') {
- // generate number
- $this->number = $this->generateNumber();
- $this->document_no = $this->formatNumber($this->number);
- }
- $this->vats_summary = htmlspecialchars($this->vats_summary);
- $return_id = parent::save ( $check_notify );
- $this->savePositions($return_id);
- return $return_id;
- }
- // ***************************Start Managing Positions*************************//
- function constructInsertQuery($data, $table = '') {
- if ($table == '' && isset ( $this->object_name ) && $this->object_name != '') {
- $table = strtolower ( $this->object_name ) . "items";
- } else
- return "";
- $keys = array ();
- $values = array ();
- foreach ( $data as $key => $value ) {
- $keys [] = $key;
- if (is_array ( $value ))
- $values [] = $value [1] . str_replace ( "'", "\'", $value [0] ) . $value [1];
- else
- $values [] = "'" . str_replace ( "'", "\'", $value ) . "'";
- }
- $q = "insert into `$table` (`";
- $q .= implode ( '`, `', $keys );
- $q .= "`) values (";
- $q .= implode ( ", ", $values );
- $q .= ");";
- return $q;
- }
- function savePositions($id = null, $position_list = null) {
- global $current_user, $timedate;
- if ($position_list == null)
- $position_list = $this->position_list;
- if ($id == null)
- $id = $this->id;
- if (count ( $position_list ) > 0)
- $this->deleteAssignedPositions ( $id );
- $arr = array ();
- $position = 0;
- for($i = 0; $i < count ( $position_list ); $i ++) {
- if ($position_list [$i] ['name'] == '')
- continue;
- $p = $position_list [$i];
- if (! empty ( $p ['category_id'] ) || $p ['category_id'] == '') {
- require_once ("modules/EcmProducts/EcmProduct.php");
- $pr = new EcmProduct ();
- $pr->retrieve ( $p ['id'] );
- $p ['category_id'] = $pr->product_category_id;
- }
- $arr = array (
- 'id' => create_guid (),
- 'date_entered' => array (
- 'NOW()',
- ''
- ),
- 'date_modified' => array (
- 'NOW()',
- ''
- ),
- 'modified_user_id' => $current_user->id,
- 'assigned_user_id' => $current_user->id,
- 'created_by' => $current_user->id,
- 'deleted' => '0',
- strtolower ( $this->object_name ) . '_id' => $id,
- 'ecmproduct_id' => $p ['product_id'],
- 'position' => $position,
- 'code' => $p ['product_code'],
- 'name' => $p ['name'],
- 'quantity' => ((empty ( $p ['quantity'] ) || $p ['quantity'] == '') ? 0 : $p ['quantity']),
- 'price_start' => ((empty ( $p ['price_start'] ) || $p ['price_start'] == '') ? 0 : $p ['price_start']),
- 'price_netto' => ((empty ( $p ['price_netto'] ) || $p ['price_netto'] == '') ? 0 : $p ['price_netto']),
- 'price_brutto'=> ($p['price_netto']+($p['price_netto']*($p ['ecmvat_name']/100))),
- 'total_brutto'=> ($p['total_netto']+($p['total_netto']*($p ['ecmvat_name']/100))),
- 'discount' => ((empty ( $p ['discount'] ) || $p ['discount'] == '') ? 0 : $p ['discount']),
- 'total_netto' => ((empty ( $p ['total_netto'] ) || $p ['total_netto'] == '') ? 0 : $p ['total_netto']),
- 'dd_unit_id' => $p ['unit_id'],
- 'dd_unit_name' => $p['unit_name'],
- 'ecmvat_id' => $p ['ecmvat_id'],
- 'ecmvat_name' => $p ['ecmvat_name'],
- 'ecmvat_value' => $p ['ecmvat_value'],
- 'ecmproductcategory_id' => $p ['category_id'],
- 'recipient_code' => $p ['recipient_code'],
- 'ean' => $p['product_ean'],
- 'brand_label' => $p['product_brand_label'],
- 'description' => $p['product_description'],
- );
- if (isset($p['product_production_date']) && strlen($p['product_production_date']) > 5) {
+ function get_list_view_data()
+ {
+ global $current_language;
+ $this->fill_in_additional_detail_fields();
+ $app_list_strings = return_app_list_strings_language($current_language);
+ $mod_strings = return_module_language($current_language, 'EcmSales');
+ $the_array = parent::get_list_view_data();
+ // THE NEW LISTVIEW CODE ONLY FETCHES COLUMNS THAT WE'RE DISPLAYING AND NOT ALL
+ // THE COLUMNS SO WE NEED THESE CHECKS.
+ if ($this->ecmproduct_id != '') {
+ //add subpanel data
+ $tmp = $this->getPriceFromDocument($this->ecmproduct_id);
+
+ $the_array ['QUANTITY'] = format_number($tmp['quantity']);
+ $the_array ['PRICE_NETTO'] = format_number($tmp['price_netto']);
+ $the_array ['TOTAL_NETTO'] = format_number($tmp['total_netto']);
+ }
+ $this->retrieve($this->id);
+ $the_array ['NAME'] = (($this->name == "") ? $this->document_no : $this->name);
+
+ $a = new EcmStockDocOut();
+ $a->retrieve_by_string_fields(['ecmsale_id' => $this->id]);
+
+ if ($a->id) $the_array ['WZ'] = "" . $a->document_no . "";
+ else $the_array ['WZ'] = $this->wz_name;
+
+ $a = new EcmInvoiceOut();
+ $a->retrieve_by_string_fields(['so_id' => $this->id]);
+ $the_array ['FV'] = "" . $a->document_no . "";
+
+ $the_array ['TOTAL'] = format_number($this->total_netto);
+ $a = new Account();
+ $a->retrieve($this->parent_id);
+ $the_array ['SHOP_NUMBER'] = ($this->shop_number != "" ? $this->shop_number : $a->shop_number);
+ //create image options
+ $op = '';
+
+ $the_array ['ZS'] = "" . $this->edi_zs_document_no . "";
+
+ $the_array['OPTIONS'] = $op;
+
+ return $the_array;
+ }
+
+ function fill_in_additional_detail_fields()
+ {
+ // FILL IN THE ASSIGNED_USER_NAME
+ $this->assigned_user_name = get_assigned_user_name($this->assigned_user_id);
+ $this->created_by_name = get_assigned_user_name($this->created_by);
+ $this->modified_by_name = get_assigned_user_name($this->modified_user_id);
+ /*
+ $result = $this->db->query ( "SELECT status, parent_id, contact_id, template_id, assigned_user_id FROM ecmsales WHERE id='$this->id'" );
+ if (is_resource ( $result )) {
+ $row = $this->db->fetchByAssoc ( $result );
+ if ($row) {
+ $this->status = $row ['status'];
+ $this->parent_id = $row ['parent_id'];
+ $this->contact_id = $row ['contact_id'];
+ $this->template_id = $row ['template_id'];
+ $this->assigned_user_id = $row ['assigned_user_id'];
+ }
+ }
+ */
+ /*
+ * $query = "select `number`, `template_id` from `ecmsales` where `id`='$this->id' limit 1"; $r = $this->db->query($query); if($r) { $r = $this->db->fetchByAssoc($r); $this->template_id = $r['template_id']; $this->number = $r['number']; $this->setTemplate(); $this->document_no = $this->formatNumber(); }
+ */
+ }
+
+ function getPriceFromDocument($product)
+ {
+ $zap = $this->db->query("select quantity,price_netto,total_netto from ecmsaleitems where id='" . $product . "'");
+ $dane = $this->db->fetchByAssoc($zap);
+ return $dane;
+ }
+
+ function create_new_list_query($order_by, $where, $filter = array(), $params = array(), $show_deleted = 0, $join_type = '', $return_array = false, $parentbean, $singleSelect = false)
+ {
+ echo '';
+ echo '';
+ echo '';
+ echo '';
+ if ($_GET['show_empty_wz']) $where .= 'ecmsales.wz_name is null';
+
+ $ret = parent::create_new_list_query($order_by, $where, $filter, $params, $show_deleted, $join_type, $return_array, $parentbean, $singleSelect);
+ //$ret['from'].=" left outer join ecmstockdocouts as wz on wz.ecmsale_id=ecmsales.id";
+ //echo print_r($ret,true);
+ return $ret;
+ }
+
+ function getStatusMenuInfo($inJSON = true)
+ {
+ global $app_list_strings;
+ $arr = array();
+ foreach ($app_list_strings ['ecmsales_status_dom'] as $key => $value) {
+ $arr [$key] = array(
+ 'enabled' => '' . $value . '' . $value . '