From 3facca396ee4364e8f4a8c5d0702d21bb64d9ca8 Mon Sep 17 00:00:00 2001
From: Fabien Morin <fabien@nexedi.com>
Date: Wed, 21 Nov 2007 13:29:34 +0000
Subject: [PATCH] change title filed to be non-editable, use preference to
display Date, put Description field into center group as recommended
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17727 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_trade/PaymentCondition_view.xml | 12 +-
.../PaymentCondition_view/my_description.xml | 231 ++----------------
.../my_destination_payment.xml | 7 +-
.../PaymentCondition_view/my_efficiency.xml | 7 +-
.../PaymentCondition_view/my_payment_date.xml | 57 +++--
.../PaymentCondition_view/my_quantity.xml | 7 +-
.../my_source_payment.xml | 7 +-
.../TradeCondition_viewPayment/my_title.xml | 40 +--
8 files changed, 85 insertions(+), 283 deletions(-)
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view.xml
index 36ae978682..524a3075d7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.Form</string>
- <string>ERP5Form</string>
- </tuple>
- <none/>
+ <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -82,7 +79,9 @@
<item>
<key> <string>center</string> </key>
<value>
- <list/>
+ <list>
+ <string>my_description</string>
+ </list>
</value>
</item>
<item>
@@ -96,7 +95,6 @@
<value>
<list>
<string>my_title</string>
- <string>my_description</string>
<string>my_quantity</string>
<string>my_efficiency</string>
<string>my_source_payment</string>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_description.xml
index ab689832af..0d94663945 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_description.xml
@@ -4,14 +4,23 @@
<pickle>
<tuple>
<tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>TextAreaField</string>
+ <string>Products.ERP5Form.ProxyField</string>
+ <string>ProxyField</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>width</string>
+ <string>height</string>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>my_description</string> </value>
@@ -24,22 +33,6 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
- <item>
- <key> <string>line_too_long</string> </key>
- <value> <string>A line was too long.</string> </value>
- </item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</string> </value>
- </item>
- <item>
- <key> <string>too_long</string> </key>
- <value> <string>You entered too many characters.</string> </value>
- </item>
- <item>
- <key> <string>too_many_lines</string> </key>
- <value> <string>You entered too many lines.</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -48,75 +41,15 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
+ <key> <string>extra_context</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>description</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -127,75 +60,15 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
+ <key> <string>extra_context</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>enabled</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>height</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -206,76 +79,26 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
+ <key> <string>extra_context</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_description</string> </value>
</item>
<item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>BaseTradeSale_FieldLibrary</string> </value>
</item>
<item>
<key> <string>height</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_linelength</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Description</string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
+ <value> <int>5</int> </value>
</item>
<item>
<key> <string>width</string> </key>
- <value> <int>40</int> </value>
+ <value> <int>80</int> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_destination_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_destination_payment.xml
index 457aab858f..fa4761dec0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_destination_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_destination_payment.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_efficiency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_efficiency.xml
index 8904da059d..874f04bfdf 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_efficiency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_efficiency.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>FloatField</string>
- </tuple>
- <none/>
+ <global name="FloatField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_date.xml
index bcc3741feb..f078d72ff6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_payment_date.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>DateTimeField</string>
- </tuple>
- <none/>
+ <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -199,9 +196,19 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>input_order</string> </key>
+ <key> <string>hidden_day_is_last_day</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hide_day</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>input_order</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>input_style</string> </key>
<value> <string></string> </value>
@@ -352,37 +359,37 @@
<item>
<key> <string>ampm</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>day</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
<key> <string>hour</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>minute</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value>
</item>
<item>
<key> <string>month</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
</value>
</item>
<item>
<key> <string>year</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
</value>
</item>
</dictionary>
@@ -455,6 +462,22 @@
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>preferences/getPreferredDateOrder | string:ymd</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<tuple>
@@ -717,7 +740,7 @@
</dictionary>
</pickle>
</record>
- <record id="4" aka="AAAAAAAAAAQ=">
+ <record id="5" aka="AAAAAAAAAAU=">
<pickle>
<tuple>
<tuple>
@@ -972,7 +995,7 @@
</dictionary>
</pickle>
</record>
- <record id="5" aka="AAAAAAAAAAU=">
+ <record id="6" aka="AAAAAAAAAAY=">
<pickle>
<tuple>
<tuple>
@@ -1227,7 +1250,7 @@
</dictionary>
</pickle>
</record>
- <record id="6" aka="AAAAAAAAAAY=">
+ <record id="7" aka="AAAAAAAAAAc=">
<pickle>
<tuple>
<tuple>
@@ -1482,7 +1505,7 @@
</dictionary>
</pickle>
</record>
- <record id="7" aka="AAAAAAAAAAc=">
+ <record id="8" aka="AAAAAAAAAAg=">
<pickle>
<tuple>
<tuple>
@@ -1737,7 +1760,7 @@
</dictionary>
</pickle>
</record>
- <record id="8" aka="AAAAAAAAAAg=">
+ <record id="9" aka="AAAAAAAAAAk=">
<pickle>
<tuple>
<tuple>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_quantity.xml
index 68c8ec26a4..ac41ad7d43 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_quantity.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>FloatField</string>
- </tuple>
- <none/>
+ <global name="FloatField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_source_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_source_payment.xml
index 0c290b0790..200a0439e9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_source_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_view/my_source_payment.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_title.xml
index a18ed2642d..7de0cce133 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_title.xml
@@ -18,7 +18,9 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list/>
+ <list>
+ <string>editable</string>
+ </list>
</value>
</item>
<item>
@@ -151,32 +153,8 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
+ <key> <string>editable</string> </key>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>extra_context</string> </key>
@@ -192,14 +170,6 @@
<key> <string>form_id</string> </key>
<value> <string>BaseTradeSale_FieldLibrary</string> </value>
</item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Title</string> </value>
- </item>
</dictionary>
</value>
</item>
--
2.30.9