From 7967a5e6697557cbcd6484e736db43e8cb2bfc86 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Fri, 3 Sep 2010 12:33:38 +0000
Subject: [PATCH] Fix view of payment and invoice transaction rules
git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@38140 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_types/Payment%20Simulation%20Rule/view.xml | 6 ++++--
bt5/erp5_accounting/bt/template_action_path_list | 1 -
.../portal_types/Payment%20Simulation%20Rule/cell_view.xml} | 6 +++---
.../InvoiceTransactionRule_view.xml | 0
.../InvoiceTransactionRule_view/listbox.xml | 0
.../listbox_membership_criterion_category_list.xml | 0
.../InvoiceTransactionRule_view/matrixbox.xml | 0
.../InvoiceTransactionRule_view/matrixbox_title.xml | 0
.../InvoiceTransactionRule_view/my_reference.xml | 0
.../InvoiceTransactionRule_view/my_start_date_range_max.xml | 0
.../InvoiceTransactionRule_view/my_start_date_range_min.xml | 0
.../InvoiceTransactionRule_view/my_test_method_id.xml | 0
.../InvoiceTransactionRule_view/my_title.xml | 0
.../my_translated_validation_state_title.xml | 0
.../InvoiceTransactionRule_view/my_version.xml | 0
.../bt/template_action_path_list | 3 ++-
.../Invoice%20Transaction%20Simulation%20Rule/view.xml | 6 ++++--
bt5/erp5_invoicing/bt/template_action_path_list | 1 -
.../cell_view.xml} | 6 +++---
.../bt/template_action_path_list | 1 +
20 files changed, 17 insertions(+), 13 deletions(-)
rename bt5/{erp5_accounting/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/divergence.xml => erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/cell_view.xml} (91%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/listbox.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/matrixbox.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/matrixbox_title.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/my_reference.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/my_start_date_range_max.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/my_start_date_range_min.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/my_test_method_id.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/my_title.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/my_translated_validation_state_title.xml (100%)
rename bt5/{erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy => erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy}/InvoiceTransactionRule_view/my_version.xml (100%)
rename bt5/{erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/divergence.xml => erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/cell_view.xml} (91%)
diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/view.xml b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/view.xml
index b237b4e70a..53392f6999 100644
--- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/view.xml
+++ b/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/view.xml
@@ -33,7 +33,9 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>icon</string> </key>
@@ -77,7 +79,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/InvoiceTransactionRule_view</string> </value>
+ <value> <string>string:${object_url}/Rule_view</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting/bt/template_action_path_list b/bt5/erp5_accounting/bt/template_action_path_list
index 6b208f48d0..91a60f284d 100644
--- a/bt5/erp5_accounting/bt/template_action_path_list
+++ b/bt5/erp5_accounting/bt/template_action_path_list
@@ -79,7 +79,6 @@ Organisation | grouping_reference_fast_input
Organisation | jump_active_accounting_pref
Organisation | jump_to_accounting
Organisation | transactions
-Payment Simulation Rule | divergence
Payment Simulation Rule | view
Payment Transaction | add_accounting_transaction_line
Payment Transaction | convert_destination_price
diff --git a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/divergence.xml b/bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/cell_view.xml
similarity index 91%
rename from bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/divergence.xml
rename to bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/cell_view.xml
index 3f86738a00..926cecca94 100644
--- a/bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/divergence.xml
+++ b/bt5/erp5_accounting_simulation_legacy/ActionTemplateItem/portal_types/Payment%20Simulation%20Rule/cell_view.xml
@@ -41,7 +41,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>divergence</string> </value>
+ <value> <string>cell_view</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
@@ -57,7 +57,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Divergence Testers</string> </value>
+ <value> <string>View</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
@@ -77,7 +77,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/Rule_view</string> </value>
+ <value> <string>string:${object_url}/InvoiceTransactionRule_view</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/listbox.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/listbox.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/listbox_membership_criterion_category_list.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/matrixbox_title.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_reference.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_max.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_start_date_range_min.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_test_method_id.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_title.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_title.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_title.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_title.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_translated_validation_state_title.xml
diff --git a/bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_version.xml b/bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_version.xml
similarity index 100%
rename from bt5/erp5_invoicing_simulation_legacy/SkinTemplateItem/portal_skins/erp5_invoicing_simulation_legacy/InvoiceTransactionRule_view/my_version.xml
rename to bt5/erp5_accounting_simulation_legacy/SkinTemplateItem/portal_skins/erp5_accounting_simulation_legacy/InvoiceTransactionRule_view/my_version.xml
diff --git a/bt5/erp5_accounting_simulation_legacy/bt/template_action_path_list b/bt5/erp5_accounting_simulation_legacy/bt/template_action_path_list
index ca958bd7d2..996e41606a 100644
--- a/bt5/erp5_accounting_simulation_legacy/bt/template_action_path_list
+++ b/bt5/erp5_accounting_simulation_legacy/bt/template_action_path_list
@@ -1,2 +1,3 @@
Invoice Rule | view
-Payment Rule | view
\ No newline at end of file
+Payment Rule | view
+Payment Simulation Rule | cell_view
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/view.xml b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/view.xml
index b237b4e70a..53392f6999 100644
--- a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/view.xml
+++ b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/view.xml
@@ -33,7 +33,9 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>icon</string> </key>
@@ -77,7 +79,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/InvoiceTransactionRule_view</string> </value>
+ <value> <string>string:${object_url}/Rule_view</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_invoicing/bt/template_action_path_list b/bt5/erp5_invoicing/bt/template_action_path_list
index 039b9484c2..80338dd224 100644
--- a/bt5/erp5_invoicing/bt/template_action_path_list
+++ b/bt5/erp5_invoicing/bt/template_action_path_list
@@ -3,6 +3,5 @@ Invoice Line | quantity
Invoice Line | view
Invoice Line | view_trade_model
Invoice Simulation Rule | view
-Invoice Transaction Simulation Rule | divergence
Invoice Transaction Simulation Rule | view
Trade Model Simulation Rule | view
\ No newline at end of file
diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/divergence.xml b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/cell_view.xml
similarity index 91%
rename from bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/divergence.xml
rename to bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/cell_view.xml
index 3f86738a00..926cecca94 100644
--- a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/divergence.xml
+++ b/bt5/erp5_invoicing_simulation_legacy/ActionTemplateItem/portal_types/Invoice%20Transaction%20Simulation%20Rule/cell_view.xml
@@ -41,7 +41,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>divergence</string> </value>
+ <value> <string>cell_view</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
@@ -57,7 +57,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Divergence Testers</string> </value>
+ <value> <string>View</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
@@ -77,7 +77,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
- <value> <string>string:${object_url}/Rule_view</string> </value>
+ <value> <string>string:${object_url}/InvoiceTransactionRule_view</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_invoicing_simulation_legacy/bt/template_action_path_list b/bt5/erp5_invoicing_simulation_legacy/bt/template_action_path_list
index 18c814a81c..e60e69f10c 100644
--- a/bt5/erp5_invoicing_simulation_legacy/bt/template_action_path_list
+++ b/bt5/erp5_invoicing_simulation_legacy/bt/template_action_path_list
@@ -1,4 +1,5 @@
Invoice Transaction Rule | divergence
Invoice Transaction Rule | view
+Invoice Transaction Simulation Rule | cell_view
Invoicing Rule | view
Trade Model Rule | view
\ No newline at end of file
--
2.30.9