diff options
| author | Lester Caine <lester@lsces.co.uk> | 2026-06-10 07:11:53 +0100 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2026-06-10 07:11:53 +0100 |
| commit | 4d24ef4733a06525f943e34ba0e85b69c7871965 (patch) | |
| tree | 85ee470a0700b148b8cb717da570593357d07542 /templates | |
| parent | cc23974a923e8b98ada7127fd2f09f75d97da01e (diff) | |
| download | stock-4d24ef4733a06525f943e34ba0e85b69c7871965.tar.gz stock-4d24ef4733a06525f943e34ba0e85b69c7871965.tar.bz2 stock-4d24ef4733a06525f943e34ba0e85b69c7871965.zip | |
stock: rename PCK→PRT (fractional parts), add PCK as ordering pack-size tag; rename pack_size→part_size; bompck templates→bomprt; strip verbose labels (fraction), (H x W)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Diffstat (limited to 'templates')
| -rwxr-xr-x | templates/component_order.tpl | 2 | ||||
| -rwxr-xr-x | templates/edit_assembly.tpl | 2 | ||||
| -rw-r--r-- | templates/list_movements.tpl | 2 | ||||
| -rw-r--r-- | templates/list_stock.tpl | 6 | ||||
| -rw-r--r-- | templates/print_bom.tpl | 2 | ||||
| -rw-r--r-- | templates/stockassembly/edit_xref_bomprt_item.tpl (renamed from templates/stockassembly/edit_xref_bompck_item.tpl) | 2 | ||||
| -rw-r--r-- | templates/stockassembly/view_xref_bomprt_item.tpl (renamed from templates/stockassembly/view_xref_bompck_item.tpl) | 2 | ||||
| -rw-r--r-- | templates/stockmovement/edit_xref_bomprt_item.tpl (renamed from templates/stockmovement/edit_xref_bompck_item.tpl) | 2 | ||||
| -rw-r--r-- | templates/stockmovement/view_xref_bomprt_item.tpl (renamed from templates/stockmovement/view_xref_bompck_item.tpl) | 2 | ||||
| -rwxr-xr-x | templates/view_component.tpl | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/templates/component_order.tpl b/templates/component_order.tpl index d2fb2f6..7ca79f7 100755 --- a/templates/component_order.tpl +++ b/templates/component_order.tpl @@ -52,7 +52,7 @@ <td>{$row.xref_data|escape}</td> <td> {$row.xkey|escape} - {if $row.item eq 'PCK' && $row.pack_size} of {$row.pack_size|escape}{if $row.pack_size_ext} {$row.pack_size_ext|escape}{/if}{/if} + {if $row.item eq 'PRT' && $row.part_size} of {$row.part_size|escape}{if $row.part_size_ext} {$row.part_size_ext|escape}{/if}{/if} </td> <td>{$row.xkey_ext|escape}</td> </tr> diff --git a/templates/edit_assembly.tpl b/templates/edit_assembly.tpl index a95afc2..c0b5004 100755 --- a/templates/edit_assembly.tpl +++ b/templates/edit_assembly.tpl @@ -70,7 +70,7 @@ <input type="file" name="csv_file" accept=".csv,text/csv"/> <input type="submit" class="btn btn-default" name="upload_bom_csv" value="{tr}Upload BOM{/tr}"/> </div> - <p class="help-block">{tr}Columns: Component, Order, Quantity, Size (SGL/PCK/SHT/VOL), Ref designators{/tr}</p> + <p class="help-block">{tr}Columns: Component, Order, Quantity, Size (SGL/PRT/SHT/VOL), Ref designators{/tr}</p> {/form} {/if} diff --git a/templates/list_movements.tpl b/templates/list_movements.tpl index fe741ee..a383e00 100644 --- a/templates/list_movements.tpl +++ b/templates/list_movements.tpl @@ -55,7 +55,7 @@ <td><a href="{$mov.display_url|escape}">{$mov.title|escape}</a></td> <td>{$mov.ref_type|escape|default:'—'}</td> {if $componentContentId} - <td class="text-right">{if $mov.cmp_qty_type eq 'PCK' && $packSize > 0}{math equation="q/p" q=$mov.cmp_qty p=$packSize format="%.2f"}{elseif $mov.cmp_qty_type eq 'SHT'}{$mov.cmp_qty|string_format:"%.2f"}{else}{$mov.cmp_qty|string_format:"%.0f"}{/if} {$mov.cmp_qty_type|escape}</td> + <td class="text-right">{if $mov.cmp_qty_type eq 'PRT' && $partSize > 0}{math equation="q/p" q=$mov.cmp_qty p=$partSize format="%.2f"}{elseif $mov.cmp_qty_type eq 'SHT'}{$mov.cmp_qty|string_format:"%.2f"}{else}{$mov.cmp_qty|string_format:"%.0f"}{/if} {$mov.cmp_qty_type|escape}</td> {/if} <td>{if $mov.ref_start_date}{$mov.ref_start_date|bit_short_date}{else}—{/if}</td> <td>{if $mov.event_time}{$mov.event_time|bit_short_date}{else}—{/if}</td> diff --git a/templates/list_stock.tpl b/templates/list_stock.tpl index f42f435..3250427 100644 --- a/templates/list_stock.tpl +++ b/templates/list_stock.tpl @@ -87,11 +87,11 @@ <td rowspan="{$comp.stock|@count}">{$comp.data|escape}</td> <td rowspan="{$comp.stock|@count}">{$comp.part_number|escape}</td> {/if} - {if $showBom}<td class="text-right">{if $qtype eq 'PCK' && $row.pack_size > 0}{math equation="b*k/p" b=$row.bom_qty k=$kitCount p=$row.pack_size format="%.2f"}{elseif $qtype eq 'SHT'}{math equation="b*k" b=$row.bom_qty k=$kitCount format="%.2f"}{else}{math equation="b*k" b=$row.bom_qty k=$kitCount format="%.0f"}{/if}</td>{/if} + {if $showBom}<td class="text-right">{if $qtype eq 'PRT' && $row.part_size > 0}{math equation="b*k/p" b=$row.bom_qty k=$kitCount p=$row.part_size format="%.2f"}{elseif $qtype eq 'SHT'}{math equation="b*k" b=$row.bom_qty k=$kitCount format="%.2f"}{else}{math equation="b*k" b=$row.bom_qty k=$kitCount format="%.0f"}{/if}</td>{/if} <td>{$qtype|escape}</td> - <td class="text-right">{if $qtype eq 'PCK' && $row.pack_size > 0}{math equation="l/p" l=$row.level p=$row.pack_size format="%.2f"}{elseif $qtype eq 'SHT'}{$row.level|string_format:"%.2f"}{else}{$row.level|string_format:"%.0f"}{/if}</td> + <td class="text-right">{if $qtype eq 'PRT' && $row.part_size > 0}{math equation="l/p" l=$row.level p=$row.part_size format="%.2f"}{elseif $qtype eq 'SHT'}{$row.level|string_format:"%.2f"}{else}{$row.level|string_format:"%.0f"}{/if}</td> {if $showBom} - <td class="text-right{if $remaining < 0} text-danger{/if}">{if $qtype eq 'PCK' && $row.pack_size > 0}{math equation="r/p" r=$remaining p=$row.pack_size format="%.2f"}{elseif $qtype eq 'SHT'}{$remaining|string_format:"%.2f"}{else}{$remaining|string_format:"%.0f"}{/if}</td> + <td class="text-right{if $remaining < 0} text-danger{/if}">{if $qtype eq 'PRT' && $row.part_size > 0}{math equation="r/p" r=$remaining p=$row.part_size format="%.2f"}{elseif $qtype eq 'SHT'}{$remaining|string_format:"%.2f"}{else}{$remaining|string_format:"%.0f"}{/if}</td> {/if} </tr> {/foreach} diff --git a/templates/print_bom.tpl b/templates/print_bom.tpl index e6c28e6..ece3cac 100644 --- a/templates/print_bom.tpl +++ b/templates/print_bom.tpl @@ -42,7 +42,7 @@ <td>{$row.xref_data|escape}</td> <td> {$row.xkey|escape} - {if $row.item eq 'PCK' && $row.pack_size} of {$row.pack_size|escape}{if $row.pack_size_ext} {$row.pack_size_ext|escape}{/if}{/if} + {if $row.item eq 'PRT' && $row.part_size} of {$row.part_size|escape}{if $row.part_size_ext} {$row.part_size_ext|escape}{/if}{/if} </td> <td>{$row.xkey_ext|escape}</td> </tr> diff --git a/templates/stockassembly/edit_xref_bompck_item.tpl b/templates/stockassembly/edit_xref_bomprt_item.tpl index adb401b..dfa783c 100644 --- a/templates/stockassembly/edit_xref_bompck_item.tpl +++ b/templates/stockassembly/edit_xref_bomprt_item.tpl @@ -34,7 +34,7 @@ {forminput} <div class="form-inline"> <input type="text" class="form-control input-small" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> - {if $xrefInfo.pack_size} of {$xrefInfo.pack_size|escape}{if $xrefInfo.pack_size_ext} {$xrefInfo.pack_size_ext|escape}{/if}{/if} + {if $xrefInfo.part_size} of {$xrefInfo.part_size|escape}{if $xrefInfo.part_size_ext} {$xrefInfo.part_size_ext|escape}{/if}{/if} </div> {/forminput} </div> diff --git a/templates/stockassembly/view_xref_bompck_item.tpl b/templates/stockassembly/view_xref_bomprt_item.tpl index 85dd7ac..002ae89 100644 --- a/templates/stockassembly/view_xref_bompck_item.tpl +++ b/templates/stockassembly/view_xref_bomprt_item.tpl @@ -8,7 +8,7 @@ {/if} </td> <td>{$xrefInfo.xref_data|escape}</td> - <td>{$xrefInfo.xkey|escape}{if $xrefInfo.pack_size} of {$xrefInfo.pack_size|escape}{if $xrefInfo.pack_size_ext} {$xrefInfo.pack_size_ext|escape}{/if}{/if}</td> + <td>{$xrefInfo.xkey|escape}{if $xrefInfo.part_size} of {$xrefInfo.part_size|escape}{if $xrefInfo.part_size_ext} {$xrefInfo.part_size_ext|escape}{/if}{/if}</td> <td>{$xrefInfo.xkey_ext|escape}</td> {if $xrefAllowEdit} <td>{$xrefInfo.start_date|bit_short_date}</td> diff --git a/templates/stockmovement/edit_xref_bompck_item.tpl b/templates/stockmovement/edit_xref_bomprt_item.tpl index bd69cff..26df942 100644 --- a/templates/stockmovement/edit_xref_bompck_item.tpl +++ b/templates/stockmovement/edit_xref_bomprt_item.tpl @@ -24,7 +24,7 @@ {formlabel label="Pieces required" for="xkey"} {forminput} <input type="text" class="form-control input-small" name="xkey" id="xkey" value="{$xrefInfo.xkey|escape}" /> - {if $xrefInfo.pack_size}<span class="help-block">{tr}of{/tr} {$xrefInfo.pack_size|escape} {tr}per pack{/tr}</span>{/if} + {if $xrefInfo.part_size}<span class="help-block">{tr}of{/tr} {$xrefInfo.part_size|escape} {tr}per pack{/tr}</span>{/if} {/forminput} </div> diff --git a/templates/stockmovement/view_xref_bompck_item.tpl b/templates/stockmovement/view_xref_bomprt_item.tpl index 85dd7ac..002ae89 100644 --- a/templates/stockmovement/view_xref_bompck_item.tpl +++ b/templates/stockmovement/view_xref_bomprt_item.tpl @@ -8,7 +8,7 @@ {/if} </td> <td>{$xrefInfo.xref_data|escape}</td> - <td>{$xrefInfo.xkey|escape}{if $xrefInfo.pack_size} of {$xrefInfo.pack_size|escape}{if $xrefInfo.pack_size_ext} {$xrefInfo.pack_size_ext|escape}{/if}{/if}</td> + <td>{$xrefInfo.xkey|escape}{if $xrefInfo.part_size} of {$xrefInfo.part_size|escape}{if $xrefInfo.part_size_ext} {$xrefInfo.part_size_ext|escape}{/if}{/if}</td> <td>{$xrefInfo.xkey_ext|escape}</td> {if $xrefAllowEdit} <td>{$xrefInfo.start_date|bit_short_date}</td> diff --git a/templates/view_component.tpl b/templates/view_component.tpl index 770005a..102b911 100755 --- a/templates/view_component.tpl +++ b/templates/view_component.tpl @@ -59,7 +59,7 @@ {foreach from=$componentStockLevels key=qtype item=level} <tr{if $level < 0} class="danger"{elseif $level == 0} class="warning"{/if}> <td>{$qtype|escape}</td> - <td class="text-right">{if $qtype eq 'PCK' && $packSize > 0}{math equation="l/p" l=$level p=$packSize format="%.2f"}{elseif $qtype eq 'SHT'}{$level|string_format:"%.2f"}{else}{$level|string_format:"%.0f"}{/if}</td> + <td class="text-right">{if $qtype eq 'PRT' && $partSize > 0}{math equation="l/p" l=$level p=$partSize format="%.2f"}{elseif $qtype eq 'SHT'}{$level|string_format:"%.2f"}{else}{$level|string_format:"%.0f"}{/if}</td> </tr> {/foreach} {else} |
