From ad61a880bf166d953d38774c437ec8b69bde7b3e Mon Sep 17 00:00:00 2001
From: "ARA (OpenERP)" <ara@tinyerp.com>
Date: Wed, 28 Sep 2011 17:43:31 +0530
Subject: [PATCH] [FIX] hr-expense : incmplete handling of canceld and reopened
 invoices

lp bug: https://launchpad.net/bugs/808704 fixed

bzr revid: ara@tinyerp.com-20110928121331-p3x76mmel6ity9fs
---
 addons/hr_expense/hr_expense.py           |  5 +++++
 addons/hr_expense/hr_expense_view.xml     |  1 +
 addons/hr_expense/hr_expense_workflow.xml | 20 ++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 2dc6ad090ac..b671705d769 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -82,6 +82,7 @@ class hr_expense_expense(osv.osv):
             ('accepted', 'Approved'),
             ('invoiced', 'Invoiced'),
             ('paid', 'Reimbursed'),
+            ('invoice_except', 'Invoice Exception'),
             ('cancelled', 'Refused')],
             'State', readonly=True, help='When the expense request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Confirmation\'.\
             \nIf the admin accepts it, the state is \'Accepted\'.\n If an invoice is made for the expense request, the state is \'Invoiced\'.\n If the expense is paid to user, the state is \'Reimbursed\'.'),
@@ -224,6 +225,10 @@ class hr_expense_expense(osv.osv):
             res = inv_id
         return res
 
+    def action_invoice_cancel(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'invoice_except'}, context=context)
+        return True
+
 hr_expense_expense()
 
 class product_product(osv.osv):
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 786dc6beee2..a832191bb90 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -106,6 +106,7 @@
                                 <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
                                 <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"/>
+                                <button name="invoice_recreate_hr_expense" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
                             </group>
                         </page>
                         <page string="Other Info" groups="base.group_extended">
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 7946bef3b6b..457b0a10b38 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -55,6 +55,13 @@
             <field name="action">action_invoice_create()</field>
         </record>
 
+        <record id="act_invoice_except" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_expenses"/>
+            <field name="name">invoice_except</field>
+            <field name="kind">function</field>
+            <field name="action">action_invoice_cancel()</field>
+        </record>
+
         <record id="t1" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirm"/>
@@ -117,5 +124,18 @@
             <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
+        <record id="t12" model="workflow.transition">
+            <field name="act_from" ref="act_invoice"/>
+            <field name="act_to" ref="act_invoice_except"/>
+            <field name="signal">subflow.cancel</field>
+            <field name="group_id" ref="base.group_hr_user"/>
+        </record>
+
+        <record id="t13" model="workflow.transition">
+            <field name="act_from" ref="act_invoice_except"/>
+            <field name="act_to" ref="act_invoice"/>
+            <field name="signal">invoice_recreate_hr_expense</field>
+        </record>
+
     </data>
 </openerp>