diff --git a/modules/EcmActions/metadata/detailviewdefs.php b/modules/EcmActions/metadata/detailviewdefs.php index 1fb75db6..1bba6b11 100644 --- a/modules/EcmActions/metadata/detailviewdefs.php +++ b/modules/EcmActions/metadata/detailviewdefs.php @@ -57,7 +57,7 @@ $viewdefs [$module_name] = array ( 1 => array ( 0 => array ( 'name' => 'category', - 'label' => 'LBL_CATEGORY' + 'label' => 'Linia' ), 1 => array ( 'name' => 'shape', diff --git a/modules/EcmActions/metadata/editviewdefs.php b/modules/EcmActions/metadata/editviewdefs.php index ce13f2b6..7d036722 100644 --- a/modules/EcmActions/metadata/editviewdefs.php +++ b/modules/EcmActions/metadata/editviewdefs.php @@ -59,7 +59,7 @@ $viewdefs [$module_name] = array( 1 => array( 0 => array( 'name' => 'category', - 'label' => 'LBL_CATEGORY', + 'label' => 'Linia', 'tabIndex' => '101', ), 1 => array( diff --git a/modules/EcmActions/metadata/listviewdefs.php b/modules/EcmActions/metadata/listviewdefs.php index 2eaad609..e0cf33a2 100644 --- a/modules/EcmActions/metadata/listviewdefs.php +++ b/modules/EcmActions/metadata/listviewdefs.php @@ -19,7 +19,7 @@ $listViewDefs [$module_name] = array ( ), 'CATEGORY' => array ( 'type' => 'varchar', - 'label' => 'LBL_CATEGORY', + 'label' => 'Linia', 'width' => '10%', 'default' => true, 'align' => 'left', diff --git a/modules/EcmActions/metadata/searchdefs.php b/modules/EcmActions/metadata/searchdefs.php index 29167f9f..95e43540 100644 --- a/modules/EcmActions/metadata/searchdefs.php +++ b/modules/EcmActions/metadata/searchdefs.php @@ -16,7 +16,7 @@ $searchdefs ['EcmActions'] = array ( ), 'category' => array( 'type' => 'enum', - 'label' => 'LBL_CATEGORY', + 'label' => 'Linia', 'width' => '10%', 'default' => true, 'name' => 'category' @@ -37,7 +37,7 @@ $searchdefs ['EcmActions'] = array ( ), 'category' => array( 'type' => 'enum', - 'label' => 'LBL_CATEGORY', + 'label' => 'Linia', 'width' => '10%', 'default' => true, 'name' => 'category' diff --git a/modules/EcmActions/vardefs.php b/modules/EcmActions/vardefs.php index 24c6061b..33d51157 100644 --- a/modules/EcmActions/vardefs.php +++ b/modules/EcmActions/vardefs.php @@ -81,7 +81,7 @@ $dictionary ['EcmAction'] = array ( 'category' => array ( 'required' => true, 'name' => 'category', - 'vname' => 'LBL_CATEGORY', + 'vname' => 'Linia', 'options' => 'ecmactions_category_dom', 'type' => 'enum', 'len' => '255', diff --git a/modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.php b/modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.php index 0c13d0ad..9464b902 100644 --- a/modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.php +++ b/modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.php @@ -67,7 +67,8 @@ SELECT s.id as orderId, s.document_no, s.status, s.parent_name, s.parent_id, s.s ps_main.ecmproduct_id as main_product_id, p_main.code as main_product_code, a.id AS action_id, - a.indeks AS action_index + a.indeks AS action_index, + a.category AS action_category FROM productionScheduler AS ps LEFT JOIN ecmsaleitems AS si ON ps.ecmsaleitem_id = si.id @@ -145,6 +146,7 @@ WHERE ps.deleted = 0 "; $row['mainProductFullCode'] = $r['main_product_code']; $row['action_id'] = $r['action_id']; $row['action_index'] = $r['action_index']; + $row['action_category'] = $app_list_strings['ecmactions_category_dom'][$r['action_category']]; $data[] = $row; } return $data; diff --git a/modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.tpl b/modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.tpl index c7956587..1b364529 100644 --- a/modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.tpl +++ b/modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.tpl @@ -152,6 +152,7 @@