merge

bzr revid: nch@tinyerp.com-20081015051827-tfmjjbfkraxr58qo
bzr revid: nch@tinyerp.com-20081020060859-r201bb8npb8ykx2u
bzr revid: nch@tinyerp.com-20081021063959-35cp2w8a27zidn3a

diff --cc addons/purchase/purchase.py
index 5fac8ea,170bf2d..fc7edc9
--- 1/addons/purchase/purchase.py
--- 2/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@@ -264,25 -264,16 +264,25 @@@ class purchase_order(osv.osv)
                         })
      def inv_line_create(self,a,ol):
          return (0, False, {
-                     'name': ol.name,
-                     'account_id': a,
-                     'price_unit': ol.price_unit or 0.0,
-                     'quantity': ol.product_qty,
-                     'product_id': ol.product_id.id or False,
-                     'uos_id': ol.product_uom.id or False,
-                     'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
-                     'account_analytic_id': ol.account_analytic_id.id,
-                 })
+             'name': ol.name,
+             'account_id': a,
+             'price_unit': ol.price_unit or 0.0,
+             'quantity': ol.product_qty,
+             'product_id': ol.product_id.id or False,
+             'uos_id': ol.product_uom.id or False,
+             'invoice_line_tax_id': [(6, 0, [x.id for x in ol.taxes_id])],
+             'account_analytic_id': ol.account_analytic_id.id,
+         })
  
 +    def action_cancel_draft(self, cr, uid, ids, *args):
 +        if not len(ids):
 +            return False
 +        self.write(cr, uid, ids, {'state':'draft','shipped':0})
 +        wf_service = netsvc.LocalService("workflow")
 +        for p_id in ids:
 +            wf_service.trg_create(uid, 'purchase.order', p_id, cr)
 +        return True
 +
      def action_invoice_create(self, cr, uid, ids, *args):
          res = False
          for o in self.browse(cr, uid, ids):

diff --cc addons/purchase/purchase_view.xml
Simple merge