Skip to content

erp5
erp5
Commit 345b39d0 authored by Aurel's avatar Aurel
Browse files
Options

many xml changes + some improvement of skins 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8542 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 56871d27
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 67 deletions
bt5/erp5_banking_check/ModuleTemplateItem/check_deposit_module.xml
View file @ 345b39d0
......@@ -454,6 +454,9 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_check/ModuleTemplateItem/check_payment_module.xml
View file @ 345b39d0
......@@ -454,6 +454,9 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_check/ModuleTemplateItem/checkbook_reception_module.xml
View file @ 345b39d0
......@@ -454,6 +454,9 @@
<name>Change proxy roles</name>
<role>Manager</role>
</permission>
<permission type='tuple'>
<name>Change user folder</name>
</permission>
<permission type='tuple'>
<name>Copy or Move</name>
<role>Manager</role>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDelivery_generateCheckDetailInputDialog.xml
View file @ 345b39d0
......@@ -80,6 +80,14 @@ context.log(\'resource\',resource)\n
item_model = context.getPortalObject().restrictedTraverse(resource)\n
context.log(\'item_model\',item_model)\n
\n
# We muste make sure that the selection is not None\n
# or the validator of the Listbox will not work\n
from Products.ERP5Form.Selection import Selection\n
selection = context.portal_selections.getSelectionFor(\'Check_fastInputForm_selection\')\n
if selection is None:\n
selection = Selection()\n
context.portal_selections.setSelectionFor(\'Check_fastInputForm_selection\',selection)\n
\n
global error_value\n
error_value = 0\n
global field_error_dict\n
......@@ -129,6 +137,8 @@ else:\n
else:\n
account = account_list[0]\n
line[\'destination_payment_relative_url\'] = account.getRelativeUrl()\n
destination_trade = account.getParentValue()\n
line[\'destination_trade_relative_url\'] = destination_trade.getRelativeUrl()\n
if reference_range_min in (None,\'\'):\n
message = \'Please set a start number\'\n
generate_error(line,\'reference_range_min\',message)\n
......@@ -240,6 +250,9 @@ else:\n
<string>resource</string>
<string>previous_resource</string>
<string>item_model</string>
<string>Products.ERP5Form.Selection</string>
<string>Selection</string>
<string>selection</string>
<string>error_value</string>
<string>field_error_dict</string>
<string>generate_error</string>
......@@ -262,6 +275,7 @@ else:\n
<string>_getitem_</string>
<string>account</string>
<string>_write_</string>
<string>destination_trade</string>
<string>check_quantity</string>
<string>check_amount_relative_url</string>
<string>check_amount_value</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_getItemModelItemList.xml
View file @ 345b39d0
......@@ -71,7 +71,7 @@
<value> <string>from Products.ERP5Type.Message import Message\n
\n
model_list = [x.getObject() for x in context.checkbook_model_module.searchFolder()]\n
result_list = [(x.getTitle(),x.getRelativeUrl()) for x in model_list]\n
result_list = [(x.getTitle(),x.getRelativeUrl()) for x in model_list if not x.isInsideCheckbook()]\n
return result_list\n
</string> </value>
</item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_getItemModelVariationltemList.xml
View file @ 345b39d0
......@@ -75,7 +75,7 @@ if resource in (None,\'None\'):\n
item_model = context.getPortalObject().restrictedTraverse(resource)\n
context.log(\'CheckDetail_getItemModelVariationltemList item_model\',item_model)\n
\n
return item_model.getVariationRangeCategoryItemList(display_id=\'title\')\n
return item_model.getVariationRangeCategoryItemList(display_id=\'title\',display_base_category=0)\n
</string> </value>
</item>
<item>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_saveFastInputLine.xml
View file @ 345b39d0
......@@ -68,7 +68,9 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># get the list of movement we need to create\n
<value> <string encoding="cdata"><![CDATA[
# get the list of movement we need to create\n
\n
# First call the first scripts wich check many things\n
error_value = context.CheckDelivery_generateCheckDetailInputDialog(\n
......@@ -91,6 +93,8 @@ if item_model.getPortalType()==\'Check\':\n
\n
create_line = 0\n
aggregate_data_list = []\n
context.log(\'CheckDetail_saveFastInputLine, listbox\',listbox)\n
number_of_line_created = 0\n
for line in listbox:\n
add_line = 0\n
quantity = line[\'quantity\']\n
......@@ -108,6 +112,9 @@ for line in listbox:\n
if destination_payment_relative_url not in (None,\'\'):\n
add_line = 1\n
line_kw_dict[\'destination_payment\'] = destination_payment_relative_url\n
destination_trade_relative_url = line.get(\'destination_trade_relative_url\',None)\n
if destination_trade_relative_url not in (None,\'\'):\n
line_kw_dict[\'destination_trade\'] = destination_trade_relative_url\n
reference_range_min = line.get(\'reference_range_min\',None)\n
if reference_range_min not in (None,\'\'):\n
line_kw_dict[\'reference_range_min\'] = reference_range_min\n
......@@ -118,17 +125,23 @@ for line in listbox:\n
if check_amount_relative_url not in (None,\'\'):\n
line_kw_dict[\'check_amount\'] = check_amount_relative_url\n
if add_line:\n
number_of_line_created += 1\n
context.newContent(portal_type=line_portal_type,**line_kw_dict)\n
\n
\n
\n
\n
request = context.REQUEST\n
message = "No%%20Lines%%20Created"\n
if number_of_line_created>0:\n
message = "Lines%%20Created"\n
redirect_url = \'%s/view?%s\' % ( context.absolute_url()\n
, \'portal_status_message=Lines Created\'\n
, \'portal_status_message=%s%%20Created\' % message\n
)\n
request[ \'RESPONSE\' ].redirect( redirect_url )\n
</string> </value>
]]></string> </value>
</item>
<item>
<key> <string>_code</string> </key>
......@@ -203,6 +216,7 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
<string>item_module_id</string>
<string>create_line</string>
<string>aggregate_data_list</string>
<string>number_of_line_created</string>
<string>_getiter_</string>
<string>line</string>
<string>add_line</string>
......@@ -213,9 +227,11 @@ request[ \'RESPONSE\' ].redirect( redirect_url )\n
<string>line_kw_dict</string>
<string>_write_</string>
<string>destination_payment_relative_url</string>
<string>destination_trade_relative_url</string>
<string>reference_range_min</string>
<string>reference_range_max</string>
<string>check_amount_relative_url</string>
<string>message</string>
<string>redirect_url</string>
</tuple>
</value>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDetail_viewLineFastInputForm.xml
View file @ 345b39d0
......@@ -80,7 +80,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -88,13 +88,13 @@
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_quantity</string>
......@@ -109,7 +109,7 @@
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_resource</string>
......@@ -118,7 +118,7 @@
</value>
</item>
<item>
<key> <string>right</string> </key>
<key> <string>right</string> </key>
<value>
<list/>
</value>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_getBaobabSourcePayment.xml
View file @ 345b39d0
......@@ -68,7 +68,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>return \'source_payment/organisation_module/2/1\'\n
<value> <string>return context.Baobab_getPortalDefaultPaymentNode()\n
</string> </value>
</item>
<item>
......@@ -89,7 +89,7 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
<value> <string>**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
......@@ -114,7 +114,11 @@
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple/>
<tuple>
<string>kw</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
</value>
</item>
</dictionary>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_view/my_source_total_asset_price.xml
View file @ 345b39d0
......@@ -168,9 +168,7 @@
</item>
<item>
<key> <string>precision</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
......@@ -241,7 +239,7 @@
</item>
<item>
<key> <string>precision</string> </key>
<value> <string></string> </value>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>required</string> </key>
......@@ -249,7 +247,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Money Quantity</string> </value>
<value> <string>Price</string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
......@@ -280,23 +278,4 @@
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here.getBaobabSourcePaymentValue().getPriceCurrencyValue().getQuantityPrecision()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDeliveryLine_view.xml
View file @ 345b39d0
......@@ -80,19 +80,19 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>my_aggregate_list</string>
......@@ -100,7 +100,7 @@
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_resource_title</string>
......@@ -110,7 +110,7 @@
</value>
</item>
<item>
<key> <string>rigth</string> </key>
<key> <string>rigth</string> </key>
<value>
<list/>
</value>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookDelivery_view.xml
View file @ 345b39d0
......@@ -79,7 +79,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -87,7 +87,7 @@
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center</string> </key>
<value>
<list>
<string>my_simulation_state</string>
......@@ -95,7 +95,7 @@
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_id</string>
......@@ -106,7 +106,7 @@
</value>
</item>
<item>
<key> <string>rigth</string> </key>
<key> <string>rigth</string> </key>
<value>
<list>
<string>my_start_date</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModelCheckAmountVariation_view.xml
View file @ 345b39d0
......@@ -80,25 +80,25 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
......@@ -108,7 +108,7 @@
</value>
</item>
<item>
<key> <string>right</string> </key>
<key> <string>right</string> </key>
<value>
<list/>
</value>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookModel_view.xml
View file @ 345b39d0
......@@ -80,7 +80,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -88,13 +88,13 @@
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_quantity</string>
......@@ -102,7 +102,7 @@
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_title</string>
......@@ -113,7 +113,7 @@
</value>
</item>
<item>
<key> <string>right</string> </key>
<key> <string>right</string> </key>
<value>
<list/>
</value>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReceptionLine_view.xml
View file @ 345b39d0
......@@ -80,13 +80,13 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center</string> </key>
<value>
<list>
<string>my_description</string>
......@@ -94,7 +94,7 @@
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>my_check_number</string>
......@@ -102,7 +102,7 @@
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_quantity</string>
......@@ -113,7 +113,7 @@
</value>
</item>
<item>
<key> <string>rigth</string> </key>
<key> <string>rigth</string> </key>
<value>
<list>
<string>my_resource_title</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookReception_view.xml
View file @ 345b39d0
......@@ -80,7 +80,7 @@
<value>
<dictionary>
<item>
<key> <string>bottom</string> </key>
<key> <string>bottom</string> </key>
<value>
<list>
<string>listbox</string>
......@@ -88,7 +88,7 @@
</value>
</item>
<item>
<key> <string>center</string> </key>
<key> <string>center</string> </key>
<value>
<list>
<string>my_simulation_state</string>
......@@ -96,7 +96,7 @@
</value>
</item>
<item>
<key> <string>hidden</string> </key>
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_destination_section</string>
......@@ -104,7 +104,7 @@
</value>
</item>
<item>
<key> <string>left</string> </key>
<key> <string>left</string> </key>
<value>
<list>
<string>my_source_reference</string>
......@@ -113,7 +113,7 @@
</value>
</item>
<item>
<key> <string>rigth</string> </key>
<key> <string>rigth</string> </key>
<value>
<list>
<string>my_start_date</string>
......
bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckbookRequestLine_view.xml
View file @ 345b39d0
......@@ -76,7 +76,7 @@
<value>
<dictionary>
<item>
<key> <string>Default</string> </key>
<key> <string>Default</string> </key>
<value>
<list>
<string>my_resource_title</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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7