diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_section.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_section.xml
index 1a7cff17bea11dab0c95abf1127f9f87d73d9656..8809df084473df2dd144fd80985136325c2b99ad 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_section.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_destination_section.xml
@@ -13,10 +13,11 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>first_item</string>
<string>title</string>
- <string>required</string>
+ <string>default</string>
+ <string>first_item</string>
<string>items</string>
+ <string>required</string>
</list>
</value>
</item>
@@ -58,10 +59,18 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
@@ -72,10 +81,18 @@
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -83,12 +100,16 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>your_section_category</string> </value>
</item>
<item>
- <key> <string>first_item</string> </key>
+ <key> <string>first_item</string> </key>
<value> <int>1</int> </value>
</item>
<item>
@@ -96,7 +117,13 @@
<value> <string>Base_viewDialogFieldLibrary</string> </value>
</item>
<item>
- <key> <string>required</string> </key>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
@@ -104,7 +131,7 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Client</string> </value>
</item>
</dictionary>
@@ -124,7 +151,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: [(here.getDestinationSectionTitle(), here.getDestinationSectionRelativeUrl()), (\'\', \'\')]</string> </value>
+ <value> <string>python: [(here.getDestinationTitle(), here.getDestinationRelativeUrl()), (\'\', \'\')]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_price_currency.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_price_currency.xml
index 512281431901fcd5c23379e9731d3cda10752fd6..548f093c10be151f523c530abeb60e57d0e616d6 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_price_currency.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_price_currency.xml
@@ -13,8 +13,9 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>first_item</string>
<string>title</string>
+ <string>default</string>
+ <string>first_item</string>
<string>items</string>
</list>
</value>
@@ -57,10 +58,20 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
@@ -68,13 +79,17 @@
<item>
<key> <string>items</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -82,24 +97,34 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_category</string> </value>
</item>
<item>
- <key> <string>first_item</string> </key>
+ <key> <string>first_item</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Currency</string> </value>
</item>
</dictionary>
@@ -109,6 +134,22 @@
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>here/getPriceCurrency</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity_unit.xml
index 0ade288b9e140a2daf3a59a529109215278f66a7..8117023eb9440095fc47fb606d5775abc346ea45 100644
--- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity_unit.xml
+++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project_trade/SaleOrderLine_viewCreateTaskDialog/your_task_line_quantity_unit.xml
@@ -13,8 +13,9 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>first_item</string>
<string>title</string>
+ <string>default</string>
+ <string>first_item</string>
<string>items</string>
</list>
</value>
@@ -57,10 +58,20 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
@@ -68,13 +79,17 @@
<item>
<key> <string>items</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -82,24 +97,34 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_category</string> </value>
</item>
<item>
- <key> <string>first_item</string> </key>
+ <key> <string>first_item</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Quantity Unit</string> </value>
</item>
</dictionary>
@@ -109,6 +134,22 @@
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>here/getQuantityUnit</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
diff --git a/bt5/erp5_project/bt/change_log b/bt5/erp5_project/bt/change_log
index 4034a104c1d3c19f6f04d8718a9fb1dd6464536e..d1b3e4a90ff23c318d62806f3642c873379b31d3 100644
--- a/bt5/erp5_project/bt/change_log
+++ b/bt5/erp5_project/bt/change_log
@@ -1,3 +1,6 @@
+2008-09-10 vincentd
+* Set default selection for Quantity Unit and Currency and fix a little pb on Client
+
2008-09-10 vincentd
* Change action Title and Return message
diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision
index 7b5a1ce4fde986027d670754e004e49331dfcb92..ed615204d1f10f12c716d53b21557ddfa0f104c0 100644
--- a/bt5/erp5_project/bt/revision
+++ b/bt5/erp5_project/bt/revision
@@ -1 +1 @@
-589
\ No newline at end of file
+590
\ No newline at end of file