Commit 70183ef3 authored by Aurel's avatar Aurel

many form fix due to order and selection

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10796 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 67f61b3d
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -87,12 +84,6 @@
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -87,12 +84,6 @@
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -445,6 +445,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -486,7 +490,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>cash_incident_incoming_line_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
......@@ -445,6 +445,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -486,7 +490,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>cash_incident_outgoing_line_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -87,12 +84,6 @@
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -80,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -88,13 +85,7 @@
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_source_total_asset_price</string>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -87,12 +84,6 @@
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -87,12 +84,6 @@
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -445,6 +445,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -486,7 +490,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>classification_survey_outgoing_line_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,11 +77,10 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
<string>listbox_delivery_start_date</string>
</list>
</value>
</item>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -87,12 +84,6 @@
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -87,12 +84,6 @@
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -83,11 +83,11 @@ def isSameSet(a, b):\n
if len(a) != len(b) : return 0\n
return 1\n
\n
# remove existing lines\n
old_line = [x.getObject() for x in context.searchFolder(portal_type=[line_portal_type, container_line_portal_type])]\n
# remove previous line\n
old_line = [x.getObject().getId() for x in context.searchFolder(portal_type=[line_portal_type, container_line_portal_type])]\n
if len(old_line)>0:\n
for object_list in old_line:\n
context.deleteContent(object_list.getId())\n
for line_id in old_line:\n
r = context.deleteContent(line_id)\n
\n
cash_container_item_dict = {}\n
# construct dict of selected container\n
......@@ -181,6 +181,12 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
<none/>
</value>
</item>
<item>
<key> <string>_dav_writelocks</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
......@@ -238,7 +244,8 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
<string>x</string>
<string>old_line</string>
<string>len</string>
<string>object_list</string>
<string>line_id</string>
<string>r</string>
<string>cash_container_item_dict</string>
<string>listbox_line</string>
<string>_getitem_</string>
......@@ -287,4 +294,25 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Persistence</string>
<string>PersistentMapping</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_container</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -85,7 +85,7 @@
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_delivery_start_date</string>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,11 +77,10 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
<string>listbox_source_total_asset_price</string>
</list>
</value>
</item>
......
......@@ -67,7 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -78,13 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -92,7 +85,7 @@
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_source_total_asset_price</string>
......
......@@ -67,9 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -87,12 +84,6 @@
</list>
</value>
</item>
<item>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
......@@ -103,18 +94,6 @@
</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>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -475,7 +475,7 @@
</item>
<item>
<key> <string>list_action</string> </key>
<value> <string>MonetaryIssueModule_cviewMonetaryIssueList</string> </value>
<value> <string>MonetaryIssueModule_viewMonetaryIssueList</string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
......@@ -489,6 +489,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -526,7 +530,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>monetray_issue_list_selection</string> </value>
<value> <string>monetary_issue_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
......@@ -457,6 +457,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -520,7 +524,36 @@
<item>
<key> <string>url_columns</string> </key>
<value>
<list/>
<list>
<tuple>
<string>selection</string>
<string></string>
</tuple>
<tuple>
<string>reference</string>
<string></string>
</tuple>
<tuple>
<string>cash_number_range_start</string>
<string></string>
</tuple>
<tuple>
<string>cash_number_range_stop</string>
<string></string>
</tuple>
<tuple>
<string>resource_translated_title</string>
<string></string>
</tuple>
<tuple>
<string>quantity</string>
<string></string>
</tuple>
<tuple>
<string>total_price</string>
<string></string>
</tuple>
</list>
</value>
</item>
</dictionary>
......
......@@ -68,7 +68,7 @@
<value>
<list>
<string>left</string>
<string>rigth</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
......@@ -115,7 +115,7 @@
</value>
</item>
<item>
<key> <string>rigth</string> </key>
<key> <string>right</string> </key>
<value>
<list>
<string>my_start_date</string>
......
......@@ -445,6 +445,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -486,7 +490,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>monetary_issue_view_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
......@@ -426,6 +426,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -463,7 +467,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
<value> <string>monetary_issue_container_list_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -68,7 +68,7 @@
<value>
<list>
<string>left</string>
<string>rigth</string>
<string>right</string>
<string>center</string>
<string>bottom</string>
<string>hidden</string>
......@@ -116,7 +116,7 @@
</value>
</item>
<item>
<key> <string>rigth</string> </key>
<key> <string>right</string> </key>
<value>
<list>
<string>my_start_date</string>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,17 +77,17 @@
<value>
<dictionary>
<item>
<key> <string>hidden</string> </key>
<key> <string>bottom</string> </key>
<value>
<list/>
<list>
<string>listbox</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>my_import_file</string>
</list>
<list/>
</value>
</item>
</dictionary>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -67,7 +67,8 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
</item>
......@@ -76,15 +77,19 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
<string>listbox_delivery_start_date</string>
<string>listbox_source_total_asset_price</string>
</list>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
</dictionary>
</value>
</item>
......
......@@ -67,7 +67,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
......@@ -78,23 +77,15 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
<string>listbox_source_total_asset_price</string>
<string>listbox_delivery_start_date</string>
</list>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_destination_logical_path</string>
......
......@@ -92,7 +92,7 @@ if context.getCashStatus() == \'to_sort\' or context.getCashStatus() == \'cancel
elif context.getEmissionLetter() in site_letter:\n
return \'%s/caveau/reserve/encaisse_des_billets_et_monnaies\' %(site,)\n
else:\n
return \'%s/caveau/externes/encaisse_des_externes\' %(site,)\n
return \'%s/caveau/auxiliaire/encaisse_des_externes\' %(site,)\n
</string> </value>
</item>
<item>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,11 +77,10 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
<string>listbox_delivery_start_date</string>
</list>
</value>
</item>
......
......@@ -67,7 +67,7 @@
<key> <string>group_list</string> </key>
<value>
<list>
<string>Default</string>
<string>bottom</string>
<string>hidden</string>
</list>
</value>
......@@ -77,7 +77,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......
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