[Erp5-report] r45548 vincent - in /erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Apr 18 18:14:11 CEST 2011
Author: vincent
Date: Mon Apr 18 18:14:10 2011
New Revision: 45548
URL: http://svn.erp5.org?rev=45548&view=rev
Log:
More changes completing r45536 & r45544.
Removed:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox_selection.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_fastInputForm.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_fastInputForm.xml
Modified:
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Delivery_saveContainerFastInputLine.xml
erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm.xml?rev=45548&r1=45547&r2=45548&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm.xml [utf8] Mon Apr 18 18:14:10 2011
@@ -85,7 +85,6 @@
<list>
<string>listbox_quantity</string>
<string>listbox_total_price</string>
- <string>listbox_selection</string>
</list>
</value>
</item>
Removed: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox_selection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox_selection.xml?rev=45547&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox_selection.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox_selection.xml (removed)
@@ -1,168 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="CheckBoxField" module="Products.Formulator.StandardFields"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>listbox_selection</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Selected</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_fastInputForm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_fastInputForm.xml?rev=45547&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_fastInputForm.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_fastInputForm.xml (removed)
@@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="ERP5Form" module="Products.ERP5Form.Form"/>
- </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>CashMovementNewNotEmitted_saveFastInputLine</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string>None</string> </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_quantity</string>
- <string>listbox_total_price</string>
- <string>listbox_selection</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>CashMovementNewNotEmitted_fastInputForm</string> </value>
- </item>
- <item>
- <key> <string>method</string> </key>
- <value> <string>POST</string> </value>
- </item>
- <item>
- <key> <string>name</string> </key>
- <value> <string>CashMovementNewNotEmitted_fastInputForm</string> </value>
- </item>
- <item>
- <key> <string>pt</string> </key>
- <value> <string>form_dialog</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>Save</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>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Delivery_saveContainerFastInputLine.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Delivery_saveContainerFastInputLine.xml?rev=45548&r1=45547&r2=45548&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Delivery_saveContainerFastInputLine.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Delivery_saveContainerFastInputLine.xml [utf8] Mon Apr 18 18:14:10 2011
@@ -76,10 +76,17 @@ if len(old_line)>0:\n
r = context.deleteContent(line_id)\n
\n
cash_container_item_dict = {}\n
-# construct dict of selected container\n
-for listbox_line in listbox:\n
- if listbox_line[\'selection\']==1:\n
- container = context.portal_catalog(uid=listbox_line[\'listbox_key\'])[0].getObject()\n
+unrestricted_catalog = context.CatalogTool_unrestrictedSearchResults\n
+\n
+# retreive selected rows\n
+portal = context.getPortalObject()\n
+list_selection_name = context.REQUEST[\'list_selection_name\']\n
+selection_tool = context.getPortalObject().portal_selections\n
+checked_uid_list = selection_tool.getSelectionCheckedUidsFor(list_selection_name)\n
+context.log("Checked uid list: %s" % checked_uid_list)\n
+\n
+for checked_uid in checked_uid_list:\n
+ container = unrestricted_catalog(uid=checked_uid)[0].getObject()\n
container_dict = {}\n
container_dict["reference"] = container.getReference()\n
container_dict["range_start"] = container.getCashNumberRangeStart()\n
@@ -151,6 +158,8 @@ for cash_container in cash_container_ite
cell.setMembershipCriterionCategoryList(container_dict[\'variation_category\'])\n
cell.edit(force_update = 1,\n
price = movement_line.getResourceValue().getBasePrice())\n
+ # Call getPrice so lines are modified before being stored, not on indexation. Sigh.\n
+ container_line.getPrice()\n
\n
request = context.REQUEST\n
redirect_url = \'%s/view?%s\' % ( context.absolute_url()\n
@@ -166,6 +175,14 @@ request[ \'RESPONSE\' ].redirect( redire
<value> <string>listbox=None, line_portal_type=None,container_line_portal_type=None,**kw</string> </value>
</item>
<item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
<key> <string>id</string> </key>
<value> <string>Delivery_saveContainerFastInputLine</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml?rev=45548&r1=45547&r2=45548&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml [utf8] Mon Apr 18 18:14:10 2011
@@ -50,7 +50,8 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>def error(msg):\n
+ <value> <string>from zExceptions import Redirect\n
+def error(msg):\n
raise Redirect(\'%s/view?portal_status_message=%s\' % (\n
context.absolute_url(),\n
context.Base_translateString(msg))\n
@@ -91,7 +92,7 @@ for o in context.portal_simulation.getCu
continue\n
container_line = container_line_list[0]\n
append({\n
- \'uid\': \'new_%s\' % (cash_container.getUid(), ),\n
+ \'uid\': cash_container.getUid(),\n
\'reference\': cash_container.getReference(),\n
\'cash_number_range_start\': cash_container.getCashNumberRangeStart(),\n
\'cash_number_range_stop\': cash_container.getCashNumberRangeStop(),\n
Removed: erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_fastInputForm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_fastInputForm.xml?rev=45547&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_fastInputForm.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_fastInputForm.xml (removed)
@@ -1,142 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="ERP5Form" module="Products.ERP5Form.Form"/>
- </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>MonetaryIssue_saveFastInputLine</string> </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_quantity</string>
- <string>listbox_total_price</string>
- <string>listbox_selection</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>MonetaryIssue_fastInputForm</string> </value>
- </item>
- <item>
- <key> <string>method</string> </key>
- <value> <string>POST</string> </value>
- </item>
- <item>
- <key> <string>name</string> </key>
- <value> <string>MonetaryIssue_fastInputForm</string> </value>
- </item>
- <item>
- <key> <string>pt</string> </key>
- <value> <string>form_dialog</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>Save</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>
More information about the Erp5-report
mailing list