[Erp5-report] r20125 - in /erp5/trunk/bt5/erp5_trade: PortalTypeTemplateItem/portal_types/ ...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 25 17:18:27 CET 2008
Author: alex
Date: Tue Mar 25 17:18:27 2008
New Revision: 20125
URL: http://svn.erp5.org?rev=20125&view=rev
Log:
* When creating an Order Line, set its reference and int_index,
* When copypasting a Order or Packing List, set a new reference on the resulting object,
* use "parent_domain" instead of "parent" on order view listbox,
* set edit_order on OrderLine_view,
* fix some values in Purchase Order printout
Added:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_afterClone.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_afterClone.xml
Modified:
erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTDataDict.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%2520Order%2520Line.xml?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml Tue Mar 25 17:18:27 2008
@@ -31,6 +31,25 @@
<key> <string>_owner</string> </key>
<value>
<none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_property_domain_dict</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
</value>
</item>
<item>
@@ -95,7 +114,7 @@
</item>
<item>
<key> <string>init_script</string> </key>
- <value> <string></string> </value>
+ <value> <string>OrderLine_init</string> </value>
</item>
<item>
<key> <string>permission</string> </key>
@@ -114,4 +133,44 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>short_title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%2520Packing%2520List.xml?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml Tue Mar 25 17:18:27 2008
@@ -114,7 +114,7 @@
</item>
<item>
<key> <string>init_script</string> </key>
- <value> <string></string> </value>
+ <value> <string>Delivery_generateReference</string> </value>
</item>
<item>
<key> <string>permission</string> </key>
Modified: erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%2520Order%2520Line.xml?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml Tue Mar 25 17:18:27 2008
@@ -95,7 +95,7 @@
</item>
<item>
<key> <string>init_script</string> </key>
- <value> <string></string> </value>
+ <value> <string>OrderLine_init</string> </value>
</item>
<item>
<key> <string>permission</string> </key>
Modified: erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%2520Packing%2520List.xml?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml Tue Mar 25 17:18:27 2008
@@ -34,6 +34,25 @@
</value>
</item>
<item>
+ <key> <string>_property_domain_dict</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>short_title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
<key> <string>_roles</string> </key>
<value>
<list/>
@@ -41,7 +60,7 @@
</item>
<item>
<key> <string>acquire_local_roles</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>allowed_content_types</string> </key>
@@ -95,6 +114,10 @@
</item>
<item>
<key> <string>init_script</string> </key>
+ <value> <string>Delivery_generateReference</string> </value>
+ </item>
+ <item>
+ <key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -110,4 +133,44 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>short_title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>domain_name</string> </key>
+ <value> <string>erp5_content</string> </value>
+ </item>
+ <item>
+ <key> <string>property_name</string> </key>
+ <value> <string>title</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml?rev=20125&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_init.xml Tue Mar 25 17:18:27 2008
@@ -1,0 +1,161 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>line = context\n
+parent = context.getParentValue()\n
+\n
+line_pt = line.getPortalType()\n
+\n
+index = len(parent.contentValues(filter={"portal_type": line_pt}))\n
+\n
+if parent.getPortalType() == line_pt:\n
+ reference = "%s.%s" % (parent.getReference(), index)\n
+else:\n
+ reference = str(index)\n
+\n
+line.edit(reference=reference, int_index=index)\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>*args, **kw</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>args</string>
+ <string>kw</string>
+ <string>context</string>
+ <string>line</string>
+ <string>_getattr_</string>
+ <string>parent</string>
+ <string>line_pt</string>
+ <string>len</string>
+ <string>index</string>
+ <string>reference</string>
+ <string>str</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>OrderLine_init</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_view.xml Tue Mar 25 17:18:27 2008
@@ -57,6 +57,15 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>edit_order</string> </key>
+ <value>
+ <list>
+ <string>title</string>
+ <string>reference</string>
+ </list>
+ </value>
+ </item>
+ <item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_afterClone.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_afterClone.xml?rev=20125&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_afterClone.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_afterClone.xml Tue Mar 25 17:18:27 2008
@@ -1,0 +1,142 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>context.setReference(\'\')\n
+\n
+context.Delivery_generateReference()\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+<string>context</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Order_afterClone</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_afterClone.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_afterClone.xml?rev=20125&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_afterClone.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_afterClone.xml Tue Mar 25 17:18:27 2008
@@ -1,0 +1,142 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>context.setReference(\'\')\n
+\n
+context.Delivery_generateReference()\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+<string>context</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>PackingList_afterClone</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTDataDict.xml?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTDataDict.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTDataDict.xml Tue Mar 25 17:18:27 2008
@@ -152,7 +152,8 @@
\n
def getSubLineList(obj):\n
sub_list = []\n
- for x in obj.searchFolder(portal_type=context.getPortalOrderMovementTypeList(), sort_on=\'int_index\'):\n
+ for x in obj.searchFolder(portal_type=context.getPortalOrderMovementTypeList(),\n
+ sort_on=[(\'int_index\', \'ascending\'), (\'reference\', \'ascending\')]):\n
sub_list.append(x)\n
sub_list.extend(getSubLineList(x))\n
return sub_list\n
@@ -166,7 +167,7 @@
\'style_name\': \'Item_20_Table_20_Title\',\n
\'left_style_name\': \'Item_20_Table_20_Title_20_Left\',\n
\'right_style_name\': \'Item_20_Table_20_Title_20_Right\',\n
- \'index\': line.getIntIndex(),\n
+ \'index\': line.getReference() or line.getIntIndex(),\n
\'source_reference\': getSourceReference(line),\n
\'reference\': line.getResource() is not None and line.getResourceValue().getReference() or \'\',\n
\'description\': desc,\n
@@ -181,7 +182,7 @@
\'style_name\': \'Table_20_Contents\',\n
\'left_style_name\': \'Table_20_Contents_20_Left\',\n
\'right_style_name\': \'Table_20_Contents_20_Right\',\n
- \'index\': line.getIntIndex(),\n
+ \'index\': line.getReference() or line.getIntIndex(),\n
\'source_reference\': getSourceReference(line),\n
\'reference\': line.getResource() is not None and line.getResourceValue().getReference() or \'\',\n
\'description\': desc,\n
@@ -199,7 +200,7 @@
\'source_section_title\': context.getSourceSectionTitle() or \'\',\n
\'source_section_address\': getOneLineAddress(\n
context.getSourceSection() and context.getSourceSectionValue().getDefaultAddressText() or \'\',\n
- context.getSourceSection() and context.getSourceSectionValue().getRegionTitle() or \'\'),\n
+ context.getSourceSection() and context.getSourceSectionValue().getDefaultAddressRegionTitle() or \'\'),\n
\'source_section_telfax\': getPhoneAndFax(context.getSourceSection() and context.getSourceSectionValue().getTelephoneText() or \'\',\n
context.getSourceSection() and context.getSourceSectionValue().getFaxText() or \'\'),\n
\'source_section_email\': getEmail(context.getSourceSection() and context.getSourceSectionValue().getEmailText() or \'\'),\n
@@ -212,7 +213,7 @@
\'destination_title\': context.getDestinationTitle() or \'\',\n
\'destination_address\': getOneLineAddress(\n
context.getDestination() and context.getDestinationValue().getDefaultAddressText() or \'\',\n
- context.getDestination() and context.getDestinationValue().getRegionTitle() or \'\'),\n
+ context.getDestination() and context.getDestinationValue().getDefaultAddressRegionTitle() or \'\'),\n
\'destination_telfax\': getPhoneAndFax(context.getDestination() and context.getDestinationValue().getTelephoneText() or \'\',\n
context.getDestination() and context.getDestinationValue().getFaxText() or \'\'),\n
\'destination_email\': getEmail(context.getDestination() and context.getDestinationValue().getEmailText() or \'\'),\n
@@ -220,7 +221,7 @@
\'destination_section_title\': unicode(context.getDestinationSectionTitle() or \'\', \'utf8\'),\n
\'destination_section_address\': unicode(getOneLineAddress(\n
context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressText() or \'\',\n
- context.getDestinationSection() and context.getDestinationSectionValue().getRegionTitle() or \'\'), \'utf8\'),\n
+ context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressRegionTitle() or \'\'), \'utf8\'),\n
\'destination_section_telfax\': unicode(getPhoneAndFax(\n
context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\',\n
context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\'), \'utf8\'),\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox.xml Tue Mar 25 17:18:27 2008
@@ -14,7 +14,6 @@
<value>
<list>
<string>list_method</string>
- <string>report_root_list</string>
</list>
</value>
</item>
@@ -90,21 +89,6 @@
</value>
</item>
<item>
- <key> <string>report_root_list</string> </key>
- <value>
- <list>
- <tuple>
- <string>parent_domain</string>
- <string>Object Tree</string>
- </tuple>
- <tuple>
- <string>resource</string>
- <string>Resource</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_purchase_order_lines_listbox.xml Tue Mar 25 17:18:27 2008
@@ -227,7 +227,7 @@
<value>
<list>
<tuple>
- <string>parent</string>
+ <string>parent_domain</string>
<string>Object Tree</string>
</tuple>
<tuple>
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=20125&r1=20124&r2=20125&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Tue Mar 25 17:18:27 2008
@@ -1,1 +1,1 @@
-202
+198
More information about the Erp5-report
mailing list