Commit 7b114223 authored by Sebastien Robin's avatar Sebastien Robin

2010-05-20 Seb

* finish to proxy SaleOrder_viewSaleOrderFastInputDialog
* rename two fields because field id should not use method names

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35478 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3d70feff
......@@ -97,15 +97,15 @@ for line in listbox:\n
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 @@ for line in listbox:\n
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
......
......@@ -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>
......
......@@ -13,13 +13,13 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>columns</string>
<string>editable_columns</string>
<string>title</string>
<string>search_columns</string>
<string>selection_name</string>
<string>list_method</string>
<string>columns</string>
<string>portal_types</string>
<string>search_columns</string>
<string>selection_name</string>
<string>title</string>
</list>
</value>
</item>
......@@ -115,11 +115,11 @@
<string>Total Price</string>
</tuple>
<tuple>
<string>getCurrentInventory</string>
<string>current_quantity</string>
<string>Current</string>
</tuple>
<tuple>
<string>getAvailableInventory</string>
<string>available_quantity</string>
<string>Available</string>
</tuple>
<tuple>
......@@ -186,6 +186,12 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>search_columns</string> </key>
<value>
......
<?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>
<?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>
926
\ No newline at end of file
928
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment