[Erp5-report] r27913 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jul 3 15:51:24 CEST 2009
Author: mame
Date: Fri Jul 3 15:51:23 2009
New Revision: 27913
URL: http://svn.erp5.org?rev=27913&view=rev
Log:
2009-07-03 mame
*create new script to set value of reference
*modified validator so that EAN13 code is only completed when the specific properties exist
*modified script so that it searches for item reference before creating the item
Added:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.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.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml
erp5/trunk/bt5/erp5_item/bt/revision
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=27913&r1=27912&r2=27913&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] Fri Jul 3 15:51:23 2009
@@ -91,14 +91,23 @@
for line in kw.get(\'listbox\'):\n
\n
if line.has_key(\'listbox_key\') and (line[\'title\'] or line[\'reference\'] not in (\'\', None)):\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
- quantity=line[\'quantity\'],\n
- quantity_unit=context.getQuantityUnit(),\n
- **item_property_dict)\n
- item.validate()\n
+ item = context.portal_catalog.getResultValue(\n
+ portal_type=\'Item\',\n
+ reference=line[\'reference\'])\n
+ if item is not None:\n
+ msg = translateString("Reference Defined On Line ${line_id} already exists",\n
+ mapping={\'line_id\': line[\'listbox_key\']})\n
+ return context.Base_redirect(form_id, keep_items=dict(\n
+ portal_status_message=msg))\n
+ else:\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
+ quantity=line[\'quantity\'],\n
+ quantity_unit=context.getQuantityUnit(),\n
+ **item_property_dict)\n
+ item.validate()\n
\n
line_variation_category_list = []\n
for variation in (\n
@@ -226,9 +235,10 @@
<string>base_id</string>
<string>line</string>
<string>None</string>
+ <string>item</string>
+ <string>msg</string>
<string>module</string>
<string>_apply_</string>
- <string>item</string>
<string>line_variation_category_list</string>
<string>variation</string>
<string>cell_found</string>
Added: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.xml?rev=27913&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.xml (added)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_setDefaultReference.xml [utf8] Fri Jul 3 15:51:23 2009
@@ -1,0 +1,123 @@
+<?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>return request.get(\'field_listbox_reference_%s\' % cell.uid)\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>request</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>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>request</string>
+ <string>_getattr_</string>
+ <string>cell</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_setDefaultReference</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_validateItemCreationDialogReference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml?rev=27913&r1=27912&r2=27913&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] Fri Jul 3 15:51:23 2009
@@ -55,16 +55,20 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
-if editor and len(request.get("field_listbox_reference_%s" % request.cell.uid))<=13:\n
+dialog = getattr(context, dialog_id)\n
+if dialog.has_field(\'your_item_extra_property_list\') and editor and len(request.get("field_listbox_reference_%s" % request.cell.uid))<=6:\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
+\n
if test_result ==True:\n
request.form["field_listbox_reference_%s" % request.cell.uid] = reference\n
+ request.set("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
+ elif test_result == False:\n
+ return False \n
return True\n
@@ -78,7 +82,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>editor, request</string> </value>
+ <value> <string>editor, request,dialog_id=\'DeliveryLine_viewItemCreationDialog\'</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -98,7 +102,7 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>2</int> </value>
+ <value> <int>3</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -106,8 +110,12 @@
<tuple>
<string>editor</string>
<string>request</string>
+ <string>dialog_id</string>
+ <string>getattr</string>
+ <string>context</string>
+ <string>dialog</string>
+ <string>_getattr_</string>
<string>len</string>
- <string>_getattr_</string>
<string>reference</string>
<string>test_result</string>
<string>True</string>
@@ -115,7 +123,6 @@
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
- <string>context</string>
<string>x</string>
<string>result</string>
<string>False</string>
@@ -130,7 +137,9 @@
<item>
<key> <string>func_defaults</string> </key>
<value>
- <none/>
+ <tuple>
+ <string>DeliveryLine_viewItemCreationDialog</string>
+ </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml?rev=27913&r1=27912&r2=27913&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox.xml [utf8] Fri Jul 3 15:51:23 2009
@@ -351,9 +351,68 @@
<string>Reference</string>
</tuple>
<tuple>
+ <string>line_variation_category_list</string>
+ <string>Variation 1</string>
+ </tuple>
+ <tuple>
+ <string>column_variation_category_list</string>
+ <string>Variation 2</string>
+ </tuple>
+ <tuple>
+ <string>tab_variation_category_list</string>
+ <string>Variation 3</string>
+ </tuple>
+ <tuple>
<string>quantity</string>
<string>Quantity</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/>
+ </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>title</string>
+ <string>Title</string>
+ </tuple>
+ <tuple>
+ <string>reference</string>
+ <string>Reference</string>
+ </tuple>
<tuple>
<string>line_variation_category_list</string>
<string>Variation 1</string>
@@ -366,68 +425,9 @@
<string>tab_variation_category_list</string>
<string>Variation 3</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/>
- </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>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>reference</string>
- <string>Reference</string>
- </tuple>
<tuple>
<string>quantity</string>
<string>Quantity</string>
- </tuple>
- <tuple>
- <string>line_variation_category_list</string>
- <string>Variation 1</string>
- </tuple>
- <tuple>
- <string>column_variation_category_list</string>
- <string>Variation 2</string>
- </tuple>
- <tuple>
- <string>tab_variation_category_list</string>
- <string>Variation 3</string>
</tuple>
</list>
</value>
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=27913&r1=27912&r2=27913&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] Fri Jul 3 15:51:23 2009
@@ -13,6 +13,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>default</string>
<string>display_maxwidth</string>
<string>display_width</string>
<string>external_validator</string>
@@ -67,6 +68,24 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>display_maxwidth</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>display_width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
@@ -78,6 +97,10 @@
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -85,6 +108,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>display_maxwidth</string> </key>
<value> <int>13</int> </value>
@@ -96,7 +123,7 @@
<item>
<key> <string>external_validator</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -124,6 +151,22 @@
<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: cell.DeliveryLine_setDefaultReference()</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=27913&r1=27912&r2=27913&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Fri Jul 3 15:51:23 2009
@@ -1,1 +1,1 @@
-173
+174
More information about the Erp5-report
mailing list