Skip to content

erp5
erp5
Commit a04edc70 authored by Vincent Pelletier's avatar Vincent Pelletier
Browse files
Options

More changes completing r45536 & r45544. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@45548 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 488ee27d
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 463 deletions
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm.xml
View file @ a04edc70
...@@ -85,7 +85,6 @@ ...@@ -85,7 +85,6 @@
<list> <list>
<string>listbox_quantity</string> <string>listbox_quantity</string>
<string>listbox_total_price</string> <string>listbox_total_price</string>
<string>listbox_selection</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashContainer_fastInputForm/listbox_selection.xml deleted 100644 → 0
View file @ 488ee27d
<?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>
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/CashMovementNewNotEmitted_fastInputForm.xml deleted 100644 → 0
View file @ 488ee27d
<?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>
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/Delivery_saveContainerFastInputLine.xml
View file @ a04edc70
...@@ -76,10 +76,17 @@ if len(old_line)>0:\n ...@@ -76,10 +76,17 @@ if len(old_line)>0:\n
r = context.deleteContent(line_id)\n r = context.deleteContent(line_id)\n
\n \n
cash_container_item_dict = {}\n cash_container_item_dict = {}\n
# construct dict of selected container\n unrestricted_catalog = context.CatalogTool_unrestrictedSearchResults\n
for listbox_line in listbox:\n \n
if listbox_line[\'selection\']==1:\n # retreive selected rows\n
container = context.portal_catalog(uid=listbox_line[\'listbox_key\'])[0].getObject()\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 = {}\n
container_dict["reference"] = container.getReference()\n container_dict["reference"] = container.getReference()\n
container_dict["range_start"] = container.getCashNumberRangeStart()\n container_dict["range_start"] = container.getCashNumberRangeStart()\n
...@@ -151,6 +158,8 @@ for cash_container in cash_container_item_dict.keys():\n ...@@ -151,6 +158,8 @@ for cash_container in cash_container_item_dict.keys():\n
cell.setMembershipCriterionCategoryList(container_dict[\'variation_category\'])\n cell.setMembershipCriterionCategoryList(container_dict[\'variation_category\'])\n
cell.edit(force_update = 1,\n cell.edit(force_update = 1,\n
price = movement_line.getResourceValue().getBasePrice())\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 \n
request = context.REQUEST\n request = context.REQUEST\n
redirect_url = \'%s/view?%s\' % ( context.absolute_url()\n redirect_url = \'%s/view?%s\' % ( context.absolute_url()\n
...@@ -165,6 +174,14 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n ...@@ -165,6 +174,14 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>listbox=None, line_portal_type=None,container_line_portal_type=None,**kw</string> </value> <value> <string>listbox=None, line_portal_type=None,container_line_portal_type=None,**kw</string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Delivery_saveContainerFastInputLine</string> </value> <value> <string>Delivery_saveContainerFastInputLine</string> </value>
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/ListBox_listCashContainers.xml
View file @ a04edc70
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <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 raise Redirect(\'%s/view?portal_status_message=%s\' % (\n
context.absolute_url(),\n context.absolute_url(),\n
context.Base_translateString(msg))\n context.Base_translateString(msg))\n
...@@ -91,7 +92,7 @@ for o in context.portal_simulation.getCurrentTrackingList(**tracking_kw):\n ...@@ -91,7 +92,7 @@ for o in context.portal_simulation.getCurrentTrackingList(**tracking_kw):\n
continue\n continue\n
container_line = container_line_list[0]\n container_line = container_line_list[0]\n
append({\n append({\n
\'uid\': \'new_%s\' % (cash_container.getUid(), ),\n \'uid\': cash_container.getUid(),\n
\'reference\': cash_container.getReference(),\n \'reference\': cash_container.getReference(),\n
\'cash_number_range_start\': cash_container.getCashNumberRangeStart(),\n \'cash_number_range_start\': cash_container.getCashNumberRangeStart(),\n
\'cash_number_range_stop\': cash_container.getCashNumberRangeStop(),\n \'cash_number_range_stop\': cash_container.getCashNumberRangeStop(),\n
......
bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryIssue_fastInputForm.xml deleted 100644 → 0
View file @ 488ee27d
<?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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7