[Erp5-report] r27665 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jun 18 18:06:26 CEST 2009
Author: mame
Date: Thu Jun 18 18:06:23 2009
New Revision: 27665
URL: http://svn.erp5.org?rev=27665&view=rev
Log:
2009-06-18 mame
*add new prefix already defined for reference
*modified so that reference is calculated according to EAN13 format
Added:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.xml
Modified:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml
erp5/trunk/bt5/erp5_item/bt/revision
Added: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.xml?rev=27665&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.xml (added)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_calculateReferencePrefix.xml [utf8] Thu Jun 18 18:06:23 2009
@@ -1,0 +1,129 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>from Products.ERP5Type.Message import translateString\n
+from DateTime import DateTime\n
+\n
+prefix_reference = DateTime().strftime(\'1%d%m%y\')\n
+return prefix_reference\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>Products.ERP5Type.Message</string>
+ <string>translateString</string>
+ <string>DateTime</string>
+ <string>_getattr_</string>
+ <string>prefix_reference</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>DeliveryLine_calculateReferencePrefix</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml?rev=27665&r1=27664&r2=27665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml [utf8] Thu Jun 18 18:06:23 2009
@@ -94,7 +94,7 @@
module = context.getDefaultModule(item_portal_type)\n
item = module.newContent(portal_type=item_portal_type,\n
title=line[\'title\'],\n
- reference ="1%s%s" % (now, line["reference"].zfill(6)),\n
+ reference = line["reference"],\n
quantity=line[\'quantity\'],\n
quantity_unit=context.getQuantityUnit(),\n
**item_property_dict)\n
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml?rev=27665&r1=27664&r2=27665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml [utf8] Thu Jun 18 18:06:23 2009
@@ -53,12 +53,22 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>result = [x.getObject() for x in context.portal_catalog(portal_type = request.get("field_your_type"),\n
- reference= request.get(\'field_listbox_reference_%s\' % request.cell.uid))]\n
-if editor and result !=[]:\n
- return False\n
+ <value> <string encoding="cdata"><![CDATA[
+
+if editor and len(request.get("field_listbox_reference_%s" % request.cell.uid))<=13:\n
+ reference = "%s%s" % (request.get("field_your_prefix_reference"), request.get(\'field_listbox_reference_%s\' % request.cell.uid).zfill(6)) \n
+ test_result = request.cell.Base_validateEan13Code(reference,request)\n
+ if test_result ==True:\n
+ request.form["field_listbox_reference_%s" % request.cell.uid] = reference\n
+ result = [x.getObject() for x in context.portal_catalog(portal_type = request.get("field_your_type"),\n
+ reference= reference)]\n
+ if (result !=[] or test_result ==False ):\n
+ return False\n
+\n
return True\n
-</string> </value>
+
+
+]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -96,15 +106,19 @@
<tuple>
<string>editor</string>
<string>request</string>
+ <string>len</string>
+ <string>_getattr_</string>
+ <string>reference</string>
+ <string>test_result</string>
+ <string>True</string>
+ <string>_write_</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
- <string>_getattr_</string>
<string>context</string>
<string>x</string>
<string>result</string>
<string>False</string>
- <string>True</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml?rev=27665&r1=27664&r2=27665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml [utf8] Thu Jun 18 18:06:23 2009
@@ -87,7 +87,7 @@
<dictionary>
<item>
<key> <string>display_maxwidth</string> </key>
- <value> <int>6</int> </value>
+ <value> <int>13</int> </value>
</item>
<item>
<key> <string>display_width</string> </key>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=27665&r1=27664&r2=27665&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Thu Jun 18 18:06:23 2009
@@ -1,1 +1,1 @@
-171
+173
More information about the Erp5-report
mailing list