mz/crm.e5.pl
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

productionScheduler + ecmactions field name

Browse Source
This commit is contained in:
Michał Zieliński
2025-09-15 20:00:00 +02:00
parent 91e6a206cb
commit 980180adb1
7 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/EcmActions/metadata/detailviewdefs.php
View File

@@ -57,7 +57,7 @@ $viewdefs [$module_name] = array (
1 => array ( 1 => array (
0 => array ( 0 => array (
'name' => 'category', 'name' => 'category',
'label' => 'LBL_CATEGORY' 'label' => 'Linia'
), ),
1 => array ( 1 => array (
'name' => 'shape', 'name' => 'shape',

2
modules/EcmActions/metadata/editviewdefs.php
View File

@@ -59,7 +59,7 @@ $viewdefs [$module_name] = array(
1 => array( 1 => array(
0 => array( 0 => array(
'name' => 'category', 'name' => 'category',
'label' => 'LBL_CATEGORY', 'label' => 'Linia',
'tabIndex' => '101', 'tabIndex' => '101',
), ),
1 => array( 1 => array(

2
modules/EcmActions/metadata/listviewdefs.php
View File

@@ -19,7 +19,7 @@ $listViewDefs [$module_name] = array (
), ),
'CATEGORY' => array ( 'CATEGORY' => array (
'type' => 'varchar', 'type' => 'varchar',
'label' => 'LBL_CATEGORY', 'label' => 'Linia',
'width' => '10%', 'width' => '10%',
'default' => true, 'default' => true,
'align' => 'left', 'align' => 'left',

4
modules/EcmActions/metadata/searchdefs.php
View File

@@ -16,7 +16,7 @@ $searchdefs ['EcmActions'] = array (
), ),
'category' => array( 'category' => array(
'type' => 'enum', 'type' => 'enum',
'label' => 'LBL_CATEGORY', 'label' => 'Linia',
'width' => '10%', 'width' => '10%',
'default' => true, 'default' => true,
'name' => 'category' 'name' => 'category'
@@ -37,7 +37,7 @@ $searchdefs ['EcmActions'] = array (
), ),
'category' => array( 'category' => array(
'type' => 'enum', 'type' => 'enum',
'label' => 'LBL_CATEGORY', 'label' => 'Linia',
'width' => '10%', 'width' => '10%',
'default' => true, 'default' => true,
'name' => 'category' 'name' => 'category'

2
modules/EcmActions/vardefs.php
View File

@@ -81,7 +81,7 @@ $dictionary ['EcmAction'] = array (
'category' => array ( 'category' => array (
'required' => true, 'required' => true,
'name' => 'category', 'name' => 'category',
'vname' => 'LBL_CATEGORY', 'vname' => 'Linia',
'options' => 'ecmactions_category_dom', 'options' => 'ecmactions_category_dom',
'type' => 'enum', 'type' => 'enum',
'len' => '255', 'len' => '255',

4
modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.php
View File

@@ -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, ps_main.ecmproduct_id as main_product_id,
p_main.code as main_product_code, p_main.code as main_product_code,
a.id AS action_id, a.id AS action_id,
a.indeks AS action_index a.indeks AS action_index,
a.category AS action_category
FROM productionScheduler AS ps FROM productionScheduler AS ps
LEFT JOIN ecmsaleitems AS si LEFT JOIN ecmsaleitems AS si
ON ps.ecmsaleitem_id = si.id ON ps.ecmsaleitem_id = si.id
@@ -145,6 +146,7 @@ WHERE ps.deleted = 0 ";
$row['mainProductFullCode'] = $r['main_product_code']; $row['mainProductFullCode'] = $r['main_product_code'];
$row['action_id'] = $r['action_id']; $row['action_id'] = $r['action_id'];
$row['action_index'] = $r['action_index']; $row['action_index'] = $r['action_index'];
$row['action_category'] = $app_list_strings['ecmactions_category_dom'][$r['action_category']];
$data[] = $row; $data[] = $row;
} }
return $data; return $data;

4
modules/EcmReports/BimIT-Reports/productionSchedule/productionSchedule.tpl
View File

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