(no diff)

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

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountList.xml

@@ -97,7 +97,7 @@ return context.portal_catalog(**kwd)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/AccountModule_getAccountList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getAccountList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountingTransactionCount.xml

@@ -129,7 +129,7 @@ return context.portal_simulation.getInventoryStat(node_uid=context.getUid(),\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/AccountModule_getAccountingTransactionCount</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getAccountingTransactionCount</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.xml

@@ -96,7 +96,7 @@ return results\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountModule_getAvailableGapList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getAvailableGapList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBalance.xml

@@ -115,7 +115,7 @@ return context.portal_simulation.getInventoryAssetPrice(node_uid=context.getUid(
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountModule_getBalance</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getBalance</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountItemList.xml

@@ -90,12 +90,6 @@ return item_list\n
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getBankAccountItemList</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>organisation = \'\'</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.xml

@@ -134,7 +134,7 @@ return result\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountModule_getBankAccountsReportSectionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getCreditBalance.xml

@@ -83,7 +83,7 @@ if total < 0.0:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountModule_getCreditBalance</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getCreditBalance</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getDebitBalance.xml

@@ -83,7 +83,7 @@ if total > 0.0:\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountModule_getDebitBalance</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getDebitBalance</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml

@@ -261,7 +261,7 @@ return result\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getNormalBalance.xml

@@ -81,7 +81,7 @@ return total\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountModule_getNormalBalance</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getNormalBalance</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.xml

@@ -183,7 +183,7 @@ return result\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/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>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceCredit.xml

@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/AccountModule_getTotalSourceCredit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getTotalSourceCredit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTotalSourceDebit.xml

@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/AccountModule_getTotalSourceDebit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getTotalSourceDebit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTransactionListUrl.xml

@@ -99,7 +99,7 @@ return object.getPath() + \'/\' + method + \'?\' + make_query(kw)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/AccountModule_getTransactionListUrl</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_getTransactionListUrl</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statAccountingTransactionCount.xml

@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/AccountModule_statAccountingTransactionCount</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_statAccountingTransactionCount</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statBalance.xml

@@ -123,8 +123,6 @@ if kw.get(\'omit_input\'):\n
 if kw.get(\'omit_output\'):\n
   params[\'omit_output\'] = 1\n
 \n
-context.log(\'params\', params)\n
-context.log(\'at_date\', at_date)\n
 results = context.Resource_zStatInventory(omit_simulation=1,\n
                                          **params)\n
 row = results[0]\n
@@ -154,7 +152,7 @@ return context.portal_simulation.getInventory( omit_simulation=1, **params )\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountModule_statBalance</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountModule_statBalance</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountStatementReport.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string></string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountStatementReportDialog.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>AccountModule_viewAccountStatementReport</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getAccountingTransactionList.xml

@@ -200,7 +200,7 @@ return new_result\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/Account_getAccountingTransactionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Account_getAccountingTransactionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getDestinationSectionItemList.xml

@@ -107,7 +107,7 @@ return item_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/Account_getDestinationSectionItemList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Account_getDestinationSectionItemList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getDestinationSectionList.xml

@@ -91,7 +91,7 @@ return destination_section_set.keys()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/Account_getDestinationSectionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Account_getDestinationSectionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getGapId.xml

@@ -84,7 +84,7 @@ return \'\'\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/Account_getGapId</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Account_getGapId</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getSourcePaymentList.xml

@@ -89,12 +89,6 @@ return source_payment_set.keys()\n
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Account_getSourcePaymentList</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>

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

@@ -142,7 +142,7 @@ return float(\'%.02f\' % (row.total_price or 0.0) )\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/Account_statSourceBalance</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Account_statSourceBalance</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statSourceCredit.xml

@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/Account_statSourceCredit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Account_statSourceCredit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_statSourceDebit.xml

@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/Account_statSourceDebit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Account_statSourceDebit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

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

@@ -76,10 +76,10 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>node_uid</string>
-                            <string>at_date</string>
-                            <string>section_category</string>
-                            <string>simulation_state</string>
+<string>node_uid</string>
+<string>at_date</string>
+<string>section_category</string>
+<string>simulation_state</string>
                           </list>
                         </value>
                     </item>
@@ -147,7 +147,7 @@
             <key> <string>arguments_src</string> </key>
             <value> <string>node_uid\r\n
 at_date\r\n
-section_category\n
+section_category\r\n
 simulation_state:list</string> </value>
         </item>
         <item>
@@ -193,7 +193,8 @@ SELECT DISTINCT\n
   catalog.path,\n
   catalog.relative_url,\n
   catalog.title,\n
-  catalog.portal_type\n
+  catalog.portal_type,\n
+  catalog.validation_state\n
 FROM\n
   catalog,\n
   stock\n
@@ -256,7 +257,8 @@ SELECT DISTINCT\n
   catalog.path,\n
   catalog.relative_url,\n
   catalog.title,\n
-  catalog.portal_type\n
+  catalog.portal_type,\n
+  catalog.validation_state\n
 FROM\n
   catalog,\n
   stock\n

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

@@ -159,23 +159,23 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-                            <string>selection</string>
-                            <string>selection_domain</string>
-                            <string>selection_report</string>
-                            <string>getUid</string>
-                            <string>where_expression</string>
-                            <string>omit_input</string>
-                            <string>omit_output</string>
-                            <string>resource_uid</string>
-                            <string>from_date</string>
-                            <string>to_date</string>
-                            <string>at_date</string>
-                            <string>transaction_simulation_state</string>
-                            <string>transaction_section_category</string>
-                            <string>payment_uid</string>
-                            <string>no_payment_uid</string>
-                            <string>mirror_section_uid</string>
-                            <string>no_mirror_section_uid</string>
+<string>selection</string>
+<string>selection_domain</string>
+<string>selection_report</string>
+<string>getUid</string>
+<string>where_expression</string>
+<string>omit_input</string>
+<string>omit_output</string>
+<string>resource_uid</string>
+<string>from_date</string>
+<string>to_date</string>
+<string>at_date</string>
+<string>transaction_simulation_state</string>
+<string>transaction_section_category</string>
+<string>payment_uid</string>
+<string>no_payment_uid</string>
+<string>mirror_section_uid</string>
+<string>no_mirror_section_uid</string>
                           </list>
                         </value>
                     </item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingPeriod_init.xml

@@ -92,12 +92,6 @@ if len(period_list) > 0 :\n
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingPeriod_init</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>*args, **kw</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingRuleCell_view.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getParentUrl.xml

@@ -78,7 +78,7 @@ return "%s/view" % line.getParent().absolute_url()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountingTransactionLine_getParentUrl</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionLine_getParentUrl</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceCredit.xml

@@ -83,12 +83,6 @@ return total\n
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceCredit</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceDebit.xml

@@ -83,12 +83,6 @@ return total\n
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionLine_statSourceDebit</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>**kw</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml

@@ -93,7 +93,7 @@ return context.AccountingTransactionModule_zGetAccountingTransactionList( select
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml

@@ -89,8 +89,8 @@ if params.get(\'count\', 0):\n
 params[\'omit_input\'] = 0\n
 params[\'omit_output\'] = 0\n
 \n
-#context.log(\'LOG\',  context.AccountingTransactionModule_zGetAccountingTransactionList(src__ =1, **params))\n
-return context.AccountingTransactionModule_zGetAccountingTransactionList(**params)\n
+#context.log(\'LOG\',  context.AccountingTransactionModule_zGetAccountingTransactionList(src__ =1, selection_params=params, **params))\n
+return context.AccountingTransactionModule_zGetAccountingTransactionList(selection_params=params, **params)\n
 
 
 ]]></string> </value>
@@ -109,7 +109,7 @@ return context.AccountingTransactionModule_zGetAccountingTransactionList(**param
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getDestinationSectionUrl.xml

@@ -93,7 +93,7 @@ return url + \'/\' + method + \'?\' + make_query(kw)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/portal_skins/local_accounting/AccountingTransactionModule_getDestinationSectionUrl</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_getDestinationSectionUrl</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalAccountingTransactionList.xml

@@ -240,7 +240,7 @@ return result + [{ "journal_total_debit": journal_total_debit,\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalAccountingTransactionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalAccountingTransactionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.xml

@@ -101,7 +101,7 @@ return credit\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceCredit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceCredit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.xml

@@ -101,7 +101,7 @@ return debit\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceDebit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_getSourceDebit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getTranslatedPortalTypeItemList.xml

@@ -84,7 +84,7 @@ return item_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountingTransactionModule_getTranslatedPortalTypeItemList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_getTranslatedPortalTypeItemList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
@@ -115,7 +115,7 @@ return item_list\n
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>portal_type_list</string>
                             <string>N_</string>
                             <string>item_list</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToActiveAccountingPreference.xml

@@ -87,7 +87,7 @@ return request.RESPONSE.redirect( "%s/AccountingPreferences_view" %\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/AccountingTransactionModule_jumpToActiveAccountingPreference</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_jumpToActiveAccountingPreference</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml

@@ -94,7 +94,7 @@ return float(\'%.02f\' % (row.total_price and - row.total_price or 0.0))\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml

@@ -93,7 +93,7 @@ return float(\'%.02f\' % (row.total_price or 0.0))\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_InitFromPreferences.xml

@@ -89,12 +89,6 @@ except AttributeError, e :\n
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransaction_InitFromPreferences</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>*args, **kw</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_closeByAccountingPeriod.xml

@@ -95,7 +95,7 @@ except ValidationFailed, message :\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransaction_closeByAccountingPeriod</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransaction_closeByAccountingPeriod</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction.xml

@@ -115,12 +115,6 @@ return context.REQUEST.RESPONSE.redirect("%s/view?portal_status_message=%s" %\n
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransaction_createReversalTransaction</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines.xml

@@ -103,7 +103,7 @@ if redirect :\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransaction_deleteEmptyLines</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationCurrencyConvertible.xml

@@ -86,12 +86,6 @@ return transaction_currency != section_value.getProperty(\'price_currency\', Non
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransaction_isDestinationCurrencyConvertible</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
@@ -121,7 +115,7 @@ return transaction_currency != section_value.getProperty(\'price_currency\', Non
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>section_value</string>
                             <string>None</string>
                             <string>transaction_currency</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceCurrencyConvertible.xml

@@ -86,12 +86,6 @@ return transaction_currency != section_value.getProperty(\'price_currency\', Non
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/AccountingTransaction_isSourceCurrencyConvertible</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string></string> </value>
@@ -121,7 +115,7 @@ return transaction_currency != section_value.getProperty(\'price_currency\', Non
                         <value>
                           <tuple>
                             <string>_getattr_</string>
-<string>context</string>
+                            <string>context</string>
                             <string>section_value</string>
                             <string>None</string>
                             <string>transaction_currency</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewDestinationAsset.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewSourceAsset.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_getAccountingTransactionList.xml

@@ -134,7 +134,7 @@ return new_result\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/BankAccount_getAccountingTransactionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/BankAccount_getAccountingTransactionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/ERP5Accounting_FormatMonetaryValue.xml

@@ -112,12 +112,6 @@ return formatted_value\n
             <key> <string>_filepath</string> </key>
             <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/ERP5Accounting_FormatMonetaryValue</string> </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_params</string> </key>
             <value> <string>value, nbsp=0, precision=0</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionGapId.xml

@@ -79,7 +79,7 @@ return account.Account_getGapId()\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/Entity_getAccountingTransactionGapId</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Entity_getAccountingTransactionGapId</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_getAccountingTransactionList.xml

@@ -143,7 +143,7 @@ return new_result\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/Entity_getAccountingTransactionList</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Entity_getAccountingTransactionList</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statSourceBalance.xml

@@ -118,7 +118,7 @@ return float(\'%.02f\' % row.total_price or 0)\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/erp5/portal_skins/erp5_accounting/Entity_statSourceBalance</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Entity_statSourceBalance</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statSourceCredit.xml

@@ -83,7 +83,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/Entity_statSourceCredit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Entity_statSourceCredit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_statSourceDebit.xml

@@ -77,7 +77,7 @@
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/Entity_statSourceDebit</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/Entity_statSourceDebit</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceLine_asCellRange.xml

@@ -101,13 +101,7 @@ return cell_range\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/InvoiceLine_asCellRange</string> </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/InvoiceLine_asCellRange</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceLine_view.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceLine_viewPrice.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InvoiceLine_viewQuantity.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_copyInvoiceProperties.xml

@@ -111,7 +111,7 @@ LOG("end")\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/PaymentTransaction_copyInvoiceProperties</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/PaymentTransaction_copyInvoiceProperties</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_selectMovement.xml

@@ -92,7 +92,7 @@ return movement_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/PaymentTransaction_selectMovement</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/PaymentTransaction_selectMovement</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml

@@ -70,9 +70,9 @@
                         <key> <string>_keys</string> </key>
                         <value>
                           <list>
-<string>from_table_list</string>
-<string>where_expression</string>
-<string>order_by_expression</string>
+                            <string>from_table_list</string>
+                            <string>where_expression</string>
+                            <string>order_by_expression</string>
                           </list>
                         </value>
                     </item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_getDueDate.xml

@@ -114,7 +114,7 @@ return due_date\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/SaleInvoiceTransaction_getDueDate</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/SaleInvoiceTransaction_getDueDate</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_getVAT.xml

@@ -135,7 +135,7 @@ return vat_infos\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/SaleInvoiceTransaction_getVAT</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/SaleInvoiceTransaction_getVAT</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_postGenerationActivity.xml

@@ -129,7 +129,7 @@ sale_invoice.activate(\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/SaleInvoiceTransaction_postGenerationActivity</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/SaleInvoiceTransaction_postGenerationActivity</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_postTransactionLineGeneration.xml

@@ -125,7 +125,7 @@ else :\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/SaleInvoiceTransaction_postTransactionLineGeneration</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/SaleInvoiceTransaction_postTransactionLineGeneration</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_selectDelivery.xml

@@ -105,7 +105,7 @@ return filter(lambda x : x is not None, deliveries_keys.keys())\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/SaleInvoiceTransaction_selectDelivery</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/SaleInvoiceTransaction_selectDelivery</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_selectInvoiceMovement.xml

@@ -107,7 +107,7 @@ return movement_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/SaleInvoiceTransaction_selectInvoiceMovement</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/SaleInvoiceTransaction_selectInvoiceMovement</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_selectPackingListMovement.xml

@@ -101,7 +101,7 @@ return movement_list\n
         </item>
         <item>
             <key> <string>_filepath</string> </key>
-            <value> <string>Script (Python):/nexedi/erp5_accounting/SaleInvoiceTransaction_selectPackingListMovement</string> </value>
+            <value> <string>Script (Python):/nexedi/portal_skins/erp5_accounting/SaleInvoiceTransaction_selectPackingListMovement</string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_viewInvoice.xml

@@ -45,12 +45,6 @@
               <tuple/>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>action</string> </key>
             <value> <string>Base_edit</string> </value>