[Erp5-report] r25234 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jan 21 15:40:02 CET 2009
Author: mame
Date: Wed Jan 21 15:39:55 2009
New Revision: 25234
URL: http://svn.erp5.org?rev=25234&view=rev
Log:
2009-01-21 mame
* modified fast input to only display of quantity unit of resource entered in the fast input
Added:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderLine_getQuantityUnitItemList.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_variation_category_list.xml
Modified:
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_getFastInputSaleOrderLineList.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_setSaleOrderLineList.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.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/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_quantity_unit.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_total_price.xml
erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/my_total_price.xml
erp5/trunk/bt5/erp5_trade/bt/revision
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderLine_getQuantityUnitItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderLine_getQuantityUnitItemList.xml?rev=25234&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderLine_getQuantityUnitItemList.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderLine_getQuantityUnitItemList.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -1,0 +1,149 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>"""\n
+This script returns only the quantity unit of the resource \n
+entered on the fast input\n
+"""\n
+request = context.REQUEST\n
+result = getattr(context.portal_categories[\'quantity_unit\'], \n
+ context.portal_preferences.getPreference(\n
+ \'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(\n
+ base=0, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')\n
+\n
+pr_title= request.form.get("field_listbox_title_%s"%context.getUid())\n
+if pr_title not in (\'\',None):\n
+ q_list = [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0)) \n
+ for x in context.getResourceValue().getQuantityUnitValueList()]\n
+ result=[]\n
+ result = [q_list[0]]\n
+return result\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>request</string>
+ <string>getattr</string>
+ <string>_getitem_</string>
+ <string>result</string>
+ <string>pr_title</string>
+ <string>None</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>_getiter_</string>
+ <string>x</string>
+ <string>q_list</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>SaleOrderLine_getQuantityUnitItemList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_getFastInputSaleOrderLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_getFastInputSaleOrderLineList.xml?rev=25234&r1=25233&r2=25234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_getFastInputSaleOrderLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_getFastInputSaleOrderLineList.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -61,31 +61,52 @@
"""\n
from Products.ERP5Type.Document import newTempBase\n
portal = context.getPortalObject()\n
+getobject = portal.portal_catalog.getobject\n
request = context.REQUEST\n
-listbox = getattr(request, \'listbox\', None) \n
-\n
+sale_order = context\n
result = []\n
line_list = context.contentValues(portal_type=\'Sale Order Line\')\n
source_section = context.getSourceSectionValue()\n
-\n
len_line_list = len(line_list)\n
-if len(line_list)!=0:\n
+if len_line_list!=0:\n
for line in line_list:\n
- obj = newTempBase(portal, id="tmp_item_%s" % line.getId(), uid="tmp_item_%s" % line.getId()) \n
+ obj=sale_order.newContent(portal_type=\'Sale Order Line\',\n
+ id=line.getId(),\n
+ uid="new_%s" % line.getId(),\n
+ temp_object=1,\n
+ is_indexable=0,)\n
+ #obj = newTempBase(portal, id="new_%s" % line.getId(), uid="new_%s" % line.getId()) \n
obj.edit(title=line.getResourceTitle(),\n
+ reference=line.getResourceReference(),\n
quantity=line.getQuantity(),\n
- quantity_unit=line.getQuantityUnit(),\n
+ quantity_unit=line.getQuantityUnitList(),\n
total_price=line.getTotalPrice(),\n
getAvailableInventory=line.getResourceValue().getAvailableInventory(\n
- node_uid=source_section.getUid()),\n
+ section_uid=source_section.getUid(),\n
+ variation_text=line.getVariationText()),\n
getCurrentInventory=line.getResourceValue().getCurrentInventory(\n
- node_uid=source_section.getUid()),\n
+ section_uid=source_section.getUid(),\n
+ variation_text=line.getVariationText()),\n
inventory=line.getResourceValue().getInventory(\n
- node_uid=source_section.getUid()))\n
+ section_uid=source_section.getUid(),\n
+ variation_text=line.getVariationText()))\n
result.append(obj)\n
+\n
for i in range(len_line_list+1,lines_num+1):\n
- obj = newTempBase(portal, id="tmp_item_%s" % i, uid="tmp_item_%s" % i)\n
+ resource_relative_url = getattr(request,"field_listbox_resource_relative_url_new_%s"%i,None)\n
+ obj=sale_order.newContent(portal_type=\'Sale Order Line\',\n
+ id=i,\n
+ uid="new_%s" % i,\n
+ temp_object=1,\n
+ getAvailableInventory=0,\n
+ getCurrentInventory=0,\n
+ is_indexable=0,)\n
+ #obj = newTempBase(portal,id="new_%s" % i, uid="new_%s" % i)\n
+ if resource_relative_url not in (\'\',None):\n
+ resource = context.restrictedTraverse(resource_relative_url) \n
+ obj.setResourceValue(resource)\n
result.append(obj)\n
+ \n
return result\n
</string> </value>
</item>
@@ -130,10 +151,9 @@
<string>_getattr_</string>
<string>context</string>
<string>portal</string>
+ <string>getobject</string>
<string>request</string>
- <string>getattr</string>
- <string>None</string>
- <string>listbox</string>
+ <string>sale_order</string>
<string>result</string>
<string>line_list</string>
<string>source_section</string>
@@ -144,6 +164,10 @@
<string>obj</string>
<string>range</string>
<string>i</string>
+ <string>getattr</string>
+ <string>None</string>
+ <string>resource_relative_url</string>
+ <string>resource</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_setSaleOrderLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_setSaleOrderLineList.xml?rev=25234&r1=25233&r2=25234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_setSaleOrderLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_setSaleOrderLineList.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -58,7 +58,7 @@
input information.It should take into account any sale order line \n
which were already created so that they are not duplicated.\n
"""\n
-\n
+from Products.ERP5Type.Message import translateString\n
result_list = []\n
sale_order_line_list = context.contentValues(portal_type=\'Sale Order Line\')\n
if sale_order_line_list!=[]:\n
@@ -66,12 +66,13 @@
for line in listbox:\n
#for each line in listbox if line has a reference defined, search \n
#for the product whose reference has been entered\n
- if line.has_key(\'listbox_key\') and line[\'reference\'] not in (\'\', None):\n
- line_id = line[\'listbox_key\'].split(\'/erp5/tmp_item_\')[1]\n
- product_list = [x.getObject() for x in context.portal_catalog(\n
- portal_type=\'Product\',\n
- reference=line[\'reference\'])]\n
- product = product_list[0]\n
+ if line.has_key(\'listbox_key\') and line[\'title\'] not in (\'\', None):\n
+ line_id = line[\'listbox_key\']\n
+ product = context.portal_catalog.getResultValue(\n
+ portal_type=[\'Product\',\'Service\'],\n
+ title=line[\'title\'],\n
+ reference=line[\'reference\'])\n
+ \n
#for each sale order line already added,\n
#if the line\'s id is the same as the sale order line, update it\n
for sale_order_line in sale_order_line_list:\n
@@ -83,26 +84,61 @@
quantity = line["quantity"],\n
quantity_unit = product.getQuantityUnit(),)\n
sale_order_line.setResourceValue(product)\n
+ if line["variation_category_list"]!=\'\':\n
+ sale_order_line.setVariationCategoryList([\'variation/%s\'%line["variation_category_list"]])\n
+ base_id = \'movement\'\n
+ cell_key_list = list(sale_order_line.getCellKeyList(base_id=base_id))\n
+ cell_key_list.sort()\n
+ price = line[\'total_price\']/line[\'quantity\']\n
+ quantity = line[\'quantity\']\n
+ for cell_key in cell_key_list:\n
+ cell = sale_order_line.newCell(base_id=base_id, \\\n
+ portal_type=\'Sale Order Cell\', *cell_key)\n
+ cell.edit(mapped_value_property_list=[\'price\',\'quantity\'],\n
+ price=price, quantity=quantity,\n
+ predicate_category_list=cell_key,\n
+ variation_category_list=cell_key)\n
+ price += 1\n
+ quantity += 1\n
result_list.append(sale_order_line)\n
else:\n
# if there was no sale order line already defined\n
# for the sale order, add a new sale order line\n
+ context.log("it goes in here second")\n
if len(sale_order_line_list)==0 or line_id not in sale_order_line_id_list:\n
sale_order_line= context.newContent(\n
portal_type=\'Sale Order Line\',)\n
+ sale_order_line.setResourceValue(product)\n
+ \n
sale_order_line.edit(\n
start_date=context.getStartDate(),\n
stop_date=context.getStopDate(),\n
resource_title=product.getTitle(),\n
price_currency = context.getPriceCurrency(),\n
quantity = line["quantity"],\n
- quantity_unit = product.getQuantityUnit(),)\n
- sale_order_line.setResourceValue(product)\n
+ )\n
+ if line["variation_category_list"]!=\'\':\n
+ sale_order_line.setVariationCategoryList([\'variation/%s\'%line["variation_category_list"]])\n
+ base_id = \'movement\'\n
+ cell_key_list = list(sale_order_line.getCellKeyList(base_id=base_id))\n
+ cell_key_list.sort()\n
+ price = line[\'total_price\']/line[\'quantity\']\n
+ quantity = line[\'quantity\']\n
+ for cell_key in cell_key_list:\n
+ cell = sale_order_line.newCell(base_id=base_id, \\\n
+ portal_type=\'Sale Order Cell\', *cell_key)\n
+ cell.edit(mapped_value_property_list=[\'price\',\'quantity\'],\n
+ price=price, quantity=quantity,\n
+ predicate_category_list=cell_key,\n
+ variation_category_list=cell_key)\n
+ price += 1\n
+ quantity += 1\n
result_list.append(sale_order_line)\n
- \n
+ \n
+\n
#return to the feature module\n
-context.REQUEST.response.redirect(\n
- \'%s/view?portal_status_message=%s\' % (context.absolute_url(), \'Sale Order Lines created.\'.replace(\' \', \'%20\')))\n
+return context.Base_redirect(form_id, keep_items=dict(\n
+ portal_status_message=translateString(\'Sale Order Lines Created.\')))\n
</string> </value>
</item>
<item>
@@ -113,7 +149,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>listbox=None, **kw</string> </value>
+ <value> <string>listbox=[], form_id=\'view\',**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -133,14 +169,17 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>listbox</string>
+ <string>form_id</string>
<string>kw</string>
+ <string>Products.ERP5Type.Message</string>
+ <string>translateString</string>
<string>result_list</string>
<string>_getattr_</string>
<string>context</string>
@@ -154,10 +193,19 @@
<string>_getitem_</string>
<string>None</string>
<string>line_id</string>
- <string>product_list</string>
<string>product</string>
<string>sale_order_line</string>
+ <string>base_id</string>
+ <string>list</string>
+ <string>cell_key_list</string>
+ <string>price</string>
+ <string>quantity</string>
+ <string>cell_key</string>
+ <string>_apply_</string>
+ <string>cell</string>
+ <string>_inplacevar_</string>
<string>len</string>
+ <string>dict</string>
</tuple>
</value>
</item>
@@ -170,7 +218,8 @@
<key> <string>func_defaults</string> </key>
<value>
<tuple>
- <none/>
+ <list/>
+ <string>view</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml?rev=25234&r1=25233&r2=25234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_updateSaleOrderLineList.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -62,39 +62,72 @@
the total price and the stock corresponding to the \n
product\n
"""\n
-request = context.REQUEST\n
+result = [x.getObject() for x in context.SaleOrder_getFastInputSaleOrderLineList(lines_num=12, **kw)]\n
+\n
+request= context.REQUEST\n
+\n
portal = context.getPortalObject()\n
Base_translateString = portal.Base_translateString\n
total_price = 0.0\n
-portal = context.getPortalObject()\n
for line in listbox:\n
if line.has_key(\'listbox_key\') and (line[\'title\'] or line[\'reference\'] not in (\'\', None)):\n
- product_list = context.portal_catalog(portal_type=\'Product\',\n
+ product = context.portal_catalog.getResultValue(\n
+ portal_type=[\'Product\',\'Service\'],\n
title=line[\'title\'],\n
reference=line[\'reference\'])\n
- product = product_list[0]\n
- if line[\'quantity\'] <= product.getAvailableInventory(\n
- node_uid=context.getSourceSectionValue().getUid()):\n
- line_id = line[\'listbox_key\'].split(\'/erp5/\')[1]\n
- line["total_price"] = line[\'quantity\'] * product.getSaleSupplyLineBasePrice()\n
- line["quantity_unit"] = product.getQuantityUnit()\n
- request.form["field_listbox_reference_%s"%line_id] = product.getReference()\n
- request.form["field_listbox_title_%s"%line_id] = product.getTitle()\n
- request.form["field_listbox_total_price_%s"%line_id] = line[\'quantity\'] * product.getPrice()\n
- request.form["field_listbox_quantity_unit_%s"%line_id] = product.getQuantityUnit()\n
- request.form["field_listbox_getAvailableInventory_%s"%line_id] = product.getAvailableInventory(\n
- node_uid=context.getSourceSectionValue().getUid())\n
- request.form[\'field_listbox_inventory_%s\'%line_id] = product.getInventory(\n
- node_uid=context.getSourceSectionValue().getUid())\n
- request.form["field_listbox_getCurrentInventory_%s"%line_id] = product.getCurrentInventory(\n
- node_uid=context.getSourceSectionValue().getUid())\n
- request.form["field_listbox_variation_category_item_list_%s"%line_id] =\\\n
- [x[0] for x in product.getVariationCategoryItemList()]\n
+ line_id = line[\'listbox_key\']\n
+ cell = result[int(line_id)-1]\n
+ cell.setResourceValue(product) \n
+ line["quantity_unit"] = cell.getQuantityUnit()\n
+ line["resource_relative_url"] = cell.getResourceRelativeUrl()\n
+ request.form["field_listbox_resource_relative_url_new_%s"%line_id]=cell.getResourceRelativeUrl()\n
+ kw["field_listbox_resource_relative_url_new_%s"%line_id]=cell.getResourceRelativeUrl()\n
+ request.set("field_listbox_resource_relative_url_new_%s"%line_id,cell.getResourceRelativeUrl())\n
+ request.form["field_listbox_reference_new_%s"%line_id] = product.getReference() or \'\'\n
+ request.form["field_listbox_title_new_%s"%line_id] = product.getTitle()\n
+ request.form["field_listbox_quantity_unit_new_%s"%line_id] = cell.getQuantityUnit()\n
+ \n
+ if line["variation_category_list"]!=\'\' and product.getPortalType()==\'Product\' and line[\'quantity\'] <= product.getAvailableInventory(\n
+ section_uid=context.getSourceSectionValue().getUid(),\n
+ variation_text=\'variation/%s\'%line["variation_category_list"]):\n
+ supply_cell_list = product.default_ssl.contentValues(portal_type=\'Sale Supply Cell\')\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
+ 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
+ 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
+ section_uid=context.getSourceSectionValue().getUid(),\n
+ variation_text=\'variation/%s\'%line["variation_category_list"])\n
+ total_price +=line[\'total_price\']\n
+ request.form["field_my_total_price"] = total_price\n
+ \n
+ elif line["variation_category_list"]==\'\' and product.getPortalType()==\'Product\' and line[\'quantity\'] <= product.getAvailableInventory(\n
+ section_uid=context.getSourceSectionValue().getUid()):\n
+ line["total_price"] = line[\'quantity\'] * cell.getPrice()\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
+ 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
+ section_uid=context.getSourceSectionValue().getUid(),)\n
+ total_price +=line[\'total_price\']\n
+ request.form["field_my_total_price"] = total_price\n
+ elif product.getPortalType()==\'Service\':\n
+ line["total_price"] = line[\'quantity\'] * cell.getPrice()\n
+ request.form["field_listbox_total_price_new_%s"%line_id] = line[\'total_price\']\n
total_price +=line[\'total_price\']\n
request.form["field_my_total_price"] = total_price\n
else:\n
- request.set(\'portal_status_message\', Base_translateString(\'Quantity Asked Not Available In Inventory\')) \n
- \n
+ request.set(\'portal_status_message\', \n
+ Base_translateString(\'Quantity Asked For Line %s Not Available In Inventory\'%line[\'listbox_key\'])) \n
+ \n
context.Base_updateDialogForm(listbox=listbox,update=1,kw=kw)\n
return context.SaleOrder_viewSaleOrderFastInputDialog(listbox=listbox,**kw)\n
@@ -109,7 +142,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>listbox=None,**kw</string> </value>
+ <value> <string>listbox=[],**kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -137,25 +170,29 @@
<tuple>
<string>listbox</string>
<string>kw</string>
+ <string>append</string>
+ <string>$append0</string>
+ <string>_getiter_</string>
+ <string>_apply_</string>
<string>_getattr_</string>
<string>context</string>
+ <string>x</string>
+ <string>result</string>
<string>request</string>
<string>portal</string>
<string>Base_translateString</string>
<string>total_price</string>
- <string>_getiter_</string>
<string>line</string>
<string>_getitem_</string>
<string>None</string>
- <string>product_list</string>
<string>product</string>
<string>line_id</string>
+ <string>int</string>
+ <string>cell</string>
<string>_write_</string>
- <string>append</string>
- <string>$append0</string>
- <string>x</string>
+ <string>supply_cell_list</string>
+ <string>supply_cell</string>
<string>_inplacevar_</string>
- <string>_apply_</string>
</tuple>
</value>
</item>
@@ -168,7 +205,7 @@
<key> <string>func_defaults</string> </key>
<value>
<tuple>
- <none/>
+ <list/>
</tuple>
</value>
</item>
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=25234&r1=25233&r2=25234&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] Wed Jan 21 15:39:55 2009
@@ -96,12 +96,13 @@
<string>listbox_reference</string>
<string>listbox_total_price</string>
<string>listbox_total_quantity</string>
+ <string>listbox_inventory</string>
+ <string>listbox_title</string>
+ <string>listbox_variation_category_list</string>
+ <string>listbox_getCurrentInventory</string>
<string>listbox_getAvailableInventory</string>
- <string>listbox_getCurrentInventory</string>
- <string>listbox_inventory</string>
- <string>listbox_variation_category_item_list</string>
- <string>listbox_title</string>
<string>listbox_quantity_unit</string>
+ <string>listbox_resource_relative_url</string>
</list>
</value>
</item>
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=25234&r1=25233&r2=25234&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] Wed Jan 21 15:39:55 2009
@@ -3,13 +3,30 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ListBox" module="Products.ERP5Form.ListBox"/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>title</string>
+ <string>columns</string>
+ <string>all_columns</string>
+ <string>search_columns</string>
+ <string>sort</string>
+ <string>list_method</string>
+ <string>selection_name</string>
+ <string>default_params</string>
+ <string>editable_columns</string>
+ <string>enabled</string>
+ </list>
+ </value>
+ </item>
+ <item>
<key> <string>id</string> </key>
<value> <string>listbox</string> </value>
</item>
@@ -29,50 +46,37 @@
<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>all_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>anchor</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<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>
- </item>
- <item>
<key> <string>default_params</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
</item>
@@ -81,23 +85,11 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -105,38 +97,10 @@
<value> <string></string> </value>
</item>
<item>
- <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>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>search_columns</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>select</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>selection_name</string> </key>
<value> <string></string> </value>
</item>
@@ -145,197 +109,38 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>sort_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>untranslatable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>url_columns</string> </key>
- <value> <string></string> </value>
- </item>
</dictionary>
</value>
</item>
<item>
- <key> <string>tales</string> </key>
+ <key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>all_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>anchor</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <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>
- </item>
- <item>
- <key> <string>default_params</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <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>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>search_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>select</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>selection_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>sort</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>sort_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>untranslatable_columns</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>url_columns</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>all_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
- <string>Title</string>
+ <string>Product or Service</string>
+ </tuple>
+ <tuple>
+ <string>resource_relative_url</string>
+ <string>Product or Service</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
- <string>variation_category_item_list</string>
+ <string>variation_category_list</string>
<string>Variation</string>
</tuple>
<tuple>
@@ -366,27 +171,23 @@
</value>
</item>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>anchor</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
- <string>Title</string>
+ <string>Product or Service</string>
+ </tuple>
+ <tuple>
+ <string>resource_relative_url</string>
+ <string>Product or Service</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
- <string>variation_category_item_list</string>
+ <string>variation_category_list</string>
<string>Variation</string>
</tuple>
<tuple>
@@ -417,54 +218,28 @@
</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>
- </item>
- <item>
<key> <string>default_params</string> </key>
<value>
<list/>
</value>
</item>
<item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>domain_root_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>domain_tree</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
<key> <string>editable_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
- <string>Title</string>
+ <string>Product or Service</string>
+ </tuple>
+ <tuple>
+ <string>resource_relative_url</string>
+ <string>Product or Service</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
- <string>variation_category_item_list</string>
- <string>Variation</string>
- </tuple>
- <tuple>
<string>quantity</string>
<string>Quantity</string>
</tuple>
@@ -473,6 +248,10 @@
<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>
@@ -496,26 +275,12 @@
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>global_attributes</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>lines</string> </key>
- <value> <int>20</int> </value>
- </item>
- <item>
- <key> <string>list_action</string> </key>
- <value> <string>list</string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_order_sub_lines_listbox</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>OrderLine_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
@@ -524,42 +289,12 @@
</value>
</item>
<item>
- <key> <string>meta_types</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>page_template</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>portal_types</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>report_root_list</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>report_tree</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>search</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
<key> <string>search_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
- <string>Title</string>
+ <string>Product or Service</string>
</tuple>
<tuple>
<string>reference</string>
@@ -573,12 +308,8 @@
</value>
</item>
<item>
- <key> <string>select</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
<key> <string>selection_name</string> </key>
- <value> <string></string> </value>
+ <value> <string>sale_order_fast_input_selection</string> </value>
</item>
<item>
<key> <string>sort</string> </key>
@@ -587,36 +318,12 @@
</value>
</item>
<item>
- <key> <string>sort_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>stat_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>stat_method</string> </key>
- <value> <string></string> </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>listbox</string> </value>
- </item>
- <item>
- <key> <string>untranslatable_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>url_columns</string> </key>
- <value>
- <list/>
- </value>
+ <value> <string>Define Sale Order Lines</string> </value>
</item>
</dictionary>
</value>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_quantity_unit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_quantity_unit.xml?rev=25234&r1=25233&r2=25234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_quantity_unit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_quantity_unit.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -3,12 +3,22 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>default</string>
+ <string>items</string>
+ <string>enabled</string>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_quantity_unit</string> </value>
@@ -21,14 +31,6 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</string> </value>
- </item>
- <item>
- <key> <string>unknown_selection</string> </key>
- <value> <string>You selected an item that was not in the list.</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -37,71 +39,15 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
+ <key> <string>extra_context</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>css_class</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</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>
- </item>
- <item>
- <key> <string>extra_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>first_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>items</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -112,23 +58,7 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -136,23 +66,15 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
+ <key> <string>extra_context</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>first_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
@@ -162,23 +84,7 @@
</value>
</item>
<item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -189,74 +95,32 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
<key> <string>default</string> </key>
<value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
+ <key> <string>extra_context</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_quantity_unit</string> </value>
</item>
<item>
- <key> <string>extra_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>first_item</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>DeliveryCell_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>my_quantity_unit</string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
</item>
</dictionary>
</value>
@@ -275,7 +139,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:getattr(here.portal_categories[\'quantity_unit\'], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(base=0, local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
+ <value> <string>python:cell.SaleOrderLine_getQuantityUnitItemList()</string> </value>
</item>
</dictionary>
</pickle>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml?rev=25234&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_resource_relative_url.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -1,0 +1,141 @@
+<?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>
+ <string>title</string>
+ <string>default</string>
+ <string>items</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_resource_relative_url</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>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <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>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</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>
+ <item>
+ <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>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>
+ <value> <string>Resource Relative Url</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </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>python: [(\'\', \'\')] + [(x.getTitle(), x.getRelativeUrl()) for x in here.portal_catalog(portal_type=[\'Product\',\'Service\'])]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_total_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_total_price.xml?rev=25234&r1=25233&r2=25234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_total_price.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_total_price.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -62,6 +62,14 @@
<value> <string></string> </value>
</item>
<item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
Added: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_variation_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_variation_category_list.xml?rev=25234&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_variation_category_list.xml (added)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/listbox_variation_category_list.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -1,0 +1,283 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>listbox_variation_category_list</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>
+ <item>
+ <key> <string>required_not_found</string> </key>
+ <value> <string>Input is required but no input given.</string> </value>
+ </item>
+ <item>
+ <key> <string>unknown_selection</string> </key>
+ <value> <string>You selected an item that was not in the list.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</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>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</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>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra_item</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>first_item</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>size</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Variation</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </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>python: [(\'\', \'\')] + [(x.getTitle(), x.getRelativeUrl()) for x in here.portal_catalog(portal_type=[\'Product Individual Variation\',\'Service Individual Variation\'])]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/my_total_price.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/my_total_price.xml?rev=25234&r1=25233&r2=25234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/my_total_price.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_viewSaleOrderFastInputDialog/my_total_price.xml [utf8] Wed Jan 21 15:39:55 2009
@@ -65,7 +65,9 @@
</item>
<item>
<key> <string>precision</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>target</string> </key>
@@ -100,4 +102,20 @@
</dictionary>
</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>python: here.getQuantityPrecisionFromResource(here.getPriceCurrency())</string> </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=25234&r1=25233&r2=25234&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Wed Jan 21 15:39:55 2009
@@ -1,1 +1,1 @@
-571
+572
More information about the Erp5-report
mailing list