only show opened accounts

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

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.xml

@@ -167,7 +167,7 @@ AAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/InvoiceTransactionLine_getDestinationItemList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.xml

@@ -76,11 +76,7 @@ category_dict = {\'income\': \'account_type/income\',\n
                  \'refundable_vat\': \'account_type/asset/receivable/refundable_vat\',\n
                  \'bank\': \'account_type/asset/bank\',\n
                  }\n
-\n
-if context.id in category_dict:\n
-  category = category_dict[context.id]\n
-else:\n
-  category = \'account_type\'\n
+category = category_dict.get(context.id, \'account_type\')\n
 \n
 display_dict = {}\n
 def display(x):\n
@@ -93,67 +89,81 @@ def display(x):\n
 def sort(x,y):\n
   return cmp(display(x), display(y))\n
 \n
-def getItemList(category=None, portal_path=None):\n
+def getItemList(category=None, portal_path=None, user_name = None, simulation_state = None):\n
   cat = context.portal_categories.resolveCategory(category)\n
+  filter_dict = {}\n
+  # we don\'t filter in "old" transactions or report / search dialogs\n
+  if simulation_state not in (\'delivered\', \'cancelled\', \'no_simulation_state\') :\n
+      filter_dict[\'validation_state\'] = (\'draft\', \'validated\')\n
   item_list = cat.getCategoryMemberItemList(portal_type=\'Account\', base=0,\n
-                                            display_method=display, sort_method=sort)\n
+                                            display_method=display, sort_method=sort, filter=filter_dict)\n
   return item_list\n
 \n
 getItemList = CachingMethod(getItemList, id=(\'getInvoiceTransactionLineItemList\', \'getItemList\'))\n
 portal_path = context.getPortalObject().getPhysicalPath()\n
-return getItemList(category=category, portal_path=portal_path)\n
+\n
+return getItemList( category=category, portal_path=portal_path, \n
+                                user_name=context.REQUEST.AUTHENTICATED_USER,\n
+                                simulation_state = context.getProperty(\'simulation_state\', \'no_simulation_state\') )\n
 </string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAA0AAAARAAAAAwAA
-AHMKAQAAZAEAawAAbAEAfQEAAWgAAARkAgBkAwADPARkBABkBQADPARkBgBkBwADPARkCABkCQAD
-PARkCgBkCwADPARkDABkDQADPARkDgBkDwADPH0CAHQDAHQEAGQQAIMCAHwCAGoGAG8cAAF0BQB8
-AgB0AwB0BABkEACDAgCDAgB9BgBuBwABZBEAfQYAaAAAiQEAhwEAZBIAhgAAiQIAhwIAZBMAhgAA
-iQAAdAoAdAoAhwAAhwIAZBQAhgIAfQsAfAEAfAsAZBAAZBUAZBYAZgIAgwEBfQsAdAMAdAMAdAQA
-ZBcAgwIAgwAAZBgAgwIAgwAAfQwAfAsAZBkAfAYAZBoAfAwAgwACU2QAAFMoGwAAAE4oAQAAAHMN
-AAAAQ2FjaGluZ01ldGhvZHMGAAAAaW5jb21lcxMAAABhY2NvdW50X3R5cGUvaW5jb21lcwcAAABl
-eHBlbnNlcxQAAABhY2NvdW50X3R5cGUvZXhwZW5zZXMHAAAAcGF5YWJsZXMeAAAAYWNjb3VudF90
-eXBlL2xpYWJpbGl0eS9wYXlhYmxlcwoAAAByZWNlaXZhYmxlcx0AAABhY2NvdW50X3R5cGUvYXNz
-ZXQvcmVjZWl2YWJsZXMNAAAAY29sbGVjdGVkX3ZhdHMsAAAAYWNjb3VudF90eXBlL2xpYWJpbGl0
-eS9wYXlhYmxlL2NvbGxlY3RlZF92YXRzDgAAAHJlZnVuZGFibGVfdmF0cywAAABhY2NvdW50X3R5
-cGUvYXNzZXQvcmVjZWl2YWJsZS9yZWZ1bmRhYmxlX3ZhdHMEAAAAYmFua3MXAAAAYWNjb3VudF90
-eXBlL2Fzc2V0L2JhbmtzAgAAAGlkcwwAAABhY2NvdW50X3R5cGVjAQAAAAcAAAAGAAAAAwAAAHNg
-AAAAfAAAiAAAagcAb0IAAXQCAHwAAGQBAIMCAIMAAH0DAHQCAHwAAGQCAIMCAIMAAH0EAGQDAHwD
-AHwEAGYCABZ0BQCIAACDAQB8AAA8bgEAAXQGAIgAAHwAAIMCAFNkAABTKAQAAABOcwgAAABnZXRH
-YXBJZHMIAAAAZ2V0VGl0bGVzBwAAACVzIC0gJXMoBwAAAHMBAAAAeHMMAAAAZGlzcGxheV9kaWN0
-cwkAAABfZ2V0YXR0cl9zBgAAAGdhcF9pZHMNAAAAYWNjb3VudF90aXRsZXMHAAAAX3dyaXRlX3MJ
-AAAAX2dldGl0ZW1fKAcAAABzAQAAAHhzDAAAAGRpc3BsYXlfZGljdHMJAAAAX2dldGF0dHJfcwYA
-AABnYXBfaWRzDQAAAGFjY291bnRfdGl0bGVzBwAAAF93cml0ZV9zCQAAAF9nZXRpdGVtXygBAAAA
-cwwAAABkaXNwbGF5X2RpY3QoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwcAAABkaXNwbGF5EgAA
-AHMKAAAAAAENARIBEgEeAWMCAAAABAAAAAUAAAADAAAAcx0AAAB0AACIAAB8AACDAQCIAAB8AQCD
-AQCDAgBTZAAAUygBAAAATigEAAAAcwMAAABjbXBzBwAAAGRpc3BsYXlzAQAAAHhzAQAAAHkoBAAA
-AHMBAAAAeHMBAAAAeXMDAAAAY21wcwcAAABkaXNwbGF5KAEAAABzBwAAAGRpc3BsYXkoAAAAAHMP
-AAAAU2NyaXB0IChQeXRob24pcwQAAABzb3J0GQAAAHMCAAAAAAFjAgAAAAgAAAAKAAAAAwAAAHNQ
-AAAAdAAAdAAAdAEAZAEAgwIAZAIAgwIAfAAAgwEAfQQAdAAAfAQAZAMAgwIAZAQAZAUAZAYAZAcA
-ZAgAiAEAZAkAiAAAgwAEfQcAfAcAU2QAAFMoCgAAAE5zEQAAAHBvcnRhbF9jYXRlZ29yaWVzcw8A
-AAByZXNvbHZlQ2F0ZWdvcnlzGQAAAGdldENhdGVnb3J5TWVtYmVySXRlbUxpc3RzCwAAAHBvcnRh
-bF90eXBlcwcAAABBY2NvdW50cwQAAABiYXNlaQAAAABzDgAAAGRpc3BsYXlfbWV0aG9kcwsAAABz
-b3J0X21ldGhvZCgHAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzCAAAAGNhdGVnb3J5cwMA
-AABjYXRzBwAAAGRpc3BsYXlzBAAAAHNvcnRzCQAAAGl0ZW1fbGlzdCgIAAAAcwgAAABjYXRlZ29y
-eXMLAAAAcG9ydGFsX3BhdGhzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMDAAAAY2F0cwcAAABk
-aXNwbGF5cwQAAABzb3J0cwkAAABpdGVtX2xpc3QoAgAAAHMEAAAAc29ydHMHAAAAZGlzcGxheSgA
-AAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCwAAAGdldEl0ZW1MaXN0HAAAAHMIAAAAAAEeARsBDwFz
-IQAAAGdldEludm9pY2VUcmFuc2FjdGlvbkxpbmVJdGVtTGlzdHMLAAAAZ2V0SXRlbUxpc3RzDwAA
-AGdldFBvcnRhbE9iamVjdHMPAAAAZ2V0UGh5c2ljYWxQYXRocwgAAABjYXRlZ29yeXMLAAAAcG9y
-dGFsX3BhdGgoDQAAAHMXAAAAUHJvZHVjdHMuRVJQNVR5cGUuQ2FjaGVzDQAAAENhY2hpbmdNZXRo
-b2RzDQAAAGNhdGVnb3J5X2RpY3RzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMJAAAAX2dldGl0
-ZW1fcwgAAABjYXRlZ29yeXMMAAAAZGlzcGxheV9kaWN0cwcAAABkaXNwbGF5cwQAAABzb3J0cwQA
-AABOb25lcwsAAABnZXRJdGVtTGlzdHMLAAAAcG9ydGFsX3BhdGgoDQAAAHMXAAAAUHJvZHVjdHMu
-RVJQNVR5cGUuQ2FjaGVzDQAAAENhY2hpbmdNZXRob2RzDQAAAGNhdGVnb3J5X2RpY3RzCQAAAF9n
-ZXRhdHRyX3MHAAAAY29udGV4dHMJAAAAX2dldGl0ZW1fcwgAAABjYXRlZ29yeXMMAAAAZGlzcGxh
-eV9kaWN0cwcAAABkaXNwbGF5cwQAAABzb3J0cwQAAABOb25lcwsAAABnZXRJdGVtTGlzdHMLAAAA
-cG9ydGFsX3BhdGgoAAAAACgDAAAAcwQAAABzb3J0cwwAAABkaXNwbGF5X2RpY3RzBwAAAGRpc3Bs
-YXlzDwAAAFNjcmlwdCAoUHl0aG9uKXMoAAAASW52b2ljZVRyYW5zYWN0aW9uTGluZV9nZXRTb3Vy
-Y2VJdGVtTGlzdAEAAABzFgAAAA0CRQkWARwCBgIGAQwHDAMVBhgBHgEoAQAAAHMoAAAASW52b2lj
-ZVRyYW5zYWN0aW9uTGluZV9nZXRTb3VyY2VJdGVtTGlzdCgBAAAAcygAAABJbnZvaWNlVHJhbnNh
-Y3Rpb25MaW5lX2dldFNvdXJjZUl0ZW1MaXN0KAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
-cwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
+            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAwAAAATAAAAAwAA
+AHMpAQAAZAEAawAAbAEAfQEAAWgAAARkAgBkAwADPARkBABkBQADPARkBgBkBwADPARkCABkCQAD
+PARkCgBkCwADPARkDABkDQADPARkDgBkDwADPH0CAHQDAHwCAGQQAIMCAHQDAHQEAGQRAIMCAGQS
+AIMCAH0FAGgAAIkBAIcBAGQTAIYAAIkCAIcCAGQUAIYAAIkAAHQJAHQJAHQJAHQJAIcAAIcCAGQV
+AIYEAH0KAHwBAHwKAGQRAGQWAGQXAGYCAIMBAX0KAHQDAHQDAHQEAGQYAIMCAIMAAGQZAIMCAIMA
+AH0LAHwKAGQaAHwFAGQbAHwLAGQcAHQDAHQDAHQEAGQdAIMCAGQeAIMCAGQfAHQDAHQEAGQgAIMC
+AGQfAGQhAIMCAIMABFNkAABTKCIAAABOKAEAAABzDQAAAENhY2hpbmdNZXRob2RzBgAAAGluY29t
+ZXMTAAAAYWNjb3VudF90eXBlL2luY29tZXMHAAAAZXhwZW5zZXMUAAAAYWNjb3VudF90eXBlL2V4
+cGVuc2VzBwAAAHBheWFibGVzHgAAAGFjY291bnRfdHlwZS9saWFiaWxpdHkvcGF5YWJsZXMKAAAA
+cmVjZWl2YWJsZXMdAAAAYWNjb3VudF90eXBlL2Fzc2V0L3JlY2VpdmFibGVzDQAAAGNvbGxlY3Rl
+ZF92YXRzLAAAAGFjY291bnRfdHlwZS9saWFiaWxpdHkvcGF5YWJsZS9jb2xsZWN0ZWRfdmF0cw4A
+AAByZWZ1bmRhYmxlX3ZhdHMsAAAAYWNjb3VudF90eXBlL2Fzc2V0L3JlY2VpdmFibGUvcmVmdW5k
+YWJsZV92YXRzBAAAAGJhbmtzFwAAAGFjY291bnRfdHlwZS9hc3NldC9iYW5rcwMAAABnZXRzAgAA
+AGlkcwwAAABhY2NvdW50X3R5cGVjAQAAAAcAAAAGAAAAAwAAAHNgAAAAfAAAiAAAagcAb0IAAXQC
+AHwAAGQBAIMCAIMAAH0DAHQCAHwAAGQCAIMCAIMAAH0EAGQDAHwDAHwEAGYCABZ0BQCIAACDAQB8
+AAA8bgEAAXQGAIgAAHwAAIMCAFNkAABTKAQAAABOcwgAAABnZXRHYXBJZHMIAAAAZ2V0VGl0bGVz
+BwAAACVzIC0gJXMoBwAAAHMBAAAAeHMMAAAAZGlzcGxheV9kaWN0cwkAAABfZ2V0YXR0cl9zBgAA
+AGdhcF9pZHMNAAAAYWNjb3VudF90aXRsZXMHAAAAX3dyaXRlX3MJAAAAX2dldGl0ZW1fKAcAAABz
+AQAAAHhzDAAAAGRpc3BsYXlfZGljdHMJAAAAX2dldGF0dHJfcwYAAABnYXBfaWRzDQAAAGFjY291
+bnRfdGl0bGVzBwAAAF93cml0ZV9zCQAAAF9nZXRpdGVtXygBAAAAcwwAAABkaXNwbGF5X2RpY3Qo
+AAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwcAAABkaXNwbGF5DgAAAHMKAAAAAAENARIBEgEeAWMC
+AAAABAAAAAUAAAADAAAAcx0AAAB0AACIAAB8AACDAQCIAAB8AQCDAQCDAgBTZAAAUygBAAAATigE
+AAAAcwMAAABjbXBzBwAAAGRpc3BsYXlzAQAAAHhzAQAAAHkoBAAAAHMBAAAAeHMBAAAAeXMDAAAA
+Y21wcwcAAABkaXNwbGF5KAEAAABzBwAAAGRpc3BsYXkoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
+cwQAAABzb3J0FQAAAHMCAAAAAAFjBAAAAAwAAAAQAAAAAwAAAHOMAAAAdAAAdAAAdAEAZAEAgwIA
+ZAIAgwIAfAAAgwEAfQYAaAAAfQcAfAMAZAMAZAQAZAUAZgMAagcAbxoAAWQGAGQHAGYCAHQGAHwH
+AIMBAGQIADxuAQABdAAAfAYAZAkAgwIAZAoAZAsAZAwAZA0AZA4AiAEAZA8AiAAAZBAAfAcAgwAF
+fQsAfAsAU2QAAFMoEQAAAE5zEQAAAHBvcnRhbF9jYXRlZ29yaWVzcw8AAAByZXNvbHZlQ2F0ZWdv
+cnlzCQAAAGRlbGl2ZXJlZHMJAAAAY2FuY2VsbGVkcxMAAABub19zaW11bGF0aW9uX3N0YXRlcwUA
+AABkcmFmdHMJAAAAdmFsaWRhdGVkcxAAAAB2YWxpZGF0aW9uX3N0YXRlcxkAAABnZXRDYXRlZ29y
+eU1lbWJlckl0ZW1MaXN0cwsAAABwb3J0YWxfdHlwZXMHAAAAQWNjb3VudHMEAAAAYmFzZWkAAAAA
+cw4AAABkaXNwbGF5X21ldGhvZHMLAAAAc29ydF9tZXRob2RzBgAAAGZpbHRlcigKAAAAcwkAAABf
+Z2V0YXR0cl9zBwAAAGNvbnRleHRzCAAAAGNhdGVnb3J5cwMAAABjYXRzCwAAAGZpbHRlcl9kaWN0
+cxAAAABzaW11bGF0aW9uX3N0YXRlcwcAAABfd3JpdGVfcwcAAABkaXNwbGF5cwQAAABzb3J0cwkA
+AABpdGVtX2xpc3QoDAAAAHMIAAAAY2F0ZWdvcnlzCwAAAHBvcnRhbF9wYXRocwkAAAB1c2VyX25h
+bWVzEAAAAHNpbXVsYXRpb25fc3RhdGVzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMDAAAAY2F0
+cwsAAABmaWx0ZXJfZGljdHMHAAAAX3dyaXRlX3MHAAAAZGlzcGxheXMEAAAAc29ydHMJAAAAaXRl
+bV9saXN0KAIAAABzBAAAAHNvcnRzBwAAAGRpc3BsYXkoAAAAAHMPAAAAU2NyaXB0IChQeXRob24p
+cwsAAABnZXRJdGVtTGlzdBgAAABzDgAAAAABHgEGAhYBGgEbARUBcyEAAABnZXRJbnZvaWNlVHJh
+bnNhY3Rpb25MaW5lSXRlbUxpc3RzCwAAAGdldEl0ZW1MaXN0cw8AAABnZXRQb3J0YWxPYmplY3Rz
+DwAAAGdldFBoeXNpY2FsUGF0aHMIAAAAY2F0ZWdvcnlzCwAAAHBvcnRhbF9wYXRocwkAAAB1c2Vy
+X25hbWVzBwAAAFJFUVVFU1RzEgAAAEFVVEhFTlRJQ0FURURfVVNFUnMQAAAAc2ltdWxhdGlvbl9z
+dGF0ZXMLAAAAZ2V0UHJvcGVydHlzEwAAAG5vX3NpbXVsYXRpb25fc3RhdGUoDAAAAHMXAAAAUHJv
+ZHVjdHMuRVJQNVR5cGUuQ2FjaGVzDQAAAENhY2hpbmdNZXRob2RzDQAAAGNhdGVnb3J5X2RpY3Rz
+CQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dHMIAAAAY2F0ZWdvcnlzDAAAAGRpc3BsYXlfZGljdHMH
+AAAAZGlzcGxheXMEAAAAc29ydHMEAAAATm9uZXMLAAAAZ2V0SXRlbUxpc3RzCwAAAHBvcnRhbF9w
+YXRoKAwAAABzFwAAAFByb2R1Y3RzLkVSUDVUeXBlLkNhY2hlcw0AAABDYWNoaW5nTWV0aG9kcw0A
+AABjYXRlZ29yeV9kaWN0cwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzCAAAAGNhdGVnb3J5cwwA
+AABkaXNwbGF5X2RpY3RzBwAAAGRpc3BsYXlzBAAAAHNvcnRzBAAAAE5vbmVzCwAAAGdldEl0ZW1M
+aXN0cwsAAABwb3J0YWxfcGF0aCgAAAAAKAMAAABzBAAAAHNvcnRzDAAAAGRpc3BsYXlfZGljdHMH
+AAAAZGlzcGxheXMPAAAAU2NyaXB0IChQeXRob24pcygAAABJbnZvaWNlVHJhbnNhY3Rpb25MaW5l
+X2dldFNvdXJjZUl0ZW1MaXN0AQAAAHMWAAAADQJFCCECBgEMBwwDGwoYAR4CGAEVASgBAAAAcygA
+AABJbnZvaWNlVHJhbnNhY3Rpb25MaW5lX2dldFNvdXJjZUl0ZW1MaXN0KAEAAABzKAAAAEludm9p
+Y2VUcmFuc2FjdGlvbkxpbmVfZ2V0U291cmNlSXRlbUxpc3QoAAAAACgAAAAAcw8AAABTY3JpcHQg
+KFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
         </item>
         <item>
             <key> <string>_dav_writelocks</string> </key>
@@ -163,7 +173,7 @@ cwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/InvoiceTransactionLine_getSourceItemList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -198,7 +208,6 @@ cwgAAAA8bW9kdWxlPgEAAABzAAAAAA==</string> </value>
                             <string>category_dict</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>_getitem_</string>
                             <string>category</string>
                             <string>display_dict</string>
                             <string>display</string>