Merge lp:~openerp-dev/openobject-addons/trunk-bug-720629-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix the bug: HR - Invoicing an expense doesn't open the invoice form
https://bugs.launchpad.net/openobject-addons/+bug/720629

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

I can not get paid/refuse state of expense when related invoice got paid/cancel.
so with your diff workflow break.

Thanks,
mra

review: Needs Fixing

[Rifakat Husen (OpenERP) (rha-openerp)]

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

clicking on invoice button on expense it should open form view of created supplier invoice as like sale order.

and collect invoice ids and return with action like inv_ids and inv_ids[0] or False

review: Needs Fixing

[Rifakat Husen (OpenERP) (rha-openerp)]

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

remove exception: raise osv.except_osv(_('Error'), _('No Invoices were created'))

and use view mode only "form" not "tree form"

review: Needs Fixing

[Rifakat Husen (OpenERP) (rha-openerp)]

review: Needs Resubmitting

[Rifakat Husen (OpenERP) (rha-openerp)]

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

i improved:
1) _('Supplier Invoices') for translability
2)
- 'view_mode': 'form',
+ 'view_mode': 'form,tree',
to allwo to switch in tree view after processing that invoice

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2011-01-31 08:05:56 +0000
+++ hr_expense/hr_expense.py	2011-02-25 14:06:55 +0000
@@ -124,6 +124,28 @@
         self.write(cr, uid, ids, {'state':'paid'})
         return True
 
+    def invoice(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        mod_obj = self.pool.get('ir.model.data')
+        res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
+        res_id = res and res[1] or False,
+        inv_ids = []
+        for id in ids:
+            wf_service.trg_validate(uid, 'hr.expense.expense', id, 'invoice', cr)
+            inv_ids.append(self.browse(cr, uid, id).invoice_id.id)
+        return {
+            'name': _('Supplier Invoices'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'view_id': [res_id],
+            'res_model': 'account.invoice',
+            'context': "{'type':'out_invoice', 'journal_type': 'purchase'}",
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'res_id': inv_ids and inv_ids[0] or False,
+        }
+
     def action_invoice_create(self, cr, uid, ids):
         res = False
         invoice_obj = self.pool.get('account.invoice')
 
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2011-01-17 20:54:13 +0000
+++ hr_expense/hr_expense_view.xml	2011-02-25 14:06:55 +0000
@@ -104,7 +104,7 @@
                                 <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
                                 <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
                                 <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
-                                <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
+                                <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
                                 <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
                             </group>
                         </page>