[Erp5-report] r34853 kazuhiko - in /erp5/trunk/products/ERP5: PropertySheet/ bootstrap/erp5...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Apr 29 13:07:53 2010
New Revision: 34853

URL: http://svn.erp5.org?rev=34853&view=rev
Log:
allow specialise category in line level, and allow acquisition from parent in order type and delivery type for specialise base category.

Modified:
    erp5/trunk/products/ERP5/PropertySheet/Movement.py
    erp5/trunk/products/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/specialise.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/PropertySheet/Movement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Movement.py?rev=34853&r1=34852&r2=34853&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Movement.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Movement.py [utf8] Thu Apr 29 13:07:53 2010
@@ -74,5 +74,5 @@
             'mode'        : 'w' },
     )
 
-    _categories = ('order', Expression('python: portal.getPortalVariationBaseCategoryList()'))
+    _categories = ('order', 'specialise', Expression('python: portal.getPortalVariationBaseCategoryList()'))
                    # XXX Please check if it is meaningful to add order cat to all movemements ?

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/specialise.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/specialise.xml?rev=34853&r1=34852&r2=34853&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/specialise.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/specialise.xml [utf8] Thu Apr 29 13:07:53 2010
@@ -34,7 +34,9 @@
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>parent</string>
+              </tuple>
             </value>
         </item>
         <item>
@@ -53,7 +55,7 @@
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: []</string> </value>
+            <value> <string>python:list(portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList())</string> </value>
         </item>
         <item>
             <key> <string>acquisition_sync_value</string> </key>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log?rev=34853&r1=34852&r2=34853&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log [utf8] Thu Apr 29 13:07:53 2010
@@ -1,3 +1,6 @@
+2010-04-29 kazuhiko
+* Allow acquisition from parent in order type and delivery type for specialise base category.
+
 2010-04-07 ivan
 * Add captcha form field to library
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=34853&r1=34852&r2=34853&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Apr 29 13:07:53 2010
@@ -1,1 +1,1 @@
-1573
+1574