Commit a6d37e11 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

no longer set deliverable on simulation movement.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32039 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e1dafeb2
...@@ -109,7 +109,6 @@ class DeliveryRule(Rule): ...@@ -109,7 +109,6 @@ class DeliveryRule(Rule):
order_ratio=1, order_ratio=1,
delivery_value=deliv_mvt, delivery_value=deliv_mvt,
delivery_ratio=1, delivery_ratio=1,
deliverable=1,
source=deliv_mvt.getSource(), source=deliv_mvt.getSource(),
source_section=deliv_mvt.getSourceSection(), source_section=deliv_mvt.getSourceSection(),
...@@ -153,7 +152,6 @@ class DeliveryRule(Rule): ...@@ -153,7 +152,6 @@ class DeliveryRule(Rule):
sim_mvt.edit( sim_mvt.edit(
delivery_value=deliv_mvt, delivery_value=deliv_mvt,
delivery_ratio=1, delivery_ratio=1,
deliverable=1,
source=deliv_mvt.getSource(), source=deliv_mvt.getSource(),
source_section=deliv_mvt.getSourceSection(), source_section=deliv_mvt.getSourceSection(),
...@@ -283,5 +281,4 @@ class DeliveryRule(Rule): ...@@ -283,5 +281,4 @@ class DeliveryRule(Rule):
return { return {
'order_list': [movement.getRelativeUrl()], 'order_list': [movement.getRelativeUrl()],
'delivery_list': [movement.getRelativeUrl()], 'delivery_list': [movement.getRelativeUrl()],
'deliverable': 1,
} }
...@@ -155,8 +155,4 @@ class InvoicingRule(Rule): ...@@ -155,8 +155,4 @@ class InvoicingRule(Rule):
def _getExpandablePropertyUpdateDict(self, applied_rule, movement, def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
business_path, current_property_dict): business_path, current_property_dict):
return { return {}
'deliverable': 1
}
...@@ -92,7 +92,6 @@ class OpenOrderRule(DeliveryRule): ...@@ -92,7 +92,6 @@ class OpenOrderRule(DeliveryRule):
order_value=order_movement, order_value=order_movement,
order_ratio=1, order_ratio=1,
delivery_ratio=1, delivery_ratio=1,
deliverable=1,
**property_dict **property_dict
) )
......
...@@ -210,5 +210,4 @@ class OrderRule(DeliveryRule): ...@@ -210,5 +210,4 @@ class OrderRule(DeliveryRule):
"""Order rule specific update dictionary""" """Order rule specific update dictionary"""
return { return {
'order_list': [movement.getRelativeUrl()], 'order_list': [movement.getRelativeUrl()],
'deliverable': 1,
} }
...@@ -84,7 +84,6 @@ class TaxRule(DeliveryRule): ...@@ -84,7 +84,6 @@ class TaxRule(DeliveryRule):
order_value=tax_movement, order_value=tax_movement,
order_ratio=1, order_ratio=1,
delivery_ratio=1, delivery_ratio=1,
deliverable=1,
**property_dict ) **property_dict )
else: else:
for existing_simulation_movement in \ for existing_simulation_movement in \
......
...@@ -120,7 +120,6 @@ class TransformationRule(TransformationSourcingRuleMixin, Rule): ...@@ -120,7 +120,6 @@ class TransformationRule(TransformationSourcingRuleMixin, Rule):
"source_section_list": (), "source_section_list": (),
"destination": production, "destination": production,
"destination_section": production_section, "destination_section": production_section,
"deliverable": 1,
'start_date': current_supply_link.calculateStartDate(stop_date), 'start_date': current_supply_link.calculateStartDate(stop_date),
'stop_date': stop_date, 'stop_date': stop_date,
'causality_value': current_supply_link, 'causality_value': current_supply_link,
...@@ -199,7 +198,6 @@ class TransformationRule(TransformationSourcingRuleMixin, Rule): ...@@ -199,7 +198,6 @@ class TransformationRule(TransformationSourcingRuleMixin, Rule):
"destination_section_list": (), "destination_section_list": (),
"source": production, "source": production,
"source_section": production_section, "source_section": production_section,
"deliverable": 1,
"variation_category_list": category_list+ind_phase_list, "variation_category_list": category_list+ind_phase_list,
"variation_property_dict": \ "variation_property_dict": \
parent_movement.getVariationPropertyDict(), parent_movement.getVariationPropertyDict(),
...@@ -261,7 +259,6 @@ class TransformationRule(TransformationSourcingRuleMixin, Rule): ...@@ -261,7 +259,6 @@ class TransformationRule(TransformationSourcingRuleMixin, Rule):
"destination_section_list": (), "destination_section_list": (),
"source": production, "source": production,
"source_section": production_section, "source_section": production_section,
"deliverable": 1,
'causality_value': current_supply_link, 'causality_value': current_supply_link,
} }
return consumed_movement_dict return consumed_movement_dict
......
...@@ -118,7 +118,6 @@ class TransformationSourcingModelRule(TransformationModelRuleMixin, Rule): ...@@ -118,7 +118,6 @@ class TransformationSourcingModelRule(TransformationModelRuleMixin, Rule):
quantity_unit=parent_movement.getQuantityUnit(), quantity_unit=parent_movement.getQuantityUnit(),
start_date=start_date, start_date=start_date,
stop_date=stop_date, stop_date=stop_date,
deliverable=1,
) )
factory.makeMovements(applied_rule) factory.makeMovements(applied_rule)
......
...@@ -191,7 +191,6 @@ class TransformationSourcingRule(TransformationSourcingRuleMixin, Rule): ...@@ -191,7 +191,6 @@ class TransformationSourcingRule(TransformationSourcingRuleMixin, Rule):
'quantity_unit': parent_movement.getQuantityUnit(), 'quantity_unit': parent_movement.getQuantityUnit(),
'start_date': previous_supply_link.calculateStartDate(stop_date), 'start_date': previous_supply_link.calculateStartDate(stop_date),
'stop_date': stop_date, 'stop_date': stop_date,
'deliverable': 1,
# Save the value of the current supply link # Save the value of the current supply link
'causality_value': previous_supply_link, 'causality_value': previous_supply_link,
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment