Skip to content

erp5
erp5
Commit 2c8d9f1d authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

few changes: 

improvement of  BankAccount_getReportInformationList
improvement of CounterModule_getVaultTransactionList
improvement of Delivery_getVaultItemList
Also the xml format has changed a bit

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14550 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 706a488a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 383 additions and 181 deletions
bt5/erp5_banking_core/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @ 2c8d9f1d
<base_category_list> <base_category_list>
<portal_type id="Banking Operation Line">
<item>aggregate_resource</item>
</portal_type>
<portal_type id="Cash Delivery Cell"> <portal_type id="Cash Delivery Cell">
<item>variation</item> <item>variation</item>
</portal_type> </portal_type>
...@@ -12,6 +15,9 @@ ...@@ -12,6 +15,9 @@
<item>resource</item> <item>resource</item>
<item>check_amount</item> <item>check_amount</item>
</portal_type> </portal_type>
<portal_type id="Checkbook Model">
<item>composition</item>
</portal_type>
<portal_type id="Counter Date"> <portal_type id="Counter Date">
<item>site</item> <item>site</item>
</portal_type> </portal_type>
......
bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Check%20Model.xml
View file @ 2c8d9f1d
...@@ -97,6 +97,10 @@ ...@@ -97,6 +97,10 @@
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>CheckModel_init</string> </value> <value> <string>CheckModel_init</string> </value>
</item> </item>
<item>
<key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>property_sheet_list</string> </key> <key> <string>property_sheet_list</string> </key>
<value> <value>
......
bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Check%20Operation%20Line.xml
View file @ 2c8d9f1d
...@@ -103,6 +103,10 @@ ...@@ -103,6 +103,10 @@
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>CheckOperationLine_init</string> </value> <value> <string>CheckOperationLine_init</string> </value>
</item> </item>
<item>
<key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>property_sheet_list</string> </key> <key> <string>property_sheet_list</string> </key>
<value> <value>
......
bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Check.xml
View file @ 2c8d9f1d
...@@ -97,6 +97,10 @@ ...@@ -97,6 +97,10 @@
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>property_sheet_list</string> </key> <key> <string>property_sheet_list</string> </key>
<value> <value>
......
bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Checkbook%20Model.xml
View file @ 2c8d9f1d
...@@ -97,6 +97,10 @@ ...@@ -97,6 +97,10 @@
<key> <string>init_script</string> </key> <key> <string>init_script</string> </key>
<value> <string>CheckbookModel_init</string> </value> <value> <string>CheckbookModel_init</string> </value>
</item> </item>
<item>
<key> <string>permission</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>property_sheet_list</string> </key> <key> <string>property_sheet_list</string> </key>
<value> <value>
......
bt5/erp5_banking_core/PortalTypeTemplateItem/portal_types/Counter%20Date.xml
View file @ 2c8d9f1d
...@@ -33,6 +33,25 @@ ...@@ -33,6 +33,25 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_property_domain_dict</string> </key>
<value>
<dictionary>
<item>
<key> <string>short_title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item> <item>
<key> <string>_roles</string> </key> <key> <string>_roles</string> </key>
<value> <value>
...@@ -108,4 +127,44 @@ ...@@ -108,4 +127,44 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value> <string>erp5_content</string> </value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>short_title</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value> <string>erp5_content</string> </value>
</item>
<item>
<key> <string>property_name</string> </key>
<value> <string>title</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportInformationList.xml
View file @ 2c8d9f1d
...@@ -75,9 +75,9 @@ if reference is None:\n ...@@ -75,9 +75,9 @@ if reference is None:\n
message = Message(domain="ui", message="Please give a reference")\n message = Message(domain="ui", message="Please give a reference")\n
raise ValueError, message\n raise ValueError, message\n
\n \n
account_list = catalog(reference=reference, portal_type=portal_type, validation_state=\'valid\')\n account_list = catalog(string_index=reference, portal_type=portal_type, validation_state=\'valid\')\n
if len(account_list) == 0:\n if len(account_list) == 0:\n
account_list = catalog(reference="%%%s%%" % reference, portal_type=portal_type)\n account_list = catalog(string_index="%%%s%%" % reference, portal_type=portal_type, validation_state=\'valid\')\n
if len(account_list) == 0:\n if len(account_list) == 0:\n
message = Message(domain="ui", message="No bank account have this reference")\n message = Message(domain="ui", message="No bank account have this reference")\n
raise ValueError, message\n raise ValueError, message\n
...@@ -93,6 +93,7 @@ if total_price:\n ...@@ -93,6 +93,7 @@ if total_price:\n
new_list.append(account.asContext(**tmp_dict))\n new_list.append(account.asContext(**tmp_dict))\n
account_list = new_list\n account_list = new_list\n
\n \n
# context.log("final account list",account_list)\n
return account_list\n return account_list\n
</string> </value> </string> </value>
</item> </item>
...@@ -118,6 +119,14 @@ return account_list\n ...@@ -118,6 +119,14 @@ return account_list\n
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>reference=None, total_price=0</string> </value> <value> <string>reference=None, total_price=0</string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
<value> <value>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BankAccount_getReportTransactionList.xml
View file @ 2c8d9f1d
...@@ -93,8 +93,14 @@ inv_account_dict = {}\n ...@@ -93,8 +93,14 @@ inv_account_dict = {}\n
for account_uid in account_uids:\n for account_uid in account_uids:\n
acc_dict = inv_account_dict[account_uid] = {}\n acc_dict = inv_account_dict[account_uid] = {}\n
account = account_dict[account_uid]\n account = account_dict[account_uid]\n
# context.log(\'account\',account)\n
acc_dict[\'account_reference\'] = account.getReference()\n acc_dict[\'account_reference\'] = account.getReference()\n
acc_dict[\'account_owner\'] = account.getParentValue().getTitle()\n acc_dict[\'internal_bank_account_number\'] = account.getInternalBankAccountNumber()\n
parent_value = account.getParentValue()\n
acc_dict[\'account_owner\'] = parent_value.getTitle()\n
acc_dict[\'activity\'] = None\n
if parent_value.getPortalType() == \'Organisation\':\n
acc_dict[\'activity\'] = parent_value.getActivity()\n
acc_dict[\'currency_title\'] = account.getPriceCurrencyTitle()\n acc_dict[\'currency_title\'] = account.getPriceCurrencyTitle()\n
acc_dict[\'transaction_list\'] = []\n acc_dict[\'transaction_list\'] = []\n
\n \n
...@@ -166,7 +172,7 @@ if transaction_list:\n ...@@ -166,7 +172,7 @@ if transaction_list:\n
if description is None:\n if description is None:\n
description = \'\'\n description = \'\'\n
tmp_dict[\'description\'] = description\n tmp_dict[\'description\'] = description\n
tmp_dict[\'start_date\'] = delivery.getStartDate()\n tmp_dict[\'start_date\'] = inventory.date\n
tmp_dict[\'module_title\'] = delivery.getParentValue().getTranslatedTitle()\n tmp_dict[\'module_title\'] = delivery.getParentValue().getTranslatedTitle()\n
\n \n
# Common to bank account\n # Common to bank account\n
...@@ -211,6 +217,14 @@ return inv_account_dict.values()\n ...@@ -211,6 +217,14 @@ return inv_account_dict.values()\n
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>from_date=None, at_date=None, reference=None, current_inventory=0, available_inventory=0, future_inventory=0, transaction_list=0</string> </value> <value> <string>from_date=None, at_date=None, reference=None, current_inventory=0, available_inventory=0, future_inventory=0, transaction_list=0</string> </value>
</item> </item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
<value> <value>
...@@ -259,6 +273,7 @@ return inv_account_dict.values()\n ...@@ -259,6 +273,7 @@ return inv_account_dict.values()\n
<string>inv_account_dict</string> <string>inv_account_dict</string>
<string>account_uid</string> <string>account_uid</string>
<string>acc_dict</string> <string>acc_dict</string>
<string>parent_value</string>
<string>_apply_</string> <string>_apply_</string>
<string>current_available_inventory_list</string> <string>current_available_inventory_list</string>
<string>inv</string> <string>inv</string>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPortalReferenceCurrencyID.xml
View file @ 2c8d9f1d
...@@ -95,7 +95,9 @@ return context.getPortalObject().getProperty(\'reference_currency_id\')\n ...@@ -95,7 +95,9 @@ return context.getPortalObject().getProperty(\'reference_currency_id\')\n
<item> <item>
<key> <string>_proxy_roles</string> </key> <key> <string>_proxy_roles</string> </key>
<value> <value>
<tuple/> <tuple>
<string>Manager</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getSiteEmissionLetter.xml 0 → 100644
View file @ 2c8d9f1d
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Python_magic</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<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>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string># Rerturns the emission letter corresponding to a particular site\n
from Products.ERP5Type.Cache import CachingMethod\n
\n
def getSiteEmissionLetter(site=None):\n
portal = context.getPortalObject()\n
site_object = portal.portal_categories.restrictedTraverse(site)\n
return site_object.getCodification()[0].lower()\n
\n
getSiteEmissionLetter = CachingMethod(getSiteEmissionLetter,\n
id = \'Baobab_getSiteEmissionLetter\',\n
cache_factory = \'erp5_ui_long\')\n
\n
return getSiteEmissionLetter(site=site)\n
</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_filepath</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>site=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>func_code</string> </key>
<value>
<object>
<klass>
<global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>site</string>
<string>Products.ERP5Type.Cache</string>
<string>CachingMethod</string>
<string>None</string>
<string>getSiteEmissionLetter</string>
</tuple>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>func_defaults</string> </key>
<value>
<tuple>
<none/>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Baobab_getSiteEmissionLetter</string> </value>
</item>
<item>
<key> <string>warnings</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/BaseCategory_view/my_category_type_list%20.xml
View file @ 2c8d9f1d
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckModule_viewCheckList/listbox.xml
View file @ 2c8d9f1d
...@@ -365,9 +365,7 @@ ...@@ -365,9 +365,7 @@
</item> </item>
<item> <item>
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
...@@ -436,7 +434,7 @@ ...@@ -436,7 +434,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -522,22 +520,6 @@ ...@@ -522,22 +520,6 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>countFolder</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<global name="Method" module="Products.Formulator.MethodField"/> <global name="Method" module="Products.Formulator.MethodField"/>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckOperationLine_view/my_source_payment_reference.xml
View file @ 2c8d9f1d
...@@ -553,7 +553,7 @@ ...@@ -553,7 +553,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>python: here.getSourcePaymentInternalBankAccountNumber()</string> </value> <value> <string>python: here.getSourcePaymentValue().getInternalBankAccountNumber()</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModelModule_viewCheckbookModelList/listbox.xml
View file @ 2c8d9f1d
...@@ -353,9 +353,7 @@ ...@@ -353,9 +353,7 @@
</item> </item>
<item> <item>
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
...@@ -436,7 +434,7 @@ ...@@ -436,7 +434,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -445,6 +443,10 @@ ...@@ -445,6 +443,10 @@
<list/> <list/>
</value> </value>
</item> </item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>portal_types</string> </key> <key> <string>portal_types</string> </key>
<value> <value>
...@@ -528,30 +530,8 @@ ...@@ -528,30 +530,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Method" module="Products.Formulator.MethodField"/>
<string>Products.Formulator.MethodField</string> <tuple/>
<string>Method</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>countFolder</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.MethodField</string>
<string>Method</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CheckbookModule_viewCheckbookList/listbox.xml
View file @ 2c8d9f1d
...@@ -365,9 +365,7 @@ ...@@ -365,9 +365,7 @@
</item> </item>
<item> <item>
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
...@@ -436,7 +434,7 @@ ...@@ -436,7 +434,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -522,22 +520,6 @@ ...@@ -522,22 +520,6 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>countFolder</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<global name="Method" module="Products.Formulator.MethodField"/> <global name="Method" module="Products.Formulator.MethodField"/>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Checkbook_view/listbox.xml
View file @ 2c8d9f1d
...@@ -357,9 +357,7 @@ ...@@ -357,9 +357,7 @@
</item> </item>
<item> <item>
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
...@@ -428,7 +426,7 @@ ...@@ -428,7 +426,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -437,6 +435,10 @@ ...@@ -437,6 +435,10 @@
<list/> <list/>
</value> </value>
</item> </item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>portal_types</string> </key> <key> <string>portal_types</string> </key>
<value> <value>
...@@ -517,30 +519,8 @@ ...@@ -517,30 +519,8 @@
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<tuple> <tuple>
<tuple> <global name="Method" module="Products.Formulator.MethodField"/>
<string>Products.Formulator.MethodField</string> <tuple/>
<string>Method</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>countFolder</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.MethodField</string>
<string>Method</string>
</tuple>
<none/>
</tuple> </tuple>
</pickle> </pickle>
<pickle> <pickle>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterDateModule_viewCounterDateList/listbox.xml
View file @ 2c8d9f1d
...@@ -357,9 +357,7 @@ ...@@ -357,9 +357,7 @@
</item> </item>
<item> <item>
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
...@@ -433,7 +431,7 @@ ...@@ -433,7 +431,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -533,22 +531,6 @@ ...@@ -533,22 +531,6 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>countFolder</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<global name="Method" module="Products.Formulator.MethodField"/> <global name="Method" module="Products.Formulator.MethodField"/>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewCounterList/listbox.xml
View file @ 2c8d9f1d
...@@ -357,9 +357,7 @@ ...@@ -357,9 +357,7 @@
</item> </item>
<item> <item>
<key> <string>count_method</string> </key> <key> <string>count_method</string> </key>
<value> <value> <string></string> </value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
...@@ -445,7 +443,7 @@ ...@@ -445,7 +443,7 @@
<item> <item>
<key> <string>list_method</string> </key> <key> <string>list_method</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
...@@ -549,22 +547,6 @@ ...@@ -549,22 +547,6 @@
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
<value> <string>countFolder</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<tuple> <tuple>
<global name="Method" module="Products.Formulator.MethodField"/> <global name="Method" module="Products.Formulator.MethodField"/>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CounterModule_viewVaultReport/listbox.xml
View file @ 2c8d9f1d
...@@ -355,11 +355,11 @@ ...@@ -355,11 +355,11 @@
<string>Cash Status</string> <string>Cash Status</string>
</tuple> </tuple>
<tuple> <tuple>
<string>emission_letter_title</string> <string>emission_letter_translated_title</string>
<string>Emission Letter</string> <string>Emission Letter</string>
</tuple> </tuple>
<tuple> <tuple>
<string>variation_title</string> <string>variation_translated_title</string>
<string>Variation</string> <string>Variation</string>
</tuple> </tuple>
<tuple> <tuple>
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
<string>Date</string> <string>Date</string>
</tuple> </tuple>
<tuple> <tuple>
<string>explanation_relative_url</string> <string>explanation_translated_relative_url</string>
<string>Explanation</string> <string>Explanation</string>
</tuple> </tuple>
<tuple> <tuple>
......
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml
View file @ 2c8d9f1d
...@@ -272,10 +272,14 @@ if user_vault == 1:\n ...@@ -272,10 +272,14 @@ if user_vault == 1:\n
\n \n
if current_url != None :\n if current_url != None :\n
if \'site\' not in current_url:\n if \'site\' not in current_url:\n
current_url = \'site/\'+current_url\n current_category_relative_url = \'site/\'+current_url\n
current_category = context.portal_categories.getCategoryValue(current_url)\n if with_base:\n
current_url = current_category_relative_url\n
else:\n
current_category_relative_url = current_url\n
current_category = context.portal_categories.getCategoryValue(current_category_relative_url)\n
if current_category is not None :\n if current_category is not None :\n
if current_category.getRelativeUrl() not in [x[1] for x in vault_list] :\n if current_url not in [x[1] for x in vault_list] :\n
# Get the logical path of the current category\n # Get the logical path of the current category\n
logical_path_list = current_category.getLogicalPath().split(\'/\')\n logical_path_list = current_category.getLogicalPath().split(\'/\')\n
title = \'/\'.join(context.Base_calculateBeautifulSiteLogicalPath(logical_path_list,path_len=len(logical_path_list)))\n title = \'/\'.join(context.Base_calculateBeautifulSiteLogicalPath(logical_path_list,path_len=len(logical_path_list)))\n
...@@ -377,6 +381,7 @@ return [(\'\', \'\')] + list(vault_list)\n ...@@ -377,6 +381,7 @@ return [(\'\', \'\')] + list(vault_list)\n
<string>$append0</string> <string>$append0</string>
<string>x</string> <string>x</string>
<string>new_vault_list</string> <string>new_vault_list</string>
<string>current_category_relative_url</string>
<string>current_category</string> <string>current_category</string>
<string>logical_path_list</string> <string>logical_path_list</string>
<string>title</string> <string>title</string>
......
bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/bank_account_workflow/scripts/checkBankAccount.xml
View file @ 2c8d9f1d
...@@ -71,8 +71,9 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n ...@@ -71,8 +71,9 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
bank_account = state_change[\'object\']\n bank_account = state_change[\'object\']\n
\n \n
# use of the constraint\n # use of the constraint\n
vliste = bank_account.checkConsistency()\n if bank_account.getParentValue().getPortalType()!=\'Person\':\n
if len(vliste) != 0 and bank_account.getParentValue().getPortalType()!=\'Person\':\n vliste = bank_account.checkConsistency()\n
if len(vliste) != 0:\n
raise ValidationFailed, (vliste[0].getTranslatedMessage(),)\n raise ValidationFailed, (vliste[0].getTranslatedMessage(),)\n
</string> </value> </string> </value>
</item> </item>
......
bt5/erp5_banking_core/bt/revision
View file @ 2c8d9f1d
226 228
\ No newline at end of file \ No newline at end of file
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