Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/jose-button-print into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

  1. jose-button-print
  2. Merge into 6.0-trunk
Status: Merged
Merged at revision: 611
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/jose-button-print
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 144 lines (+37/-6)
8 files modified
l10n_ve_withholding_islr/i18n/es.po (+5/-0)
l10n_ve_withholding_islr/i18n/es_VE.po (+6/-0)
l10n_ve_withholding_islr/islr_wh_report.xml (+4/-1)
l10n_ve_withholding_islr/view/islr_wh_doc_view.xml (+5/-3)
l10n_ve_withholding_iva/i18n/es.po (+5/-0)
l10n_ve_withholding_iva/i18n/es_VE.po (+5/-0)
l10n_ve_withholding_iva/report/withholding_vat_report.xml (+5/-2)
l10n_ve_withholding_iva/view/wh_iva_view.xml (+2/-0)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/jose-button-print
Reviewer Review Type Date Requested Status
Gabriela Quilarque Approve
Review via email: mp+92350@code.launchpad.net

Description of the change

Changed button of print withholding

To post a comment you must log in.
Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Merge Realizado.

Revision history for this message
Gabriela Quilarque (gabrielaquilarque97) wrote :

Merge Realizado

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_withholding_islr/i18n/es.po'
2--- l10n_ve_withholding_islr/i18n/es.po 2012-01-17 00:07:23 +0000
3+++ l10n_ve_withholding_islr/i18n/es.po 2012-02-09 19:30:25 +0000
4@@ -21,6 +21,11 @@
5 msgstr "NO APLICA RETENCION"
6
7 #. module: l10n_ve_withholding_islr
8+#: view:islr.wh.doc:0
9+msgid "Print Withholding Income"
10+msgstr "Imprimir comprobante de retención"
11+
12+#. module: l10n_ve_withholding_islr
13 #: field:islr.wh.doc,date_uid:0
14 msgid "Withhold Date"
15 msgstr "Fecha de Retención"
16
17=== modified file 'l10n_ve_withholding_islr/i18n/es_VE.po'
18--- l10n_ve_withholding_islr/i18n/es_VE.po 2012-01-18 23:14:35 +0000
19+++ l10n_ve_withholding_islr/i18n/es_VE.po 2012-02-09 19:30:25 +0000
20@@ -26,6 +26,12 @@
21 msgstr "Fecha de Retención"
22
23 #. module: l10n_ve_withholding_islr
24+#: view:islr.wh.doc:0
25+msgid "Print Withholding Income"
26+msgstr "Imprimir comprobante de retención"
27+
28+
29+#. module: l10n_ve_withholding_islr
30 #: help:islr.wh.concept,rate_ids:0
31 msgid "Withholding Concept rate"
32 msgstr "Tasa asociada al concepto de retención"
33
34=== modified file 'l10n_ve_withholding_islr/islr_wh_report.xml'
35--- l10n_ve_withholding_islr/islr_wh_report.xml 2012-01-17 00:22:56 +0000
36+++ l10n_ve_withholding_islr/islr_wh_report.xml 2012-02-09 19:30:25 +0000
37@@ -8,7 +8,10 @@
38 rml="addons/l10n_ve_withholding_islr/report/wh_islr_report.rml"
39 string="Voucher Withholding Income"
40 auto="False"
41- header="False"/>
42+ header="False"
43+ menu="False"
44+ />
45+
46 <report
47 id="list_report_withholding_islr"
48 menu="True"
49
50=== modified file 'l10n_ve_withholding_islr/view/islr_wh_doc_view.xml'
51--- l10n_ve_withholding_islr/view/islr_wh_doc_view.xml 2012-01-27 14:03:00 +0000
52+++ l10n_ve_withholding_islr/view/islr_wh_doc_view.xml 2012-02-09 19:30:25 +0000
53@@ -143,8 +143,9 @@
54 <field name="state"/>
55 <button name="act_progress" string="Progress" states="draft" icon="gtk-go-forward"/>
56 <button name="act_confirmed" string="Confirmed" states="progress" icon="gtk-go-forward"/>
57- <button name="act_done" string="Done" states="confirmed" icon="gtk-execute"/>
58- <button name="act_cancel" string="Cancel" states="done" icon="gtk-cancel"/>
59+ <button name="act_done" string="Done" states="confirmed" icon="gtk-execute" />
60+ <button name="%(voucher_report_withholding_islr)d" string="Print Withholding Income" states="done" colspan="3" type="action" icon="gtk-execute"/>
61+ <button name="act_cancel" string="Cancel" states="done" icon="gtk-cancel" colspan="2" />
62 <button name="act_draft" colspan="2" string="Set to draft" states="cancel" icon="gtk-go-forward"/>
63 </group>
64 </form>
65@@ -284,7 +285,8 @@
66 <button name="act_progress" string="Progress" states="draft" type="workflow" icon="gtk-go-forward"/>
67 <button name="act_confirmed" string="Confirmed" states="progress" type="workflow" icon="gtk-go-forward"/>
68 <button name="act_done" string="Done" states="confirmed" type="workflow" icon="gtk-go-forward"/>
69- <button name="act_cancel" string="Cancel" states="done" type="workflow" icon="gtk-go-forward"/>
70+ <button name="%(voucher_report_withholding_islr)d" string="Print Withholding Income" colspan="3" states="done" type="action" icon="gtk-execute"/>
71+ <button name="act_cancel" string="Cancel" states="done" type="workflow" colspan="2" icon="gtk-go-forward"/>
72 <button name="act_draft" colspan="2" string="Set to draft" states="cancel" type="workflow" icon="gtk-go-forward"/>
73 </group>
74 </form>
75
76=== modified file 'l10n_ve_withholding_iva/i18n/es.po'
77--- l10n_ve_withholding_iva/i18n/es.po 2012-02-06 19:05:01 +0000
78+++ l10n_ve_withholding_iva/i18n/es.po 2012-02-09 19:30:25 +0000
79@@ -21,6 +21,11 @@
80 msgstr "Retención del IVA para leyes Venezolanas."
81
82 #. module: l10n_ve_withholding_iva
83+#: view:account.wh.iva:0
84+msgid "Print Voucher Withholding VAT"
85+msgstr "Imprimir comprobante de retención"
86+
87+#. module: l10n_ve_withholding_iva
88 #: help:account.wh.iva.line,move_id:0
89 msgid "Account entry"
90 msgstr "Cuenta de entrada"
91
92=== modified file 'l10n_ve_withholding_iva/i18n/es_VE.po'
93--- l10n_ve_withholding_iva/i18n/es_VE.po 2012-02-06 19:05:01 +0000
94+++ l10n_ve_withholding_iva/i18n/es_VE.po 2012-02-09 19:30:25 +0000
95@@ -26,6 +26,11 @@
96 msgstr "Cuenta de entrada"
97
98 #. module: l10n_ve_withholding_iva
99+#: view:account.wh.iva:0
100+msgid "Print Voucher Withholding VAT"
101+msgstr "Imprimir comprobante de retención"
102+
103+#. module: l10n_ve_withholding_iva
104 #: view:txt.iva:0
105 msgid "Withholding lines"
106 msgstr "Lineas de Retención"
107
108=== modified file 'l10n_ve_withholding_iva/report/withholding_vat_report.xml'
109--- l10n_ve_withholding_iva/report/withholding_vat_report.xml 2012-01-03 15:23:32 +0000
110+++ l10n_ve_withholding_iva/report/withholding_vat_report.xml 2012-02-09 19:30:25 +0000
111@@ -6,8 +6,11 @@
112 model="account.wh.iva"
113 name="account.wh.iva"
114 rml="addons/l10n_ve_withholding_iva/report/withholding_vat_report.rml"
115- string="Voucher Withhondig VAT"
116+ string="Voucher Withholding VAT"
117 auto="False"
118- header="True"/>
119+ header="True"
120+ menu="False"
121+ />
122+
123 </data>
124 </openerp>
125
126=== modified file 'l10n_ve_withholding_iva/view/wh_iva_view.xml'
127--- l10n_ve_withholding_iva/view/wh_iva_view.xml 2012-01-19 20:10:51 +0000
128+++ l10n_ve_withholding_iva/view/wh_iva_view.xml 2012-02-09 19:30:25 +0000
129@@ -176,6 +176,7 @@
130 </group>
131 <group col="2" colspan="2">
132 <button name="cancel" colspan="2" states="done" string="Cancel" icon="gtk-cancel"/>
133+ <button name="%(withholding_vat)d" type="action" colspan="2" states="done" string="Print Voucher Withholding VAT" icon="gtk-execute"/>
134 <button name="set_to_draft" colspan="2" states="cancel" string="Set to draft" icon="terp-stock_effects-object-colorize"/>
135 <button colspan="2" name="compute_amount_wh" states="draft" string="Compute Withholding Vat" type="object" icon="terp-stock_format-scientific"/>
136 <field name="amount_base_ret"/>
137@@ -227,6 +228,7 @@
138 </group>
139 <group col="2" colspan="2">
140 <button name="cancel" colspan="2" states="done" string="Cancel" icon="gtk-cancel"/>
141+ <button name="%(withholding_vat)d" type="action" colspan="2" states="done" string="Print Voucher Withholding VAT" icon="gtk-execute"/>
142 <button name="set_to_draft" colspan="2" states="cancel" string="Set to draft" icon="terp-stock_effects-object-colorize"/>
143
144 <!--