Merge remote-tracking branch 'origin/master'

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',

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(

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', 

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'

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',

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;

modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.tpl

@@ -152,6 +152,7 @@
             <th>Marka</th>
             <th>Data wysyłki</th>
             <th>Czynność</th>
+            <th>Linia</th>
             <th>Uwagi</th>
         </tr>
         </thead>
@@ -245,6 +246,9 @@
                         {$ROW.action_index}
                     </a>
                 </td>
+                <td>
+                    {$ROW.action_category}
+                </td>
                 <td>
                     <div id="edit-description-{$ROW.id}" class="ui-icon ui-icon-pencil"
                          onclick="editDescription('{$ROW.id}')" style="display: inline-block;"></div>