Merge lp://qastaging/~vauxoo/openerp-venezuela-localization/7.0-YAML-rev3-dev-hbto into lp://qastaging/openerp-venezuela-localization
Proposed by
hbto [Vauxoo] http://www.vauxoo.com
| Status: | Merged |
|---|---|
| Merged at revision: | 937 |
| Proposed branch: | lp://qastaging/~vauxoo/openerp-venezuela-localization/7.0-YAML-rev3-dev-hbto |
| Merge into: | lp://qastaging/openerp-venezuela-localization |
| Diff against target: |
2541 lines (+1622/-238) (has conflicts) 8 files modified
l10n_ve_withholding_iva/__openerp__.py (+5/-2) l10n_ve_withholding_iva/model/wh_iva.py (+9/-0) l10n_ve_withholding_iva/test/purchase_invoice_wh_iva.yml (+182/-62) l10n_ve_withholding_iva/test/purchase_wh_iva.yml (+221/-0) l10n_ve_withholding_iva/test/purchase_wh_iva_sequence.yml (+213/-0) l10n_ve_withholding_iva/test/sale_invoice_wh_iva.yml (+75/-72) l10n_ve_withholding_iva/test/sale_wh_iva.yml (+762/-102) l10n_ve_withholding_iva/test/sale_wh_iva_sequence.yml (+155/-0) Text conflict in l10n_ve_withholding_iva/model/wh_iva.py |
| To merge this branch: | bzr merge lp://qastaging/~vauxoo/openerp-venezuela-localization/7.0-YAML-rev3-dev-hbto |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| hbto [Vauxoo] http://www.vauxoo.com | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
