[Erp5-report] r31979 kazuhiko - in /erp5/trunk/products/ERP5: Document/ PropertySheet/ boot...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jan 26 14:55:49 CET 2010
Author: kazuhiko
Date: Tue Jan 26 14:55:46 2010
New Revision: 31979
URL: http://svn.erp5.org?rev=31979&view=rev
Log:
remove orderable and deliverable on Simulation Movement, that are useless and not at all used.
Modified:
erp5/trunk/products/ERP5/Document/SimulationMovement.py
erp5/trunk/products/ERP5/PropertySheet/Simulation.py
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
Modified: erp5/trunk/products/ERP5/Document/SimulationMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SimulationMovement.py?rev=31979&r1=31978&r2=31979&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SimulationMovement.py [utf8] Tue Jan 26 14:55:46 2010
@@ -214,29 +214,6 @@
"""
return self.getParentValue().isAccountable(self)
- # Ordering / Delivering
- security.declareProtected( Permissions.AccessContentsInformation,
- 'requiresOrder')
- def requiresOrder(self):
- """
- Returns 1 if this needs to be ordered
- """
- if self.isOrderable():
- return len(self.getCategoryMembership('order')) is 0
- else:
- return 0
-
- security.declareProtected( Permissions.AccessContentsInformation,
- 'requiresDelivery')
- def requiresDelivery(self):
- """
- Returns 1 if this needs to be accounted
- """
- if self.isDeliverable():
- return len(self.getCategoryMembership('delivery')) is 0
- else:
- return 0
-
#######################################################
# Causality Workflow Methods
Modified: erp5/trunk/products/ERP5/PropertySheet/Simulation.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Simulation.py?rev=31979&r1=31978&r2=31979&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Simulation.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Simulation.py [utf8] Tue Jan 26 14:55:46 2010
@@ -46,17 +46,6 @@
'description' : 'If set to 1, the stop date can not be changed',
'type' : 'boolean',
'mode' : 'w' },
- # Change of dates and quantities
- { 'id' : 'orderable',
- 'description' : 'If set to 1, self must be associated to an order',
- 'type' : 'boolean',
- 'mode' : 'w' },
- { 'id' : 'deliverable',
- 'description' : 'If set to 1, self must be associated to a delivery',
- 'type' : 'boolean',
- 'mode' : 'w' },
-
-
{ 'id' : 'delivery_ratio',
'description' : 'ratio to apply on the quantity property of the' \
'corresponding delivery to obtain the current quantity',
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml?rev=31979&r1=31978&r2=31979&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_movement_list.xml [utf8] Tue Jan 26 14:55:46 2010
@@ -84,12 +84,6 @@
</value>
</item>
<item>
- <key> <string>isDeliverable</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
<key> <string>isDivergent</string> </key>
<value>
<dictionary/>
@@ -97,12 +91,6 @@
</item>
<item>
<key> <string>isMovement</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- <item>
- <key> <string>isOrderable</string> </key>
<value>
<dictionary/>
</value>
@@ -131,8 +119,6 @@
<string>getStopDate</string>
<string>getPrice</string>
<string>isAccountable</string>
- <string>isOrderable</string>
- <string>isDeliverable</string>
<string>isDivergent</string>
<string>getVariationText</string>
</list>
@@ -162,8 +148,6 @@
getStopDate\n
getPrice\n
isAccountable\n
-isOrderable\n
-isDeliverable\n
isDivergent\n
getVariationText</string> </value>
</item>
@@ -235,8 +219,6 @@
<dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
<dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isOrderable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isDeliverable[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="isDivergent[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
)\n
@@ -314,8 +296,6 @@
<dtml-sqlvar expr="getStopDate[loop_item]" type="datetime" optional>,\n
<dtml-sqlvar expr="getPrice[loop_item]" type="float" optional>,\n
<dtml-sqlvar expr="isAccountable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isOrderable[loop_item]" type="int" optional>,\n
- <dtml-sqlvar expr="isDeliverable[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="isDivergent[loop_item]" type="int" optional>,\n
<dtml-sqlvar expr="getVariationText[loop_item]" type="string" optional>\n
)\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml?rev=31979&r1=31978&r2=31979&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_movement.xml [utf8] Tue Jan 26 14:55:46 2010
@@ -97,8 +97,6 @@
`stop_date` datetime,\n
`price` real,\n
`is_accountable` bool,\n
- `is_orderable` bool,\n
- `is_deliverable` bool,\n
`is_divergent` bool,\n
`variation_text` VARCHAR(255),\n
PRIMARY KEY `uid` (`uid`),\n
@@ -107,8 +105,6 @@
KEY `destination_uid` (`destination_uid`),\n
KEY `resource_uid` (`resource_uid`),\n
KEY `is_accountable` (`is_accountable`),\n
- KEY `is_orderable` (`is_orderable`),\n
- KEY `is_deliverable` (`is_deliverable`),\n
KEY `variation_text` (`variation_text`)\n
) TYPE=InnoDB;\n
</string> </value>
@@ -162,8 +158,6 @@
`stop_date` datetime,\n
`price` real,\n
`is_accountable` bool,\n
- `is_orderable` bool,\n
- `is_deliverable` bool,\n
`is_divergent` bool,\n
`variation_text` VARCHAR(255),\n
PRIMARY KEY `uid` (`uid`),\n
@@ -172,8 +166,6 @@
KEY `destination_uid` (`destination_uid`),\n
KEY `resource_uid` (`resource_uid`),\n
KEY `is_accountable` (`is_accountable`),\n
- KEY `is_orderable` (`is_orderable`),\n
- KEY `is_deliverable` (`is_deliverable`),\n
KEY `variation_text` (`variation_text`)\n
) TYPE=InnoDB;\n
</string> </value>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision?rev=31979&r1=31978&r2=31979&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision [utf8] Tue Jan 26 14:55:46 2010
@@ -1,1 +1,1 @@
-169
+170
More information about the Erp5-report
mailing list