From 4ecf6fef06226e3841ce449e408d65a68675ad7c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 11 Jul 2012 18:43:47 +0530
Subject: [PATCH 01/40] [IMP] hr_expense : After the confirmation of the
 expense, the button should create an account.voucher (instead of an invoice)
 and confirmed it. It must creates the accounting entries exactly as the
 current invoice does.

bzr revid: mdi@tinyerp.com-20120711131347-4uj73ojgrrfcdjd1
---
 addons/hr_expense/__openerp__.py              |  2 +-
 addons/hr_expense/hr_expense.py               | 83 +++++++++----------
 addons/hr_expense/hr_expense_view.xml         |  2 +-
 addons/hr_expense/hr_expense_workflow.xml     |  6 +-
 addons/hr_expense/report/hr_expense_report.py |  8 +-
 .../report/hr_expense_report_view.xml         |  2 +-
 6 files changed, 47 insertions(+), 56 deletions(-)

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 2a1d302e094..d0265372b0c 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -43,7 +43,7 @@ re-invoice your customer's expenses if your work by project.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
-    'depends': ['hr', 'account'],
+    'depends': ['hr', 'account_voucher'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index b1192701dfb..d5f816268cb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -73,7 +73,7 @@ class hr_expense_expense(osv.osv):
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, string='Total Amount'),
-        'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
+        'voucher_id': fields.many2one('account.voucher', "Employee's Voucher"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -131,95 +131,86 @@ class hr_expense_expense(osv.osv):
         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_supplier_form')
-        inv_ids = []
+        wkf_service = netsvc.LocalService("workflow")
+        
+        if not ids: return []
+        exp = self.browse(cr, uid, ids[0], context=context)
+        
+        voucher_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)
+            wkf_service.trg_validate(uid, 'hr.expense.expense', id, 'invoice', cr)
+            voucher_ids.append(self.browse(cr, uid, id, context=context).voucher_id.id)
+        res = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
+        res_id = res and res[1] or False
         return {
-            'name': _('Supplier Invoices'),
             'view_type': 'form',
             'view_mode': 'form',
-            'view_id': [res and res[1] or False],
-            'res_model': 'account.invoice',
-            'context': "{'type':'out_invoice', 'journal_type': 'purchase'}",
+            'res_model': 'account.voucher',
+            'views': [(res_id, 'form')],
+            'view_id': res_id,
             'type': 'ir.actions.act_window',
+            'target': 'new',
             'nodestroy': True,
-            'target': 'current',
-            'res_id': inv_ids and inv_ids[0] or False,
+            'res_id': voucher_ids and voucher_ids[0] or False,
+            'close_after_process': True,
         }
-
-    def action_invoice_create(self, cr, uid, ids):
+    def action_voucher_create(self, cr, uid, ids, context=None):
         res = False
         invoice_obj = self.pool.get('account.invoice')
         property_obj = self.pool.get('ir.property')
         sequence_obj = self.pool.get('ir.sequence')
-        analytic_journal_obj = self.pool.get('account.analytic.journal')
         account_journal = self.pool.get('account.journal')
-        for exp in self.browse(cr, uid, ids):
+        voucher_obj = self.pool.get('account.voucher')
+        
+        for exp in self.browse(cr, uid, ids, context=None):
             company_id = exp.company_id.id
             lines = []
+            total = 0.0
             for l in exp.line_ids:
-                tax_id = []
                 if l.product_id:
                     acc = l.product_id.product_tmpl_id.property_account_expense
                     if not acc:
                         acc = l.product_id.categ_id.property_account_expense_categ
-                    tax_id = [x.id for x in l.product_id.supplier_taxes_id]
                 else:
                     acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
                     if not acc:
                         raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
+                
                 lines.append((0, False, {
                     'name': l.name,
                     'account_id': acc.id,
-                    'price_unit': l.unit_amount,
-                    'quantity': l.unit_quantity,
-                    'uos_id': l.uom_id.id,
-                    'product_id': l.product_id and l.product_id.id or False,
-                    'invoice_line_tax_id': tax_id and [(6, 0, tax_id)] or False,
-                    'account_analytic_id': l.analytic_account.id,
+                    'amount': l.unit_amount,
+                    'type': 'dr'
                 }))
+                total += l.unit_amount
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
             acc = exp.employee_id.address_home_id.property_account_payable.id
-            payment_term_id = exp.employee_id.address_home_id.property_payment_term.id
-            inv = {
+            voucher = {
                 'name': exp.name,
-                'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
+                'number': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
                 'account_id': acc,
-                'type': 'in_invoice',
+                'type': 'purchase',
                 'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
-                'origin': exp.name,
-                'invoice_line': lines,
+    #            'origin': exp.name,
+                'line_ids': lines,
                 'currency_id': exp.currency_id.id,
-                'payment_term': payment_term_id,
-                'fiscal_position': exp.employee_id.address_home_id.property_account_position.id
+                'amount': total
             }
-            if payment_term_id:
-                to_update = invoice_obj.onchange_payment_term_date_invoice(cr, uid, [], payment_term_id, None)
-                if to_update:
-                    inv.update(to_update['value'])
             journal = False
             if exp.journal_id:
-                inv['journal_id']=exp.journal_id.id
+                voucher['journal_id'] = exp.journal_id.id
                 journal = exp.journal_id
             else:
                 journal_id = invoice_obj._get_journal(cr, uid, context={'type': 'in_invoice', 'company_id': company_id})
                 if journal_id:
-                    inv['journal_id'] = journal_id
+                    voucher['journal_id'] = journal_id
                     journal = account_journal.browse(cr, uid, journal_id)
-            if journal and not journal.analytic_journal_id:
-                analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')])
-                if analytic_journal_ids:
-                    account_journal.write(cr, uid, [journal.id],{'analytic_journal_id':analytic_journal_ids[0]})
-            inv_id = invoice_obj.create(cr, uid, inv, {'type': 'in_invoice'})
-            invoice_obj.button_compute(cr, uid, [inv_id], {'type': 'in_invoice'}, set_total=True)
-            self.write(cr, uid, [exp.id], {'invoice_id': inv_id, 'state': 'invoiced'})
-            res = inv_id
+            voucher_id = voucher_obj.create(cr, uid, voucher, context)
+            aaa = self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'invoiced'})
+            res = voucher_id
         return res
 
 hr_expense_expense()
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b8868c3319f..f5967c39e21 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -116,7 +116,7 @@
                             <group>
                                 <group string="Accounting Data">
                                     <field name="journal_id"/>
-                                    <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
+                                    <field name="voucher_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 328a07879a4..730e6d21e5d 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -51,8 +51,8 @@
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">invoice</field>
             <field name="kind">subflow</field>
-            <field name="subflow_id" ref="account.wkf"/>
-            <field name="action">action_invoice_create()</field>
+            <field name="subflow_id" ref="account_voucher.wkf"/>
+            <field name="action">action_voucher_create()</field>
         </record>
 
         <record id="t1" model="workflow.transition">
@@ -99,7 +99,7 @@
         <record id="t9" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_paid"/>
-            <field name="signal">subflow.paid</field>
+            <field name="signal">subflow.done</field>
             <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index adef11f5269..52f155a8e9e 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -43,7 +43,7 @@ class hr_expense_report(osv.osv):
         'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True),
         'date_confirm': fields.date('Confirmation Date', readonly=True),
         'date_valid': fields.date('Validation Date', readonly=True),
-        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'voucher_id': fields.many2one('account.voucher', 'Voucher', readonly=True),
         'department_id':fields.many2one('hr.department','Department', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
@@ -78,8 +78,8 @@ class hr_expense_report(osv.osv):
                      s.currency_id,
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm,
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid,
-                     s.invoice_id,
-                     count(s.invoice_id) as invoiced,
+                     s.voucher_id,
+                     count(s.voucher_id) as invoiced,
                      s.user_valid as user_id,
                      s.department_id,
                      to_char(date_trunc('day',s.create_date), 'YYYY') as year,
@@ -109,7 +109,7 @@ class hr_expense_report(osv.osv):
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY'),
                      l.product_id,
                      l.analytic_account,
-                     s.invoice_id,
+                     s.voucher_id,
                      s.currency_id,
                      s.user_valid,
                      s.department_id,
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 7877edf4b3a..bfd73f8ed7d 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -13,7 +13,7 @@
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
-                <field name="invoice_id" invisible="1"/>
+                <field name="voucher_id" invisible="1"/>
                 <field name="analytic_account" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="department_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>

From 7ceed2bb9b25b516caa5128c21fab424a797dbc0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 12 Jul 2012 12:24:55 +0530
Subject: [PATCH 02/40] [IMP] hr_expense : Improved the test cases in
 accordance with voucher.

bzr revid: mdi@tinyerp.com-20120712065455-0xhhss2jcoo4cyxp
---
 addons/hr_expense/hr_expense.py            |  2 +-
 addons/hr_expense/test/expense_process.yml | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index d5f816268cb..5c8aed03d79 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -183,7 +183,7 @@ class hr_expense_expense(osv.osv):
                     'amount': l.unit_amount,
                     'type': 'dr'
                 }))
-                total += l.unit_amount
+                total += l.total_amount
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
             acc = exp.employee_id.address_home_id.property_account_payable.id
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index 5c8a9d53f7c..2f8fffb786d 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -17,22 +17,20 @@
   !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Approved state}:
     - state == 'accepted'
 -
-  I make Invoice for the expense.
+  I make Voucher for the expense.
 -
   !python {model: hr.expense.expense}: |
     self.invoice(cr, uid, [ref('sep_expenses')])
 -
-  I check invoice details.
+  I check voucher details.
 -
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
     assert sep_expenses.state == 'invoiced', "Expense should be in 'Invoiced' state."
-    assert sep_expenses.invoice_id, "Expense should have link of Invoice."
-    assert sep_expenses.invoice_id.currency_id == sep_expenses.currency_id,"Invoice currency is not correspond with supplier invoice currency"
-    assert sep_expenses.invoice_id.origin == sep_expenses.name,"Invoice origin is not correspond with supplier invoice"
-    assert sep_expenses.invoice_id.type == 'in_invoice', "Invoice type is not supplier invoice"
-    assert sep_expenses.invoice_id.amount_total == sep_expenses.amount,"Invoice total amount is not correspond with supplier invoice total"
-    assert len(sep_expenses.invoice_id.invoice_line) == len(sep_expenses.line_ids),"Lines of Invoice and supplier invoice Line are not correspond"
+    assert sep_expenses.voucher_id.name == sep_expenses.name,"Voucher name is not correspond with expense name."
+    assert sep_expenses.voucher_id.type == 'purchase', "Voucher type is not purchase voucher."
+    assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Voucher total amount is not correspond with expense total."
+    assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Voucher and expense line are not correspond."
     #TODO: check invoice line details with Expenses lines
 -
   I pay the expenses.

From 3512fd1be0b0aa640b8969e37de3348624c23828 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 12 Jul 2012 14:14:07 +0530
Subject: [PATCH 03/40] [IMP] hr_expense : Added 'Total Amount' field in form
 view.

bzr revid: mdi@tinyerp.com-20120712084407-s78a0udwp3ww4npd
---
 addons/hr_expense/hr_expense_view.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index f5967c39e21..a143a746667 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -109,8 +109,15 @@
                                     </group>
                                 </form>
                             </field>
-                            <separator string="Notes"/>
-                            <field name="note" placeholder="Free Notes"/>
+                            <group>
+                                <div>
+                                    <separator string="Notes"/>
+                                    <field name="note" placeholder="Free Notes"/>
+                                </div>
+                                <group class="oe_subtotal_footer">
+                                    <field name="amount"/>
+                                </group>
+                            </group>
                         </page>
                         <page string="Other Info">
                             <group>

From 85cf7c94fd69de1fd8bedbeba85ff7920709010d Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 12 Jul 2012 14:18:25 +0530
Subject: [PATCH 04/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120712084825-enistrb9u1fum2at
---
 addons/hr_expense/hr_expense.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 5c8aed03d79..3b8129914f3 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -180,7 +180,7 @@ class hr_expense_expense(osv.osv):
                 lines.append((0, False, {
                     'name': l.name,
                     'account_id': acc.id,
-                    'amount': l.unit_amount,
+                    'amount': l.total_amount,
                     'type': 'dr'
                 }))
                 total += l.total_amount
@@ -196,7 +196,6 @@ class hr_expense_expense(osv.osv):
                 'company_id': company_id,
     #            'origin': exp.name,
                 'line_ids': lines,
-                'currency_id': exp.currency_id.id,
                 'amount': total
             }
             journal = False

From a4e5ec5ce20ed54f5bdb7f71b948ffea90096ca9 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 12 Jul 2012 15:16:45 +0530
Subject: [PATCH 05/40] [IMP] hr_recruitment : Opens the purchase receipt form
 on voucher_id field.

bzr revid: mdi@tinyerp.com-20120712094645-4m86lvzxz4d4wjmx
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 addons/hr_expense/hr_expense_view.xml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index adb078fac22..2c3399da31c 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -222,7 +222,7 @@
             <field name="model">account.voucher</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+                <form string="Purchase Receipt" version="7.0">
                 <header>
                     <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index a143a746667..78e651f7c6e 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -123,7 +123,7 @@
                             <group>
                                 <group string="Accounting Data">
                                     <field name="journal_id"/>
-                                    <field name="voucher_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
+                                    <field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
                                 </group>
                             </group>
                         </page>

From d4e7e106bbcb67034d7de8ed5c364899464dd1e2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 12 Jul 2012 16:17:38 +0530
Subject: [PATCH 06/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120712104738-a362686jqyz116j9
---
 addons/hr_expense/hr_expense.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 3b8129914f3..bc150e194ff 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -144,6 +144,7 @@ class hr_expense_expense(osv.osv):
         res = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
         res_id = res and res[1] or False
         return {
+            'name': _('Purchase Receipt'),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'account.voucher',
@@ -153,7 +154,6 @@ class hr_expense_expense(osv.osv):
             'target': 'new',
             'nodestroy': True,
             'res_id': voucher_ids and voucher_ids[0] or False,
-            'close_after_process': True,
         }
     def action_voucher_create(self, cr, uid, ids, context=None):
         res = False
@@ -189,12 +189,11 @@ class hr_expense_expense(osv.osv):
             acc = exp.employee_id.address_home_id.property_account_payable.id
             voucher = {
                 'name': exp.name,
-                'number': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
+                'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
                 'account_id': acc,
                 'type': 'purchase',
                 'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
-    #            'origin': exp.name,
                 'line_ids': lines,
                 'amount': total
             }

From 00ec1afdf08f43f8c5ae1534a390f85b30044443 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 12 Jul 2012 17:03:46 +0530
Subject: [PATCH 07/40] [IMP] hr_improvement : Fix the journal used when the
 expense is paid.

bzr revid: mdi@tinyerp.com-20120712113346-47fkltrn5kyydmld
---
 addons/hr_expense/hr_expense.py       | 2 +-
 addons/hr_expense/hr_expense_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index bc150e194ff..edd7076dbb7 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -63,7 +63,7 @@ class hr_expense_expense(osv.osv):
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
         'date': fields.date('Date', select=True),
-        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
+        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is paid."),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'user_id': fields.many2one('res.users', 'User', required=True),
         'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 78e651f7c6e..99fbc2d8456 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -122,7 +122,7 @@
                         <page string="Other Info">
                             <group>
                                 <group string="Accounting Data">
-                                    <field name="journal_id"/>
+                                    <field name="journal_id" widget="selection" domain="[('type', 'in', ('purchase','purchase_refund'))]"/>
                                     <field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
                                 </group>
                             </group>

From 7a2e0463ddb6c72f764694c8e421e143f8f5be15 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Thu, 12 Jul 2012 17:55:56 +0530
Subject: [PATCH 08/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120712122556-p8bgyf0cqq4sfdi0
---
 addons/hr_expense/hr_expense.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index edd7076dbb7..ebe1bc0f109 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -131,12 +131,10 @@ class hr_expense_expense(osv.osv):
         return True
 
     def invoice(self, cr, uid, ids, context=None):
+        if not ids: return []
         mod_obj = self.pool.get('ir.model.data')
         wkf_service = netsvc.LocalService("workflow")
         
-        if not ids: return []
-        exp = self.browse(cr, uid, ids[0], context=context)
-        
         voucher_ids = []
         for id in ids:
             wkf_service.trg_validate(uid, 'hr.expense.expense', id, 'invoice', cr)

From 9fe6cdd4ee3700f13cb3604236a62bc15665b3bd Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 13 Jul 2012 17:08:12 +0530
Subject: [PATCH 09/40] [IMP] hr_expense : After the confirmation of the
 expense, the button should create an account.voucher (instead of an invoice)
 and confirmed it. It must creates the accounting entries exactly as the
 current invoice does and its related changes.

bzr revid: mdi@tinyerp.com-20120713113812-pv886hx31397viv5
---
 addons/hr_expense/hr_expense.py            | 28 ++++++++++++----------
 addons/hr_expense/hr_expense_view.xml      |  2 +-
 addons/hr_expense/hr_expense_workflow.xml  | 12 +++++-----
 addons/hr_expense/test/expense_process.yml |  6 ++---
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index ebe1bc0f109..d4c2dfbbf7d 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -40,12 +40,16 @@ class hr_expense_expense(osv.osv):
         if context is None:
             context = {}
         if not default: default = {}
-        default.update({'invoice_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False})
+        default.update({'voucher_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False})
         return super(hr_expense_expense, self).copy(cr, uid, id, default, context=context)
 
     def _amount(self, cr, uid, ids, field_name, arg, context=None):
-        cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN %s GROUP BY s.id ", (tuple(ids),))
-        res = dict(cr.fetchall())
+        res= {}
+        for expense in self.browse(cr, uid, ids, context=context):
+            total = 0.0
+            for line in expense.line_ids:
+                total += line.unit_amount * line.unit_quantity
+            res[expense.id] = total
         return res
 
     def _get_currency(self, cr, uid, context=None):
@@ -73,7 +77,7 @@ class hr_expense_expense(osv.osv):
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, string='Total Amount'),
-        'voucher_id': fields.many2one('account.voucher', "Employee's Voucher"),
+        'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -82,11 +86,11 @@ class hr_expense_expense(osv.osv):
             ('cancelled', 'Refused'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
-            ('invoiced', 'Invoiced'),
+            ('receipted', 'Receipted'),
             ('paid', 'Reimbursed')
             ],
             'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
-            \nIf the admin accepts it, the status is \'Accepted\'.\n If an invoice is made for the expense request, the status is \'Invoiced\'.\n If the expense is paid to user, the status is \'Reimbursed\'.'),
+            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Receipted\'.\n If the expense is paid to user, the status is \'Reimbursed\'.'),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
@@ -130,14 +134,14 @@ class hr_expense_expense(osv.osv):
         self.write(cr, uid, ids, {'state':'paid'})
         return True
 
-    def invoice(self, cr, uid, ids, context=None):
+    def receipt(self, cr, uid, ids, context=None):
         if not ids: return []
         mod_obj = self.pool.get('ir.model.data')
         wkf_service = netsvc.LocalService("workflow")
         
         voucher_ids = []
         for id in ids:
-            wkf_service.trg_validate(uid, 'hr.expense.expense', id, 'invoice', cr)
+            wkf_service.trg_validate(uid, 'hr.expense.expense', id, 'receipt', cr)
             voucher_ids.append(self.browse(cr, uid, id, context=context).voucher_id.id)
         res = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
         res_id = res and res[1] or False
@@ -153,9 +157,9 @@ class hr_expense_expense(osv.osv):
             'nodestroy': True,
             'res_id': voucher_ids and voucher_ids[0] or False,
         }
-    def action_voucher_create(self, cr, uid, ids, context=None):
+
+    def action_receipt_create(self, cr, uid, ids, context=None):
         res = False
-        invoice_obj = self.pool.get('account.invoice')
         property_obj = self.pool.get('ir.property')
         sequence_obj = self.pool.get('ir.sequence')
         account_journal = self.pool.get('account.journal')
@@ -200,12 +204,12 @@ class hr_expense_expense(osv.osv):
                 voucher['journal_id'] = exp.journal_id.id
                 journal = exp.journal_id
             else:
-                journal_id = invoice_obj._get_journal(cr, uid, context={'type': 'in_invoice', 'company_id': company_id})
+                journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
                 if journal_id:
                     voucher['journal_id'] = journal_id
                     journal = account_journal.browse(cr, uid, journal_id)
             voucher_id = voucher_obj.create(cr, uid, voucher, context)
-            aaa = self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'invoiced'})
+            self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'})
             res = voucher_id
         return res
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 99fbc2d8456..c45c743c1c8 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -68,7 +68,7 @@
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
-                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button name="receipt" states="accepted" string="Issue Receipt" type="object" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 730e6d21e5d..58eed45b1d2 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -47,12 +47,12 @@
             <field name="action">expense_canceled()</field>
         </record>
 
-        <record id="act_invoice" model="workflow.activity">
+        <record id="act_receipt" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
-            <field name="name">invoice</field>
+            <field name="name">receipt</field>
             <field name="kind">subflow</field>
             <field name="subflow_id" ref="account_voucher.wkf"/>
-            <field name="action">action_voucher_create()</field>
+            <field name="action">action_receipt_create()</field>
         </record>
 
         <record id="t1" model="workflow.transition">
@@ -91,13 +91,13 @@
 
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
-            <field name="act_to" ref="act_invoice"/>
-            <field name="signal">invoice</field>
+            <field name="act_to" ref="act_receipt"/>
+            <field name="signal">receipt</field>
             <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t9" model="workflow.transition">
-            <field name="act_from" ref="act_invoice"/>
+            <field name="act_from" ref="act_receipt"/>
             <field name="act_to" ref="act_paid"/>
             <field name="signal">subflow.done</field>
             <field name="group_id" ref="base.group_hr_user"/>
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index 2f8fffb786d..0ddbca537bf 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -20,18 +20,18 @@
   I make Voucher for the expense.
 -
   !python {model: hr.expense.expense}: |
-    self.invoice(cr, uid, [ref('sep_expenses')])
+    self.receipt(cr, uid, [ref('sep_expenses')])
 -
   I check voucher details.
 -
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
-    assert sep_expenses.state == 'invoiced', "Expense should be in 'Invoiced' state."
+    assert sep_expenses.state == 'receipted', "Expense should be in 'Receipted' state."
     assert sep_expenses.voucher_id.name == sep_expenses.name,"Voucher name is not correspond with expense name."
     assert sep_expenses.voucher_id.type == 'purchase', "Voucher type is not purchase voucher."
     assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Voucher total amount is not correspond with expense total."
     assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Voucher and expense line are not correspond."
-    #TODO: check invoice line details with Expenses lines
+
 -
   I pay the expenses.
 -

From 0fee0b9527a0e46bc55e04570a9570df4e4b174b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 13 Jul 2012 17:17:17 +0530
Subject: [PATCH 10/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120713114717-1gg9xygu4ut3nl64
---
 addons/hr_expense/hr_expense.py            | 20 ++++++++++----------
 addons/hr_expense/test/expense_process.yml | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index d4c2dfbbf7d..0e413c8e1fe 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -146,7 +146,7 @@ class hr_expense_expense(osv.osv):
         res = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
         res_id = res and res[1] or False
         return {
-            'name': _('Purchase Receipt'),
+            'name': _('Expense Receipt'),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'account.voucher',
@@ -169,23 +169,23 @@ class hr_expense_expense(osv.osv):
             company_id = exp.company_id.id
             lines = []
             total = 0.0
-            for l in exp.line_ids:
-                if l.product_id:
-                    acc = l.product_id.product_tmpl_id.property_account_expense
+            for line in exp.line_ids:
+                if line.product_id:
+                    acc = line.product_id.product_tmpl_id.property_account_expense
                     if not acc:
-                        acc = l.product_id.categ_id.property_account_expense_categ
+                        acc = line.product_id.categ_id.property_account_expense_categ
                 else:
                     acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
                     if not acc:
                         raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
                 
                 lines.append((0, False, {
-                    'name': l.name,
+                    'name': line.name,
                     'account_id': acc.id,
-                    'amount': l.total_amount,
+                    'amount': line.total_amount,
                     'type': 'dr'
                 }))
-                total += l.total_amount
+                total += line.total_amount
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
             acc = exp.employee_id.address_home_id.property_account_payable.id
@@ -207,9 +207,9 @@ class hr_expense_expense(osv.osv):
                 journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
                 if journal_id:
                     voucher['journal_id'] = journal_id
-                    journal = account_journal.browse(cr, uid, journal_id)
+                    journal = account_journal.browse(cr, uid, journal_id, context=context)
             voucher_id = voucher_obj.create(cr, uid, voucher, context)
-            self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'})
+            self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'}, context=context)
             res = voucher_id
         return res
 
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index 0ddbca537bf..65359de95ff 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -17,20 +17,20 @@
   !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Approved state}:
     - state == 'accepted'
 -
-  I make Voucher for the expense.
+  I make Receipt for the expense.
 -
   !python {model: hr.expense.expense}: |
     self.receipt(cr, uid, [ref('sep_expenses')])
 -
-  I check voucher details.
+  I check receipt details.
 -
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
     assert sep_expenses.state == 'receipted', "Expense should be in 'Receipted' state."
-    assert sep_expenses.voucher_id.name == sep_expenses.name,"Voucher name is not correspond with expense name."
-    assert sep_expenses.voucher_id.type == 'purchase', "Voucher type is not purchase voucher."
-    assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Voucher total amount is not correspond with expense total."
-    assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Voucher and expense line are not correspond."
+    assert sep_expenses.voucher_id.name == sep_expenses.name,"Receipt name is not correspond with expense name."
+    assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
+    assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."
+    assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Receipt and expense line are not correspond."
 
 -
   I pay the expenses.

From e068186c172120a210c0a3bd1194ccf0f95f19ea Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 13 Jul 2012 18:09:52 +0530
Subject: [PATCH 11/40] [IMP] hr_improvement : Added 'Open Receipt' button to
 open the receipt in 'receipted' state.

bzr revid: mdi@tinyerp.com-20120713123952-gr48p943v6rjon57
---
 addons/hr_expense/hr_expense.py       | 19 +++++++++++++++++++
 addons/hr_expense/hr_expense_view.xml |  1 +
 2 files changed, 20 insertions(+)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 0e413c8e1fe..ee2c92cf483 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -212,6 +212,25 @@ class hr_expense_expense(osv.osv):
             self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'}, context=context)
             res = voucher_id
         return res
+    
+    def action_view_receipt(self, cr, uid, ids, context=None):
+        '''
+        This function returns an action that display existing receipt of given expense ids.
+        '''
+        voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id
+        res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
+        result = {
+            'name': _('Expense Receipt'),
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': res and res[1] or False,
+            'res_model': 'account.voucher',
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'target': 'current',
+            'res_id': voucher_id,
+        }
+        return result
 
 hr_expense_expense()
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index c45c743c1c8..78fa22db4d4 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -69,6 +69,7 @@
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
                     <button name="receipt" states="accepted" string="Issue Receipt" type="object" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button name="action_view_receipt" states="receipted" string="Open Receipt" type="object" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>

From ba225d9d56486edf234bc97677f81ca10fa361a0 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 13 Jul 2012 18:37:16 +0530
Subject: [PATCH 12/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120713130716-6obmfiioui5qxtxa
---
 addons/hr_expense/hr_expense.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index ee2c92cf483..c9fd824471a 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -162,6 +162,7 @@ class hr_expense_expense(osv.osv):
         res = False
         property_obj = self.pool.get('ir.property')
         sequence_obj = self.pool.get('ir.sequence')
+        analytic_journal_obj = self.pool.get('account.analytic.journal')
         account_journal = self.pool.get('account.journal')
         voucher_obj = self.pool.get('account.voucher')
         
@@ -208,7 +209,11 @@ class hr_expense_expense(osv.osv):
                 if journal_id:
                     voucher['journal_id'] = journal_id
                     journal = account_journal.browse(cr, uid, journal_id, context=context)
-            voucher_id = voucher_obj.create(cr, uid, voucher, context)
+            if journal and not journal.analytic_journal_id:
+                analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context)
+                if analytic_journal_ids:
+                    account_journal.write(cr, uid, [journal.id], {'analytic_journal_id': analytic_journal_ids[0]}, context=context)
+            voucher_id = voucher_obj.create(cr, uid, voucher, context=context)
             self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'}, context=context)
             res = voucher_id
         return res

From 9afbde5c97a4900ac86cb61b53bf4ed77ce078ab Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 13 Jul 2012 18:58:14 +0530
Subject: [PATCH 13/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120713132814-qu531hn061hawh18
---
 addons/hr_expense/hr_expense.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index c9fd824471a..fe127f5fb79 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -183,6 +183,7 @@ class hr_expense_expense(osv.osv):
                 lines.append((0, False, {
                     'name': line.name,
                     'account_id': acc.id,
+                    'account_analytic_id': line.analytic_account.id,
                     'amount': line.total_amount,
                     'type': 'dr'
                 }))

From d73663c123214432d51ed493d69f435fb03d7f2f Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 16 Jul 2012 11:51:50 +0530
Subject: [PATCH 14/40] [IMP] hr_expense : Improved the hr expense report.

bzr revid: mdi@tinyerp.com-20120716062150-rrbwm51f34iei8xy
---
 addons/hr_expense/report/hr_expense_report.py       | 8 ++++----
 addons/hr_expense/report/hr_expense_report_view.xml | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 52f155a8e9e..42ee7f7bda6 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -39,11 +39,11 @@ class hr_expense_report(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
-        'invoiced':fields.integer('# of Invoiced Lines', readonly=True),
+        'receipted':fields.integer('# of Receipted Lines', readonly=True),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True),
         'date_confirm': fields.date('Confirmation Date', readonly=True),
         'date_valid': fields.date('Validation Date', readonly=True),
-        'voucher_id': fields.many2one('account.voucher', 'Voucher', readonly=True),
+        'voucher_id': fields.many2one('account.voucher', 'Receipt', readonly=True),
         'department_id':fields.many2one('hr.department','Department', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
@@ -60,7 +60,7 @@ class hr_expense_report(osv.osv):
             ('draft', 'Draft'),
             ('confirm', 'Waiting confirmation'),
             ('accepted', 'Accepted'),
-            ('invoiced', 'Invoiced'),
+            ('receipted', 'Receipted'),
             ('paid', 'Reimbursed'),
             ('cancelled', 'Cancelled')],
             'Status', readonly=True),
@@ -79,7 +79,7 @@ class hr_expense_report(osv.osv):
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm,
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid,
                      s.voucher_id,
-                     count(s.voucher_id) as invoiced,
+                     count(s.voucher_id) as receipted,
                      s.user_valid as user_id,
                      s.department_id,
                      to_char(date_trunc('day',s.create_date), 'YYYY') as year,
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index bfd73f8ed7d..1800f75ee3b 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -7,7 +7,7 @@
         <field name="model">hr.expense.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'" string="Expenses Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','receipted','paid');gray:state == 'cancelled'" string="Expenses Analysis">
                 <field name="employee_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -23,7 +23,7 @@
                 <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="no_of_products" sum="# of Products"/>
-                <field name="invoiced" sum="Total Invoiced Lines"/>
+                <field name="receipted" sum="Total Receipted Lines"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay_confirm"/>
@@ -56,8 +56,8 @@
                       help = "Confirm Expenses"/>
                     <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
                       help = "Approved Expenses"/>
-                    <filter string="Invoiced" icon="terp-dolar" domain="[('state','in', ('invoiced', 'paid'))]"
-                      help = "Invoiced Expenses"/>
+                    <filter string="Receipted" icon="terp-dolar" domain="[('state','in', ('receipted', 'paid'))]"
+                      help = "Receipted Expenses"/>
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>

From 2368d235bfb4cc1851534e54fe18dc8c148d7651 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 16 Jul 2012 12:20:52 +0530
Subject: [PATCH 15/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120716065052-6pmwb3j1firawhdl
---
 addons/hr_expense/hr_expense.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index fe127f5fb79..d98766dfe66 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -135,7 +135,6 @@ class hr_expense_expense(osv.osv):
         return True
 
     def receipt(self, cr, uid, ids, context=None):
-        if not ids: return []
         mod_obj = self.pool.get('ir.model.data')
         wkf_service = netsvc.LocalService("workflow")
         
@@ -144,14 +143,12 @@ class hr_expense_expense(osv.osv):
             wkf_service.trg_validate(uid, 'hr.expense.expense', id, 'receipt', cr)
             voucher_ids.append(self.browse(cr, uid, id, context=context).voucher_id.id)
         res = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
-        res_id = res and res[1] or False
         return {
             'name': _('Expense Receipt'),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'account.voucher',
-            'views': [(res_id, 'form')],
-            'view_id': res_id,
+            'view_id': [res and res[1] or False],
             'type': 'ir.actions.act_window',
             'target': 'new',
             'nodestroy': True,

From 361291706e91a5b3a3042e46a3a540c9d03c55c2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 16 Jul 2012 12:28:09 +0530
Subject: [PATCH 16/40] [IMP] hr_expense : Improved the view.

bzr revid: mdi@tinyerp.com-20120716065809-xazcx753xqzum18c
---
 addons/hr_expense/hr_expense_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 78fa22db4d4..1d3189283ac 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -45,7 +45,7 @@
             <field name="model">hr.expense.expense</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','invoiced','paid');gray:state == 'cancelled'"  string="Expenses" editable="top">
+                <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','receipted','paid');gray:state == 'cancelled'"  string="Expenses" editable="top">
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="department_id"/>

From 18913e1b4db1971459f91d84bf033eff48697ba8 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 16 Jul 2012 12:41:50 +0530
Subject: [PATCH 17/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120716071150-cj8hu9wxtul9mmbz
---
 addons/hr_expense/hr_expense.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index d98766dfe66..2f6e6025241 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -220,6 +220,7 @@ class hr_expense_expense(osv.osv):
         '''
         This function returns an action that display existing receipt of given expense ids.
         '''
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
         voucher_id = self.browse(cr, uid, ids[0], context=context).voucher_id.id
         res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
         result = {

From 7c6c75aff56b8fffc1892a30cbcb6330d1c58138 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 16 Jul 2012 14:17:39 +0530
Subject: [PATCH 18/40] [IMP] hr_expense : Improved the module description.

bzr revid: mdi@tinyerp.com-20120716084739-scv93c6fwesm7tpi
---
 addons/hr_expense/__openerp__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index d0265372b0c..1300531f019 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -33,8 +33,8 @@ The whole workflow is implemented:
     * Draft expense
     * Confirmation of the sheet by the employee
     * Validation by his manager
-    * Validation by the accountant and invoice creation
-    * Payment of the invoice to the employee
+    * Validation by the accountant and receipt creation
+    * Payment of the receipt to the employee
 
 This module also uses the analytic accounting and is compatible with
 the invoice on timesheet module so that you will be able to automatically

From 4bd4bd4b4398f1140d5dbfe8c1b6c73dcb5d9e38 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 16 Jul 2012 15:08:59 +0530
Subject: [PATCH 19/40] [IMP] hr_expense : Improved the tooltip.

bzr revid: mdi@tinyerp.com-20120716093859-nazz1z16342py7ta
---
 addons/hr_expense/hr_expense.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 2f6e6025241..3c7426027ef 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -67,7 +67,7 @@ class hr_expense_expense(osv.osv):
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
         'date': fields.date('Date', select=True),
-        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is paid."),
+        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is receipted."),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'user_id': fields.many2one('res.users', 'User', required=True),
         'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),

From 4e132aa66aa8fbeb957675e962492a330ea6858e Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 16 Jul 2012 16:59:35 +0530
Subject: [PATCH 20/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120716112935-idcmrz47p8f0azjk
---
 addons/hr_expense/hr_expense.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 3c7426027ef..c501de64896 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -163,7 +163,7 @@ class hr_expense_expense(osv.osv):
         account_journal = self.pool.get('account.journal')
         voucher_obj = self.pool.get('account.voucher')
         
-        for exp in self.browse(cr, uid, ids, context=None):
+        for exp in self.browse(cr, uid, ids, context=context):
             company_id = exp.company_id.id
             lines = []
             total = 0.0

From edaedb7455a5f4583ba6f9e2fcd973136f7ec66c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 17 Jul 2012 12:47:31 +0530
Subject: [PATCH 21/40] [IMP] hr_expense : After the confirmation of the
 expense, the button should create an account.voucher (instead of an invoice)
 and confirmed it. It must creates the accounting entries exactly as the
 current invoice does.

bzr revid: mdi@tinyerp.com-20120717071731-mbc91xnbuirbc6o2
---
 addons/hr_expense/hr_expense.py            | 27 ++++------------------
 addons/hr_expense/hr_expense_view.xml      |  2 +-
 addons/hr_expense/hr_expense_workflow.xml  |  5 ++--
 addons/hr_expense/test/expense_process.yml |  4 ++--
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index c501de64896..02aaf9b8c2e 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -86,11 +86,11 @@ class hr_expense_expense(osv.osv):
             ('cancelled', 'Refused'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
-            ('receipted', 'Receipted'),
+            ('receipted', 'Waiting Reimbursement'),
             ('paid', 'Reimbursed')
             ],
             'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
-            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Receipted\'.\n If the expense is paid to user, the status is \'Reimbursed\'.'),
+            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Waiting Reimbursement\'.\n If the expense is paid to user, the status is \'Reimbursed\'.'),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
@@ -134,27 +134,6 @@ class hr_expense_expense(osv.osv):
         self.write(cr, uid, ids, {'state':'paid'})
         return True
 
-    def receipt(self, cr, uid, ids, context=None):
-        mod_obj = self.pool.get('ir.model.data')
-        wkf_service = netsvc.LocalService("workflow")
-        
-        voucher_ids = []
-        for id in ids:
-            wkf_service.trg_validate(uid, 'hr.expense.expense', id, 'receipt', cr)
-            voucher_ids.append(self.browse(cr, uid, id, context=context).voucher_id.id)
-        res = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_purchase_receipt_form')
-        return {
-            'name': _('Expense Receipt'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'account.voucher',
-            'view_id': [res and res[1] or False],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'nodestroy': True,
-            'res_id': voucher_ids and voucher_ids[0] or False,
-        }
-
     def action_receipt_create(self, cr, uid, ids, context=None):
         res = False
         property_obj = self.pool.get('ir.property')
@@ -162,6 +141,7 @@ class hr_expense_expense(osv.osv):
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         account_journal = self.pool.get('account.journal')
         voucher_obj = self.pool.get('account.voucher')
+        wkf_service = netsvc.LocalService("workflow")
         
         for exp in self.browse(cr, uid, ids, context=context):
             company_id = exp.company_id.id
@@ -212,6 +192,7 @@ class hr_expense_expense(osv.osv):
                 if analytic_journal_ids:
                     account_journal.write(cr, uid, [journal.id], {'analytic_journal_id': analytic_journal_ids[0]}, context=context)
             voucher_id = voucher_obj.create(cr, uid, voucher, context=context)
+            wkf_service.trg_validate(uid, 'account.voucher', voucher_id, 'proforma_voucher', cr)
             self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'}, context=context)
             res = voucher_id
         return res
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b33d6e05474..b84674b6369 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -68,7 +68,7 @@
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
-                    <button name="receipt" states="accepted" string="Issue Receipt" type="object" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button name="receipt" states="accepted" string="Issue Receipt" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="action_view_receipt" states="receipted" string="Open Receipt" type="object" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 58eed45b1d2..445927c0288 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -50,8 +50,7 @@
         <record id="act_receipt" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">receipt</field>
-            <field name="kind">subflow</field>
-            <field name="subflow_id" ref="account_voucher.wkf"/>
+            <field name="kind">function</field>
             <field name="action">action_receipt_create()</field>
         </record>
 
@@ -99,7 +98,7 @@
         <record id="t9" model="workflow.transition">
             <field name="act_from" ref="act_receipt"/>
             <field name="act_to" ref="act_paid"/>
-            <field name="signal">subflow.done</field>
+            <field name="signal">paid</field>
             <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index 65359de95ff..7734a003ebb 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -20,13 +20,13 @@
   I make Receipt for the expense.
 -
   !python {model: hr.expense.expense}: |
-    self.receipt(cr, uid, [ref('sep_expenses')])
+    self.action_receipt_create(cr, uid, [ref('sep_expenses')])
 -
   I check receipt details.
 -
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
-    assert sep_expenses.state == 'receipted', "Expense should be in 'Receipted' state."
+    assert sep_expenses.state == 'receipted', "Expense should be in 'Waiting Reimbursement' state."
     assert sep_expenses.voucher_id.name == sep_expenses.name,"Receipt name is not correspond with expense name."
     assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
     assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."

From 7ea31c56f706b1019bfec415483c4430252896b2 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 17 Jul 2012 14:37:38 +0530
Subject: [PATCH 22/40] [IMP] hr_expense : Improved the code.

bzr revid: mdi@tinyerp.com-20120717090738-awbina7y4e7h7z3n
---
 addons/hr_expense/hr_expense.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 02aaf9b8c2e..c80eed615d8 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -135,7 +135,6 @@ class hr_expense_expense(osv.osv):
         return True
 
     def action_receipt_create(self, cr, uid, ids, context=None):
-        res = False
         property_obj = self.pool.get('ir.property')
         sequence_obj = self.pool.get('ir.sequence')
         analytic_journal_obj = self.pool.get('account.analytic.journal')
@@ -194,8 +193,7 @@ class hr_expense_expense(osv.osv):
             voucher_id = voucher_obj.create(cr, uid, voucher, context=context)
             wkf_service.trg_validate(uid, 'account.voucher', voucher_id, 'proforma_voucher', cr)
             self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'}, context=context)
-            res = voucher_id
-        return res
+        return True
     
     def action_view_receipt(self, cr, uid, ids, context=None):
         '''

From bb7df4dcc512ac2859592828424837d0a2f38ea4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 17 Jul 2012 16:12:14 +0530
Subject: [PATCH 23/40] [IMP] hr_expense : After the confirmation of the
 expense, the button should create a purchase receipt  and confirmed it. It
 must creates the accounting entries exactly as the current invoice does.

bzr revid: mdi@tinyerp.com-20120717104214-pwypgr6d17ji4s4q
---
 addons/hr_expense/__openerp__.py              |  1 -
 addons/hr_expense/hr_expense.py               | 13 ++++-------
 addons/hr_expense/hr_expense_view.xml         |  8 +++----
 addons/hr_expense/hr_expense_workflow.xml     | 23 ++++---------------
 addons/hr_expense/report/hr_expense_report.py |  5 +---
 .../report/hr_expense_report_view.xml         |  5 +---
 addons/hr_expense/test/expense_process.yml    | 12 +---------
 7 files changed, 15 insertions(+), 52 deletions(-)

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 1300531f019..bd49066a80c 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -34,7 +34,6 @@ The whole workflow is implemented:
     * Confirmation of the sheet by the employee
     * Validation by his manager
     * Validation by the accountant and receipt creation
-    * Payment of the receipt to the employee
 
 This module also uses the analytic accounting and is compatible with
 the invoice on timesheet module so that you will be able to automatically
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index c80eed615d8..a1946cd7aeb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -67,7 +67,7 @@ class hr_expense_expense(osv.osv):
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
         'date': fields.date('Date', select=True),
-        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is receipted."),
+        'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is done."),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'user_id': fields.many2one('res.users', 'User', required=True),
         'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
@@ -86,11 +86,10 @@ class hr_expense_expense(osv.osv):
             ('cancelled', 'Refused'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
-            ('receipted', 'Waiting Reimbursement'),
-            ('paid', 'Reimbursed')
+            ('done', 'Done'),
             ],
             'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
-            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Waiting Reimbursement\'.\n If the expense is paid to user, the status is \'Reimbursed\'.'),
+            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Done\'.'),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
@@ -130,10 +129,6 @@ class hr_expense_expense(osv.osv):
         self.write(cr, uid, ids, {'state':'cancelled'})
         return True
 
-    def expense_paid(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'paid'})
-        return True
-
     def action_receipt_create(self, cr, uid, ids, context=None):
         property_obj = self.pool.get('ir.property')
         sequence_obj = self.pool.get('ir.sequence')
@@ -192,7 +187,7 @@ class hr_expense_expense(osv.osv):
                     account_journal.write(cr, uid, [journal.id], {'analytic_journal_id': analytic_journal_ids[0]}, context=context)
             voucher_id = voucher_obj.create(cr, uid, voucher, context=context)
             wkf_service.trg_validate(uid, 'account.voucher', voucher_id, 'proforma_voucher', cr)
-            self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'receipted'}, context=context)
+            self.write(cr, uid, [exp.id], {'voucher_id': voucher_id, 'state': 'done'}, context=context)
         return True
     
     def action_view_receipt(self, cr, uid, ids, context=None):
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b84674b6369..881126161db 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -45,7 +45,7 @@
             <field name="model">hr.expense.expense</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','receipted','paid');gray:state == 'cancelled'"  string="Expenses" editable="top">
+                <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'"  string="Expenses" editable="top">
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="department_id"/>
@@ -68,10 +68,10 @@
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
-                    <button name="receipt" states="accepted" string="Issue Receipt" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button name="action_view_receipt" states="receipted" string="Open Receipt" type="object" class="oe_highlight"/>
+                    <button name="done" states="accepted" string="Issue Receipt" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button name="action_view_receipt" states="done" string="Open Receipt" type="object" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
                     <group>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 445927c0288..2e085071207 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -32,14 +32,6 @@
             <field name="action">expense_accept()</field>
         </record>
 
-        <record id="act_paid" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_expenses"/>
-            <field name="name">paid</field>
-            <field name="kind">function</field>
-            <field name="action">expense_paid()</field>
-            <field name="flow_stop">True</field>
-        </record>
-
         <record id="act_refused" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
             <field name="name">refused</field>
@@ -47,9 +39,9 @@
             <field name="action">expense_canceled()</field>
         </record>
 
-        <record id="act_receipt" model="workflow.activity">
+        <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_expenses"/>
-            <field name="name">receipt</field>
+            <field name="name">done</field>
             <field name="kind">function</field>
             <field name="action">action_receipt_create()</field>
         </record>
@@ -90,15 +82,8 @@
 
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
-            <field name="act_to" ref="act_receipt"/>
-            <field name="signal">receipt</field>
-            <field name="group_id" ref="base.group_hr_user"/>
-        </record>
-
-        <record id="t9" model="workflow.transition">
-            <field name="act_from" ref="act_receipt"/>
-            <field name="act_to" ref="act_paid"/>
-            <field name="signal">paid</field>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">done</field>
             <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 42ee7f7bda6..72bf710ec4f 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -39,7 +39,6 @@ class hr_expense_report(osv.osv):
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Force Journal', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
-        'receipted':fields.integer('# of Receipted Lines', readonly=True),
         'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True),
         'date_confirm': fields.date('Confirmation Date', readonly=True),
         'date_valid': fields.date('Validation Date', readonly=True),
@@ -60,8 +59,7 @@ class hr_expense_report(osv.osv):
             ('draft', 'Draft'),
             ('confirm', 'Waiting confirmation'),
             ('accepted', 'Accepted'),
-            ('receipted', 'Receipted'),
-            ('paid', 'Reimbursed'),
+            ('done', 'Done'),
             ('cancelled', 'Cancelled')],
             'Status', readonly=True),
     }
@@ -79,7 +77,6 @@ class hr_expense_report(osv.osv):
                      to_date(to_char(s.date_confirm, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_confirm,
                      to_date(to_char(s.date_valid, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_valid,
                      s.voucher_id,
-                     count(s.voucher_id) as receipted,
                      s.user_valid as user_id,
                      s.department_id,
                      to_char(date_trunc('day',s.create_date), 'YYYY') as year,
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1800f75ee3b..8f20766fa8b 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -7,7 +7,7 @@
         <field name="model">hr.expense.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','receipted','paid');gray:state == 'cancelled'" string="Expenses Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'" string="Expenses Analysis">
                 <field name="employee_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -23,7 +23,6 @@
                 <field name="state" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="no_of_products" sum="# of Products"/>
-                <field name="receipted" sum="Total Receipted Lines"/>
                 <field name="price_average" avg="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay_confirm"/>
@@ -56,8 +55,6 @@
                       help = "Confirm Expenses"/>
                     <filter string="Approved" icon="terp-check" domain="[('state','=','accepted')]"
                       help = "Approved Expenses"/>
-                    <filter string="Receipted" icon="terp-dolar" domain="[('state','in', ('receipted', 'paid'))]"
-                      help = "Receipted Expenses"/>
                     <separator orientation="vertical"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index 7734a003ebb..c38dbad3463 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -26,22 +26,12 @@
 -
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
-    assert sep_expenses.state == 'receipted', "Expense should be in 'Waiting Reimbursement' state."
+    assert sep_expenses.state == 'done', "Expense should be in 'Done' state."
     assert sep_expenses.voucher_id.name == sep_expenses.name,"Receipt name is not correspond with expense name."
     assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
     assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."
     assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Receipt and expense line are not correspond."
 
--
-  I pay the expenses.
--
-  !python {model: hr.expense.expense}: |
-    self.expense_paid(cr, uid, [ref('sep_expenses')])
--
-  I check that state of expenses is 'Paid'.
--
-  !assert {model: hr.expense.expense, id: sep_expenses, severity: error, string: Expense should be in Paid state}:
-    - state == 'paid'
 -
   I duplicate the expenses and cancel duplicated.
 -

From b943af3fe97a075c6973694e813a62160e8582b6 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 17 Jul 2012 17:08:03 +0530
Subject: [PATCH 24/40] [IMP] hr_expense : Improved the test cases.

bzr revid: mdi@tinyerp.com-20120717113803-paf83b5fm69p6d7w
---
 addons/hr_expense/test/expense_process.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index c38dbad3463..af4d5aaec37 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -19,14 +19,14 @@
 -
   I make Receipt for the expense.
 -
-  !python {model: hr.expense.expense}: |
-    self.action_receipt_create(cr, uid, [ref('sep_expenses')])
+  !workflow {model: hr.expense.expense, action: done, ref: sep_expenses}
 -
   I check receipt details.
 -
   !python {model: hr.expense.expense}: |
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
     assert sep_expenses.state == 'done', "Expense should be in 'Done' state."
+    assert sep_expenses.voucher_id, "Expense should have link of Purchase Receipt."
     assert sep_expenses.voucher_id.name == sep_expenses.name,"Receipt name is not correspond with expense name."
     assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
     assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."

From 9606e7a28c6ef51bd0edc0ff06fac4abd4a06258 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 23 Jul 2012 11:13:00 +0530
Subject: [PATCH 25/40] [IMP] hr_expense : Rename the 'Issue Receipt' into
 'Generate Account Entry' and make it visible only by the eInvoicing & Payment
 User (not the HR).

bzr revid: mdi@tinyerp.com-20120723054300-sde5r73zn31dbpw2
---
 addons/hr_expense/hr_expense_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 881126161db..8081b56167a 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -68,7 +68,7 @@
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
-                    <button name="done" states="accepted" string="Issue Receipt" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                    <button name="done" states="accepted" string="Generate Account Entry" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
                     <button name="action_view_receipt" states="done" string="Open Receipt" type="object" class="oe_highlight"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>

From 73f4c519dca9de426c18c39611d86b5a8990f818 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 23 Jul 2012 11:15:36 +0530
Subject: [PATCH 26/40] [IMP] hr_expense : OpenReceipt must be normal, not red.

bzr revid: mdi@tinyerp.com-20120723054536-gcsffy284r1qx2rf
---
 addons/hr_expense/hr_expense_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 8081b56167a..fd922065e22 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -69,7 +69,7 @@
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
                     <button name="done" states="accepted" string="Generate Account Entry" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
-                    <button name="action_view_receipt" states="done" string="Open Receipt" type="object" class="oe_highlight"/>
+                    <button name="action_view_receipt" states="done" string="Open Receipt" type="object"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>

From 31673d113965aed1e289b1b5b079c4aa52c9ab5b Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 23 Jul 2012 11:20:33 +0530
Subject: [PATCH 27/40] [IMP] hr_expense : Rename 'Done' status into 'Paid'.

bzr revid: mdi@tinyerp.com-20120723055033-3hg9cyflwf61ov9t
---
 addons/hr_expense/hr_expense.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index a1946cd7aeb..06b426b0fab 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -86,10 +86,10 @@ class hr_expense_expense(osv.osv):
             ('cancelled', 'Refused'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
-            ('done', 'Done'),
+            ('done', 'Paid'),
             ],
             'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
-            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Done\'.'),
+            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Paid\'.'),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),

From b362ec2e8d9a67484ecfcfb3cc2772c08380b853 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Wed, 25 Jul 2012 19:01:54 +0530
Subject: [PATCH 28/40] [IMP] hr_expense: improve to support multi currency
 payment

bzr revid: psi@tinyerp.com-20120725133154-gxjoahiuis5108g7
---
 addons/hr_expense/hr_expense.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 06b426b0fab..26bcb4d1a12 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -135,12 +135,16 @@ class hr_expense_expense(osv.osv):
         analytic_journal_obj = self.pool.get('account.analytic.journal')
         account_journal = self.pool.get('account.journal')
         voucher_obj = self.pool.get('account.voucher')
+        currency_obj = self.pool.get('res.currency')
         wkf_service = netsvc.LocalService("workflow")
-        
+        if context is None:
+            context = {}
         for exp in self.browse(cr, uid, ids, context=context):
             company_id = exp.company_id.id
             lines = []
             total = 0.0
+            ctx = context.copy()
+            ctx.update({'date': exp.date})
             for line in exp.line_ids:
                 if line.product_id:
                     acc = line.product_id.product_tmpl_id.property_account_expense
@@ -150,15 +154,19 @@ class hr_expense_expense(osv.osv):
                     acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
                     if not acc:
                         raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
-                
+                total_amount = 0.0
+                if exp.company_id.currency_id != exp.currency_id:
+                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, line.total_amount, context=ctx)
+                else:
+                    total_amount = line.total_amount
                 lines.append((0, False, {
                     'name': line.name,
                     'account_id': acc.id,
                     'account_analytic_id': line.analytic_account.id,
-                    'amount': line.total_amount,
+                    'amount': total_amount,
                     'type': 'dr'
                 }))
-                total += line.total_amount
+                total += total_amount
             if not exp.employee_id.address_home_id:
                 raise osv.except_osv(_('Error !'), _('The employee must have a Home address.'))
             acc = exp.employee_id.address_home_id.property_account_payable.id
@@ -169,6 +177,7 @@ class hr_expense_expense(osv.osv):
                 'type': 'purchase',
                 'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
+                'currency_id': exp.currency_id.id,
                 'line_ids': lines,
                 'amount': total
             }

From 6079bbff1944e6709f5e39c15d9242d7b356a866 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 30 Jul 2012 15:30:11 +0530
Subject: [PATCH 29/40] [IMP] improve YML

bzr revid: psi@tinyerp.com-20120730100011-zdonb109wm3t0702
---
 addons/hr_expense/test/expense_process.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index af4d5aaec37..eae63c460fc 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -27,7 +27,6 @@
     sep_expenses = self.browse(cr, uid, ref("sep_expenses"), context=context)
     assert sep_expenses.state == 'done', "Expense should be in 'Done' state."
     assert sep_expenses.voucher_id, "Expense should have link of Purchase Receipt."
-    assert sep_expenses.voucher_id.name == sep_expenses.name,"Receipt name is not correspond with expense name."
     assert sep_expenses.voucher_id.type == 'purchase', "Receipt type is not purchase receipt."
     assert sep_expenses.voucher_id.amount == sep_expenses.amount,"Receipt total amount is not correspond with expense total."
     assert len(sep_expenses.voucher_id.line_dr_ids) == len(sep_expenses.line_ids),"Lines of Receipt and expense line are not correspond."

From 9b9e5f13496f5c4e0a2519705666fcd827be10d5 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 30 Jul 2012 15:45:19 +0530
Subject: [PATCH 30/40] [IMP] hr_expense: Small change rename Paid to done as
 we are not paying the expence on the click of Generate Accounting Entries
 button

bzr revid: psi@tinyerp.com-20120730101519-qq7bs1s5cpfc3vbf
---
 addons/hr_expense/hr_expense.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 26bcb4d1a12..6861696257c 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -86,10 +86,10 @@ class hr_expense_expense(osv.osv):
             ('cancelled', 'Refused'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
-            ('done', 'Paid'),
+            ('done', 'Done'),
             ],
             'Status', readonly=True, help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
-            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Paid\'.'),
+            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Done\'.'),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),

From 815128e7d3bfe6993956d8465f79345d1c34ac9e Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Mon, 30 Jul 2012 16:46:47 +0530
Subject: [PATCH 31/40] [IMP] hr_expense: assign group multicurrency to
 currency fields

bzr revid: psi@tinyerp.com-20120730111647-r65atxk71el136c7
---
 addons/hr_expense/hr_expense_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 55d2f758655..5747a926f8d 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -33,7 +33,7 @@
                     <field name="date"/>
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="amount"/>
                     <field name="state"/>
                 </tree>
@@ -84,7 +84,7 @@
                         <group>
                             <field name="name"/>
                             <field name="user_valid"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
                         </group>
                     </group>
                     <notebook>

From e8e7c91138608c88b5ca7d92204dc3a44177073e Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 10 Aug 2012 17:11:08 +0200
Subject: [PATCH 32/40] [IMP] hr_expense: small improvements

bzr revid: qdp-launchpad@openerp.com-20120810151108-lxqlaxh7m6yd31fi
---
 addons/hr_expense/hr_expense_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 4e4d221c342..1f9d49ee7c1 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -68,7 +68,7 @@
                     <button name="confirm" states="draft" string="Submit to Manager" type="workflow" class="oe_highlight"/>
                     <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
-                    <button name="done" states="accepted" string="Generate Account Entry" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
+                    <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
                     <button name="action_view_receipt" states="done" string="Open Receipt" type="object"/>
                     <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
@@ -123,7 +123,7 @@
                         <page string="Other Info">
                             <group>
                                 <group string="Accounting Data">
-                                    <field name="journal_id" widget="selection" domain="[('type', 'in', ('purchase','purchase_refund'))]"/>
+                                    <field name="journal_id" widget="selection" domain="[('type', '=', 'purchase')]"/>
                                     <field name="voucher_id" context="{'form_view_ref': 'account_voucher.view_purchase_receipt_form'}"/>
                                 </group>
                             </group>

From 52eb6fd1dd2f7c6b3a5b87387fb708ab38ba3f43 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 13 Aug 2012 18:53:47 +0530
Subject: [PATCH 33/40] [FIX]hr_expense :improve voucher if voucher journal
 have currency convert the expense to that currency

bzr revid: mma@tinyerp.com-20120813132347-j6f6uy991wbrogfi
---
 addons/hr_expense/hr_expense.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 01a054c4c90..72b30cb2b46 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -145,6 +145,7 @@ class hr_expense_expense(osv.osv):
             total = 0.0
             ctx = context.copy()
             ctx.update({'date': exp.date})
+            journal = False
             for line in exp.line_ids:
                 if line.product_id:
                     acc = line.product_id.product_tmpl_id.property_account_expense
@@ -159,6 +160,18 @@ class hr_expense_expense(osv.osv):
                     total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, line.total_amount, context=ctx)
                 else:
                     total_amount = line.total_amount
+                if exp.journal_id:
+                     journal = exp.journal_id
+                else:
+                    journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
+                    if journal_id:
+                        journal = account_journal.browse(cr, uid, journal_id, context=context)
+                        if journal.currency:
+                            if exp.currency_id != journal.currency:
+                                total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, line.total_amount, context=ctx)
+                            else:
+                                total_amount = line.total_amount
+                            
                 lines.append((0, False, {
                     'name': line.name,
                     'account_id': acc.id,
@@ -178,18 +191,10 @@ class hr_expense_expense(osv.osv):
                 'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
                 'currency_id': exp.currency_id.id,
+                'journal_id': journal.id,
                 'line_ids': lines,
                 'amount': total
             }
-            journal = False
-            if exp.journal_id:
-                voucher['journal_id'] = exp.journal_id.id
-                journal = exp.journal_id
-            else:
-                journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
-                if journal_id:
-                    voucher['journal_id'] = journal_id
-                    journal = account_journal.browse(cr, uid, journal_id, context=context)
             if journal and not journal.analytic_journal_id:
                 analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context)
                 if analytic_journal_ids:

From 25367f13bb39090c6c72522274c30d37ac5cd12b Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 14 Aug 2012 11:13:48 +0530
Subject: [PATCH 34/40] [FIX]hr_expense :improve  fource journal if fource
 journal have currency convert the expense to that currency

bzr revid: mma@tinyerp.com-20120814054348-6ofe8r0fcksbhp85
---
 addons/hr_expense/hr_expense.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 72b30cb2b46..d860b21c125 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -162,6 +162,11 @@ class hr_expense_expense(osv.osv):
                     total_amount = line.total_amount
                 if exp.journal_id:
                      journal = exp.journal_id
+                     if journal.currency:
+                         if exp.currency_id != journal.currency:
+                             total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, line.total_amount, context=ctx)
+                         else:
+                             total_amount = line.total_amount
                 else:
                     journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
                     if journal_id:

From 48f2640283326026a9df21e297f7ca351d2eadfd Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 14 Aug 2012 12:22:01 +0530
Subject: [PATCH 35/40] [FIX]hr_expense :put an onchange in the currency field
 that fill the force journal field with a purhcase journal that has the same
 currency

bzr revid: mma@tinyerp.com-20120814065201-57472t4o0wma1232
---
 addons/hr_expense/hr_expense.py       | 8 ++++++++
 addons/hr_expense/hr_expense_view.xml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index d860b21c125..ecd0c97f7e9 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -100,6 +100,14 @@ class hr_expense_expense(osv.osv):
         'currency_id': _get_currency,
     }
 
+    def onchange_currency_id(self, cr, uid, ids, currency_id, context=None):
+        res =  {'value': {'journal_id': False}}
+        company_id = self.browse(cr, uid, ids[0], context=context).company_id.id
+        journal_id = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase'), ('currency','=',currency_id), ('company_id', '=', company_id)])
+        if journal_id:
+            res['value']['journal_id'] = journal_id
+        return res
+
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
         emp_obj = self.pool.get('hr.employee')
         department_id = False
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 1f9d49ee7c1..980b6e993c8 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -84,7 +84,7 @@
                         <group>
                             <field name="name"/>
                             <field name="user_valid"/>
-                            <field name="currency_id" groups="base.group_multi_currency"/>
+                            <field name="currency_id" groups="base.group_multi_currency" on_change="onchange_currency_id(currency_id)"/>
                         </group>
                     </group>
                     <notebook>

From 14e4696c0d81094e93f34c9ea52972fd4d6c757b Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 14 Aug 2012 17:03:20 +0530
Subject: [PATCH 36/40] [IMP] hr_expense: update journal on currency change and
 improve the code for multicurrency

bzr revid: psi@tinyerp.com-20120814113320-wf5bnieerjo7yt86
---
 addons/hr_expense/hr_expense.py       | 30 ++++++++++++++++-----------
 addons/hr_expense/hr_expense_view.xml |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 01a054c4c90..c64da1f525b 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -100,6 +100,13 @@ class hr_expense_expense(osv.osv):
         'currency_id': _get_currency,
     }
 
+    def onchange_currency_id(self, cr, uid, ids, currency_id=False, company_id=False, context=None):
+        res =  {'value': {'journal_id': False}}
+        journal_id = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase'), ('currency','=',currency_id), ('company_id', '=', company_id)], context=context)[0]
+        if journal_id:
+            res['value']['journal_id'] = journal_id
+        return res
+
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
         emp_obj = self.pool.get('hr.employee')
         department_id = False
@@ -145,6 +152,13 @@ class hr_expense_expense(osv.osv):
             total = 0.0
             ctx = context.copy()
             ctx.update({'date': exp.date})
+            journal = False
+            if exp.journal_id:
+                journal = exp.journal_id
+            else:
+                journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
+                if journal_id:
+                    journal = account_journal.browse(cr, uid, journal_id, context=context)
             for line in exp.line_ids:
                 if line.product_id:
                     acc = line.product_id.product_tmpl_id.property_account_expense
@@ -155,8 +169,8 @@ class hr_expense_expense(osv.osv):
                     if not acc:
                         raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
                 total_amount = 0.0
-                if exp.company_id.currency_id != exp.currency_id:
-                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, line.total_amount, context=ctx)
+                if journal.currency and exp.currency_id.id != journal.currency.id:
+                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, line.total_amount, context=ctx)
                 else:
                     total_amount = line.total_amount
                 lines.append((0, False, {
@@ -179,17 +193,9 @@ class hr_expense_expense(osv.osv):
                 'company_id': company_id,
                 'currency_id': exp.currency_id.id,
                 'line_ids': lines,
-                'amount': total
+                'amount': total,
+                'journal_id': journal.id,
             }
-            journal = False
-            if exp.journal_id:
-                voucher['journal_id'] = exp.journal_id.id
-                journal = exp.journal_id
-            else:
-                journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
-                if journal_id:
-                    voucher['journal_id'] = journal_id
-                    journal = account_journal.browse(cr, uid, journal_id, context=context)
             if journal and not journal.analytic_journal_id:
                 analytic_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context)
                 if analytic_journal_ids:
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 1f9d49ee7c1..a9bebeb6376 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -84,7 +84,7 @@
                         <group>
                             <field name="name"/>
                             <field name="user_valid"/>
-                            <field name="currency_id" groups="base.group_multi_currency"/>
+                            <field name="currency_id" groups="base.group_multi_currency" on_change="onchange_currency_id(currency_id, company_id)"/>
                         </group>
                     </group>
                     <notebook>

From b5fbb818f273dc1a9b1cb9bb7bcf15029f97db5c Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Tue, 14 Aug 2012 17:55:43 +0530
Subject: [PATCH 37/40] [IMP] small fix

bzr revid: psi@tinyerp.com-20120814122543-7o6hkxpy3ecap1m1
---
 addons/hr_expense/hr_expense.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index c64da1f525b..96a3eab170d 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -102,9 +102,9 @@ class hr_expense_expense(osv.osv):
 
     def onchange_currency_id(self, cr, uid, ids, currency_id=False, company_id=False, context=None):
         res =  {'value': {'journal_id': False}}
-        journal_id = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase'), ('currency','=',currency_id), ('company_id', '=', company_id)], context=context)[0]
-        if journal_id:
-            res['value']['journal_id'] = journal_id
+        journal = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase'), ('currency','=',currency_id), ('company_id', '=', company_id)], context=context)
+        if journal:
+            res['value']['journal_id'] = journal[0]
         return res
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):

From 049e8a12f06134b6796784e42e2d3b72ec62b65c Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 16 Aug 2012 10:58:46 +0530
Subject: [PATCH 38/40] [FIX] small fix

bzr revid: psi@tinyerp.com-20120816052846-gxi0q4gd4at7r7pp
---
 addons/hr_expense/hr_expense.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 1ef44d56275..97405a5e156 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -77,7 +77,7 @@ class hr_expense_expense(osv.osv):
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, string='Total Amount', digits_compute= dp.get_precision('Account')),
-        'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
+        'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
         'company_id': fields.many2one('res.company', 'Company', required=True),

From 26d020fe4ca5a1ab4332146eb1d5ca4c60fd248c Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Thu, 16 Aug 2012 12:16:37 +0530
Subject: [PATCH 39/40] [FIX]hr_expense :improve multi currency code for
 expense line with multiple cases

bzr revid: mma@tinyerp.com-20120816064637-4c5oo6jbprqcocdx
---
 addons/hr_expense/hr_expense.py | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 9154502003e..483813e3103 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -169,28 +169,12 @@ class hr_expense_expense(osv.osv):
                     acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category', context={'force_company': company_id})
                     if not acc:
                         raise osv.except_osv(_('Error!'), _('Please configure Default Expense account for Product purchase: `property_account_expense_categ`.'))
-                total_amount = 0.0
-                if journal.currency and exp.currency_id.id != journal.currency.id:
-                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, line.total_amount, context=ctx)
-                else:
-                    total_amount = line.total_amount
-                if exp.journal_id:
-                     journal = exp.journal_id
-                     if journal.currency:
-                         if exp.currency_id != journal.currency:
-                             total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, line.total_amount, context=ctx)
-                         else:
-                             total_amount = line.total_amount
-                else:
-                    journal_id = voucher_obj._get_journal(cr, uid, context={'type': 'purchase', 'company_id': company_id})
-                    if journal_id:
-                        journal = account_journal.browse(cr, uid, journal_id, context=context)
-                        if journal.currency:
-                            if exp.currency_id != journal.currency:
-                                total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, line.total_amount, context=ctx)
-                            else:
-                                total_amount = line.total_amount
-                            
+                total_amount = line.total_amount
+                if journal.currency:
+                    if exp.currency_id != journal.currency:
+                        total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, journal.currency.id, total_amount, context=ctx)
+                elif exp.company_id.currency_id != exp.currency_id:
+                    total_amount = currency_obj.compute(cr, uid, exp.currency_id.id, exp.company_id.currency_id.id, total_amount, context=ctx)
                 lines.append((0, False, {
                     'name': line.name,
                     'account_id': acc.id,
@@ -210,7 +194,6 @@ class hr_expense_expense(osv.osv):
                 'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
                 'currency_id': exp.currency_id.id,
-                'journal_id': journal.id,
                 'line_ids': lines,
                 'amount': total,
                 'journal_id': journal.id,

From 0f5f09b2c916a5bccbce309bf29cd6b74f78eceb Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Thu, 16 Aug 2012 14:04:02 +0530
Subject: [PATCH 40/40] [IMP] hr_expense: small change

bzr revid: psi@tinyerp.com-20120816083402-i0u6j8grvat6jcty
---
 addons/hr_expense/hr_expense.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index ec7d78339cb..594b869c71e 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -192,7 +192,6 @@ class hr_expense_expense(osv.osv):
                 'type': 'purchase',
                 'partner_id': exp.employee_id.address_home_id.id,
                 'company_id': company_id,
-                'currency_id': exp.currency_id.id,
                 'line_ids': lines,
                 'amount': total,
                 'journal_id': journal.id,