From 6b6cec60235a82fbf23295a0800e3667384a36de Mon Sep 17 00:00:00 2001 From: Mame Coumba Sall <mame@nexedi.com> Date: Tue, 16 Jun 2009 18:32:17 +0000 Subject: [PATCH] 2009-06-16 mame *modified so that reference of item is always of form EAN-13 code git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27621 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_item/DeliveryLine_createItemList.xml | 7 +++++-- .../listbox_reference.xml | 5 +++++ .../portal_skins/erp5_item/Item_view/my_reference.xml | 8 +++++++- bt5/erp5_item/bt/revision | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) 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 5ec46bf6e1..bbacf45ff2 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 @@ -56,10 +56,11 @@ <value> <string encoding="cdata"><![CDATA[ from Products.ERP5Type.Message import translateString\n +from DateTime import DateTime\n item_list = []\n request = context.REQUEST\n total_quantity = 0.0\n -\n +now = DateTime().strftime(\'%d%m%y\')\n item_portal_type = request[\'type\']\n \n if context.getPortalType()==\'Purchase Packing List Line\':\n @@ -93,7 +94,7 @@ for line in kw.get(\'listbox\'):\n module = context.getDefaultModule(item_portal_type)\n item = module.newContent(portal_type=item_portal_type,\n title=line[\'title\'],\n - reference=line[\'reference\'],\n + reference ="1%s%s" % (now, line["reference"].zfill(6)),\n quantity=line[\'quantity\'],\n quantity_unit=context.getQuantityUnit(),\n **item_property_dict)\n @@ -201,11 +202,13 @@ return context.Base_redirect(form_id, keep_items=dict(\n <string>kw</string> <string>Products.ERP5Type.Message</string> <string>translateString</string> + <string>DateTime</string> <string>item_list</string> <string>_getattr_</string> <string>context</string> <string>request</string> <string>total_quantity</string> + <string>now</string> <string>_getitem_</string> <string>item_portal_type</string> <string>cell_portal_type</string> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml index b001f48802..1c1dad3827 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml @@ -13,6 +13,7 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>display_maxwidth</string> <string>display_width</string> <string>external_validator</string> <string>title</string> @@ -84,6 +85,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <int>6</int> </value> + </item> <item> <key> <string>display_width</string> </key> <value> <int>20</int> </value> diff --git a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_reference.xml b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_reference.xml index 1de8153237..7ce498416c 100644 --- a/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_reference.xml +++ b/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_view/my_reference.xml @@ -12,7 +12,9 @@ <item> <key> <string>delegated_list</string> </key> <value> - <list/> + <list> + <string>display_maxwidth</string> + </list> </value> </item> <item> @@ -72,6 +74,10 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>display_maxwidth</string> </key> + <value> <int>13</int> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string>my_reference</string> </value> diff --git a/bt5/erp5_item/bt/revision b/bt5/erp5_item/bt/revision index 9a1371776c..6547e41559 100644 --- a/bt5/erp5_item/bt/revision +++ b/bt5/erp5_item/bt/revision @@ -1 +1 @@ -169 \ No newline at end of file +171 \ No newline at end of file -- 2.30.9