Merge lp:~camptocamp/openobject-addons/hr_expense_cancelling into lp:openobject-addons/7.0

[Yannick Vaucher @ Camptocamp]

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

See reviews in https://code.launchpad.net/~camptocamp/ocb-addons/hr_expense_cancelling/+merge/183399

review: Needs Fixing (code, no test)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Made fixes

review: Approve

Unmerged revisions

9296. By Yannick Vaucher @ Camptocamp on 2013-09-02

[PEP8]

9295. By Yannick Vaucher @ Camptocamp on 2013-09-02

[FIX] add missing context

9294. By Yannick Vaucher @ Camptocamp on 2013-09-02

[FIX] call workflow even when account_move_id is not set

9293. By Yannick Vaucher @ Camptocamp on 2013-09-02

[IMP] remove trailing spaces

9292. By Vincent Renaville@camptocamp on 2013-07-10

[FIX] Allow to cancel an expense

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2013-05-22 17:49:45 +0000
+++ hr_expense/hr_expense.py	2013-09-02 09:43:57 +0000
@@ -227,6 +227,24 @@
             total_currency -= i['amount_currency'] or i['price']
         return total, total_currency, account_move_lines
 
+    def action_expense_cancel(self, cr, uid, ids, context=None):
+        ## We will first check the the move is not reconciled
+        for expense in self.browse(cr, uid, ids, context=context):
+            if expense.account_move_id:
+                for move_line in expense.account_move_id.line_id:
+                    if move_line.reconcile_id or move_line.reconcile_partial_id:
+                         raise osv.except_osv(
+                                 _('Error!'),
+                                 _('Please unreconcile payment accounting entries before cancelling this expense'))
+                ### Then we unlink the move line
+                self.pool.get('account.move').unlink(cr, uid, [expense.account_move_id.id], context=context)
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_delete(uid, 'hr.expense.expense', expense.id, cr)
+            wf_service.trg_create(uid, 'hr.expense.expense', expense.id, cr)
+            wf_service.trg_validate(uid, 'hr.expense.expense', expense.id, 'draft', cr)
+
+        return True
+
 
     def action_receipt_create(self, cr, uid, ids, context=None):
         '''

=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2013-07-02 13:14:56 +0000
+++ hr_expense/hr_expense_view.xml	2013-09-02 09:43:57 +0000
@@ -67,6 +67,7 @@
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
                     <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
+                    <button name="action_expense_cancel" states="done,paid" string="Cancel Expense" type="object" />
                     <button name="action_view_receipt" states="done" string="Open Accounting Entries" type="object" groups="account.group_account_invoice"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done,paid" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>