[Erp5-report] r35477 seb - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu May 20 13:21:52 CEST 2010
Author: seb
Date: Thu May 20 13:21:47 2010
New Revision: 35477
URL: http://svn.erp5.org?rev=35477&view=rev
Log:
2010-05-20 Seb
* finish to proxy SaleOrder_viewSaleOrderFastInputDialog
* rename two fields because field id should not use method names
Added:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_available_quantity.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_current_quantity.xml
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateFastInputLineList.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateFastInputLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateFastInputLineList.xml?rev=35477&r1=35476&r2=35477&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateFastInputLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_updateFastInputLineList.xml [utf8] Thu May 20 13:21:47 2010
@@ -97,15 +97,15 @@
supply_cell_list = product.default_ssl.contentValues(portal_type=supply_cell_portal_type)\n
for supply_cell in supply_cell_list:\n
if supply_cell.getVariationCategoryList()[0]==\'variation/%s\'%line["variation_category_list"]:\n
- line["total_price"] = line[\'quantity\'] * supply_cell.getBasePrice()\n
+ line["total_price"] = line[\'quantity\'] * (supply_cell.getBasePrice() or 0)\n
request.form["field_listbox_total_price_new_%s"%line_id] = line[\'total_price\'] \n
- request.form["field_listbox_getAvailableInventory_new_%s"%line_id] = product.getAvailableInventory(\n
+ request.form["field_listbox_available_quantity_new_%s"%line_id] = product.getAvailableInventory(\n
section_uid=context.getSourceSectionValue().getUid(),\n
variation_text=\'variation/%s\'%line["variation_category_list"])\n
request.form[\'field_listbox_inventory_new_%s\'%line_id] = product.getInventory(\n
section_uid=context.getSourceSectionValue().getUid(),\n
variation_text=\'variation/%s\'%line["variation_category_list"])\n
- request.form["field_listbox_getCurrentInventory_new_%s"%line_id] = product.getCurrentInventory(\n
+ request.form["field_listbox_current_quantity_new_%s"%line_id] = product.getCurrentInventory(\n
section_uid=context.getSourceSectionValue().getUid(),\n
variation_text=\'variation/%s\'%line["variation_category_list"])\n
total_price +=line[\'total_price\']\n
@@ -114,13 +114,13 @@
elif line["variation_category_list"]==\'\' and product.getPortalType()==\'Product\' \\\n
and no_inventory is False \\\n
and line[\'quantity\'] <= product.getAvailableInventory(section_uid=context.getSourceSectionValue().getUid()):\n
- line["total_price"] = line[\'quantity\'] * cell.getPrice()\n
+ line["total_price"] = line[\'quantity\'] * (cell.getPrice() or 0)\n
request.form["field_listbox_total_price_new_%s"%line_id] = line[\'total_price\']\n
- request.form["field_listbox_getAvailableInventory_new_%s"%line_id] = product.getAvailableInventory(\n
+ request.form["field_listbox_available_quantity_new_%s"%line_id] = product.getAvailableInventory(\n
section_uid=context.getSourceSectionValue().getUid())\n
request.form[\'field_listbox_inventory_new_%s\'%line_id] = product.getInventory(\n
section_uid=context.getSourceSectionValue().getUid())\n
- request.form["field_listbox_getCurrentInventory_new_%s"%line_id] = product.getCurrentInventory(\n
+ request.form["field_listbox_current_quantity_new_%s"%line_id] = product.getCurrentInventory(\n
section_uid=context.getSourceSectionValue().getUid(),)\n
total_price +=line[\'total_price\']\n
request.form["field_my_total_price"] = total_price\n
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog.xml?rev=35477&r1=35476&r2=35477&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog.xml [utf8] Thu May 20 13:21:47 2010
@@ -97,8 +97,8 @@
<string>listbox_total_price</string>
<string>listbox_title</string>
<string>listbox_variation_category_list</string>
- <string>listbox_getCurrentInventory</string>
- <string>listbox_getAvailableInventory</string>
+ <string>listbox_current_quantity</string>
+ <string>listbox_available_quantity</string>
<string>listbox_quantity_unit</string>
</list>
</value>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox.xml?rev=35477&r1=35476&r2=35477&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox.xml [utf8] Thu May 20 13:21:47 2010
@@ -13,13 +13,13 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>columns</string>
<string>editable_columns</string>
- <string>title</string>
+ <string>list_method</string>
+ <string>portal_types</string>
<string>search_columns</string>
<string>selection_name</string>
- <string>list_method</string>
- <string>columns</string>
- <string>portal_types</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -115,6 +115,49 @@
<string>Total Price</string>
</tuple>
<tuple>
+ <string>current_quantity</string>
+ <string>Current</string>
+ </tuple>
+ <tuple>
+ <string>available_quantity</string>
+ <string>Available</string>
+ </tuple>
+ <tuple>
+ <string>inventory</string>
+ <string>Future</string>
+ </tuple>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>editable_columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>title</string>
+ <string>Product or Service</string>
+ </tuple>
+ <tuple>
+ <string>reference</string>
+ <string>Reference</string>
+ </tuple>
+ <tuple>
+ <string>quantity</string>
+ <string>Quantity</string>
+ </tuple>
+ <tuple>
+ <string>quantity_unit</string>
+ <string>Quantity Unit</string>
+ </tuple>
+ <tuple>
+ <string>variation_category_list</string>
+ <string>Variation</string>
+ </tuple>
+ <tuple>
+ <string>total_price</string>
+ <string>Total Price</string>
+ </tuple>
+ <tuple>
<string>getCurrentInventory</string>
<string>Current</string>
</tuple>
@@ -130,49 +173,6 @@
</value>
</item>
<item>
- <key> <string>editable_columns</string> </key>
- <value>
- <list>
- <tuple>
- <string>title</string>
- <string>Product or Service</string>
- </tuple>
- <tuple>
- <string>reference</string>
- <string>Reference</string>
- </tuple>
- <tuple>
- <string>quantity</string>
- <string>Quantity</string>
- </tuple>
- <tuple>
- <string>quantity_unit</string>
- <string>Quantity Unit</string>
- </tuple>
- <tuple>
- <string>variation_category_list</string>
- <string>Variation</string>
- </tuple>
- <tuple>
- <string>total_price</string>
- <string>Total Price</string>
- </tuple>
- <tuple>
- <string>getCurrentInventory</string>
- <string>Current</string>
- </tuple>
- <tuple>
- <string>getAvailableInventory</string>
- <string>Available</string>
- </tuple>
- <tuple>
- <string>inventory</string>
- <string>Future</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_listbox</string> </value>
</item>
@@ -184,6 +184,12 @@
<key> <string>list_method</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_types</string> </key>
+ <value>
+ <list/>
</value>
</item>
<item>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_available_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_available_quantity.xml?rev=35477&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_available_quantity.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_available_quantity.xml [utf8] Thu May 20 13:21:47 2010
@@ -1,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_available_quantity</string> </value>
+ </item>
+ <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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_view_mode_listbox_quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewTradeFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_current_quantity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_current_quantity.xml?rev=35477&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_current_quantity.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_current_quantity.xml [utf8] Thu May 20 13:21:47 2010
@@ -1,0 +1,93 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_current_quantity</string> </value>
+ </item>
+ <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>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_view_mode_listbox_quantity</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewTradeFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=35477&r1=35476&r2=35477&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Thu May 20 13:21:47 2010
@@ -1,1 +1,1 @@
-926
+928
More information about the Erp5-report
mailing list