diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Banknote_view/my_base_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Banknote_view/my_base_price.xml
index e6bf5fbf545b7337b45d50311b9bc03821421be2..4d01e35b1234f8466c4f015be23b45fd1d997cff 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Banknote_view/my_base_price.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Banknote_view/my_base_price.xml
@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
- <string>IntegerField</string>
+ <string>FloatField</string>
</tuple>
<none/>
</tuple>
@@ -31,12 +31,8 @@
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
- <key> <string>integer_out_of_range</string> </key>
- <value> <string>The integer you entered was out of range.</string> </value>
- </item>
- <item>
- <key> <string>not_integer</string> </key>
- <value> <string>You did not enter an integer.</string> </value>
+ <key> <string>not_float</string> </key>
+ <value> <string>You did not enter a floating point number.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
@@ -81,10 +77,6 @@
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>end</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -98,11 +90,15 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -130,9 +126,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -154,10 +148,6 @@
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>end</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -171,11 +161,17 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -199,7 +195,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>figure</string> </value>
</item>
<item>
<key> <string>default</string> </key>
@@ -225,29 +221,29 @@
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
- <item>
- <key> <string>end</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>align=right</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1234.5</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>start</string> </key>
- <value> <string></string> </value>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -277,7 +273,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.Integer_toString(int(here.getBasePrice()))</string> </value>
+ <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view.xml
index e26e230fe0b7f66bd5c3dca592a774e6078cbd14..acb13cbe8e65b355046b71ff39eaf5d475a75dfc 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view.xml
@@ -99,7 +99,6 @@
<value>
<list>
<string>matrixbox_membership_criterion_category_list</string>
- <string>matrixbox_quantity</string>
<string>membership_criterion_base_category_list</string>
</list>
</value>
@@ -110,6 +109,7 @@
<list>
<string>my_resource_translated_title</string>
<string>my_total_price</string>
+ <string>matrixbox_quantity</string>
</list>
</value>
</item>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/matrixbox_quantity.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/matrixbox_quantity.xml
index aecba75fb8023be90c7b0c87c53fbdd6d48a1d77..3798b6362e1e117cc63604f69c0569158aaf9c0f 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/matrixbox_quantity.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/matrixbox_quantity.xml
@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
- <string>IntegerField</string>
+ <string>FloatField</string>
</tuple>
<none/>
</tuple>
@@ -31,12 +31,8 @@
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
- <key> <string>integer_out_of_range</string> </key>
- <value> <string>The integer you entered was out of range.</string> </value>
- </item>
- <item>
- <key> <string>not_integer</string> </key>
- <value> <string>You did not enter an integer.</string> </value>
+ <key> <string>not_float</string> </key>
+ <value> <string>You did not enter a floating point number.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
@@ -81,10 +77,6 @@
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>end</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -98,11 +90,15 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>precision</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -130,9 +126,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -149,17 +143,13 @@
<item>
<key> <string>editable</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>end</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -173,11 +163,17 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -201,7 +197,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>figure</string> </value>
</item>
<item>
<key> <string>default</string> </key>
@@ -221,35 +217,35 @@
</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>end</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>align="right"</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1234.5</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>start</string> </key>
- <value> <string></string> </value>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -279,7 +275,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.Integer_toString(int(cell.getProperty(\'quantity\')))</string> </value>
+ <value> <string>python: here.getSimulationState() == \'draft\'</string> </value>
</item>
</dictionary>
</pickle>
@@ -298,7 +294,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.getSimulationState() == \'draft\'</string> </value>
+ <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/my_total_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/my_total_price.xml
index b7eaed7aea8cee37729ff0f1b6411cebe66f9998..84578c26f5b651b00e02585eb4176f4a253c55b1 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/my_total_price.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDeliveryLine_view/my_total_price.xml
@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
- <string>IntegerField</string>
+ <string>FloatField</string>
</tuple>
<none/>
</tuple>
@@ -31,12 +31,8 @@
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
- <key> <string>integer_out_of_range</string> </key>
- <value> <string>The integer you entered was out of range.</string> </value>
- </item>
- <item>
- <key> <string>not_integer</string> </key>
- <value> <string>You did not enter an integer.</string> </value>
+ <key> <string>not_float</string> </key>
+ <value> <string>You did not enter a floating point number.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
@@ -81,10 +77,6 @@
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>end</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -98,11 +90,15 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -130,9 +126,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -154,10 +148,6 @@
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>end</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -171,11 +161,19 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
+ <key> <string>input_style</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>precision</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -199,7 +197,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>figure</string> </value>
</item>
<item>
<key> <string>default</string> </key>
@@ -225,30 +223,30 @@
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
- <item>
- <key> <string>end</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>
+ <value> <string>align="right"</string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1234.5</string> </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>precision</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>Total Price</string> </value>
@@ -277,7 +275,26 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.Integer_toString(int(here.getTotalPrice()))</string> </value>
+ <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.TALESField</string>
+ <string>TALESMethod</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: here.getResourceValue().getQuantityPrecision()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Coin_view/my_base_price.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Coin_view/my_base_price.xml
index e6bf5fbf545b7337b45d50311b9bc03821421be2..4d01e35b1234f8466c4f015be23b45fd1d997cff 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Coin_view/my_base_price.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Coin_view/my_base_price.xml
@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
- <string>IntegerField</string>
+ <string>FloatField</string>
</tuple>
<none/>
</tuple>
@@ -31,12 +31,8 @@
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
- <key> <string>integer_out_of_range</string> </key>
- <value> <string>The integer you entered was out of range.</string> </value>
- </item>
- <item>
- <key> <string>not_integer</string> </key>
- <value> <string>You did not enter an integer.</string> </value>
+ <key> <string>not_float</string> </key>
+ <value> <string>You did not enter a floating point number.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
@@ -81,10 +77,6 @@
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>end</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -98,11 +90,15 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -130,9 +126,7 @@
</item>
<item>
<key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -154,10 +148,6 @@
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>end</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -171,11 +161,17 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>start</string> </key>
+ <key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -199,7 +195,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
- <value> <string></string> </value>
+ <value> <string>figure</string> </value>
</item>
<item>
<key> <string>default</string> </key>
@@ -225,29 +221,29 @@
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
- <item>
- <key> <string>end</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>align=right</string> </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>input_style</string> </key>
+ <value> <string>-1234.5</string> </value>
+ </item>
+ <item>
+ <key> <string>precision</string> </key>
<value> <int>0</int> </value>
</item>
<item>
- <key> <string>start</string> </key>
- <value> <string></string> </value>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -277,7 +273,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.Integer_toString(int(here.getBasePrice()))</string> </value>
+ <value> <string>string:-1 234.5 | preferences/getPreferredMoneyQuantityStyle</string> </value>
</item>
</dictionary>
</pickle>