From 0c3e2d892345baaee8f139d9e299f47e38b55a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Tue, 29 Jan 2013 13:54:52 +0000
Subject: [PATCH] rename portal_type parameter to line_portal_type

Previously, portal_type parameter was passed in REQUEST and stored in the selection for the next listbox, which can be listing objects of another portal_type
---
 .../add_accounting_transaction_line.xml                       | 2 +-
 .../add_internal_invoice_transaction_line.xml                 | 2 +-
 .../Payment%20Transaction/add_accounting_transaction_line.xml | 2 +-
 .../add_purchase_invoice_transaction_line.xml                 | 2 +-
 .../add_sale_invoice_transaction_line.xml                     | 2 +-
 .../AccountingTransaction_addAccountingTransactionLine.xml    | 4 ++--
 ...tingTransaction_viewAddAccountingTransactionLineDialog.xml | 2 +-
 .../{your_portal_type.xml => your_line_portal_type.xml}       | 4 ++--
 bt5/erp5_accounting/bt/revision                               | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/{your_portal_type.xml => your_line_portal_type.xml} (98%)

diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction/add_accounting_transaction_line.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction/add_accounting_transaction_line.xml
index 6bd4693e67..28d98d116c 100644
--- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction/add_accounting_transaction_line.xml
+++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction/add_accounting_transaction_line.xml
@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Accounting+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Accounting+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Internal%20Invoice%20Transaction/add_internal_invoice_transaction_line.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Internal%20Invoice%20Transaction/add_internal_invoice_transaction_line.xml
index 68298bf627..de659178c5 100644
--- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Internal%20Invoice%20Transaction/add_internal_invoice_transaction_line.xml
+++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Internal%20Invoice%20Transaction/add_internal_invoice_transaction_line.xml
@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Internal+Invoice+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Internal+Invoice+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Transaction/add_accounting_transaction_line.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Transaction/add_accounting_transaction_line.xml
index 6bd4693e67..28d98d116c 100644
--- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Transaction/add_accounting_transaction_line.xml
+++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Transaction/add_accounting_transaction_line.xml
@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Accounting+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Accounting+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/add_purchase_invoice_transaction_line.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/add_purchase_invoice_transaction_line.xml
index 2dd0e43fa1..58ecf53eb9 100644
--- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/add_purchase_invoice_transaction_line.xml
+++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/add_purchase_invoice_transaction_line.xml
@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Purchase+Invoice+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Purchase+Invoice+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/add_sale_invoice_transaction_line.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/add_sale_invoice_transaction_line.xml
index 89adf1abeb..49bb7794e0 100644
--- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/add_sale_invoice_transaction_line.xml
+++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/add_sale_invoice_transaction_line.xml
@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Sale+Invoice+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Sale+Invoice+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.xml
index c6c4eea781..c5896d5e3a 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.xml
@@ -58,7 +58,7 @@ from Products.ERP5Type.Message import translateString\n
 request = container.REQUEST\n
 \n
 for i in range(line_count):\n
-  context.newContent(portal_type=portal_type)\n
+  context.newContent(portal_type=line_portal_type)\n
 \n
 request.set(\'portal_status_message\',\n
     translateString(\'Accounting Transaction Lines added.\'),)\n
@@ -67,7 +67,7 @@ return getattr(context, form_id)()\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>form_id=\'view\', portal_type=\'Accounting Transaction Line\', line_count=1</string> </value>
+            <value> <string>form_id=\'view\', line_portal_type=\'Accounting Transaction Line\', line_count=1</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog.xml
index f7c0794127..5827d2241e 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog.xml
@@ -86,7 +86,7 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>your_portal_type</string>
+                        <string>your_line_portal_type</string>
                         <string>your_line_count</string>
                       </list>
                     </value>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/your_portal_type.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/your_line_portal_type.xml
similarity index 98%
rename from bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/your_portal_type.xml
rename to bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/your_line_portal_type.xml
index be8c957846..afa5b614c4 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/your_portal_type.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/your_line_portal_type.xml
@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>your_portal_type</string> </value>
+            <value> <string>your_line_portal_type</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -267,7 +267,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>request/portal_type</string> </value>
+            <value> <string>request/line_portal_type</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index ae6f1163f2..2c87a4b00c 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-1507
\ No newline at end of file
+1508
\ No newline at end of file
-- 
2.30.9