Merge lp://staging/~vauxoo/openerp-mexico-localization/addons-mx-trunk-facturae-multisuc-dev-yzk into lp://staging/openerp-mexico-localization
Proposed by
Isaac López Zúñiga
| Status: | Rejected |
|---|---|
| Rejected by: | Moisés López - http://www.vauxoo.com |
| Proposed branch: | lp://staging/~vauxoo/openerp-mexico-localization/addons-mx-trunk-facturae-multisuc-dev-yzk |
| Merge into: | lp://staging/openerp-mexico-localization |
| Diff against target: |
1264 lines (+634/-223) (has conflicts) 19 files modified
l10n_mx_company_multi_address/__init__.py (+31/-0) l10n_mx_company_multi_address/__openerp__.py (+54/-0) l10n_mx_company_multi_address/account_journal.py (+79/-0) l10n_mx_company_multi_address/account_journal_view.xml (+18/-0) l10n_mx_company_multi_address/invoice.py (+123/-0) l10n_mx_company_multi_address/invoice_view_address.xml (+21/-0) l10n_mx_company_multi_address/res_company.py (+60/-0) l10n_mx_company_multi_address/res_company_view.xml (+18/-0) l10n_mx_facturae/__init__.py (+1/-0) l10n_mx_facturae/__openerp__.py (+3/-1) l10n_mx_facturae/__terp__.py (+3/-1) l10n_mx_facturae/invoice.py (+18/-18) l10n_mx_facturae/l10n_mx_facturae_report.xml (+1/-0) l10n_mx_facturae/report/invoice_facturae_pdf.py (+7/-7) l10n_mx_facturae/report/invoice_facturae_pdf.rml (+25/-26) l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py (+7/-7) l10n_mx_facturae_cbb/report/invoice_facturae_pdf.rml (+115/-118) l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.py (+8/-8) l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.rml (+42/-37) Text conflict in l10n_mx_company_multi_address/invoice_view_address.xml Contents conflict in l10n_mx_facturae/report/invoice_facturae_pdf.sxw Text conflict in l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.rml Contents conflict in l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.sxw |
| To merge this branch: | bzr merge lp://staging/~vauxoo/openerp-mexico-localization/addons-mx-trunk-facturae-multisuc-dev-yzk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Moisés López - http://www.vauxoo.com | Disapprove | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Moisés López - http://www.vauxoo.com (moylop260) wrote | # |
review:
Disapprove
Unmerged revisions
- 185. By Isaac López Zúñiga
-
[REF][l10n_
mx_company_ multi_address] renombra la vista a invoice_ view_address. xml - 184. By Isaac López Zúñiga
-
[FIX][l10n_
mx_company_ multi_address] Readonly removido - 183. By Isaac López Zúñiga
-
[IMP][l10n_
mx_company_ multi_address] address_ invoice_ company_ id cambiado a readonly - 182. By Isaac López Zúñiga
-
[REF]l10n_
mx_company_ multi_address] Add , after to city - 181. By Isaac López Zúñiga
-
[IMP][l10n_
mx_company_ multi_address] Lugar de expedicion correspondiente a la sucursal - 180. By Isaac López Zúñiga
-
[REF][l10n_
mx_company_ multi_address] Cambio a fin de linea LF - 179. By Isaac López Zúñiga
-
[IMP][l10n_
mx_company_ multi_address] Se agrega el regimen fiscal al xml - 178. By Isaac López Zúñiga
-
[IMP][l10n_
mx_company_ multi_address] Se quita el onchange de company - 177. By Isaac López Zúñiga
-
[ADD][l10n_
mx_company_ multi_address] Add address_ invoice_ company_ id to journal - 176. By Isaac López Zúñiga
-
[IMP][l10n_
mx_company_ multi_address] ADD inherit to _get_facturae_ invoice_ dict_data function
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Conflicto en los textos, migrar a nueva versión