productionScheduler + ecmactions field name
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user