From 6732cac8ea40e64c5e6e3a5976906539a657be19 Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Wed, 23 Apr 2008 14:37:35 +0000
Subject: [PATCH] Uniformise Sale Packing List, Sale Order, Purchase Packing
List and Purchase Order list views with respective document views.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20774 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../listbox.xml | 127 +++++++++++----
.../listbox.xml | 149 ++++++++----------
.../listbox.xml | 135 +++++++++++-----
bt5/erp5_trade/bt/revision | 2 +-
4 files changed, 262 insertions(+), 151 deletions(-)
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList/listbox.xml
index 3469f1c615..68e1ce32d2 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList/listbox.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ListBox</string>
- <string>ListBox</string>
- </tuple>
- <none/>
+ <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -315,15 +312,31 @@
<list>
<tuple>
<string>title</string>
- <string>Purchase Packing List</string>
+ <string>Title</string>
</tuple>
<tuple>
- <string>default_source_title</string>
- <string>Source</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
<string>causality_title</string>
- <string>Causality</string>
+ <string>Order</string>
+ </tuple>
+ <tuple>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -346,21 +359,41 @@
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
- <string>Purchase Packing List</string>
+ <string>Title</string>
</tuple>
<tuple>
- <string>default_source_title</string>
- <string>Source</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
<string>causality_title</string>
- <string>Causality</string>
+ <string>Order</string>
+ </tuple>
+ <tuple>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -398,12 +431,21 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
- <list/>
+ <list>
+ <tuple>
+ <string>delivery_mode</string>
+ <string>Delivery Mode</string>
+ </tuple>
+ <tuple>
+ <string>incoterm</string>
+ <string>Incoterm</string>
+ </tuple>
+ </list>
</value>
</item>
<item>
<key> <string>domain_tree</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
@@ -488,15 +530,31 @@
<list>
<tuple>
<string>title</string>
- <string>Purchase Packing List</string>
+ <string>Title</string>
</tuple>
<tuple>
- <string>default_source_title</string>
- <string>Source</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
<string>causality_title</string>
- <string>Causality</string>
+ <string>Order</string>
+ </tuple>
+ <tuple>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -534,15 +592,31 @@
<list>
<tuple>
<string>title</string>
- <string>Purchase Packing List</string>
+ <string>Title</string>
</tuple>
<tuple>
- <string>default_source_title</string>
- <string>Source</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
<string>causality_title</string>
- <string>Causality</string>
+ <string>Order</string>
+ </tuple>
+ <tuple>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -584,11 +658,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.MethodField</string>
- <string>Method</string>
- </tuple>
- <none/>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderModule_viewSaleOrderList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderModule_viewSaleOrderList/listbox.xml
index a6fff1f425..89c33dbe77 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderModule_viewSaleOrderList/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderModule_viewSaleOrderList/listbox.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ListBox</string>
- <string>ListBox</string>
- </tuple>
- <none/>
+ <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -318,16 +315,24 @@
<string>Title</string>
</tuple>
<tuple>
- <string>default_destination_title</string>
- <string>Destination</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
- <string>default_destination_decision_title</string>
- <string>Destination Decision</string>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
</tuple>
<tuple>
- <string>description</string>
- <string>Description</string>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -350,6 +355,10 @@
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>columns</string> </key>
<value>
@@ -359,16 +368,24 @@
<string>Title</string>
</tuple>
<tuple>
- <string>default_destination_title</string>
- <string>Destination</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
- <string>default_destination_decision_title</string>
- <string>Destination Decision</string>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
</tuple>
<tuple>
- <string>description</string>
- <string>Description</string>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -407,17 +424,9 @@
<key> <string>domain_root_list</string> </key>
<value>
<list>
- <tuple>
- <string>source_section</string>
- <string>Source Section</string>
- </tuple>
<tuple>
<string>order</string>
- <string>Order type</string>
- </tuple>
- <tuple>
- <string>origin</string>
- <string>Origin</string>
+ <string>Order Type</string>
</tuple>
<tuple>
<string>incoterm</string>
@@ -427,20 +436,12 @@
<string>delivery_mode</string>
<string>Delivery Mode</string>
</tuple>
- <tuple>
- <string>segmentation</string>
- <string>Segmentation</string>
- </tuple>
- <tuple>
- <string>group</string>
- <string>Group</string>
- </tuple>
</list>
</value>
</item>
<item>
<key> <string>domain_tree</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
@@ -508,36 +509,7 @@
<item>
<key> <string>report_root_list</string> </key>
<value>
- <list>
- <tuple>
- <string>source_section</string>
- <string>Source Section</string>
- </tuple>
- <tuple>
- <string>order</string>
- <string>Order type</string>
- </tuple>
- <tuple>
- <string>origin</string>
- <string>Origin</string>
- </tuple>
- <tuple>
- <string>incoterm</string>
- <string>Incoterm</string>
- </tuple>
- <tuple>
- <string>delivery_mode</string>
- <string>Delivery Mode</string>
- </tuple>
- <tuple>
- <string>segmentation</string>
- <string>Segmentation</string>
- </tuple>
- <tuple>
- <string>group</string>
- <string>Group</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -557,16 +529,24 @@
<string>Title</string>
</tuple>
<tuple>
- <string>default_destination_title</string>
- <string>Destination</string>
+ <string>reference</string>
+ <string>Reference</string>
+ </tuple>
+ <tuple>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
</tuple>
<tuple>
- <string>default_destination_decision_title</string>
- <string>Destination Decision</string>
+ <string>source_section_title</string>
+ <string>Supplier</string>
</tuple>
<tuple>
- <string>description</string>
- <string>Description</string>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -607,16 +587,24 @@
<string>Title</string>
</tuple>
<tuple>
- <string>default_destination_title</string>
- <string>Destination</string>
+ <string>reference</string>
+ <string>Reference</string>
+ </tuple>
+ <tuple>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
</tuple>
<tuple>
- <string>default_destination_decision_title</string>
- <string>Destination Decision</string>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
</tuple>
<tuple>
- <string>description</string>
- <string>Description</string>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -658,11 +646,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.MethodField</string>
- <string>Method</string>
- </tuple>
- <none/>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingListModule_viewSalePackingListList/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingListModule_viewSalePackingListList/listbox.xml
index 553ffe0e33..8dcab90e9a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingListModule_viewSalePackingListList/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingListModule_viewSalePackingListList/listbox.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ListBox</string>
- <string>ListBox</string>
- </tuple>
- <none/>
+ <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -315,19 +312,31 @@
<list>
<tuple>
<string>title</string>
- <string>Sale Packing List</string>
+ <string>Title</string>
</tuple>
<tuple>
- <string>default_destination_title</string>
- <string>Destination</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
- <string>default_destination_decision_title</string>
- <string>Destination Decision</string>
+ <string>causality_title</string>
+ <string>Order</string>
</tuple>
<tuple>
- <string>causality_title</string>
- <string>Causality</string>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -350,25 +359,41 @@
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
- <string>Sale Packing List</string>
+ <string>Title</string>
</tuple>
<tuple>
- <string>default_destination_title</string>
- <string>Destination</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
- <string>default_destination_decision_title</string>
- <string>Destination Decision</string>
+ <string>causality_title</string>
+ <string>Order</string>
</tuple>
<tuple>
- <string>causality_title</string>
- <string>Causality</string>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -406,12 +431,21 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
- <list/>
+ <list>
+ <tuple>
+ <string>delivery_mode</string>
+ <string>Delivery Mode</string>
+ </tuple>
+ <tuple>
+ <string>incoterm</string>
+ <string>Incoterm</string>
+ </tuple>
+ </list>
</value>
</item>
<item>
<key> <string>domain_tree</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
@@ -496,19 +530,31 @@
<list>
<tuple>
<string>title</string>
- <string>Sale Packing List</string>
+ <string>Title</string>
</tuple>
<tuple>
- <string>default_destination_title</string>
- <string>Destination</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
- <string>default_destination_decision_title</string>
- <string>Destination Decision</string>
+ <string>causality_title</string>
+ <string>Order</string>
</tuple>
<tuple>
- <string>causality_title</string>
- <string>Causality</string>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -546,19 +592,31 @@
<list>
<tuple>
<string>title</string>
- <string>Sale Packing List</string>
+ <string>Title</string>
</tuple>
<tuple>
- <string>default_destination_title</string>
- <string>Destination</string>
+ <string>reference</string>
+ <string>Reference</string>
</tuple>
<tuple>
- <string>default_destination_decision_title</string>
- <string>Destination Decision</string>
+ <string>causality_title</string>
+ <string>Order</string>
</tuple>
<tuple>
- <string>causality_title</string>
- <string>Causality</string>
+ <string>source_title</string>
+ <string>Sender or Provider</string>
+ </tuple>
+ <tuple>
+ <string>source_section_title</string>
+ <string>Supplier</string>
+ </tuple>
+ <tuple>
+ <string>destination_title</string>
+ <string>Recipient or Beneficiary</string>
+ </tuple>
+ <tuple>
+ <string>destination_section_title</string>
+ <string>Client</string>
</tuple>
<tuple>
<string>delivery.stop_date</string>
@@ -600,11 +658,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.MethodField</string>
- <string>Method</string>
- </tuple>
- <none/>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 6ffe0d0bf6..235adf8bd8 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-348
\ No newline at end of file
+349
\ No newline at end of file
--
2.30.9