[Erp5-report] r25243 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jan 21 18:59:49 CET 2009
Author: jerome
Date: Wed Jan 21 18:59:46 2009
New Revision: 25243
URL: http://svn.erp5.org?rev=25243&view=rev
Log:
give more priority to validated trade conditions and reject invalidated ones
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml?rev=25243&r1=25242&r2=25243&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml [utf8] Wed Jan 21 18:59:46 2009
@@ -98,6 +98,8 @@
if trade_condition.getDestination():\n
rank += 1\n
rank += len(trade_condition.getSpecialiseList())\n
+ if trade_condition.getValidationState() == \'validated\':\n
+ rank += 2\n
return rank\n
\n
def sort_method(a, b):\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml?rev=25243&r1=25242&r2=25243&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_asPredicate.xml [utf8] Wed Jan 21 18:59:46 2009
@@ -53,7 +53,11 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>category_list = [\n
+ <value> <string>if context.getValidationState() == \'invalidated\':\n
+ # return a predicate that will never apply\n
+ return context.generatePredicate(criterion_property_list=(\'uid\',))\n
+\n
+category_list = [\n
\'source\', \'source_section\',\n
\'destination\', \'destination_section\',\n
]\n
@@ -108,12 +112,12 @@
<tuple>
<string>args</string>
<string>kw</string>
+ <string>_getattr_</string>
+ <string>context</string>
<string>category_list</string>
<string>criterion_list</string>
<string>_getiter_</string>
<string>category</string>
- <string>_getattr_</string>
- <string>context</string>
<string>date_context</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml?rev=25243&r1=25242&r2=25243&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml [utf8] Wed Jan 21 18:59:46 2009
@@ -98,6 +98,8 @@
if trade_condition.getSource():\n
rank += 1\n
rank += len(trade_condition.getSpecialiseList())\n
+ if trade_condition.getValidationState() == \'validated\':\n
+ rank += 2\n
return rank\n
\n
def sort_method(a, b):\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml?rev=25243&r1=25242&r2=25243&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleTradeCondition_asPredicate.xml [utf8] Wed Jan 21 18:59:46 2009
@@ -53,7 +53,11 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>category_list = [\n
+ <value> <string>if context.getValidationState() == \'invalidated\':\n
+ # return a predicate that will never apply\n
+ return context.generatePredicate(criterion_property_list=(\'uid\',))\n
+\n
+category_list = [\n
\'source\', \'source_section\',\n
\'destination\', \'destination_section\',\n
]\n
@@ -108,12 +112,12 @@
<tuple>
<string>args</string>
<string>kw</string>
+ <string>_getattr_</string>
+ <string>context</string>
<string>category_list</string>
<string>criterion_list</string>
<string>_getiter_</string>
<string>category</string>
- <string>_getattr_</string>
- <string>context</string>
<string>date_context</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=25243&r1=25242&r2=25243&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Jan 21 18:59:46 2009
@@ -1,1 +1,1 @@
-574
+575
More information about the Erp5-report
mailing list