[Erp5-report] r32711 kazuhiko - in /erp5/trunk/bt5/erp5_pdm: PortalTypeTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 18 03:49:12 CET 2010
Author: kazuhiko
Date: Thu Feb 18 03:49:10 2010
New Revision: 32711
URL: http://svn.erp5.org?rev=32711&view=rev
Log:
* create InternalSupplyLine_init and use it in Internal Supply Line.
* reduce duplicated code.
Modified:
erp5/trunk/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Line.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_init.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_init.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_init.xml
erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_init.xml
erp5/trunk/bt5/erp5_pdm/bt/revision
Modified: erp5/trunk/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%2520Supply%2520Line.xml?rev=32711&r1=32710&r2=32711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Line.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/PortalTypeTemplateItem/portal_types/Internal%20Supply%20Line.xml [utf8] Thu Feb 18 03:49:10 2010
@@ -76,7 +76,7 @@
</item>
<item>
<key> <string>init_script</string> </key>
- <value> <string>SaleSupplyLine_init</string> </value>
+ <value> <string>InternalSupplyLine_init</string> </value>
</item>
<item>
<key> <string>permission</string> </key>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_init.xml?rev=32711&r1=32710&r2=32711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_init.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/InternalSupplyLine_init.xml [utf8] Thu Feb 18 03:49:10 2010
@@ -53,18 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># XXX Set a resource for the supply line inside a resource\n
-if context.getParentValue().getPortalType() in \\\n
- context.getPortalResourceTypeList():\n
- context.setResourceValue(context.getParentValue())\n
-# Predicate ?\n
-context.setMappedValuePropertyList([\n
- \'base_price\', \'additional_price\',\n
- \'discount_ratio\', \'exclusive_discount_ratio\',\n
- \'surcharge_ratio\', \'variable_additional_price\',\n
- \'non_discountable_additional_price\',\n
- \'priced_quantity\',\n
-])\n
+ <value> <string>return context.SupplyLine_init(**kw)\n
</string> </value>
</item>
<item>
@@ -102,6 +91,7 @@
<value>
<tuple>
<string>kw</string>
+ <string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_init.xml?rev=32711&r1=32710&r2=32711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_init.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/PurchaseSupplyLine_init.xml [utf8] Thu Feb 18 03:49:10 2010
@@ -53,18 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># XXX Set a resource for the supply line inside a resource\n
-if context.getParentValue().getPortalType() in \\\n
- context.getPortalResourceTypeList():\n
- context.setResourceValue(context.getParentValue())\n
-# Predicate ?\n
-context.setMappedValuePropertyList([\n
- \'base_price\', \'additional_price\',\n
- \'discount_ratio\', \'exclusive_discount_ratio\',\n
- \'surcharge_ratio\', \'variable_additional_price\',\n
- \'non_discountable_additional_price\',\n
- \'priced_quantity\', \'base_unit_price\',\n
-])\n
+ <value> <string>return context.SupplyLine_init(**kw)\n
</string> </value>
</item>
<item>
@@ -102,6 +91,7 @@
<value>
<tuple>
<string>kw</string>
+ <string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_init.xml?rev=32711&r1=32710&r2=32711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_init.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SaleSupplyLine_init.xml [utf8] Thu Feb 18 03:49:10 2010
@@ -53,18 +53,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># XXX Set a resource for the supply line inside a resource\n
-if context.getParentValue().getPortalType() in \\\n
- context.getPortalResourceTypeList():\n
- context.setResourceValue(context.getParentValue())\n
-# Predicate ?\n
-context.setMappedValuePropertyList([\n
- \'base_price\', \'additional_price\',\n
- \'discount_ratio\', \'exclusive_discount_ratio\',\n
- \'surcharge_ratio\', \'variable_additional_price\',\n
- \'non_discountable_additional_price\',\n
- \'priced_quantity\', \'base_unit_price\',\n
-])\n
+ <value> <string>return context.SupplyLine_init(**kw)\n
</string> </value>
</item>
<item>
@@ -102,6 +91,7 @@
<value>
<tuple>
<string>kw</string>
+ <string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_init.xml?rev=32711&r1=32710&r2=32711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_init.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/SupplyLine_init.xml [utf8] Thu Feb 18 03:49:10 2010
@@ -54,16 +54,16 @@
<item>
<key> <string>_body</string> </key>
<value> <string># XXX Set a resource for the supply line inside a resource\n
-if context.getParentValue().getPortalType() in \\\n
- context.getPortalResourceTypeList():\n
- context.setResourceValue(context.getParentValue())\n
+parent_value = context.getParentValue()\n
+if parent_value.getPortalType() in context.getPortalResourceTypeList():\n
+ context.setResourceValue(parent_value)\n
# Predicate ?\n
context.setMappedValuePropertyList([\n
\'base_price\', \'additional_price\',\n
\'discount_ratio\', \'exclusive_discount_ratio\',\n
\'surcharge_ratio\', \'variable_additional_price\',\n
\'non_discountable_additional_price\',\n
- \'priced_quantity\',\n
+ \'priced_quantity\', \'base_unit_price\',\n
])\n
</string> </value>
</item>
@@ -104,6 +104,7 @@
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
+ <string>parent_value</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_pdm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm/bt/revision?rev=32711&r1=32710&r2=32711&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm/bt/revision [utf8] Thu Feb 18 03:49:10 2010
@@ -1,1 +1,1 @@
-448
+449
More information about the Erp5-report
mailing list