diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml index d6a5be7f24ce116d0b89fa5f42774b85cb4bcb0e..a74e2941bb851edb73745104e986802444f5ae28 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml @@ -57,7 +57,7 @@ item_list = []\n request = context.REQUEST\n total_quantity = 0.0\n -type = request.get("field_your_type")\n +type = request.get("field_your_type") or \'Item\'\n if context.getPortalType()==\'Purchase Packing List Line\':\n cell_portal_type = \'Purchase Packing List Cell\'\n elif context.getPortalType()==\'Purchase Order Line\' :\n @@ -82,8 +82,9 @@ for line in kw.get(\'listbox\'):\n item_list.append(item) \n \n \n - if line.has_key("variation_category_list") and line[\'variation_category_list\'] not in(\'\',[]) and [line[\'variation_category_list\'][i] not in context.getVariationCategoryList() for i in range(0,(len(line[\'variation_category_list\'])-1))][0]:\n - context.setVariationCategoryList(context.getVariationCategoryList() + list((line[\'variation_category_list\'])))\n + if line.has_key("variation_category_list") and line[\'variation_category_list\'] not in(\'\',[]):\n + new_list = filter(lambda x:(x not in context.getVariationCategoryList()),line["variation_category_list"])\n + context.setVariationCategoryList(context.getVariationCategoryList()+new_list)\n if line.has_key("variation_category_list") and line[\'variation_category_list\'] not in(\'\',None):\n cell_key = list((line[\'variation_category_list\']))\n quantity = line[\'quantity\']\n @@ -162,11 +163,8 @@ return context.Base_redirect(form_id, keep_items=dict(\n <string>None</string> <string>module</string> <string>item</string> - <string>append</string> - <string>$append0</string> - <string>range</string> - <string>len</string> - <string>i</string> + <string>filter</string> + <string>new_list</string> <string>list</string> <string>cell_key</string> <string>quantity</string> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_getAggregatedItemValueList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_getAggregatedItemValueList.xml similarity index 98% rename from bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_getAggregatedItemValueList.xml rename to bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_getAggregatedItemValueList.xml index 61a1b6220cb727d395432a57d54c37cb332ffe6c..47961009d658d0e1240cce1d0d00dec83fde33b9 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_getAggregatedItemValueList.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_getAggregatedItemValueList.xml @@ -136,7 +136,7 @@ return [context.portal_catalog.getObject(uid) for uid in selection_uid_list]\n </item> <item> <key> <string>id</string> </key> - <value> <string>Order_getAggregatedItemValueList</string> </value> + <value> <string>Delivery_getAggregatedItemValueList</string> </value> </item> <item> <key> <string>warnings</string> </key> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList.xml new file mode 100644 index 0000000000000000000000000000000000000000..ac1640a1b6c2b7d81ab426133376f6969c0a54b3 --- /dev/null +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList.xml @@ -0,0 +1,157 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ERP5Form" module="Products.ERP5Form.Form"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <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/> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_objects</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>action</string> </key> + <value> <string>Base_edit</string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>edit_order</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>enctype</string> </key> + <value> <string>multipart/form-data</string> </value> + </item> + <item> + <key> <string>group_list</string> </key> + <value> + <list> + <string>left</string> + <string>right</string> + <string>center</string> + <string>bottom</string> + <string>hidden</string> + </list> + </value> + </item> + <item> + <key> <string>groups</string> </key> + <value> + <dictionary> + <item> + <key> <string>bottom</string> </key> + <value> + <list> + <string>listbox</string> + </list> + </value> + </item> + <item> + <key> <string>center</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> + <list> + <string>listbox_history</string> + <string>listbox_quantity</string> + <string>listbox_variation_category_item_list</string> + </list> + </value> + </item> + <item> + <key> <string>left</string> </key> + <value> + <list> + <string>my_title</string> + </list> + </value> + </item> + <item> + <key> <string>right</string> </key> + <value> + <list/> + </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Delivery_viewAggregatedItemList</string> </value> + </item> + <item> + <key> <string>method</string> </key> + <value> <string>POST</string> </value> + </item> + <item> + <key> <string>name</string> </key> + <value> <string>Delivery_viewAggregatedItemList</string> </value> + </item> + <item> + <key> <string>pt</string> </key> + <value> <string>form_view</string> </value> + </item> + <item> + <key> <string>row_length</string> </key> + <value> <int>4</int> </value> + </item> + <item> + <key> <string>stored_encoding</string> </key> + <value> <string>UTF-8</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Aggregated Items</string> </value> + </item> + <item> + <key> <string>unicode_mode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>update_action</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml new file mode 100644 index 0000000000000000000000000000000000000000..e6bf60dd84aac760f59b6e5b9da7a8e2084f9b2b --- /dev/null +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox.xml @@ -0,0 +1,598 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ListBox" module="Products.ERP5Form.ListBox"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>listbox</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>all_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>anchor</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>domain_root_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>domain_tree</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>global_attributes</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>lines</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>list_action</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>meta_types</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>portal_types</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>report_root_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>report_tree</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>search</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>search_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>select</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>selection_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>sort_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>stat_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>stat_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>untranslatable_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>url_columns</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>all_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>anchor</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>domain_root_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>domain_tree</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>global_attributes</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>lines</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>list_action</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>meta_types</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>portal_types</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>report_root_list</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>report_tree</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>search</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>search_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>select</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>selection_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>sort_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>stat_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>stat_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>untranslatable_columns</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>url_columns</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>all_columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>anchor</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>columns</string> </key> + <value> + <list> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>reference</string> + <string>Reference</string> + </tuple> + <tuple> + <string>Item_getResourceTitle</string> + <string>Resource</string> + </tuple> + <tuple> + <string>quantity</string> + <string>Quantity</string> + </tuple> + <tuple> + <string>variation_category_item_list</string> + <string>Variation</string> + </tuple> + <tuple> + <string>translated_validation_state_title</string> + <string>Simulation State</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default_params</string> </key> + <value> + <list> + <tuple> + <string>checked_permission</string> + <string>View</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>domain_root_list</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>domain_tree</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>editable_columns</string> </key> + <value> + <list> + <tuple> + <string>quantity</string> + <string>Quantity</string> + </tuple> + <tuple> + <string>variation_category_item_list</string> + <string>Variation</string> + </tuple> + </list> + </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>global_attributes</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>lines</string> </key> + <value> <int>20</int> </value> + </item> + <item> + <key> <string>list_action</string> </key> + <value> <string>list</string> </value> + </item> + <item> + <key> <string>list_method</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> + </item> + <item> + <key> <string>meta_types</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>page_template</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>portal_types</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>report_root_list</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>report_tree</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>search</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>search_columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>select</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>selection_name</string> </key> + <value> <string>item_tracking_selection</string> </value> + </item> + <item> + <key> <string>sort</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>sort_columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>stat_columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>stat_method</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Item Tracking</string> </value> + </item> + <item> + <key> <string>untranslatable_columns</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>url_columns</string> </key> + <value> + <list/> + </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: preferences.getPreference(\'preferred_listbox_view_mode_line_count\', 15)</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +string:Base_viewListMode?proxy_form_id=${form/getId}&proxy_field_id=${field/getId} + +]]></string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <global name="Method" module="Products.Formulator.MethodField"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>method_name</string> </key> + <value> <string>Delivery_getAggregatedItemValueList</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_viewAggregatedItemList/listbox_history.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_history.xml similarity index 100% rename from bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_viewAggregatedItemList/listbox_history.xml rename to bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_history.xml diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_viewAggregatedItemList/listbox_quantity.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_quantity.xml similarity index 100% rename from bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_viewAggregatedItemList/listbox_quantity.xml rename to bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_quantity.xml diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_viewAggregatedItemList/listbox_variation_category_item_list.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml similarity index 100% rename from bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_viewAggregatedItemList/listbox_variation_category_item_list.xml rename to bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/listbox_variation_category_item_list.xml diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_viewAggregatedItemList/my_title.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/my_title.xml similarity index 100% rename from bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_viewAggregatedItemList/my_title.xml rename to bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList/my_title.xml diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision index 97a55e1d749c6ac7c783778b6ea2d19cb770909d..0fd0714a51f10639eab0e6a0121977179a7b458a 100644 --- a/bt5/erp5_item/bt/revision +++ b/bt5/erp5_item/bt/revision @@ -1 +1 @@ -101 \ No newline at end of file +103 \ No newline at end of file