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

12
modules/automation/automation.py
View File

@@ -283,17 +283,17 @@ class AutomationDocument(ModelSQL, ModelView, Workflow):
sale_line.enable_linked_currency = True sale_line.enable_linked_currency = True
sale_line.linked_currency = 1 sale_line.linked_currency = 1
sale_line.linked_unit = Uom.get_by_name(sell_price_unit) sale_line.linked_unit = Uom.get_by_name(sell_price_unit)
sale_line.linked_price = sell_price sale_line.linked_price = round(sell_price,4)
sale_line.unit_price = sale_line.get_price_linked_currency() sale_line.unit_price = sale_line.get_price_linked_currency()
else: else:
sale.currency = Currency.get_by_name(sell_price_currency) sale.currency = Currency.get_by_name(sell_price_currency)
sale_line.unit_price = sell_price sale_line.unit_price = round(sell_price,4)
sale_line.unit = Uom.get_by_name(sell_price_unit) sale_line.unit = Uom.get_by_name(sell_price_unit)
sale_line.premium = premium sale_line.premium = premium
Sale.save([sale]) Sale.save([sale])
sale_line.sale = sale.id sale_line.sale = sale.id
sale_line.quantity = lot_net_weight sale_line.quantity = round(lot_net_weight,5)
sale_line.quantity_theorical = lot_net_weight sale_line.quantity_theorical = round(lot_net_weight,5)
sale_line.product = Product.get_by_name('BRAZIL COTTON') sale_line.product = Product.get_by_name('BRAZIL COTTON')
logger.info("PRODUCT:%s",sale_line.product) logger.info("PRODUCT:%s",sale_line.product)
sale_line.unit = Uom.get_by_name(lot_unit) sale_line.unit = Uom.get_by_name(lot_unit)
@@ -335,8 +335,8 @@ class AutomationDocument(ModelSQL, ModelView, Workflow):
l.lot_qt = lot_bales l.lot_qt = lot_bales
l.lot_unit = Uom.get_by_name('bale') l.lot_unit = Uom.get_by_name('bale')
l.lot_unit_line = lot_unit l.lot_unit_line = lot_unit
l.lot_quantity = lot_net_weight l.lot_quantity = round(lot_net_weight,5)
l.lot_gross_quantity = lot_gross_weight l.lot_gross_quantity = round(lot_gross_weight,5)
l.lot_premium = premium l.lot_premium = premium
LotQt.add_physical_lots(lqt,[l]) LotQt.add_physical_lots(lqt,[l])