[Erp5-report] r32039 kazuhiko - /erp5/trunk/products/ERP5/Document/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jan 27 20:50:55 CET 2010
Author: kazuhiko
Date: Wed Jan 27 20:50:53 2010
New Revision: 32039
URL: http://svn.erp5.org?rev=32039&view=rev
Log:
no longer set deliverable on simulation movement.
Modified:
erp5/trunk/products/ERP5/Document/DeliveryRule.py
erp5/trunk/products/ERP5/Document/InvoicingRule.py
erp5/trunk/products/ERP5/Document/OpenOrderRule.py
erp5/trunk/products/ERP5/Document/OrderRule.py
erp5/trunk/products/ERP5/Document/TaxRule.py
erp5/trunk/products/ERP5/Document/TransformationRule.py
erp5/trunk/products/ERP5/Document/TransformationSourcingModelRule.py
erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py
Modified: erp5/trunk/products/ERP5/Document/DeliveryRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/DeliveryRule.py?rev=32039&r1=32038&r2=32039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/DeliveryRule.py [utf8] Wed Jan 27 20:50:53 2010
@@ -109,7 +109,6 @@
order_ratio=1,
delivery_value=deliv_mvt,
delivery_ratio=1,
- deliverable=1,
source=deliv_mvt.getSource(),
source_section=deliv_mvt.getSourceSection(),
@@ -153,7 +152,6 @@
sim_mvt.edit(
delivery_value=deliv_mvt,
delivery_ratio=1,
- deliverable=1,
source=deliv_mvt.getSource(),
source_section=deliv_mvt.getSourceSection(),
@@ -283,5 +281,4 @@
return {
'order_list': [movement.getRelativeUrl()],
'delivery_list': [movement.getRelativeUrl()],
- 'deliverable': 1,
}
Modified: erp5/trunk/products/ERP5/Document/InvoicingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoicingRule.py?rev=32039&r1=32038&r2=32039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoicingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InvoicingRule.py [utf8] Wed Jan 27 20:50:53 2010
@@ -155,8 +155,4 @@
def _getExpandablePropertyUpdateDict(self, applied_rule, movement,
business_path, current_property_dict):
- return {
- 'deliverable': 1
- }
-
-
+ return {}
Modified: erp5/trunk/products/ERP5/Document/OpenOrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OpenOrderRule.py?rev=32039&r1=32038&r2=32039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OpenOrderRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OpenOrderRule.py [utf8] Wed Jan 27 20:50:53 2010
@@ -92,7 +92,6 @@
order_value=order_movement,
order_ratio=1,
delivery_ratio=1,
- deliverable=1,
**property_dict
)
Modified: erp5/trunk/products/ERP5/Document/OrderRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderRule.py?rev=32039&r1=32038&r2=32039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/OrderRule.py [utf8] Wed Jan 27 20:50:53 2010
@@ -210,5 +210,4 @@
"""Order rule specific update dictionary"""
return {
'order_list': [movement.getRelativeUrl()],
- 'deliverable': 1,
}
Modified: erp5/trunk/products/ERP5/Document/TaxRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TaxRule.py?rev=32039&r1=32038&r2=32039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TaxRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TaxRule.py [utf8] Wed Jan 27 20:50:53 2010
@@ -84,7 +84,6 @@
order_value=tax_movement,
order_ratio=1,
delivery_ratio=1,
- deliverable=1,
**property_dict )
else:
for existing_simulation_movement in \
Modified: erp5/trunk/products/ERP5/Document/TransformationRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformationRule.py?rev=32039&r1=32038&r2=32039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformationRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformationRule.py [utf8] Wed Jan 27 20:50:53 2010
@@ -120,7 +120,6 @@
"source_section_list": (),
"destination": production,
"destination_section": production_section,
- "deliverable": 1,
'start_date': current_supply_link.calculateStartDate(stop_date),
'stop_date': stop_date,
'causality_value': current_supply_link,
@@ -199,7 +198,6 @@
"destination_section_list": (),
"source": production,
"source_section": production_section,
- "deliverable": 1,
"variation_category_list": category_list+ind_phase_list,
"variation_property_dict": \
parent_movement.getVariationPropertyDict(),
@@ -261,7 +259,6 @@
"destination_section_list": (),
"source": production,
"source_section": production_section,
- "deliverable": 1,
'causality_value': current_supply_link,
}
return consumed_movement_dict
Modified: erp5/trunk/products/ERP5/Document/TransformationSourcingModelRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformationSourcingModelRule.py?rev=32039&r1=32038&r2=32039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformationSourcingModelRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformationSourcingModelRule.py [utf8] Wed Jan 27 20:50:53 2010
@@ -118,7 +118,6 @@
quantity_unit=parent_movement.getQuantityUnit(),
start_date=start_date,
stop_date=stop_date,
- deliverable=1,
)
factory.makeMovements(applied_rule)
Modified: erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py?rev=32039&r1=32038&r2=32039&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TransformationSourcingRule.py [utf8] Wed Jan 27 20:50:53 2010
@@ -191,7 +191,6 @@
'quantity_unit': parent_movement.getQuantityUnit(),
'start_date': previous_supply_link.calculateStartDate(stop_date),
'stop_date': stop_date,
- 'deliverable': 1,
# Save the value of the current supply link
'causality_value': previous_supply_link,
}
More information about the Erp5-report
mailing list