diff --git a/modules/automation/automation.py b/modules/automation/automation.py index 9c1618b..7fd2bed 100644 --- a/modules/automation/automation.py +++ b/modules/automation/automation.py @@ -9,7 +9,6 @@ import requests import io import logging import json -from trytond.modules.purchase_trade.service import ContractFactory logger = logging.getLogger(__name__) diff --git a/modules/purchase_trade/lot.py b/modules/purchase_trade/lot.py index 7832209..5e3bc5e 100755 --- a/modules/purchase_trade/lot.py +++ b/modules/purchase_trade/lot.py @@ -3337,6 +3337,8 @@ class ContractDetail(ModelView): ], 'Price type') currency_unit = fields.Selection('get_currency_unit',string="Curr/Unit") reference = fields.Char("Reference") + from_location = fields.Many2One('stock.location',"From location") + to_location = fields.Many2One('stock.location',"To location") @classmethod def default_category(cls): diff --git a/modules/purchase_trade/stock.py b/modules/purchase_trade/stock.py index c6b9f8e..5acba90 100755 --- a/modules/purchase_trade/stock.py +++ b/modules/purchase_trade/stock.py @@ -17,6 +17,7 @@ from operator import itemgetter import datetime from collections import defaultdict from sql import Table +from trytond.modules.purchase_trade.service import ContractFactory import logging logger = logging.getLogger(__name__) @@ -534,6 +535,8 @@ class ShipmentIn(metaclass=PoolMeta): sale.party = Party.getPartyByName(customer,'CLIENT') logger.info("SALE_PARTY:%s",sale.party) sale.reference = reference + sale.from_location = self.from_location + sale.to_location = self.to_location sale.company = 6 if sale.party.addresses: sale.invoice_address = sale.party.addresses[0] @@ -594,6 +597,8 @@ class ShipmentIn(metaclass=PoolMeta): d.tol_max = 0 d.incoterm = None d.reference = str(sale.id) + d.from_location = sale.from_location + d.to_location = sale.to_location d.del_period = None d.from_del = None d.to_del = None diff --git a/modules/purchase_trade/view/contract_detail_tree.xml b/modules/purchase_trade/view/contract_detail_tree.xml index 547e0ce..af70bb1 100755 --- a/modules/purchase_trade/view/contract_detail_tree.xml +++ b/modules/purchase_trade/view/contract_detail_tree.xml @@ -14,5 +14,7 @@ + +