From 36fa2abaaafaf2e990a2d7d1371d7c191c0869ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 21 Dec 2005 19:21:39 +0000 Subject: [PATCH] use getPortalAccountingTransactionTypeList git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4847 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...odule_getOtherPartiesReportSectionList.xml | 125 +++++++------- .../listbox.xml | 33 +++- ...le_getJournalAccountingTransactionList.xml | 159 +++++++++--------- ...ntingTransactionModule_getSourceCredit.xml | 72 ++++---- ...untingTransactionModule_getSourceDebit.xml | 75 ++++----- .../listbox.xml | 27 +-- .../my_transaction_portal_type.xml | 23 ++- ...AccountingTransaction_deleteEmptyLines.xml | 57 +++---- .../BankAccount_statSourceBalance.xml | 2 +- .../listbox.xml | 33 +++- 10 files changed, 328 insertions(+), 278 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml index 869c2fd582..312c4c2a24 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml @@ -83,6 +83,7 @@ role_filter_list = request.get(\'entity_role\', None)\n omit_balanced_accounts = request[\'omit_balanced_accounts\']\n omit_empty_accounts = request[\'omit_empty_accounts\']\n from_date = request.get(\'from_date\', None)\n +accounting_transaction_line_currency = request.get(\'accounting_transaction_line_currency\', None)\n \n # role_filter_list == None means no filter on the role\n if role_filter_list == [\'\'] : \n @@ -162,75 +163,76 @@ return result\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAB0AAAA1AAAAQwAA -AHMQBAAAZAEAawAAbAEAfQEAAXQCAHQDAGQCAIMCAH0EAHQFAHwEAGQDAIMCAH0GAHQFAHwEAGQE + <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAB4AAAA1AAAAQwAA +AHMoBAAAZAEAawAAbAEAfQEAAXQCAHQDAGQCAIMCAH0EAHQFAHwEAGQDAIMCAH0GAHQFAHwEAGQE AIMCAH0HAHQFAHwEAGQFAIMCAH0IAHQCAHwEAGQGAIMCAGQHAHQJAIMCAH0KAHQFAHwEAGQIAIMC -AH0LAHQFAHwEAGQJAIMCAH0MAHQCAHwEAGQGAIMCAGQKAHQJAIMCAH0NAHwKAGQLAGcBAGoCAG8K -AAF0CQB9CgBuAQABZwAAfQ4AaAAABGQDAHwGAAM8BGQEAHwHAAM8BGQMAHwHAAM8BGQNAHwIAAM8 -BGQOAHQJAAM8BGQPAGQQAAM8fQ8AdAUAfAQAZBEAgwIAdBAAfA8AgwEAZBIAPHwNAG8UAAF8DQB0 -EAB8DwCDAQBkCgA8bgEAAXQCAHQCAHQDAGQTAIMCAGQUAIMCAIMAAH0RAGQVAGQWAGYCAGQXAGQY -AGYCAGQZAGQaAGYCAGQbAGQcAGYCAGQdAGQeAGYCAGQfAGQgAGYCAGQNAGQhAGYCAGQiAGQjAGYC -AGQkAGQlAGYCAGQmAGQnAGYCAGcKAH0SAHQFAHwPAGQSAIMCAAxvHQABdAIAfBIAZCgAgwIAZCkA -ZCoAZgIAgwEAAW4BAAF0AgB0AgB0AwBkKwCDAgBkLACDAgBkLQCDAQB9EwB0AgB0AgB0AwBkKwCD -AgBkLgCDAgBkLQB8DwCDAgABeNkBdBQAdAIAdAMAZC8AgwIAgwAAgwEARF2/AX0VAHQCAHwVAGQw -AIMCAIMAAH0WAHwKAG8mAAF0FwB8FgBkMQCDAgBvFgABdAIAfBYAZDEAgwIAgwAAfAoAagcAbwcA -AXEmAm4BAAF0FwB8FgBkMgCDAgBvEAABdAIAfBYAZDIAgwIAgwAAbxoAAWQzAHQCAHwWAGQyAIMC -AIMAABZ9GABuBwABZAsAfRgAfBgAfAcAagMAbyABAXwMAG8iAAF0GQB0GgB0AgB8FgBkNACDAgB8 -DwCNAQCDAQBkNQBqAgBvBAABceUDAXwLAG8iAAF0GwB0GgB0AgB8FgBkNgCDAgB8DwCNAQCDAQBk -NQBqAgBvBAABceUDAXQXAHwWAGQxAIMCAG8QAAF0AgB8FgBkMQCDAgCDAABvLAABZDcAdAIAfBYA -ZDgAgwIAgwAAdAIAfBYAZDEAgwIAgwAAZgIAFn0cAG4TAAF0AgB8FgBkOACDAgCDAAB9HAB0AgB8 -DgBkKACDAgB8AQBkOQB8HABkOgBkOwBkPAB0AgB8FgBkPQCDAgCDAABkPgBkPwBkQABkLQBkQQB8 -DwBkQgB8EgBkQwBkRABkRQBmAgBnAQCDAAiDAQABcSYCAXEmAld0AgB0AgB0AwBkKwCDAgBkLgCD -AgBkLQB8EwCDAgABfA4AU2QAAFMoRgAAAE4oAQAAAHMNAAAAUmVwb3J0U2VjdGlvbnMHAAAAUkVR -VUVTVHMHAAAAdG9fZGF0ZXMcAAAAdHJhbnNhY3Rpb25fc2VjdGlvbl9jYXRlZ29yeXMcAAAAdHJh -bnNhY3Rpb25fc2ltdWxhdGlvbl9zdGF0ZXMDAAAAZ2V0cwsAAABlbnRpdHlfcm9sZXMWAAAAb21p -dF9iYWxhbmNlZF9hY2NvdW50c3MTAAAAb21pdF9lbXB0eV9hY2NvdW50c3MJAAAAZnJvbV9kYXRl -cwAAAABzEAAAAHNlY3Rpb25fY2F0ZWdvcnlzEAAAAHNpbXVsYXRpb25fc3RhdGVzJAAAAGFjY291 -bnRpbmdfdHJhbnNhY3Rpb25fbGluZV9jdXJyZW5jeXMMAAAAcmVwb3J0X2RlcHRoaQUAAABzFwAA -AG9taXRfZ3JvdXBlZF9yZWZlcmVuY2Vzcw0AAABoaWRlX2dyb3VwaW5ncwoAAABwb3J0YWxfdXJs -cw8AAABnZXRQb3J0YWxPYmplY3RzCwAAAGdldFN0b3BEYXRlcwQAAABEYXRlcxoAAABFbnRpdHlf -Z2V0UGFyZW50UG9ydGFsVHlwZXMEAAAAVHlwZXMVAAAARW50aXR5X2dldFNvdXJjZUdhcElkcwMA -AABHQVBzEwAAAEVudGl0eV9nZXRSZWZlcmVuY2VzCgAAAEludm9pY2UgTm9zFQAAAEVudGl0eV9n -ZXRQYXJlbnRUaXRsZXMFAAAAVGl0bGVzGQAAAEVudGl0eV9nZXRTb3VyY2VSZWZlcmVuY2VzCQAA -AFJlZmVyZW5jZXMFAAAAU3RhdGVzDAAAAHNvdXJjZV9kZWJpdHMFAAAARGViaXRzDQAAAHNvdXJj -ZV9jcmVkaXRzBgAAAENyZWRpdHMOAAAAc291cmNlX2JhbGFuY2VzBwAAAEJhbGFuY2VzBgAAAGFw -cGVuZHMSAAAAZ3JvdXBpbmdfcmVmZXJlbmNlcxIAAABHcm91cGluZyBSZWZlcmVuY2VzEQAAAHBv -cnRhbF9zZWxlY3Rpb25zcxIAAABnZXRTZWxlY3Rpb25QYXJhbXNzFAAAAGFjY291bnRpbmdfc2Vs -ZWN0aW9ucxUAAABzZXRTZWxlY3Rpb25QYXJhbXNGb3JzHAAAAEFjY291bnRfekRpc3RpbmN0U2Vj -dGlvbkxpc3RzCQAAAGdldE9iamVjdHMHAAAAZ2V0Um9sZXMIAAAAZ2V0R3JvdXBzCAAAAGdyb3Vw -LyVzcyQAAABFbnRpdHlfekdldEFjY291bnRpbmdUcmFuc2FjdGlvbkxpc3RpAAAAAHMSAAAARW50 -aXR5X3N0YXRCYWxhbmNlcwcAAAAlcyAoJXMpcwgAAABnZXRUaXRsZXMFAAAAdGl0bGVzBQAAAGxl -dmVsaQIAAABzBAAAAHBhdGhzDwAAAGdldFBoeXNpY2FsUGF0aHMHAAAAZm9ybV9pZHMkAAAARW50 -aXR5X3ZpZXdBY2NvdW50aW5nVHJhbnNhY3Rpb25MaXN0cw4AAABzZWxlY3Rpb25fbmFtZXMQAAAA -c2VsZWN0aW9uX3BhcmFtc3MRAAAAc2VsZWN0aW9uX2NvbHVtbnNzFAAAAHNlbGVjdGlvbl9zb3J0 -X29yZGVycxIAAABkZWxpdmVyeS5zdG9wX2RhdGVzCQAAAGFzY2VuZGluZygdAAAAcxgAAABQcm9k +AH0LAHQFAHwEAGQJAIMCAH0MAHQCAHwEAGQGAIMCAGQKAHQJAIMCAH0NAHQCAHwEAGQGAIMCAGQL +AHQJAIMCAH0OAHwKAGQMAGcBAGoCAG8KAAF0CQB9CgBuAQABZwAAfQ8AaAAABGQDAHwGAAM8BGQE +AHwHAAM8BGQNAHwHAAM8BGQOAHwIAAM8BGQLAHQJAAM8BGQPAGQQAAM8fRAAdAUAfAQAZBEAgwIA +dBEAfBAAgwEAZBIAPHwNAG8UAAF8DQB0EQB8EACDAQBkCgA8bgEAAXQCAHQCAHQDAGQTAIMCAGQU +AIMCAIMAAH0SAGQVAGQWAGYCAGQXAGQYAGYCAGQZAGQaAGYCAGQbAGQcAGYCAGQdAGQeAGYCAGQf +AGQgAGYCAGQOAGQhAGYCAGQiAGQjAGYCAGQkAGQlAGYCAGQmAGQnAGYCAGcKAH0TAHQFAHwQAGQS +AIMCAAxvHQABdAIAfBMAZCgAgwIAZCkAZCoAZgIAgwEAAW4BAAF0AgB0AgB0AwBkKwCDAgBkLACD +AgBkLQCDAQB9FAB0AgB0AgB0AwBkKwCDAgBkLgCDAgBkLQB8EACDAgABeNkBdBUAdAIAdAMAZC8A +gwIAgwAAgwEARF2/AX0WAHQCAHwWAGQwAIMCAIMAAH0XAHwKAG8mAAF0GAB8FwBkMQCDAgBvFgAB +dAIAfBcAZDEAgwIAgwAAfAoAagcAbwcAAXE+Am4BAAF0GAB8FwBkMgCDAgBvEAABdAIAfBcAZDIA +gwIAgwAAbxoAAWQzAHQCAHwXAGQyAIMCAIMAABZ9GQBuBwABZAwAfRkAfBkAfAcAagMAbyABAXwM +AG8iAAF0GgB0GwB0AgB8FwBkNACDAgB8EACNAQCDAQBkNQBqAgBvBAABcf0DAXwLAG8iAAF0HAB0 +GwB0AgB8FwBkNgCDAgB8EACNAQCDAQBkNQBqAgBvBAABcf0DAXQYAHwXAGQxAIMCAG8QAAF0AgB8 +FwBkMQCDAgCDAABvLAABZDcAdAIAfBcAZDgAgwIAgwAAdAIAfBcAZDEAgwIAgwAAZgIAFn0dAG4T +AAF0AgB8FwBkOACDAgCDAAB9HQB0AgB8DwBkKACDAgB8AQBkOQB8HQBkOgBkOwBkPAB0AgB8FwBk +PQCDAgCDAABkPgBkPwBkQABkLQBkQQB8EABkQgB8EwBkQwBkRABkRQBmAgBnAQCDAAiDAQABcT4C +AXE+Ald0AgB0AgB0AwBkKwCDAgBkLgCDAgBkLQB8FACDAgABfA8AU2QAAFMoRgAAAE4oAQAAAHMN +AAAAUmVwb3J0U2VjdGlvbnMHAAAAUkVRVUVTVHMHAAAAdG9fZGF0ZXMcAAAAdHJhbnNhY3Rpb25f +c2VjdGlvbl9jYXRlZ29yeXMcAAAAdHJhbnNhY3Rpb25fc2ltdWxhdGlvbl9zdGF0ZXMDAAAAZ2V0 +cwsAAABlbnRpdHlfcm9sZXMWAAAAb21pdF9iYWxhbmNlZF9hY2NvdW50c3MTAAAAb21pdF9lbXB0 +eV9hY2NvdW50c3MJAAAAZnJvbV9kYXRlcyQAAABhY2NvdW50aW5nX3RyYW5zYWN0aW9uX2xpbmVf +Y3VycmVuY3lzAAAAAHMQAAAAc2VjdGlvbl9jYXRlZ29yeXMQAAAAc2ltdWxhdGlvbl9zdGF0ZXMM +AAAAcmVwb3J0X2RlcHRoaQUAAABzFwAAAG9taXRfZ3JvdXBlZF9yZWZlcmVuY2Vzcw0AAABoaWRl +X2dyb3VwaW5ncwoAAABwb3J0YWxfdXJscw8AAABnZXRQb3J0YWxPYmplY3RzCwAAAGdldFN0b3BE +YXRlcwQAAABEYXRlcxoAAABFbnRpdHlfZ2V0UGFyZW50UG9ydGFsVHlwZXMEAAAAVHlwZXMVAAAA +RW50aXR5X2dldFNvdXJjZUdhcElkcwMAAABHQVBzEwAAAEVudGl0eV9nZXRSZWZlcmVuY2VzCgAA +AEludm9pY2UgTm9zFQAAAEVudGl0eV9nZXRQYXJlbnRUaXRsZXMFAAAAVGl0bGVzGQAAAEVudGl0 +eV9nZXRTb3VyY2VSZWZlcmVuY2VzCQAAAFJlZmVyZW5jZXMFAAAAU3RhdGVzDAAAAHNvdXJjZV9k +ZWJpdHMFAAAARGViaXRzDQAAAHNvdXJjZV9jcmVkaXRzBgAAAENyZWRpdHMOAAAAc291cmNlX2Jh +bGFuY2VzBwAAAEJhbGFuY2VzBgAAAGFwcGVuZHMSAAAAZ3JvdXBpbmdfcmVmZXJlbmNlcxIAAABH +cm91cGluZyBSZWZlcmVuY2VzEQAAAHBvcnRhbF9zZWxlY3Rpb25zcxIAAABnZXRTZWxlY3Rpb25Q +YXJhbXNzFAAAAGFjY291bnRpbmdfc2VsZWN0aW9ucxUAAABzZXRTZWxlY3Rpb25QYXJhbXNGb3Jz +HAAAAEFjY291bnRfekRpc3RpbmN0U2VjdGlvbkxpc3RzCQAAAGdldE9iamVjdHMHAAAAZ2V0Um9s +ZXMIAAAAZ2V0R3JvdXBzCAAAAGdyb3VwLyVzcyQAAABFbnRpdHlfekdldEFjY291bnRpbmdUcmFu +c2FjdGlvbkxpc3RpAAAAAHMSAAAARW50aXR5X3N0YXRCYWxhbmNlcwcAAAAlcyAoJXMpcwgAAABn +ZXRUaXRsZXMFAAAAdGl0bGVzBQAAAGxldmVsaQIAAABzBAAAAHBhdGhzDwAAAGdldFBoeXNpY2Fs +UGF0aHMHAAAAZm9ybV9pZHMkAAAARW50aXR5X3ZpZXdBY2NvdW50aW5nVHJhbnNhY3Rpb25MaXN0 +cw4AAABzZWxlY3Rpb25fbmFtZXMQAAAAc2VsZWN0aW9uX3BhcmFtc3MRAAAAc2VsZWN0aW9uX2Nv +bHVtbnNzFAAAAHNlbGVjdGlvbl9zb3J0X29yZGVycxIAAABkZWxpdmVyeS5zdG9wX2RhdGVzCQAA +AGFzY2VuZGluZygeAAAAcxgAAABQcm9kdWN0cy5FUlA1Rm9ybS5SZXBvcnRzDQAAAFJlcG9ydFNl +Y3Rpb25zCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAcmVxdWVzdHMJAAAAX2dldGl0ZW1f +cwcAAAB0b19kYXRlcxwAAAB0cmFuc2FjdGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwAAAB0cmFuc2Fj +dGlvbl9zaW11bGF0aW9uX3N0YXRlcwQAAABOb25lcxAAAAByb2xlX2ZpbHRlcl9saXN0cxYAAABv +bWl0X2JhbGFuY2VkX2FjY291bnRzcxMAAABvbWl0X2VtcHR5X2FjY291bnRzcwkAAABmcm9tX2Rh +dGVzJAAAAGFjY291bnRpbmdfdHJhbnNhY3Rpb25fbGluZV9jdXJyZW5jeXMGAAAAcmVzdWx0cwYA +AABwYXJhbXNzBwAAAF93cml0ZV9zBgAAAHBvcnRhbHMOAAAAZW50aXR5X2NvbHVtbnNzDAAAAHNh +dmVkX3BhcmFtc3MJAAAAX2dldGl0ZXJfcwUAAABwYXJ0eXMBAAAAb3MHAAAAaGFzYXR0cnMFAAAA +Z3JvdXBzAwAAAGxlbnMHAAAAX2FwcGx5X3MDAAAAaW50cwUAAAB0aXRsZSgeAAAAcxgAAABQcm9k dWN0cy5FUlA1Rm9ybS5SZXBvcnRzDQAAAFJlcG9ydFNlY3Rpb25zCQAAAF9nZXRhdHRyX3MHAAAA Y29udGV4dHMHAAAAcmVxdWVzdHMJAAAAX2dldGl0ZW1fcwcAAAB0b19kYXRlcxwAAAB0cmFuc2Fj dGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwAAAB0cmFuc2FjdGlvbl9zaW11bGF0aW9uX3N0YXRlcwQA AABOb25lcxAAAAByb2xlX2ZpbHRlcl9saXN0cxYAAABvbWl0X2JhbGFuY2VkX2FjY291bnRzcxMA -AABvbWl0X2VtcHR5X2FjY291bnRzcwkAAABmcm9tX2RhdGVzBgAAAHJlc3VsdHMGAAAAcGFyYW1z -cwcAAABfd3JpdGVfcwYAAABwb3J0YWxzDgAAAGVudGl0eV9jb2x1bW5zcwwAAABzYXZlZF9wYXJh -bXNzCQAAAF9nZXRpdGVyX3MFAAAAcGFydHlzAQAAAG9zBwAAAGhhc2F0dHJzBQAAAGdyb3VwcwMA -AABsZW5zBwAAAF9hcHBseV9zAwAAAGludHMFAAAAdGl0bGUoHQAAAHMYAAAAUHJvZHVjdHMuRVJQ -NUZvcm0uUmVwb3J0cw0AAABSZXBvcnRTZWN0aW9ucwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRz -BwAAAHJlcXVlc3RzCQAAAF9nZXRpdGVtX3MHAAAAdG9fZGF0ZXMcAAAAdHJhbnNhY3Rpb25fc2Vj -dGlvbl9jYXRlZ29yeXMcAAAAdHJhbnNhY3Rpb25fc2ltdWxhdGlvbl9zdGF0ZXMEAAAATm9uZXMQ -AAAAcm9sZV9maWx0ZXJfbGlzdHMWAAAAb21pdF9iYWxhbmNlZF9hY2NvdW50c3MTAAAAb21pdF9l -bXB0eV9hY2NvdW50c3MJAAAAZnJvbV9kYXRlcwYAAAByZXN1bHRzBgAAAHBhcmFtc3MHAAAAX3dy -aXRlX3MGAAAAcG9ydGFscw4AAABlbnRpdHlfY29sdW1uc3MMAAAAc2F2ZWRfcGFyYW1zcwkAAABf -Z2V0aXRlcl9zBQAAAHBhcnR5cwEAAABvcwcAAABoYXNhdHRycwUAAABncm91cHMDAAAAbGVucwcA -AABfYXBwbHlfcwMAAABpbnRzBQAAAHRpdGxlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p -cy4AAABBY2NvdW50TW9kdWxlX2dldE90aGVyUGFydGllc1JlcG9ydFNlY3Rpb25MaXN0AQAAAHN6 -AAAAAAUNAg8BDwEPAQ8BGAEPAQ8BGAMQAQoCBgIHAQkBCQEJAQkBEQQZAQcBFAIbAgABCQEJAQkB -CQEJAQkBCQEJAQkBDwIUARoEJAEZAhkABgESATABBwEjARoCBgENASwBBAEsAQQCIwEsAhUBCQEV -AhsEBgEGASECGQEoAQAAAHMuAAAAQWNjb3VudE1vZHVsZV9nZXRPdGhlclBhcnRpZXNSZXBvcnRT -ZWN0aW9uTGlzdCgBAAAAcy4AAABBY2NvdW50TW9kdWxlX2dldE90aGVyUGFydGllc1JlcG9ydFNl -Y3Rpb25MaXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABz -AAAAAA==</string> </value> +AABvbWl0X2VtcHR5X2FjY291bnRzcwkAAABmcm9tX2RhdGVzJAAAAGFjY291bnRpbmdfdHJhbnNh +Y3Rpb25fbGluZV9jdXJyZW5jeXMGAAAAcmVzdWx0cwYAAABwYXJhbXNzBwAAAF93cml0ZV9zBgAA +AHBvcnRhbHMOAAAAZW50aXR5X2NvbHVtbnNzDAAAAHNhdmVkX3BhcmFtc3MJAAAAX2dldGl0ZXJf +cwUAAABwYXJ0eXMBAAAAb3MHAAAAaGFzYXR0cnMFAAAAZ3JvdXBzAwAAAGxlbnMHAAAAX2FwcGx5 +X3MDAAAAaW50cwUAAAB0aXRsZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMuAAAAQWNj +b3VudE1vZHVsZV9nZXRPdGhlclBhcnRpZXNSZXBvcnRTZWN0aW9uTGlzdAEAAABzfAAAAAAFDQIP +AQ8BDwEPARgBDwEPARgBGAMQAQoCBgIHAQkBCQEJAQkBEQQZAQcBFAIbAgABCQEJAQkBCQEJAQkB +CQEJAQkBDwIUARoEJAEZAhkABgESATABBwEjARoCBgENASwBBAEsAQQCIwEsAhUBCQEVAhsEBgEG +ASECGQEoAQAAAHMuAAAAQWNjb3VudE1vZHVsZV9nZXRPdGhlclBhcnRpZXNSZXBvcnRTZWN0aW9u +TGlzdCgBAAAAcy4AAABBY2NvdW50TW9kdWxlX2dldE90aGVyUGFydGllc1JlcG9ydFNlY3Rpb25M +aXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_filepath</string> </key> - <value> <string>Script (Python):/nexedi/erp5_accounting/AccountModule_getOtherPartiesReportSectionList</string> </value> + <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList</string> </value> </item> <item> <key> <string>_params</string> </key> @@ -282,6 +284,7 @@ AAAAAA==</string> </value> <string>omit_balanced_accounts</string> <string>omit_empty_accounts</string> <string>from_date</string> + <string>accounting_transaction_line_currency</string> <string>result</string> <string>params</string> <string>_write_</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml index bdc3dc5ec0..588db3d3a5 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/listbox.xml @@ -186,6 +186,10 @@ <key> <string>columns</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -252,7 +256,9 @@ </item> <item> <key> <string>portal_types</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>report_root_list</string> </key> @@ -476,7 +482,7 @@ <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -582,7 +588,7 @@ <item> <key> <string>stat_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> @@ -618,6 +624,25 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:[(x, x) for x in here.getPortalAccountingTransactionTypeList()]</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> @@ -636,7 +661,7 @@ </dictionary> </pickle> </record> - <record id="3" aka="AAAAAAAAAAM="> + <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalAccountingTransactionList.xml index 56d66fb740..a5b8514609 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalAccountingTransactionList.xml @@ -122,11 +122,7 @@ for transaction in context\\\n \n result.append(transaction_dict)\n transaction_lines = transaction.contentValues(\n - filter = {\'portal_type\' : [ \'Accounting Transaction Line\',\n - \'Sale Invoice Transaction Line\',\n - \'Purchase Invoice Transaction Line\',\n - \'Pay Sheet Transaction Line\',\n - \'Balance Transaction Line\']})\n + filter = {\'portal_type\' : context.getPortalAccountingMovementTypeList()})\n \n transaction_lines.sort(lambda x,y: cmp(y.getObject().getSourceDebit(),\n x.getObject().getSourceDebit()))\n @@ -201,90 +197,87 @@ return result + [{"journal_total_debit": journal_total_debit, "journal_total_cre <item> <key> <string>_code</string> </key> <value> <string encoding="base64">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 -AAB0cmFuc2FjdGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwAAAB0cmFuc2FjdGlvbl9zaW11bGF0aW9u -X3N0YXRlcxcAAAB0cmFuc2FjdGlvbl9wb3J0YWxfdHlwZXMDAAAAZ2V0cwkAAABmcm9tX2RhdGVz -BwAAAHNvcnRfb25zEwAAAGRlbGl2ZXJ5LnN0YXJ0X2RhdGVzEAAAAHNpbXVsYXRpb25fc3RhdGVz -EAAAAHNlY3Rpb25fY2F0ZWdvcnlzCwAAAHBvcnRhbF90eXBlaQAAAABzOQAAAEFjY291bnRpbmdU -cmFuc2FjdGlvbk1vZHVsZV96R2V0QWNjb3VudGluZ1RyYW5zYWN0aW9uTGlzdHMQAAAAc2VsZWN0 -aW9uX3BhcmFtc3MJAAAAc2VsZWN0aW9ucwkAAABnZXRPYmplY3RzBAAAAGRhdGVzDwAAAEJhc2Vf -Rm9ybWF0RGF0ZXMMAAAAZ2V0U3RhcnREYXRlcwsAAABkZXNjcmlwdGlvbnMUAAAAQmFzZV9UcmFu -c2xhdGVTdHJpbmdzkAAAACR7dHJhbnNhY3Rpb25fdGl0bGV9IChUcmFuc2FjdGlvbiBSZWZlcmVu -Y2UgPSAke3RyYW5zYWN0aW9uX3NvdXJjZV9yZWZlcmVuY2V9LAogQ3JlYXRpb24gRGF0ZSA9ICR7 -Y3JlYXRpb25fZGF0ZX0gCiBDdXJyZW5jeSA9ICR7Y3VycmVuY3lfdGl0bGV9KXMHAAAAbWFwcGlu -Z3MRAAAAdHJhbnNhY3Rpb25fdGl0bGVzCAAAAGdldFRpdGxlcwAAAABzBAAAAHV0ZjhzHAAAAHRy -YW5zYWN0aW9uX3NvdXJjZV9yZWZlcmVuY2VzEgAAAGdldFNvdXJjZVJlZmVyZW5jZXMNAAAAY3Jl -YXRpb25fZGF0ZXMPAAAAZ2V0Q3JlYXRpb25EYXRlcw4AAABjdXJyZW5jeV90aXRsZXMQAAAAZ2V0 -UmVzb3VyY2VUaXRsZXMFAAAAbGluZXNzBgAAAGFwcGVuZHMNAAAAY29udGVudFZhbHVlc3MGAAAA -ZmlsdGVycxsAAABBY2NvdW50aW5nIFRyYW5zYWN0aW9uIExpbmVzHQAAAFNhbGUgSW52b2ljZSBU -cmFuc2FjdGlvbiBMaW5lcyEAAABQdXJjaGFzZSBJbnZvaWNlIFRyYW5zYWN0aW9uIExpbmVzGgAA -AFBheSBTaGVldCBUcmFuc2FjdGlvbiBMaW5lcxgAAABCYWxhbmNlIFRyYW5zYWN0aW9uIExpbmVz -BAAAAHNvcnRjAgAAAAQAAAAGAAAAQwAAAHM9AAAAdAAAdAEAdAEAfAEAZAEAgwIAgwAAZAIAgwIA -gwAAdAEAdAEAfAAAZAEAgwIAgwAAZAIAgwIAgwAAgwIAUygDAAAATnMJAAAAZ2V0T2JqZWN0cw4A -AABnZXRTb3VyY2VEZWJpdCgEAAAAcwMAAABjbXBzCQAAAF9nZXRhdHRyX3MBAAAAeXMBAAAAeCgE -AAAAcwEAAAB4cwEAAAB5cwMAAABjbXBzCQAAAF9nZXRhdHRyXygAAAAAKAAAAABzDwAAAFNjcmlw -dCAoUHl0aG9uKXMKAAAAPGxhbWJkYS45Pj0AAABzAgAAACQBcw4AAABnZXRTb3VyY2VEZWJpdHMP -AAAAZ2V0U291cmNlQ3JlZGl0cw4AAABnZXRTb3VyY2VWYWx1ZXMOAAAAZ2V0QWNjb3VudFR5cGVz -CgAAAGFzc2V0L2JhbmtzDwAAAGFzc2V0L2JhbmsvY2FzaHMHAAAAJXMgKCVzKXMOAAAAZ2V0U291 -cmNlVGl0bGVzFQAAAGdldFNvdXJjZVBheW1lbnRUaXRsZXMQAAAAYXNzZXQvcmVjZWl2YWJsZXMR -AAAAbGlhYmlsaXR5L3BheWFibGVzGgAAAGdldERlc3RpbmF0aW9uU2VjdGlvblRpdGxlcwYAAABk -ZWJ0b3JzDgAAAGFjY291bnRfZ2FwX2lkcwgAAABnZXRHYXBJZHMMAAAAYWNjb3VudF9uYW1lcwYA -AABhbW91bnRzFQAAAGdldERlc3RpbmF0aW9uU2VjdGlvbnMQAAAAZ2V0U291cmNlU2VjdGlvbnMT -AAAAZ2V0RGVzdGluYXRpb25EZWJpdHMUAAAAZ2V0RGVzdGluYXRpb25DcmVkaXRzEwAAAGdldERl -c3RpbmF0aW9uVmFsdWVzCgAAAGFzc2V0L2Nhc2hzEwAAAGdldERlc3RpbmF0aW9uVGl0bGVzGgAA -AGdldERlc3RpbmF0aW9uUGF5bWVudFRpdGxlcxUAAABnZXRTb3VyY2VTZWN0aW9uVGl0bGVzEwAA -AGpvdXJuYWxfdG90YWxfZGViaXRzFAAAAGpvdXJuYWxfdG90YWxfY3JlZGl0KBoAAABzCQAAAF9n -ZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAcmVxdWVzdHMJAAAAX2dldGl0ZW1fcwcAAABhdF9kYXRl -cxwAAAB0cmFuc2FjdGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwAAAB0cmFuc2FjdGlvbl9zaW11bGF0 -aW9uX3N0YXRlcxcAAAB0cmFuc2FjdGlvbl9wb3J0YWxfdHlwZXMEAAAATm9uZXMJAAAAZnJvbV9k -YXRlcwYAAABwYXJhbXNzBwAAAF93cml0ZV9zBgAAAHJlc3VsdHMTAAAAam91cm5hbF90b3RhbF9k -ZWJpdHMUAAAAam91cm5hbF90b3RhbF9jcmVkaXRzCQAAAF9nZXRpdGVyX3MHAAAAX2FwcGx5X3ML -AAAAdHJhbnNhY3Rpb25zBQAAAGxpbmVzcwcAAAB1bmljb2RlcxAAAAB0cmFuc2FjdGlvbl9kaWN0 -cxEAAAB0cmFuc2FjdGlvbl9saW5lc3MEAAAAbGluZXMGAAAAZGVidG9ycwcAAABhY2NvdW50cxMA -AABhY2NvdW50X2Rlc2NyaXB0aW9uKBoAAABzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAA -cmVxdWVzdHMJAAAAX2dldGl0ZW1fcwcAAABhdF9kYXRlcxwAAAB0cmFuc2FjdGlvbl9zZWN0aW9u -X2NhdGVnb3J5cxwAAAB0cmFuc2FjdGlvbl9zaW11bGF0aW9uX3N0YXRlcxcAAAB0cmFuc2FjdGlv -bl9wb3J0YWxfdHlwZXMEAAAATm9uZXMJAAAAZnJvbV9kYXRlcwYAAABwYXJhbXNzBwAAAF93cml0 -ZV9zBgAAAHJlc3VsdHMTAAAAam91cm5hbF90b3RhbF9kZWJpdHMUAAAAam91cm5hbF90b3RhbF9j -cmVkaXRzCQAAAF9nZXRpdGVyX3MHAAAAX2FwcGx5X3MLAAAAdHJhbnNhY3Rpb25zBQAAAGxpbmVz -cwcAAAB1bmljb2RlcxAAAAB0cmFuc2FjdGlvbl9kaWN0cxEAAAB0cmFuc2FjdGlvbl9saW5lc3ME -AAAAbGluZXMGAAAAZGVidG9ycwcAAABhY2NvdW50cxMAAABhY2NvdW50X2Rlc2NyaXB0aW9uKAAA -AAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcz8AAABBY2NvdW50aW5nVHJhbnNhY3Rpb25Nb2R1 -bGVfZ2V0Sm91cm5hbEFjY291bnRpbmdUcmFuc2FjdGlvbkxpc3QBAAAAc6QAAAAAEg8BDwEPAQ8B -DwEYAhACCQEJAQkBCAIHARQCBgEGAQYBGAIZARIBBgEuAQ8CLAEoASQBHgELAhABDwEkBhMCDQAG -ARIBJAESARQBHwEGAQ8BFwEfAwYBDwEXAhUBEAEMARIBCQEZARQBDwETAgcBGgIWAyUBJAESARQB -GQEGAQ8BFwEfAwYBDwEXAhUBEAEMARIBCQEZARQBDwETAgcBGgIiAigBAAAAcz8AAABBY2NvdW50 -aW5nVHJhbnNhY3Rpb25Nb2R1bGVfZ2V0Sm91cm5hbEFjY291bnRpbmdUcmFuc2FjdGlvbkxpc3Qo -AQAAAHM/AAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uTW9kdWxlX2dldEpvdXJuYWxBY2NvdW50aW5n -VHJhbnNhY3Rpb25MaXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxl -PgEAAABzAAAAAA==</string> </value> +AAB8EQBkJQCDAgBkJgBoAAAEZAwAdAAAdAEAZCcAgwIAgwAAAzyDAAF9FQB0AAB8FQBkKACDAgBk +KQCEAACDAQABeK0DdA8AfBUAgwEARF2fA30WAHQAAHwWAGQRAIMCAIMAAH0WAHQAAHwWAGQqAIMC +AIMAAHQAAHwWAGQrAIMCAIMAAGoEAH0XAHQAAHwWAGQsAIMCAIMAAH0YAHwYAHQIAGoIAG8HAAFx +SgJuAQABdAAAfBgAZC0AgwIAgwAAZC4AZC8AZgIAagYAbywAAWQwAHQAAHwWAGQxAIMCAIMAAHQA +AHwWAGQyAIMCAIMAAGYCABZ9GQBuXgABdAAAfBgAZC0AgwIAgwAAZDMAZDQAZgIAagYAbywAAWQw +AHQAAHwWAGQxAIMCAIMAAHQAAHwWAGQ1AIMCAIMAAGYCABZ9GQBuEwABdAAAfBYAZDEAgwIAgwAA +fRkAdAAAfBIAZCQAgwIAaAAABGQ2AHwXAAM8BGQ3AHQAAHwYAGQ4AIMCAIMAAAM8BGQ5AHwZAAM8 +BGQ6AHwXAG8gAAF0AAB8FgBkKgCDAgCDAAB0AAB8FgBkKwCDAgCDAAAYcCAAAXQAAHwWAGQrAIMC +AIMAAHQAAHwWAGQqAIMCAIMAABgDPIMBAAF8FwBvGgABfA0AdAAAfBYAZCoAgwIAgwAAN30NAG4X +AAF8DgB0AAB8FgBkKwCDAgCDAAA3fQ4AdAAAfBYAZDsAgwIAgwAAdAAAfBYAZDwAgwIAgwAAagIA +b7ABAXQAAHwWAGQ9AIMCAIMAAHQAAHwWAGQ+AIMCAIMAAGoEAH0XAHQAAHwWAGQ/AIMCAIMAAH0Y +AHwYAHQIAGoIAG8HAAFxSgJuAQABdAAAfBgAZC0AgwIAgwAAZEAAagIAbywAAWQwAHQAAHwWAGRB +AIMCAIMAAHQAAHwWAGRCAIMCAIMAAGYCABZ9GQBuXgABdAAAfBgAZC0AgwIAgwAAZDMAZDQAZgIA +agYAbywAAWQwAHQAAHwWAGRBAIMCAIMAAHQAAHwWAGRDAIMCAIMAAGYCABZ9GQBuEwABdAAAfBYA +ZEEAgwIAgwAAfRkAdAAAfBIAZCQAgwIAaAAABGQ2AHwXAAM8BGQ3AHQAAHwYAGQ4AIMCAIMAAAM8 +BGQ5AHwZAAM8BGQ6AHwXAG8gAAF0AAB8FgBkPQCDAgCDAAB0AAB8FgBkPgCDAgCDAAAYcCAAAXQA +AHwWAGQ+AIMCAIMAAHQAAHwWAGQ9AIMCAIMAABgDPIMBAAF8FwBvGgABfA0AdAAAfBYAZCoAgwIA +gwAAN30NAHHpBQF8DgB0AAB8FgBkKwCDAgCDAAA3fQ4AcUoCAXFKAldx7gBXfAwAaAAABGREAHwN +AAM8BGRFAHwOAAM8ZwEAF1NkAABTKEYAAABOcwcAAABSRVFVRVNUcwcAAABhdF9kYXRlcxwAAAB0 +cmFuc2FjdGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwAAAB0cmFuc2FjdGlvbl9zaW11bGF0aW9uX3N0 +YXRlcxcAAAB0cmFuc2FjdGlvbl9wb3J0YWxfdHlwZXMDAAAAZ2V0cwkAAABmcm9tX2RhdGVzBwAA +AHNvcnRfb25zEwAAAGRlbGl2ZXJ5LnN0YXJ0X2RhdGVzEAAAAHNpbXVsYXRpb25fc3RhdGVzEAAA +AHNlY3Rpb25fY2F0ZWdvcnlzCwAAAHBvcnRhbF90eXBlaQAAAABzOQAAAEFjY291bnRpbmdUcmFu +c2FjdGlvbk1vZHVsZV96R2V0QWNjb3VudGluZ1RyYW5zYWN0aW9uTGlzdHMQAAAAc2VsZWN0aW9u +X3BhcmFtc3MJAAAAc2VsZWN0aW9ucwkAAABnZXRPYmplY3RzBAAAAGRhdGVzDwAAAEJhc2VfRm9y +bWF0RGF0ZXMMAAAAZ2V0U3RhcnREYXRlcwsAAABkZXNjcmlwdGlvbnMUAAAAQmFzZV9UcmFuc2xh +dGVTdHJpbmdzkAAAACR7dHJhbnNhY3Rpb25fdGl0bGV9IChUcmFuc2FjdGlvbiBSZWZlcmVuY2Ug +PSAke3RyYW5zYWN0aW9uX3NvdXJjZV9yZWZlcmVuY2V9LAogQ3JlYXRpb24gRGF0ZSA9ICR7Y3Jl +YXRpb25fZGF0ZX0gCiBDdXJyZW5jeSA9ICR7Y3VycmVuY3lfdGl0bGV9KXMHAAAAbWFwcGluZ3MR +AAAAdHJhbnNhY3Rpb25fdGl0bGVzCAAAAGdldFRpdGxlcwAAAABzBAAAAHV0ZjhzHAAAAHRyYW5z +YWN0aW9uX3NvdXJjZV9yZWZlcmVuY2VzEgAAAGdldFNvdXJjZVJlZmVyZW5jZXMNAAAAY3JlYXRp +b25fZGF0ZXMPAAAAZ2V0Q3JlYXRpb25EYXRlcw4AAABjdXJyZW5jeV90aXRsZXMQAAAAZ2V0UmVz +b3VyY2VUaXRsZXMFAAAAbGluZXNzBgAAAGFwcGVuZHMNAAAAY29udGVudFZhbHVlc3MGAAAAZmls +dGVycyMAAABnZXRQb3J0YWxBY2NvdW50aW5nTW92ZW1lbnRUeXBlTGlzdHMEAAAAc29ydGMCAAAA +BAAAAAYAAABDAAAAcz0AAAB0AAB0AQB0AQB8AQBkAQCDAgCDAABkAgCDAgCDAAB0AQB0AQB8AABk +AQCDAgCDAABkAgCDAgCDAACDAgBTKAMAAABOcwkAAABnZXRPYmplY3RzDgAAAGdldFNvdXJjZURl +Yml0KAQAAABzAwAAAGNtcHMJAAAAX2dldGF0dHJfcwEAAAB5cwEAAAB4KAQAAABzAQAAAHhzAQAA +AHlzAwAAAGNtcHMJAAAAX2dldGF0dHJfKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwsA +AAA8bGFtYmRhLjU1PjkAAABzAgAAACQBcw4AAABnZXRTb3VyY2VEZWJpdHMPAAAAZ2V0U291cmNl +Q3JlZGl0cw4AAABnZXRTb3VyY2VWYWx1ZXMOAAAAZ2V0QWNjb3VudFR5cGVzCgAAAGFzc2V0L2Jh +bmtzDwAAAGFzc2V0L2JhbmsvY2FzaHMHAAAAJXMgKCVzKXMOAAAAZ2V0U291cmNlVGl0bGVzFQAA +AGdldFNvdXJjZVBheW1lbnRUaXRsZXMQAAAAYXNzZXQvcmVjZWl2YWJsZXMRAAAAbGlhYmlsaXR5 +L3BheWFibGVzGgAAAGdldERlc3RpbmF0aW9uU2VjdGlvblRpdGxlcwYAAABkZWJ0b3JzDgAAAGFj +Y291bnRfZ2FwX2lkcwgAAABnZXRHYXBJZHMMAAAAYWNjb3VudF9uYW1lcwYAAABhbW91bnRzFQAA +AGdldERlc3RpbmF0aW9uU2VjdGlvbnMQAAAAZ2V0U291cmNlU2VjdGlvbnMTAAAAZ2V0RGVzdGlu +YXRpb25EZWJpdHMUAAAAZ2V0RGVzdGluYXRpb25DcmVkaXRzEwAAAGdldERlc3RpbmF0aW9uVmFs +dWVzCgAAAGFzc2V0L2Nhc2hzEwAAAGdldERlc3RpbmF0aW9uVGl0bGVzGgAAAGdldERlc3RpbmF0 +aW9uUGF5bWVudFRpdGxlcxUAAABnZXRTb3VyY2VTZWN0aW9uVGl0bGVzEwAAAGpvdXJuYWxfdG90 +YWxfZGViaXRzFAAAAGpvdXJuYWxfdG90YWxfY3JlZGl0KBoAAABzCQAAAF9nZXRhdHRyX3MHAAAA +Y29udGV4dHMHAAAAcmVxdWVzdHMJAAAAX2dldGl0ZW1fcwcAAABhdF9kYXRlcxwAAAB0cmFuc2Fj +dGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwAAAB0cmFuc2FjdGlvbl9zaW11bGF0aW9uX3N0YXRlcxcA +AAB0cmFuc2FjdGlvbl9wb3J0YWxfdHlwZXMEAAAATm9uZXMJAAAAZnJvbV9kYXRlcwYAAABwYXJh +bXNzBwAAAF93cml0ZV9zBgAAAHJlc3VsdHMTAAAAam91cm5hbF90b3RhbF9kZWJpdHMUAAAAam91 +cm5hbF90b3RhbF9jcmVkaXRzCQAAAF9nZXRpdGVyX3MHAAAAX2FwcGx5X3MLAAAAdHJhbnNhY3Rp +b25zBQAAAGxpbmVzcwcAAAB1bmljb2RlcxAAAAB0cmFuc2FjdGlvbl9kaWN0cxEAAAB0cmFuc2Fj +dGlvbl9saW5lc3MEAAAAbGluZXMGAAAAZGVidG9ycwcAAABhY2NvdW50cxMAAABhY2NvdW50X2Rl +c2NyaXB0aW9uKBoAAABzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAcmVxdWVzdHMJAAAA +X2dldGl0ZW1fcwcAAABhdF9kYXRlcxwAAAB0cmFuc2FjdGlvbl9zZWN0aW9uX2NhdGVnb3J5cxwA +AAB0cmFuc2FjdGlvbl9zaW11bGF0aW9uX3N0YXRlcxcAAAB0cmFuc2FjdGlvbl9wb3J0YWxfdHlw +ZXMEAAAATm9uZXMJAAAAZnJvbV9kYXRlcwYAAABwYXJhbXNzBwAAAF93cml0ZV9zBgAAAHJlc3Vs +dHMTAAAAam91cm5hbF90b3RhbF9kZWJpdHMUAAAAam91cm5hbF90b3RhbF9jcmVkaXRzCQAAAF9n +ZXRpdGVyX3MHAAAAX2FwcGx5X3MLAAAAdHJhbnNhY3Rpb25zBQAAAGxpbmVzcwcAAAB1bmljb2Rl +cxAAAAB0cmFuc2FjdGlvbl9kaWN0cxEAAAB0cmFuc2FjdGlvbl9saW5lc3MEAAAAbGluZXMGAAAA +ZGVidG9ycwcAAABhY2NvdW50cxMAAABhY2NvdW50X2Rlc2NyaXB0aW9uKAAAAAAoAAAAAHMPAAAA +U2NyaXB0IChQeXRob24pcz8AAABBY2NvdW50aW5nVHJhbnNhY3Rpb25Nb2R1bGVfZ2V0Sm91cm5h +bEFjY291bnRpbmdUcmFuc2FjdGlvbkxpc3QBAAAAc6QAAAAAEg8BDwEPAQ8BDwEYAhACCQEJAQkB +CAIHARQCBgEGAQYBGAIZARIBBgEuAQ8CLAEoASQBHgELAhABDwEhAhMCDQAGARIBJAESARQBHwEG +AQ8BFwEfAwYBDwEXAhUBEAEMARIBCQEZARQBDwETAgcBGgIWAyUBJAESARQBGQEGAQ8BFwEfAwYB +DwEXAhUBEAEMARIBCQEZARQBDwETAgcBGgIiAigBAAAAcz8AAABBY2NvdW50aW5nVHJhbnNhY3Rp +b25Nb2R1bGVfZ2V0Sm91cm5hbEFjY291bnRpbmdUcmFuc2FjdGlvbkxpc3QoAQAAAHM/AAAAQWNj +b3VudGluZ1RyYW5zYWN0aW9uTW9kdWxlX2dldEpvdXJuYWxBY2NvdW50aW5nVHJhbnNhY3Rpb25M +aXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_dav_writelocks</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.xml index 306cb0e59f..9689623132 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.xml @@ -66,12 +66,8 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>accounting_transaction_lines_portal_types = [\'Accounting Transaction Line\', \n - \'Sale Invoice Transaction Line\',\n - \'Purchase Invoice Transaction Line\', \n - \'Pay Sheet Transaction Line\',\n - \'Payment Transaction Line\',\n - \'Balance Transaction Line\']\n + <value> <string>accounting_transaction_lines_portal_types = context.getPortalAccountingMovementTypeList()\n +\n transaction = brain.getObject()\n credit = 0\n for line in transaction.objectValues() :\n @@ -96,37 +92,35 @@ return float(\'%.02f\' % (row.quantity or 0.0))\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGUAAGQBAIQCAFoBAGQAAFMoAgAAAE5jAgAAABEAAAAQ -AAAASwAAAHOLAQAAZAEAZAIAZAMAZAQAZAUAZAYAZwYAfQMAdAEAfAAAZAcAgwIAgwAAfQUAZAgA -fQYAeJIAdAUAdAEAfAUAZAkAgwIAgwAAgwEARF14AH0IAHQBAHwIAGQKAIMCAIMAAHwDAGoGAG8a -AAF8BgB0AQB8CABkCwCDAgCDAAA3fQYAbgEAAXQBAHwIAGQMAIMCAIMAAHQBAHwIAGQNAIMCAIMA -AGoCAG8aAAF8BgB0AQB8CABkCwCDAgCDAAA3fQYAcUkAAXFJAFd8BgBTdAEAfAEAZA4AgwIAgwAA -fQkAaAAAfQIAdAEAfAkAZA8AgwIAZBAAgwEAdAoAfAIAgwEAZBAAPGQRAHQKAHwCAIMBAGQSADxk -EQB0CgB8AgCDAQBkEwA8dAEAdAsAZBQAgwIAgwAAdAoAfAIAgwEAZBUAPHQMAHQBAHQLAGQWAIMC -AGQXAHwBAHwCAI0BAX0NAHQOAHwNAGQIAIMCAH0PAHQQAGQYAHQBAHwPAGQZAIMCAHAEAAFkGgAW -gwEAU2QAAFMoGwAAAE5zGwAAAEFjY291bnRpbmcgVHJhbnNhY3Rpb24gTGluZXMdAAAAU2FsZSBJ -bnZvaWNlIFRyYW5zYWN0aW9uIExpbmVzIQAAAFB1cmNoYXNlIEludm9pY2UgVHJhbnNhY3Rpb24g -TGluZXMaAAAAUGF5IFNoZWV0IFRyYW5zYWN0aW9uIExpbmVzGAAAAFBheW1lbnQgVHJhbnNhY3Rp -b24gTGluZXMYAAAAQmFsYW5jZSBUcmFuc2FjdGlvbiBMaW5lcwkAAABnZXRPYmplY3RpAAAAAHMM -AAAAb2JqZWN0VmFsdWVzcw0AAABnZXRQb3J0YWxUeXBlcw8AAABnZXRTb3VyY2VDcmVkaXRzEAAA -AGdldFNvdXJjZVNlY3Rpb25zFQAAAGdldERlc3RpbmF0aW9uU2VjdGlvbnMJAAAAZ2V0UGFyYW1z -cwMAAABnZXRzEAAAAHNlY3Rpb25fY2F0ZWdvcnlpAQAAAHMEAAAAc3RhdHMLAAAAb21pdF9vdXRw -dXRzBgAAAGdldFVpZHMLAAAAdHJhbnNhY3Rpb25zOQAAAEFjY291bnRpbmdUcmFuc2FjdGlvbk1v -ZHVsZV96R2V0QWNjb3VudGluZ1RyYW5zYWN0aW9uTGlzdHMJAAAAc2VsZWN0aW9ucwUAAAAlLjAy -ZnMIAAAAcXVhbnRpdHlmAzAuMCgRAAAAcykAAABhY2NvdW50aW5nX3RyYW5zYWN0aW9uX2xpbmVz -X3BvcnRhbF90eXBlc3MJAAAAX2dldGF0dHJfcwUAAABicmFpbnMLAAAAdHJhbnNhY3Rpb25zBgAA -AGNyZWRpdHMJAAAAX2dldGl0ZXJfcwQAAABsaW5lcwkAAABzZWxlY3Rpb25zBgAAAHBhcmFtc3MC -AAAAa3dzBwAAAF93cml0ZV9zBwAAAGNvbnRleHRzBwAAAF9hcHBseV9zBgAAAHJlc3VsdHMJAAAA -X2dldGl0ZW1fcwMAAAByb3dzBQAAAGZsb2F0KBEAAABzBQAAAGJyYWlucwkAAABzZWxlY3Rpb25z -AgAAAGt3cykAAABhY2NvdW50aW5nX3RyYW5zYWN0aW9uX2xpbmVzX3BvcnRhbF90eXBlc3MJAAAA -X2dldGF0dHJfcwsAAAB0cmFuc2FjdGlvbnMGAAAAY3JlZGl0cwkAAABfZ2V0aXRlcl9zBAAAAGxp -bmVzBgAAAHBhcmFtc3MHAAAAX3dyaXRlX3MHAAAAY29udGV4dHMHAAAAX2FwcGx5X3MGAAAAcmVz -dWx0cwkAAABfZ2V0aXRlbV9zAwAAAHJvd3MFAAAAZmxvYXQoAAAAACgAAAAAcw8AAABTY3JpcHQg -KFB5dGhvbilzKwAAAEFjY291bnRpbmdUcmFuc2FjdGlvbk1vZHVsZV9nZXRTb3VyY2VDcmVkaXQB -AAAAcyQAAAAYBhIBBgEZAAYBGQEaASUBHgEEAxIBBgEfARABEAEcAh4BDwEoAgAAAHMEAAAATm9u -ZXMrAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uTW9kdWxlX2dldFNvdXJjZUNyZWRpdCgCAAAAcwQA -AABOb25lcysAAABBY2NvdW50aW5nVHJhbnNhY3Rpb25Nb2R1bGVfZ2V0U291cmNlQ3JlZGl0KAAA -AAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGUAAGQBAIQCAFoBAGQAAFMoAgAAAE5jAgAAABEAAAAO +AAAASwAAAHOFAQAAdAAAdAEAZAEAgwIAgwAAfQUAdAAAfAAAZAIAgwIAgwAAfQYAZAMAfQcAeJIA +dAYAdAAAfAYAZAQAgwIAgwAAgwEARF14AH0JAHQAAHwJAGQFAIMCAIMAAHwFAGoGAG8aAAF8BwB0 +AAB8CQBkBgCDAgCDAAA3fQcAbgEAAXQAAHwJAGQHAIMCAIMAAHQAAHwJAGQIAIMCAIMAAGoCAG8a +AAF8BwB0AAB8CQBkBgCDAgCDAAA3fQcAcUMAAXFDAFd8BwBTdAAAfAEAZAkAgwIAgwAAfQoAaAAA +fQIAdAAAfAoAZAoAgwIAZAsAgwEAdAsAfAIAgwEAZAsAPGQMAHQLAHwCAIMBAGQNADxkDAB0CwB8 +AgCDAQBkDgA8dAAAdAEAZA8AgwIAgwAAdAsAfAIAgwEAZBAAPHQMAHQAAHQBAGQRAIMCAGQSAHwB +AHwCAI0BAX0NAHQOAHwNAGQDAIMCAH0PAHQQAGQTAHQAAHwPAGQUAIMCAHAEAAFkFQAWgwEAU2QA +AFMoFgAAAE5zIwAAAGdldFBvcnRhbEFjY291bnRpbmdNb3ZlbWVudFR5cGVMaXN0cwkAAABnZXRP +YmplY3RpAAAAAHMMAAAAb2JqZWN0VmFsdWVzcw0AAABnZXRQb3J0YWxUeXBlcw8AAABnZXRTb3Vy +Y2VDcmVkaXRzEAAAAGdldFNvdXJjZVNlY3Rpb25zFQAAAGdldERlc3RpbmF0aW9uU2VjdGlvbnMJ +AAAAZ2V0UGFyYW1zcwMAAABnZXRzEAAAAHNlY3Rpb25fY2F0ZWdvcnlpAQAAAHMEAAAAc3RhdHML +AAAAb21pdF9vdXRwdXRzBgAAAGdldFVpZHMLAAAAdHJhbnNhY3Rpb25zOQAAAEFjY291bnRpbmdU +cmFuc2FjdGlvbk1vZHVsZV96R2V0QWNjb3VudGluZ1RyYW5zYWN0aW9uTGlzdHMJAAAAc2VsZWN0 +aW9ucwUAAAAlLjAyZnMIAAAAcXVhbnRpdHlmAzAuMCgRAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNv +bnRleHRzKQAAAGFjY291bnRpbmdfdHJhbnNhY3Rpb25fbGluZXNfcG9ydGFsX3R5cGVzcwUAAABi +cmFpbnMLAAAAdHJhbnNhY3Rpb25zBgAAAGNyZWRpdHMJAAAAX2dldGl0ZXJfcwQAAABsaW5lcwkA +AABzZWxlY3Rpb25zBgAAAHBhcmFtc3MCAAAAa3dzBwAAAF93cml0ZV9zBwAAAF9hcHBseV9zBgAA +AHJlc3VsdHMJAAAAX2dldGl0ZW1fcwMAAAByb3dzBQAAAGZsb2F0KBEAAABzBQAAAGJyYWlucwkA +AABzZWxlY3Rpb25zAgAAAGt3cwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzKQAAAGFjY291bnRp +bmdfdHJhbnNhY3Rpb25fbGluZXNfcG9ydGFsX3R5cGVzcwsAAAB0cmFuc2FjdGlvbnMGAAAAY3Jl +ZGl0cwkAAABfZ2V0aXRlcl9zBAAAAGxpbmVzBgAAAHBhcmFtc3MHAAAAX3dyaXRlX3MHAAAAX2Fw +cGx5X3MGAAAAcmVzdWx0cwkAAABfZ2V0aXRlbV9zAwAAAHJvd3MFAAAAZmxvYXQoAAAAACgAAAAA +cw8AAABTY3JpcHQgKFB5dGhvbilzKwAAAEFjY291bnRpbmdUcmFuc2FjdGlvbk1vZHVsZV9nZXRT +b3VyY2VDcmVkaXQBAAAAcyQAAAASAhIBBgEZAAYBGQEaASUBHgEEAxIBBgEfARABEAEcAh4BDwEo +AgAAAHMEAAAATm9uZXMrAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uTW9kdWxlX2dldFNvdXJjZUNy +ZWRpdCgCAAAAcwQAAABOb25lcysAAABBY2NvdW50aW5nVHJhbnNhY3Rpb25Nb2R1bGVfZ2V0U291 +cmNlQ3JlZGl0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABz +AAAAAA==</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -163,15 +157,15 @@ AAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </ <string>brain</string> <string>selection</string> <string>kw</string> - <string>accounting_transaction_lines_portal_types</string> <string>_getattr_</string> + <string>context</string> + <string>accounting_transaction_lines_portal_types</string> <string>transaction</string> <string>credit</string> <string>_getiter_</string> <string>line</string> <string>params</string> <string>_write_</string> - <string>context</string> <string>_apply_</string> <string>result</string> <string>_getitem_</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.xml index 859a2d3352..7190685951 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.xml @@ -66,12 +66,8 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>accounting_transaction_lines_portal_types = [\'Accounting Transaction Line\', \n - \'Sale Invoice Transaction Line\',\n - \'Purchase Invoice Transaction Line\', \n - \'Pay Sheet Transaction Line\',\n - \'Payment Transaction Line\',\n - \'Balance Transaction Line\']\n + <value> <string>accounting_transaction_lines_portal_types = context.getPortalAccountingMovementTypeList()\n +\n transaction = brain.getObject()\n debit = 0\n for line in transaction.objectValues() :\n @@ -99,39 +95,36 @@ return float(\'%.02f\' % (row.quantity and - row.quantity or 0.0))\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGUAAGQBAIQCAFoBAGQAAFMoAgAAAE5jAgAAABIAAAAR -AAAASwAAAHO5AQAAZAEAZAIAZAMAZAQAZAUAZAYAZwYAfQMAdAEAfAAAZAcAgwIAgwAAfQUAZAgA -fQYAeJIAdAUAdAEAfAUAZAkAgwIAgwAAgwEARF14AH0IAHQBAHwIAGQKAIMCAIMAAHwDAGoGAG8a -AAF8BgB0AQB8CABkCwCDAgCDAAA3fQYAbgEAAXQBAHwIAGQMAIMCAIMAAHQBAHwIAGQNAIMCAIMA -AGoCAG8aAAF8BgB0AQB8CABkCwCDAgCDAAA3fQYAcUkAAXFJAFd8BgBTfAEAdAgAagkAbxYAAXQB -AHwBAGQOAIMCAIMAAH0KAG4HAAFoAAB9CgBoAAB9AgB0AQB8CgBkDwCDAgBkEACDAQB0CwB8AgCD -AQBkEAA8ZBEAdAsAfAIAgwEAZBIAPGQRAHQLAHwCAIMBAGQTADx0AQB0DABkFACDAgCDAAB0CwB8 -AgCDAQBkFQA8dA0AdAEAdAwAZBYAgwIAZBcAfAEAZBgAfAIAfAIAjQECfQ4AdA8AfA4AZAgAgwIA -fRAAdBEAZBkAdAEAfBAAZBoAgwIAbw4AAXQBAHwQAGQaAIMCAAtwBAABZBsAFoMBAFNkAABTKBwA -AABOcxsAAABBY2NvdW50aW5nIFRyYW5zYWN0aW9uIExpbmVzHQAAAFNhbGUgSW52b2ljZSBUcmFu -c2FjdGlvbiBMaW5lcyEAAABQdXJjaGFzZSBJbnZvaWNlIFRyYW5zYWN0aW9uIExpbmVzGgAAAFBh -eSBTaGVldCBUcmFuc2FjdGlvbiBMaW5lcxgAAABQYXltZW50IFRyYW5zYWN0aW9uIExpbmVzGAAA -AEJhbGFuY2UgVHJhbnNhY3Rpb24gTGluZXMJAAAAZ2V0T2JqZWN0aQAAAABzDAAAAG9iamVjdFZh -bHVlc3MNAAAAZ2V0UG9ydGFsVHlwZXMOAAAAZ2V0U291cmNlRGViaXRzEAAAAGdldFNvdXJjZVNl -Y3Rpb25zFQAAAGdldERlc3RpbmF0aW9uU2VjdGlvbnMJAAAAZ2V0UGFyYW1zcwMAAABnZXRzEAAA -AHNlY3Rpb25fY2F0ZWdvcnlpAQAAAHMEAAAAc3RhdHMKAAAAb21pdF9pbnB1dHMGAAAAZ2V0VWlk -cwsAAAB0cmFuc2FjdGlvbnM5AAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uTW9kdWxlX3pHZXRBY2Nv -dW50aW5nVHJhbnNhY3Rpb25MaXN0cwkAAABzZWxlY3Rpb25zEAAAAHNlbGVjdGlvbl9wYXJhbXNz -BQAAACUuMDJmcwgAAABxdWFudGl0eWYDMC4wKBIAAABzKQAAAGFjY291bnRpbmdfdHJhbnNhY3Rp -b25fbGluZXNfcG9ydGFsX3R5cGVzcwkAAABfZ2V0YXR0cl9zBQAAAGJyYWlucwsAAAB0cmFuc2Fj -dGlvbnMFAAAAZGViaXRzCQAAAF9nZXRpdGVyX3MEAAAAbGluZXMJAAAAc2VsZWN0aW9ucwQAAABO -b25lcwYAAABwYXJhbXNzAgAAAGt3cwcAAABfd3JpdGVfcwcAAABjb250ZXh0cwcAAABfYXBwbHlf -cwYAAAByZXN1bHRzCQAAAF9nZXRpdGVtX3MDAAAAcm93cwUAAABmbG9hdCgSAAAAcwUAAABicmFp -bnMJAAAAc2VsZWN0aW9ucwIAAABrd3MpAAAAYWNjb3VudGluZ190cmFuc2FjdGlvbl9saW5lc19w -b3J0YWxfdHlwZXNzCQAAAF9nZXRhdHRyX3MLAAAAdHJhbnNhY3Rpb25zBQAAAGRlYml0cwkAAABf -Z2V0aXRlcl9zBAAAAGxpbmVzBAAAAE5vbmVzBgAAAHBhcmFtc3MHAAAAX3dyaXRlX3MHAAAAY29u -dGV4dHMHAAAAX2FwcGx5X3MGAAAAcmVzdWx0cwkAAABfZ2V0aXRlbV9zAwAAAHJvd3MFAAAAZmxv -YXQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzKgAAAEFjY291bnRpbmdUcmFuc2FjdGlv -bk1vZHVsZV9nZXRTb3VyY2VEZWJpdAEAAABzKAAAABgGEgEGARkABgEZARoBJQEeAQQDDQEWAgYB -BgEfARABEAEcAiQBDwEoAgAAAHMEAAAATm9uZXMqAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uTW9k -dWxlX2dldFNvdXJjZURlYml0KAIAAABzBAAAAE5vbmVzKgAAAEFjY291bnRpbmdUcmFuc2FjdGlv -bk1vZHVsZV9nZXRTb3VyY2VEZWJpdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAA -PG1vZHVsZT4BAAAAcwAAAAA=</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGUAAGQBAIQCAFoBAGQAAFMoAgAAAE5jAgAAABIAAAAP +AAAASwAAAHOzAQAAdAAAdAEAZAEAgwIAgwAAfQUAdAAAfAAAZAIAgwIAgwAAfQYAZAMAfQcAeJIA +dAYAdAAAfAYAZAQAgwIAgwAAgwEARF14AH0JAHQAAHwJAGQFAIMCAIMAAHwFAGoGAG8aAAF8BwB0 +AAB8CQBkBgCDAgCDAAA3fQcAbgEAAXQAAHwJAGQHAIMCAIMAAHQAAHwJAGQIAIMCAIMAAGoCAG8a +AAF8BwB0AAB8CQBkBgCDAgCDAAA3fQcAcUMAAXFDAFd8BwBTfAEAdAkAagkAbxYAAXQAAHwBAGQJ +AIMCAIMAAH0LAG4HAAFoAAB9CwBoAAB9AgB0AAB8CwBkCgCDAgBkCwCDAQB0DAB8AgCDAQBkCwA8 +ZAwAdAwAfAIAgwEAZA0APGQMAHQMAHwCAIMBAGQOADx0AAB0AQBkDwCDAgCDAAB0DAB8AgCDAQBk +EAA8dA0AdAAAdAEAZBEAgwIAZBIAfAEAZBMAfAIAfAIAjQECfQ4AdA8AfA4AZAMAgwIAfRAAdBEA +ZBQAdAAAfBAAZBUAgwIAbw4AAXQAAHwQAGQVAIMCAAtwBAABZBYAFoMBAFNkAABTKBcAAABOcyMA +AABnZXRQb3J0YWxBY2NvdW50aW5nTW92ZW1lbnRUeXBlTGlzdHMJAAAAZ2V0T2JqZWN0aQAAAABz +DAAAAG9iamVjdFZhbHVlc3MNAAAAZ2V0UG9ydGFsVHlwZXMOAAAAZ2V0U291cmNlRGViaXRzEAAA +AGdldFNvdXJjZVNlY3Rpb25zFQAAAGdldERlc3RpbmF0aW9uU2VjdGlvbnMJAAAAZ2V0UGFyYW1z +cwMAAABnZXRzEAAAAHNlY3Rpb25fY2F0ZWdvcnlpAQAAAHMEAAAAc3RhdHMKAAAAb21pdF9pbnB1 +dHMGAAAAZ2V0VWlkcwsAAAB0cmFuc2FjdGlvbnM5AAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uTW9k +dWxlX3pHZXRBY2NvdW50aW5nVHJhbnNhY3Rpb25MaXN0cwkAAABzZWxlY3Rpb25zEAAAAHNlbGVj +dGlvbl9wYXJhbXNzBQAAACUuMDJmcwgAAABxdWFudGl0eWYDMC4wKBIAAABzCQAAAF9nZXRhdHRy +X3MHAAAAY29udGV4dHMpAAAAYWNjb3VudGluZ190cmFuc2FjdGlvbl9saW5lc19wb3J0YWxfdHlw +ZXNzBQAAAGJyYWlucwsAAAB0cmFuc2FjdGlvbnMFAAAAZGViaXRzCQAAAF9nZXRpdGVyX3MEAAAA +bGluZXMJAAAAc2VsZWN0aW9ucwQAAABOb25lcwYAAABwYXJhbXNzAgAAAGt3cwcAAABfd3JpdGVf +cwcAAABfYXBwbHlfcwYAAAByZXN1bHRzCQAAAF9nZXRpdGVtX3MDAAAAcm93cwUAAABmbG9hdCgS +AAAAcwUAAABicmFpbnMJAAAAc2VsZWN0aW9ucwIAAABrd3MJAAAAX2dldGF0dHJfcwcAAABjb250 +ZXh0cykAAABhY2NvdW50aW5nX3RyYW5zYWN0aW9uX2xpbmVzX3BvcnRhbF90eXBlc3MLAAAAdHJh +bnNhY3Rpb25zBQAAAGRlYml0cwkAAABfZ2V0aXRlcl9zBAAAAGxpbmVzBAAAAE5vbmVzBgAAAHBh +cmFtc3MHAAAAX3dyaXRlX3MHAAAAX2FwcGx5X3MGAAAAcmVzdWx0cwkAAABfZ2V0aXRlbV9zAwAA +AHJvd3MFAAAAZmxvYXQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzKgAAAEFjY291bnRp +bmdUcmFuc2FjdGlvbk1vZHVsZV9nZXRTb3VyY2VEZWJpdAEAAABzKAAAABICEgEGARkABgEZARoB +JQEeAQQDDQEWAgYBBgEfARABEAEcAiQBDwEoAgAAAHMEAAAATm9uZXMqAAAAQWNjb3VudGluZ1Ry +YW5zYWN0aW9uTW9kdWxlX2dldFNvdXJjZURlYml0KAIAAABzBAAAAE5vbmVzKgAAAEFjY291bnRp +bmdUcmFuc2FjdGlvbk1vZHVsZV9nZXRTb3VyY2VEZWJpdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAo +UHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -168,8 +161,9 @@ PG1vZHVsZT4BAAAAcwAAAAA=</string> </value> <string>brain</string> <string>selection</string> <string>kw</string> - <string>accounting_transaction_lines_portal_types</string> <string>_getattr_</string> + <string>context</string> + <string>accounting_transaction_lines_portal_types</string> <string>transaction</string> <string>debit</string> <string>_getiter_</string> @@ -177,7 +171,6 @@ PG1vZHVsZT4BAAAAcwAAAAA=</string> </value> <string>None</string> <string>params</string> <string>_write_</string> - <string>context</string> <string>_apply_</string> <string>result</string> <string>_getitem_</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml index 7d5f543e56..0ef38125bc 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox.xml @@ -334,7 +334,7 @@ <string>Type</string> </tuple> <tuple> - <string>delivery.stop_date</string> + <string>delivery.start_date</string> <string>Date</string> </tuple> <tuple> @@ -388,19 +388,19 @@ </tuple> <tuple> <string>translated_portal_type</string> - <string>Type</string> + <string>Transaction Type</string> </tuple> <tuple> - <string>delivery.stop_date</string> - <string>Date</string> + <string>delivery.start_date</string> + <string>Accounting Operation Date</string> </tuple> <tuple> <string>reference</string> - <string>Invoice Number</string> + <string>Document Reference</string> </tuple> <tuple> <string>source_reference</string> - <string>Source Reference</string> + <string>Transaction Reference</string> </tuple> <tuple> <string>translated_simulation_state_title</string> @@ -458,7 +458,12 @@ <item> <key> <string>editable_columns</string> </key> <value> - <list/> + <list> + <tuple> + <string>source_reference</string> + <string>Source Reference</string> + </tuple> + </list> </value> </item> <item> @@ -497,7 +502,7 @@ </item> <item> <key> <string>lines</string> </key> - <value> <int>20</int> </value> + <value> <int>18</int> </value> </item> <item> <key> <string>list_action</string> </key> @@ -589,7 +594,7 @@ <string>Type</string> </tuple> <tuple> - <string>delivery.stop_date</string> + <string>delivery.start_date</string> <string>Date</string> </tuple> <tuple> @@ -624,8 +629,8 @@ <value> <list> <tuple> - <string>delivery.stop_date</string> - <string>delivery.stop_date</string> + <string>delivery.start_date</string> + <string>delivery.start_date</string> </tuple> </list> </value> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewJournalDialog/my_transaction_portal_type.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewJournalDialog/my_transaction_portal_type.xml index 30cc517f1a..812d3dbe7c 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewJournalDialog/my_transaction_portal_type.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewJournalDialog/my_transaction_portal_type.xml @@ -156,7 +156,9 @@ </item> <item> <key> <string>items</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> + </value> </item> <item> <key> <string>required</string> </key> @@ -326,4 +328,23 @@ </dictionary> </pickle> </record> + <record id="4" aka="AAAAAAAAAAQ="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:[(x, x) for x in here.getPortalAccountingTransactionTypeList()]</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml index b8875c282f..4ee24be850 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml @@ -70,13 +70,7 @@ This script deletes all empty (ie. with balance == 0) lines in an accounting transaction\n """\n \n -lines_portal_type = (\'Accounting Transaction Line\', \n - \'Sale Invoice Transaction Line\',\n - \'Purchase Invoice Transaction Line\', \n - \'Pay Sheet Transaction Line\',\n - \'Payment Transaction Line\',\n - \'Balance Transaction Line\',)\n -\n +lines_portal_type = context.getPortalAccountingMovementTypeList()\n transaction = context.getObject()\n \n for line in transaction.objectValues(portal_type=lines_portal_type) : \n @@ -96,31 +90,28 @@ if redirect :\n <item> <key> <string>_code</string> </key> <value> <string encoding="base64">YwAAAAAAAAAAAgAAAEAAAABzEAAAAGQBAGQCAIQBAFoAAGQAAFMoAwAAAE5pAAAAAGMBAAAACQAA -ABEAAABDAAAAc08BAABkAQBkAgBkAwBkBABkBQBkBgBmBgB9AQB0AQB0AgBkBwCDAgCDAAB9BAB4 -yQB0BAB0AQB8BABkCACDAgBkCQB8AQCDAAGDAQBEXakAfQYAdAEAfAYAZAcAgwIAgwAAfQYAdAYA -dAEAfAYAZAoAgwIAZAkAZAsAgwABdAEAfAYAZAwAgwIAZAkAZAsAgwABF4MBAGQNAGoCAG9WAAF0 -AQB8BgBkDgCDAgCDAAB0AQB8BgBkDwCDAgCDAAAYfQgAfAgAZA0AagIAbyMAAXQBAHwEAGQQAIMC -AHQBAHwGAGQRAIMCAIMAAIMBAAFx8gABcUkAAXFJAFd8AABvTgABdAEAdAEAdAEAdAIAZBIAgwIA -ZBMAgwIAZBQAgwIAZBUAdAEAfAQAZBYAgwIAgwAAdAEAdAIAZBcAgwIAZBgAgwEAZgIAFoMBAAFu -AQABZAAAUygZAAAATnMbAAAAQWNjb3VudGluZyBUcmFuc2FjdGlvbiBMaW5lcx0AAABTYWxlIElu -dm9pY2UgVHJhbnNhY3Rpb24gTGluZXMhAAAAUHVyY2hhc2UgSW52b2ljZSBUcmFuc2FjdGlvbiBM -aW5lcxoAAABQYXkgU2hlZXQgVHJhbnNhY3Rpb24gTGluZXMYAAAAUGF5bWVudCBUcmFuc2FjdGlv -biBMaW5lcxgAAABCYWxhbmNlIFRyYW5zYWN0aW9uIExpbmVzCQAAAGdldE9iamVjdHMMAAAAb2Jq -ZWN0VmFsdWVzcwsAAABwb3J0YWxfdHlwZXMbAAAAZ2V0RGVsaXZlcnlSZWxhdGVkVmFsdWVMaXN0 -cxMAAABTaW11bGF0aW9uIE1vdmVtZW50cxgAAABnZXRPcmRlclJlbGF0ZWRWYWx1ZUxpc3RpAAAA -AHMOAAAAZ2V0U291cmNlRGViaXRzDwAAAGdldFNvdXJjZUNyZWRpdHMNAAAAZGVsZXRlQ29udGVu -dHMFAAAAZ2V0SWRzBwAAAFJFUVVFU1RzCAAAAFJFU1BPTlNFcwgAAAByZWRpcmVjdHMgAAAAJXMv -dmlldz9wb3J0YWxfc3RhdHVzX21lc3NhZ2U9JXNzBwAAAGdldFBhdGhzFAAAAEJhc2VfVHJhbnNs -YXRlU3RyaW5ncxQAAABFbXB0eSBMaW5lcyBEZWxldGVkLigJAAAAcxEAAABsaW5lc19wb3J0YWxf -dHlwZXMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwsAAAB0cmFuc2FjdGlvbnMJAAAAX2dldGl0 -ZXJfcwQAAABsaW5lcwMAAABsZW5zBwAAAGJhbGFuY2VzCAAAAHJlZGlyZWN0KAkAAABzCAAAAHJl -ZGlyZWN0cxEAAABsaW5lc19wb3J0YWxfdHlwZXMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwsA -AAB0cmFuc2FjdGlvbnMJAAAAX2dldGl0ZXJfcwQAAABsaW5lcwMAAABsZW5zBwAAAGJhbGFuY2Uo -AAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzJgAAAEFjY291bnRpbmdUcmFuc2FjdGlvbl9k -ZWxldGVFbXB0eUxpbmVzAQAAAHMaAAAAAAQYBxICHwAGARIDGwAgASIBEAEoAhABGwEoAQAAAHMm -AAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX2RlbGV0ZUVtcHR5TGluZXMoAQAAAHMmAAAAQWNjb3Vu -dGluZ1RyYW5zYWN0aW9uX2RlbGV0ZUVtcHR5TGluZXMoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5 -dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> +AA8AAABDAAAAc0kBAAB0AAB0AQBkAQCDAgCDAAB9AwB0AAB0AQBkAgCDAgCDAAB9BAB4yQB0BAB0 +AAB8BABkAwCDAgBkBAB8AwCDAAGDAQBEXakAfQYAdAAAfAYAZAIAgwIAgwAAfQYAdAYAdAAAfAYA +ZAUAgwIAZAQAZAYAgwABdAAAfAYAZAcAgwIAZAQAZAYAgwABF4MBAGQIAGoCAG9WAAF0AAB8BgBk +CQCDAgCDAAB0AAB8BgBkCgCDAgCDAAAYfQgAfAgAZAgAagIAbyMAAXQAAHwEAGQLAIMCAHQAAHwG +AGQMAIMCAIMAAIMBAAFx7AABcUMAAXFDAFd8AABvTgABdAAAdAAAdAAAdAEAZA0AgwIAZA4AgwIA +ZA8AgwIAZBAAdAAAfAQAZBEAgwIAgwAAdAAAdAEAZBIAgwIAZBMAgwEAZgIAFoMBAAFuAQABZAAA +UygUAAAATnMjAAAAZ2V0UG9ydGFsQWNjb3VudGluZ01vdmVtZW50VHlwZUxpc3RzCQAAAGdldE9i +amVjdHMMAAAAb2JqZWN0VmFsdWVzcwsAAABwb3J0YWxfdHlwZXMbAAAAZ2V0RGVsaXZlcnlSZWxh +dGVkVmFsdWVMaXN0cxMAAABTaW11bGF0aW9uIE1vdmVtZW50cxgAAABnZXRPcmRlclJlbGF0ZWRW +YWx1ZUxpc3RpAAAAAHMOAAAAZ2V0U291cmNlRGViaXRzDwAAAGdldFNvdXJjZUNyZWRpdHMNAAAA +ZGVsZXRlQ29udGVudHMFAAAAZ2V0SWRzBwAAAFJFUVVFU1RzCAAAAFJFU1BPTlNFcwgAAAByZWRp +cmVjdHMgAAAAJXMvdmlldz9wb3J0YWxfc3RhdHVzX21lc3NhZ2U9JXNzBwAAAGdldFBhdGhzFAAA +AEJhc2VfVHJhbnNsYXRlU3RyaW5ncxQAAABFbXB0eSBMaW5lcyBEZWxldGVkLigJAAAAcwkAAABf +Z2V0YXR0cl9zBwAAAGNvbnRleHRzEQAAAGxpbmVzX3BvcnRhbF90eXBlcwsAAAB0cmFuc2FjdGlv +bnMJAAAAX2dldGl0ZXJfcwQAAABsaW5lcwMAAABsZW5zBwAAAGJhbGFuY2VzCAAAAHJlZGlyZWN0 +KAkAAABzCAAAAHJlZGlyZWN0cwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzEQAAAGxpbmVzX3Bv +cnRhbF90eXBlcwsAAAB0cmFuc2FjdGlvbnMJAAAAX2dldGl0ZXJfcwQAAABsaW5lcwMAAABsZW5z +BwAAAGJhbGFuY2UoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzJgAAAEFjY291bnRpbmdU +cmFuc2FjdGlvbl9kZWxldGVFbXB0eUxpbmVzAQAAAHMaAAAAAAQSARICHwAGARIDGwAgASIBEAEo +AhABGwEoAQAAAHMmAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX2RlbGV0ZUVtcHR5TGluZXMoAQAA +AHMmAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX2RlbGV0ZUVtcHR5TGluZXMoAAAAACgAAAAAcw8A +AABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -155,9 +146,9 @@ dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> <value> <tuple> <string>redirect</string> - <string>lines_portal_type</string> <string>_getattr_</string> <string>context</string> + <string>lines_portal_type</string> <string>transaction</string> <string>_getiter_</string> <string>line</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statSourceBalance.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statSourceBalance.xml index 2572fdb523..b4f233381f 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statSourceBalance.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_statSourceBalance.xml @@ -143,7 +143,7 @@ AHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_filepath</string> </key> - <value> <string>Script (Python):/nexedi/erp5_accounting/BankAccount_statSourceBalance</string> </value> + <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/BankAccount_statSourceBalance</string> </value> </item> <item> <key> <string>_params</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml index 3fe8acb41d..02e6dc8732 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/listbox.xml @@ -186,6 +186,10 @@ <key> <string>columns</string> </key> <value> <string></string> </value> </item> + <item> + <key> <string>count_method</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>css_class</string> </key> <value> <string></string> </value> @@ -252,7 +256,9 @@ </item> <item> <key> <string>portal_types</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> </item> <item> <key> <string>report_root_list</string> </key> @@ -490,7 +496,7 @@ <item> <key> <string>list_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> </item> <item> @@ -600,7 +606,7 @@ <item> <key> <string>stat_method</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> <item> @@ -636,6 +642,25 @@ </pickle> </record> <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <tuple> + <string>Products.Formulator.TALESField</string> + <string>TALESMethod</string> + </tuple> + <none/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python:[(x, x) for x in here.getPortalAccountingTransactionTypeList()]</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> <pickle> <tuple> <tuple> @@ -654,7 +679,7 @@ </dictionary> </pickle> </record> - <record id="3" aka="AAAAAAAAAAM="> + <record id="4" aka="AAAAAAAAAAQ="> <pickle> <tuple> <tuple> -- 2.30.9