From 9e12bd1367aca04fb64e3d864e0c63974cb75cf1 Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Tue, 22 Nov 2011 14:11:38 +0900
Subject: [PATCH] Stop showing detailed DateTime in listbox. This problem
started occur due to recent specification change of zope's DateTime.
---
...Base_viewAdvancedInvoicingFieldLibrary.xml | 2 +
...view_mode_listbox_read_only_start_date.xml | 101 ++++++++++++++++++
..._view_mode_listbox_read_only_stop_date.xml | 101 ++++++++++++++++++
...eInvoiceModule_viewPurchaseInvoiceList.xml | 25 +----
.../listbox.xml | 20 +++-
.../listbox_delivery_stop_date.xml | 84 +++++++++++++++
.../SaleInvoiceModule_viewSaleInvoiceList.xml | 25 +----
.../listbox.xml | 12 +++
.../listbox_delivery_start_date.xml | 84 +++++++++++++++
bt5/erp5_advanced_invoicing/bt/change_log | 3 +
bt5/erp5_advanced_invoicing/bt/revision | 2 +-
11 files changed, 410 insertions(+), 49 deletions(-)
create mode 100644 bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary/my_view_mode_listbox_read_only_start_date.xml
create mode 100644 bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary/my_view_mode_listbox_read_only_stop_date.xml
create mode 100644 bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox_delivery_stop_date.xml
create mode 100644 bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox_delivery_start_date.xml
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary.xml
index 4baacf0a37..5e55e57e93 100644
--- a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary.xml
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary.xml
@@ -100,6 +100,8 @@
<string>my_translated_causality_state_title</string>
<string>my_translated_simulation_state_title</string>
<string>my_price</string>
+ <string>my_view_mode_listbox_read_only_stop_date</string>
+ <string>my_view_mode_listbox_read_only_start_date</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary/my_view_mode_listbox_read_only_start_date.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary/my_view_mode_listbox_read_only_start_date.xml
new file mode 100644
index 0000000000..7682dafe1e
--- /dev/null
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary/my_view_mode_listbox_read_only_start_date.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>editable</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_view_mode_listbox_read_only_start_date</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_date_time_field</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Invoice Date</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary/my_view_mode_listbox_read_only_stop_date.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary/my_view_mode_listbox_read_only_stop_date.xml
new file mode 100644
index 0000000000..1a973b3629
--- /dev/null
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Base_viewAdvancedInvoicingFieldLibrary/my_view_mode_listbox_read_only_stop_date.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>editable</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_view_mode_listbox_read_only_stop_date</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_date_time_field</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Invoice Date</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList.xml
index 08d342dc7b..889e642c3b 100644
--- a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList.xml
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList.xml
@@ -59,9 +59,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
- <string>left</string>
- <string>right</string>
- <string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
@@ -79,28 +76,12 @@
</list>
</value>
</item>
- <item>
- <key> <string>center</string> </key>
- <value>
- <list/>
- </value>
- </item>
<item>
<key> <string>hidden</string> </key>
<value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
+ <list>
+ <string>listbox_delivery_stop_date</string>
+ </list>
</value>
</item>
</dictionary>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml
index 6980aa2b32..16a7d05454 100644
--- a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox.xml
@@ -11,6 +11,7 @@
<value>
<list>
<string>columns</string>
+ <string>editable_columns</string>
<string>search_columns</string>
<string>selection_name</string>
<string>sort</string>
@@ -93,7 +94,7 @@
<string>Supplier</string>
</tuple>
<tuple>
- <string>delivery.start_date</string>
+ <string>delivery.stop_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
@@ -107,6 +108,17 @@
</list>
</value>
</item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>delivery.stop_date</string>
+ <string>Invoice Date</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_mode_listbox</string> </value>
@@ -132,7 +144,7 @@
<string>Supplier</string>
</tuple>
<tuple>
- <string>delivery.start_date</string>
+ <string>delivery.stop_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
@@ -155,7 +167,7 @@
<value>
<list>
<tuple>
- <string>delivery.start_date</string>
+ <string>delivery.stop_date</string>
<string>ASC</string>
</tuple>
</list>
@@ -178,7 +190,7 @@
<string>Supplier</string>
</tuple>
<tuple>
- <string>delivery.start_date</string>
+ <string>delivery.stop_date</string>
<string>Invoice Date</string>
</tuple>
<tuple>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox_delivery_stop_date.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox_delivery_stop_date.xml
new file mode 100644
index 0000000000..ecffa3fceb
--- /dev/null
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/PurchaseInvoiceModule_viewPurchaseInvoiceList/listbox_delivery_stop_date.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_delivery_stop_date</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_view_mode_listbox_read_only_stop_date</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewAdvancedInvoicingFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList.xml
index 0b36e151fe..4d6abf3a7b 100644
--- a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList.xml
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList.xml
@@ -59,9 +59,6 @@
<key> <string>group_list</string> </key>
<value>
<list>
- <string>left</string>
- <string>right</string>
- <string>center</string>
<string>bottom</string>
<string>hidden</string>
</list>
@@ -79,28 +76,12 @@
</list>
</value>
</item>
- <item>
- <key> <string>center</string> </key>
- <value>
- <list/>
- </value>
- </item>
<item>
<key> <string>hidden</string> </key>
<value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
+ <list>
+ <string>listbox_delivery_start_date</string>
+ </list>
</value>
</item>
</dictionary>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml
index 135abf0e7a..d330d64847 100644
--- a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox.xml
@@ -11,6 +11,7 @@
<value>
<list>
<string>columns</string>
+ <string>editable_columns</string>
<string>search_columns</string>
<string>selection_name</string>
<string>sort</string>
@@ -107,6 +108,17 @@
</list>
</value>
</item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>delivery.start_date</string>
+ <string>Invoice Date</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_mode_listbox</string> </value>
diff --git a/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox_delivery_start_date.xml b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox_delivery_start_date.xml
new file mode 100644
index 0000000000..fee5b514e5
--- /dev/null
+++ b/bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/SaleInvoiceModule_viewSaleInvoiceList/listbox_delivery_start_date.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_delivery_start_date</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_view_mode_listbox_read_only_start_date</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewAdvancedInvoicingFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_advanced_invoicing/bt/change_log b/bt5/erp5_advanced_invoicing/bt/change_log
index a7ea5ca1c5..e34b72b70e 100644
--- a/bt5/erp5_advanced_invoicing/bt/change_log
+++ b/bt5/erp5_advanced_invoicing/bt/change_log
@@ -1,3 +1,6 @@
+2011-11-22 yusei
+* Stop showing detailed DateTime in listbox. This problem started occur due to recent specification change of zope's DateTime.
+
2010-11-04 tatuya
* Fix stop_action on invoice_workflow. The settings were missing.
diff --git a/bt5/erp5_advanced_invoicing/bt/revision b/bt5/erp5_advanced_invoicing/bt/revision
index 105d7d9ad3..97a55e1d74 100644
--- a/bt5/erp5_advanced_invoicing/bt/revision
+++ b/bt5/erp5_advanced_invoicing/bt/revision
@@ -1 +1 @@
-100
\ No newline at end of file
+101
\ No newline at end of file
--
GitLab