[MERGE]:purchase

bzr revid: apa@tinyerp.com-20121023071631-wngvblxpswu6khkp

addons/account/account_invoice.py

@@ -217,7 +217,7 @@ class account_invoice(osv.osv):
         'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}, select=True,
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
-        'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
+        'partner_id': fields.many2one('res.partner', 'Supplier', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]},
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. "\

addons/product_visible_discount/product_visible_discount.py

@@ -111,9 +111,11 @@ class account_invoice_line(osv.osv):
 
             if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
                 item = res_dict['item_id'].get(pricelist,False)
-                item_base = item_obj.read(cr, uid, [item], ['base'])[0]['base']
-                if item_base > 0:
-                    field_name = price_type_obj.browse(cr, uid, item_base).field
+                item_read = item_obj.read(cr, uid, [item], ['base'])
+                if item_read:
+                    item_base = item_read[0]['base']
+                    if item_base > 0:
+                        field_name = price_type_obj.browse(cr, uid, item_base).field
 
             product = product_obj.browse(cr, uid, product_id, context)
             product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)

addons/purchase/purchase_view.xml

@@ -451,7 +451,7 @@
             <field name="name">purchase.order.line.tree</field>
             <field name="model">purchase.order.line</field>
             <field name="arch" type="xml">
-                <tree string="Purchase Order Lines">
+                <tree string="Purchase Order Lines" create="false">
                     <field name="order_id"/>
                     <field name="name"/>
                     <field name="partner_id" string="Supplier" />
@@ -471,11 +471,11 @@
             <field name="model">purchase.order.line</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Purchase Order Line" version="7.0">
+                <form string="Purchase Order Line" version="7.0" create="false">
                     <sheet>
                         <label for="order_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="order_id" class="oe_inline"/>
+                            <field name="order_id" class="oe_inline" domain="[('invoice_method','=','manual')]" />
                             <label string="," attrs="{'invisible':[('date_order','=',False)]}"/>
                             <field name="date_order" class="oe_inline"/>
                         </h1>

addons/purchase/stock_view.xml

@@ -18,7 +18,7 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='date']" position="before">
-                    <field name="purchase_id"/>
+                    <field name="purchase_id" context="{'search_default_partner_id':partner_id,'default_partner_id':partner_id}"/>
                 </xpath>
                 <xpath expr="//field[@name='company_id']" position="after">
                     <field name="warehouse_id" groups="stock.group_locations"/>