Merge lp://qastaging/~openerp-brazil-core-team/openerp.pt-br-localiz/l10n_br_inscr_est_refatorada_v2 into lp://qastaging/openerp.pt-br-localiz/6.1

Proposed by Renato Lima - http://www.akretion.com
Status: Merged
Approved by: Renato Lima - http://www.akretion.com
Approved revision: 285
Merge reported by: Renato Lima - http://www.akretion.com
Merged at revision: not available
Proposed branch: lp://qastaging/~openerp-brazil-core-team/openerp.pt-br-localiz/l10n_br_inscr_est_refatorada_v2
Merge into: lp://qastaging/openerp.pt-br-localiz/6.1
Diff against target: 1189 lines (+675/-323) (has conflicts)
4 files modified
l10n_br_base/__openerp__.py (+4/-1)
l10n_br_base/partner.py (+449/-322)
l10n_br_base/test/base_inscr_est_invalid.yml (+111/-0)
l10n_br_base/test/base_inscr_est_valid.yml (+111/-0)
Text conflict in l10n_br_base/partner.py
To merge this branch: bzr merge lp://qastaging/~openerp-brazil-core-team/openerp.pt-br-localiz/l10n_br_inscr_est_refatorada_v2
Reviewer Review Type Date Requested Status
Renato Lima - http://www.akretion.com Approve
Review via email: mp+119740@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Renato Lima - http://www.akretion.com (renatonlima) wrote :

Integrar o desenvolvimento das regras de validação das inscrições estaduais

Revision history for this message
Renato Lima - http://www.akretion.com (renatonlima) wrote :

Antes de fazer o merge resolver o conflito do arquivo l10n_br_base/partner.py

review: Needs Fixing
Revision history for this message
Renato Lima - http://www.akretion.com (renatonlima) wrote :

Corrigido conflitos

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.