[Erp5-report] r40797 nicolas - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Nov 26 16:46:58 2010
New Revision: 40797

URL: http://svn.erp5.org?rev=40797&view=rev
Log:
Much better with or.
This enable listing of quantity_unit item list on 'Update Lines' fast input.
because resource is defined on line, so there is no need to querying for a new resource (first condition)

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderLine_getQuantityUnitItemList.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: 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=40797&r1=40796&r2=40797&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderLine_getQuantityUnitItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrderLine_getQuantityUnitItemList.xml [utf8] Fri Nov 26 16:46:58 2010
@@ -70,7 +70,7 @@ resource_title = request.form.get("field
 resource_reference = request.form.get("field_listbox_reference_%s" % context.getUid())\n
 resource_value = context.getResourceValue()\n
 result = [(\'\', \'\')]\n
-if (resource_title or resource_reference) and resource_value is not None:\n
+if (resource_title or resource_reference) or resource_value is not None:\n
  quantity_unit_list = [(x.getLogicalPath(), x.getCategoryRelativeUrl(base=0))\n
                 for x in resource_value.getQuantityUnitValueList()]\n
  # return the first quantity_unit item of resource\n

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=40797&r1=40796&r2=40797&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Fri Nov 26 16:46:58 2010
@@ -1 +1 @@
-1044
\ No newline at end of file
+1045
\ No newline at end of file