diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml
index 98c346fb62b6e8c4fc99082953f332d4c895ab0f..0a20f0543203c8e6b6ed7e6376f3fa74142d6b5e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment.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>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox.xml
index 8472d4abc97ce8d19025a64f24bc7bcfe79f7741..3fd6ae1a624f21080310af9713b553a98148b731 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/listbox.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/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>
@@ -186,6 +183,10 @@
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
@@ -240,7 +241,9 @@
</item>
<item>
<key> <string>list_action</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>list_method</string> </key>
@@ -250,6 +253,10 @@
<key> <string>meta_types</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>page_template</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>portal_types</string> </key>
<value> <string></string> </value>
@@ -330,8 +337,8 @@
<value>
<list>
<tuple>
- <string>id</string>
- <string>ID</string>
+ <string>translated_id</string>
+ <string>Payement Condition Function</string>
</tuple>
<tuple>
<string>title</string>
@@ -341,6 +348,34 @@
<string>description</string>
<string>Description</string>
</tuple>
+ <tuple>
+ <string>quantity</string>
+ <string>Total</string>
+ </tuple>
+ <tuple>
+ <string>efficiency</string>
+ <string>Percentage Of Total</string>
+ </tuple>
+ <tuple>
+ <string>source_payment_title</string>
+ <string>Source Payment</string>
+ </tuple>
+ <tuple>
+ <string>destination_payment_title</string>
+ <string>Destination Payment</string>
+ </tuple>
+ <tuple>
+ <string>payment_term</string>
+ <string>Payment Delay</string>
+ </tuple>
+ <tuple>
+ <string>payment_end_of_month</string>
+ <string>Payment At The End Of Month</string>
+ </tuple>
+ <tuple>
+ <string>payment_date</string>
+ <string>Payment Date</string>
+ </tuple>
</list>
</value>
</item>
@@ -419,12 +454,12 @@
</item>
<item>
<key> <string>list_action</string> </key>
- <value> <string>Folder_viewContentList</string> </value>
+ <value> <string>list</string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -433,6 +468,10 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>page_template</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>portal_types</string> </key>
<value>
@@ -528,17 +567,37 @@
<pickle>
<tuple>
<tuple>
- <string>Products.Formulator.MethodField</string>
- <string>Method</string>
+ <string>Products.Formulator.TALESField</string>
+ <string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+string:Base_viewListMode?proxy_form_id=${form/getId}&proxy_field_id=${field/getId}
+
+]]></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <tuple>
+ <global name="Method" module="Products.Formulator.MethodField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
<pickle>
<dictionary>
<item>
<key> <string>method_name</string> </key>
- <value> <string>searchFolder</string> </value>
+ <value> <string>contentValues</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_destination_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_destination_payment.xml
index 876e8336f85c5275cdede2092defb77bf3c4fe39..fc371694cdf2e67bb83a43d66b7260deffb949e5 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_destination_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_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/TradeCondition_viewPayment/my_payment_condition_efficiency.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_efficiency.xml
index 2ceb71798f049d1f9cea5049a582015fa455d6ba..48457f7d66d74ae461016d4b0f17b7abbce5232f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_efficiency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_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/TradeCondition_viewPayment/my_payment_condition_payment_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_payment_date.xml
index 343af99206ebf71d3db023191c4a4d742d2a8605..1301c411861523e395ed6ff8bc114bf53101343c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_payment_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_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>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_quantity.xml
index 7c3b0db8845484a21d66d10f067b9e19ac7a69d7..3919551ca754f4c4b2cc385d62144408ec5d33f0 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_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/TradeCondition_viewPayment/my_payment_condition_source_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_source_payment.xml
index befe49f9b5281ab684781da31f7062ec9cf63835..b524dde3c1785a240c4fef6dbe78be6b0115029f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_source_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_viewPayment/my_payment_condition_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 f5c8216e2c3abc751ec5e3203723a65fd1f557be..a18ed2642dba5fd3b27873f0dbe8a3f50e885867 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
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 5d1277e790328f9e133a3d83d800e37fd6ac82ed..4b9bce48238e62028651de99e7f2b218771cd806 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-147
\ No newline at end of file
+148
\ No newline at end of file