diff --git a/modules/lot/lot.py b/modules/lot/lot.py index 3453fb9..92ce710 100755 --- a/modules/lot/lot.py +++ b/modules/lot/lot.py @@ -515,6 +515,12 @@ class Lot(ModelSQL, ModelView): unit = self.line.unit if self.line else self.sale_line.unit qt, gross_qt = self.get_hist_quantity(state_id) return round(Decimal(Uom.compute_qty(self.lot_unit_line, float(qt), unit)),5) + + def get_current_gross_quantity_converted(self,state_id=0,name=None): + Uom = Pool().get('product.uom') + unit = self.line.unit if self.line else self.sale_line.unit + qt, gross_qt = self.get_hist_quantity(state_id) + return round(Decimal(Uom.compute_qty(self.lot_unit_line, float(gross_qt), unit)),5) def get_current_gross_quantity(self,name=None): if self.lot_type == 'physic': diff --git a/modules/purchase_trade/sale.py b/modules/purchase_trade/sale.py index 23eac5e..61ad850 100755 --- a/modules/purchase_trade/sale.py +++ b/modules/purchase_trade/sale.py @@ -260,7 +260,7 @@ class Sale(metaclass=PoolMeta): our_reference = fields.Char("Our Reference") company_visible = fields.Function(fields.Boolean("Visible"),'get_company_info') lc_date = fields.Date("LC date") - origin = fields.Char("Origin") + product_origin = fields.Char("Origin") def get_company_info(self,name): return (self.company.party.name == 'MELYA') @@ -271,6 +271,20 @@ class Sale(metaclass=PoolMeta): return self.lines[0].note else: return '' + + @property + def report_gross(self): + if self.lines: + return sum([l.get_current_gross_quantity_converted() for l in self.lines if l.lot_type == 'physic']) + else: + return '' + + @property + def report_net(self): + if self.lines: + return sum([l.get_current_quantity_converted() for l in self.lines if l.lot_type == 'physic']) + else: + return '' @property def report_qt(self): diff --git a/modules/purchase_trade/view/sale_form.xml b/modules/purchase_trade/view/sale_form.xml index e21eb08..83e64d1 100755 --- a/modules/purchase_trade/view/sale_form.xml +++ b/modules/purchase_trade/view/sale_form.xml @@ -36,8 +36,8 @@ this repository contains the full copyright notices and license terms. -->