Merge lp:~openerp-dev/openobject-addons/trunk-opw-577036-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

 ==> When you invoice your time-sheet lines, the generated invoice line contains the analytic account, due to which the amount does double into the Analytic entries analysis report.

Steps:
1. I make a project from "Sales/Sales/Contracts".
2. Connect project to customer and set "Invoice on Timesheet & Costs" 100%.
3. Go-to HR – Timesheet lines and Create a timesheet line of 20 hours on this project
4. Go-to "Sales/Invoicing/All Uninvoiced Entries" select the line and Crate Invoice from the wizard.
6. I confirm and validate this invoice
7. Go-to "Accounting/Reporting/Statistic Reports/Analytic Entries Analysis" the quantity = 40 and NOT 20 and the amount is not 20x30=600, but it is 900.

      This is due to the analytic account set on the invoice. I have set the analytic account as False at the time invoice line creation.
      code is forward port from 6.1

Thanks,
Mayur

[Fabien (Open ERP) (fp-tinyerp)]

this was correct, I reject.

review: Disapprove

Unmerged revisions

8078. By Dhruti Shastri on 2012-11-20

[FIX]hr_timesheet_invoice: Analylitic entries analysis report shows the double amounts is due to the fact that when invoice timesheet lines the generated invoice line contains the analytic account

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2012-10-30 11:26:32 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2012-11-20 10:12:23 +0000
@@ -144,7 +144,7 @@
                     'invoice_line_tax_id': [(6,0,tax)],
                     'uos_id': uom,
                     'account_id': general_account.id,
-                    'account_analytic_id': account.id,
+                    'account_analytic_id': False,
                 }
 
                 #