openerp-mexico-localization

Merge lp:~vauxoo/openerp-mexico-localization/7.0-oml_settings_factuare_company_dev_jorge into lp:openerp-mexico-localization/7.0

  1. 7.0-oml_settings_factuare_company_dev_jorge
  2. Merge into 7.0
Status: Merged
Merged at revision: 346
Proposed branch: lp:~vauxoo/openerp-mexico-localization/7.0-oml_settings_factuare_company_dev_jorge
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 21 lines (+2/-2)
1 file modified
l10n_mx_settings_facturae/model/res_config.py (+2/-2)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/7.0-oml_settings_factuare_company_dev_jorge
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Needs Information
Julio Serna-http://www.vauxoo.com Pending
Isaac López Zúñiga Pending
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Pending
Review via email: mp+199544@code.launchpad.net

Commit message

[REF][l10n_mx_settings_facturae] Add company_id in function report_multicompany_create, this for assign user.company_id.id to configuration of report.

Description of the change

Se agrega company_id para enviarlo a la función de report_multicompany_create del modelo report_multicompany el cual asigna o crea un registro de ese modelo con la compañía enviada.

To post a comment you must log in.
Revision history for this message
Moisés López - http://www.vauxoo.com (moylop260) wrote :

Jorge,
Puedes establecer un commit message en esta propuesta de merge, que explique el qué hiciste y el porqué.

review: Needs Information

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_mx_settings_facturae/model/res_config.py'
2--- l10n_mx_settings_facturae/model/res_config.py 2013-12-16 19:41:35 +0000
3+++ l10n_mx_settings_facturae/model/res_config.py 2013-12-18 20:01:39 +0000
4@@ -104,7 +104,7 @@
5 cr, uid, values, context)
6 report_company_obj = self.pool.get('report.multicompany')
7 email_obj = self.pool.get('email.template')
8- if values.get('mail_server_id') and values.get('company_id') and values.get('email_tmp_id') and values.get('temp_report_id'):
9+ if values.get('mail_server_id') and values.get('email_tmp_id') and values.get('temp_report_id'):
10 confg_data = self.browse(cr, uid, confg_id, context=context)
11 email_obj.write(cr, uid, [confg_data.email_tmp_id.id], {
12 'company_id': confg_data.company_id.id,
13@@ -112,7 +112,7 @@
14 'report_template': values.get('temp_report_id')},
15 context=context)
16 report_company_obj.report_multicompany_create(
17- cr, uid, values.get('temp_report_id'), context=context)
18+ cr, uid, values.get('temp_report_id'), values.get('company_id'), context=context)
19 return confg_id
20
21 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: