[Erp5-report] r21321 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jun 4 19:44:03 CEST 2008
Author: rafael
Date: Wed Jun 4 19:44:02 2008
New Revision: 21321
URL: http://svn.erp5.org?rev=21321&view=rev
Log:
Improved Order/Delivery creation Fast Input
Modified:
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml
erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
erp5/trunk/bt5/erp5_item/bt/revision
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml?rev=21321&r1=21320&r2=21321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination.xml Wed Jun 4 19:44:02 2008
@@ -64,7 +64,7 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
+ <key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -87,7 +87,7 @@
<value> <string>Item_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>items</string> </key>
+ <key> <string>items</string> </key>
<value>
<list/>
</value>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml?rev=21321&r1=21320&r2=21321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_destination_section.xml Wed Jun 4 19:44:02 2008
@@ -64,7 +64,7 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
+ <key> <string>items</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -87,7 +87,7 @@
<value> <string>Item_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>items</string> </key>
+ <key> <string>items</string> </key>
<value>
<list/>
</value>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml?rev=21321&r1=21320&r2=21321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_reference.xml Wed Jun 4 19:44:02 2008
@@ -83,7 +83,7 @@
<value> <string>Item_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
+ <key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml?rev=21321&r1=21320&r2=21321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/ItemModule_createRelatedAffectationFormDialog/your_stop_date.xml Wed Jun 4 19:44:02 2008
@@ -12,7 +12,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>required</string>
+ </list>
</value>
</item>
<item>
@@ -85,6 +87,10 @@
<item>
<key> <string>form_id</string> </key>
<value> <string>Item_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>target</string> </key>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml?rev=21321&r1=21320&r2=21321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationFormDialog.xml Wed Jun 4 19:44:02 2008
@@ -53,6 +53,16 @@
<value> <string>Item_createRelatedAffectationValidate</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>
@@ -96,10 +106,7 @@
<value>
<list>
<string>my_reference</string>
- <string>my_quantity_unit</string>
<string>my_resource</string>
- <string>your_source</string>
- <string>your_source_section</string>
</list>
</value>
</item>
@@ -118,6 +125,7 @@
<value>
<list>
<string>my_quantity</string>
+ <string>my_quantity_unit</string>
<string>your_portal_type</string>
</list>
</value>
@@ -159,7 +167,7 @@
</item>
<item>
<key> <string>update_action</string> </key>
- <value> <string>Item_createRelatedAffectationUpdate</string> </value>
+ <value> <string>Item_createAffectationFormDialog</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml?rev=21321&r1=21320&r2=21321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_createRelatedAffectationValidate.xml Wed Jun 4 19:44:02 2008
@@ -65,29 +65,13 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-# Check data validity\n
-error_count = 0\n
-#error_count = context.Item_createRelatedAffectationUpdate(destination, destination_section,portal_type,site_suggestion,source,source_section,stop_date,title,batch_mode=1, **kw)\n
-#context.log(\'error_count\',error_count)\n
-context.log(\'portal_type\',portal_type)\n
-if portal_type not in (\'Sale Packing List\'):\n
- if error_count > 0:\n
- return context.Item_createRelatedAffectationUpdate(destination,\\\n
- destination_section, \\\n
- portal_type,\\\n
- site_suggestion,\\\n
- source, \\\n
- source_section, \\\n
- stop_date,title, \\\n
- batch_mode=0, **kw)\n
+ <value> <string># Check data validity\n
+source = context.Item_getCurrentSiteValue()\n
+source_section = context.Item_getCurrentOwnerTitle(with_title=0)\n
\n
property_dict = {\'title\':title,\n
\'destination_section\' : destination_section,\n
\'destination\' : destination, \n
- \'source_section\' : source_section,\n
- \'source\' : source,\n
\'stop_date\' : stop_date,\n
\'start_date\' : start_date,\n
\'portal_type\' : portal_type, }\n
@@ -96,7 +80,6 @@
line_portal_type = \'%s Line\' % portal_type\n
\n
pl_dict = {}\n
-#context.log(\'property_dict:\',property_dict)\n
for k,v in property_dict.items():\n
pl_dict[k]=v\n
\n
@@ -109,12 +92,12 @@
pl_line_dict[\'quantity_unit\'] = quantity_unit\n
\n
pl_value = module.newContent(**pl_dict)\n
+pl_value.setSourceValue(source)\n
+pl_value.setSourceSectionValue(source)\n
pl_line_value = pl_value.newContent(**pl_line_dict)\n
\n
context.REQUEST[\'RESPONSE\'].redirect(\'/\'.join(pl_value.getPhysicalPath()))\n
-
-
-]]></string> </value>
+</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -136,7 +119,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>destination=None,destination_section=None,portal_type=None,site_suggestion=None,source=None,source_section=None,start_date=None,quantity=None,stop_date=None,title=\'\',**kw</string> </value>
+ <value> <string>destination=None,destination_section=None,portal_type=None,site_suggestion=None,start_date=None,quantity=None,start_date=None,stop_date=None,title=\'\',quantity_unit=None,**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -166,17 +149,17 @@
<string>destination_section</string>
<string>portal_type</string>
<string>site_suggestion</string>
+ <string>start_date</string>
+ <string>quantity</string>
+ <string>start_date</string>
+ <string>stop_date</string>
+ <string>title</string>
+ <string>quantity_unit</string>
+ <string>kw</string>
+ <string>_getattr_</string>
+ <string>context</string>
<string>source</string>
<string>source_section</string>
- <string>start_date</string>
- <string>quantity</string>
- <string>stop_date</string>
- <string>title</string>
- <string>kw</string>
- <string>error_count</string>
- <string>_getattr_</string>
- <string>context</string>
- <string>_apply_</string>
<string>property_dict</string>
<string>module</string>
<string>line_portal_type</string>
@@ -186,7 +169,7 @@
<string>v</string>
<string>_write_</string>
<string>pl_line_dict</string>
- <string>quantity_unit</string>
+ <string>_apply_</string>
<string>pl_value</string>
<string>pl_line_value</string>
<string>_getitem_</string>
@@ -210,8 +193,8 @@
<none/>
<none/>
<none/>
- <none/>
<string></string>
+ <none/>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml?rev=21321&r1=21320&r2=21321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/Item_getCurrentSiteValue.xml Wed Jun 4 19:44:02 2008
@@ -68,7 +68,7 @@
<value> <string>from DateTime import DateTime\n
\n
date = DateTime()\n
-last_affectation_list = context.portal_simulation.getTrackingList(item=context.getRelativeUrl(), at_date=date)\n
+last_affectation_list = context.portal_simulation.getCurrentTrackingList(item=context.getRelativeUrl(), at_date=date)\n
#context.log(\'last_affectation_list\',len(last_affectation_list))\n
if len(last_affectation_list) == 0:\n
return None\n
Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=21321&r1=21320&r2=21321&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision Wed Jun 4 19:44:02 2008
@@ -1,1 +1,1 @@
-38
+40
More information about the Erp5-report
mailing list