Skip to content

erp5
erp5
Commit d6a9a3ac authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

2010-05-24 Jérome 

* Allow to select multiple accounts root in General Ledger and Trial Balance

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35557 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bdfa6398
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 43 deletions
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
View file @ d6a9a3ac
......@@ -70,10 +70,11 @@ section_uid = context.Base_getSectionUidListForSectionCategory(\n
section_category, request[\'section_category_strict\'])\n
simulation_state = request[\'simulation_state\']\n
from_date = request.get(\'from_date\', None)\n
gap = request.get(\'gap\', None)\n
# XXX the field should maybe use base=1 on the category...\n
if gap:\n
gap = \'gap/%s\' % gap\n
gap_list = []\n
for gap in request.get(\'gap_list\', ()):\n
# XXX the field should maybe use base=1 on the category...\n
gap_list.append(\'gap/%s\' % gap)\n
\n
display_categories = request.get(\'display_categories\', False)\n
period_start_date = context\\\n
.Base_getAccountingPeriodStartDateForSectionCategory(\n
......@@ -182,8 +183,8 @@ account_type_to_group_by_mirror_section = [\n
\'account_type/liability/payable\', ]\n
\n
\n
if gap or gap_root:\n
params[\'node_category\'] = gap or gap_root\n
if gap_list or gap_root:\n
params[\'node_category\'] = gap_list or gap_root\n
\n
report_section_list = []\n
\n
......@@ -493,6 +494,8 @@ return report_section_list\n
<string>simulation_state</string>
<string>None</string>
<string>from_date</string>
<string>gap_list</string>
<string>_getiter_</string>
<string>gap</string>
<string>False</string>
<string>display_categories</string>
......@@ -515,7 +518,6 @@ return report_section_list\n
<string>getFullAccountName</string>
<string>account_type_to_group_by_node</string>
<string>profit_and_loss_account_type</string>
<string>_getiter_</string>
<string>account_type_value</string>
<string>append</string>
<string>$append0</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml
View file @ d6a9a3ac
......@@ -91,11 +91,13 @@ request.set(\'precision\', precision)\n
\n
# optional GAP filter\n
node_uid = []\n
gap = request.get(\'gap\', None)\n
if gap:\n
gap_value = portal.portal_categories.gap.restrictedTraverse(gap)\n
node_uid = [x.uid for x in gap_value.getCategoryMemberValueList(\n
portal_type=\'Account\')] or -1\n
gap_uid_list = []\n
for gap in request.get(\'gap_list\', ()):\n
gap_uid_list.append(portal.portal_categories.gap.restrictedTraverse(gap).getUid())\n
if gap_uid_list:\n
node_uid = [x.uid for x in portal.portal_catalog(\n
portal_type=\'Account\',\n
default_gap_uid=gap_uid_list)] or -1\n
\n
request.set(\'is_accounting_report\', True)\n
\n
......@@ -186,11 +188,11 @@ return [ ReportSection(\n
<string>currency</string>
<string>precision</string>
<string>node_uid</string>
<string>gap_uid_list</string>
<string>_getiter_</string>
<string>gap</string>
<string>gap_value</string>
<string>append</string>
<string>$append0</string>
<string>_getiter_</string>
<string>x</string>
<string>True</string>
<string>dict</string>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary.xml
View file @ d6a9a3ac
......@@ -91,11 +91,11 @@
<string>your_portal_type</string>
<string>your_at_date</string>
<string>your_from_date</string>
<string>your_gap</string>
<string>your_gap_root</string>
<string>your_function</string>
<string>your_project</string>
<string>your_section_category_strict</string>
<string>your_gap_list</string>
</list>
</value>
</item>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_gap.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_gap_list.xml
View file @ d6a9a3ac
......@@ -3,7 +3,7 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="ListField" module="Products.Formulator.StandardFields"/>
<global name="MultiListField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
......@@ -11,7 +11,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>your_gap</string> </value>
<value> <string>your_gap_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -72,10 +72,6 @@
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
......@@ -101,7 +97,7 @@
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<key> <string>view_separator</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
......@@ -147,10 +143,6 @@
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
......@@ -178,7 +170,7 @@
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<key> <string>view_separator</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
......@@ -198,7 +190,9 @@
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
<value>
<list/>
</value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -224,10 +218,6 @@
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
......@@ -244,7 +234,7 @@
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1</int> </value>
<value> <int>5</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -255,8 +245,12 @@
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
<key> <string>view_separator</string> </key>
<value> <string encoding="cdata"><![CDATA[
<br />
]]></string> </value>
</item>
</dictionary>
</value>
......@@ -275,7 +269,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: here.Account_getGapItemList()</string> </value>
<value> <string>context/Account_getGapItemList</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerReportDialog.xml
View file @ d6a9a3ac
......@@ -67,7 +67,7 @@
<key> <string>center</string> </key>
<value>
<list>
<string>your_gap</string>
<string>your_gap_list</string>
<string>your_gap_root</string>
</list>
</value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerReportDialog/your_gap.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewGeneralLedgerReportDialog/your_gap_list.xml
View file @ d6a9a3ac
......@@ -17,7 +17,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_gap</string> </value>
<value> <string>your_gap_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -74,7 +74,7 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_gap</string> </value>
<value> <string>your_gap_list</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog.xml
View file @ d6a9a3ac
......@@ -66,7 +66,7 @@
<key> <string>center</string> </key>
<value>
<list>
<string>your_gap</string>
<string>your_gap_list</string>
<string>your_gap_root</string>
</list>
</value>
......
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_gap.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog/your_gap_list.xml
View file @ d6a9a3ac
......@@ -17,7 +17,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_gap</string> </value>
<value> <string>your_gap_list</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -74,7 +74,7 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_gap</string> </value>
<value> <string>your_gap_list</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
......
bt5/erp5_accounting/bt/change_log
View file @ d6a9a3ac
2010-05-24 Jérome
* Allow to select multiple accounts root in General Ledger and Trial Balance
2010-05-24 kazuhiko
* Improve activity dependencies for Delivery_updateAppliedRule, eg. delivery.activate(tag='(path)_updateAppliedRule', after_tag='(path)_expand').Delivery_updateAppliedRule(activate_kw={'tag':'(path)_expand'})
......
bt5/erp5_accounting/bt/revision
View file @ d6a9a3ac
1214
\ No newline at end of file
1218
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7