Merge lp:~openerp-dev/openobject-addons/6.1-opw-573448-ksa into lp:openobject-addons/6.1

Proposed by Kirti Savalia(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-573448-ksa
Merge into: lp:openobject-addons/6.1
Diff against target: 20 lines (+6/-3)
1 file modified
hr_timesheet_invoice/hr_timesheet_invoice.py (+6/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-573448-ksa
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+101068@code.launchpad.net

Description of the change

Hello,

Create the invoice over and over again in circle.

Thanks
KSA

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve
Revision history for this message
Amit Parik (amit-parik) wrote :

Hello Naresh,

Would you please check this commit again because it will creates a problem.

After applying this patch you can not validate the invoice with analytic account and faced the following warning massage.

"You cannot modify an invoiced analytic line!"

Thanks!

Revision history for this message
Rifakat Husen (OpenERP) (rha-openerp) wrote :

Hello,

Correct way to fix this issue is from create_analytic_lines() inherited
in hr_timesheet_invoice. invoice_id and to_invoice fields are added from
this module.

I have updated the branch.
Please review this fix.

Regards,
Rifakat Haradwala

7024. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7025. By Stephane Wirtel (OpenERP)

[FIX] point_of_sale: remove unused file

7026. By Xavier ALT

[MERGE] OPW 578622: project: duplicating project must reset analytic account code

7027. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7028. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7029. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7030. By Olivier Dony (Odoo)

[FIX] wiki: remove unused 6.0 web addon components - web API was rewritten from scratch in 6.1

7031. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7032. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7033. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7034. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7035. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7036. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7037. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7038. By Xavier ALT

[MERGE] OPW 577723: purchase: add domain on purchase order partner field for autocomplete to search only for suppliers

7039. By Xavier ALT

[MERGE] OPW 577045: account/hr_holidays: fix untranslated string and 'Filter By' display on account reports

7040. By Xavier ALT

[MERGE] OPW 576804: hr_holidays: fix problem with accentuated chars in 'Leaves by Department' report

7041. By Xavier ALT

[MERGE] OPW 579990: account: changing invoice line account should take product taxes or account taxes, not both

  backport of trunk addons revid: <email address hidden>

7042. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7043. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7044. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7045. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7046. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7047. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7048. By Xavier ALT

[MERGE] OPW 579331: base_vat: button check_vat should not return 'None' uppon success - this will cause error for clients using XML-RPC

7049. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7050. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7051. By Xavier ALT

[MERGE] OPW 578792: project_issue/resource: fix calc. of open/close & working hours to open/close on issue + has to be timezone aware

7052. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7053. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7054. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7055. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7056. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7057. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7058. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7059. By Olivier Dony (Odoo)

[FIX] project_issue: fix access rights error when using portal access

Due to the recent change in the computation of the closing duration
for project issues[1], viewing issues now fails for users who do not
have read access to project.project. This is typically the case for
portal users, who can view their own issues but not the project details.
Doing the computation in superuser mode does not cause any security
problem and avoids the access rights error.

7060. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7061. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7062. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7063. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7064. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7065. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7066. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7067. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7068. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7069. By Xavier ALT

[MERGE] OPW 576829: pos: fix creation of payment line when pos order have multiple payment methods + return

   partial trunk backport revid: <email address hidden>,
     <email address hidden>

7070. By Xavier ALT

[MERGE] OPW 576495: stock: fix missing 'state' field in view - required for button states evaluation

7071. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7072. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7073. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7074. By Rifakat Husen (OpenERP)

[FIX] hr_timesheet_invoice: improved fix to be able to reinvoice expenses

7075. By Rifakat Husen (OpenERP)

[FIX] hr_timesheet_invoice: optimized code

Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-573448-port-mma/+merge/136640and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7075. By Rifakat Husen (OpenERP)

[FIX] hr_timesheet_invoice: optimized code

7074. By Rifakat Husen (OpenERP)

[FIX] hr_timesheet_invoice: improved fix to be able to reinvoice expenses

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
2--- hr_timesheet_invoice/hr_timesheet_invoice.py 2012-01-03 12:33:39 +0000
3+++ hr_timesheet_invoice/hr_timesheet_invoice.py 2012-11-19 09:15:44 +0000
4@@ -193,10 +193,13 @@
5 res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context)
6 analytic_line_obj = self.pool.get('account.analytic.line')
7 for move_line in self.browse(cr, uid, ids, context=context):
8+ #For customer invoice, link analytic line to the invoice so it is not proposed for invoicing in Bill Tasks Work
9+ invoice_id = move_line.invoice and move_line.invoice.type in ('out_invoice','out_refund') and move_line.invoice.id or False
10 for line in move_line.analytic_lines:
11- toinv = line.account_id.to_invoice.id
12- if toinv:
13- analytic_line_obj.write(cr, uid, line.id, {'to_invoice': toinv})
14+ analytic_line_obj.write(cr, uid, line.id, {
15+ 'invoice_id': invoice_id,
16+ 'to_invoice': line.account_id.to_invoice and line.account_id.to_invoice.id or False
17+ }, context=context)
18 return res
19
20 account_move_line()