improved trial balance

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4730 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList.xml

@@ -75,16 +75,19 @@ from Products.ERP5Form.Report import ReportSection\n
 \n
 request = context.REQUEST\n
 \n
-at_date                      = request[\'at_date\']\n
-transaction_section_category = request[\'transaction_section_category\']\n
-transaction_simulation_state = request[\'transaction_simulation_state\']\n
-gap_root                     = request[\'gap_root\']\n
-from_date                    = request.get(\'from_date\', None)\n
+at_date                         = request[\'at_date\']\n
+transaction_section_category    = request[\'transaction_section_category\']\n
+transaction_simulation_state    = request[\'transaction_simulation_state\']\n
+gap_root                        = request[\'gap_root\']\n
+from_date                       = request.get(\'from_date\', None)\n
+expand_accounts                 = request.get(\'expand_accounts\', 0)\n
+\n
 \n
 # flat_mode is a boolean that indicate wether we should use a report tree \n
 # or a flat list of all accounts. \n
-tree_mode                    =  request.get(\'tree_mode\', 0)\n
-\n
+tree_mode                        =  request.get(\'tree_mode\', 0)\n
+if tree_mode :\n
+  raise \'tree mode no longer supported, sorry\'\n
 \n
 result = []\n
 params = {\n
@@ -96,6 +99,7 @@ params = {\n
   \'is_report_opened\'                     : 1,\n
   \'report_depth\'                         : 5,\n
   \'gap_root\'                             : gap_root,\n
+  \'expand_accounts\'                      : expand_accounts ,\n
 }\n
 \n
 preferences = {\n
@@ -121,19 +125,18 @@ else :\n
 balance_columns = (\n
   gap_id_line,\n
   (\'title\', \'Account\'),\n
-  # TODO\n
-# (\'AccountModule_getAccountingTransactionCount\', \'Transaction Count\'),\n
-  (\'debit\', \'Debit\'),\n
-  (\'credit\', \'Credit\'),\n
-  (\'debit_balance\', \'Debit Balance\'),\n
-  (\'credit_balance\', \'Credit Balance\')\n
+  (\'opening_balance\', \'Opening Balance\'),\n
+  (\'debit_movement\', \'Debit Movements\'),\n
+  (\'credit_movement\', \'Credit Movements\'),\n
+  (\'closing_balance\', \'Closing Balance\'),\n
 )\n
 \n
 \n
 if not tree_mode :\n
   result.append(\n
-                ReportSection(path=portal.account_module.getPhysicalPath(),\n
-                               title=\'Trial Balance\',\n
+                ReportSection( path=portal.account_module.getPhysicalPath(),\n
+                               # FIXME translate later\n
+                               title=portal.translation_service.translate(\'ui\', \'Trial Balance\').encode(\'utf8\'),\n
                                level=1,\n
                                form_id=\'AccountModule_viewAccountListForTrialBalance\',\n
                                selection_name=\'accounting_selection\',\n
@@ -151,7 +154,7 @@ else :\n
 \n
   result.append(\n
                  ReportSection(path=portal.account_module.getPhysicalPath(),\n
-                               title=portal.translation_service.translate(\'ui\', \'Trial Balance\').encode(\'utf8\'),\n
+                               title=\'Trial Balance\',\n
                                level=1,\n
                                form_id=\'AccountModule_viewAccountList\',\n
                                selection_name=\'account_selection\',\n
@@ -170,64 +173,67 @@ return result\n
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAABYAAAApAAAAQwAA
-AHP8AgAAZAEAawAAbAEAfQEAAXQCAHQDAGQCAIMCAH0EAHQFAHwEAGQDAIMCAH0GAHQFAHwEAGQE
+            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAABcAAAAsAAAAQwAA
+AHMuAwAAZAEAawAAbAEAfQEAAXQCAHQDAGQCAIMCAH0EAHQFAHwEAGQDAIMCAH0GAHQFAHwEAGQE
 AIMCAH0HAHQFAHwEAGQFAIMCAH0IAHQFAHwEAGQGAIMCAH0JAHQCAHwEAGQHAIMCAGQIAHQKAIMC
-AH0LAHQCAHwEAGQHAIMCAGQJAGQKAIMCAH0MAGcAAH0NAGgAAARkAwB8BgADPARkBAB8BwADPARk
-CwB8BwADPARkBQB8CAADPARkDAB0CgADPARkDQBkDgADPARkDwBkEAADPARkBgB8CQADPH0OAGgA
-AARkEQB8BgADPARkEgB8BwADPARkEwB8CAADPARkFAB8CQADPH0PAHwLAG8kAAF8CwB0EAB8DgCD
-AQBkCAA8fAsAdBAAfA8AgwEAZBUAPG4BAAF0AgB0AgB0AwBkFgCDAgBkFwCDAgCDAAB9EQB8DABv
-EAABZBgAZBkAZgIAfRIAbg0AAWQaAGQZAGYCAH0SAHwSAGQbAGQcAGYCAGQdAGQeAGYCAGQfAGQg
-AGYCAGQhAGQiAGYCAGQjAGQkAGYCAGYGAH0TAHwMAAxvZQABdAIAfA0AZCUAgwIAfAEAZCYAdAIA
-dAIAfBEAZCcAgwIAZCgAgwIAgwAAZBsAZCkAZCoAZA4AZCsAZCwAZC0AZC4AZC8AfA4AZDAAZDEA
-ZDIAfBMAZDMAfA8AgwAJgwEAAW7jAAFkNAB8CQAXfRQAdAIAdAIAdAMAZDUAgwIAfBQAgwEAZDYA
-gwIAgwAAfRUAfBUAdBAAfA4AgwEAZDcAPHwVAHQQAHwOAIMBAGQ4ADx0AgB8DQBkJQCDAgB8AQBk
-JgB0AgB0AgB8EQBkJwCDAgBkKACDAgCDAABkGwB0AgB0AgB0AgB8EQBkOQCDAgBkOgCDAgBkOwBk
-KQCDAgBkPACDAgBkPQCDAQBkKgBkDgBkKwBkPgBkLQBkPwBkLwB8DgBkMABkQABkMgB8EwBkQQB8
-FABkQgB8FQBkMwB8DwCDAAuDAQABfA0AU2QAAFMoQwAAAE4oAQAAAHMNAAAAUmVwb3J0U2VjdGlv
-bnMHAAAAUkVRVUVTVHMHAAAAYXRfZGF0ZXMcAAAAdHJhbnNhY3Rpb25fc2VjdGlvbl9jYXRlZ29y
-eXMcAAAAdHJhbnNhY3Rpb25fc2ltdWxhdGlvbl9zdGF0ZXMIAAAAZ2FwX3Jvb3RzAwAAAGdldHMJ
-AAAAZnJvbV9kYXRlcwkAAAB0cmVlX21vZGVpAAAAAHMQAAAAc2VjdGlvbl9jYXRlZ29yeXMkAAAA
-YWNjb3VudGluZ190cmFuc2FjdGlvbl9saW5lX2N1cnJlbmN5cxAAAABpc19yZXBvcnRfb3BlbmVk
-aQEAAABzDAAAAHJlcG9ydF9kZXB0aGkFAAAAcygAAABwcmVmZXJyZWRfYWNjb3VudGluZ190cmFu
-c2FjdGlvbl9hdF9kYXRlczEAAABwcmVmZXJyZWRfYWNjb3VudGluZ190cmFuc2FjdGlvbl9zZWN0
-aW9uX2NhdGVnb3J5czEAAABwcmVmZXJyZWRfYWNjb3VudGluZ190cmFuc2FjdGlvbl9zaW11bGF0
-aW9uX3N0YXRlcykAAABwcmVmZXJyZWRfYWNjb3VudGluZ190cmFuc2FjdGlvbl9nYXBfcm9vdHMq
-AAAAcHJlZmVycmVkX2FjY291bnRpbmdfdHJhbnNhY3Rpb25fZnJvbV9kYXRlcwoAAABwb3J0YWxf
-dXJscw8AAABnZXRQb3J0YWxPYmplY3RzBgAAAGdhcF9pZHMDAAAAR0FQcwIAAABpZHMFAAAAdGl0
-bGVzBwAAAEFjY291bnRzBQAAAGRlYml0cwUAAABEZWJpdHMGAAAAY3JlZGl0cwYAAABDcmVkaXRz
-DQAAAGRlYml0X2JhbGFuY2VzDQAAAERlYml0IEJhbGFuY2VzDgAAAGNyZWRpdF9iYWxhbmNlcw4A
-AABDcmVkaXQgQmFsYW5jZXMGAAAAYXBwZW5kcwQAAABwYXRocw4AAABhY2NvdW50X21vZHVsZXMP
-AAAAZ2V0UGh5c2ljYWxQYXRocw0AAABUcmlhbCBCYWxhbmNlcwUAAABsZXZlbHMHAAAAZm9ybV9p
-ZHMsAAAAQWNjb3VudE1vZHVsZV92aWV3QWNjb3VudExpc3RGb3JUcmlhbEJhbGFuY2VzDgAAAHNl
-bGVjdGlvbl9uYW1lcxQAAABhY2NvdW50aW5nX3NlbGVjdGlvbnMQAAAAc2VsZWN0aW9uX3BhcmFt
-c3MUAAAAbGlzdGJveF9kaXNwbGF5X21vZGVzDAAAAEZsYXRMaXN0TW9kZXMRAAAAc2VsZWN0aW9u
-X2NvbHVtbnNzCwAAAHByZWZlcmVuY2VzcxIAAABwb3J0YWxfY2F0ZWdvcmllcy9zEgAAAHJlc3Ry
-aWN0ZWRUcmF2ZXJzZXMLAAAAZ2V0UGF0aExpc3RzCwAAAHJlcG9ydF9saXN0cwsAAAByZXBvcnRf
-cGF0aHMTAAAAdHJhbnNsYXRpb25fc2VydmljZXMJAAAAdHJhbnNsYXRlcwIAAAB1aXMGAAAAZW5j
-b2RlcwQAAAB1dGY4cx0AAABBY2NvdW50TW9kdWxlX3ZpZXdBY2NvdW50TGlzdHMRAAAAYWNjb3Vu
-dF9zZWxlY3Rpb25zDgAAAFJlcG9ydFRyZWVNb2RlcxUAAABzZWxlY3Rpb25fcmVwb3J0X3BhdGhz
-FQAAAHNlbGVjdGlvbl9yZXBvcnRfbGlzdCgWAAAAcxgAAABQcm9kdWN0cy5FUlA1Rm9ybS5SZXBv
-cnRzDQAAAFJlcG9ydFNlY3Rpb25zCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAcmVxdWVz
-dHMJAAAAX2dldGl0ZW1fcwcAAABhdF9kYXRlcxwAAAB0cmFuc2FjdGlvbl9zZWN0aW9uX2NhdGVn
-b3J5cxwAAAB0cmFuc2FjdGlvbl9zaW11bGF0aW9uX3N0YXRlcwgAAABnYXBfcm9vdHMEAAAATm9u
-ZXMJAAAAZnJvbV9kYXRlcwkAAAB0cmVlX21vZGVzBgAAAHJlc3VsdHMGAAAAcGFyYW1zcwsAAABw
-cmVmZXJlbmNlc3MHAAAAX3dyaXRlX3MGAAAAcG9ydGFscwsAAABnYXBfaWRfbGluZXMPAAAAYmFs
-YW5jZV9jb2x1bW5zcxUAAABzZWxlY3Rpb25fcmVwb3J0X3BhdGhzFQAAAHNlbGVjdGlvbl9yZXBv
-cnRfbGlzdCgWAAAAcxgAAABQcm9kdWN0cy5FUlA1Rm9ybS5SZXBvcnRzDQAAAFJlcG9ydFNlY3Rp
-b25zCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAcmVxdWVzdHMJAAAAX2dldGl0ZW1fcwcA
-AABhdF9kYXRlcxwAAAB0cmFuc2FjdGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwAAAB0cmFuc2FjdGlv
-bl9zaW11bGF0aW9uX3N0YXRlcwgAAABnYXBfcm9vdHMEAAAATm9uZXMJAAAAZnJvbV9kYXRlcwkA
-AAB0cmVlX21vZGVzBgAAAHJlc3VsdHMGAAAAcGFyYW1zcwsAAABwcmVmZXJlbmNlc3MHAAAAX3dy
-aXRlX3MGAAAAcG9ydGFscwsAAABnYXBfaWRfbGluZXMPAAAAYmFsYW5jZV9jb2x1bW5zcxUAAABz
-ZWxlY3Rpb25fcmVwb3J0X3BhdGhzFQAAAHNlbGVjdGlvbl9yZXBvcnRfbGlzdCgAAAAAKAAAAABz
-DwAAAFNjcmlwdCAoUHl0aG9uKXMuAAAAQWNjb3VudE1vZHVsZV9nZXRUcmlhbEJhbGFuY2VSZXBv
-cnRTZWN0aW9uTGlzdAEAAABzbAAAAAAFDQIPAg8BDwEPAQ8BGAQYAwYBBwEJAQkBCQEJARsDCAMH
-AQkCCQIJAQgDBwEQARQCGwIHARACDAIAAQMBCQMJAQkBCQEPBAsBCQE5BQwCBgEOBAoBIQEQARMC
-CQEqATkEDAIGAQYBBgEKBCgBAAAAcy4AAABBY2NvdW50TW9kdWxlX2dldFRyaWFsQmFsYW5jZVJl
-cG9ydFNlY3Rpb25MaXN0KAEAAABzLgAAAEFjY291bnRNb2R1bGVfZ2V0VHJpYWxCYWxhbmNlUmVw
-b3J0U2VjdGlvbkxpc3QoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+
-AQAAAHMAAAAA</string> </value>
+AH0LAHQCAHwEAGQHAIMCAGQJAGQKAIMCAH0MAHQCAHwEAGQHAIMCAGQLAGQKAIMCAH0NAHwNAG8K
+AAFkDACCAQBuAQABZwAAfQ4AaAAABGQDAHwGAAM8BGQEAHwHAAM8BGQNAHwHAAM8BGQFAHwIAAM8
+BGQOAHQKAAM8BGQPAGQQAAM8BGQRAGQSAAM8BGQGAHwJAAM8BGQJAHwMAAM8fQ8AaAAABGQTAHwG
+AAM8BGQUAHwHAAM8BGQVAHwIAAM8BGQWAHwJAAM8fRAAfAsAbyQAAXwLAHQRAHwPAIMBAGQIADx8
+CwB0EQB8EACDAQBkFwA8bgEAAXQCAHQCAHQDAGQYAIMCAGQZAIMCAIMAAH0SAHwNAG8QAAFkGgBk
+GwBmAgB9EwBuDQABZBwAZBsAZgIAfRMAfBMAZB0AZB4AZgIAZB8AZCAAZgIAZCEAZCIAZgIAZCMA
+ZCQAZgIAZCUAZCYAZgIAZgYAfRQAfA0ADG+PAAF0AgB8DgBkJwCDAgB8AQBkKAB0AgB0AgB8EgBk
+KQCDAgBkKgCDAgCDAABkHQB0AgB0AgB0AgB8EgBkKwCDAgBkLACDAgBkLQBkLgCDAgBkLwCDAgBk
+MACDAQBkMQBkEABkMgBkMwBkNABkNQBkNgB8DwBkNwBkOABkOQB8FABkOgB8EACDAAmDAQABbrkA
+AWQ7AHwJABd9FQB0AgB0AgB0AwBkPACDAgB8FQCDAQBkPQCDAgCDAAB9FgB8FgB0EQB8DwCDAQBk
+PgA8fBYAdBEAfA8AgwEAZD8APHQCAHwOAGQnAIMCAHwBAGQoAHQCAHQCAHwSAGQpAIMCAGQqAIMC
+AIMAAGQdAGQuAGQxAGQQAGQyAGRAAGQ0AGRBAGQ2AHwPAGQ3AGRCAGQ5AHwUAGRDAHwVAGREAHwW
+AGQ6AHwQAIMAC4MBAAF8DgBTZAAAUyhFAAAATigBAAAAcw0AAABSZXBvcnRTZWN0aW9ucwcAAABS
+RVFVRVNUcwcAAABhdF9kYXRlcxwAAAB0cmFuc2FjdGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwAAAB0
+cmFuc2FjdGlvbl9zaW11bGF0aW9uX3N0YXRlcwgAAABnYXBfcm9vdHMDAAAAZ2V0cwkAAABmcm9t
+X2RhdGVzDwAAAGV4cGFuZF9hY2NvdW50c2kAAAAAcwkAAAB0cmVlX21vZGVzJAAAAHRyZWUgbW9k
+ZSBubyBsb25nZXIgc3VwcG9ydGVkLCBzb3JyeXMQAAAAc2VjdGlvbl9jYXRlZ29yeXMkAAAAYWNj
+b3VudGluZ190cmFuc2FjdGlvbl9saW5lX2N1cnJlbmN5cxAAAABpc19yZXBvcnRfb3BlbmVkaQEA
+AABzDAAAAHJlcG9ydF9kZXB0aGkFAAAAcygAAABwcmVmZXJyZWRfYWNjb3VudGluZ190cmFuc2Fj
+dGlvbl9hdF9kYXRlczEAAABwcmVmZXJyZWRfYWNjb3VudGluZ190cmFuc2FjdGlvbl9zZWN0aW9u
+X2NhdGVnb3J5czEAAABwcmVmZXJyZWRfYWNjb3VudGluZ190cmFuc2FjdGlvbl9zaW11bGF0aW9u
+X3N0YXRlcykAAABwcmVmZXJyZWRfYWNjb3VudGluZ190cmFuc2FjdGlvbl9nYXBfcm9vdHMqAAAA
+cHJlZmVycmVkX2FjY291bnRpbmdfdHJhbnNhY3Rpb25fZnJvbV9kYXRlcwoAAABwb3J0YWxfdXJs
+cw8AAABnZXRQb3J0YWxPYmplY3RzBgAAAGdhcF9pZHMDAAAAR0FQcwIAAABpZHMFAAAAdGl0bGVz
+BwAAAEFjY291bnRzDwAAAG9wZW5pbmdfYmFsYW5jZXMPAAAAT3BlbmluZyBCYWxhbmNlcw4AAABk
+ZWJpdF9tb3ZlbWVudHMPAAAARGViaXQgTW92ZW1lbnRzcw8AAABjcmVkaXRfbW92ZW1lbnRzEAAA
+AENyZWRpdCBNb3ZlbWVudHNzDwAAAGNsb3NpbmdfYmFsYW5jZXMPAAAAQ2xvc2luZyBCYWxhbmNl
+cwYAAABhcHBlbmRzBAAAAHBhdGhzDgAAAGFjY291bnRfbW9kdWxlcw8AAABnZXRQaHlzaWNhbFBh
+dGhzEwAAAHRyYW5zbGF0aW9uX3NlcnZpY2VzCQAAAHRyYW5zbGF0ZXMCAAAAdWlzDQAAAFRyaWFs
+IEJhbGFuY2VzBgAAAGVuY29kZXMEAAAAdXRmOHMFAAAAbGV2ZWxzBwAAAGZvcm1faWRzLAAAAEFj
+Y291bnRNb2R1bGVfdmlld0FjY291bnRMaXN0Rm9yVHJpYWxCYWxhbmNlcw4AAABzZWxlY3Rpb25f
+bmFtZXMUAAAAYWNjb3VudGluZ19zZWxlY3Rpb25zEAAAAHNlbGVjdGlvbl9wYXJhbXNzFAAAAGxp
+c3Rib3hfZGlzcGxheV9tb2RlcwwAAABGbGF0TGlzdE1vZGVzEQAAAHNlbGVjdGlvbl9jb2x1bW5z
+cwsAAABwcmVmZXJlbmNlc3MSAAAAcG9ydGFsX2NhdGVnb3JpZXMvcxIAAAByZXN0cmljdGVkVHJh
+dmVyc2VzCwAAAGdldFBhdGhMaXN0cwsAAAByZXBvcnRfbGlzdHMLAAAAcmVwb3J0X3BhdGhzHQAA
+AEFjY291bnRNb2R1bGVfdmlld0FjY291bnRMaXN0cxEAAABhY2NvdW50X3NlbGVjdGlvbnMOAAAA
+UmVwb3J0VHJlZU1vZGVzFQAAAHNlbGVjdGlvbl9yZXBvcnRfcGF0aHMVAAAAc2VsZWN0aW9uX3Jl
+cG9ydF9saXN0KBcAAABzGAAAAFByb2R1Y3RzLkVSUDVGb3JtLlJlcG9ydHMNAAAAUmVwb3J0U2Vj
+dGlvbnMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwcAAAByZXF1ZXN0cwkAAABfZ2V0aXRlbV9z
+BwAAAGF0X2RhdGVzHAAAAHRyYW5zYWN0aW9uX3NlY3Rpb25fY2F0ZWdvcnlzHAAAAHRyYW5zYWN0
+aW9uX3NpbXVsYXRpb25fc3RhdGVzCAAAAGdhcF9yb290cwQAAABOb25lcwkAAABmcm9tX2RhdGVz
+DwAAAGV4cGFuZF9hY2NvdW50c3MJAAAAdHJlZV9tb2RlcwYAAAByZXN1bHRzBgAAAHBhcmFtc3ML
+AAAAcHJlZmVyZW5jZXNzBwAAAF93cml0ZV9zBgAAAHBvcnRhbHMLAAAAZ2FwX2lkX2xpbmVzDwAA
+AGJhbGFuY2VfY29sdW1uc3MVAAAAc2VsZWN0aW9uX3JlcG9ydF9wYXRocxUAAABzZWxlY3Rpb25f
+cmVwb3J0X2xpc3QoFwAAAHMYAAAAUHJvZHVjdHMuRVJQNUZvcm0uUmVwb3J0cw0AAABSZXBvcnRT
+ZWN0aW9ucwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzBwAAAHJlcXVlc3RzCQAAAF9nZXRpdGVt
+X3MHAAAAYXRfZGF0ZXMcAAAAdHJhbnNhY3Rpb25fc2VjdGlvbl9jYXRlZ29yeXMcAAAAdHJhbnNh
+Y3Rpb25fc2ltdWxhdGlvbl9zdGF0ZXMIAAAAZ2FwX3Jvb3RzBAAAAE5vbmVzCQAAAGZyb21fZGF0
+ZXMPAAAAZXhwYW5kX2FjY291bnRzcwkAAAB0cmVlX21vZGVzBgAAAHJlc3VsdHMGAAAAcGFyYW1z
+cwsAAABwcmVmZXJlbmNlc3MHAAAAX3dyaXRlX3MGAAAAcG9ydGFscwsAAABnYXBfaWRfbGluZXMP
+AAAAYmFsYW5jZV9jb2x1bW5zcxUAAABzZWxlY3Rpb25fcmVwb3J0X3BhdGhzFQAAAHNlbGVjdGlv
+bl9yZXBvcnRfbGlzdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMuAAAAQWNjb3VudE1v
+ZHVsZV9nZXRUcmlhbEJhbGFuY2VSZXBvcnRTZWN0aW9uTGlzdAEAAABzdAAAAAAFDQIPAg8BDwEP
+AQ8BGAEYBRgBBwEKAgYBBwEJAQkBCQEJARsDCQEIAwcBCQIJAgkBCAMHARABFAIbAgcBEAIMAgAB
+AwEJAQkBCQEJAQ8ECwEJASoCOQQMAgYBDgQKASEBEAETAgkBOQUMAgYBBgEGAQoEKAEAAABzLgAA
+AEFjY291bnRNb2R1bGVfZ2V0VHJpYWxCYWxhbmNlUmVwb3J0U2VjdGlvbkxpc3QoAQAAAHMuAAAA
+QWNjb3VudE1vZHVsZV9nZXRUcmlhbEJhbGFuY2VSZXBvcnRTZWN0aW9uTGlzdCgAAAAAKAAAAABz
+DwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
@@ -237,7 +243,7 @@ AQAAAHMAAAAA</string> </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountModule_getTrialBalanceReportSectionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getTrialBalanceReportSectionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -279,6 +285,7 @@ AQAAAHMAAAAA</string> </value>
                             <string>gap_root</string>
                             <string>None</string>
                             <string>from_date</string>
+                            <string>expand_accounts</string>
                             <string>tree_mode</string>
                             <string>result</string>
                             <string>params</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReport.xml

@@ -73,6 +73,7 @@
                     <key> <string>Default</string> </key>
                     <value>
                       <list>
+                        <string>from_date</string>
                         <string>at_date</string>
                         <string>transaction_section_category</string>
                         <string>transaction_simulation_state</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewTrialBalanceReportDialog.xml

@@ -78,6 +78,7 @@
                         <string>my_transaction_section_category</string>
                         <string>my_from_date</string>
                         <string>my_at_date</string>
+                        <string>my_expand_accounts</string>
                         <string>my_portal_skin</string>
                       </list>
                     </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statSourceBalance.xml

@@ -70,15 +70,15 @@
 if kw.has_key(\'where_expression\'):\n
   params[\'where_expression\'] = kw[\'where_expression\']\n
 if kw.get(\'resource\'):\n
-  try: params[\'resource_uid\'] = context.restritedTraverse(selection_params[\'resource\'])\n
-  except KeyError: pass\n
+  try: params[\'resource_uid\'] = context.restritedTraverse(selection_params[\'resource\']).getUid()\n
+  except (KeyError, AttributeError): pass\n
 \n
 # read settings from user preference\n
 preference = context.getPortalObject().portal_preferences\n
-from_date = preference.getPreferredAccountingTransactionFromDate()\n
+from_date = kw.get(\'from_date\', preference.getPreferredAccountingTransactionFromDate())\n
 if from_date :\n
   params[\'from_date\'] = from_date\n
-at_date = preference.getPreferredAccountingTransactionAtDate()\n
+at_date =  kw.get(\'at_date\', preference.getPreferredAccountingTransactionAtDate())\n
 if at_date :\n
   params[\'at_date\'] = at_date\n
 simulation_state = preference.getPreferredAccountingTransactionSimulationStateList()\n
@@ -93,48 +93,84 @@ if kw.get(\'omit_input\') :\n
 if kw.get(\'omit_output\') :\n
   params[\'omit_output\'] = 1\n
 \n
-result = context.Account_zGetTotalQuantity(node_uid=context.getUid(), **params)\n
+MARKER = []\n
+kw = selection.getParams()\n
+source_payment_uid = kw.get(\'source_payment_uid\', MARKER)\n
+if source_payment_uid is not MARKER:\n
+  params[\'source_payment_uid\'] = source_payment_uid\n
+no_source_payment = kw.get(\'no_source_payment_uid\', MARKER)\n
+if no_source_payment is not MARKER:\n
+  params[\'no_source_payment_uid\'] = 1\n
+\n
+destination_section_uid = kw.get(\'destination_section_uid\', MARKER)\n
+if destination_section_uid is not MARKER:\n
+  params[\'destination_section_uid\'] = destination_section_uid\n
+no_destination_section = kw.get(\'no_destination_section\', MARKER)\n
+if no_destination_section is not MARKER:\n
+  params[\'no_destination_section\'] = 1\n
+\n
+params[\'node_uid\'] = kw.get(\'node_uid\', context.getUid())\n
+\n
+if kw.get(\'from_date_summary\', 0) :\n
+  if params.has_key(\'from_date\'):\n
+    del params[\'from_date\']\n
+\n
+#context.log("SQL with %s \\n" % params, context.Account_zGetTotalQuantity(src__=1, **params))\n
+result = context.Account_zGetTotalQuantity(**params)\n
 row = result[0]\n
 return float(\'%.02f\' % (row.quantity or 0.0) )\n
-\n
-# vim: syntax=python\n
 </string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAABIAAAAgAAAASwAA
-AHMTAgAAaAAAfQIAdAEAfAEAZAEAgwIAZAIAgwEAbx0AAXQDAHwBAGQCAIMCAHQEAHwCAIMBAGQC
-ADxuAQABdAEAfAEAZAMAgwIAZAQAgwEAb0YAAXksAHQBAHQFAGQFAIMCAHQDAHQGAGQEAIMCAIMB
-AHQEAHwCAIMBAGQGADxXcZUABHQHAGoKAG8HAAEBAQFxlQABWG4BAAF0AQB0AQB0BQBkBwCDAgCD
-AABkCACDAgB9CQB0AQB8CQBkCQCDAgCDAAB9CgB8CgBvFAABfAoAdAQAfAIAgwEAZAoAPG4BAAF0
-AQB8CQBkCwCDAgCDAAB9CwB8CwBvFAABfAsAdAQAfAIAgwEAZAwAPG4BAAF0AQB8CQBkDQCDAgCD
-AAB9DAB8DABvFAABfAwAdAQAfAIAgwEAZA4APG4BAAF0AQB8CQBkDwCDAgCDAAB9DQB8DQBvFAAB
-fA0AdAQAfAIAgwEAZBAAPG4BAAF0AQB8AQBkAwCDAgBkEQCDAQBvFAABZBIAdAQAfAIAgwEAZBEA
-PG4BAAF0AQB8AQBkAwCDAgBkEwCDAQBvFAABZBIAdAQAfAIAgwEAZBMAPG4BAAF0DQB0AQB0BQBk
-FACDAgBkFQB0AQB0BQBkFgCDAgCDAAB8AgCNAQF9DwB0AwB8DwBkFwCDAgB9EAB0EABkGAB0AQB8
-EABkGQCDAgBwBAABZBoAFoMBAFNkAABTKBsAAABOcwcAAABoYXNfa2V5cxAAAAB3aGVyZV9leHBy
-ZXNzaW9ucwMAAABnZXRzCAAAAHJlc291cmNlcxEAAAByZXN0cml0ZWRUcmF2ZXJzZXMMAAAAcmVz
-b3VyY2VfdWlkcw8AAABnZXRQb3J0YWxPYmplY3RzEgAAAHBvcnRhbF9wcmVmZXJlbmNlc3MpAAAA
-Z2V0UHJlZmVycmVkQWNjb3VudGluZ1RyYW5zYWN0aW9uRnJvbURhdGVzCQAAAGZyb21fZGF0ZXMn
-AAAAZ2V0UHJlZmVycmVkQWNjb3VudGluZ1RyYW5zYWN0aW9uQXREYXRlcwcAAABhdF9kYXRlczQA
-AABnZXRQcmVmZXJyZWRBY2NvdW50aW5nVHJhbnNhY3Rpb25TaW11bGF0aW9uU3RhdGVMaXN0cxwA
-AAB0cmFuc2FjdGlvbl9zaW11bGF0aW9uX3N0YXRlczAAAABnZXRQcmVmZXJyZWRBY2NvdW50aW5n
-VHJhbnNhY3Rpb25TZWN0aW9uQ2F0ZWdvcnlzHAAAAHRyYW5zYWN0aW9uX3NlY3Rpb25fY2F0ZWdv
-cnlzCgAAAG9taXRfaW5wdXRpAQAAAHMLAAAAb21pdF9vdXRwdXRzGQAAAEFjY291bnRfekdldFRv
-dGFsUXVhbnRpdHlzCAAAAG5vZGVfdWlkcwYAAABnZXRVaWRpAAAAAHMFAAAAJS4wMmZzCAAAAHF1
-YW50aXR5ZgMwLjAoEQAAAHMGAAAAcGFyYW1zcwkAAABfZ2V0YXR0cl9zAgAAAGt3cwkAAABfZ2V0
-aXRlbV9zBwAAAF93cml0ZV9zBwAAAGNvbnRleHRzEAAAAHNlbGVjdGlvbl9wYXJhbXNzCAAAAEtl
-eUVycm9ycwoAAABwcmVmZXJlbmNlcwkAAABmcm9tX2RhdGVzBwAAAGF0X2RhdGVzEAAAAHNpbXVs
-YXRpb25fc3RhdGVzEAAAAHNlY3Rpb25fY2F0ZWdvcnlzBwAAAF9hcHBseV9zBgAAAHJlc3VsdHMD
-AAAAcm93cwUAAABmbG9hdCgSAAAAcwkAAABzZWxlY3Rpb25zAgAAAGt3cwYAAABwYXJhbXNzCQAA
-AF9nZXRhdHRyX3MJAAAAX2dldGl0ZW1fcwcAAABfd3JpdGVfcwcAAABjb250ZXh0cxAAAABzZWxl
-Y3Rpb25fcGFyYW1zcwgAAABLZXlFcnJvcnMKAAAAcHJlZmVyZW5jZXMJAAAAZnJvbV9kYXRlcwcA
-AABhdF9kYXRlcxAAAABzaW11bGF0aW9uX3N0YXRlcxAAAABzZWN0aW9uX2NhdGVnb3J5cwcAAABf
-YXBwbHlfcwYAAAByZXN1bHRzAwAAAHJvd3MFAAAAZmxvYXQoAAAAACgAAAAAcw8AAABTY3JpcHQg
-KFB5dGhvbilzGQAAAEFjY291bnRfc3RhdFNvdXJjZUJhbGFuY2UBAAAAczIAAAAJARMBIAETAS8B
-FwMbARIBBwEUARIBBwEUARIBBwEUARIBBwEXAhMBFwETARQCKgEPASgBAAAAcxkAAABBY2NvdW50
-X3N0YXRTb3VyY2VCYWxhbmNlKAEAAABzGQAAAEFjY291bnRfc3RhdFNvdXJjZUJhbGFuY2UoAAAA
-ACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
+            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAQAAABgAAAAzAAAASwAA
+AHOlAwAAaAAAfQIAdAEAfAEAZAEAgwIAZAIAgwEAbx0AAXQDAHwBAGQCAIMCAHQEAHwCAIMBAGQC
+ADxuAQABdAEAfAEAZAMAgwIAZAQAgwEAb1gAAXk4AHQBAHQBAHQFAGQFAIMCAHQDAHQGAGQEAIMC
+AIMBAGQGAIMCAIMAAHQEAHwCAIMBAGQHADxXcacABHQHAHQIAGYCAGoKAG8HAAEBAQFxpwABWG4B
+AAF0AQB0AQB0BQBkCACDAgCDAABkCQCDAgB9CgB0AQB8AQBkAwCDAgBkCgB0AQB8CgBkCwCDAgCD
+AACDAgB9CwB8CwBvFAABfAsAdAQAfAIAgwEAZAoAPG4BAAF0AQB8AQBkAwCDAgBkDAB0AQB8CgBk
+DQCDAgCDAACDAgB9DAB8DABvFAABfAwAdAQAfAIAgwEAZAwAPG4BAAF0AQB8CgBkDgCDAgCDAAB9
+DQB8DQBvFAABfA0AdAQAfAIAgwEAZA8APG4BAAF0AQB8CgBkEACDAgCDAAB9DgB8DgBvFAABfA4A
+dAQAfAIAgwEAZBEAPG4BAAF0AQB8AQBkAwCDAgBkEgCDAQBvFAABZBMAdAQAfAIAgwEAZBIAPG4B
+AAF0AQB8AQBkAwCDAgBkFACDAQBvFAABZBMAdAQAfAIAgwEAZBQAPG4BAAFnAAB9DwB0AQB8AABk
+FQCDAgCDAAB9AQB0AQB8AQBkAwCDAgBkFgB8DwCDAgB9EAB8EAB8DwBqCQBvFAABfBAAdAQAfAIA
+gwEAZBYAPG4BAAF0AQB8AQBkAwCDAgBkFwB8DwCDAgB9EQB8EQB8DwBqCQBvFAABZBMAdAQAfAIA
+gwEAZBcAPG4BAAF0AQB8AQBkAwCDAgBkGAB8DwCDAgB9EgB8EgB8DwBqCQBvFAABfBIAdAQAfAIA
+gwEAZBgAPG4BAAF0AQB8AQBkAwCDAgBkGQB8DwCDAgB9EwB8EwB8DwBqCQBvFAABZBMAdAQAfAIA
+gwEAZBkAPG4BAAF0AQB8AQBkAwCDAgBkGgB0AQB0BQBkBgCDAgCDAACDAgB0BAB8AgCDAQBkGgA8
+dAEAfAEAZAMAgwIAZBsAZBwAgwIAbysAAXQBAHwCAGQBAIMCAGQKAIMBAG8RAAF0BAB8AgCDAQBk
+CgA9cVwDAW4BAAF0FAB0AQB0BQBkHQCDAgB8AgCNAQB9FQB0AwB8FQBkHACDAgB9FgB0FwBkHgB0
+AQB8FgBkHwCDAgBwBAABZCAAFoMBAFNkAABTKCEAAABOcwcAAABoYXNfa2V5cxAAAAB3aGVyZV9l
+eHByZXNzaW9ucwMAAABnZXRzCAAAAHJlc291cmNlcxEAAAByZXN0cml0ZWRUcmF2ZXJzZXMGAAAA
+Z2V0VWlkcwwAAAByZXNvdXJjZV91aWRzDwAAAGdldFBvcnRhbE9iamVjdHMSAAAAcG9ydGFsX3By
+ZWZlcmVuY2VzcwkAAABmcm9tX2RhdGVzKQAAAGdldFByZWZlcnJlZEFjY291bnRpbmdUcmFuc2Fj
+dGlvbkZyb21EYXRlcwcAAABhdF9kYXRlcycAAABnZXRQcmVmZXJyZWRBY2NvdW50aW5nVHJhbnNh
+Y3Rpb25BdERhdGVzNAAAAGdldFByZWZlcnJlZEFjY291bnRpbmdUcmFuc2FjdGlvblNpbXVsYXRp
+b25TdGF0ZUxpc3RzHAAAAHRyYW5zYWN0aW9uX3NpbXVsYXRpb25fc3RhdGVzMAAAAGdldFByZWZl
+cnJlZEFjY291bnRpbmdUcmFuc2FjdGlvblNlY3Rpb25DYXRlZ29yeXMcAAAAdHJhbnNhY3Rpb25f
+c2VjdGlvbl9jYXRlZ29yeXMKAAAAb21pdF9pbnB1dGkBAAAAcwsAAABvbWl0X291dHB1dHMJAAAA
+Z2V0UGFyYW1zcxIAAABzb3VyY2VfcGF5bWVudF91aWRzFQAAAG5vX3NvdXJjZV9wYXltZW50X3Vp
+ZHMXAAAAZGVzdGluYXRpb25fc2VjdGlvbl91aWRzFgAAAG5vX2Rlc3RpbmF0aW9uX3NlY3Rpb25z
+CAAAAG5vZGVfdWlkcxEAAABmcm9tX2RhdGVfc3VtbWFyeWkAAAAAcxkAAABBY2NvdW50X3pHZXRU
+b3RhbFF1YW50aXR5cwUAAAAlLjAyZnMIAAAAcXVhbnRpdHlmAzAuMCgYAAAAcwYAAABwYXJhbXNz
+CQAAAF9nZXRhdHRyX3MCAAAAa3dzCQAAAF9nZXRpdGVtX3MHAAAAX3dyaXRlX3MHAAAAY29udGV4
+dHMQAAAAc2VsZWN0aW9uX3BhcmFtc3MIAAAAS2V5RXJyb3JzDgAAAEF0dHJpYnV0ZUVycm9ycwoA
+AABwcmVmZXJlbmNlcwkAAABmcm9tX2RhdGVzBwAAAGF0X2RhdGVzEAAAAHNpbXVsYXRpb25fc3Rh
+dGVzEAAAAHNlY3Rpb25fY2F0ZWdvcnlzBgAAAE1BUktFUnMJAAAAc2VsZWN0aW9ucxIAAABzb3Vy
+Y2VfcGF5bWVudF91aWRzEQAAAG5vX3NvdXJjZV9wYXltZW50cxcAAABkZXN0aW5hdGlvbl9zZWN0
+aW9uX3VpZHMWAAAAbm9fZGVzdGluYXRpb25fc2VjdGlvbnMHAAAAX2FwcGx5X3MGAAAAcmVzdWx0
+cwMAAAByb3dzBQAAAGZsb2F0KBgAAABzCQAAAHNlbGVjdGlvbnMCAAAAa3dzBgAAAHBhcmFtc3MJ
+AAAAX2dldGF0dHJfcwkAAABfZ2V0aXRlbV9zBwAAAF93cml0ZV9zBwAAAGNvbnRleHRzEAAAAHNl
+bGVjdGlvbl9wYXJhbXNzCAAAAEtleUVycm9ycw4AAABBdHRyaWJ1dGVFcnJvcnMKAAAAcHJlZmVy
+ZW5jZXMJAAAAZnJvbV9kYXRlcwcAAABhdF9kYXRlcxAAAABzaW11bGF0aW9uX3N0YXRlcxAAAABz
+ZWN0aW9uX2NhdGVnb3J5cwYAAABNQVJLRVJzEgAAAHNvdXJjZV9wYXltZW50X3VpZHMRAAAAbm9f
+c291cmNlX3BheW1lbnRzFwAAAGRlc3RpbmF0aW9uX3NlY3Rpb25fdWlkcxYAAABub19kZXN0aW5h
+dGlvbl9zZWN0aW9ucwcAAABfYXBwbHlfcwYAAAByZXN1bHRzAwAAAHJvd3MFAAAAZmxvYXQoAAAA
+ACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzGQAAAEFjY291bnRfc3RhdFNvdXJjZUJhbGFuY2UB
+AAAAc1YAAAAJARMBIAETATsBHQMbASQBBwEUASQBBwEUARIBBwEUARIBBwEXAhMBFwETARQCBgES
+ARgBDQEUARgBDQEUAhgBDQEUARgBDQEUAjECGQEWARIDGAEPASgBAAAAcxkAAABBY2NvdW50X3N0
+YXRTb3VyY2VCYWxhbmNlKAEAAABzGQAAAEFjY291bnRfc3RhdFNvdXJjZUJhbGFuY2UoAAAAACgA
+AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
@@ -191,11 +227,17 @@ ACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </valu
                             <string>context</string>
                             <string>selection_params</string>
                             <string>KeyError</string>
+                            <string>AttributeError</string>
                             <string>preference</string>
                             <string>from_date</string>
                             <string>at_date</string>
                             <string>simulation_state</string>
                             <string>section_category</string>
+                            <string>MARKER</string>
+                            <string>source_payment_uid</string>
+                            <string>no_source_payment</string>
+                            <string>destination_section_uid</string>
+                            <string>no_destination_section</string>
                             <string>_apply_</string>
                             <string>result</string>
                             <string>row</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zDistinctSectionList.xml

@@ -39,13 +39,41 @@
                     <item>
                         <key> <string>_data</string> </key>
                         <value>
-                          <dictionary/>
+                          <dictionary>
+                            <item>
+                                <key> <string>at_date</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>node_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>simulation_state</string> </key>
+                                <value>
+                                  <dictionary>
+                                    <item>
+                                        <key> <string>type</string> </key>
+                                        <value> <string>list</string> </value>
+                                    </item>
+                                  </dictionary>
+                                </value>
+                            </item>
+                          </dictionary>
                         </value>
                     </item>
                     <item>
                         <key> <string>_keys</string> </key>
                         <value>
-                          <list/>
+                          <list>
+<string>node_uid</string>
+<string>at_date</string>
+<string>simulation_state</string>
+                          </list>
                         </value>
                     </item>
                   </dictionary>
@@ -104,7 +132,9 @@
         </item>
         <item>
             <key> <string>arguments_src</string> </key>
-            <value> <string></string> </value>
+            <value> <string>node_uid\r\n
+at_date\r\n
+simulation_state:list</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -140,16 +170,34 @@
         </item>
         <item>
             <key> <string>src</string> </key>
-            <value> <string>SELECT DISTINCT\n
+            <value> <string encoding="cdata"><![CDATA[
+
+SELECT DISTINCT\n
   catalog.uid,\n
-  catalog.path\n
+  catalog.path,\n
+  catalog.relative_url,\n
+  catalog.title, \n
+  catalog.portal_type\n
 FROM\n
   catalog,\n
   stock\n
 WHERE\n
   stock.mirror_section_uid = catalog.uid\n
+<dtml-if node_uid>\n
+  AND stock.node_uid = <dtml-sqlvar node_uid type="string">\n
+</dtml-if>\n
+<dtml-if at_date>\n
+  AND stock.date <= <dtml-sqlvar at_date type="datetime">\n
+</dtml-if>\n
+<dtml-if simulation_state>\n
+  AND ( <dtml-in simulation_state>\n
+    stock.simulation_state = <dtml-sqlvar sequence-item type="string"><dtml-unless sequence-end>OR </dtml-unless>\n
+  </dtml-in> )\n
+</dtml-if>\n
 ORDER BY\n
-  catalog.title</string> </value>
+  catalog.portal_type, catalog.title
+
+]]></string> </value>
         </item>
         <item>
             <key> <string>template</string> </key>
@@ -183,16 +231,34 @@ ORDER BY\n
                     </item>
                     <item>
                         <key> <string>raw</string> </key>
-                        <value> <string>SELECT DISTINCT\n
+                        <value> <string encoding="cdata"><![CDATA[
+
+SELECT DISTINCT\n
   catalog.uid,\n
-  catalog.path\n
+  catalog.path,\n
+  catalog.relative_url,\n
+  catalog.title, \n
+  catalog.portal_type\n
 FROM\n
   catalog,\n
   stock\n
 WHERE\n
   stock.mirror_section_uid = catalog.uid\n
+<dtml-if node_uid>\n
+  AND stock.node_uid = <dtml-sqlvar node_uid type="string">\n
+</dtml-if>\n
+<dtml-if at_date>\n
+  AND stock.date <= <dtml-sqlvar at_date type="datetime">\n
+</dtml-if>\n
+<dtml-if simulation_state>\n
+  AND ( <dtml-in simulation_state>\n
+    stock.simulation_state = <dtml-sqlvar sequence-item type="string"><dtml-unless sequence-end>OR </dtml-unless>\n
+  </dtml-in> )\n
+</dtml-if>\n
 ORDER BY\n
-  catalog.title</string> </value>
+  catalog.portal_type, catalog.title
+
+]]></string> </value>
                     </item>
                   </dictionary>
                 </state>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetAccountingTransactionList.xml

@@ -46,6 +46,12 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>destination_section_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>from_date</string> </key>
                                 <value>
@@ -58,6 +64,18 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>no_destination_section_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>no_source_payment_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>omit_input</string> </key>
                                 <value>
@@ -99,6 +117,12 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>source_payment_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>to_date</string> </key>
                                 <value>
@@ -148,6 +172,10 @@
 <string>at_date</string>
 <string>transaction_simulation_state</string>
 <string>transaction_section_category</string>
+<string>source_payment_uid</string>
+<string>no_source_payment_uid</string>
+<string>destination_section_uid</string>
+<string>no_destination_section_uid</string>
                           </list>
                         </value>
                     </item>
@@ -188,7 +216,11 @@ from_date\r\n
 to_date\r\n
 at_date\r\n
 transaction_simulation_state:list\r\n
-transaction_section_category</string> </value>
+transaction_section_category\r\n
+source_payment_uid\r\n
+no_source_payment_uid\r\n
+destination_section_uid\r\n
+no_destination_section_uid</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -236,14 +268,11 @@ SELECT\n
   destination_section.title AS third_party,\n
   IF(stock.quantity > 0, stock.quantity, 0.0) AS source_debit,\n
   IF(stock.quantity < 0, - stock.quantity, 0.0) AS source_credit,\n
-  stock.quantity AS source_balance\n
+  stock.quantity AS source_balance,\n
+  stock.payment_uid AS source_payment_uid\n
 FROM\n
   movement,\n
-  stock\n
-  LEFT JOIN catalog AS destination_section \n
-      ON destination_section.uid = stock.mirror_section_uid\n
-        AND stock.node_uid = <dtml-var getUid>,\n
-\n
+  stock,\n
   catalog,\n
   catalog  AS transaction_line,\n
   catalog  AS transaction,\n
@@ -254,9 +283,14 @@ FROM\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if where_expression>, category </dtml-if>\n
+\n
+  LEFT JOIN catalog AS destination_section \n
+      ON destination_section.uid = stock.mirror_section_uid\n
+        AND stock.node_uid = <dtml-var getUid>\n
 \n
 WHERE stock.node_uid = <dtml-var getUid>\n
   AND transaction_line.uid = stock.uid \n
+  AND transaction_line.portal_type <> \'Simulation Movement\'\n
   AND transaction_line.parent_uid = transaction.uid\n
   AND catalog.uid = stock.section_uid\n
   AND movement.uid = stock.uid\n
@@ -269,13 +303,13 @@ WHERE stock.node_uid = <dtml-var getUid>\n
   )\n
 </dtml-if>\n
 <dtml-if from_date>\n
-  AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n
+  AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
 </dtml-if>\n
 <dtml-if at_date>\n
-  AND movement.stop_date <= <dtml-sqlvar at_date type="datetime">\n
+  AND movement.start_date <= <dtml-sqlvar at_date type="datetime">\n
 </dtml-if>\n
 <dtml-if to_date>\n
-  AND movement.stop_date < <dtml-sqlvar to_date type="datetime">\n
+  AND movement.start_date < <dtml-sqlvar to_date type="datetime">\n
 </dtml-if>\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
@@ -283,6 +317,18 @@ WHERE stock.node_uid = <dtml-var getUid>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
 </dtml-if>\n
+<dtml-if source_payment_uid>\n
+  AND stock.payment_uid = <dtml-sqlvar source_payment_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_source_payment_uid>\n
+  AND stock.payment_uid IS NULL\n
+</dtml-if>\n
+<dtml-if destination_section_uid>\n
+  AND stock.mirror_section_uid = <dtml-sqlvar destination_section_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_destination_section_uid>\n
+  AND stock.mirror_section_uid IS NULL\n
+</dtml-if>\n
 <dtml-if transaction_simulation_state>\n
   AND (\n
   <dtml-in transaction_simulation_state>\n
@@ -359,14 +405,11 @@ SELECT\n
   destination_section.title AS third_party,\n
   IF(stock.quantity > 0, stock.quantity, 0.0) AS source_debit,\n
   IF(stock.quantity < 0, - stock.quantity, 0.0) AS source_credit,\n
-  stock.quantity AS source_balance\n
+  stock.quantity AS source_balance,\n
+  stock.payment_uid AS source_payment_uid\n
 FROM\n
   movement,\n
-  stock\n
-  LEFT JOIN catalog AS destination_section \n
-      ON destination_section.uid = stock.mirror_section_uid\n
-        AND stock.node_uid = <dtml-var getUid>,\n
-\n
+  stock,\n
   catalog,\n
   catalog  AS transaction_line,\n
   catalog  AS transaction,\n
@@ -377,9 +420,14 @@ FROM\n
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>\n
   <dtml-if where_expression>, category </dtml-if>\n
+\n
+  LEFT JOIN catalog AS destination_section \n
+      ON destination_section.uid = stock.mirror_section_uid\n
+        AND stock.node_uid = <dtml-var getUid>\n
 \n
 WHERE stock.node_uid = <dtml-var getUid>\n
   AND transaction_line.uid = stock.uid \n
+  AND transaction_line.portal_type <> \'Simulation Movement\'\n
   AND transaction_line.parent_uid = transaction.uid\n
   AND catalog.uid = stock.section_uid\n
   AND movement.uid = stock.uid\n
@@ -392,13 +440,13 @@ WHERE stock.node_uid = <dtml-var getUid>\n
   )\n
 </dtml-if>\n
 <dtml-if from_date>\n
-  AND movement.stop_date >= <dtml-sqlvar from_date type="datetime">\n
+  AND movement.start_date >= <dtml-sqlvar from_date type="datetime">\n
 </dtml-if>\n
 <dtml-if at_date>\n
-  AND movement.stop_date <= <dtml-sqlvar at_date type="datetime">\n
+  AND movement.start_date <= <dtml-sqlvar at_date type="datetime">\n
 </dtml-if>\n
 <dtml-if to_date>\n
-  AND movement.stop_date < <dtml-sqlvar to_date type="datetime">\n
+  AND movement.start_date < <dtml-sqlvar to_date type="datetime">\n
 </dtml-if>\n
 <dtml-if omit_input>\n
   AND stock.quantity < 0\n
@@ -406,6 +454,18 @@ WHERE stock.node_uid = <dtml-var getUid>\n
 <dtml-if omit_output>\n
   AND stock.quantity > 0\n
 </dtml-if>\n
+<dtml-if source_payment_uid>\n
+  AND stock.payment_uid = <dtml-sqlvar source_payment_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_source_payment_uid>\n
+  AND stock.payment_uid IS NULL\n
+</dtml-if>\n
+<dtml-if destination_section_uid>\n
+  AND stock.mirror_section_uid = <dtml-sqlvar destination_section_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_destination_section_uid>\n
+  AND stock.mirror_section_uid IS NULL\n
+</dtml-if>\n
 <dtml-if transaction_simulation_state>\n
   AND (\n
   <dtml-in transaction_simulation_state>\n

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_zGetTotalQuantity.xml

@@ -50,12 +50,30 @@
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>destination_section_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>from_date</string> </key>
                                 <value>
                                   <dictionary/>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>no_destination_section_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
+                            <item>
+                                <key> <string>no_source_payment_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>node_uid</string> </key>
                                 <value>
@@ -91,6 +109,12 @@
                                   </dictionary>
                                 </value>
                             </item>
+                            <item>
+                                <key> <string>source_payment_uid</string> </key>
+                                <value>
+                                  <dictionary/>
+                                </value>
+                            </item>
                             <item>
                                 <key> <string>to_date</string> </key>
                                 <value>
@@ -131,6 +155,10 @@
 <string>at_date</string>
 <string>transaction_simulation_state</string>
 <string>transaction_section_category</string>
+<string>source_payment_uid</string>
+<string>no_source_payment_uid</string>
+<string>destination_section_uid</string>
+<string>no_destination_section_uid</string>
                           </list>
                         </value>
                     </item>
@@ -160,9 +188,13 @@ omit_output\r\n
 resource_uid:list\r\n
 from_date\r\n
 to_date\r\n
-at_date\n
+at_date\r\n
 transaction_simulation_state:list\r\n
-transaction_section_category</string> </value>
+transaction_section_category\r\n
+source_payment_uid\r\n
+no_source_payment_uid\r\n
+destination_section_uid\r\n
+no_destination_section_uid</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -220,6 +252,7 @@ WHERE stock.node_uid = <dtml-var node_uid>\n
   AND child.uid = stock.uid \n
   AND child.parent_uid = catalog.uid\n
   AND movement.uid = stock.uid\n
+  AND child.portal_type <> \'Simulation Movement\'\n
   AND movement.is_accountable = 1\n
 <dtml-if resource_uid>\n
   AND (\n
@@ -243,6 +276,18 @@ WHERE stock.node_uid = <dtml-var node_uid>\n
 <dtml-if omit_output>\n
   AND stock.quantity < 0.0\n
 </dtml-if>\n
+<dtml-if source_payment_uid>\n
+  AND stock.payment_uid = <dtml-sqlvar source_payment_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_source_payment_uid>\n
+  AND stock.payment_uid IS NULL\n
+</dtml-if>\n
+<dtml-if destination_section_uid>\n
+  AND stock.mirror_section_uid = <dtml-sqlvar destination_section_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_destination_section_uid>\n
+  AND stock.mirror_section_uid IS NULL\n
+</dtml-if>\n
 <dtml-if transaction_simulation_state>\n
   AND (\n
   <dtml-in transaction_simulation_state>\n
@@ -320,6 +365,7 @@ WHERE stock.node_uid = <dtml-var node_uid>\n
   AND child.uid = stock.uid \n
   AND child.parent_uid = catalog.uid\n
   AND movement.uid = stock.uid\n
+  AND child.portal_type <> \'Simulation Movement\'\n
   AND movement.is_accountable = 1\n
 <dtml-if resource_uid>\n
   AND (\n
@@ -343,6 +389,18 @@ WHERE stock.node_uid = <dtml-var node_uid>\n
 <dtml-if omit_output>\n
   AND stock.quantity < 0.0\n
 </dtml-if>\n
+<dtml-if source_payment_uid>\n
+  AND stock.payment_uid = <dtml-sqlvar source_payment_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_source_payment_uid>\n
+  AND stock.payment_uid IS NULL\n
+</dtml-if>\n
+<dtml-if destination_section_uid>\n
+  AND stock.mirror_section_uid = <dtml-sqlvar destination_section_uid type="int">\n
+</dtml-if>\n
+<dtml-if no_destination_section_uid>\n
+  AND stock.mirror_section_uid IS NULL\n
+</dtml-if>\n
 <dtml-if transaction_simulation_state>\n
   AND (\n
   <dtml-in transaction_simulation_state>\n