Skip to content

erp5
erp5
Commit 7db12d78 authored by Mame Coumba Sall's avatar Mame Coumba Sall
Browse files
Options

2009-05-25 mame 

*rename Order_viewAggregatedItemList
*modified DeliveryLine_createItemList to avoid creation of more cells than what's actually needed

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27152 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 00f13e99
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 763 additions and 10 deletions
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
View file @ 7db12d78
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
item_list = []\n item_list = []\n
request = context.REQUEST\n request = context.REQUEST\n
total_quantity = 0.0\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 if context.getPortalType()==\'Purchase Packing List Line\':\n
cell_portal_type = \'Purchase Packing List Cell\'\n cell_portal_type = \'Purchase Packing List Cell\'\n
elif context.getPortalType()==\'Purchase Order Line\' :\n elif context.getPortalType()==\'Purchase Order Line\' :\n
...@@ -82,8 +82,9 @@ for line in kw.get(\'listbox\'):\n ...@@ -82,8 +82,9 @@ for line in kw.get(\'listbox\'):\n
item_list.append(item) \n item_list.append(item) \n
\n \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 if line.has_key("variation_category_list") and line[\'variation_category_list\'] not in(\'\',[]):\n
context.setVariationCategoryList(context.getVariationCategoryList() + list((line[\'variation_category_list\'])))\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 if line.has_key("variation_category_list") and line[\'variation_category_list\'] not in(\'\',None):\n
cell_key = list((line[\'variation_category_list\']))\n cell_key = list((line[\'variation_category_list\']))\n
quantity = line[\'quantity\']\n quantity = line[\'quantity\']\n
...@@ -162,11 +163,8 @@ return context.Base_redirect(form_id, keep_items=dict(\n ...@@ -162,11 +163,8 @@ return context.Base_redirect(form_id, keep_items=dict(\n
<string>None</string> <string>None</string>
<string>module</string> <string>module</string>
<string>item</string> <string>item</string>
<string>append</string> <string>filter</string>
<string>$append0</string> <string>new_list</string>
<string>range</string>
<string>len</string>
<string>i</string>
<string>list</string> <string>list</string>
<string>cell_key</string> <string>cell_key</string>
<string>quantity</string> <string>quantity</string>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Order_getAggregatedItemValueList.xml → bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_getAggregatedItemValueList.xml
View file @ 7db12d78
...@@ -136,7 +136,7 @@ return [context.portal_catalog.getObject(uid) for uid in selection_uid_list]\n ...@@ -136,7 +136,7 @@ return [context.portal_catalog.getObject(uid) for uid in selection_uid_list]\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Order_getAggregatedItemValueList</string> </value> <value> <string>Delivery_getAggregatedItemValueList</string> </value>
</item> </item>
<item> <item>
<key> <string>warnings</string> </key> <key> <string>warnings</string> </key>
......
bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Delivery_viewAggregatedItemList.xml 0 → 100644
View file @ 7db12d78
<?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>
bt5/erp5_item/bt/revision
View file @ 7db12d78
101 103
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7