Report - Printing and Sending

Merge lp:~gbaconnier-c2c/report-print-send/lp6.1-pingen-1086027 into lp:~report-print-send-core-editors/report-print-send/6.1

  1. lp6.1-pingen-1086027
  2. Merge into 6.1
Proposed by Guewen Baconnier @ Camptocamp
Status: Merged
Merged at revision: 5
Proposed branch: lp:~gbaconnier-c2c/report-print-send/lp6.1-pingen-1086027
Merge into: lp:~report-print-send-core-editors/report-print-send/6.1
Diff against target: 10 lines (+1/-1)
1 file modified
pingen/res_company.py (+1/-1)
To merge this branch: bzr merge lp:~gbaconnier-c2c/report-print-send/lp6.1-pingen-1086027
Reviewer Review Type Date Requested Status
Omar (Pexego) Approve
Alexandre Fayolle - camptocamp code review, no test Approve
Review via email: mp+138917@code.launchpad.net

Description of the change

Fix for undefined name 'company_id'

lp:1086027

To post a comment you must log in.
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

LGTM, Thanks !

Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Omar (Pexego) (omar7r) wrote :

LGTM

review: Approve
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Thanks for the reviews and the merge.
Happy season's *greetings*

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pingen/res_company.py'
2--- pingen/res_company.py 2012-11-26 09:15:12 +0000
3+++ pingen/res_company.py 2012-12-10 08:22:21 +0000
4@@ -37,6 +37,6 @@
5 assert isinstance(company, (int, long, browse_record)), \
6 "one id or browse_record expected"
7 if not isinstance(company, browse_record):
8- company = self.browse(cr, uid, company_id, context=context)
9+ company = self.browse(cr, uid, company, context=context)
10 return Pingen(company.pingen_token, staging=company.pingen_staging)
11

Subscribers

People subscribed via source and target branches