Openerp Venezuela

Merge lp://qastaging/~vauxoo/openerp-venezuela-localization/7.0-wh-all-ref-1704-kty into lp://qastaging/openerp-venezuela-localization

7.0-wh-all-ref-1704-kty
Merge into trunk

Proposed by Katherine Zaoral (Vauxoo) on 2014-07-01

Status:	Merged
Merged at revision:	1000
Proposed branch:	lp://qastaging/~vauxoo/openerp-venezuela-localization/7.0-wh-all-ref-1704-kty
Merge into:	lp://qastaging/openerp-venezuela-localization
Diff against target:	2961 lines (+925/-398) (has conflicts) 31 files modified l10n_ve_fiscal_book/__openerp__.py (+2/-2) l10n_ve_fiscal_book/model/fiscal_book.py (+63/-44) l10n_ve_fiscal_book/view/fiscal_book.xml (+20/-3) l10n_ve_imex/model/customs_form.py (+17/-47) l10n_ve_imex/model/invoice.py (+30/-13) l10n_ve_imex/view/customs_form.xml (+5/-1) l10n_ve_withholding/model/account.py (+12/-2) l10n_ve_withholding/test/wh_pay_invoice.yml (+2/-2) l10n_ve_withholding_islr/model/islr_wh_doc.py (+23/-9) l10n_ve_withholding_islr/model/islr_xml_wh.py (+39/-12) l10n_ve_withholding_islr/security/ir.model.access.csv (+31/-15) l10n_ve_withholding_islr/security/wh_islr_security.xml (+3/-1) l10n_ve_withholding_islr/view/islr_xml_wh.xml (+31/-10) l10n_ve_withholding_islr/wizard/__init__.py (+2/-1) l10n_ve_withholding_islr/wizard/employee_income_wh.py (+211/-0) l10n_ve_withholding_islr/wizard/employee_income_wh.xml (+28/-0) l10n_ve_withholding_iva/__openerp__.py (+8/-7) l10n_ve_withholding_iva/model/generate_txt.py (+34/-32) l10n_ve_withholding_iva/model/invoice.py (+67/-36) l10n_ve_withholding_iva/model/partner.py (+7/-0) l10n_ve_withholding_iva/model/res_company.py (+2/-2) l10n_ve_withholding_iva/model/wh_iva.py (+113/-129) l10n_ve_withholding_iva/test/purchase_wh_iva.yml (+2/-0) l10n_ve_withholding_iva/test/purchase_wh_iva_sequence.yml (+40/-10) l10n_ve_withholding_iva/view/account_invoice_view.xml (+10/-6) l10n_ve_withholding_iva/view/partner_view.xml (+1/-0) l10n_ve_withholding_iva/view/res_company_view.xml (+1/-1) l10n_ve_withholding_iva/view/wh_iva_view.xml (+24/-13) l10n_ve_withholding_iva/wizard/__init__.py (+1/-0) l10n_ve_withholding_iva/wizard/wizard_wh_nro.py (+68/-0) l10n_ve_withholding_iva/wizard/wizard_wh_nro_view.xml (+28/-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-wh-all-ref-1704-kty
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Katherine Zaoral (Vauxoo)			Approve on 2014-07-21
Review via email: mp+225228@code.qastaging.launchpad.net

Description of the change

[MERGE] port forwarding from revno 6 to 7

Revision history for this message

Katherine Zaoral (Vauxoo) (kathy-zaoral) wrote on 2014-07-01:

this merge is not ready. only generate the mp to run some test in the runbot.

review: Needs Fixing

lp://qastaging/~vauxoo/openerp-venezuela-localization/7.0-wh-all-ref-1704-kty updated on 2014-07-21

1015. By Katherine Zaoral (Vauxoo) on 2014-07-11: [ADD] more port forwarding from version 6.0.
1016. By Katherine Zaoral (Vauxoo) on 2014-07-11: [ADD] more port forwarding from revision 6.0.
1017. By Katherine Zaoral (Vauxoo) on 2014-07-11: [FIX] change the raise message.
1018. By Katherine Zaoral (Vauxoo) on 2014-07-11: [IMP] manage two methods, find_fortnight and _find_fortnight to manage the
fortnigh field like a boolean or a string element.
1019. By Katherine Zaoral (Vauxoo) on 2014-07-11: [IMP] adapt the calls to find_fortnight method to be compatible with the new
version of the method.
1020. By Katherine Zaoral (Vauxoo) on 2014-07-11: [IMP] rename the res_company.wh_consolidate field to 'consolidate_vat_wh'.
1021. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] add the 'consolidate_vat_wh' boolean field to the res.partner model.
1022. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] add the consolidate_vat_wh boolean field to the partner form view.
1023. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] add boolean field consolidate_vat_wh to the acc.wh.doc.
1024. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] add the consolidate_vat_wh to the iva wh doc form view.
1025. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] change the group_wh_iva_doc field name to consolidate_vat_wh. Also remove
the place where is used to set te wh lines and add a TODO of what to do and
when with this field.
1026. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] comment the port forwardinf wizard from revno 6.0 jmarquez.
1027. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] add wizard from port forwarding from version 6.0 jmarquez.
1028. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] update the test to manage the new result manage for the find_fortnight
method.
1029. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] add debug data to run the test in the runbot.
1030. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] revert changes introduces in revno 1008 and 1029.
1031. By Katherine Zaoral (Vauxoo) on 2014-07-14: [FIX] the wh lines only are generate in the purchase operations not in the sale
operations.
1032. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] add the voucher date.
1033. By Katherine Zaoral (Vauxoo) on 2014-07-14: [FIX] date format.
1034. By Katherine Zaoral (Vauxoo) on 2014-07-14: [FIX] manage correctly the date wth the eval method in the yaml.
1035. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] add date_ret to the supplier wh doc.
1036. By Katherine Zaoral (Vauxoo) on 2014-07-14: [FIX] add missing dates to the wh document.
1037. By Katherine Zaoral (Vauxoo) on 2014-07-14: [FIX] add the date and date_ret wrongly. set it in a more propertly place.
1038. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] I set the date and date_ret in the wh documetns before confirm.
1039. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] impor time to the needed yaml tests.
1040. By Katherine Zaoral (Vauxoo) on 2014-07-14: [CC] comment the test.
1041. By Katherine Zaoral (Vauxoo) on 2014-07-14: [ADD] comment all the iva test. need to be fixed.
1042. By Katherine Zaoral (Vauxoo) on 2014-07-18: [ADD] comment the fiscal book yaml test cases.
1043. By Katherine Zaoral (Vauxoo) on 2014-07-21: [FIX] remove type of view element in the view record. This element was
generating a warning in the server log and a orange runbot.
1044. By Katherine Zaoral (Vauxoo) on 2014-07-21: [FIX] remove type of view element in the view record. This element was
generating a warning in the server log and a orange runbot.