Skip to content

erp5
erp5
Commit 566f0498 authored by Aurel's avatar Aurel
Browse files
Options

Merge remote-tracking branch 'origin' into syncml

parents 9ffe13dc b229ea94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3192 additions and 846 deletions
CHANGES.erp5.util.txt
View file @ 566f0498
Changes
=======
0.4.35 (2013-06-21)
-------------------
* erp5.util.testsuite:
- Fix additional_bt5_repository_id into testnode.py
[Benjamin Blanc]
0.4.34 (2013-04-11)
-------------------
......
bt5/erp5_accounting/PortalTypeTemplateItem/portal_types/Account.xml
View file @ 566f0498
......@@ -107,9 +107,7 @@
<dictionary>
<item>
<key> <string>domain_name</string> </key>
<value>
<none/>
</value>
<value> <string>content_translation</string> </value>
</item>
<item>
<key> <string>property_name</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
View file @ 566f0498
......@@ -333,7 +333,7 @@ def getNodeTitleAndId(node_relative_url):\n
node = traverse(node_relative_url)\n
return node_title_and_id_cache.setdefault(node_relative_url,\n
( node.getUid(),\n
node.getTitle(),\n
node.getTranslatedTitle(),\n
node.Account_getGapId(gap_root=selected_gap),\n
node.getProperty(\'string_index\'),\n
node))\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml
View file @ 566f0498
......@@ -54,6 +54,7 @@
"""Client & vendors accounts.\n
"""\n
portal = context.portal_url.getPortalObject()\n
\n
from Products.ERP5Form.Report import ReportSection\n
\n
......@@ -65,13 +66,14 @@ role_filter_list = request.get(\'mirror_section_category_list\', None)\n
omit_balanced_accounts = request[\'omit_balanced_accounts\']\n
from_date = request.get(\'from_date\', None)\n
gap_root = request.get(\'gap_root\', None)\n
project = request.get(\'project\', None)\n
\n
request.other[\'is_accounting_report\'] = True\n
\n
# role_filter_list == None means no filter on the role\n
if role_filter_list == [\'\'] :\n
role_filter_list = None\n
\n
\n
section_uid = context.Base_getSectionUidListForSectionCategory(\n
request[\'section_category\'],\n
request[\'section_category_strict\'])\n
......@@ -89,7 +91,12 @@ if from_date:\n
else :\n
params[\'no_from_date\'] = 1\n
\n
portal = context.portal_url.getPortalObject()\n
if project:\n
if project == \'None\':\n
params[\'project_uid\'] = project\n
else:\n
params[\'project_uid\'] = portal.restrictedTraverse(project).getUid()\n
\n
simulation_tool = portal.portal_simulation\n
\n
entity_columns = [\n
......@@ -131,16 +138,13 @@ for party in context.Account_zDistinctSectionList(\n
not o.isMemberOf(section_category):\n
# don\'t show entities belonging to the group we are reporting\n
if omit_balanced_accounts and (\n
simulation_tool.getInventoryAssetPrice(\n
section_category=section_category,\n
at_date=at_date,\n
simulation_state=simulation_state,\n
round(simulation_tool.getInventoryAssetPrice(\n
mirror_section_uid=party.uid,\n
node_category_strict_membership=(\n
\'account_type/asset/receivable\',\n
\'account_type/liability/payable\'),\n
# TODO: don\'t compare floats for equality ...\n
) == 0.):\n
**params\n
), 3) == 0.):\n
pass\n
else:\n
title = o.getTitle()\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml
View file @ 566f0498
......@@ -162,7 +162,7 @@
<string>GAP Number</string>
</tuple>
<tuple>
<string>title</string>
<string>translated_title</string>
<string>Account Name</string>
</tuple>
<tuple>
......@@ -283,7 +283,7 @@
<string>preferred_gap_id</string>
</tuple>
<tuple>
<string>title</string>
<string>translated_title</string>
<string>Account Name</string>
</tuple>
<tuple>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_simulation_state.xml
View file @ 566f0498
......@@ -280,7 +280,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Accounting Transaction\', state_var=\'simulation_state\', display_none_category=False)</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerReportDialog.xml
View file @ 566f0498
......@@ -37,6 +37,16 @@
<key> <string>action</string> </key>
<value> <string>AccountModule_viewGeneralLedgerReport</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
......@@ -142,6 +152,10 @@
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string>AccountModule_viewGeneralLedgerReportDialog</string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport.xml
View file @ 566f0498
......@@ -91,6 +91,7 @@
<list>
<string>your_section_category</string>
<string>your_currency</string>
<string>your_project</string>
<string>your_at_date</string>
<string>your_omit_balanced_accounts</string>
<string>your_omit_empty_accounts</string>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/StringAttributeMatchConstraint_view/my_message_property_not_set.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReport/your_project.xml
View file @ 566f0498
......@@ -9,15 +9,12 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>display_width</string>
<string>title</string>
</list>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_message_property_not_set</string> </value>
<value> <string>your_project</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -72,26 +69,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value>
<value> <string>your_project</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
<value> <string>AccountModule_viewReportFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Error Message if Property is not Set</string> </value>
</item>
</dictionary>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReportDialog.xml
View file @ 566f0498
......@@ -37,6 +37,16 @@
<key> <string>action</string> </key>
<value> <string>AccountModule_viewOtherPartiesReport</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
......@@ -73,6 +83,7 @@
<list>
<string>your_section_category</string>
<string>your_section_category_strict</string>
<string>your_project</string>
<string>your_at_date</string>
<string>your_omit_balanced_accounts</string>
<string>your_omit_grouping_reference</string>
......@@ -128,6 +139,10 @@
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string>AccountModule_viewOtherPartiesReportDialog</string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewOtherPartiesReportDialog/your_project.xml 0 → 100644
View file @ 566f0498
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_project</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>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_project</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>AccountModule_viewDialogFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewReportFieldLibrary/your_simulation_state.xml
View file @ 566f0498
......@@ -280,7 +280,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Accounting Transaction\', state_var=\'simulation_state\', display_none_category=False)</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog.xml
View file @ 566f0498
......@@ -37,6 +37,16 @@
<key> <string>action</string> </key>
<value> <string>AccountModule_viewTrialBalanceReport</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
......@@ -137,6 +147,10 @@
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string>AccountModule_viewTrialBalanceReportDialog</string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getFormattedTitle.xml
View file @ 566f0498
......@@ -54,7 +54,7 @@
account = context\n
\n
gap_id = account.Account_getGapId(gap_root=gap_root)\n
title = account.getTitle()\n
title = account.getTranslatedTitle()\n
\n
if gap_id:\n
title = "%s - %s" % (gap_id, title)\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml
View file @ 566f0498
......@@ -109,8 +109,8 @@ for brain in portal.Base_zGetNotGroupedMovementList(\n
if function and not (mvt.getSourceFunction() or \'\').startswith(function):\n
continue\n
specific_reference = transaction.getSourceReference()\n
mirror_section_title = transaction.getDestinationSectionTitle()\n
section_title = transaction.getSourceSectionTitle()\n
mirror_section_title = mvt.getDestinationSectionTitle()\n
section_title = mvt.getSourceSectionTitle()\n
else:\n
if payment_uid and mvt.getDestinationPaymentUid() != payment_uid:\n
continue\n
......@@ -119,8 +119,8 @@ for brain in portal.Base_zGetNotGroupedMovementList(\n
if function and not (mvt.getDestinationFunction() or \'\').startswith(function):\n
continue\n
specific_reference = transaction.getDestinationReference()\n
mirror_section_title = transaction.getSourceSectionTitle()\n
section_title = transaction.getDestinationSectionTitle()\n
mirror_section_title = mvt.getSourceSectionTitle()\n
section_title = mvt.getDestinationSectionTitle()\n
\n
\n
debit = max(brain.total_quantity, 0)\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/your_preferred_simulation_state.xml
View file @ 566f0498
......@@ -293,7 +293,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:[(\'\', \'\')] + here.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Accounting Transaction\', state_var=\'simulation_state\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_view/my_source_section_title.xml
View file @ 566f0498
......@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
<string>title</string>
</list>
</value>
......@@ -71,6 +72,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_source_section_title</string> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_viewDestination/my_destination_section_title.xml
View file @ 566f0498
......@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>editable</string>
<string>title</string>
</list>
</value>
......@@ -71,6 +72,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_destination_section_title</string> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml
View file @ 566f0498
......@@ -173,7 +173,7 @@ for delivery in delivery_list:\n
node_account_type_title = \'\'\n
node_financial_section_title = \'\'\n
if node is not None:\n
node_title = node.getTitle()\n
node_title = node.getTranslatedTitle()\n
node_account_type_title = node.getAccountTypeTranslatedTitle()\n
node_financial_section_title = \\\n
node.getFinancialSectionTranslatedTitle()\n
......@@ -224,7 +224,7 @@ for delivery in delivery_list:\n
node_account_type_title = \'\'\n
node_financial_section_title = \'\'\n
if node is not None:\n
node_title = node.getTitle()\n
node_title = node.getTranslatedTitle()\n
node_account_type_title = node.getAccountTypeTranslatedTitle()\n
node_financial_section_title = \\\n
node.getFinancialSectionTranslatedTitle()\n
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml
View file @ 566f0498
......@@ -271,11 +271,11 @@
<value>
<list>
<tuple>
<string>debit</string>
<string>total_debit</string>
<string>Debit</string>
</tuple>
<tuple>
<string>credit</string>
<string>total_credit</string>
<string>Credit</string>
</tuple>
<tuple>
......@@ -398,6 +398,14 @@
<string>specific_reference</string>
<string>Transaction Reference</string>
</tuple>
<tuple>
<string>total_debit</string>
<string>Debit</string>
</tuple>
<tuple>
<string>total_credit</string>
<string>Credit</string>
</tuple>
<tuple>
<string>source_project_title</string>
<string>Supplier Project</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog/your_simulation_state.xml
View file @ 566f0498
......@@ -278,7 +278,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Accounting Transaction\', state_var=\'simulation_state\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statCredit.xml
View file @ 566f0498
......@@ -53,10 +53,13 @@
<value> <string>"""Total credit of all accounting transactions having this\n
entity as a mirror section\n
"""\n
\n
kw[\'mirror_section_uid\'] = context.getUid()\n
kw[\'omit_asset_increase\'] = 1\n
kw[\'node_category_strict_membership\'] = [\'account_type/asset/receivable\',\n
\'account_type/liability/payable\']\n
kw.update(kw[\'selection\'].getParams())\n
\n
# here, or 0 is to prevent displaying "- 0"\n
return - context.Node_statAccountingBalance(**kw) or 0\n
</string> </value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statDebit.xml
View file @ 566f0498
......@@ -57,6 +57,8 @@ kw[\'mirror_section_uid\'] = context.getUid()\n
kw[\'omit_asset_decrease\'] = 1\n
kw[\'node_category_strict_membership\'] = [\'account_type/asset/receivable\',\n
\'account_type/liability/payable\']\n
kw.update(kw[\'selection\'].getParams())\n
\n
return context.Node_statAccountingBalance(**kw)\n
</string> </value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/your_preferred_simulation_state.xml
View file @ 566f0498
......@@ -293,7 +293,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:[(\'\', \'\')] + context.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Accounting Transaction\', state_var=\'simulation_state\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml
View file @ 566f0498
......@@ -82,7 +82,8 @@ portal = context.getPortalObject()\n
total_payable_price_per_node_section = dict()\n
\n
if simulation_state is None:\n
state_list = [x[1] for x in context.Base_getTranslatedAccountingWorkflowStateItemList()]\n
state_list = [x[1] for x in context.ERP5Site_getWorkflowStateItemList(\n
portal_type=\'Accounting Transaction\', state_var=\'simulation_state\')]\n
simulation_state = [x for x in state_list\n
if x not in (\'draft\', \'cancelled\', \'deleted\', \'rejected\')]\n
\n
......
bt5/erp5_accounting/bt/change_log
View file @ 566f0498
2013-04-17 arnaud.fontaine
* erp5_simulation should not be required as some system do not use simulation.
2011-12-16 arnaud.fontaine
* Display "Own Section" along "Third Party" in AccountingTransactionModule_viewAccountingTransactionList.
......
bt5/erp5_accounting/bt/dependency_list
View file @ 566f0498
erp5_base >= 0.8.3
erp5_core >= 1.0rc13
erp5_simulation
\ No newline at end of file
erp5_core >= 1.0rc13
\ No newline at end of file
bt5/erp5_accounting/bt/revision
View file @ 566f0498
1530
\ No newline at end of file
1535
\ No newline at end of file
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.xml
View file @ 566f0498
......@@ -121,15 +121,21 @@ Test `preferred_gap_id` column of Account Module\n
\n
<!-- make sure we are sorted by preferred_gap_id ASC -->\n
<tr>\n
<!-- sort by title, to reset any sort on preferred_gap_id -->\n
<td>clickAndWait</td>\n
<td>//button[@value=\'listbox.title\']</td>\n
<td>storeLocation</td>\n
<td>current_account_url</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset any sort on preferred_gap_id. previously here was sorting by title, \n
but now we can sort by multiple columns, so sort by title does not reset sorting. -->\n
<td>openAndWait</td>\n
<td>${current_account_url}&reset=int:1</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- sort by preferred_gap_id -->\n
<td>clickAndWait</td>\n
<td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
<td>//button[@value=\'listbox.preferred_gap_id:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -153,7 +159,7 @@ Test `preferred_gap_id` column of Account Module\n
<tr>\n
<!-- sort by preferred_gap_id -->\n
<td>clickAndWait</td>\n
<td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
<td>//button[@value=\'listbox.preferred_gap_id:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -181,8 +187,7 @@ Test `preferred_gap_id` column of Account Module\n
</tbody></table>\n
</body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n
-->\n
-->
]]></unicode> </value>
</item>
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.xml
View file @ 566f0498
......@@ -87,15 +87,21 @@ Test `preferred_gap_id` column of Account Module\n
\n
<!-- make sure we are sorted by preferred_gap_id ASC -->\n
<tr>\n
<!-- sort by title, to reset any sort on preferred_gap_id -->\n
<td>clickAndWait</td>\n
<td>//button[@value=\'listbox.title\']</td>\n
<td>storeLocation</td>\n
<td>current_account_url</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset any sort on preferred_gap_id. previously here was sorting by title, \n
but now we can sort by multiple columns, so sort by title does not reset sorting. -->\n
<td>openAndWait</td>\n
<td>${current_account_url}&reset=int:1</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- sort by preferred_gap_id -->\n
<td>clickAndWait</td>\n
<td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
<td>//button[@value=\'listbox.preferred_gap_id:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -124,7 +130,7 @@ Test `preferred_gap_id` column of Account Module\n
<tr>\n
<!-- sort by preferred_gap_id -->\n
<td>clickAndWait</td>\n
<td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
<td>//button[@value=\'listbox.preferred_gap_id:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -152,7 +158,7 @@ Test `preferred_gap_id` column of Account Module\n
<tr>\n
<!-- make sure we end up sorting in ASCENDING-->\n
<td>clickAndWait</td>\n
<td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
<td>//button[@value=\'listbox.preferred_gap_id:asc\']</td>\n
<td></td>\n
</tr>\n
\n
......@@ -160,8 +166,7 @@ Test `preferred_gap_id` column of Account Module\n
</tbody></table>\n
</body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n
-->\n
-->
]]></unicode> </value>
</item>
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.xml
View file @ 566f0498
......@@ -91,7 +91,12 @@ Test sort for Accounting module main listbox\n
<!-- sort by title {{{ -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -129,7 +134,7 @@ Test sort for Accounting module main listbox\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -160,10 +165,21 @@ Test sort for Accounting module main listbox\n
<!-- }}} -->\n
\n
<!-- sort by type {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset title sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.translated_portal_type\']</td>\n
@value=\'listbox.translated_portal_type:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -187,7 +203,7 @@ Test sort for Accounting module main listbox\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.translated_portal_type\']</td>\n
@value=\'listbox.translated_portal_type:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -208,10 +224,21 @@ Test sort for Accounting module main listbox\n
<!-- }}} -->\n
\n
<!-- sort by date {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_portal_type:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset type sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_portal_type:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.operation_date\']</td>\n
@value=\'listbox.operation_date:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -245,7 +272,7 @@ Test sort for Accounting module main listbox\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.operation_date\']</td>\n
@value=\'listbox.operation_date:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -276,6 +303,17 @@ Test sort for Accounting module main listbox\n
<!-- }}} -->\n
\n
<!-- sort by reference {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset date sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>listbox_reference</td>\n
......@@ -285,7 +323,7 @@ Test sort for Accounting module main listbox\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.reference\']</td>\n
@value=\'listbox.reference:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -309,7 +347,7 @@ Test sort for Accounting module main listbox\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.reference\']</td>\n
@value=\'listbox.reference:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -339,10 +377,22 @@ Test sort for Accounting module main listbox\n
<!-- }}} -->\n
\n
<!-- sort by specific reference {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.reference:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset reference sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.reference:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.specific_reference\']</td>\n
@value=\'listbox.specific_reference:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -376,7 +426,7 @@ Test sort for Accounting module main listbox\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.specific_reference\']</td>\n
@value=\'listbox.specific_reference:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -407,10 +457,22 @@ Test sort for Accounting module main listbox\n
<!-- }}} -->\n
\n
<!-- sort by simulation state {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.specific_reference:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset specific_reference sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.specific_reference:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.translated_simulation_state_title\']</td>\n
@value=\'listbox.translated_simulation_state_title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.xml
View file @ 566f0498
......@@ -80,7 +80,12 @@ Test sort for Accounting module main listbox, without section\n
<!-- sort by title {{{ -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -118,7 +123,7 @@ Test sort for Accounting module main listbox, without section\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -149,10 +154,21 @@ Test sort for Accounting module main listbox, without section\n
<!-- }}} -->\n
\n
<!-- sort by type {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset title sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.translated_portal_type\']</td>\n
@value=\'listbox.translated_portal_type:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -176,7 +192,7 @@ Test sort for Accounting module main listbox, without section\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.translated_portal_type\']</td>\n
@value=\'listbox.translated_portal_type:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -197,10 +213,21 @@ Test sort for Accounting module main listbox, without section\n
<!-- }}} -->\n
\n
<!-- sort by date {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_portal_type:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset type sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_portal_type:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.operation_date\']</td>\n
@value=\'listbox.operation_date:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -215,7 +242,7 @@ Test sort for Accounting module main listbox, without section\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.operation_date\']</td>\n
@value=\'listbox.operation_date:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -227,6 +254,17 @@ Test sort for Accounting module main listbox, without section\n
<!-- }}} -->\n
\n
<!-- sort by reference {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset date sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>listbox_reference</td>\n
......@@ -236,7 +274,7 @@ Test sort for Accounting module main listbox, without section\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.reference\']</td>\n
@value=\'listbox.reference:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -260,7 +298,7 @@ Test sort for Accounting module main listbox, without section\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.reference\']</td>\n
@value=\'listbox.reference:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -290,10 +328,22 @@ Test sort for Accounting module main listbox, without section\n
<!-- }}} -->\n
\n
<!-- sort by specific reference {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.reference:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset reference sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.reference:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.specific_reference\']</td>\n
@value=\'listbox.specific_reference:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -308,7 +358,7 @@ Test sort for Accounting module main listbox, without section\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.specific_reference\']</td>\n
@value=\'listbox.specific_reference:desc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -320,10 +370,22 @@ Test sort for Accounting module main listbox, without section\n
<!-- }}} -->\n
\n
<!-- sort by simulation state {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.specific_reference:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset specific_reference sorting -->\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.specific_reference:none\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
@value=\'listbox.translated_simulation_state_title\']</td>\n
@value=\'listbox.translated_simulation_state_title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.xml
View file @ 566f0498
......@@ -103,7 +103,7 @@ Test Account Transaction List then jump to accounting module.\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
<td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.xml
View file @ 566f0498
......@@ -81,7 +81,7 @@ Sorting in Grouping Dialog\n
<!-- Sort by date asc {{{ -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[6]/button</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[6]/button[@value="listbox.date:asc"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -109,7 +109,7 @@ Sorting in Grouping Dialog\n
<!-- Sort by date desc {{{ -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[6]/button</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[6]/button[@value="listbox.date:desc"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -135,9 +135,20 @@ Sorting in Grouping Dialog\n
<!-- }}} -->\n
\n
<!-- Sort by title asc {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[6]/button[@value="listbox.date:none"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset date sorting -->\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[6]/button[@value="listbox.date:none"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[7]/button</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[7]/button[@value="listbox.parent_title:asc"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -165,7 +176,7 @@ Sorting in Grouping Dialog\n
<!-- Sort by title desc {{{ -->\n
<tr>\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[7]/button</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[7]/button[@value="listbox.parent_title:desc"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -192,17 +203,41 @@ Sorting in Grouping Dialog\n
\n
<!-- Sort by grouping reference asc {{{ -->\n
<tr>\n
<!-- reset title sorting -->\n
<td>assertElementPresent</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[7]/button[@value="listbox.parent_title:none"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset title sorting -->\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[2]/button</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[7]/button[@value="listbox.parent_title:none"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- XXX-Tatuya: For what purpose of this sort? -->\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[2]/button[@value="listbox.grouping_reference:asc"]</td>\n
<td></td>\n
</tr>\n
<!-- }}} -->\n
\n
\n
<!-- Sort by Account Name asc {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[2]/button[@value="listbox.grouping_reference:none"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset grouping reference sorting -->\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[2]/button[@value="listbox.grouping_reference:none"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[9]/button</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[9]/button[@value="listbox.node_title:asc"]</td>\n
<td></td>\n
</tr>\n
<!-- all lines have the same account here. -->\n
......@@ -210,8 +245,19 @@ Sorting in Grouping Dialog\n
\n
<!-- Sort by third party title asc {{{ -->\n
<tr>\n
<td>assertElementPresent</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[9]/button[@value="listbox.node_title:none"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<!-- reset Account Name sorting -->\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[10]/button</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[9]/button[@value="listbox.node_title:none"]</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>clickAndWait</td>\n
<td>//tr[@class=\'listbox-label-line\']/th[10]/button[@value="listbox.Movement_getMirrorSectionTitle:asc"]</td>\n
<td></td>\n
</tr>\n
<!-- this is not really sorting by title, but by uid just to make sure lines\n
......@@ -222,8 +268,7 @@ for the same party are grouped together.\n
</tbody></table>\n
</body>\n
</html> <!-- vim: syntax=html foldmethod=marker\n
-->\n
-->
]]></unicode> </value>
</item>
......
bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.xml
View file @ 566f0498
......@@ -119,7 +119,7 @@ stool.setSelectionParamsFor(\'account_module_selection\', dict()) # (this recrea
stool.setSelectionSortOrder(\'account_module_selection\', sort_on=((\'preferred_gap_id\', \'ascending\'),))\n
stool.setSelectionColumns(\'account_module_selection\',\n
[(\'preferred_gap_id\', \'GAP Number\'),\n
(\'title\', \'Account Name\'),\n
(\'translated_title\', \'Account Name\'),\n
(\'translated_validation_state_title\', \'State\'),\n
(\'AccountModule_getAccountingTransactionCount\', \'Count\'),\n
(\'debit\', \'Debit\'),\n
......
bt5/erp5_accounting_ui_test/bt/change_log
View file @ 566f0498
2013-06-18 arnaud.fontaine
* Default Accounting Transaction Module sorting has been removed (8f9bc61) for performance reasons, so fix improved listbox sort feature accordingly. This fixes testFunctionalCore failures.
2008-06-16 yusei
* Update accounting_zuite/test_account_module/test_account_module_domain_tree.html
for the recent changes of domain tree.
......
bt5/erp5_accounting_ui_test/bt/revision
View file @ 566f0498
196
\ No newline at end of file
198
\ No newline at end of file
bt5/erp5_banking_core/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_stock_list_without_delete_for_inventory_virtual_movement.xml 0 → 100644
View file @ 566f0498
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="SQL" module="Products.ZSQLMethods.SQL"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
getResourceUid\r\n
getInventoriatedQuantity\r\n
getBaobabSourceUid\r\n
getBaobabDestinationUid\r\n
getBaobabSourceSectionUid\r\n
getBaobabDestinationSectionUid\r\n
isMovement\r\n
isCancellationAmount\r\n
isInventoryMovement\r\n
getBaobabSourcePaymentUid\r\n
getBaobabDestinationPaymentUid\r\n
getExplanationUid\r\n
getSimulationState\r\n
getSourceInventoriatedTotalAssetPrice\r\n
getDestinationInventoriatedTotalAssetPrice\r\n
getStartDate\r\n
getStopDate\r\n
isAccountable\r\n
getPortalType\r\n
getBaobabDestinationVariationText\r\n
getBaobabSourceVariationText\r\n
getSubVariationText</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>class_file_</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>connection_id</string> </key>
<value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>z_catalog_stock_list</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
<value> <int>100</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
DELETE FROM\n
stock\n
WHERE\n
<dtml-in uid>\n
uid=<dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>\n
</dtml-in>\n
;\n
\n
<dtml-var "\'\\0\'">\n
\n
<dtml-let row_list="[]" uid_dict="{}">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "not isInventoryMovement[loop_item] and isMovement[loop_item] and isAccountable[loop_item] and getResourceUid[loop_item]">\n
<dtml-if "getBaobabDestinationUid[loop_item]">\n
<dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
<dtml-call expr="row_list.append([uid[loop_item], uid_dict[uid[loop_item]], getBaobabDestinationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationPaymentUid[loop_item], getExplanationUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourceUid[loop_item], getResourceUid[loop_item], getInventoriatedQuantity[loop_item], isCancellationAmount[loop_item], getStopDate[loop_item], getDestinationInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabDestinationVariationText[loop_item], getSubVariationText[loop_item]])">\n
</dtml-if>\n
<dtml-if "getBaobabSourceUid[loop_item]">\n
<dtml-call expr="uid_dict.update({uid[loop_item]: uid_dict.get(uid[loop_item], -1) + 1})">\n
<dtml-call expr="row_list.append([uid[loop_item], uid_dict[uid[loop_item]], getBaobabSourceUid[loop_item], getBaobabSourceSectionUid[loop_item], getBaobabSourcePaymentUid[loop_item], getExplanationUid[loop_item], getBaobabDestinationSectionUid[loop_item], getBaobabDestinationUid[loop_item], getResourceUid[loop_item], -(getInventoriatedQuantity[loop_item] or 0), isCancellationAmount[loop_item], getStartDate[loop_item], getSourceInventoriatedTotalAssetPrice[loop_item], getPortalType[loop_item], getSimulationState[loop_item], getBaobabSourceVariationText[loop_item], getSubVariationText[loop_item]])">\n
</dtml-if>\n
</dtml-if>\n
</dtml-in>\n
\n
<dtml-if "row_list">\n
INSERT INTO\n
stock\n
VALUES\n
<dtml-in prefix="row" expr="row_list">\n
(\n
<dtml-sqlvar expr="row_item[0]" type="int">,\n
<dtml-sqlvar expr="row_item[1]" type="int">,\n
<dtml-sqlvar expr="row_item[2]" type="int">,\n
<dtml-sqlvar expr="row_item[3]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[4]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[5]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[6]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[7]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[8]" type="int">, \n
<dtml-sqlvar expr="row_item[9]" type="float" optional>,\n
<dtml-sqlvar expr="row_item[10]" type="int" optional>,\n
<dtml-sqlvar expr="row_item[11]" type="datetime" optional>,\n
<dtml-sqlvar expr="row_item[12]" type="float" optional>,\n
<dtml-sqlvar expr="row_item[13]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[14]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[15]" type="string" optional>,\n
<dtml-sqlvar expr="row_item[16]" type="string" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
</dtml-if>\n
</dtml-let>\n
]]></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_banking_core/bt/change_log
View file @ 566f0498
2013-06-17 arnaud.fontaine
* Fix banking tests (Followup of 'Fix an inventory bug').
2007-11-06 aurel
* add issue date on check operation line
......
bt5/erp5_banking_core/bt/revision
View file @ 566f0498
588
\ No newline at end of file
589
\ No newline at end of file
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/EmbeddedFile_view/my_description.xml
View file @ 566f0498
......@@ -79,7 +79,7 @@
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Document_viewFieldLibrary</string> </value>
<value> <string>File_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
......
bt5/erp5_base/bt/change_log
View file @ 566f0498
2012-10-11 arnaud.fontaine
* Fix dead ProxyField as Document_viewFieldLibrary is only available in erp5_dms which depends upon erp5_base itself.
2012-04-10 Kazuhiko
* add an external method to generate barcode image.
......@@ -425,4 +428,4 @@ and query_workflow for Cancelled and Answered states
* Two skins were moved from portal_skins/erp5_core to portal_skins/erp5_base
2006-02-24 Seb
* Created this business template in order to split erp5_core
\ No newline at end of file
* Created this business template in order to split erp5_core
bt5/erp5_base/bt/revision
View file @ 566f0498
1042
\ No newline at end of file
1043
\ No newline at end of file
bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/BudgetModule_viewBudgetConsumptionReportDialog/your_validation_state.xml
View file @ 566f0498
......@@ -280,7 +280,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Base_getTranslatedWorkflowStateItemList(wf_id=\'budget_workflow\')</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Budget\', state_var=\'validation_state\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_budget/bt/revision
View file @ 566f0498
365
\ No newline at end of file
366
\ No newline at end of file
bt5/erp5_commerce/SkinTemplateItem/portal_skins/erp5_commerce_multiflex_layout/ListBox_asMf54HTML.xml
View file @ 566f0498
......@@ -94,7 +94,7 @@
<tr>\n
<td valign="top">\n
<select name="domain_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n
tal:attributes="onchange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n
<tal:block tal:repeat="c here/getDomainRootList">\n
<option value="base_domain"\n
tal:define="path python: c[0]; title python: c[1]"\n
......
bt5/erp5_commerce/bt/revision
View file @ 566f0498
285
\ No newline at end of file
286
\ No newline at end of file
bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator_wizard/wizard_form_dialog.xml
View file @ 566f0498
......@@ -61,7 +61,7 @@
}.get(dialog_category, \'Select\')"\n
i18n:translate="" i18n:domain="ui"></label>\n
<select name="select_dialog" id="dialog_selector"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doDialog\')">\n
tal:attributes="onchange string:submitAction(this.form,\'Base_doDialog\')">\n
\n
<tal:block tal:repeat="action dialog_actions">\n
<option tal:attributes="value action/url;\n
......
bt5/erp5_configurator/bt/revision
View file @ 566f0498
549
\ No newline at end of file
550
\ No newline at end of file
bt5/erp5_content_translation/WorkflowTemplateItem/portal_workflow/content_translation_interaction_workflow/interactions/edit.xml
View file @ 566f0498
......@@ -77,6 +77,10 @@
<tuple/>
</value>
</item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......
bt5/erp5_content_translation/bt/change_log
View file @ 566f0498
2013-04-12 arnaud.fontaine
* Ignore temporary documents for content translation Interaction Workflow. This is useless and likely to trigger errors anyway, such as the document being not available when Interactions is actually called.
2012-01-05 Kazuhiko
* move create/drop table SQL for content_translation table from erp5_content_translation to erp5_full_text_*_catalog BT.
......
bt5/erp5_content_translation/bt/revision
View file @ 566f0498
45
\ No newline at end of file
46
\ No newline at end of file
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewCRMFieldLibrary/your_dialog_sale_opportunity_state.xml
View file @ 566f0498
......@@ -10,9 +10,9 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>items</string>
<string>size</string>
<string>title</string>
</list>
</value>
</item>
......@@ -123,26 +123,20 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Base_getTranslatedWorkflowStateItemList(wf_id=\'sale_opportunity_workflow\')</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Sale Opportunity\', state_var=\'validation_state\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
......
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewCRMFieldLibrary/your_dialog_validation_state.xml
View file @ 566f0498
......@@ -10,9 +10,9 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>items</string>
<string>size</string>
<string>title</string>
</list>
</value>
</item>
......@@ -123,26 +123,20 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.Base_getTranslatedWorkflowStateItemList(wf_id=\'ticket_workflow\')</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Campaign\', state_var=\'validation_state\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
......
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewCRMFieldLibrary/your_report_sale_opportunity_state.xml
View file @ 566f0498
......@@ -10,10 +10,10 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>default</string>
<string>items</string>
<string>enabled</string>
<string>items</string>
<string>title</string>
</list>
</value>
</item>
......@@ -136,10 +136,7 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
......@@ -152,10 +149,7 @@
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
......@@ -168,16 +162,13 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.Base_getTranslatedWorkflowStateItemList(wf_id="sale_opportunity_workflow")</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Sale Opportunity\', state_var=\'validation_state\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewCRMFieldLibrary/your_report_validation_state.xml
View file @ 566f0498
......@@ -10,10 +10,10 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
<string>default</string>
<string>items</string>
<string>enabled</string>
<string>items</string>
<string>title</string>
</list>
</value>
</item>
......@@ -136,10 +136,7 @@
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
......@@ -152,10 +149,7 @@
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
......@@ -168,16 +162,13 @@
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.Base_getTranslatedWorkflowStateItemList(wf_id="ticket_workflow")</string> </value>
<value> <string>python: context.ERP5Site_getWorkflowStateItemList(portal_type=\'Campaign\', state_var=\'validation_state\')</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_getEventActivityLineList.xml
View file @ 566f0498
......@@ -79,8 +79,8 @@ if request_stop_date:\n
query=request_stop_date.latestTime())\n
\n
#Get direction workfolow state list (simulation states)\n
for state in portal.Base_getTranslatedWorkflowStateItemList(\n
wf_id=\'event_simulation_workflow\'):\n
for state in portal.ERP5Site_getWorkflowStateItemList(\n
portal_type=portal.getPortalEventTypeList(), state_var=\'simulation_state\'):\n
if state[1] in direction_state_list:\n
#count number of objects in state with request parameters\n
obj = Object(uid="new_")\n
......
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_getEventDetailedLineList.xml
View file @ 566f0498
......@@ -55,7 +55,8 @@
from Products.PythonScripts.standard import Object\n
request = container.REQUEST\n
portal = context.getPortalObject()\n
state_item_list=[x[1] for x in context.Base_getTranslatedWorkflowStateItemList(wf_id=\'event_simulation_workflow\')]\n
state_item_list=[x[1] for x in portal.ERP5Site_getWorkflowStateItemList(\n
portal_type=portal.getPortalEventTypeList(), state_var=\'simulation_state\')]\n
#remove deteted state\n
if \'deleted\' in state_item_list:\n
state_item_list.remove(\'deleted\')\n
......
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/EventModule_getEventDetailedReportSectionList.xml
View file @ 566f0498
......@@ -59,7 +59,8 @@ selection_columns.append((\'ticket_type\', \'Module\'))\n
selection_columns.append((\'resource\',\'Type\'))\n
#Add dynamicaly event states columns to the form\n
#The name of column must be without spaces\n
for event_state in context.Base_getWorkflowStateItemList(\'event_simulation_workflow\'):\n
for event_state in context.ERP5Site_getWorkflowStateItemList(\n
portal_type=context.getPortalEventTypeList(), state_var=\'simulation_state\', translate=False):\n
if event_state[1]!=\'deleted\':\n
selection_columns.append((event_state[1],event_state[0]))\n
selection_columns.append((\'total\', \'Total\'))\n
......
bt5/erp5_crm/bt/revision
View file @ 566f0498
658
\ No newline at end of file
659
\ No newline at end of file
bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getSummaryAsHTML.xml
View file @ 566f0498
......@@ -85,7 +85,7 @@
<button tal:condition="isUserAllowedToPost"\n
type="submit" title="Reply"\n
name="DiscussionThread_redirectCreateNewDiscussionPost:method"\n
tal:attributes="onClick python: \'redirectCreateCitedNewDiscussionPost(\\\'%s\\\')\' %discussion_post_id"\n
tal:attributes="onclick python: \'redirectCreateCitedNewDiscussionPost(\\\'%s\\\')\' %discussion_post_id"\n
class="discussion-post-action-button">Reply</button>\n
</div>\n
\n
......
bt5/erp5_discussion/bt/revision
View file @ 566f0498
133
\ No newline at end of file
134
\ No newline at end of file
bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation_xhtml_style/context_box_render.xml
View file @ 566f0498
......@@ -42,7 +42,7 @@
<tal:block metal:define-macro="master">\n
<span id="jump" metal:define-macro="jump">\n
<select name="select_jump"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doJump\')">\n
tal:attributes="onchange string:submitAction(this.form,\'Base_doJump\')">\n
<option selected="selected" value=""\n
i18n:translate="" i18n:domain="ui">Jump...</option>\n
<tal:block tal:repeat="jump actions/object_jump | nothing">\n
......@@ -62,7 +62,7 @@
\n
<span id="action" metal:define-macro="action">\n
<select name="select_action"\n
onChange="submitAction(this.form,\'Base_doAction\')">\n
onchange="submitAction(this.form,\'Base_doAction\')">\n
<option selected="selected" value=""\n
i18n:translate="" i18n:domain="ui">Action...</option>\n
<tal:block tal:define="allowed_content_type_list here/getVisibleAllowedContentTypeList | python:[]">\n
......
bt5/erp5_documentation/bt/revision
View file @ 566f0498
218
\ No newline at end of file
219
\ No newline at end of file
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/EGov_ListBox_asHTML.xml
View file @ 566f0498
......@@ -94,7 +94,7 @@
<tr>\n
<td valign="top">\n
<select name="domain_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n
tal:attributes="onchange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n
<tal:block tal:repeat="c here/getDomainRootList">\n
<option value="base_domain"\n
tal:define="path python: c[0]; title python: c[1]"\n
......@@ -196,7 +196,7 @@
tal:define="lines here/getMaxLineNumber"\n
tal:attributes="id string:${field_id}_page_selection;\n
name string:${field_id}_list_start;\n
onChange string:submitAction(this.form, \'${context_url}/${field_id}_setPage\')"\n
onchange string:submitAction(this.form, \'${context_url}/${field_id}_setPage\')"\n
i18n:domain="ui" i18n:attributes="title">\n
<option value="0"\n
tal:repeat="p python: range(0, here.total_pages)"\n
......@@ -224,7 +224,7 @@
<td tal:condition="is_report_tree_mode"\n
class="Data" style="width: 50px; text-align: left; vertical-align: middle">\n
<select name="report_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n
tal:attributes="onchange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n
<tal:block tal:repeat="c here/getReportRootList">\n
<option value="base_domain"\n
tal:define="path python: c[0]; title python: c[1]"\n
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/ListBox_asHTML.xml
View file @ 566f0498
......@@ -90,7 +90,7 @@
<tr>\n
<td valign="top">\n
<select name="domain_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n
tal:attributes="onchange string:submitAction(this.form, \'${context_url}/setDomainRoot\')">\n
<tal:block tal:repeat="c here/getDomainRootList">\n
<option value="base_domain"\n
tal:define="path python: c[0]; title python: c[1]"\n
......@@ -217,7 +217,7 @@
tal:define="lines here/getMaxLineNumber"\n
tal:attributes="id string:${field_id}_page_selection;\n
name string:${field_id}_list_start;\n
onChange string:submitAction(this.form, \'${context_url}/${field_id}_setPage\')"\n
onchange string:submitAction(this.form, \'${context_url}/${field_id}_setPage\')"\n
i18n:domain="ui" i18n:attributes="title">\n
<option value="0"\n
tal:repeat="p python: range(0, here.total_pages)"\n
......@@ -256,7 +256,7 @@
tal:define="params python: {field_id+\'_setPage:method\':\'\',\'list_start\':\'this.value\'};\n
lines here/getMaxLineNumber" \n
tal:attributes=\'id string:${field_id}_page_selection;\n
onChange python: real_context.KnowledgePad_generateAjaxCall(context_url+"/"+form_id,box_relative_url,box_id,params).replace("\\"this.value\\"","this.value")\'\n
onchange python: real_context.KnowledgePad_generateAjaxCall(context_url+"/"+form_id,box_relative_url,box_id,params).replace("\\"this.value\\"","this.value")\'\n
i18n:domain="ui" i18n:attributes="title">\n
<option value="0"\n
tal:repeat="p python: range(0, here.total_pages)"\n
......@@ -288,7 +288,7 @@
<td tal:condition="is_report_tree_mode"\n
class="Data" style="width: 50px; text-align: left; vertical-align: middle">\n
<select name="report_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n
tal:attributes="onchange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n
<tal:block tal:repeat="c here/getReportRootList">\n
<option value="base_domain"\n
tal:define="path python: c[0]; title python: c[1]"\n
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/view_main.xml
View file @ 566f0498
......@@ -69,7 +69,7 @@
<button tal:condition="python: not is_web_mode and form_action"\n
type="submit" class="save" title="Save"\n
tal:attributes="name string:${form_action}:method;\n
onClick string:javascript:clickSaveButton(\'${form_action}\');"\n
onclick string:javascript:clickSaveButton(\'${form_action}\');"\n
i18n:attributes="title" i18n:domain="ui">\n
<span class="image"></span>\n
<span class="description" i18n:translate="" i18n:domain="ui">Save</span>\n
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewStatusBarRenderer.xml
View file @ 566f0498
......@@ -57,7 +57,7 @@
<div class="onright">\n
<span id="language">\n
<select name="select_language"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doLanguage\')">\n
tal:attributes="onchange string:submitAction(this.form,\'Base_doLanguage\')">\n
<option value=""\n
i18n:translate="" i18n:domain="ui">My language</option>\n
<option tal:repeat="language python: here.Localizer.get_languages_map()"\n
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewWorklistRenderer.xml
View file @ 566f0498
......@@ -43,7 +43,7 @@
<span class="select_favorite"\n
tal:define="ordered_global_actions python:here.getOrderedGlobalActionList(actions[\'global\']);\n
user_actions actions/user;"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doFavorite\')">\n
tal:attributes="onchange string:submitAction(this.form,\'Base_doFavorite\')">\n
<tal:block tal:repeat="action ordered_global_actions">\n
<span tal:condition="action/disabled"\n
disabled="disabled">-- <tal:block tal:content="action/title" i18n:translate="" i18n:domain="ui" /> --</span>\n
......
bt5/erp5_egov/bt/revision
View file @ 566f0498
761
\ No newline at end of file
762
\ No newline at end of file
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_viewVcsStatus.xml
View file @ 566f0498
......@@ -88,16 +88,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<tr><td>\n
<table style="width: 80px;" cellspacing="0" cellpadding="0">\n
<tr>\n
<td id="item2" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="viewDiff(1,document.getElementById(\'main_form\'))">Diff</td>\n
<td id="item2" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onclick="viewDiff(1,document.getElementById(\'main_form\'))">Diff</td>\n
</tr>\n
<tr>\n
<td id="item3" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="log()"> History</td>\n
<td id="item3" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onclick="log()"> History</td>\n
</tr>\n
<tr>\n
<td id="item4" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="commit(1,document.getElementById(\'main_form\'))">Commit</td>\n
<td id="item4" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onclick="commit(1,document.getElementById(\'main_form\'))">Commit</td>\n
</tr>\n
<tr>\n
<td id="item5" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onClick="revert(1,document.getElementById(\'main_form\'))">Revert</td>\n
<td id="item5" style="text-align: center;" onMouseOver="this.style.backgroundColor=\'#dae6e6\'" onMouseOut="this.style.backgroundColor=\'#ffffff\'" onclick="revert(1,document.getElementById(\'main_form\'))">Revert</td>\n
</tr>\n
</table>\n
</td></tr>\n
......
bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_working_copy_list.xml
View file @ 566f0498
......@@ -118,7 +118,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.getPreferredWorkingCopyList() or here.getPreferredSubversionWorkingCopyList()</string> </value>
<value> <string>python: here.getPreferredWorkingCopyList()</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_forge/bt/change_log
View file @ 566f0498
2012-10-04 arnaud.fontaine
* getPreferredSubversionWorkingCopyList() cannot be set properly.
2012-04-19 Kazuhiko
* add TypesTool_viewRoleInformationList that lists all Role Informations.
......
bt5/erp5_forge/bt/revision
View file @ 566f0498
672
\ No newline at end of file
674
\ No newline at end of file
bt5/erp5_forum_tutorial/SkinTemplateItem/portal_skins/erp5_forum/ListBox_asStandardHTML.xml
View file @ 566f0498
......@@ -127,7 +127,7 @@
<td tal:condition="is_report_tree_mode"\n
class="Data" style="width: 50px; text-align: left; vertical-align: middle">\n
<select name="report_root_url"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n
tal:attributes="onchange string:submitAction(this.form, \'${context_url}/setReportRoot\')">\n
<tal:block tal:repeat="c here/getReportRootList">\n
<option value="base_domain"\n
tal:define="path python: c[0]; title python: c[1]"\n
......
bt5/erp5_forum_tutorial/bt/revision
View file @ 566f0498
4
\ No newline at end of file
5
\ No newline at end of file
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_widget_library/Base_viewDownloadWidget.xml
View file @ 566f0498
......@@ -49,7 +49,7 @@
list_index python: 5">\n
<span i18n:domain="erp5_ui" \n
i18n:translate=""\n
onClick="javascript:$(\'div.download-document-format-list-menu\').toggle();"> Download</span>\n
onclick="javascript:$(\'div.download-document-format-list-menu\').toggle();"> Download</span>\n
<div class="download-document-format-list-menu" style="opacity: 0.999999; display: none;">\n
<ul>\n
<li class="separator"\n
......@@ -74,7 +74,7 @@
</li>\n
</div>\n
<li class="toggle-hidden-format-dialog-selection-link">\n
<span onClick="javascript:toggleHiddenFormatDialogSelection();"\n
<span onclick="javascript:toggleHiddenFormatDialogSelection();"\n
i18n:domain="erp5_ui" \n
i18n:translate=""\n
title="Show more download formats"> More... </span>\n
......
bt5/erp5_km/bt/revision
View file @ 566f0498
1877
\ No newline at end of file
1878
\ No newline at end of file
bt5/erp5_km_ui_test/PathTemplateItem/portal_tests/erp5_km_zuite/testKMWebSiteDefaultView.xml
View file @ 566f0498
......@@ -42,8 +42,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n
<title tal:content="template/getId"/>\n
</head>\n
<body tal:define="file_name string:tiolive-ERP5.Freedom.TioLive.MultiplePages.PDF-001-en.pdf;\n
full_filename_location python: here.Zuite_getFilenameLocation(file_name)">\n
<body>\n
<table cellpadding="1" cellspacing="1" border="1">\n
<thead>\n
<tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
......
bt5/erp5_km_ui_test/bt/revision
View file @ 566f0498
165
\ No newline at end of file
166
\ No newline at end of file
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/ListBox_asHTML.xml
View file @ 566f0498
......@@ -80,8 +80,8 @@
tal:define="selected_domain_path here/getSelectedDomainPath">\n
<div>\n
<div valign="top">\n
<select name="domain_root_url" onChange="submitAction(this.form, \'context/portal_selections/setDomainRoot\')"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/portal_selections/setDomainRoot\')">\n
<select name="domain_root_url" onchange="submitAction(this.form, \'context/portal_selections/setDomainRoot\')"\n
tal:attributes="onchange string:submitAction(this.form, \'${context_url}/portal_selections/setDomainRoot\')">\n
<tal:block tal:repeat="c here/getDomainRootList">\n
<option value="base_domain"\n
tal:define="path python: c[0]; title python: c[1]"\n
......@@ -138,13 +138,13 @@
<input type="hidden" tal:attributes="id string:${field_id}_listMax; name string:${field_id}_listMax; value python: len(search_value_list)">\n
<input type="hidden" tal:attributes="id string:${field_id}_itemMax; name string:${field_id}_itemMax; value python: len(line_list)">\n
<br />\n
<span tal:attributes="id string:${field_id}_check; name string:${field_id}_check; onClick string:simple_aff(this.id)" class="div_short_mode" i18n:translate="" i18n:domain="ui">Toggle Detailed Mode</span>\n
<span tal:attributes="id string:${field_id}_check; name string:${field_id}_check; onclick string:simple_aff(this.id)" class="div_short_mode" i18n:translate="" i18n:domain="ui">Toggle Detailed Mode</span>\n
\n
<select id="listbox_page_selection" name="list_start" title="Change Page" size="1"\n
onChange="submitAction(this.form, \'context/${field_id}_setPage\')"\n
onchange="submitAction(this.form, \'context/${field_id}_setPage\')"\n
tal:define="lines here/getMaxLineNumber"\n
tal:attributes="id string:${field_id}_page_selection;\n
onChange string:submitAction(this.form, \'${context_url}/${field_id}_setPage\')"\n
onchange string:submitAction(this.form, \'${context_url}/${field_id}_setPage\')"\n
i18n:domain="ui" i18n:attributes="title">\n
<option value="0"\n
tal:repeat="p python: range(0, here.total_pages)"\n
......@@ -195,8 +195,8 @@
<div tal:condition="is_report_tree_mode"\n
class="Data" style="width: 50px; text-align: left; vertical-align: middle;">\n
<select name="report_root_url"\n
onChange="submitAction(this.form, \'context/portal_selections/setReportRoot\')"\n
tal:attributes="onChange string:submitAction(this.form, \'${context_url}/portal_selections/setReportRoot\')">\n
onchange="submitAction(this.form, \'context/portal_selections/setReportRoot\')"\n
tal:attributes="onchange string:submitAction(this.form, \'${context_url}/portal_selections/setReportRoot\')">\n
<tal:block tal:repeat="c here/getReportRootList">\n
<option value="base_domain"\n
tal:define="path python: c[0]; title python: c[1]"\n
......@@ -231,7 +231,7 @@
</tal:block>\n
<div name="selection_mui" style="padding-bottom: 5px;">\n
\n
<select id="select_search_field" onChange="javascript: showSearchSelectedColumn();" name="select_search_field">\n
<select id="select_search_field" onchange="javascript: showSearchSelectedColumn();" name="select_search_field">\n
<tal:block tal:repeat="valueX search_value_list">\n
<tal:block tal:define="\n
aliasX python: valueX[0];\n
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/context_actions_render.xml
View file @ 566f0498
......@@ -155,7 +155,7 @@ XXX: Folder_filter accesses selection directly\n
<div id="jump">\n
<span id="jump" metal:define-macro="jump">\n
<select name="select_jump"\n
tal:attributes="onChange string:submitAction(this.form,\'Base_doJump\')">\n
tal:attributes="onchange string:submitAction(this.form,\'Base_doJump\')">\n
<option selected="selected" value=""\n
i18n:translate="" i18n:domain="ui">Jump...</option>\n
<tal:block tal:repeat="jump actions/object_jump | nothing">\n
......@@ -189,7 +189,7 @@ XXX: Folder_filter accesses selection directly\n
<div id="actions">\n
<span id="action" metal:define-macro="action">\n
<select name="select_action"\n
tal:attributes="onChange string:submitAction(this.form,\'${url}/Base_doAction\')" tal:define="document_template_list here/getDocumentTemplateList | nothing">\n
tal:attributes="onchange string:submitAction(this.form,\'${url}/Base_doAction\')" tal:define="document_template_list here/getDocumentTemplateList | nothing">\n
<option selected="selected" value=""\n
i18n:translate="" i18n:domain="ui">Action...\n
</option>\n
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/form_dialog.xml
View file @ 566f0498
......@@ -83,7 +83,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
}.get(dialog_category, \'Select\')"\n
i18n:translate="" i18n:domain="ui"></label>\n
<select name="select_dialog" id="dialog_selector"\n
onChange="submitAction(this.form,\'Base_doDialog\')">\n
onchange="submitAction(this.form,\'Base_doDialog\')">\n
<tal:block tal:repeat="action dialog_actions">\n
<option tal:attributes="value action/url;\n
selected python: action is current_action and \'selected\' or None"\n
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/index_html.xml
View file @ 566f0498
......@@ -84,7 +84,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
<div id="navigation_bar">\n
<div id="favourites" class="mod_badg">\n
<select name="select_favorite"\n
onChange="submitAction(this.form,\'Base_doFavorite\')"\n
onchange="submitAction(this.form,\'Base_doFavorite\')"\n
tal:define="ordered_global_actions python:here.getOrderedGlobalActionList(actions[\'global\']);\n
user_actions actions/user;">\n
<option selected="selected" value=""\n
......@@ -121,7 +121,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
\n
<div id="modules" class="mod_badg">\n
<select name="select_module"\n
onChange="submitAction(this.form,\'Base_doModule\')">\n
onchange="submitAction(this.form,\'Base_doModule\')">\n
tal:define="module_list here/ERP5Site_getModuleItemList;">\n
<option selected="selected" value="" i18n:translate="" i18n:domain="ui">ERP5 Modules</option>\n
<option tal:repeat="module here/ERP5Site_getModuleItemList"\n
......@@ -139,7 +139,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
\n
<div id="language" class="mod_badg">\n
<select name="select_language"\n
onChange="submitAction(this.form,\'Base_doLanguage\')">\n
onchange="submitAction(this.form,\'Base_doLanguage\')">\n
<option value=""\n
i18n:translate="" i18n:domain="ui">My language</option>\n
<option tal:repeat="language python: here.Localizer.get_languages_map()"\n
......
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/list_main.xml
View file @ 566f0498
......@@ -95,7 +95,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
</div>\n
\n
<!-- <div class="aff_options">\n
<a class="list_mode link" title="List Mode" onClick="affOptions()">\n
<a class="list_mode link" title="List Mode" onclick="affOptions()">\n
<span class="mobil" i18n:translate="" i18n:domain="ui"> < Options ></span> \n
</a>\n
</div> -->\n
......@@ -113,7 +113,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n
\n
<div id="actions">\n
<select name="select_action"\n
tal:attributes="onChange string:submitAction(this.form,\'${url}/Base_doAction\')" tal:define="document_template_list here/getDocumentTemplateList | nothing">\n
tal:attributes="onchange string:submitAction(this.form,\'${url}/Base_doAction\')" tal:define="document_template_list here/getDocumentTemplateList | nothing">\n
<option selected="selected" value=""\n
i18n:translate="" i18n:domain="ui">Action...\n
</option>\n
......
bt5/erp5_mobile/bt/revision
View file @ 566f0498
67
\ No newline at end of file
68
\ No newline at end of file
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroupModule_viewPaymentTransactionGroupList/listbox.xml
View file @ 566f0498
......@@ -108,6 +108,10 @@
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
<tuple>
<string>source_administration_title</string>
<string>Payment Transaction Manager</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view.xml
View file @ 566f0498
......@@ -105,6 +105,7 @@
<string>my_reference</string>
<string>my_source_section</string>
<string>my_source_payment</string>
<string>my_source_administration_title</string>
</list>
</value>
</item>
......
bt5/erp5_payment_mean/SkinTemplateItem/portal_skins/erp5_payment_mean/PaymentTransactionGroup_view/my_source_administration_title.xml 0 → 100644
View file @ 566f0498
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>columns</string>
<string>portal_type</string>
<string>proxy_listbox_ids</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_source_administration_title</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>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Usual Name</string>
</tuple>
<tuple>
<string>subordination_title</string>
<string>Subordination</string>
</tuple>
<tuple>
<string>function_translated_title</string>
<string>Function</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Person</string>
<string> Person</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>proxy_listbox_ids</string> </key>
<value>
<list>
<tuple>
<string>PersonModule_viewPersonList/listbox</string>
<string>Persons</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payment Group Manager</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payment_mean/bt/change_log
View file @ 566f0498
2011-07-13 Gabriel:
* Add field on PaymentTransactionGroup_view to display the source_administration property
2011-07-13 aurel :
* initial version
\ No newline at end of file
bt5/erp5_paypal_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaypalService/link_url_string_constraint.xml
View file @ 566f0498
......@@ -54,7 +54,7 @@
<value> <string>link_url_string_constraint</string> </value>
</item>
<item>
<key> <string>message_attribute_match</string> </key>
<key> <string>message_attribute_not_match</string> </key>
<value> <string>Paypal URL have to be set</string> </value>
</item>
<item>
......
bt5/erp5_paypal_secure_payment/bt/change_log
View file @ 566f0498
2013-06-18 arnaud.fontaine
* message_attribute_does_not_match was incorrectly renamed to message_attribute_match when migrating StringAttributeMatch constraint from filesystem to ZODB. Also, use message_attribute_not_match instead of message_attribute_does_not_match to follow ERP5 naming convention.
2012/07/03 Gabriel Monnerat
* Initial version.
\ No newline at end of file
bt5/erp5_paypal_secure_payment/bt/revision
View file @ 566f0498
6
\ No newline at end of file
7
\ No newline at end of file
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
View file @ 566f0498
......@@ -182,13 +182,12 @@ def getPaymentConditionText(paysheet):\n
date)\n
return \'\'\n
\n
gross_salary = getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/payroll/report/salary/gross\',\n
base_contribution = \'base_contribution/base_amount/payroll/report/salary/gross\'\n
gross_salary = getMovementTotalPriceFromCategory(base_contribution,\n
contribution_share=\'contribution_share/employee\')\n
\n
year_to_date_gross_salary = paysheet.PaySheetTransaction_getYearToDateSlice()\n
year_to_date_slice_a = paysheet.PaySheetTransaction_getYearToDateSlice(\'salary_range/france/tranche_a\')\n
year_to_date_slice_b = paysheet.PaySheetTransaction_getYearToDateSlice(\'salary_range/france/tranche_b\')\n
year_to_date_gross_salary = paysheet.PaySheetTransaction_getYearToDateSlice(base_contribution)\n
year_to_date_slice_a = paysheet.PaySheetTransaction_getYearToDateSlice(base_contribution, \'salary_range/france/tranche_a\')\n
year_to_date_slice_b = paysheet.PaySheetTransaction_getYearToDateSlice(base_contribution, \'salary_range/france/tranche_b\')\n
\n
worked_hour_count = paysheet.getWorkTimeAnnotationLineQuantity(0)\n
year_to_date_worked_hour_count = worked_hour_count + \\\n
......@@ -208,8 +207,8 @@ year_to_date_bonus_worked_hour_amount = portal.PaySheetTransaction_getYearToDate
base_contribution=\'base_contribution/base_amount/payroll/report/overtime\', \\\n
contribution_share=\'contribution_share/employee\') or 0\n
\n
year_to_date_taxable_net_salary = portal.PaySheetTransaction_getYearToDateBaseContributionTotalPrice(\\\n
paysheet=paysheet, base_contribution_list=\'payroll/report/salary/net\') + salaire_net_imposable\n
year_to_date_taxable_net_salary = paysheet.PaySheetTransaction_getYearToDateSlice(\n
\'base_contribution/base_amount/payroll/base/income_tax\')\n
\n
def unicodeDict(d):\n
for k, v in d.items():\n
......
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
View file @ 566f0498
......@@ -50,9 +50,7 @@
</item>
<item>
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
\'\'\'\n
<value> <string>\'\'\'\n
This script get year to date amount for the slice corresponding to slice_path\n
of the model.\n
\'\'\'\n
......@@ -73,12 +71,12 @@ paysheet_list = [r.getObject() for r in accounting_module.searchFolder(**search_
paysheet_list.append(context)\n
yearly_slice_amount = 0\n
\n
for paysheet in paysheet_list :\n
gross_salary=paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n
base_contribution=\'base_contribution/base_amount/payroll/report/salary/gross\',\n
for paysheet in paysheet_list:\n
salary = paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\n
base_contribution=base_contribution,\n
contribution_share=\'contribution_share/employee\')\n
if slice_path is None:\n
yearly_slice_amount += gross_salary\n
yearly_slice_amount += salary\n
continue\n
model = paysheet.getSpecialiseValue().getEffectiveModel(\\\n
start_date=paysheet.getStartDate(),\n
......@@ -89,21 +87,14 @@ for paysheet in paysheet_list :\n
return 0.0\n
plafond_max = slice.getQuantityRangeMax()\n
plafond_min = slice.getQuantityRangeMin()\n
slice_amount = 0\n
if gross_salary < plafond_max:\n
slice_amount = gross_salary - plafond_min\n
else:\n
slice_amount = plafond_max - plafond_min\n
yearly_slice_amount += slice_amount\n
yearly_slice_amount += min(salary, plafond_max) - plafond_min\n
\n
return yearly_slice_amount\n
]]></string> </value>
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>slice_path=None</string> </value>
<value> <string>base_contribution, slice_path=None</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
bt5/erp5_payroll_l10n_fr/bt/revision
View file @ 566f0498
141
\ No newline at end of file
142
\ No newline at end of file
bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/link_url_string_constraint.xml
View file @ 566f0498
......@@ -54,7 +54,7 @@
<value> <string>link_url_string_constraint</string> </value>
</item>
<item>
<key> <string>message_attribute_match</string> </key>
<key> <string>message_attribute_not_match</string> </key>
<value> <string>Payzen URL have to be set</string> </value>
</item>
<item>
......
bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_action_mode_constraint.xml
View file @ 566f0498
......@@ -54,7 +54,7 @@
<value> <string>payzen_vads_action_mode_constraint</string> </value>
</item>
<item>
<key> <string>message_attribute_match</string> </key>
<key> <string>message_attribute_not_match</string> </key>
<value> <string>Payzen vads_action_mode have to be SILENT or INTERACTIVE</string> </value>
</item>
<item>
......
bt5/erp5_payzen_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PayzenService/payzen_vads_ctx_mode_constraint.xml
View file @ 566f0498
......@@ -54,7 +54,7 @@
<value> <string>payzen_vads_ctx_mode_constraint</string> </value>
</item>
<item>
<key> <string>message_attribute_match</string> </key>
<key> <string>message_attribute_not_match</string> </key>
<value> <string>Payzen vads_ctx_mode have to be TEST or PRODUCTION</string> </value>
</item>
<item>
......
bt5/erp5_payzen_secure_payment/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_project/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_project_ui_test/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_registry_ohada/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_run_my_doc/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_simulation_test/bt/dependency_list
View file @ 566f0498
This diff is collapsed.
bt5/erp5_simulation_test/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_trade/bt/change_log
View file @ 566f0498
This diff is collapsed.
bt5/erp5_trade/bt/dependency_list
View file @ 566f0498
This diff is collapsed.
bt5/erp5_trade/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_ui_test/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_ui_test_core/bt/change_log
View file @ 566f0498
This diff is collapsed.
bt5/erp5_ui_test_core/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_upgrader/bt/change_log
View file @ 566f0498
This diff is collapsed.
bt5/erp5_upgrader/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_web/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_web_ung_theme/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_wizard/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/erp5_xhtml_gadget_style/bt/revision
View file @ 566f0498
This diff is collapsed.
bt5/tiolive_base/bt/revision
View file @ 566f0498
This diff is collapsed.
erp5/util/testnode/testnode.py
View file @ 566f0498
This diff is collapsed.
product/CMFActivity/ActivityTool.py
View file @ 566f0498
This diff is collapsed.
product/DeadlockDebugger/dumper.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Document/BusinessTemplate.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Document/Coordinate.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Document/Image.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Document/Inventory.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Document/OrderBuilder.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Document/PDFDocument.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Document/TextDocument.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Extensions/InventoryBrain.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Tool/PasswordTool.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Tool/TemplateTool.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/Tool/TrashTool.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/mixin/downloadable.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/tests/testERP5WebWithDms.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/tests/testInventory.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/tests/testPayroll_l10n_fr.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/tests/testTemplateTool.py
View file @ 566f0498
This diff is collapsed.
product/ERP5/tests/testXHTML.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Form/ListBox.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Form/Tool/SelectionTool.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Form/tests/testFields.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Form/www/ListBox_asHTML.zpt
View file @ 566f0498
This diff is collapsed.
product/ERP5OOo/tests/testDms.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/Base.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/Core/Folder.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/Core/PropertySheet.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/Tool/ClassTool.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/ZopePatch.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/dynamic/lazy_class.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/patches/DCWorkflowGraph.py 0 → 100644
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/tests/ERP5TypeTestSuite.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/tests/backportUnittest.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Type/tests/testLocalizer.py
View file @ 566f0498
This diff is collapsed.
product/ERP5VCS/WorkingCopy.py
View file @ 566f0498
This diff is collapsed.
product/ERP5Workflow/Document/Workflow.py
View file @ 566f0498
This diff is collapsed.
product/Formulator/Widget.py
View file @ 566f0498
This diff is collapsed.
product/HBTreeFolder2/contents.dtml
View file @ 566f0498
This diff is collapsed.
product/Localizer/MessageCatalog.py
View file @ 566f0498
This diff is collapsed.
setup.py
View file @ 566f0498
This diff is collapsed.
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