diff --git a/product/ERP5/Document/InvoiceTransactionRule.py b/product/ERP5/Document/InvoiceTransactionRule.py index 20a054b62e88abfe5ab79e1bc3268d008d05563a..75e2f6b44a961f19cb81fa3a6a3d5a43243d90eb 100644 --- a/product/ERP5/Document/InvoiceTransactionRule.py +++ b/product/ERP5/Document/InvoiceTransactionRule.py @@ -132,20 +132,20 @@ class InvoiceTransactionRule(Rule, PredicateMatrix): LOG("InvoiceTransactionRule", PROBLEM, "expanding %s: without resource" % applied_rule.getPath()) - prevision_line = {} - prevision_line.update( - id = transaction_line.getId(), - source = transaction_line.getSource(), - destination = transaction_line.getDestination(), - source_section = context_movement.getSourceSection(), - destination_section = context_movement.getDestinationSection(), - resource = resource, + prevision_line = { + 'id': transaction_line.getId(), + 'source': transaction_line.getSource(), + 'destination': transaction_line.getDestination(), + 'source_section': context_movement.getSourceSection(), + 'destination_section': context_movement.getDestinationSection(), + 'resource': resource, # calculate (quantity * price) * cell_quantity - quantity = (context_movement.getCorrectedQuantity() * + 'quantity': (context_movement.getCorrectedQuantity() * context_movement.getPrice()) * transaction_line.getQuantity(), - start_date = context_movement.getStartDate(), - stop_date = context_movement.getStopDate(), - force_update = 1) + 'start_date': context_movement.getStartDate(), + 'stop_date': context_movement.getStopDate(), + 'force_update': 1, + } prevision_list.append(prevision_line) return prevision_list diff --git a/product/ERP5/Document/InvoicingRule.py b/product/ERP5/Document/InvoicingRule.py index 65e0ae41af350e0528b6f6cd36f4e50cc4962c5c..374259374982f25746499356c06c1eeee2ad4d31 100644 --- a/product/ERP5/Document/InvoicingRule.py +++ b/product/ERP5/Document/InvoicingRule.py @@ -108,23 +108,23 @@ class InvoicingRule(Rule): or destination_section is None: return [] - invoice_line = {} - invoice_line.update( - price=context_movement.getPrice(), - quantity=context_movement.getCorrectedQuantity(), - quantity_unit=context_movement.getQuantityUnit(), - efficiency=context_movement.getEfficiency(), - resource=context_movement.getResource(), - variation_category_list=context_movement.getVariationCategoryList(), - variation_property_dict=context_movement.getVariationPropertyDict(), - start_date=context_movement.getStartDate(), - stop_date=context_movement.getStopDate(), - source=context_movement.getSource(), source_section=source_section, - destination=context_movement.getDestination(), - destination_section=destination_section, + invoice_line = { + 'price': context_movement.getPrice(), + 'quantity': context_movement.getCorrectedQuantity(), + 'quantity_unit': context_movement.getQuantityUnit(), + 'efficiency': context_movement.getEfficiency(), + 'resource': context_movement.getResource(), + 'variation_category_list': context_movement.getVariationCategoryList(), + 'variation_property_dict': context_movement.getVariationPropertyDict(), + 'start_date': context_movement.getStartDate(), + 'stop_date': context_movement.getStopDate(), + 'source': context_movement.getSource(), + 'source_section': source_section, + 'destination': context_movement.getDestination(), + 'destination_section': destination_section, # We do need to collect invoice lines to build invoices - deliverable=1 - ) + 'deliverable': 1 + } return [invoice_line] security.declareProtected(Permissions.ModifyPortalContent, 'expand')