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 -1
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 08581f24ea - Show all commits

2
modules/automation/automation.py
View File

@@ -193,6 +193,8 @@ class AutomationDocument(ModelSQL, ModelView, Workflow):
WeightReport = Pool().get('weight.report') WeightReport = Pool().get('weight.report')
WeightReport.create_from_json(metadata) WeightReport.create_from_json(metadata)
# if cls.rule_set.ocr_required: # if cls.rule_set.ocr_required:
# cls.run_ocr([doc]) # cls.run_ocr([doc])
# if cls.rule_set.structure_required and doc.state != "error": # if cls.rule_set.structure_required and doc.state != "error":

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

@@ -111,7 +111,7 @@ this repository contains the full copyright notices and license terms. -->
</xpath> </xpath>
<xpath expr="//page[@id='other']" position="after"> <xpath expr="//page[@id='other']" position="after">
<page string="Weight Report" col="4" id="wr"> <page string="Weight Report" col="4" id="wr">
<field name="wr" colspan="4" mode="tree" view_ids="purchase_trade.shipment_wr_view_tree"/> <field name="shipment_wr" colspan="4" mode="tree" view_ids="purchase_trade.shipment_wr_view_tree"/>
</page> </page>
</xpath> </xpath>
</data> </data>