diff --git a/modules/purchase_trade/lot.py b/modules/purchase_trade/lot.py index ac12a41..d690810 100755 --- a/modules/purchase_trade/lot.py +++ b/modules/purchase_trade/lot.py @@ -3226,28 +3226,29 @@ class ContractDetail(ModelView): category = fields.Integer("Category") cd = fields.Many2One('contracts.start',"Contracts") - party = fields.Many2One('party.party',"Party",domain=[('categories.parent', 'child_of', Eval('category'))],depends=['category']) - currency = fields.Many2One('currency.currency',"Currency") - incoterm = fields.Many2One('incoterm.incoterm',"Incoterm") - quantity = fields.Numeric("Quantity",digits=(1,5)) - unit = fields.Many2One('product.uom',"Unit") + party = fields.Many2One('party.party',"Party", required=True,domain=[('categories.parent', 'child_of', Eval('category'))],depends=['category']) + currency = fields.Many2One('currency.currency',"Currency", required=True) + incoterm = fields.Many2One('incoterm.incoterm',"Incoterm", required=True) + quantity = fields.Numeric("Quantity",digits=(1,5), required=True) + unit = fields.Many2One('product.uom',"Unit", required=True) qt_unit = fields.Many2One('product.uom',"Unit") - tol_min = fields.Numeric("Tol - in %") - tol_max = fields.Numeric("Tol + in %") + tol_min = fields.Numeric("Tol - in %", required=True) + tol_max = fields.Numeric("Tol + in %", required=True) crop = fields.Many2One('purchase.crop',"Crop") del_period = fields.Many2One('product.month',"Delivery Period") from_del = fields.Date("From") to_del = fields.Date("To") - price = fields.Numeric("Price",digits=(1,4),states={'invisible': Eval('price_type') != 'priced'}) + price = fields.Numeric("Price", required=True,digits=(1,4),states={'invisible': Eval('price_type') != 'priced'}) price_type = price_type = fields.Selection([ ('cash', 'Cash Price'), ('priced', 'Priced'), ('basis', 'Basis'), - ], 'Price type') + ], 'Price type', required=True) 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") + payment_term = fields.Many2One('account.invoice.payment_term',"Payment Term", required=True) @classmethod def default_category(cls): diff --git a/modules/purchase_trade/service.py b/modules/purchase_trade/service.py index 927fa8d..2d9f929 100644 --- a/modules/purchase_trade/service.py +++ b/modules/purchase_trade/service.py @@ -53,6 +53,7 @@ class ContractFactory: contract.crop = c.crop contract.tol_min = c.tol_min contract.tol_max = c.tol_max + contract.payment_term = c.payment_term contract.reference = c.reference contract.from_location = c.from_location contract.to_location = c.to_location diff --git a/modules/purchase_trade/view/contract_detail_tree.xml b/modules/purchase_trade/view/contract_detail_tree.xml index af70bb1..6def8fc 100755 --- a/modules/purchase_trade/view/contract_detail_tree.xml +++ b/modules/purchase_trade/view/contract_detail_tree.xml @@ -9,6 +9,7 @@ +