[Erp5-report] r25018 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jan 6 10:10:43 CET 2009
Author: mame
Date: Tue Jan 6 10:10:41 2009
New Revision: 25018
URL: http://svn.erp5.org?rev=25018&view=rev
Log:
2009-01-06 mame
*modify scripts to only display product inventory for the source section defined in the sale order
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/bt/revision
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=25018&r1=25017&r2=25018&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] Tue Jan 6 10:10:41 2009
@@ -66,6 +66,7 @@
\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
@@ -75,9 +76,12 @@
quantity=line.getQuantity(),\n
quantity_unit=line.getQuantityUnit(),\n
total_price=line.getTotalPrice(),\n
- getAvailableInventory=line.getResourceValue().getAvailableInventory(),\n
- getCurrentInventory=line.getResourceValue().getCurrentInventory(),\n
- inventory=line.getResourceValue().getInventory())\n
+ getAvailableInventory=line.getResourceValue().getAvailableInventory(\n
+ node_uid=source_section.getUid()),\n
+ getCurrentInventory=line.getResourceValue().getCurrentInventory(\n
+ node_uid=source_section.getUid()),\n
+ inventory=line.getResourceValue().getInventory(\n
+ node_uid=source_section.getUid()))\n
result.append(obj)\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
@@ -132,6 +136,7 @@
<string>listbox</string>
<string>result</string>
<string>line_list</string>
+ <string>source_section</string>
<string>len</string>
<string>len_line_list</string>
<string>_getiter_</string>
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=25018&r1=25017&r2=25018&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] Tue Jan 6 10:10:41 2009
@@ -58,6 +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
result_list = []\n
sale_order_line_list = context.contentValues(portal_type=\'Sale Order Line\')\n
if sale_order_line_list!=[]:\n
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=25018&r1=25017&r2=25018&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] Tue Jan 6 10:10:41 2009
@@ -73,17 +73,21 @@
title=line[\'title\'],\n
reference=line[\'reference\'])\n
product = product_list[0]\n
- if line[\'quantity\'] <= product.getAvailableInventory():\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.getPrice()\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
- request.form[\'field_listbox_inventory_%s\'%line_id] = product.getInventory()\n
- request.form["field_listbox_getCurrentInventory_%s"%line_id] = product.getCurrentInventory()\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
total_price +=line[\'total_price\']\n
Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=25018&r1=25017&r2=25018&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Tue Jan 6 10:10:41 2009
@@ -1,1 +1,1 @@
-557
+560
More information about the Erp5-report
mailing list