admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main #7

Merged
admin merged 620 commits from main into dev 2026-03-29 13:03:25 +00:00
Conversation 0 Commits 620 Files Changed 155 +3 -3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33eeabf5e1 - Show all commits

4
modules/purchase_trade/stock.py
View File

@@ -479,8 +479,8 @@ class ShipmentIn(metaclass=PoolMeta):
lines.append(
"<p>"
f"<strong>Lot nb:</strong> {m.lot.lot_name} | "
f"<strong>Net Qt:</strong> {m.lot.get_current_quantity()} {m.lot.lot_unit.symbol} | "
f"<strong>Gross Qt:</strong> {m.lot.get_current_gross_quantity()} {m.lot.lot_unit.symbol}"
f"<strong>Net Qt:</strong> {m.lot.get_current_quantity()} {m.lot.lot_unit_line.symbol} | "
f"<strong>Gross Qt:</strong> {m.lot.get_current_gross_quantity()} {m.lot.lot_unit_line.symbol}"
"</p>"
)

2
modules/purchase_trade/view/shipment_in_form.xml
View File

@@ -125,7 +125,7 @@ this repository contains the full copyright notices and license terms. -->
<field name="result"/>
<newline/>
<label name="instructions"/>
<field name="instructions" widget="richtext" colspan="4" height="100"/>
<field name="instructions" widget="html_viewer" colspan="4" height="100"/>
<newline/>
<label name="returned_id"/>
<field name="returned_id"/>