From 68d8eee02a7e76ef299a11dff955f2c9fa2761a4 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Thu, 8 Dec 2005 12:54:05 +0000 Subject: [PATCH] 2005-12-08 yo * Fix the LEFT JOIN syntax in Order_zSelectMovement. 2005-12-05 Seb * Cleaned SaleOrder_applySaleTradeCondition git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4554 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Organisation/jump_to_purchase_order.xml | 2 +- .../jump_to_purchase_packing_list.xml | 2 +- .../Organisation/jump_to_sale_order.xml | 2 +- .../jump_to_sale_packing_list.xml | 2 +- .../portal_categories/order/supply.xml | 821 +-------- .../portal_categories/origin/order.xml | 1603 +---------------- .../Purchase%20Packing%20List%20Cell.xml | 8 +- .../Purchase%20Packing%20List%20Line.xml | 12 +- .../erp5_trade/Order_zSelectMovement.xml | 36 +- .../SaleOrder_applySaleTradeCondition.xml | 130 +- .../erp5_trade/SaleOrder_selectMovement.xml | 42 +- bt5/erp5_trade/bt/change_log | 6 + 12 files changed, 126 insertions(+), 2540 deletions(-) diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml index 13dbfa30f3..24b0a44500 100755 --- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml +++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_order.xml @@ -4,7 +4,7 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml index 11a04e8b66..bc0cf0060e 100755 --- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml +++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_purchase_packing_list.xml @@ -4,7 +4,7 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml index 39eb65a475..c1b62070e7 100755 --- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml +++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_order.xml @@ -4,7 +4,7 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> diff --git a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml index a7a557898e..69b98e3386 100755 --- a/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml +++ b/bt5/erp5_trade/ActionTemplateItem/portal_types/Organisation/jump_to_sale_packing_list.xml @@ -4,7 +4,7 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_categories/order/supply.xml b/bt5/erp5_trade/PathTemplateItem/portal_categories/order/supply.xml index d99c448804..bd1463410e 100755 --- a/bt5/erp5_trade/PathTemplateItem/portal_categories/order/supply.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_categories/order/supply.xml @@ -94,7 +94,7 @@ <none/> </tuple> </pickle> - <pickle> <int>2</int> </pickle> + <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> @@ -107,16 +107,7 @@ </tuple> </pickle> <pickle> - <tuple> - <tuple> - <tuple> - <tuple> - <string>ERP5 Category</string> - <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> - </tuple> - </tuple> - </tuple> - </tuple> + <none/> </pickle> </record> <record id="4" aka="AAAAAAAAAAQ="> @@ -130,18 +121,7 @@ </tuple> </pickle> <pickle> - <tuple> - <tuple> - <tuple> - <tuple> - <string>flux tendu</string> - <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> - <string>reassort</string> - <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> - </tuple> - </tuple> - </tuple> - </tuple> + <none/> </pickle> </record> <record id="5" aka="AAAAAAAAAAU="> @@ -409,799 +389,4 @@ </dictionary> </pickle> </record> - <record id="6" aka="AAAAAAAAAAY="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OIBTree</string> - <string>OIBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <tuple> - <tuple> - <tuple> - <tuple> - <string>flux tendu</string> - <int>1</int> - <string>reassort</string> - <int>1</int> - </tuple> - </tuple> - </tuple> - </tuple> - </pickle> - </record> - <record id="7" aka="AAAAAAAAAAc="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Type.Document.Category</string> - <string>Category</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <dictionary> - <item> - <key> <string>rc</string> </key> - <value> - <list> - <string>Owner</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>order/supply/flux tendu</string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>flux tendu</string> </value> - </item> - <item> - <key> <string>int_index</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Category</string> </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> <long>1991371749</long> </value> - </item> - <item> - <key> <string>workflow_history</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="8" aka="AAAAAAAAAAg="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Type.Document.Category</string> - <string>Category</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <dictionary> - <item> - <key> <string>rc</string> </key> - <value> - <list> - <string>Owner</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>order/supply/reassort</string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>reassort</string> </value> - </item> - <item> - <key> <string>int_index</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Category</string> </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> <long>1991371748</long> </value> - </item> - <item> - <key> <string>workflow_history</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="9" aka="AAAAAAAAAAk="> - <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="10" aka="AAAAAAAAAAo="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="11" aka="AAAAAAAAAAs="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="12" aka="AAAAAAAAAAw="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>edit_workflow</string> </key> - <value> - <tuple> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> - <global id="12.1" name="DateTime" module="DateTime.DateTime"/> - </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3461962</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911353</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.353</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.35</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346196215272</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string>Object copied from /test/portal_templates/erp5_trade</string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> <reference id="12.1"/> </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3461963</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911358</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.358</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.36</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346196273145</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="13" aka="AAAAAAAAAA0="> - <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="14" aka="AAAAAAAAAA4="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="15" aka="AAAAAAAAAA8="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="16" aka="AAAAAAAAABA="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>edit_workflow</string> </key> - <value> - <tuple> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> - <global id="16.1" name="DateTime" module="DateTime.DateTime"/> - </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3461963</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911361</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.361</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.36</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346196307873</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string>Object copied from /test/portal_templates/erp5_trade</string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> <reference id="16.1"/> </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3461964</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911365</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.365</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.37</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346196354163</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/PathTemplateItem/portal_categories/origin/order.xml b/bt5/erp5_trade/PathTemplateItem/portal_categories/origin/order.xml index 07c43d337b..71ac32ab38 100755 --- a/bt5/erp5_trade/PathTemplateItem/portal_categories/origin/order.xml +++ b/bt5/erp5_trade/PathTemplateItem/portal_categories/origin/order.xml @@ -87,7 +87,7 @@ <none/> </tuple> </pickle> - <pickle> <int>4</int> </pickle> + <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> @@ -100,16 +100,7 @@ </tuple> </pickle> <pickle> - <tuple> - <tuple> - <tuple> - <tuple> - <string>ERP5 Category</string> - <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> - </tuple> - </tuple> - </tuple> - </tuple> + <none/> </pickle> </record> <record id="4" aka="AAAAAAAAAAQ="> @@ -123,22 +114,7 @@ </tuple> </pickle> <pickle> - <tuple> - <tuple> - <tuple> - <tuple> - <string>EDI</string> - <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> - <string>FAX</string> - <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> - <string>Internet</string> - <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> - <string>eMail</string> - <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent> - </tuple> - </tuple> - </tuple> - </tuple> + <none/> </pickle> </record> <record id="5" aka="AAAAAAAAAAU="> @@ -406,1577 +382,4 @@ </dictionary> </pickle> </record> - <record id="6" aka="AAAAAAAAAAY="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OIBTree</string> - <string>OIBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <tuple> - <tuple> - <tuple> - <tuple> - <string>EDI</string> - <int>1</int> - <string>FAX</string> - <int>1</int> - <string>Internet</string> - <int>1</int> - <string>eMail</string> - <int>1</int> - </tuple> - </tuple> - </tuple> - </tuple> - </pickle> - </record> - <record id="7" aka="AAAAAAAAAAc="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Type.Document.Category</string> - <string>Category</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <dictionary> - <item> - <key> <string>rc</string> </key> - <value> - <list> - <string>Owner</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAs=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAw=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAA0=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>origin/order/EDI</string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>EDI</string> </value> - </item> - <item> - <key> <string>int_index</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Category</string> </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> <long>1991371744</long> </value> - </item> - <item> - <key> <string>workflow_history</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAA4=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="8" aka="AAAAAAAAAAg="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Type.Document.Category</string> - <string>Category</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <dictionary> - <item> - <key> <string>rc</string> </key> - <value> - <list> - <string>Owner</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAA8=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABA=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABE=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>origin/order/FAX</string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>FAX</string> </value> - </item> - <item> - <key> <string>int_index</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>last_id</string> </key> - <value> <string>1</string> </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Category</string> </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> <long>1991371743</long> </value> - </item> - <item> - <key> <string>workflow_history</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABI=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="9" aka="AAAAAAAAAAk="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Type.Document.Category</string> - <string>Category</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <dictionary> - <item> - <key> <string>rc</string> </key> - <value> - <list> - <string>Owner</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABM=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABQ=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABU=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>origin/order/Internet</string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Internet</string> </value> - </item> - <item> - <key> <string>int_index</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Category</string> </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> <long>1991371742</long> </value> - </item> - <item> - <key> <string>workflow_history</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABY=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="10" aka="AAAAAAAAAAo="> - <pickle> - <tuple> - <tuple> - <string>Products.ERP5Type.Document.Category</string> - <string>Category</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <dictionary> - <item> - <key> <string>rc</string> </key> - <value> - <list> - <string>Owner</string> - </list> - </value> - </item> - </dictionary> - </value> - </item> - <item> - <key> <string>_count</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABc=</string> </persistent> - </value> - </item> - <item> - <key> <string>_mt_index</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABg=</string> </persistent> - </value> - </item> - <item> - <key> <string>_tree</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABk=</string> </persistent> - </value> - </item> - <item> - <key> <string>categories</string> </key> - <value> - <tuple> - <string>origin/order/eMail</string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>eMail</string> </value> - </item> - <item> - <key> <string>int_index</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>portal_type</string> </key> - <value> <string>Category</string> </value> - </item> - <item> - <key> <string>uid</string> </key> - <value> <long>1991371741</long> </value> - </item> - <item> - <key> <string>workflow_history</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAABo=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="11" aka="AAAAAAAAAAs="> - <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="12" aka="AAAAAAAAAAw="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="13" aka="AAAAAAAAAA0="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="14" aka="AAAAAAAAAA4="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>edit_workflow</string> </key> - <value> - <tuple> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> - <global id="14.1" name="DateTime" module="DateTime.DateTime"/> - </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3462011</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911772</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.772</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.77</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346201064822</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string>Object copied from /test/portal_templates/erp5_trade</string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> <reference id="14.1"/> </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3462011</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911777</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.777</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.78</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346201122687</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="15" aka="AAAAAAAAAA8="> - <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="16" aka="AAAAAAAAABA="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="17" aka="AAAAAAAAABE="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="18" aka="AAAAAAAAABI="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>edit_workflow</string> </key> - <value> - <tuple> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> - <global id="18.1" name="DateTime" module="DateTime.DateTime"/> - </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3462012</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911781</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.781</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.78</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346201168984</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string>Object copied from /test/portal_templates/erp5_trade</string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> <reference id="18.1"/> </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3462012</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911785</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.785</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.79</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346201215274</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="19" aka="AAAAAAAAABM="> - <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="20" aka="AAAAAAAAABQ="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="21" aka="AAAAAAAAABU="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="22" aka="AAAAAAAAABY="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>edit_workflow</string> </key> - <value> - <tuple> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> - <global id="22.1" name="DateTime" module="DateTime.DateTime"/> - </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3462013</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911789</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.789</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.79</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346201261571</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string>Object copied from /test/portal_templates/erp5_trade</string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> <reference id="22.1"/> </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3462013</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911793</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.793</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.79</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346201307875</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="23" aka="AAAAAAAAABc="> - <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> <int>0</int> </pickle> - </record> - <record id="24" aka="AAAAAAAAABg="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="25" aka="AAAAAAAAABk="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <none/> - </pickle> - </record> - <record id="26" aka="AAAAAAAAABo="> - <pickle> - <tuple> - <tuple> - <string>Persistence</string> - <string>PersistentMapping</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_container</string> </key> - <value> - <dictionary> - <item> - <key> <string>edit_workflow</string> </key> - <value> - <tuple> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> - <global id="26.1" name="DateTime" module="DateTime.DateTime"/> - </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3462014</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911797</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.797</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.8</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346201354165</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - <dictionary> - <item> - <key> <string>action</string> </key> - <value> <string>\'edit\'</string> </value> - </item> - <item> - <key> <string>actor</string> </key> - <value> <string>romain</string> </value> - </item> - <item> - <key> <string>comment</string> </key> - <value> <string>Object copied from /test/portal_templates/erp5_trade</string> </value> - </item> - <item> - <key> <string>state</string> </key> - <value> <string>current</string> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> - <object> - <klass> <reference id="26.1"/> </klass> - <tuple> - <none/> - </tuple> - <state> - <dictionary> - <item> - <key> <string>_aday</string> </key> - <value> <string>Thu</string> </value> - </item> - <item> - <key> <string>_amon</string> </key> - <value> <string>Jun</string> </value> - </item> - <item> - <key> <string>_d</string> </key> - <value> <float>38152.3462014</float> </value> - </item> - <item> - <key> <string>_day</string> </key> - <value> <int>16</int> </value> - </item> - <item> - <key> <string>_dayoffset</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_fday</string> </key> - <value> <string>Thursday</string> </value> - </item> - <item> - <key> <string>_fmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_hour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_millis</string> </key> - <value> <long>1118909911802</long> </value> - </item> - <item> - <key> <string>_minute</string> </key> - <value> <int>18</int> </value> - </item> - <item> - <key> <string>_month</string> </key> - <value> <int>6</int> </value> - </item> - <item> - <key> <string>_nearsec</string> </key> - <value> <float>31.0</float> </value> - </item> - <item> - <key> <string>_pday</string> </key> - <value> <string>Thu.</string> </value> - </item> - <item> - <key> <string>_pm</string> </key> - <value> <string>am</string> </value> - </item> - <item> - <key> <string>_pmhour</string> </key> - <value> <int>4</int> </value> - </item> - <item> - <key> <string>_pmon</string> </key> - <value> <string>June</string> </value> - </item> - <item> - <key> <string>_second</string> </key> - <value> <float>31.802</float> </value> - </item> - <item> - <key> <string>_t</string> </key> - <value> <float>1118909911.8</float> </value> - </item> - <item> - <key> <string>_tz</string> </key> - <value> <string>GMT-4</string> </value> - </item> - <item> - <key> <string>_year</string> </key> - <value> <int>2005</int> </value> - </item> - <item> - <key> <string>time</string> </key> - <value> <float>0.346201412038</float> </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - </dictionary> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml index 2886feee12..6d0d867991 100755 --- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml +++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml @@ -110,7 +110,7 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> @@ -175,7 +175,7 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> @@ -240,7 +240,7 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> @@ -305,7 +305,7 @@ <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> diff --git a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml index 94f5fa5717..9d05063ac1 100755 --- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml +++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Line.xml @@ -117,7 +117,7 @@ a manufactured product, like a pen, a bicycle...</string> </value> <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> @@ -182,7 +182,7 @@ a manufactured product, like a pen, a bicycle...</string> </value> <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> @@ -249,7 +249,7 @@ a manufactured product, like a pen, a bicycle...</string> </value> <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> @@ -316,7 +316,7 @@ a manufactured product, like a pen, a bicycle...</string> </value> <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> @@ -381,7 +381,7 @@ a manufactured product, like a pen, a bicycle...</string> </value> <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> @@ -446,7 +446,7 @@ a manufactured product, like a pen, a bicycle...</string> </value> <pickle> <tuple> <tuple> - <string>Products.ERP5Type.CMFCorePatch</string> + <string>Products.ERP5Type.patches.ActionInformation</string> <string>PatchedActionInformation</string> </tuple> <none/> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml index 04b6629031..0ad4ff6e93 100755 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_zSelectMovement.xml @@ -136,18 +136,16 @@ SELECT DISTINCT\n catalog.id\n \n FROM\n -movement as simulation_movement,\n -<dtml-in from_table_list> \n - <dtml-var sequence-item> AS <dtml-var sequence-key>\n - <dtml-if sequence-end>\n - <dtml-else>,\n + movement as simulation_movement\n +<dtml-in prefix="table" expr="from_table_list"> \n + <dtml-if expr="table_key != \'catalog\'">\n + , <dtml-var table_item> AS <dtml-var table_key>\n </dtml-if>\n </dtml-in>\n -\n -LEFT JOIN catalog AS base_category ON base_category.relative_url = "delivery" \n - AND base_category.portal_type = "Base Category"\n -LEFT JOIN category ON catalog.uid=category.uid\n - AND base_category.uid=category.base_category_uid\n + , catalog\n + LEFT JOIN category \n + ON (catalog.uid = category.uid\n + AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n WHERE\n 1=1\n <dtml-if where_expression>\n @@ -208,18 +206,16 @@ SELECT DISTINCT\n catalog.id\n \n FROM\n -movement as simulation_movement,\n -<dtml-in from_table_list> \n - <dtml-var sequence-item> AS <dtml-var sequence-key>\n - <dtml-if sequence-end>\n - <dtml-else>,\n + movement as simulation_movement\n +<dtml-in prefix="table" expr="from_table_list"> \n + <dtml-if expr="table_key != \'catalog\'">\n + , <dtml-var table_item> AS <dtml-var table_key>\n </dtml-if>\n </dtml-in>\n -\n -LEFT JOIN catalog AS base_category ON base_category.relative_url = "delivery" \n - AND base_category.portal_type = "Base Category"\n -LEFT JOIN category ON catalog.uid=category.uid\n - AND base_category.uid=category.base_category_uid\n + , catalog\n + LEFT JOIN category \n + ON (catalog.uid = category.uid\n + AND category.base_category_uid = <dtml-sqlvar "portal_categories.delivery.getUid()" type="int">)\n WHERE\n 1=1\n <dtml-if where_expression>\n diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml index 0ee5a56c48..01b77ea971 100755 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml @@ -164,7 +164,6 @@ else : \n \n # copy PaymentCondition if no one is defined on Order\n payment_condition_portal_type = \'Payment Condition\'\n - context.Base_connectAsSuperUser()\n if (len(order.contentIds(filter={\'portal_type\':payment_condition_portal_type})) == 0) or force == 1 :\n if force ==1:\n to_delete=order.contentIds(filter={\'portal_type\':payment_condition_portal_type})\n @@ -210,11 +209,11 @@ else:\n <item> <key> <string>_code</string> </key> <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGQBAGQCAGQDAIQCAFoAAGQAAFMoBAAAAE5pAAAAAGkBAAAA -YwMAAAAXAAAASQAAAEMAAABzogoAAHQAAH0EAGcAAH0FAGQBAH0GAHQEAHwEAGQCAIMCAGQDAHwG +YwMAAAAXAAAASQAAAEMAAABzkgoAAHQAAH0EAGcAAH0FAGQBAH0GAHQEAHwEAGQCAIMCAGQDAHwG AGYBAIMAAX0FAHQFAHwFAIMBAGQEAGoCAG9HAAF0BAB0BAB0AABkBQCDAgBkBgCDAgB8BABkAwB8 BgBmAQBkBwBkBACDAQJ9BQB0BAB0AABkCACDAgBkCQB8BQCDAgABbgEAAXQFAHwFAIMBAGQEAGoC -AG8jAAFkCgB0BAB0AABkCwCDAgCDAAB8AABkDABmAwAWfQkAbq4JAXQFAHwFAIMBAGQNAGoEAG8j -AAFkCgB0BAB0AABkCwCDAgCDAAB8AABkDgBmAwAWfQkAbngJAXQEAHQIAHwFAGQEAIMCAGQPAIMC +AG8jAAFkCgB0BAB0AABkCwCDAgCDAAB8AABkDABmAwAWfQkAbp4JAXQFAHwFAIMBAGQNAGoEAG8j +AAFkCgB0BAB0AABkCwCDAgCDAAB8AABkDgBmAwAWfQkAbmgJAXQEAHQIAHwFAGQEAIMCAGQPAIMC AIMAAH0LAHQEAHwEAGQQAIMCAIMAAH0MAHQEAHwEAGQRAIMCAIMAAHQLAGoIAG8aAAF0BAB0AABk EgCDAgB0DACDAACDAQABbgEAAXQEAHwEAGQTAIMCAIMAAHQLAGoCAHAKAAF8AgBkDQBqAgBvFgAB dAQAfAsAZBMAgwIAgwAAdAsAagkAbyYAAXQEAHwEAGQUAIMCAHQEAHwLAGQVAIMCAIMAAGYBAIMB @@ -245,69 +244,68 @@ AGQwAIMCAIMAAHQLAGoIAHAKAAF8AgBkDQBqAgBvFgABdAQAfAsAZDAAgwIAgwAAdAsAagkAbzIA AXQEAHwEAGQxAIMCAHQEAHQEAHwLAGQwAIMCAIMAAGQqAIMCAIMAAGYBAIMBAAFuAQABdAQAfAQA ZDIAgwIAgwAAdAsAaggAcAoAAXwCAGQNAGoCAG8WAAF0BAB8CwBkMgCDAgCDAAB0CwBqCQBvMgAB dAQAfAQAZDMAgwIAdAQAdAQAfAsAZDIAgwIAgwAAZCoAgwIAgwAAZgEAgwEAAW4BAAFkNAB9EQB0 -BAB0AABkNQCDAgCDAAABdAUAdAQAfAQAZDYAgwIAZDcAaAAABGQDAHwRAAM8gwABgwEAZAQAagIA -cAoAAXwCAGQNAGoCAG+0AAF8AgBkDQBqAgBvOAABdAQAfAQAZDYAgwIAZDcAaAAABGQDAHwRAAM8 -gwABfRIAdAQAfAQAZDgAgwIAfBIAgwEAAW4BAAFnAAB9EwB0BAB8CwBkNgCDAgBkNwBoAAAEZAMA -fBEAAzyDAAF9EwB0BQB8EwCDAQBkBABqBABvMQABdAQAfAsAZDkAgwIAZDoAfBMAgwABfRQAdAQA -fAQAZDsAgwIAfBQAgwEAfRUAcbMIAW4BAAF0BAB8BABkPACDAgCDAAB0CwBqCABwCgABfAIAZA0A -agIAbxYAAXQEAHwLAGQ8AIMCAIMAAHQLAGoJAG8yAAF0BAB8BABkPQCDAgB0BAB0BAB8CwBkPACD -AgCDAABkKgCDAgCDAABmAQCDAQABbgEAAWQ+AH0WAHQFAHQEAHwEAGQ2AIMCAGQ3AGgAAARkAwB8 -FgADPIMAAYMBAGQEAGoCAHAKAAF8AgBkDQBqAgBvtAABfAIAZA0AagIAbzgAAXQEAHwEAGQ2AIMC -AGQ3AGgAAARkAwB8FgADPIMAAX0SAHQEAHwEAGQ4AIMCAHwSAIMBAAFuAQABZwAAfRMAdAQAfAsA -ZDYAgwIAZDcAaAAABGQDAHwWAAM8gwABfRMAdAUAfBMAgwEAZAQAagQAbzEAAXQEAHwLAGQ5AIMC -AGQ6AHwTAIMAAX0UAHQEAHwEAGQ7AIMCAHwUAIMBAH0VAHEZCgFuAQABdAQAfAQAZD8AgwIAdAQA -fAsAZCoAgwIAgwAAZgEAgwEAAXQEAHwEAGRAAIMCAIMAAAFkCgB0BAB0AABkCwCDAgCDAAB8AABk -QQBmAwAWfQkAfAEAbwgAAXQLAFNuJgABdAQAdAgAdAQAdAAAZEIAgwIAZEMAgwIAZEQAgwIAfAkA -gwEAAWQAAFMoRQAAAE5zFAAAAFNhbGUgVHJhZGUgQ29uZGl0aW9ucxYAAABnZXRTcGVjaWFsaXNl -VmFsdWVMaXN0cwsAAABwb3J0YWxfdHlwZWkAAAAAcw4AAABwb3J0YWxfZG9tYWluc3MTAAAAc2Vh -cmNoUHJlZGljYXRlTGlzdHMEAAAAdGVzdHMDAAAAbG9ncxUAAAB0cmFkZV9jb25kaXRpb25fbGlz -dCxzCAAAACVzLyVzPyVzcwwAAABhYnNvbHV0ZV91cmxzKQAAAHBvcnRhbF9zdGF0dXNfbWVzc2Fn -ZT1ObytUcmFkZStDb25kaXRpb24uaQEAAABzLwAAAHBvcnRhbF9zdGF0dXNfbWVzc2FnZT1Ub28r -bWFueStUcmFkZStDb25kaXRpb24ucwkAAABnZXRPYmplY3RzDwAAAGdldENhdGVnb3J5TGlzdHMP -AAAAZ2V0UmVjZWl2ZWREYXRlcw8AAABzZXRSZWNlaXZlZERhdGVzDgAAAGdldFNvdXJjZVZhbHVl -cw0AAABzZXRTb3VyY2VMaXN0cxQAAABnZXRTb3VyY2VSZWxhdGl2ZVVybHMVAAAAZ2V0U291cmNl -U2VjdGlvblZhbHVlcxQAAABzZXRTb3VyY2VTZWN0aW9uTGlzdHMbAAAAZ2V0U291cmNlU2VjdGlv -blJlbGF0aXZlVXJscxYAAABnZXRTb3VyY2VEZWNpc2lvblZhbHVlcxUAAABzZXRTb3VyY2VEZWNp -c2lvbkxpc3RzHAAAAGdldFNvdXJjZURlY2lzaW9uUmVsYXRpdmVVcmxzHAAAAGdldFNvdXJjZUFk -bWluaXN0cmF0aW9uVmFsdWVzGwAAAHNldFNvdXJjZUFkbWluaXN0cmF0aW9uTGlzdHMiAAAAZ2V0 -U291cmNlQWRtaW5pc3RyYXRpb25SZWxhdGl2ZVVybHMVAAAAZ2V0U291cmNlUGF5bWVudFZhbHVl -cxQAAABzZXRTb3VyY2VQYXltZW50TGlzdHMbAAAAZ2V0U291cmNlUGF5bWVudFJlbGF0aXZlVXJs -cxoAAABnZXREZXN0aW5hdGlvblNlY3Rpb25WYWx1ZXMZAAAAc2V0RGVzdGluYXRpb25TZWN0aW9u -TGlzdHMgAAAAZ2V0RGVzdGluYXRpb25TZWN0aW9uUmVsYXRpdmVVcmxzEwAAAGdldERlc3RpbmF0 -aW9uVmFsdWVzGQAAAGdldERlc3RpbmF0aW9uUmVsYXRpdmVVcmxzEgAAAHNldERlc3RpbmF0aW9u -TGlzdHMfAAAAZ2V0RGVzdGluYXRpb25EZWNpc2lvblZhbHVlTGlzdHMaAAAAc2V0RGVzdGluYXRp -b25EZWNpc2lvbkxpc3RzDgAAAGdldFJlbGF0aXZlVXJscyEAAABnZXREZXN0aW5hdGlvbkFkbWlu -aXN0cmF0aW9uVmFsdWVzIAAAAHNldERlc3RpbmF0aW9uQWRtaW5pc3RyYXRpb25MaXN0cxoAAABn -ZXREZXN0aW5hdGlvblBheW1lbnRWYWx1ZXMZAAAAc2V0RGVzdGluYXRpb25QYXltZW50TGlzdHMg -AAAAZ2V0RGVzdGluYXRpb25QYXltZW50UmVsYXRpdmVVcmxzFQAAAGdldFByaWNlQ3VycmVuY3lW -YWx1ZXMUAAAAc2V0UHJpY2VDdXJyZW5jeUxpc3RzFAAAAGdldERlbGl2ZXJ5TW9kZVZhbHVlcxMA -AABzZXREZWxpdmVyeU1vZGVMaXN0cxEAAABQYXltZW50IENvbmRpdGlvbnMXAAAAQmFzZV9jb25u -ZWN0QXNTdXBlclVzZXJzCgAAAGNvbnRlbnRJZHNzBgAAAGZpbHRlcnMRAAAAbWFuYWdlX2RlbE9i -amVjdHNzEgAAAG1hbmFnZV9jb3B5T2JqZWN0c3MDAAAAaWRzcxMAAABtYW5hZ2VfcGFzdGVPYmpl -Y3RzcxAAAABnZXRJbmNvdGVybVZhbHVlcw8AAABzZXRJbmNvdGVybUxpc3RzCAAAAERpc2NvdW50 -cxEAAABzZXRTcGVjaWFsaXNlTGlzdHMWAAAAcmVjdXJzaXZlUmVpbmRleE9iamVjdHMkAAAAcG9y -dGFsX3N0YXR1c19tZXNzYWdlPU9yZGVyK3VwZGF0ZWQucwcAAABSRVFVRVNUcwgAAABSRVNQT05T -RXMIAAAAcmVkaXJlY3QoFwAAAHMHAAAAY29udGV4dHMFAAAAb3JkZXJzFAAAAHRyYWRlX2NvbmRp -dGlvbl9saXN0cxsAAAB0cmFkZV9jb25kaXRpb25fcG9ydGFsX3R5cGVzCQAAAF9nZXRhdHRyX3MD -AAAAbGVucwcAAABmb3JtX2lkcwwAAAByZWRpcmVjdF91cmxzCQAAAF9nZXRpdGVtX3MPAAAAdHJh -ZGVfY29uZGl0aW9ucwoAAABjYXRlZ29yaWVzcwQAAABOb25lcwgAAABEYXRlVGltZXMFAAAAZm9y -Y2VzCQAAAF9nZXRpdGVyX3MGAAAAb2JqZWN0cx0AAABwYXltZW50X2NvbmRpdGlvbl9wb3J0YWxf +BQB0BAB8BABkNQCDAgBkNgBoAAAEZAMAfBEAAzyDAAGDAQBkBABqAgBwCgABfAIAZA0AagIAb7QA +AXwCAGQNAGoCAG84AAF0BAB8BABkNQCDAgBkNgBoAAAEZAMAfBEAAzyDAAF9EgB0BAB8BABkNwCD +AgB8EgCDAQABbgEAAWcAAH0TAHQEAHwLAGQ1AIMCAGQ2AGgAAARkAwB8EQADPIMAAX0TAHQFAHwT +AIMBAGQEAGoEAG8xAAF0BAB8CwBkOACDAgBkOQB8EwCDAAF9FAB0BAB8BABkOgCDAgB8FACDAQB9 +FQBxowgBbgEAAXQEAHwEAGQ7AIMCAIMAAHQLAGoIAHAKAAF8AgBkDQBqAgBvFgABdAQAfAsAZDsA +gwIAgwAAdAsAagkAbzIAAXQEAHwEAGQ8AIMCAHQEAHQEAHwLAGQ7AIMCAIMAAGQqAIMCAIMAAGYB +AIMBAAFuAQABZD0AfRYAdAUAdAQAfAQAZDUAgwIAZDYAaAAABGQDAHwWAAM8gwABgwEAZAQAagIA +cAoAAXwCAGQNAGoCAG+0AAF8AgBkDQBqAgBvOAABdAQAfAQAZDUAgwIAZDYAaAAABGQDAHwWAAM8 +gwABfRIAdAQAfAQAZDcAgwIAfBIAgwEAAW4BAAFnAAB9EwB0BAB8CwBkNQCDAgBkNgBoAAAEZAMA +fBYAAzyDAAF9EwB0BQB8EwCDAQBkBABqBABvMQABdAQAfAsAZDgAgwIAZDkAfBMAgwABfRQAdAQA +fAQAZDoAgwIAfBQAgwEAfRUAcQkKAW4BAAF0BAB8BABkPgCDAgB0BAB8CwBkKgCDAgCDAABmAQCD +AQABdAQAfAQAZD8AgwIAgwAAAWQKAHQEAHQAAGQLAIMCAIMAAHwAAGRAAGYDABZ9CQB8AQBvCAAB +dAsAU24mAAF0BAB0CAB0BAB0AABkQQCDAgBkQgCDAgBkQwCDAgB8CQCDAQABZAAAUyhEAAAATnMU +AAAAU2FsZSBUcmFkZSBDb25kaXRpb25zFgAAAGdldFNwZWNpYWxpc2VWYWx1ZUxpc3RzCwAAAHBv +cnRhbF90eXBlaQAAAABzDgAAAHBvcnRhbF9kb21haW5zcxMAAABzZWFyY2hQcmVkaWNhdGVMaXN0 +cwQAAAB0ZXN0cwMAAABsb2dzFQAAAHRyYWRlX2NvbmRpdGlvbl9saXN0LHMIAAAAJXMvJXM/JXNz +DAAAAGFic29sdXRlX3VybHMpAAAAcG9ydGFsX3N0YXR1c19tZXNzYWdlPU5vK1RyYWRlK0NvbmRp +dGlvbi5pAQAAAHMvAAAAcG9ydGFsX3N0YXR1c19tZXNzYWdlPVRvbyttYW55K1RyYWRlK0NvbmRp +dGlvbi5zCQAAAGdldE9iamVjdHMPAAAAZ2V0Q2F0ZWdvcnlMaXN0cw8AAABnZXRSZWNlaXZlZERh +dGVzDwAAAHNldFJlY2VpdmVkRGF0ZXMOAAAAZ2V0U291cmNlVmFsdWVzDQAAAHNldFNvdXJjZUxp +c3RzFAAAAGdldFNvdXJjZVJlbGF0aXZlVXJscxUAAABnZXRTb3VyY2VTZWN0aW9uVmFsdWVzFAAA +AHNldFNvdXJjZVNlY3Rpb25MaXN0cxsAAABnZXRTb3VyY2VTZWN0aW9uUmVsYXRpdmVVcmxzFgAA +AGdldFNvdXJjZURlY2lzaW9uVmFsdWVzFQAAAHNldFNvdXJjZURlY2lzaW9uTGlzdHMcAAAAZ2V0 +U291cmNlRGVjaXNpb25SZWxhdGl2ZVVybHMcAAAAZ2V0U291cmNlQWRtaW5pc3RyYXRpb25WYWx1 +ZXMbAAAAc2V0U291cmNlQWRtaW5pc3RyYXRpb25MaXN0cyIAAABnZXRTb3VyY2VBZG1pbmlzdHJh +dGlvblJlbGF0aXZlVXJscxUAAABnZXRTb3VyY2VQYXltZW50VmFsdWVzFAAAAHNldFNvdXJjZVBh +eW1lbnRMaXN0cxsAAABnZXRTb3VyY2VQYXltZW50UmVsYXRpdmVVcmxzGgAAAGdldERlc3RpbmF0 +aW9uU2VjdGlvblZhbHVlcxkAAABzZXREZXN0aW5hdGlvblNlY3Rpb25MaXN0cyAAAABnZXREZXN0 +aW5hdGlvblNlY3Rpb25SZWxhdGl2ZVVybHMTAAAAZ2V0RGVzdGluYXRpb25WYWx1ZXMZAAAAZ2V0 +RGVzdGluYXRpb25SZWxhdGl2ZVVybHMSAAAAc2V0RGVzdGluYXRpb25MaXN0cx8AAABnZXREZXN0 +aW5hdGlvbkRlY2lzaW9uVmFsdWVMaXN0cxoAAABzZXREZXN0aW5hdGlvbkRlY2lzaW9uTGlzdHMO +AAAAZ2V0UmVsYXRpdmVVcmxzIQAAAGdldERlc3RpbmF0aW9uQWRtaW5pc3RyYXRpb25WYWx1ZXMg +AAAAc2V0RGVzdGluYXRpb25BZG1pbmlzdHJhdGlvbkxpc3RzGgAAAGdldERlc3RpbmF0aW9uUGF5 +bWVudFZhbHVlcxkAAABzZXREZXN0aW5hdGlvblBheW1lbnRMaXN0cyAAAABnZXREZXN0aW5hdGlv +blBheW1lbnRSZWxhdGl2ZVVybHMVAAAAZ2V0UHJpY2VDdXJyZW5jeVZhbHVlcxQAAABzZXRQcmlj +ZUN1cnJlbmN5TGlzdHMUAAAAZ2V0RGVsaXZlcnlNb2RlVmFsdWVzEwAAAHNldERlbGl2ZXJ5TW9k +ZUxpc3RzEQAAAFBheW1lbnQgQ29uZGl0aW9ucwoAAABjb250ZW50SWRzcwYAAABmaWx0ZXJzEQAA +AG1hbmFnZV9kZWxPYmplY3RzcxIAAABtYW5hZ2VfY29weU9iamVjdHNzAwAAAGlkc3MTAAAAbWFu +YWdlX3Bhc3RlT2JqZWN0c3MQAAAAZ2V0SW5jb3Rlcm1WYWx1ZXMPAAAAc2V0SW5jb3Rlcm1MaXN0 +cwgAAABEaXNjb3VudHMRAAAAc2V0U3BlY2lhbGlzZUxpc3RzFgAAAHJlY3Vyc2l2ZVJlaW5kZXhP +YmplY3RzJAAAAHBvcnRhbF9zdGF0dXNfbWVzc2FnZT1PcmRlcit1cGRhdGVkLnMHAAAAUkVRVUVT +VHMIAAAAUkVTUE9OU0VzCAAAAHJlZGlyZWN0KBcAAABzBwAAAGNvbnRleHRzBQAAAG9yZGVycxQA +AAB0cmFkZV9jb25kaXRpb25fbGlzdHMbAAAAdHJhZGVfY29uZGl0aW9uX3BvcnRhbF90eXBlcwkA +AABfZ2V0YXR0cl9zAwAAAGxlbnMHAAAAZm9ybV9pZHMMAAAAcmVkaXJlY3RfdXJscwkAAABfZ2V0 +aXRlbV9zDwAAAHRyYWRlX2NvbmRpdGlvbnMKAAAAY2F0ZWdvcmllc3MEAAAATm9uZXMIAAAARGF0 +ZVRpbWVzBQAAAGZvcmNlcwkAAABfZ2V0aXRlcl9zBgAAAG9iamVjdHMdAAAAcGF5bWVudF9jb25k +aXRpb25fcG9ydGFsX3R5cGVzCQAAAHRvX2RlbGV0ZXMHAAAAdG9fY29weXMJAAAAY29weV9kYXRh +cwsAAABuZXdfaWRfbGlzdHMUAAAAZGlzY291bnRfcG9ydGFsX3R5cGVzCgAAAGJhdGNoX21vZGUo +FwAAAHMHAAAAZm9ybV9pZHMKAAAAYmF0Y2hfbW9kZXMFAAAAZm9yY2VzBwAAAGNvbnRleHRzBQAA +AG9yZGVycxQAAAB0cmFkZV9jb25kaXRpb25fbGlzdHMbAAAAdHJhZGVfY29uZGl0aW9uX3BvcnRh +bF90eXBlcwkAAABfZ2V0YXR0cl9zAwAAAGxlbnMMAAAAcmVkaXJlY3RfdXJscwkAAABfZ2V0aXRl +bV9zDwAAAHRyYWRlX2NvbmRpdGlvbnMKAAAAY2F0ZWdvcmllc3MEAAAATm9uZXMIAAAARGF0ZVRp +bWVzCQAAAF9nZXRpdGVyX3MGAAAAb2JqZWN0cx0AAABwYXltZW50X2NvbmRpdGlvbl9wb3J0YWxf dHlwZXMJAAAAdG9fZGVsZXRlcwcAAAB0b19jb3B5cwkAAABjb3B5X2RhdGFzCwAAAG5ld19pZF9s -aXN0cxQAAABkaXNjb3VudF9wb3J0YWxfdHlwZXMKAAAAYmF0Y2hfbW9kZSgXAAAAcwcAAABmb3Jt -X2lkcwoAAABiYXRjaF9tb2RlcwUAAABmb3JjZXMHAAAAY29udGV4dHMFAAAAb3JkZXJzFAAAAHRy -YWRlX2NvbmRpdGlvbl9saXN0cxsAAAB0cmFkZV9jb25kaXRpb25fcG9ydGFsX3R5cGVzCQAAAF9n -ZXRhdHRyX3MDAAAAbGVucwwAAAByZWRpcmVjdF91cmxzCQAAAF9nZXRpdGVtX3MPAAAAdHJhZGVf -Y29uZGl0aW9ucwoAAABjYXRlZ29yaWVzcwQAAABOb25lcwgAAABEYXRlVGltZXMJAAAAX2dldGl0 -ZXJfcwYAAABvYmplY3RzHQAAAHBheW1lbnRfY29uZGl0aW9uX3BvcnRhbF90eXBlcwkAAAB0b19k -ZWxldGVzBwAAAHRvX2NvcHlzCQAAAGNvcHlfZGF0YXMLAAAAbmV3X2lkX2xpc3RzFAAAAGRpc2Nv -dW50X3BvcnRhbF90eXBlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcyEAAABTYWxlT3Jk -ZXJfYXBwbHlTYWxlVHJhZGVDb25kaXRpb24BAAAAc7gAAAAAAgYBBgIGARsCEwEwARcCEwEjAhMB -IwMbAxICHAEaAz8BJgImARkBJgImARkBJgImARkBJgImARkBIwMjAhwBIwEcASoCIwIcASMBHAEn -AiwCHwEZAAkBJwEcASoCIwIcAS8BHAEqAiMCHAEjARwBKgMmARkBMgMmARkBLwMJAQ0BOwENASQB -FAEGASEBEwEYASADJgEZAS8DBgE7AQ0BJAEUAQYBIQETARgBIAMiAQ0CHwMHARECKAEAAABzIQAA -AFNhbGVPcmRlcl9hcHBseVNhbGVUcmFkZUNvbmRpdGlvbigBAAAAcyEAAABTYWxlT3JkZXJfYXBw -bHlTYWxlVHJhZGVDb25kaXRpb24oAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxt -b2R1bGU+AQAAAHMAAAAA</string> </value> +aXN0cxQAAABkaXNjb3VudF9wb3J0YWxfdHlwZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u +KXMhAAAAU2FsZU9yZGVyX2FwcGx5U2FsZVRyYWRlQ29uZGl0aW9uAQAAAHO2AAAAAAIGAQYCBgEb +AhMBMAEXAhMBIwITASMDGwMSAhwBGgM/ASYCJgEZASYCJgEZASYCJgEZASYCJgEZASMDIwIcASMB +HAEqAiMCHAEjARwBJwIsAh8BGQAJAScBHAEqAiMCHAEvARwBKgIjAhwBIwEcASoDJgEZATIDJgEZ +AS8DBgE7AQ0BJAEUAQYBIQETARgBIAMmARkBLwMGATsBDQEkARQBBgEhARMBGAEgAyIBDQIfAwcB +EQIoAQAAAHMhAAAAU2FsZU9yZGVyX2FwcGx5U2FsZVRyYWRlQ29uZGl0aW9uKAEAAABzIQAAAFNh +bGVPcmRlcl9hcHBseVNhbGVUcmFkZUNvbmRpdGlvbigAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0 +aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> </item> <item> <key> <string>_dav_writelocks</string> </key> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml index d484095a23..a1cb376b57 100755 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_selectMovement.xml @@ -73,11 +73,11 @@ kw[\'simulation_state\'] = \'confirmed\'\n \n kw.update(context.portal_catalog.buildSQLQuery(**kw))\n \n -context.log(\'SaleOrder_selectMovement\', \'SQL\\n%s\' % context.Order_zSelectMovement(src__=1, **kw))\n +#context.log(\'SaleOrder_selectMovement\', \'SQL\\n%s\' % context.Order_zSelectMovement(src__=1, **kw))\n \n if src__==0:\n movement_list = [x.getObject() for x in context.Order_zSelectMovement(**kw)]\n - context.log(\'SaleOrder_selectMovement\', \'mvt : %s\' % movement_list)\n + #context.log(\'SaleOrder_selectMovement\', \'mvt : %s\' % movement_list)\n return movement_list\n else:\n return context.Order_zSelectMovement(src__=1, **kw)\n @@ -86,27 +86,25 @@ else:\n <item> <key> <string>_code</string> </key> <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMBAAAACwAA -ABEAAABLAAAAc0ABAABkAQBkAgBnAgB0AAB8AQCDAQBkAwA8ZAQAdAAAfAEAgwEAZAUAPGQGAHQA +AA8AAABLAAAAc/QAAABkAQBkAgBnAgB0AAB8AQCDAQBkAwA8ZAQAdAAAfAEAgwEAZAUAPGQGAHQA AHwBAIMBAGQHADxkCAB0AAB8AQCDAQBkCQA8dAIAfAEAZAoAgwIAdAMAdAIAdAIAdAQAZAsAgwIA -ZAwAgwIAfAEAjQEAgwEAAXQCAHQEAGQNAIMCAGQOAGQPAHQDAHQCAHQEAGQQAIMCAGQRAGQSAHwB -AI0BARaDAgABfAAAZBMAagIAb20AAWcAAARpBgB9BwB0CAB0AwB0AgB0BABkEACDAgB8AQCNAQCD -AQBEXRwAfQkAfAcAdAIAfAkAZBQAgwIAgwAAgwEAAXHZAH4HAH0KAHQCAHQEAGQNAIMCAGQOAGQV -AHwKABaDAgABfAoAU24dAAF0AwB0AgB0BABkEACDAgBkEQBkEgB8AQCNAQFTZAAAUygWAAAATnMK -AAAAT3JkZXIgUnVsZXMNAAAARGVsaXZlcnkgUnVsZXMdAAAAcGFyZW50X3NwZWNpYWxpc2VfcG9y -dGFsX3R5cGVzCgAAAFNhbGUgT3JkZXJzFwAAAGV4cGxhbmF0aW9uX3BvcnRhbF90eXBlcxMAAABT -aW11bGF0aW9uIE1vdmVtZW50cwsAAABwb3J0YWxfdHlwZXMJAAAAY29uZmlybWVkcxAAAABzaW11 -bGF0aW9uX3N0YXRlcwYAAAB1cGRhdGVzDgAAAHBvcnRhbF9jYXRhbG9ncw0AAABidWlsZFNRTFF1 -ZXJ5cwMAAABsb2dzGAAAAFNhbGVPcmRlcl9zZWxlY3RNb3ZlbWVudHMGAAAAU1FMCiVzcxUAAABP -cmRlcl96U2VsZWN0TW92ZW1lbnRzBQAAAHNyY19faQEAAABpAAAAAHMJAAAAZ2V0T2JqZWN0cwgA -AABtdnQgOiAlcygLAAAAcwcAAABfd3JpdGVfcwIAAABrd3MJAAAAX2dldGF0dHJfcwcAAABfYXBw -bHlfcwcAAABjb250ZXh0cwUAAABzcmNfX3MGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dl -dGl0ZXJfcwEAAAB4cw0AAABtb3ZlbWVudF9saXN0KAsAAABzBQAAAHNyY19fcwIAAABrd3MHAAAA -X3dyaXRlX3MJAAAAX2dldGF0dHJfcwcAAABfYXBwbHlfcwcAAABjb250ZXh0cwYAAABhcHBlbmRz -CAAAACRhcHBlbmQwcwkAAABfZ2V0aXRlcl9zAQAAAHhzDQAAAG1vdmVtZW50X2xpc3QoAAAAACgA -AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzGAAAAFNhbGVPcmRlcl9zZWxlY3RNb3ZlbWVudAEAAABz -FgAAABYBEAEQARMCLgIvAg0BJgAoARcBCAIoAQAAAHMYAAAAU2FsZU9yZGVyX3NlbGVjdE1vdmVt -ZW50KAEAAABzGAAAAFNhbGVPcmRlcl9zZWxlY3RNb3ZlbWVudCgAAAAAKAAAAABzDwAAAFNjcmlw -dCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> +ZAwAgwIAfAEAjQEAgwEAAXwAAGQNAGoCAG9TAAFnAAAEaQYAfQcAdAgAdAMAdAIAdAQAZA4AgwIA +fAEAjQEAgwEARF0cAH0JAHwHAHQCAHwJAGQPAIMCAIMAAIMBAAFxpwB+BwB9CgB8CgBTbh0AAXQD +AHQCAHQEAGQOAIMCAGQQAGQRAHwBAI0BAVNkAABTKBIAAABOcwoAAABPcmRlciBSdWxlcw0AAABE +ZWxpdmVyeSBSdWxlcx0AAABwYXJlbnRfc3BlY2lhbGlzZV9wb3J0YWxfdHlwZXMKAAAAU2FsZSBP +cmRlcnMXAAAAZXhwbGFuYXRpb25fcG9ydGFsX3R5cGVzEwAAAFNpbXVsYXRpb24gTW92ZW1lbnRz +CwAAAHBvcnRhbF90eXBlcwkAAABjb25maXJtZWRzEAAAAHNpbXVsYXRpb25fc3RhdGVzBgAAAHVw +ZGF0ZXMOAAAAcG9ydGFsX2NhdGFsb2dzDQAAAGJ1aWxkU1FMUXVlcnlpAAAAAHMVAAAAT3JkZXJf +elNlbGVjdE1vdmVtZW50cwkAAABnZXRPYmplY3RzBQAAAHNyY19faQEAAAAoCwAAAHMHAAAAX3dy +aXRlX3MCAAAAa3dzCQAAAF9nZXRhdHRyX3MHAAAAX2FwcGx5X3MHAAAAY29udGV4dHMFAAAAc3Jj +X19zBgAAAGFwcGVuZHMIAAAAJGFwcGVuZDBzCQAAAF9nZXRpdGVyX3MBAAAAeHMNAAAAbW92ZW1l +bnRfbGlzdCgLAAAAcwUAAABzcmNfX3MCAAAAa3dzBwAAAF93cml0ZV9zCQAAAF9nZXRhdHRyX3MH +AAAAX2FwcGx5X3MHAAAAY29udGV4dHMGAAAAYXBwZW5kcwgAAAAkYXBwZW5kMHMJAAAAX2dldGl0 +ZXJfcwEAAAB4cw0AAABtb3ZlbWVudF9saXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p +cxgAAABTYWxlT3JkZXJfc2VsZWN0TW92ZW1lbnQBAAAAcxIAAAAWARABEAETAisEDQEmACUCCAIo +AQAAAHMYAAAAU2FsZU9yZGVyX3NlbGVjdE1vdmVtZW50KAEAAABzGAAAAFNhbGVPcmRlcl9zZWxl +Y3RNb3ZlbWVudCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAA +cwAAAAA=</string> </value> </item> <item> <key> <string>_dav_writelocks</string> </key> diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log index 3635e810d4..c22250837d 100755 --- a/bt5/erp5_trade/bt/change_log +++ b/bt5/erp5_trade/bt/change_log @@ -1,3 +1,9 @@ +2005-12-08 yo +* Fix the LEFT JOIN syntax in Order_zSelectMovement. + +2005-12-05 Seb +* Cleaned SaleOrder_applySaleTradeCondition + 2005-11-30 aurel * add aggregateMovementGroup in portal_deliveries/purchase_packing_list_builder -- 2.30.9