diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/preferred_warning.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/preferred_warning.xml
index 6495fde2522d33058b789bfc96b63625e5ded1af..cef6844be9fcd5c2a5c6d0160f07948baf95dd8d 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/preferred_warning.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/preferred_warning.xml
@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
+ <string>LabelField</string>
</tuple>
<none/>
</tuple>
@@ -19,30 +19,13 @@
<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>
- <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>Too much input was given.</string> </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<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>
@@ -55,14 +38,6 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
@@ -71,10 +46,6 @@
<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>
@@ -83,30 +54,10 @@
<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>required</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>truncate</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>
</dictionary>
</value>
</item>
@@ -114,10 +65,6 @@
<key> <string>tales</string> </key>
<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>
@@ -132,14 +79,6 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
@@ -150,10 +89,6 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
@@ -162,30 +97,10 @@
<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>required</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>truncate</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>
</dictionary>
</value>
</item>
@@ -193,10 +108,6 @@
<key> <string>values</string> </key>
<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>
@@ -209,26 +120,14 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
<item>
<key> <string>editable</string> </key>
- <value> <int>0</int> </value>
+ <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>
- </item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
@@ -237,30 +136,10 @@
<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>required</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Info</string> </value>
</item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <int>0</int> </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>
- </item>
</dictionary>
</value>
</item>
@@ -304,7 +183,7 @@ python: here.Localizer.translate(\'erp5_ui\', "The values above are the paramete
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: request.get(\'portal_skin\', \'\') != \'Print\'</string> </value>
+ <value> <string>python: not( request.get(\'is_accounting_report\', 0) or request.get(\'portal_skin\', \'\') == \'Print\')</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_viewAccountingTransactionList/preferred_warning.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_viewAccountingTransactionList/preferred_warning.xml
index 6495fde2522d33058b789bfc96b63625e5ded1af..cef6844be9fcd5c2a5c6d0160f07948baf95dd8d 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_viewAccountingTransactionList/preferred_warning.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_viewAccountingTransactionList/preferred_warning.xml
@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
+ <string>LabelField</string>
</tuple>
<none/>
</tuple>
@@ -19,30 +19,13 @@
<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>
- <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>Too much input was given.</string> </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<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>
@@ -55,14 +38,6 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
@@ -71,10 +46,6 @@
<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>
@@ -83,30 +54,10 @@
<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>required</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>truncate</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>
</dictionary>
</value>
</item>
@@ -114,10 +65,6 @@
<key> <string>tales</string> </key>
<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>
@@ -132,14 +79,6 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
@@ -150,10 +89,6 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
@@ -162,30 +97,10 @@
<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>required</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>truncate</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>
</dictionary>
</value>
</item>
@@ -193,10 +108,6 @@
<key> <string>values</string> </key>
<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>
@@ -209,26 +120,14 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
<item>
<key> <string>editable</string> </key>
- <value> <int>0</int> </value>
+ <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>
- </item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
@@ -237,30 +136,10 @@
<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>required</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Info</string> </value>
</item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <int>0</int> </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>
- </item>
</dictionary>
</value>
</item>
@@ -304,7 +183,7 @@ python: here.Localizer.translate(\'erp5_ui\', "The values above are the paramete
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: request.get(\'portal_skin\', \'\') != \'Print\'</string> </value>
+ <value> <string>python: not( request.get(\'is_accounting_report\', 0) or request.get(\'portal_skin\', \'\') == \'Print\')</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/preferred_warning.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/preferred_warning.xml
index 075462e9a8f9aa464cf7404c89bd468e339c9793..cef6844be9fcd5c2a5c6d0160f07948baf95dd8d 100644
--- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/preferred_warning.xml
+++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/preferred_warning.xml
@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
- <string>StringField</string>
+ <string>LabelField</string>
</tuple>
<none/>
</tuple>
@@ -19,30 +19,13 @@
<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>
- <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>Too much input was given.</string> </value>
- </item>
- </dictionary>
+ <dictionary/>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<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>
@@ -55,14 +38,6 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
@@ -71,10 +46,6 @@
<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>
@@ -83,30 +54,10 @@
<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>required</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>truncate</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>
</dictionary>
</value>
</item>
@@ -114,10 +65,6 @@
<key> <string>tales</string> </key>
<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>
@@ -132,14 +79,6 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
@@ -150,10 +89,6 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
@@ -162,30 +97,10 @@
<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>required</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>truncate</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>
</dictionary>
</value>
</item>
@@ -193,10 +108,6 @@
<key> <string>values</string> </key>
<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>
@@ -209,26 +120,14 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
<item>
<key> <string>editable</string> </key>
- <value> <int>0</int> </value>
+ <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>
- </item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
@@ -237,30 +136,10 @@
<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>required</string> </key>
- <value> <int>0</int> </value>
- </item>
<item>
<key> <string>title</string> </key>
<value> <string>Info</string> </value>
</item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <int>0</int> </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>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision
index dc9414b21fc0a9f0da06762d78acf2a2774d9b01..b912dc118c6d152c61ec7a6dd1962596853bc8f7 100644
--- a/bt5/erp5_accounting/bt/revision
+++ b/bt5/erp5_accounting/bt/revision
@@ -1 +1 @@
-154
\ No newline at end of file
+155
\ No newline at end of file