diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountingTransactionCount.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountingTransactionCount.xml index 8c4ebe9d4bc1143c0ae5bae9b5d4b57e4f417212..0a070d3536826422d1d2eebfe6e733c91b103f41 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountingTransactionCount.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountingTransactionCount.xml @@ -108,27 +108,18 @@ if kw.get(\'stat\') :\n kwd[\'closed_summary\'] = params[\'closed_summary\']\n if selection.isInvertMode() :\n kwd[\'selection_uids\'] = selection.getInvertModeUidList()\n - result = context.Resource_zStatInventory(omit_simulation=1,\n + return context.portal_simulation.getInventoryStat(omit_simulation=1,\n **kwd)\n - row = result[0]\n - return int(row.count or 0)\n \n -inventory = context.Resource_zGetInventory_old(node_uid=context.getUid(),\n +return context.portal_simulation.getInventory(node_uid=context.getUid(),\n omit_simulation=1,\n **kwd)\n -inventory = inventory[0]\n -return inventory.stock_uid\n -\n -# XXX should be return currency.getInventoryCount(from_date = params.get(\'from_date\'), to_date=params.get(\'to_date\'), )\n -# XXX should be actually return currency.getInventoryCount(**params )\n -\n -# vim: syntax=python\n </string> </value> </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAgAAABgAAAArAAAASwAA -AHNXAwAAZAEAhAAAfQMAdAEAfAAAZAIAgwIAgwAAfQUAdAQAfAUAgwEAfQcAdAEAdAEAdAYAZAMA + <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAgAAABQAAAArAAAASwAA +AHMgAwAAZAEAhAAAfQMAdAEAfAAAZAIAgwIAgwAAfQUAdAQAfAUAgwEAfQcAdAEAdAEAdAYAZAMA gwIAgwAAZAQAgwIAfQkAdAEAfAkAZAUAgwIAgwAAfQoAfAoAbxQAAXwKAHQJAHwHAIMBAGQGADxu AQABdAEAfAkAZAcAgwIAgwAAfQwAfAwAbxQAAXwMAHQJAHwHAIMBAGQIADxuAQABdAEAfAkAZAkA gwIAgwAAfQ0AfA0AbxQAAXwNAHQJAHwHAIMBAGQKADxuAQABdAwAdAEAdAEAdAYAZAsAgwIAZAwA @@ -136,48 +127,45 @@ gwIAfAcAjQEAfQ8AdAEAfAkAZA0AgwIAgwAAfRAAfBAAbxQAAXwQAHQJAHwHAIMBAGQOADxuAQAB dAEAfA8AZA8AgwIAZBAAgwEAbx0AAXQPAHwPAGQQAIMCAHQJAHwHAIMBAGQQADxuAQABdAEAfA8A ZA8AgwIAZBEAgwEAbx0AAXQPAHwPAGQRAIMCAHQJAHwHAIMBAGQRADxuAQABdAEAfAUAZA8AgwIA ZBIAgwEAfRIAfBIAb0EAAXQBAHQBAHQGAGQTAIMCAGQUAIMCAHwSAIMBAH0TAHQBAHwTAGQVAIMC -AIMAAGcBAHQJAHwHAIMBAGQWADxuAQABdAEAfAIAZA8AgwIAZBcAgwEAbxcBAXQBAHwAAGQYAIMC +AIMAAGcBAHQJAHwHAIMBAGQWADxuAQABdAEAfAIAZA8AgwIAZBcAgwEAb/UAAXQBAHwAAGQYAIMC AIMAAG8gAAF0AQB8AABkGACDAgCDAAB0CQB8BwCDAQBkGQA8bgEAAXQBAHwAAGQaAIMCAIMAAG8g AAF0AQB8AABkGgCDAgCDAAB0CQB8BwCDAQBkGwA8bgEAAXQBAHwFAGQPAIMCAGQcAIMBAG8dAAF0 DwB8BQBkHACDAgB0CQB8BwCDAQBkHAA8bgEAAXQBAHwAAGQdAIMCAIMAAG8gAAF0AQB8AABkHgCD -AgCDAAB0CQB8BwCDAQBkHwA8bgEAAXQMAHQBAHQGAGQgAIMCAGQhAGQiAHwHAI0BAX0UAHQPAHwU -AGQjAIMCAH0VAHQVAHQBAHwVAGQkAIMCAHAEAAFkIwCDAQBTbgEAAXQMAHQBAHQGAGQlAIMCAGQm -AHQBAHQGAGQVAIMCAIMAAGQhAGQiAHwHAI0BAn0XAHQPAHwXAGQjAIMCAH0XAHQBAHwXAGQnAIMC -AFNkAABTKCgAAABOYwEAAAADAAAAAwAAAEMAAABzFgAAAHQAAHQBAGQBAIMCAGQCAHwAAIMCAFMo -AwAAAE5zAwAAAGxvZ3MrAAAAQWNjb3VudE1vZHVsZV9nZXRBY2NvdW50aW5nVHJhbnNhY3Rpb25D -b3VudCgDAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzBwAAAG1lc3NhZ2UoAwAAAHMHAAAA -bWVzc2FnZXMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQ -eXRob24pcwoAAAA8bGFtYmRhLjE+AQAAAHMAAAAAcwkAAABnZXRQYXJhbXNzDwAAAGdldFBvcnRh -bE9iamVjdHMSAAAAcG9ydGFsX3ByZWZlcmVuY2VzcykAAABnZXRQcmVmZXJyZWRBY2NvdW50aW5n -VHJhbnNhY3Rpb25Gcm9tRGF0ZXMJAAAAZnJvbV9kYXRlcycAAABnZXRQcmVmZXJyZWRBY2NvdW50 -aW5nVHJhbnNhY3Rpb25BdERhdGVzBwAAAGF0X2RhdGVzMAAAAGdldFByZWZlcnJlZEFjY291bnRp -bmdUcmFuc2FjdGlvblNlY3Rpb25DYXRlZ29yeXMQAAAAc2VjdGlvbl9jYXRlZ29yeXMOAAAAcG9y -dGFsX2NhdGFsb2dzDQAAAGJ1aWxkU1FMUXVlcnlzNAAAAGdldFByZWZlcnJlZEFjY291bnRpbmdU -cmFuc2FjdGlvblNpbXVsYXRpb25TdGF0ZUxpc3RzEAAAAHNpbXVsYXRpb25fc3RhdGVzAwAAAGdl -dHMQAAAAd2hlcmVfZXhwcmVzc2lvbnMPAAAAZnJvbV90YWJsZV9saXN0cyQAAABhY2NvdW50aW5n -X3RyYW5zYWN0aW9uX2xpbmVfY3VycmVuY3lzEQAAAHBvcnRhbF9jYXRlZ29yaWVzcw8AAAByZXNv -bHZlQ2F0ZWdvcnlzBgAAAGdldFVpZHMMAAAAcmVzb3VyY2VfdWlkcwQAAABzdGF0cwkAAABnZXRE -b21haW5zEAAAAHNlbGVjdGlvbl9kb21haW5zCQAAAGdldFJlcG9ydHMQAAAAc2VsZWN0aW9uX3Jl -cG9ydHMOAAAAY2xvc2VkX3N1bW1hcnlzDAAAAGlzSW52ZXJ0TW9kZXMUAAAAZ2V0SW52ZXJ0TW9k -ZVVpZExpc3RzDgAAAHNlbGVjdGlvbl91aWRzcxcAAABSZXNvdXJjZV96U3RhdEludmVudG9yeXMP -AAAAb21pdF9zaW11bGF0aW9uaQEAAABpAAAAAHMFAAAAY291bnRzGgAAAFJlc291cmNlX3pHZXRJ -bnZlbnRvcnlfb2xkcwgAAABub2RlX3VpZHMJAAAAc3RvY2tfdWlkKBcAAABzAwAAAExPR3MJAAAA -X2dldGF0dHJfcwkAAABzZWxlY3Rpb25zBgAAAHBhcmFtc3MEAAAAZGljdHMDAAAAa3dkcwcAAABj -b250ZXh0cwoAAABwcmVmZXJlbmNlcwkAAABmcm9tX2RhdGVzBwAAAF93cml0ZV9zBwAAAGF0X2Rh -dGVzEAAAAHNlY3Rpb25fY2F0ZWdvcnlzBwAAAF9hcHBseV9zBQAAAHF1ZXJ5cxAAAABzaW11bGF0 -aW9uX3N0YXRlcwkAAABfZ2V0aXRlbV9zCAAAAHJlc291cmNlcwgAAABjdXJyZW5jeXMCAAAAa3dz -BgAAAHJlc3VsdHMDAAAAcm93cwMAAABpbnRzCQAAAGludmVudG9yeSgYAAAAcwkAAABzZWxlY3Rp -b25zBQAAAGJyYWlucwIAAABrd3MDAAAATE9HcwkAAABfZ2V0YXR0cl9zBgAAAHBhcmFtc3MEAAAA -ZGljdHMDAAAAa3dkcwcAAABjb250ZXh0cwoAAABwcmVmZXJlbmNlcwkAAABmcm9tX2RhdGVzBwAA -AF93cml0ZV9zBwAAAGF0X2RhdGVzEAAAAHNlY3Rpb25fY2F0ZWdvcnlzBwAAAF9hcHBseV9zBQAA -AHF1ZXJ5cxAAAABzaW11bGF0aW9uX3N0YXRlcwkAAABfZ2V0aXRlbV9zCAAAAHJlc291cmNlcwgA -AABjdXJyZW5jeXMGAAAAcmVzdWx0cwMAAAByb3dzAwAAAGludHMJAAAAaW52ZW50b3J5KAAAAAAo -AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcysAAABBY2NvdW50TW9kdWxlX2dldEFjY291bnRpbmdU -cmFuc2FjdGlvbkNvdW50AQAAAHNSAAAACQISAQwDGwESAQcBFAESAQcBFAESAQcBFAIhAhIBBwEX -AhMBIAETAR0CFQEHAR4BJgIWARABIwEQASMBEwEgARABIAEVAQkBDwEeAicCCQEPASgBAAAAcysA -AABBY2NvdW50TW9kdWxlX2dldEFjY291bnRpbmdUcmFuc2FjdGlvbkNvdW50KAEAAABzKwAAAEFj -Y291bnRNb2R1bGVfZ2V0QWNjb3VudGluZ1RyYW5zYWN0aW9uQ291bnQoAAAAACgAAAAAcw8AAABT -Y3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> +AgCDAAB0CQB8BwCDAQBkHwA8bgEAAXQMAHQBAHQBAHQGAGQgAIMCAGQhAIMCAGQiAGQjAHwHAI0B +AVNuAQABdAwAdAEAdAEAdAYAZCAAgwIAZCQAgwIAZCUAdAEAdAYAZBUAgwIAgwAAZCIAZCMAfAcA +jQECU2QAAFMoJgAAAE5jAQAAAAMAAAADAAAAQwAAAHMWAAAAdAAAdAEAZAEAgwIAZAIAfAAAgwIA +UygDAAAATnMDAAAAbG9ncysAAABBY2NvdW50TW9kdWxlX2dldEFjY291bnRpbmdUcmFuc2FjdGlv +bkNvdW50KAMAAABzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMHAAAAbWVzc2FnZSgDAAAAcwcA +AABtZXNzYWdlcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoAAAAACgAAAAAcw8AAABTY3JpcHQg +KFB5dGhvbilzCgAAADxsYW1iZGEuMD4BAAAAcwAAAABzCQAAAGdldFBhcmFtc3MPAAAAZ2V0UG9y +dGFsT2JqZWN0cxIAAABwb3J0YWxfcHJlZmVyZW5jZXNzKQAAAGdldFByZWZlcnJlZEFjY291bnRp +bmdUcmFuc2FjdGlvbkZyb21EYXRlcwkAAABmcm9tX2RhdGVzJwAAAGdldFByZWZlcnJlZEFjY291 +bnRpbmdUcmFuc2FjdGlvbkF0RGF0ZXMHAAAAYXRfZGF0ZXMwAAAAZ2V0UHJlZmVycmVkQWNjb3Vu +dGluZ1RyYW5zYWN0aW9uU2VjdGlvbkNhdGVnb3J5cxAAAABzZWN0aW9uX2NhdGVnb3J5cw4AAABw +b3J0YWxfY2F0YWxvZ3MNAAAAYnVpbGRTUUxRdWVyeXM0AAAAZ2V0UHJlZmVycmVkQWNjb3VudGlu +Z1RyYW5zYWN0aW9uU2ltdWxhdGlvblN0YXRlTGlzdHMQAAAAc2ltdWxhdGlvbl9zdGF0ZXMDAAAA +Z2V0cxAAAAB3aGVyZV9leHByZXNzaW9ucw8AAABmcm9tX3RhYmxlX2xpc3RzJAAAAGFjY291bnRp +bmdfdHJhbnNhY3Rpb25fbGluZV9jdXJyZW5jeXMRAAAAcG9ydGFsX2NhdGVnb3JpZXNzDwAAAHJl +c29sdmVDYXRlZ29yeXMGAAAAZ2V0VWlkcwwAAAByZXNvdXJjZV91aWRzBAAAAHN0YXRzCQAAAGdl +dERvbWFpbnMQAAAAc2VsZWN0aW9uX2RvbWFpbnMJAAAAZ2V0UmVwb3J0cxAAAABzZWxlY3Rpb25f +cmVwb3J0cw4AAABjbG9zZWRfc3VtbWFyeXMMAAAAaXNJbnZlcnRNb2RlcxQAAABnZXRJbnZlcnRN +b2RlVWlkTGlzdHMOAAAAc2VsZWN0aW9uX3VpZHNzEQAAAHBvcnRhbF9zaW11bGF0aW9ucxAAAABn +ZXRJbnZlbnRvcnlTdGF0cw8AAABvbWl0X3NpbXVsYXRpb25pAQAAAHMMAAAAZ2V0SW52ZW50b3J5 +cwgAAABub2RlX3VpZCgTAAAAcwMAAABMT0dzCQAAAF9nZXRhdHRyX3MJAAAAc2VsZWN0aW9ucwYA +AABwYXJhbXNzBAAAAGRpY3RzAwAAAGt3ZHMHAAAAY29udGV4dHMKAAAAcHJlZmVyZW5jZXMJAAAA +ZnJvbV9kYXRlcwcAAABfd3JpdGVfcwcAAABhdF9kYXRlcxAAAABzZWN0aW9uX2NhdGVnb3J5cwcA +AABfYXBwbHlfcwUAAABxdWVyeXMQAAAAc2ltdWxhdGlvbl9zdGF0ZXMJAAAAX2dldGl0ZW1fcwgA +AAByZXNvdXJjZXMIAAAAY3VycmVuY3lzAgAAAGt3KBQAAABzCQAAAHNlbGVjdGlvbnMFAAAAYnJh +aW5zAgAAAGt3cwMAAABMT0dzCQAAAF9nZXRhdHRyX3MGAAAAcGFyYW1zcwQAAABkaWN0cwMAAABr +d2RzBwAAAGNvbnRleHRzCgAAAHByZWZlcmVuY2VzCQAAAGZyb21fZGF0ZXMHAAAAX3dyaXRlX3MH +AAAAYXRfZGF0ZXMQAAAAc2VjdGlvbl9jYXRlZ29yeXMHAAAAX2FwcGx5X3MFAAAAcXVlcnlzEAAA +AHNpbXVsYXRpb25fc3RhdGVzCQAAAF9nZXRpdGVtX3MIAAAAcmVzb3VyY2VzCAAAAGN1cnJlbmN5 +KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcysAAABBY2NvdW50TW9kdWxlX2dldEFjY291 +bnRpbmdUcmFuc2FjdGlvbkNvdW50AQAAAHNKAAAACQISAQwDGwESAQcBFAESAQcBFAESAQcBFAIh +AhIBBwEXAhMBIAETAR0CFQEHAR4BJgIWARABIwEQASMBEwEgARABIAEeAQsCMAIoAQAAAHMrAAAA +QWNjb3VudE1vZHVsZV9nZXRBY2NvdW50aW5nVHJhbnNhY3Rpb25Db3VudCgBAAAAcysAAABBY2Nv +dW50TW9kdWxlX2dldEFjY291bnRpbmdUcmFuc2FjdGlvbkNvdW50KAAAAAAoAAAAAHMPAAAAU2Ny +aXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_dav_writelocks</string> </key> @@ -237,10 +225,6 @@ Y3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> <string>_getitem_</string> <string>resource</string> <string>currency</string> - <string>result</string> - <string>row</string> - <string>int</string> - <string>inventory</string> </tuple> </value> </item> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml index 3c5feb745abadc0278f58b387cf94e7586791c66..6246b493fecb4ff93e59357b771723a2f7591ee5 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml @@ -92,52 +92,45 @@ if kw.get(\'omit_input\') :\n kwd[\'omit_input\'] = 1\n if kw.get(\'omit_output\') :\n kwd[\'omit_output\'] = 1\n - \n -inventory = context.Resource_zGetInventory_old(node_uid=context.getUid(),\n +\n +return context.portal_simulation.getInventory(node_uid=context.getUid(),\n omit_simulation=1,\n **kwd)\n -total = inventory[0].inventory or 0.0\n -\n -return total\n -\n -# vim: syntax=python\n </string> </value> </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGUAAGQBAIQCAFoBAGQAAFMoAgAAAE5jAgAAABMAAAAe -AAAASwAAAHPmAQAAdAAAfAEAZAEAgwIAgwAAfQQAaAAAfQUAdAAAdAAAdAQAZAIAgwIAgwAAZAMA + <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGUAAGQBAIQCAFoBAGQAAFMoAgAAAE5jAgAAABAAAAAe +AAAASwAAAHPKAQAAdAAAfAEAZAEAgwIAgwAAfQQAaAAAfQUAdAAAdAAAdAQAZAIAgwIAgwAAZAMA gwIAfQcAdAAAfAcAZAQAgwIAgwAAfQgAfAgAbxQAAXwIAHQHAHwFAIMBAGQFADxuAQABdAAAfAcA ZAYAgwIAgwAAfQoAfAoAbxQAAXwKAHQHAHwFAIMBAGQHADxuAQABdAAAfAcAZAgAgwIAgwAAfQsA fAsAbxQAAXwLAHQHAHwFAIMBAGQJADxuAQABdAAAfAcAZAoAgwIAgwAAfQwAfAwAbxQAAXwMAHQH AHwFAIMBAGQLADxuAQABdAAAfAQAZAwAgwIAZA0AgwEAfQ0AfA0AbzgAAXQAAHQEAGQOAIMCAHwN AIMBAH0OAHQAAHwOAGQPAIMCAIMAAGcBAHQHAHwFAIMBAGQQADxuAQABdAAAfAIAZAwAgwIAZBEA gwEAbxQAAWQSAHQHAHwFAIMBAGQRADxuAQABdAAAfAIAZAwAgwIAZBMAgwEAbxQAAWQSAHQHAHwF -AIMBAGQTADxuAQABdA4AdAAAdAQAZBQAgwIAZBUAdAAAdAQAZA8AgwIAgwAAZBYAZBIAfAUAjQEC -fRAAdAAAdBAAfBAAZBcAgwIAZBgAgwIAcAQAAWQZAH0SAHwSAFNkAABTKBoAAABOcwkAAABnZXRQ -YXJhbXNzDwAAAGdldFBvcnRhbE9iamVjdHMSAAAAcG9ydGFsX3ByZWZlcmVuY2VzcykAAABnZXRQ -cmVmZXJyZWRBY2NvdW50aW5nVHJhbnNhY3Rpb25Gcm9tRGF0ZXMJAAAAZnJvbV9kYXRlcycAAABn -ZXRQcmVmZXJyZWRBY2NvdW50aW5nVHJhbnNhY3Rpb25BdERhdGVzBwAAAGF0X2RhdGVzNAAAAGdl -dFByZWZlcnJlZEFjY291bnRpbmdUcmFuc2FjdGlvblNpbXVsYXRpb25TdGF0ZUxpc3RzEAAAAHNp -bXVsYXRpb25fc3RhdGVzMAAAAGdldFByZWZlcnJlZEFjY291bnRpbmdUcmFuc2FjdGlvblNlY3Rp -b25DYXRlZ29yeXMQAAAAc2VjdGlvbl9jYXRlZ29yeXMDAAAAZ2V0cyQAAABhY2NvdW50aW5nX3Ry -YW5zYWN0aW9uX2xpbmVfY3VycmVuY3lzEgAAAHJlc3RyaWN0ZWRUcmF2ZXJzZXMGAAAAZ2V0VWlk -cwwAAAByZXNvdXJjZV91aWRzCgAAAG9taXRfaW5wdXRpAQAAAHMLAAAAb21pdF9vdXRwdXRzGgAA -AFJlc291cmNlX3pHZXRJbnZlbnRvcnlfb2xkcwgAAABub2RlX3VpZHMPAAAAb21pdF9zaW11bGF0 -aW9uaQAAAABzCQAAAGludmVudG9yeWYDMC4wKBIAAABzCQAAAF9nZXRhdHRyX3MJAAAAc2VsZWN0 -aW9ucwYAAABwYXJhbXNzAwAAAGt3ZHMHAAAAY29udGV4dHMKAAAAcHJlZmVyZW5jZXMJAAAAZnJv -bV9kYXRlcwcAAABfd3JpdGVfcwcAAABhdF9kYXRlcxAAAABzaW11bGF0aW9uX3N0YXRlcxAAAABz -ZWN0aW9uX2NhdGVnb3J5cwMAAAB1cmxzCAAAAGN1cnJlbmN5cwIAAABrd3MHAAAAX2FwcGx5X3MJ -AAAAaW52ZW50b3J5cwkAAABfZ2V0aXRlbV9zBQAAAHRvdGFsKBMAAABzBQAAAGJyYWlucwkAAABz -ZWxlY3Rpb25zAgAAAGt3cwkAAABfZ2V0YXR0cl9zBgAAAHBhcmFtc3MDAAAAa3dkcwcAAABjb250 -ZXh0cwoAAABwcmVmZXJlbmNlcwkAAABmcm9tX2RhdGVzBwAAAF93cml0ZV9zBwAAAGF0X2RhdGVz -EAAAAHNpbXVsYXRpb25fc3RhdGVzEAAAAHNlY3Rpb25fY2F0ZWdvcnlzAwAAAHVybHMIAAAAY3Vy -cmVuY3lzBwAAAF9hcHBseV9zCQAAAGludmVudG9yeXMJAAAAX2dldGl0ZW1fcwUAAAB0b3RhbCgA -AAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMYAAAAQWNjb3VudE1vZHVsZV9nZXRCYWxhbmNl -AQAAAHM0AAAAEgEGAxsBEgEHARQBEgEHARQBEgEHARQBEgEHARQCFQEHARUBJgETARcBEwEUAicC -CQEfAigCAAAAcwQAAABOb25lcxgAAABBY2NvdW50TW9kdWxlX2dldEJhbGFuY2UoAgAAAHMEAAAA -Tm9uZXMYAAAAQWNjb3VudE1vZHVsZV9nZXRCYWxhbmNlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQ -eXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> +AIMBAGQTADxuAQABdA4AdAAAdAAAdAQAZBQAgwIAZBUAgwIAZBYAdAAAdAQAZA8AgwIAgwAAZBcA +ZBIAfAUAjQECU2QAAFMoGAAAAE5zCQAAAGdldFBhcmFtc3MPAAAAZ2V0UG9ydGFsT2JqZWN0cxIA +AABwb3J0YWxfcHJlZmVyZW5jZXNzKQAAAGdldFByZWZlcnJlZEFjY291bnRpbmdUcmFuc2FjdGlv +bkZyb21EYXRlcwkAAABmcm9tX2RhdGVzJwAAAGdldFByZWZlcnJlZEFjY291bnRpbmdUcmFuc2Fj +dGlvbkF0RGF0ZXMHAAAAYXRfZGF0ZXM0AAAAZ2V0UHJlZmVycmVkQWNjb3VudGluZ1RyYW5zYWN0 +aW9uU2ltdWxhdGlvblN0YXRlTGlzdHMQAAAAc2ltdWxhdGlvbl9zdGF0ZXMwAAAAZ2V0UHJlZmVy +cmVkQWNjb3VudGluZ1RyYW5zYWN0aW9uU2VjdGlvbkNhdGVnb3J5cxAAAABzZWN0aW9uX2NhdGVn +b3J5cwMAAABnZXRzJAAAAGFjY291bnRpbmdfdHJhbnNhY3Rpb25fbGluZV9jdXJyZW5jeXMSAAAA +cmVzdHJpY3RlZFRyYXZlcnNlcwYAAABnZXRVaWRzDAAAAHJlc291cmNlX3VpZHMKAAAAb21pdF9p +bnB1dGkBAAAAcwsAAABvbWl0X291dHB1dHMRAAAAcG9ydGFsX3NpbXVsYXRpb25zDAAAAGdldElu +dmVudG9yeXMIAAAAbm9kZV91aWRzDwAAAG9taXRfc2ltdWxhdGlvbigPAAAAcwkAAABfZ2V0YXR0 +cl9zCQAAAHNlbGVjdGlvbnMGAAAAcGFyYW1zcwMAAABrd2RzBwAAAGNvbnRleHRzCgAAAHByZWZl +cmVuY2VzCQAAAGZyb21fZGF0ZXMHAAAAX3dyaXRlX3MHAAAAYXRfZGF0ZXMQAAAAc2ltdWxhdGlv +bl9zdGF0ZXMQAAAAc2VjdGlvbl9jYXRlZ29yeXMDAAAAdXJscwgAAABjdXJyZW5jeXMCAAAAa3dz +BwAAAF9hcHBseV8oEAAAAHMFAAAAYnJhaW5zCQAAAHNlbGVjdGlvbnMCAAAAa3dzCQAAAF9nZXRh +dHRyX3MGAAAAcGFyYW1zcwMAAABrd2RzBwAAAGNvbnRleHRzCgAAAHByZWZlcmVuY2VzCQAAAGZy +b21fZGF0ZXMHAAAAX3dyaXRlX3MHAAAAYXRfZGF0ZXMQAAAAc2ltdWxhdGlvbl9zdGF0ZXMQAAAA +c2VjdGlvbl9jYXRlZ29yeXMDAAAAdXJscwgAAABjdXJyZW5jeXMHAAAAX2FwcGx5XygAAAAAKAAA +AABzDwAAAFNjcmlwdCAoUHl0aG9uKXMYAAAAQWNjb3VudE1vZHVsZV9nZXRCYWxhbmNlAQAAAHMw +AAAAEgEGAxsBEgEHARQBEgEHARQBEgEHARQBEgEHARQCFQEHARUBJgETARcBEwEUAjACKAIAAABz +BAAAAE5vbmVzGAAAAEFjY291bnRNb2R1bGVfZ2V0QmFsYW5jZSgCAAAAcwQAAABOb25lcxgAAABB +Y2NvdW50TW9kdWxlX2dldEJhbGFuY2UoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAA +ADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_dav_writelocks</string> </key> @@ -193,9 +186,6 @@ eXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> <string>url</string> <string>currency</string> <string>_apply_</string> - <string>inventory</string> - <string>_getitem_</string> - <string>total</string> </tuple> </value> </item> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceCredit.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceCredit.xml index 8790e7d4b76dcd2319a6d68ba3eb9fa005587e1b..6a7f8900cc2137bb1da055732fd6918d6953d3ac 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceCredit.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceCredit.xml @@ -66,7 +66,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return - context.AccountModule_getBalance(brain=brain, selection=selection, omit_output=1, **kw) or 0.00\n + <value> <string>return - context.AccountModule_getBalance(brain=brain, selection=selection, omit_input=1, **kw) or 0.00\n </string> </value> </item> <item> @@ -74,14 +74,14 @@ <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGUAAGQBAIQCAFoBAGQAAFMoAgAAAE5jAgAAAAYAAAAK AAAASwAAAHM0AAAAdAAAdAEAdAIAZAEAgwIAZAIAfAAAZAMAfAEAZAQAZAUAfAIAjQEDC3AEAAFk BgBTZAAAUygHAAAATnMYAAAAQWNjb3VudE1vZHVsZV9nZXRCYWxhbmNlcwUAAABicmFpbnMJAAAA -c2VsZWN0aW9ucwsAAABvbWl0X291dHB1dGkBAAAAZgMwLjAoBgAAAHMHAAAAX2FwcGx5X3MJAAAA -X2dldGF0dHJfcwcAAABjb250ZXh0cwUAAABicmFpbnMJAAAAc2VsZWN0aW9ucwIAAABrdygGAAAA -cwUAAABicmFpbnMJAAAAc2VsZWN0aW9ucwIAAABrd3MHAAAAX2FwcGx5X3MJAAAAX2dldGF0dHJf -cwcAAABjb250ZXh0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcyIAAABBY2NvdW50TW9k -dWxlX2dldFRvdGFsU291cmNlQ3JlZGl0AQAAAHMAAAAAKAIAAABzBAAAAE5vbmVzIgAAAEFjY291 -bnRNb2R1bGVfZ2V0VG90YWxTb3VyY2VDcmVkaXQoAgAAAHMEAAAATm9uZXMiAAAAQWNjb3VudE1v -ZHVsZV9nZXRUb3RhbFNvdXJjZUNyZWRpdCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMI -AAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> +c2VsZWN0aW9ucwoAAABvbWl0X2lucHV0aQEAAABmAzAuMCgGAAAAcwcAAABfYXBwbHlfcwkAAABf +Z2V0YXR0cl9zBwAAAGNvbnRleHRzBQAAAGJyYWlucwkAAABzZWxlY3Rpb25zAgAAAGt3KAYAAABz +BQAAAGJyYWlucwkAAABzZWxlY3Rpb25zAgAAAGt3cwcAAABfYXBwbHlfcwkAAABfZ2V0YXR0cl9z +BwAAAGNvbnRleHQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzIgAAAEFjY291bnRNb2R1 +bGVfZ2V0VG90YWxTb3VyY2VDcmVkaXQBAAAAcwAAAAAoAgAAAHMEAAAATm9uZXMiAAAAQWNjb3Vu +dE1vZHVsZV9nZXRUb3RhbFNvdXJjZUNyZWRpdCgCAAAAcwQAAABOb25lcyIAAABBY2NvdW50TW9k +dWxlX2dldFRvdGFsU291cmNlQ3JlZGl0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgA +AAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_filepath</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceDebit.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceDebit.xml index 4e5ba7fe3f33e20ee901c7647cd9ec2762780030..28da9cc43e4050d261bddf7bb83cb0d5362eb922 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceDebit.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceDebit.xml @@ -66,21 +66,21 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return context.AccountModule_getBalance(brain, selection, omit_input=1, **kw)\n + <value> <string>return context.AccountModule_getBalance(brain, selection, omit_output=1, **kw)\n </string> </value> </item> <item> <key> <string>_code</string> </key> <value> <string encoding="base64">YwAAAAAAAAAAAwAAAEAAAABzEwAAAGUAAGUAAGQBAIQCAFoBAGQAAFMoAgAAAE5jAgAAAAYAAAAI AAAASwAAAHMmAAAAdAAAdAEAdAIAZAEAgwIAfAAAfAEAZAIAZAMAfAIAjQMBU2QAAFMoBAAAAE5z -GAAAAEFjY291bnRNb2R1bGVfZ2V0QmFsYW5jZXMKAAAAb21pdF9pbnB1dGkBAAAAKAYAAABzBwAA -AF9hcHBseV9zCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMFAAAAYnJhaW5zCQAAAHNlbGVjdGlv -bnMCAAAAa3coBgAAAHMFAAAAYnJhaW5zCQAAAHNlbGVjdGlvbnMCAAAAa3dzBwAAAF9hcHBseV9z -CQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMh -AAAAQWNjb3VudE1vZHVsZV9nZXRUb3RhbFNvdXJjZURlYml0AQAAAHMAAAAAKAIAAABzBAAAAE5v -bmVzIQAAAEFjY291bnRNb2R1bGVfZ2V0VG90YWxTb3VyY2VEZWJpdCgCAAAAcwQAAABOb25lcyEA -AABBY2NvdW50TW9kdWxlX2dldFRvdGFsU291cmNlRGViaXQoAAAAACgAAAAAcw8AAABTY3JpcHQg -KFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> +GAAAAEFjY291bnRNb2R1bGVfZ2V0QmFsYW5jZXMLAAAAb21pdF9vdXRwdXRpAQAAACgGAAAAcwcA +AABfYXBwbHlfcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzBQAAAGJyYWlucwkAAABzZWxlY3Rp +b25zAgAAAGt3KAYAAABzBQAAAGJyYWlucwkAAABzZWxlY3Rpb25zAgAAAGt3cwcAAABfYXBwbHlf +cwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilz +IQAAAEFjY291bnRNb2R1bGVfZ2V0VG90YWxTb3VyY2VEZWJpdAEAAABzAAAAACgCAAAAcwQAAABO +b25lcyEAAABBY2NvdW50TW9kdWxlX2dldFRvdGFsU291cmNlRGViaXQoAgAAAHMEAAAATm9uZXMh +AAAAQWNjb3VudE1vZHVsZV9nZXRUb3RhbFNvdXJjZURlYml0KAAAAAAoAAAAAHMPAAAAU2NyaXB0 +IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_dav_writelocks</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml index b30c9c8ffb711b602ecfdfcabdf28b9ca41a0c4e..2ca33d36e622b3a23c64185f2573c7281f871403 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml @@ -597,7 +597,7 @@ </item> <item> <key> <string>selection_name</string> </key> - <value> <string>account_selection</string> </value> + <value> <string>account_module_selection</string> </value> </item> <item> <key> <string>sort</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapId.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapId.xml index ad214b0f9e6f0fc70436ce085d7ca84f92333bf1..eb5d606ba847ad4a894ed8d1802373e6c2685066 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapId.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapId.xml @@ -68,7 +68,7 @@ <key> <string>_body</string> </key> <value> <string># This script returns the gap id for this account according to the current gap\n \n -current_gap = context.getPortalObject().portal_preferences.getGapValue().getRelativeUrl()\n +current_gap = context.getPortalObject().portal_preferences.getPreferredAccountingTransactionGap()\n \n for gap in context.getGapValueList() : \n if current_gap in gap.getPath() : \n @@ -77,18 +77,18 @@ for gap in context.getGapValueList() : \n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAAMAAAAQwAA -AHOHAAAAdAAAdAAAdAAAdAAAdAEAZAEAgwIAgwAAZAIAgwIAZAMAgwIAgwAAZAQAgwIAgwAAfQIA -eE0AdAMAdAAAdAEAZAUAgwIAgwAAgwEARF0zAH0EAHwCAHQAAHwEAGQGAIMCAIMAAGoGAG8UAAF0 -AAB8BABkBwCDAgCDAABTcUwAAXFMAFdkAABTKAgAAABOcw8AAABnZXRQb3J0YWxPYmplY3RzEgAA -AHBvcnRhbF9wcmVmZXJlbmNlc3MLAAAAZ2V0R2FwVmFsdWVzDgAAAGdldFJlbGF0aXZlVXJscw8A -AABnZXRHYXBWYWx1ZUxpc3RzBwAAAGdldFBhdGhzBQAAAGdldElkKAUAAABzCQAAAF9nZXRhdHRy -X3MHAAAAY29udGV4dHMLAAAAY3VycmVudF9nYXBzCQAAAF9nZXRpdGVyX3MDAAAAZ2FwKAUAAABz -CQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMLAAAAY3VycmVudF9nYXBzCQAAAF9nZXRpdGVyX3MD -AAAAZ2FwKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcxAAAABBY2NvdW50X2dldEdhcElk -AQAAAHMKAAAAAAIzAhkABgEZASgBAAAAcxAAAABBY2NvdW50X2dldEdhcElkKAEAAABzEAAAAEFj -Y291bnRfZ2V0R2FwSWQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+ -AQAAAHMAAAAA</string> </value> + <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAALAAAAQwAA +AHN7AAAAdAAAdAAAdAAAdAEAZAEAgwIAgwAAZAIAgwIAZAMAgwIAgwAAfQIAeE0AdAMAdAAAdAEA +ZAQAgwIAgwAAgwEARF0zAH0EAHwCAHQAAHwEAGQFAIMCAIMAAGoGAG8UAAF0AAB8BABkBgCDAgCD +AABTcUAAAXFAAFdkAABTKAcAAABOcw8AAABnZXRQb3J0YWxPYmplY3RzEgAAAHBvcnRhbF9wcmVm +ZXJlbmNlc3MkAAAAZ2V0UHJlZmVycmVkQWNjb3VudGluZ1RyYW5zYWN0aW9uR2Fwcw8AAABnZXRH +YXBWYWx1ZUxpc3RzBwAAAGdldFBhdGhzBQAAAGdldElkKAUAAABzCQAAAF9nZXRhdHRyX3MHAAAA +Y29udGV4dHMLAAAAY3VycmVudF9nYXBzCQAAAF9nZXRpdGVyX3MDAAAAZ2FwKAUAAABzCQAAAF9n +ZXRhdHRyX3MHAAAAY29udGV4dHMLAAAAY3VycmVudF9nYXBzCQAAAF9nZXRpdGVyX3MDAAAAZ2Fw +KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcxAAAABBY2NvdW50X2dldEdhcElkAQAAAHMK +AAAAAAInAhkABgEZASgBAAAAcxAAAABBY2NvdW50X2dldEdhcElkKAEAAABzEAAAAEFjY291bnRf +Z2V0R2FwSWQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMA +AAAA</string> </value> </item> <item> <key> <string>_filepath</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapItemList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapItemList.xml index ad42386d1f1bee7dffcef64182be1a826bc6bf71..2d6aafafff0be34b811e31f1545df0bbadc268a9 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapItemList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapItemList.xml @@ -73,7 +73,7 @@ def sort(x,y):\n return cmp(display(x), display(y))\n \n try :\n - gap_root = \'gap/\' + context.portal_preferences.getGap() \n + gap_root = context.portal_preferences.getPreferredAccountingTransactionGap() \n except KeyError :\n raise\n gap_root = context.getPortalDefaultGapRoot()\n @@ -84,27 +84,27 @@ return obj.getCategoryChildItemList(base=0, display_method=display, sort_method <item> <key> <string>_code</string> </key> <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAcAAAAPAAAAAwAA -AHOnAAAAZAEAhAAAiQAAhwAAZAIAhgAAfQEAeSMAZAMAdAIAdAIAdAMAZAQAgwIAZAUAgwIAgwAA -F30EAFduKAAEdAUAagoAbxwAAQEBAYIAAHQCAHQDAGQGAIMCAIMAAH0EAG4CAAFYdAIAdAIAdAMA -ZAcAgwIAZAgAgwIAfAQAgwEAfQYAdAIAfAYAZAkAgwIAZAoAZAsAZAwAiAAAZA0AfAEAgwADU2QA -AFMoDgAAAE5jAQAAAAIAAAAGAAAAQwAAAHMqAAAAZAEAdAAAfAAAZAIAgwIAgwAAdAAAfAAAZAMA -gwIAgwAAZgIAFlNkAABTKAQAAABOcwcAAAAlcyAtICVzcwUAAABnZXRJZHMIAAAAZ2V0VGl0bGUo -AgAAAHMJAAAAX2dldGF0dHJfcwEAAAB4KAIAAABzAQAAAHhzCQAAAF9nZXRhdHRyXygAAAAAKAAA -AABzDwAAAFNjcmlwdCAoUHl0aG9uKXMHAAAAZGlzcGxheQEAAABzAgAAAAABYwIAAAAEAAAABQAA -AAMAAABzHQAAAHQAAIgAAHwAAIMBAIgAAHwBAIMBAIMCAFNkAABTKAEAAABOKAQAAABzAwAAAGNt -cHMHAAAAZGlzcGxheXMBAAAAeHMBAAAAeSgEAAAAcwEAAAB4cwEAAAB5cwMAAABjbXBzBwAAAGRp -c3BsYXkoAQAAAHMHAAAAZGlzcGxheSgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzBAAAAHNvcnQE -AAAAcwIAAAAAAXMEAAAAZ2FwL3MSAAAAcG9ydGFsX3ByZWZlcmVuY2VzcwYAAABnZXRHYXBzFwAA -AGdldFBvcnRhbERlZmF1bHRHYXBSb290cxEAAABwb3J0YWxfY2F0ZWdvcmllc3MPAAAAcmVzb2x2 -ZUNhdGVnb3J5cxgAAABnZXRDYXRlZ29yeUNoaWxkSXRlbUxpc3RzBAAAAGJhc2VpAAAAAHMOAAAA -ZGlzcGxheV9tZXRob2RzCwAAAHNvcnRfbWV0aG9kKAcAAABzBwAAAGRpc3BsYXlzBAAAAHNvcnRz -CQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMIAAAAZ2FwX3Jvb3RzCAAAAEtleUVycm9ycwMAAABv -YmooBwAAAHMHAAAAZGlzcGxheXMEAAAAc29ydHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwgA -AABnYXBfcm9vdHMIAAAAS2V5RXJyb3JzAwAAAG9iaigAAAAAKAEAAABzBwAAAGRpc3BsYXlzDwAA -AFNjcmlwdCAoUHl0aG9uKXMWAAAAQWNjb3VudF9nZXRHYXBJdGVtTGlzdAEAAABzEAAAAAkDDAMD -ASMBDgEDARcBHgEoAQAAAHMWAAAAQWNjb3VudF9nZXRHYXBJdGVtTGlzdCgBAAAAcxYAAABBY2Nv -dW50X2dldEdhcEl0ZW1MaXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9k -dWxlPgEAAABzAAAAAA==</string> </value> +AHOjAAAAZAEAhAAAiQAAhwAAZAIAhgAAfQEAeR8AdAIAdAIAdAMAZAMAgwIAZAQAgwIAgwAAfQQA +V24oAAR0BQBqCgBvHAABAQEBggAAdAIAdAMAZAUAgwIAgwAAfQQAbgIAAVh0AgB0AgB0AwBkBgCD +AgBkBwCDAgB8BACDAQB9BgB0AgB8BgBkCACDAgBkCQBkCgBkCwCIAABkDAB8AQCDAANTZAAAUygN +AAAATmMBAAAAAgAAAAYAAABDAAAAcyoAAABkAQB0AAB8AABkAgCDAgCDAAB0AAB8AABkAwCDAgCD +AABmAgAWU2QAAFMoBAAAAE5zBwAAACVzIC0gJXNzBQAAAGdldElkcwgAAABnZXRUaXRsZSgCAAAA +cwkAAABfZ2V0YXR0cl9zAQAAAHgoAgAAAHMBAAAAeHMJAAAAX2dldGF0dHJfKAAAAAAoAAAAAHMP +AAAAU2NyaXB0IChQeXRob24pcwcAAABkaXNwbGF5AQAAAHMCAAAAAAFjAgAAAAQAAAAFAAAAAwAA +AHMdAAAAdAAAiAAAfAAAgwEAiAAAfAEAgwEAgwIAU2QAAFMoAQAAAE4oBAAAAHMDAAAAY21wcwcA +AABkaXNwbGF5cwEAAAB4cwEAAAB5KAQAAABzAQAAAHhzAQAAAHlzAwAAAGNtcHMHAAAAZGlzcGxh +eSgBAAAAcwcAAABkaXNwbGF5KAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMEAAAAc29ydAQAAABz +AgAAAAABcxIAAABwb3J0YWxfcHJlZmVyZW5jZXNzJAAAAGdldFByZWZlcnJlZEFjY291bnRpbmdU +cmFuc2FjdGlvbkdhcHMXAAAAZ2V0UG9ydGFsRGVmYXVsdEdhcFJvb3RzEQAAAHBvcnRhbF9jYXRl +Z29yaWVzcw8AAAByZXNvbHZlQ2F0ZWdvcnlzGAAAAGdldENhdGVnb3J5Q2hpbGRJdGVtTGlzdHME +AAAAYmFzZWkAAAAAcw4AAABkaXNwbGF5X21ldGhvZHMLAAAAc29ydF9tZXRob2QoBwAAAHMHAAAA +ZGlzcGxheXMEAAAAc29ydHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwgAAABnYXBfcm9vdHMI +AAAAS2V5RXJyb3JzAwAAAG9iaigHAAAAcwcAAABkaXNwbGF5cwQAAABzb3J0cwkAAABfZ2V0YXR0 +cl9zBwAAAGNvbnRleHRzCAAAAGdhcF9yb290cwgAAABLZXlFcnJvcnMDAAAAb2JqKAAAAAAoAQAA +AHMHAAAAZGlzcGxheXMPAAAAU2NyaXB0IChQeXRob24pcxYAAABBY2NvdW50X2dldEdhcEl0ZW1M +aXN0AQAAAHMQAAAACQMMAwMBHwEOAQMBFwEeASgBAAAAcxYAAABBY2NvdW50X2dldEdhcEl0ZW1M +aXN0KAEAAABzFgAAAEFjY291bnRfZ2V0R2FwSXRlbUxpc3QoAAAAACgAAAAAcw8AAABTY3JpcHQg +KFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_filepath</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml index b14ce9be83e007e29c81fc6e8a97c6dfbc44e3a7..bbe0fea8b374ec75b01ab76d4bf8960d7053ed1e 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml @@ -78,17 +78,17 @@ context.AccountingTransaction_InitFromPreferences()\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAGAAAASwAA -AHNSAAAAdAAAfQIAdAIAfAIAZAEAgwIAZAIAZAMAZAQAZAUAgwACAXQCAHwCAGQBAIMCAGQCAGQD + <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAAGAAAATwAA +AHNSAAAAdAAAfQMAdAIAfAMAZAEAgwIAZAIAZAMAZAQAZAUAgwACAXQCAHwDAGQBAIMCAGQCAGQD AGQEAGQFAIMAAgF0AgB0AABkBgCDAgCDAAABZAAAUygHAAAATnMKAAAAbmV3Q29udGVudHMLAAAA cG9ydGFsX3R5cGVzGwAAAEFjY291bnRpbmcgVHJhbnNhY3Rpb24gTGluZXMRAAAAaW1tZWRpYXRl X3JlaW5kZXhpAQAAAHMpAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX0luaXRGcm9tUHJlZmVyZW5j -ZXMoAwAAAHMHAAAAY29udGV4dHMLAAAAdHJhbnNhY3Rpb25zCQAAAF9nZXRhdHRyXygEAAAAcwIA -AABrd3MHAAAAY29udGV4dHMLAAAAdHJhbnNhY3Rpb25zCQAAAF9nZXRhdHRyXygAAAAAKAAAAABz -DwAAAFNjcmlwdCAoUHl0aG9uKXMaAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX2luaXQBAAAAcwYA -AAAJAhwCHAMoAQAAAHMaAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX2luaXQoAQAAAHMaAAAAQWNj -b3VudGluZ1RyYW5zYWN0aW9uX2luaXQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAA -ADxtb2R1bGU+AQAAAHMAAAAA</string> </value> +ZXMoAwAAAHMHAAAAY29udGV4dHMLAAAAdHJhbnNhY3Rpb25zCQAAAF9nZXRhdHRyXygFAAAAcwQA +AABhcmdzcwIAAABrd3MHAAAAY29udGV4dHMLAAAAdHJhbnNhY3Rpb25zCQAAAF9nZXRhdHRyXygA +AAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMaAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX2lu +aXQBAAAAcwYAAAAJAhwCHAMoAQAAAHMaAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX2luaXQoAQAA +AHMaAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX2luaXQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5 +dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -96,7 +96,7 @@ ADxtb2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>**kw</string> </value> + <value> <string>*args, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -122,6 +122,7 @@ ADxtb2R1bGU+AQAAAHMAAAAA</string> </value> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>args</string> <string>kw</string> <string>context</string> <string>transaction</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml index c3597057ceffc7ea9d3e09a573ea638df5ea9ef6..3773d42ec6161ad3aff074ac1a4776b5b02f424a 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml @@ -89,19 +89,19 @@ context.AccountingTransaction_InitFromPreferences()\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAMAAAAKAAAAQwAA -AHOSAAAAdAAAfQEAdAIAfAEAZAEAgwIAZAIAZAMAZAQAZAUAZAYAZAcAZAgAZAkAgwAEAXQCAHwB -AGQBAIMCAGQCAGQDAGQEAGQKAGQGAGQHAGQIAGQJAIMABAF0AgB8AQBkAQCDAgBkAgBkAwBkBABk + <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAAKAAAATwAA +AHOSAAAAdAAAfQMAdAIAfAMAZAEAgwIAZAIAZAMAZAQAZAUAZAYAZAcAZAgAZAkAgwAEAXQCAHwD +AGQBAIMCAGQCAGQDAGQEAGQKAGQGAGQHAGQIAGQJAIMABAF0AgB8AwBkAQCDAgBkAgBkAwBkBABk CwBkBgBkBwBkCABkCQCDAAQBdAIAdAAAZAwAgwIAgwAAAWQAAFMoDQAAAE5zCgAAAG5ld0NvbnRl bnRzCwAAAHBvcnRhbF90eXBlcxsAAABBY2NvdW50aW5nIFRyYW5zYWN0aW9uIExpbmVzAgAAAGlk cwoAAAByZWNlaXZhYmxlcwgAAABxdWFudGl0eWkAAAAAcxEAAABpbW1lZGlhdGVfcmVpbmRleGkB AAAAcwcAAABwYXlhYmxlcwQAAABiYW5rcykAAABBY2NvdW50aW5nVHJhbnNhY3Rpb25fSW5pdEZy b21QcmVmZXJlbmNlcygDAAAAcwcAAABjb250ZXh0cwsAAAB0cmFuc2FjdGlvbnMJAAAAX2dldGF0 -dHJfKAMAAABzBwAAAGNvbnRleHRzCwAAAHRyYW5zYWN0aW9ucwkAAABfZ2V0YXR0cl8oAAAAACgA -AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzFwAAAFBheW1lbnRUcmFuc2FjdGlvbl9pbml0AQAAAHMI -AAAACQIoBSgFKAYoAQAAAHMXAAAAUGF5bWVudFRyYW5zYWN0aW9uX2luaXQoAQAAAHMXAAAAUGF5 -bWVudFRyYW5zYWN0aW9uX2luaXQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxt -b2R1bGU+AQAAAHMAAAAA</string> </value> +dHJfKAUAAABzBAAAAGFyZ3NzAgAAAGt3cwcAAABjb250ZXh0cwsAAAB0cmFuc2FjdGlvbnMJAAAA +X2dldGF0dHJfKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcxcAAABQYXltZW50VHJhbnNh +Y3Rpb25faW5pdAEAAABzCAAAAAkCKAUoBSgGKAEAAABzFwAAAFBheW1lbnRUcmFuc2FjdGlvbl9p +bml0KAEAAABzFwAAAFBheW1lbnRUcmFuc2FjdGlvbl9pbml0KAAAAAAoAAAAAHMPAAAAU2NyaXB0 +IChQeXRob24pcwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -109,7 +109,7 @@ b2R1bGU+AQAAAHMAAAAA</string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string></string> </value> + <value> <string>*args, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -135,6 +135,8 @@ b2R1bGU+AQAAAHMAAAAA</string> </value> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>args</string> + <string>kw</string> <string>context</string> <string>transaction</string> <string>_getattr_</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml index e016bbf38afdd214a4ba57d535f31f50bfe100fc..4aea7d3de3260b75949987f8f6b55465912b5d93 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml @@ -92,19 +92,19 @@ context.AccountingTransaction_InitFromPreferences()\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAMAAAAIAAAAQwAA -AHOAAAAAdAAAfQEAdAIAfAEAZAEAgwIAZAIAZAMAZAQAZAUAZAYAZAcAgwADAXQCAHwBAGQBAIMC -AGQCAGQDAGQEAGQIAGQGAGQHAIMAAwF0AgB8AQBkAQCDAgBkAgBkAwBkBABkCQBkBgBkBwCDAAMB + <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAAIAAAATwAA +AHOAAAAAdAAAfQMAdAIAfAMAZAEAgwIAZAIAZAMAZAQAZAUAZAYAZAcAgwADAXQCAHwDAGQBAIMC +AGQCAGQDAGQEAGQIAGQGAGQHAIMAAwF0AgB8AwBkAQCDAgBkAgBkAwBkBABkCQBkBgBkBwCDAAMB dAIAdAAAZAoAgwIAgwAAAWQAAFMoCwAAAE5zCgAAAG5ld0NvbnRlbnRzCwAAAHBvcnRhbF90eXBl cyEAAABQdXJjaGFzZSBJbnZvaWNlIFRyYW5zYWN0aW9uIExpbmVzAgAAAGlkcwcAAABleHBlbnNl cxEAAABpbW1lZGlhdGVfcmVpbmRleGkBAAAAcwcAAABwYXlhYmxlcw4AAAByZWZ1bmRhYmxlX3Zh dHMpAAAAQWNjb3VudGluZ1RyYW5zYWN0aW9uX0luaXRGcm9tUHJlZmVyZW5jZXMoAwAAAHMHAAAA -Y29udGV4dHMLAAAAdHJhbnNhY3Rpb25zCQAAAF9nZXRhdHRyXygDAAAAcwcAAABjb250ZXh0cwsA -AAB0cmFuc2FjdGlvbnMJAAAAX2dldGF0dHJfKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p -cx8AAABQdXJjaGFzZUludm9pY2VUcmFuc2FjdGlvbl9pbml0AQAAAHMIAAAACQIiBCIEIgsoAQAA -AHMfAAAAUHVyY2hhc2VJbnZvaWNlVHJhbnNhY3Rpb25faW5pdCgBAAAAcx8AAABQdXJjaGFzZUlu -dm9pY2VUcmFuc2FjdGlvbl9pbml0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8 -bW9kdWxlPgEAAABzAAAAAA==</string> </value> +Y29udGV4dHMLAAAAdHJhbnNhY3Rpb25zCQAAAF9nZXRhdHRyXygFAAAAcwQAAABhcmdzcwIAAABr +d3MHAAAAY29udGV4dHMLAAAAdHJhbnNhY3Rpb25zCQAAAF9nZXRhdHRyXygAAAAAKAAAAABzDwAA +AFNjcmlwdCAoUHl0aG9uKXMfAAAAUHVyY2hhc2VJbnZvaWNlVHJhbnNhY3Rpb25faW5pdAEAAABz +CAAAAAkCIgQiBCILKAEAAABzHwAAAFB1cmNoYXNlSW52b2ljZVRyYW5zYWN0aW9uX2luaXQoAQAA +AHMfAAAAUHVyY2hhc2VJbnZvaWNlVHJhbnNhY3Rpb25faW5pdCgAAAAAKAAAAABzDwAAAFNjcmlw +dCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -112,7 +112,7 @@ bW9kdWxlPgEAAABzAAAAAA==</string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string></string> </value> + <value> <string>*args, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -138,6 +138,8 @@ bW9kdWxlPgEAAABzAAAAAA==</string> </value> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>args</string> + <string>kw</string> <string>context</string> <string>transaction</string> <string>_getattr_</string> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml index 0b0ef5580c49cdbbd0a873d6181e0057b4c8aae3..df8bb83f2643f813680497f619552e23281a66ae 100755 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml @@ -89,19 +89,19 @@ context.AccountingTransaction_InitFromPreferences()\n </item> <item> <key> <string>_code</string> </key> - <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAQAAAAKAAAASwAA -AHOSAAAAdAAAfQIAdAIAfAIAZAEAgwIAZAIAZAMAZAQAZAUAZAYAZAcAZAgAZAkAgwAEAXQCAHwC -AGQBAIMCAGQCAGQDAGQEAGQKAGQGAGQHAGQIAGQJAIMABAF0AgB8AgBkAQCDAgBkAgBkAwBkBABk + <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAUAAAAKAAAATwAA +AHOSAAAAdAAAfQMAdAIAfAMAZAEAgwIAZAIAZAMAZAQAZAUAZAYAZAcAZAgAZAkAgwAEAXQCAHwD +AGQBAIMCAGQCAGQDAGQEAGQKAGQGAGQHAGQIAGQJAIMABAF0AgB8AwBkAQCDAgBkAgBkAwBkBABk CwBkBgBkBwBkCABkCQCDAAQBdAIAdAAAZAwAgwIAgwAAAWQAAFMoDQAAAE5zCgAAAG5ld0NvbnRl bnRzCwAAAHBvcnRhbF90eXBlcx0AAABTYWxlIEludm9pY2UgVHJhbnNhY3Rpb24gTGluZXMCAAAA aWRzBgAAAGluY29tZXMIAAAAcXVhbnRpdHlpAAAAAHMRAAAAaW1tZWRpYXRlX3JlaW5kZXhpAQAA AHMKAAAAcmVjZWl2YWJsZXMNAAAAY29sbGVjdGVkX3ZhdHMpAAAAQWNjb3VudGluZ1RyYW5zYWN0 aW9uX0luaXRGcm9tUHJlZmVyZW5jZXMoAwAAAHMHAAAAY29udGV4dHMLAAAAdHJhbnNhY3Rpb25z -CQAAAF9nZXRhdHRyXygEAAAAcwIAAABrd3MHAAAAY29udGV4dHMLAAAAdHJhbnNhY3Rpb25zCQAA -AF9nZXRhdHRyXygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMbAAAAU2FsZUludm9pY2VU -cmFuc2FjdGlvbl9pbml0AQAAAHMIAAAACQIoBSgFKAYoAQAAAHMbAAAAU2FsZUludm9pY2VUcmFu -c2FjdGlvbl9pbml0KAEAAABzGwAAAFNhbGVJbnZvaWNlVHJhbnNhY3Rpb25faW5pdCgAAAAAKAAA -AABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> +CQAAAF9nZXRhdHRyXygFAAAAcwQAAABhcmdzcwIAAABrd3MHAAAAY29udGV4dHMLAAAAdHJhbnNh +Y3Rpb25zCQAAAF9nZXRhdHRyXygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMbAAAAU2Fs +ZUludm9pY2VUcmFuc2FjdGlvbl9pbml0AQAAAHMIAAAACQIoBSgFKAYoAQAAAHMbAAAAU2FsZUlu +dm9pY2VUcmFuc2FjdGlvbl9pbml0KAEAAABzGwAAAFNhbGVJbnZvaWNlVHJhbnNhY3Rpb25faW5p +dCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> </item> <item> <key> <string>_filepath</string> </key> @@ -109,7 +109,7 @@ AABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>**kw</string> </value> + <value> <string>*args, **kw</string> </value> </item> <item> <key> <string>errors</string> </key> @@ -135,6 +135,7 @@ AABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4BAAAAcwAAAAA=</string> </value> <key> <string>co_varnames</string> </key> <value> <tuple> + <string>args</string> <string>kw</string> <string>context</string> <string>transaction</string>