openerp-mexico-localization

Merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_diot_report_add_csv_file_dev_ernesto into lp:openerp-mexico-localization/7.0

  1. 7.0-l10n_mx_diot_report_add_csv_file_dev_ernesto
  2. Merge into 7.0
Status: Merged
Merged at revision: 272
Proposed branch: lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_diot_report_add_csv_file_dev_ernesto
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 128 lines (+32/-11)
4 files modified
l10n_mx_diot_report/i18n/es.po (+14/-4)
l10n_mx_diot_report/i18n/es_MX.po (+14/-4)
l10n_mx_diot_report/wizard/wizard_diot_report.py (+2/-2)
l10n_mx_diot_report/wizard/wizard_diot_report_view.xml (+2/-1)
To merge this branch: bzr merge lp:~vauxoo/openerp-mexico-localization/7.0-l10n_mx_diot_report_add_csv_file_dev_ernesto
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Luis Ernesto García Medina - http://www.vauxoo.com Pending
Isaac López Zúñiga Pending
Review via email: mp+182186@code.launchpad.net

This proposal supersedes a proposal from 2013-08-23.

Description of the change

Cambio en el orden en el que se muestran las descargas, cambios en las ayudas de los archivos y se agregan traducciones

To post a comment you must log in.
Revision history for this message
Luis Ernesto García Medina - http://www.vauxoo.com (ernesto-gm) wrote : Posted in a previous version of this proposal

Se agregaron los totales de los impuestos al archivo CSV

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_mx_diot_report/i18n/es.po'
2--- l10n_mx_diot_report/i18n/es.po 2013-08-23 23:06:07 +0000
3+++ l10n_mx_diot_report/i18n/es.po 2013-08-26 18:56:24 +0000
4@@ -78,8 +78,8 @@
5
6 #. module: l10n_mx_diot_report
7 #: help:account.diot.report,file:0
8-msgid "This is File for export to SAT"
9-msgstr "Este es el archivo para exportar al SAT"
10+msgid "This file, you can import the SAT"
11+msgstr "Este archivo, lo podrá importar directamente al SAT"
12
13 #. module: l10n_mx_diot_report
14 #: selection:res.partner,type_of_operation:0
15@@ -198,8 +198,8 @@
16
17 #. module: l10n_mx_diot_report
18 #: help:account.diot.report,file_csv:0
19-msgid "This is the file to collate"
20-msgstr "Este es el archivo para cotejar"
21+msgid "It will open in your program office, to validate numbers"
22+msgstr "Se abrirá en su programa office, para validar números"
23
24 #. module: l10n_mx_diot_report
25 #: selection:res.partner,diot_country:0
26@@ -327,6 +327,11 @@
27 msgstr "ZW - Zimbawe"
28
29 #. module: l10n_mx_diot_report
30+#: view:account.diot.report:0
31+msgid "Spreadsheet:"
32+msgstr "Hoja de Cálculo:"
33+
34+#. module: l10n_mx_diot_report
35 #: selection:res.partner,diot_country:0
36 msgid "DZ - Argelia"
37 msgstr "DZ - Argelia"
38@@ -382,6 +387,11 @@
39 msgstr "HU - Hungaria"
40
41 #. module: l10n_mx_diot_report
42+#: view:account.diot.report:0
43+msgid "TXT to import the SAT:"
44+msgstr "TXT para importar al SAT:"
45+
46+#. module: l10n_mx_diot_report
47 #: selection:res.partner,diot_country:0
48 msgid "CU - Cuba"
49 msgstr "CU - Cuba"
50
51=== modified file 'l10n_mx_diot_report/i18n/es_MX.po'
52--- l10n_mx_diot_report/i18n/es_MX.po 2013-08-23 23:06:07 +0000
53+++ l10n_mx_diot_report/i18n/es_MX.po 2013-08-26 18:56:24 +0000
54@@ -80,8 +80,8 @@
55
56 #. module: l10n_mx_diot_report
57 #: help:account.diot.report,file:0
58-msgid "This is File for export to SAT"
59-msgstr "Este es el archivo para exportar al SAT"
60+msgid "This file, you can import the SAT"
61+msgstr "Este archivo, lo podrá importar directamente al SAT"
62
63 #. module: l10n_mx_diot_report
64 #: selection:res.partner,type_of_operation:0
65@@ -200,8 +200,8 @@
66
67 #. module: l10n_mx_diot_report
68 #: help:account.diot.report,file_csv:0
69-msgid "This is the file to collate"
70-msgstr "Este es el archivo para cotejar"
71+msgid "It will open in your program office, to validate numbers"
72+msgstr "Se abrirá en su programa office, para validar números"
73
74 #. module: l10n_mx_diot_report
75 #: selection:res.partner,diot_country:0
76@@ -329,6 +329,11 @@
77 msgstr "ZW - Zimbawe"
78
79 #. module: l10n_mx_diot_report
80+#: view:account.diot.report:0
81+msgid "Spreadsheet:"
82+msgstr "Hoja de Cálculo:"
83+
84+#. module: l10n_mx_diot_report
85 #: selection:res.partner,diot_country:0
86 msgid "DZ - Argelia"
87 msgstr "DZ - Argelia"
88@@ -384,6 +389,11 @@
89 msgstr "HU - Hungaria"
90
91 #. module: l10n_mx_diot_report
92+#: view:account.diot.report:0
93+msgid "TXT to import the SAT:"
94+msgstr "TXT para importar al SAT:"
95+
96+#. module: l10n_mx_diot_report
97 #: selection:res.partner,diot_country:0
98 msgid "CU - Cuba"
99 msgstr "CU - Cuba"
100
101=== modified file 'l10n_mx_diot_report/wizard/wizard_diot_report.py'
102--- l10n_mx_diot_report/wizard/wizard_diot_report.py 2013-08-25 07:03:10 +0000
103+++ l10n_mx_diot_report/wizard/wizard_diot_report.py 2013-08-26 18:56:24 +0000
104@@ -46,8 +46,8 @@
105 'filename': fields.char('File name', size=128, readonly=True,
106 help='This is File name'),
107 'filename_csv': fields.char('File name', size=128, readonly=True),
108- 'file': fields.binary('File', readonly=True, help='This is File for export to SAT'),
109- 'file_csv': fields.binary('File', readonly=True, help='This is the file to collate'),
110+ 'file': fields.binary('File', readonly=True, help='This file, you can import the SAT'),
111+ 'file_csv': fields.binary('File', readonly=True, help='It will open in your program office, to validate numbers'),
112 'state': fields.selection([('choose', 'Choose'), ('get', 'Get'),
113 ('not_file', 'Not File')]),
114 }
115
116=== modified file 'l10n_mx_diot_report/wizard/wizard_diot_report_view.xml'
117--- l10n_mx_diot_report/wizard/wizard_diot_report_view.xml 2013-08-23 23:06:07 +0000
118+++ l10n_mx_diot_report/wizard/wizard_diot_report_view.xml 2013-08-26 18:56:24 +0000
119@@ -16,7 +16,8 @@
120 <div states="get">
121 <h2>You DIOT report has been successfully created!</h2>
122 <p>Here is the exported DIOT Report file:</p>
123- <p>TXT: <field name="file" readonly="1" filename="filename"/> CSV: <field name="file_csv" readonly="1" filename="filename_csv"/></p>
124+ <p>Spreadsheet: <field name="file_csv" readonly="1" filename="filename_csv"/></p>
125+ <p>TXT to import the SAT: <field name="file" readonly="1" filename="filename"/> </p>
126 </div>
127 <div states="not_file">
128 <h2>You DIOT report not has been created!</h2>