NaNtic
/
trytond-production_mass_balance_report
mirror of https://github.com/NaN-tic/trytond-production_mass_balance_report.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '5.4' of github.com:NaN-tic/trytond-production_mass_balance_report into 5.4

This commit is contained in:
Jared Esparza 2020-09-23 14:57:30 +02:00
parent 7a5234bee8 c3cdfa9510
commit 90108704c2
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
production.py
View File

@ -22,14 +22,16 @@ _ZERO = 0.0
class Production(metaclass=PoolMeta): class Production(metaclass=PoolMeta):
__name__ = 'production' __name__ = 'production'
def mass_balance_report_data(self, requested_product, direction): def mass_balance_report_data(self, requested_product, direction, lot=None):
Uom = Pool().get('product.uom') Uom = Pool().get('product.uom')
digits = self.on_change_with_unit_digits() digits = self.on_change_with_unit_digits()
quantity = 0.0 quantity = 0.0
for move in getattr(self, 'outputs' if direction == 'backward' else 'inputs'): for move in getattr(self, 'outputs' if direction == 'backward' else 'inputs'):
if move.product == requested_product: if move.product == requested_product:
# skip moves that same product but different lot
if lot and lot != move.lot:
continue
quantity += Uom.compute_qty(move.uom, move.quantity, move.product.default_uom, True) quantity += Uom.compute_qty(move.uom, move.quantity, move.product.default_uom, True)
moves = {} moves = {}
@ -57,12 +59,11 @@ class Production(metaclass=PoolMeta):
balance_plan_consumption = balance_difference = balance_difference_percent = 0.0 balance_plan_consumption = balance_difference = balance_difference_percent = 0.0
if self.bom: if self.bom:
bom = self.bom bom = self.bom
uom = self.uom
for bm in bom.inputs: for bm in bom.inputs:
if bm.product == product: if bm.product == product:
default_uom = self.product.default_uom default_uom = self.product.default_uom
bqty = Uom.compute_qty( bqty = Uom.compute_qty(
uom, bm.quantity, default_uom, True) bm.uom, bm.quantity, bm.product.default_uom, True)
factor = bom.compute_factor(self.product, bqty, default_uom) factor = bom.compute_factor(self.product, bqty, default_uom)
balance_plan_consumption = default_uom.ceil(self.quantity * factor) balance_plan_consumption = default_uom.ceil(self.quantity * factor)
break break
@ -84,12 +85,11 @@ class Production(metaclass=PoolMeta):
balance_plan_consumption = balance_difference = balance_difference_percent = 0.0 balance_plan_consumption = balance_difference = balance_difference_percent = 0.0
if self.bom: if self.bom:
bom = self.bom bom = self.bom
uom = self.uom
for bm in bom.inputs: for bm in bom.inputs:
if bm.product == requested_product: if bm.product == requested_product:
default_uom = self.product.default_uom default_uom = self.product.default_uom
bqty = Uom.compute_qty( bqty = Uom.compute_qty(
uom, bm.quantity, default_uom, True) bm.uom, bm.quantity, bm.product.default_uom, True)
factor = bom.compute_factor(self.product, bqty, default_uom) factor = bom.compute_factor(self.product, bqty, default_uom)
balance_plan_consumption = default_uom.ceil(self.quantity * factor) balance_plan_consumption = default_uom.ceil(self.quantity * factor)
break break
@ -249,6 +249,7 @@ class PrintProductionMassBalanceReport(HTMLReport):
requested_product = Product(data['product']) requested_product = Product(data['product'])
direction = data['direction'] direction = data['direction']
lot = Lot(data['lot']) if data.get('lot') else None
parameters = {} parameters = {}
parameters['direction'] = direction parameters['direction'] = direction
@ -256,7 +257,7 @@ class PrintProductionMassBalanceReport(HTMLReport):
parameters['to_date'] = to_date parameters['to_date'] = to_date
parameters['show_date'] = bool(data.get('from_date')) parameters['show_date'] = bool(data.get('from_date'))
parameters['requested_product'] = requested_product parameters['requested_product'] = requested_product
parameters['lot'] = Lot(data['lot']) if data.get('lot') else None parameters['lot'] = lot
# TODO get url from trytond.url issue8767 # TODO get url from trytond.url issue8767
if BASE_URL: if BASE_URL:
@ -281,8 +282,8 @@ class PrintProductionMassBalanceReport(HTMLReport):
('outputs.state', '=', 'done'), ('outputs.state', '=', 'done'),
('company', '=', company_id), ('company', '=', company_id),
] ]
if data.get('lot'): if lot:
domain += [('outputs.lot', '=', data['lot'])] domain += [('outputs.lot', '=', lot)]
else: else:
domain = [ domain = [
('inputs.product', '=', requested_product), ('inputs.product', '=', requested_product),
@ -291,14 +292,15 @@ class PrintProductionMassBalanceReport(HTMLReport):
('inputs.state', '=', 'done'), ('inputs.state', '=', 'done'),
('company', '=', company_id), ('company', '=', company_id),
] ]
if data.get('lot'): if lot:
domain += [('inputs.lot', '=', data['lot'])] domain += [('inputs.lot', '=', lot)]
productions = Production.search(domain) productions = Production.search(domain)
records = {} records = {}
for production in productions: for production in productions:
res = production.mass_balance_report_data(requested_product, direction) res = production.mass_balance_report_data(requested_product,
direction, lot)
for key, values in res.items(): for key, values in res.items():
if not records.get(key): if not records.get(key):