[MERGE] Merge lp:~openerp-dev/openobject-addons/ron-dev-addons

bzr revid: sbh@tinyerp.com-20101229112714-nwewmpad0dkwurkf
2010-12-29 16:57:14 +05:30
parent 6e725393de c0771e8554
commit 4367b52c56
2 changed files with 2 additions and 2 deletions
@@ -223,7 +223,7 @@ class product_pricelist(osv.osv):
                        'AND (min_quantity IS NULL OR min_quantity <= %s) '
                        'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
                    'ORDER BY sequence',
-                    (tmpl_id, product_id, pricelist_id, qty))
+                    (tmpl_id, product_id, plversion_ids[0], qty))
                res1 = cr.dictfetchall()
                uom_price_already_computed = False
                for res in res1:
@@ -132,7 +132,7 @@
                </calendar>
            </field>
        </record>
-        <record model="ir.ui.view" id="view_purchase_order_graph">
+        <record model="ir.ui.view" id="purchase_order_graph">
            <field name="name">purchase.order.graph</field>
            <field name="model">purchase.order</field>
            <field name="type">graph</field>