Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-whmuni-rev-kty into lp:openerp-venezuela-localization
- ovl70-whmuni-rev-kty
- Merge into trunk
Proposed by
Katherine Zaoral (Vauxoo)
Status: | Merged |
---|---|
Merged at revision: | 778 |
Proposed branch: | lp:~vauxoo/openerp-venezuela-localization/ovl70-whmuni-rev-kty |
Merge into: | lp:openerp-venezuela-localization |
Diff against target: |
1489 lines (+322/-303) 17 files modified
l10n_ve_withholding_muni/__init__.py (+1/-7) l10n_ve_withholding_muni/__openerp__.py (+23/-20) l10n_ve_withholding_muni/i18n/es.po (+32/-32) l10n_ve_withholding_muni/i18n/es_VE.po (+31/-31) l10n_ve_withholding_muni/model/__init__.py (+28/-0) l10n_ve_withholding_muni/model/invoice.py (+59/-49) l10n_ve_withholding_muni/model/partner.py (+4/-4) l10n_ve_withholding_muni/model/wh_muni.py (+128/-106) l10n_ve_withholding_muni/report/wh_muni_report.py (+5/-5) l10n_ve_withholding_muni/report/wh_muni_report.rml (+2/-1) l10n_ve_withholding_muni/report/wh_muni_report.xml (+4/-2) l10n_ve_withholding_muni/view/account_invoice_view.xml (+0/-3) l10n_ve_withholding_muni/view/partner_view.xml (+0/-1) l10n_ve_withholding_muni/view/wh_muni_view.xml (+0/-5) l10n_ve_withholding_muni/wizard/out.txt (+0/-1) l10n_ve_withholding_muni/wizard/prueba1.py (+0/-33) l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml (+5/-3) |
To merge this branch: | bzr merge lp:~vauxoo/openerp-venezuela-localization/ovl70-whmuni-rev-kty |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
hbto [Vauxoo] http://www.vauxoo.com | Approve | ||
Nhomar - Vauxoo | Pending | ||
Review via email: mp+146544@code.launchpad.net |
This proposal supersedes a proposal from 2013-01-31.
Commit message
Description of the change
[MERGE] First Revision WH Muni
from Yani and Kty's branch
To post a comment you must log in.
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote : | # |
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) : | # |
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_muni/__init__.py' |
2 | --- l10n_ve_withholding_muni/__init__.py 2011-10-25 20:33:16 +0000 |
3 | +++ l10n_ve_withholding_muni/__init__.py 2013-02-05 03:03:22 +0000 |
4 | @@ -23,10 +23,4 @@ |
5 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
6 | ################################################################################ |
7 | |
8 | - |
9 | -import wh_muni |
10 | -import invoice |
11 | -import partner |
12 | -import report |
13 | -#import wizard |
14 | -import workflow |
15 | +import model |
16 | |
17 | === modified file 'l10n_ve_withholding_muni/__openerp__.py' |
18 | --- l10n_ve_withholding_muni/__openerp__.py 2012-09-11 00:38:30 +0000 |
19 | +++ l10n_ve_withholding_muni/__openerp__.py 2013-02-05 03:03:22 +0000 |
20 | @@ -1,17 +1,17 @@ |
21 | #!/usr/bin/python |
22 | # -*- encoding: utf-8 -*- |
23 | -########################################################################### |
24 | +############################################################################# |
25 | # Module Writen to OpenERP, Open Source Management Solution |
26 | # Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>). |
27 | # All Rights Reserved |
28 | -###############Credits###################################################### |
29 | -# Coded by: javier@vauxoo.com |
30 | +###############Credits####################################################### |
31 | +# Coded by: javier@vauxoo.com |
32 | # Planified by: Nhomar Hernandez |
33 | # Audited by: Vauxoo C.A. |
34 | ############################################################################# |
35 | # This program is free software: you can redistribute it and/or modify |
36 | -# it under the terms of the GNU Affero General Public License as published by |
37 | -# the Free Software Foundation, either version 3 of the License, or |
38 | +# it under the terms of the GNU Affero General Public License as published |
39 | +# by the Free Software Foundation, either version 3 of the License, or |
40 | # (at your option) any later version. |
41 | # |
42 | # This program is distributed in the hope that it will be useful, |
43 | @@ -21,26 +21,29 @@ |
44 | # |
45 | # You should have received a copy of the GNU Affero General Public License |
46 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
47 | -################################################################################ |
48 | +############################################################################# |
49 | { |
50 | - "name" : "Local Withholding Venezuelan laws", |
51 | - "version" : "0.2", |
52 | - "author" : "Vauxoo", |
53 | - "website" : "http://vauxoo.com", |
54 | + "name": "Local Withholding Venezuelan laws", |
55 | + "version": "0.2", |
56 | + "author": "Vauxoo", |
57 | + "website": "http://vauxoo.com", |
58 | "category": 'Generic Modules/Accounting', |
59 | - "description": """Management local withholding for Venezuelan tax laws |
60 | + "description": """Management local withholding for Venezuelan tax laws |
61 | """, |
62 | - "depends" : ["l10n_ve_withholding"], |
63 | - 'data': [ |
64 | + 'init_xml': [], |
65 | + "depends": ["l10n_ve_withholding"], |
66 | + 'update_xml': [ |
67 | 'security/wh_muni_security.xml', |
68 | 'security/ir.model.access.csv', |
69 | - 'account_invoice_view.xml', |
70 | - 'partner_view.xml', |
71 | - 'wh_muni_view.xml', |
72 | - "wh_muni_sequence.xml", |
73 | - "wh_muni_report.xml", |
74 | - "workflow/l10n_ve_wh_muni_wf.xml", |
75 | - #~ "workflow/account_workflow.xml", |
76 | + 'view/account_invoice_view.xml', |
77 | + 'view/partner_view.xml', |
78 | + 'view/wh_muni_view.xml', |
79 | + 'data/wh_muni_sequence.xml', |
80 | + 'report/wh_muni_report.xml', |
81 | + 'workflow/l10n_ve_wh_muni_wf.xml', |
82 | + ], |
83 | + 'data': [ |
84 | + 'data/wh_muni_sequence.xml', |
85 | ], |
86 | 'demo_xml': [], |
87 | 'test': [], |
88 | |
89 | === added directory 'l10n_ve_withholding_muni/data' |
90 | === renamed file 'l10n_ve_withholding_muni/wh_muni_sequence.xml' => 'l10n_ve_withholding_muni/data/wh_muni_sequence.xml' |
91 | === modified file 'l10n_ve_withholding_muni/i18n/es.po' |
92 | --- l10n_ve_withholding_muni/i18n/es.po 2012-03-13 22:37:59 +0000 |
93 | +++ l10n_ve_withholding_muni/i18n/es.po 2013-02-05 03:03:22 +0000 |
94 | @@ -29,7 +29,7 @@ |
95 | #. module: l10n_ve_withholding_muni |
96 | #: sql_constraint:account.wh.munici.line:0 |
97 | msgid "The invoice has already assigned in local withholding, you cannot assigned it twice!" |
98 | -msgstr "La Factura ya ha sido asignada a una retencion municipal, no puede ser asignada dos veces" |
99 | +msgstr "La Factura ya ha sido asignada a una retención municipal, no puede ser asignada dos veces" |
100 | |
101 | #. module: l10n_ve_withholding_muni |
102 | #: report:wh.muni_rep:0 |
103 | @@ -40,7 +40,7 @@ |
104 | #: field:account.wh.munici,company_id:0 |
105 | #: help:account.wh.munici,company_id:0 |
106 | msgid "Company" |
107 | -msgstr "Compañia" |
108 | +msgstr "Compañía" |
109 | |
110 | #. module: l10n_ve_withholding_muni |
111 | #: report:wh.muni_rep:0 |
112 | @@ -56,7 +56,7 @@ |
113 | #: model:ir.actions.act_window,name:l10n_ve_withholding_muni.action_account_wh_muni_supplier |
114 | #: model:ir.ui.menu,name:l10n_ve_withholding_muni.menu_action_account_wh_muni_supplier |
115 | msgid "Local Withholding Supplier" |
116 | -msgstr "Proveedor de Retencion Municipal " |
117 | +msgstr "Proveedor de Retención Municipal " |
118 | |
119 | #. module: l10n_ve_withholding_muni |
120 | #: view:account.invoice:0 |
121 | @@ -103,17 +103,17 @@ |
122 | #. module: l10n_ve_withholding_muni |
123 | #: constraint:res.partner:0 |
124 | msgid "Error ! Partner's VAT must be a unique value or empty" |
125 | -msgstr "Error ! El RIF del partner debe ser unico a vacio " |
126 | +msgstr "Error ! El RIF del partner debe ser único o vacio " |
127 | |
128 | #. module: l10n_ve_withholding_muni |
129 | #: field:account.wh.munici,date_ret:0 |
130 | msgid "Withholding date" |
131 | -msgstr "Fecha de Retencion" |
132 | +msgstr "Fecha de Retención" |
133 | |
134 | #. module: l10n_ve_withholding_muni |
135 | #: help:account.wh.munici,type:0 |
136 | msgid "Withholding type" |
137 | -msgstr "Tipo de retencion" |
138 | +msgstr "Tipo de retención" |
139 | |
140 | #. module: l10n_ve_withholding_muni |
141 | #: view:account.wh.munici:0 |
142 | @@ -145,7 +145,7 @@ |
143 | #: field:account.wh.munici,partner_id:0 |
144 | #: model:ir.model,name:l10n_ve_withholding_muni.model_res_partner |
145 | msgid "Partner" |
146 | -msgstr "Compañia" |
147 | +msgstr "Compañía" |
148 | |
149 | #. module: l10n_ve_withholding_muni |
150 | #: help:account.wh.munici.line,invoice_id:0 |
151 | @@ -171,7 +171,7 @@ |
152 | #. module: l10n_ve_withholding_muni |
153 | #: view:account.wh.munici:0 |
154 | msgid "Accounting Date of Withhold" |
155 | -msgstr "Fecha contable de la retencion" |
156 | +msgstr "Fecha contable de la retención" |
157 | |
158 | #. module: l10n_ve_withholding_muni |
159 | #: selection:account.wh.munici,type:0 |
160 | @@ -181,7 +181,7 @@ |
161 | #. module: l10n_ve_withholding_muni |
162 | #: help:account.wh.munici.line,name:0 |
163 | msgid "Local Withholding line Description" |
164 | -msgstr "Descripcion de la linea de retencion Municipal" |
165 | +msgstr "Descripcion de la línea de retención Municipal" |
166 | |
167 | #. module: l10n_ve_withholding_muni |
168 | #: report:wh.muni_rep:0 |
169 | @@ -196,18 +196,18 @@ |
170 | #. module: l10n_ve_withholding_muni |
171 | #: field:account.wh.munici,munici_line_ids:0 |
172 | msgid "Local withholding lines" |
173 | -msgstr "Lineas de Retenciones Municipales" |
174 | +msgstr "Líneas de Retenciones Municipales" |
175 | |
176 | #. module: l10n_ve_withholding_muni |
177 | #: help:account.wh.munici.line,wh_loc_rate:0 |
178 | msgid "Local withholding rate" |
179 | -msgstr "Porcentaje de Retencion Municipal" |
180 | +msgstr "Porcentaje de Retención Municipal" |
181 | |
182 | #. module: l10n_ve_withholding_muni |
183 | #: code:addons/l10n_ve_withholding_muni/wh_muni.py:113 |
184 | #, python-format |
185 | msgid "The line containing the document '%s' looks as if the amount withheld was wrong please check.!" |
186 | -msgstr "La línea que contiene el documento de '% s' parece como si la cantidad retenida esta erronea por favor verifique.!" |
187 | +msgstr "La línea que contiene el documento de '% s' parece como si la cantidad retenida esta errónea por favor verifique.!" |
188 | |
189 | #. module: l10n_ve_withholding_muni |
190 | #: field:res.partner,property_wh_munici_payable:0 |
191 | @@ -218,12 +218,12 @@ |
192 | #: code:addons/l10n_ve_withholding_muni/wh_muni.py:113 |
193 | #, python-format |
194 | msgid "Invalid action !" |
195 | -msgstr "Accion Invalida" |
196 | +msgstr "Acción Inválida" |
197 | |
198 | #. module: l10n_ve_withholding_muni |
199 | #: view:account.wh.munici:0 |
200 | msgid "Other Information" |
201 | -msgstr "Otra Informacion" |
202 | +msgstr "Otra Información" |
203 | |
204 | #. module: l10n_ve_withholding_muni |
205 | #: help:account.wh.munici,amount:0 |
206 | @@ -265,7 +265,7 @@ |
207 | #: model:ir.actions.act_window,name:l10n_ve_withholding_muni.action_account_wh_muni_customer |
208 | #: model:ir.ui.menu,name:l10n_ve_withholding_muni.menu_action_account_wh_muni_customer |
209 | msgid "Local Withholding Customer" |
210 | -msgstr "Cliente de Retencion Municipal" |
211 | +msgstr "Cliente de Retención Municipal" |
212 | |
213 | #. module: l10n_ve_withholding_muni |
214 | #: field:account.wh.munici.line,concepto_id:0 |
215 | @@ -287,7 +287,7 @@ |
216 | #: view:account.wh.munici:0 |
217 | #: model:ir.model,name:l10n_ve_withholding_muni.model_account_wh_munici |
218 | msgid "Local Withholding" |
219 | -msgstr "Retencion Municipal" |
220 | +msgstr "Retención Municipal" |
221 | |
222 | #. module: l10n_ve_withholding_muni |
223 | #: help:account.wh.munici,munici_line_ids:0 |
224 | @@ -297,7 +297,7 @@ |
225 | #. module: l10n_ve_withholding_muni |
226 | #: report:wh.muni_rep:0 |
227 | msgid "COMPROBANTE DE RETENCION DE IMPUESTOS MUNICIPALES DE FACTURA:" |
228 | -msgstr "COMPROBANTE DE RETENCION DE IMPUESTOS MUNICIPALES DE FACTURA:" |
229 | +msgstr "COMPROBANTE DE RETENCIÓN DE IMPUESTOS MUNICIPALES DE FACTURA:" |
230 | |
231 | #. module: l10n_ve_withholding_muni |
232 | #: help:account.wh.munici,state:0 |
233 | @@ -323,27 +323,27 @@ |
234 | #. module: l10n_ve_withholding_muni |
235 | #: view:account.wh.munici:0 |
236 | msgid "Withholding" |
237 | -msgstr "Retencion" |
238 | +msgstr "Retención" |
239 | |
240 | #. module: l10n_ve_withholding_muni |
241 | #: model:ir.model,name:l10n_ve_withholding_muni.model_account_wh_munici_line |
242 | msgid "Local Withholding Line" |
243 | -msgstr "Linea de Retencion Municipal" |
244 | +msgstr "Línea de Retención Municipal" |
245 | |
246 | #. module: l10n_ve_withholding_muni |
247 | #: view:account.wh.munici.line:0 |
248 | msgid "Local Withholding line " |
249 | -msgstr "Linea de Retencion Municipal" |
250 | +msgstr "Línea de Retención Municipal" |
251 | |
252 | #. module: l10n_ve_withholding_muni |
253 | #: help:account.wh.munici,date_ret:0 |
254 | msgid "Keep empty to use the current date" |
255 | -msgstr "Mantenga Vacio para usar la fecha actual" |
256 | +msgstr "Mantenga Vacío para usar la fecha actual" |
257 | |
258 | #. module: l10n_ve_withholding_muni |
259 | #: help:account.wh.munici,code:0 |
260 | msgid "Withholding reference" |
261 | -msgstr "Referencia de retencion" |
262 | +msgstr "Referencia de retención" |
263 | |
264 | #. module: l10n_ve_withholding_muni |
265 | #: code:addons/l10n_ve_withholding_muni/wh_muni.py:149 |
266 | @@ -365,7 +365,7 @@ |
267 | #. module: l10n_ve_withholding_muni |
268 | #: help:account.wh.munici.line,concepto_id:0 |
269 | msgid "Local withholding concept" |
270 | -msgstr "Concepto de Retencion Municipal" |
271 | +msgstr "Concepto de Retención Municipal" |
272 | |
273 | #. module: l10n_ve_withholding_muni |
274 | #: help:account.invoice,wh_local:0 |
275 | @@ -380,12 +380,12 @@ |
276 | #. module: l10n_ve_withholding_muni |
277 | #: help:account.wh.munici,period_id:0 |
278 | msgid "Keep empty to use the period of the validation(Withholding date) date." |
279 | -msgstr "Mantenga vacio para usar el periodo de la fecha de validacion (Fecha de Retenion)" |
280 | +msgstr "Mantenga vacío para usar el periodo de la fecha de validación (Fecha de Retención)" |
281 | |
282 | #. module: l10n_ve_withholding_muni |
283 | #: field:account.wh.munici,code:0 |
284 | msgid "Code" |
285 | -msgstr "Codigo" |
286 | +msgstr "Código" |
287 | |
288 | #. module: l10n_ve_withholding_muni |
289 | #: report:wh.muni_rep:0 |
290 | @@ -405,7 +405,7 @@ |
291 | #. module: l10n_ve_withholding_muni |
292 | #: field:account.wh.munici,number:0 |
293 | msgid "Number" |
294 | -msgstr "Numero" |
295 | +msgstr "Número" |
296 | |
297 | #. module: l10n_ve_withholding_muni |
298 | #: report:wh.muni_rep:0 |
299 | @@ -432,7 +432,7 @@ |
300 | #: code:addons/l10n_ve_withholding_muni/wh_muni.py:163 |
301 | #, python-format |
302 | msgid "No se encontro un periodo fiscal para esta fecha: '%s' por favor verificar.!" |
303 | -msgstr "No se encontro un periodo fiscal para esta fecha: '%s' por favor verificar.!" |
304 | +msgstr "No se encontró un periodo fiscal para esta fecha: '%s' por favor verificar.!" |
305 | |
306 | #. module: l10n_ve_withholding_muni |
307 | #: selection:account.wh.munici,type:0 |
308 | @@ -448,7 +448,7 @@ |
309 | #: field:account.wh.munici,name:0 |
310 | #: field:account.wh.munici.line,name:0 |
311 | msgid "Description" |
312 | -msgstr "Descripcion" |
313 | +msgstr "Descripción" |
314 | |
315 | #. module: l10n_ve_withholding_muni |
316 | #: field:account.wh.munici,currency_id:0 |
317 | @@ -475,7 +475,7 @@ |
318 | #. module: l10n_ve_withholding_muni |
319 | #: help:account.wh.munici,name:0 |
320 | msgid "Description of withholding" |
321 | -msgstr "Descripcion de la retencion" |
322 | +msgstr "Descripción de la retención" |
323 | |
324 | #. module: l10n_ve_withholding_muni |
325 | #: view:account.invoice:0 |
326 | @@ -486,7 +486,7 @@ |
327 | #. module: l10n_ve_withholding_muni |
328 | #: constraint:account.invoice:0 |
329 | msgid "The Document you have been entering for this Partner has already been recorded" |
330 | -msgstr "El documento que esta intentando ingresar ya ha sido grabado en el sistema " |
331 | +msgstr "El documento que está intentando ingresar ya ha sido grabado en el sistema " |
332 | |
333 | #. module: l10n_ve_withholding_muni |
334 | #: report:wh.muni_rep:0 |
335 | @@ -496,7 +496,7 @@ |
336 | #. module: l10n_ve_withholding_muni |
337 | #: help:account.wh.munici,number:0 |
338 | msgid "Withholding number" |
339 | -msgstr "Numero de retencion " |
340 | +msgstr "Número de retención " |
341 | |
342 | #. module: l10n_ve_withholding_muni |
343 | #: help:res.partner,property_wh_munici_receivable:0 |
344 | @@ -506,7 +506,7 @@ |
345 | #. module: l10n_ve_withholding_muni |
346 | #: view:account.wh.munici.line:0 |
347 | msgid "Linea" |
348 | -msgstr "Linea" |
349 | +msgstr "Línea" |
350 | |
351 | #. module: l10n_ve_withholding_muni |
352 | #: field:account.wh.munici,move_id:0 |
353 | |
354 | === modified file 'l10n_ve_withholding_muni/i18n/es_VE.po' |
355 | --- l10n_ve_withholding_muni/i18n/es_VE.po 2012-03-13 22:37:59 +0000 |
356 | +++ l10n_ve_withholding_muni/i18n/es_VE.po 2013-02-05 03:03:22 +0000 |
357 | @@ -40,7 +40,7 @@ |
358 | #: field:account.wh.munici,company_id:0 |
359 | #: help:account.wh.munici,company_id:0 |
360 | msgid "Company" |
361 | -msgstr "Compañia" |
362 | +msgstr "Compañía" |
363 | |
364 | #. module: l10n_ve_withholding_muni |
365 | #: report:wh.muni_rep:0 |
366 | @@ -56,7 +56,7 @@ |
367 | #: model:ir.actions.act_window,name:l10n_ve_withholding_muni.action_account_wh_muni_supplier |
368 | #: model:ir.ui.menu,name:l10n_ve_withholding_muni.menu_action_account_wh_muni_supplier |
369 | msgid "Local Withholding Supplier" |
370 | -msgstr "Proveedor de Retencion Municipal " |
371 | +msgstr "Proveedor de Retención Municipal " |
372 | |
373 | #. module: l10n_ve_withholding_muni |
374 | #: view:account.invoice:0 |
375 | @@ -66,17 +66,17 @@ |
376 | #. module: l10n_ve_withholding_muni |
377 | #: model:ir.actions.report.xml,name:l10n_ve_withholding_muni.report_wh_muni |
378 | msgid "Comprobante Retencion Municipal" |
379 | -msgstr "Comprobante Retencion Municipal" |
380 | +msgstr "Comprobante Retención Municipal" |
381 | |
382 | #. module: l10n_ve_withholding_muni |
383 | #: sql_constraint:account.wh.munici:0 |
384 | msgid "number must be unique !" |
385 | -msgstr "El numero debe ser Unico!" |
386 | +msgstr "El número debe ser Único!" |
387 | |
388 | #. module: l10n_ve_withholding_muni |
389 | #: help:res.partner,property_wh_munici_payable:0 |
390 | msgid "This account will be used debit local withholding amount" |
391 | -msgstr "Esta cuenta se utilizara para para debitar el monto de la retencion municipal " |
392 | +msgstr "Esta cuenta se utilizará para debitar el monto de la retención municipal " |
393 | |
394 | #. module: l10n_ve_withholding_muni |
395 | #: field:account.wh.munici,amount:0 |
396 | @@ -103,17 +103,17 @@ |
397 | #. module: l10n_ve_withholding_muni |
398 | #: constraint:res.partner:0 |
399 | msgid "Error ! Partner's VAT must be a unique value or empty" |
400 | -msgstr "Error ! El RIF del partner debe ser unico a vacio " |
401 | +msgstr "Error ! El RIF del partner debe ser único a vacío " |
402 | |
403 | #. module: l10n_ve_withholding_muni |
404 | #: field:account.wh.munici,date_ret:0 |
405 | msgid "Withholding date" |
406 | -msgstr "Fecha de Retencion" |
407 | +msgstr "Fecha de Retención" |
408 | |
409 | #. module: l10n_ve_withholding_muni |
410 | #: help:account.wh.munici,type:0 |
411 | msgid "Withholding type" |
412 | -msgstr "Tipo de retencion" |
413 | +msgstr "Tipo de retención" |
414 | |
415 | #. module: l10n_ve_withholding_muni |
416 | #: view:account.wh.munici:0 |
417 | @@ -145,7 +145,7 @@ |
418 | #: field:account.wh.munici,partner_id:0 |
419 | #: model:ir.model,name:l10n_ve_withholding_muni.model_res_partner |
420 | msgid "Partner" |
421 | -msgstr "Compañia" |
422 | +msgstr "Compañía" |
423 | |
424 | #. module: l10n_ve_withholding_muni |
425 | #: help:account.wh.munici.line,invoice_id:0 |
426 | @@ -171,7 +171,7 @@ |
427 | #. module: l10n_ve_withholding_muni |
428 | #: view:account.wh.munici:0 |
429 | msgid "Accounting Date of Withhold" |
430 | -msgstr "Fecha contable de la retencion" |
431 | +msgstr "Fecha contable de la retención" |
432 | |
433 | #. module: l10n_ve_withholding_muni |
434 | #: selection:account.wh.munici,type:0 |
435 | @@ -181,7 +181,7 @@ |
436 | #. module: l10n_ve_withholding_muni |
437 | #: help:account.wh.munici.line,name:0 |
438 | msgid "Local Withholding line Description" |
439 | -msgstr "Descripcion de la linea de retencion Municipal" |
440 | +msgstr "Descripción de la línea de retención Municipal" |
441 | |
442 | #. module: l10n_ve_withholding_muni |
443 | #: report:wh.muni_rep:0 |
444 | @@ -196,18 +196,18 @@ |
445 | #. module: l10n_ve_withholding_muni |
446 | #: field:account.wh.munici,munici_line_ids:0 |
447 | msgid "Local withholding lines" |
448 | -msgstr "Lineas de Retenciones Municipales" |
449 | +msgstr "Líneas de Retenciones Municipales" |
450 | |
451 | #. module: l10n_ve_withholding_muni |
452 | #: help:account.wh.munici.line,wh_loc_rate:0 |
453 | msgid "Local withholding rate" |
454 | -msgstr "Porcentaje de Retencion Municipal" |
455 | +msgstr "Porcentaje de Retención Municipal" |
456 | |
457 | #. module: l10n_ve_withholding_muni |
458 | #: code:addons/l10n_ve_withholding_muni/wh_muni.py:113 |
459 | #, python-format |
460 | msgid "The line containing the document '%s' looks as if the amount withheld was wrong please check.!" |
461 | -msgstr "La línea que contiene el documento de '% s' parece como si la cantidad retenida esta erronea por favor verifique.!" |
462 | +msgstr "La línea que contiene el documento de '% s' parece como si la cantidad retenida esta errónea por favor verifique.!" |
463 | |
464 | #. module: l10n_ve_withholding_muni |
465 | #: field:res.partner,property_wh_munici_payable:0 |
466 | @@ -218,12 +218,12 @@ |
467 | #: code:addons/l10n_ve_withholding_muni/wh_muni.py:113 |
468 | #, python-format |
469 | msgid "Invalid action !" |
470 | -msgstr "Accion Invalida" |
471 | +msgstr "Acción Inválida" |
472 | |
473 | #. module: l10n_ve_withholding_muni |
474 | #: view:account.wh.munici:0 |
475 | msgid "Other Information" |
476 | -msgstr "Otra Informacion" |
477 | +msgstr "Otra Información" |
478 | |
479 | #. module: l10n_ve_withholding_muni |
480 | #: help:account.wh.munici,amount:0 |
481 | @@ -323,27 +323,27 @@ |
482 | #. module: l10n_ve_withholding_muni |
483 | #: view:account.wh.munici:0 |
484 | msgid "Withholding" |
485 | -msgstr "Retencion" |
486 | +msgstr "Retención" |
487 | |
488 | #. module: l10n_ve_withholding_muni |
489 | #: model:ir.model,name:l10n_ve_withholding_muni.model_account_wh_munici_line |
490 | msgid "Local Withholding Line" |
491 | -msgstr "Linea de Retencion Municipal" |
492 | +msgstr "Línea de Retención Municipal" |
493 | |
494 | #. module: l10n_ve_withholding_muni |
495 | #: view:account.wh.munici.line:0 |
496 | msgid "Local Withholding line " |
497 | -msgstr "Linea de Retencion Municipal" |
498 | +msgstr "Línea de Retención Municipal" |
499 | |
500 | #. module: l10n_ve_withholding_muni |
501 | #: help:account.wh.munici,date_ret:0 |
502 | msgid "Keep empty to use the current date" |
503 | -msgstr "Mantenga Vacio para usar la fecha actual" |
504 | +msgstr "Mantenga Vacío para usar la fecha actual" |
505 | |
506 | #. module: l10n_ve_withholding_muni |
507 | #: help:account.wh.munici,code:0 |
508 | msgid "Withholding reference" |
509 | -msgstr "Referencia de retencion" |
510 | +msgstr "Referencia de retención" |
511 | |
512 | #. module: l10n_ve_withholding_muni |
513 | #: code:addons/l10n_ve_withholding_muni/wh_muni.py:149 |
514 | @@ -365,7 +365,7 @@ |
515 | #. module: l10n_ve_withholding_muni |
516 | #: help:account.wh.munici.line,concepto_id:0 |
517 | msgid "Local withholding concept" |
518 | -msgstr "Concepto de Retencion Municipal" |
519 | +msgstr "Concepto de Retención Municipal" |
520 | |
521 | #. module: l10n_ve_withholding_muni |
522 | #: help:account.invoice,wh_local:0 |
523 | @@ -380,12 +380,12 @@ |
524 | #. module: l10n_ve_withholding_muni |
525 | #: help:account.wh.munici,period_id:0 |
526 | msgid "Keep empty to use the period of the validation(Withholding date) date." |
527 | -msgstr "Mantenga vacio para usar el periodo de la fecha de validacion (Fecha de Retenion)" |
528 | +msgstr "Mantenga vacío para usar el periodo de la fecha de validación (Fecha de Retención)" |
529 | |
530 | #. module: l10n_ve_withholding_muni |
531 | #: field:account.wh.munici,code:0 |
532 | msgid "Code" |
533 | -msgstr "Codigo" |
534 | +msgstr "Código" |
535 | |
536 | #. module: l10n_ve_withholding_muni |
537 | #: report:wh.muni_rep:0 |
538 | @@ -405,7 +405,7 @@ |
539 | #. module: l10n_ve_withholding_muni |
540 | #: field:account.wh.munici,number:0 |
541 | msgid "Number" |
542 | -msgstr "Numero" |
543 | +msgstr "Número" |
544 | |
545 | #. module: l10n_ve_withholding_muni |
546 | #: report:wh.muni_rep:0 |
547 | @@ -432,7 +432,7 @@ |
548 | #: code:addons/l10n_ve_withholding_muni/wh_muni.py:163 |
549 | #, python-format |
550 | msgid "No se encontro un periodo fiscal para esta fecha: '%s' por favor verificar.!" |
551 | -msgstr "No se encontro un periodo fiscal para esta fecha: '%s' por favor verificar.!" |
552 | +msgstr "No se encontró un periodo fiscal para esta fecha: '%s' por favor verificar.!" |
553 | |
554 | #. module: l10n_ve_withholding_muni |
555 | #: selection:account.wh.munici,type:0 |
556 | @@ -448,7 +448,7 @@ |
557 | #: field:account.wh.munici,name:0 |
558 | #: field:account.wh.munici.line,name:0 |
559 | msgid "Description" |
560 | -msgstr "Descripcion" |
561 | +msgstr "Descripción" |
562 | |
563 | #. module: l10n_ve_withholding_muni |
564 | #: field:account.wh.munici,currency_id:0 |
565 | @@ -475,7 +475,7 @@ |
566 | #. module: l10n_ve_withholding_muni |
567 | #: help:account.wh.munici,name:0 |
568 | msgid "Description of withholding" |
569 | -msgstr "Descripcion de la retencion" |
570 | +msgstr "Descripción de la retención" |
571 | |
572 | #. module: l10n_ve_withholding_muni |
573 | #: view:account.invoice:0 |
574 | @@ -486,7 +486,7 @@ |
575 | #. module: l10n_ve_withholding_muni |
576 | #: constraint:account.invoice:0 |
577 | msgid "The Document you have been entering for this Partner has already been recorded" |
578 | -msgstr "El documento que esta intentando ingresar ya ha sido grabado en el sistema " |
579 | +msgstr "El documento que está intentando ingresar ya ha sido grabado en el sistema " |
580 | |
581 | #. module: l10n_ve_withholding_muni |
582 | #: report:wh.muni_rep:0 |
583 | @@ -496,7 +496,7 @@ |
584 | #. module: l10n_ve_withholding_muni |
585 | #: help:account.wh.munici,number:0 |
586 | msgid "Withholding number" |
587 | -msgstr "Numero de retencion " |
588 | +msgstr "Número de retención " |
589 | |
590 | #. module: l10n_ve_withholding_muni |
591 | #: help:res.partner,property_wh_munici_receivable:0 |
592 | @@ -506,7 +506,7 @@ |
593 | #. module: l10n_ve_withholding_muni |
594 | #: view:account.wh.munici.line:0 |
595 | msgid "Linea" |
596 | -msgstr "Linea" |
597 | +msgstr "Línea" |
598 | |
599 | #. module: l10n_ve_withholding_muni |
600 | #: field:account.wh.munici,move_id:0 |
601 | |
602 | === added directory 'l10n_ve_withholding_muni/model' |
603 | === added file 'l10n_ve_withholding_muni/model/__init__.py' |
604 | --- l10n_ve_withholding_muni/model/__init__.py 1970-01-01 00:00:00 +0000 |
605 | +++ l10n_ve_withholding_muni/model/__init__.py 2013-02-05 03:03:22 +0000 |
606 | @@ -0,0 +1,28 @@ |
607 | +#!/usr/bin/python |
608 | +# -*- encoding: utf-8 -*- |
609 | +########################################################################### |
610 | +# Module Writen to OpenERP, Open Source Management Solution |
611 | +# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>). |
612 | +# All Rights Reserved |
613 | +###############Credits###################################################### |
614 | +# Coded by: Yanina Aular <yanina.aular@vauxoo.com> |
615 | +# Planified by: Humberto Arocha |
616 | +# Audited by: Vauxoo C.A. |
617 | +############################################################################# |
618 | +# This program is free software: you can redistribute it and/or modify |
619 | +# it under the terms of the GNU Affero General Public License as published by |
620 | +# the Free Software Foundation, either version 3 of the License, or |
621 | +# (at your option) any later version. |
622 | +# |
623 | +# This program is distributed in the hope that it will be useful, |
624 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
625 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
626 | +# GNU Affero General Public License for more details. |
627 | +# |
628 | +# You should have received a copy of the GNU Affero General Public License |
629 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
630 | +################################################################################ |
631 | + |
632 | +import invoice |
633 | +import partner |
634 | +import wh_muni |
635 | |
636 | === renamed file 'l10n_ve_withholding_muni/invoice.py' => 'l10n_ve_withholding_muni/model/invoice.py' |
637 | --- l10n_ve_withholding_muni/invoice.py 2012-06-13 15:08:00 +0000 |
638 | +++ l10n_ve_withholding_muni/model/invoice.py 2013-02-05 03:03:22 +0000 |
639 | @@ -5,13 +5,13 @@ |
640 | # Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>). |
641 | # All Rights Reserved |
642 | ###############Credits###################################################### |
643 | -# Coded by: Javier Duran <jduran@corvus.com.ve> |
644 | +# Coded by: Javier Duran <jduran@corvus.com.ve> |
645 | # Planified by: Nhomar Hernandez |
646 | # Audited by: Vauxoo C.A. |
647 | ############################################################################# |
648 | # This program is free software: you can redistribute it and/or modify |
649 | -# it under the terms of the GNU Affero General Public License as published by |
650 | -# the Free Software Foundation, either version 3 of the License, or |
651 | +# it under the terms of the GNU Affero General Public License as published |
652 | +# by the Free Software Foundation, either version 3 of the License, or |
653 | # (at your option) any later version. |
654 | # |
655 | # This program is distributed in the hope that it will be useful, |
656 | @@ -21,53 +21,61 @@ |
657 | # |
658 | # You should have received a copy of the GNU Affero General Public License |
659 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
660 | -################################################################################ |
661 | +############################################################################# |
662 | |
663 | import time |
664 | from osv import fields, osv |
665 | |
666 | |
667 | - |
668 | class account_invoice(osv.osv): |
669 | _inherit = 'account.invoice' |
670 | |
671 | - def _get_move_lines(self, cr, uid, ids, to_wh, period_id, |
672 | - pay_journal_id, writeoff_acc_id, |
673 | - writeoff_period_id, writeoff_journal_id, date, |
674 | + def _get_move_lines(self, cr, uid, ids, to_wh, period_id, |
675 | + pay_journal_id, writeoff_acc_id, |
676 | + writeoff_period_id, writeoff_journal_id, date, |
677 | name, context=None): |
678 | - if context is None: context = {} |
679 | - res = super(account_invoice,self)._get_move_lines(cr, uid, ids, to_wh, period_id, |
680 | - pay_journal_id, writeoff_acc_id, |
681 | - writeoff_period_id, writeoff_journal_id, date, |
682 | + context = context or {} |
683 | + res = super(account_invoice, self)._get_move_lines(cr, uid, ids, to_wh, |
684 | + period_id, pay_journal_id, writeoff_acc_id, |
685 | + writeoff_period_id, writeoff_journal_id, date, |
686 | name, context=context) |
687 | - if context.get('muni_wh',False): |
688 | + if context.get('muni_wh', False): |
689 | invoice = self.browse(cr, uid, ids[0]) |
690 | - types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1} |
691 | + types = { |
692 | + 'out_invoice': -1, |
693 | + 'in_invoice': 1, |
694 | + 'out_refund': 1, |
695 | + 'in_refund': -1 |
696 | + } |
697 | direction = types[invoice.type] |
698 | - res.append((0,0,{ |
699 | - 'debit': direction * to_wh.amount<0 and - direction * to_wh.amount, |
700 | - 'credit': direction * to_wh.amount>0 and direction * to_wh.amount, |
701 | + res.append((0, 0, { |
702 | + 'debit': direction * to_wh.amount < 0 and |
703 | + - direction * to_wh.amount, |
704 | + 'credit': direction * to_wh.amount > 0 and |
705 | + direction * to_wh.amount, |
706 | 'partner_id': invoice.partner_id.id, |
707 | - 'ref':invoice.number, |
708 | + 'ref': invoice.number, |
709 | 'date': date, |
710 | 'currency_id': False, |
711 | - 'name':name, |
712 | + 'name': name, |
713 | 'account_id': to_wh.retention_id.account_id.id, |
714 | })) |
715 | return res |
716 | |
717 | - |
718 | - def _retenida_munici(self, cr, uid, ids, name, args, context): |
719 | + def _retenida_munici(self, cr, uid, ids, name, args, context=None): |
720 | + context = context or {} |
721 | res = {} |
722 | for id in ids: |
723 | res[id] = self.test_retenida_muni(cr, uid, [id], 'retmun') |
724 | return res |
725 | |
726 | - |
727 | - def test_retenida_muni(self, cr, uid, ids, *args): |
728 | - type2journal = {'out_invoice': 'mun_sale', 'in_invoice': 'mun_purchase', 'out_refund': 'mun_sale', 'in_refund': 'mun_purchase'} |
729 | + def test_retenida_muni(self, cr, uid, ids, *args): |
730 | + type2journal = {'out_invoice': 'mun_sale', |
731 | + 'out_refund': 'mun_sale', |
732 | + 'in_invoice': 'mun_purchase', |
733 | + 'in_refund': 'mun_purchase'} |
734 | type_inv = self.browse(cr, uid, ids[0]).type |
735 | - type_journal = type2journal.get(type_inv, 'mun_purchase') |
736 | + type_journal = type2journal.get(type_inv, 'mun_purchase') |
737 | res = self.ret_payment_get(cr, uid, ids) |
738 | if not res: |
739 | return False |
740 | @@ -77,14 +85,16 @@ |
741 | l.id \ |
742 | from account_move_line l \ |
743 | inner join account_journal j on (j.id=l.journal_id) \ |
744 | - where l.id in ('+','.join(map(str,res))+') and j.type='+ '\''+type_journal+'\'') |
745 | + where l.id in (' + ','.join(map(str, res)) + ') and j.type=' + |
746 | + '\'' + type_journal + '\'') |
747 | ok = ok and bool(cr.fetchone()) |
748 | return ok |
749 | |
750 | - |
751 | - def _get_inv_munici_from_line(self, cr, uid, ids, context={}): |
752 | + def _get_inv_munici_from_line(self, cr, uid, ids, context=None): |
753 | + context = context or {} |
754 | move = {} |
755 | - for line in self.pool.get('account.move.line').browse(cr, uid, ids): |
756 | + aml_brw = self.pool.get('account.move.line').browse(cr, uid, ids) |
757 | + for line in aml_brw: |
758 | if line.reconcile_partial_id: |
759 | for line2 in line.reconcile_partial_id.line_partial_ids: |
760 | move[line2.move_id.id] = True |
761 | @@ -93,41 +103,41 @@ |
762 | move[line2.move_id.id] = True |
763 | invoice_ids = [] |
764 | if move: |
765 | - invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context) |
766 | + invoice_ids = self.pool.get('account.invoice').search(cr, uid, |
767 | + [('move_id', 'in', move.keys())], context=context) |
768 | return invoice_ids |
769 | |
770 | - def _get_inv_munici_from_reconcile(self, cr, uid, ids, context={}): |
771 | + def _get_inv_munici_from_reconcile(self, cr, uid, ids, context=None): |
772 | + context = context or {} |
773 | move = {} |
774 | - for r in self.pool.get('account.move.reconcile').browse(cr, uid, ids): |
775 | + amr_brw = self.pool.get('account.move.reconcile').browse(cr, uid, ids) |
776 | + for r in amr_brw: |
777 | for line in r.line_partial_ids: |
778 | move[line.move_id.id] = True |
779 | for line in r.line_id: |
780 | move[line.move_id.id] = True |
781 | - |
782 | + |
783 | invoice_ids = [] |
784 | if move: |
785 | - invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context) |
786 | + invoice_ids = self.pool.get('account.invoice').search(cr, uid, |
787 | + [('move_id', 'in', move.keys())], context=context) |
788 | return invoice_ids |
789 | |
790 | - |
791 | _columns = { |
792 | - 'wh_local': fields.function(_retenida_munici, method=True, string='Local Withholding', type='boolean', |
793 | + 'wh_local': fields.function(_retenida_munici, method=True, |
794 | + string='Local Withholding', type='boolean', |
795 | store={ |
796 | - 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), |
797 | - 'account.move.line': (_get_inv_munici_from_line, None, 50), |
798 | - 'account.move.reconcile': (_get_inv_munici_from_reconcile, None, 50), |
799 | + 'account.invoice': |
800 | + (lambda self, cr, uid, ids, c={}: ids, None, 50), |
801 | + 'account.move.line': (_get_inv_munici_from_line, None, 50), |
802 | + 'account.move.reconcile': |
803 | + (_get_inv_munici_from_reconcile, None, 50), |
804 | }, |
805 | - help="The account moves of the invoice have been withheld with account moves of the payment(s)."), |
806 | - 'wh_muni_id': fields.many2one('account.wh.munici', 'Wh. Municipality', readonly=True, help="Withholding muni."), |
807 | + help="The account moves of the invoice have been withheld with \ |
808 | + account moves of the payment(s)."), |
809 | + 'wh_muni_id': fields.many2one('account.wh.munici', 'Wh. Municipality', |
810 | + readonly=True, help="Withholding muni."), |
811 | |
812 | } |
813 | - |
814 | - |
815 | - |
816 | - |
817 | |
818 | account_invoice() |
819 | - |
820 | - |
821 | - |
822 | - |
823 | |
824 | === renamed file 'l10n_ve_withholding_muni/partner.py' => 'l10n_ve_withholding_muni/model/partner.py' |
825 | --- l10n_ve_withholding_muni/partner.py 2011-10-25 20:33:16 +0000 |
826 | +++ l10n_ve_withholding_muni/model/partner.py 2013-02-05 03:03:22 +0000 |
827 | @@ -4,8 +4,8 @@ |
828 | # Module Writen to OpenERP, Open Source Management Solution |
829 | # Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>). |
830 | # All Rights Reserved |
831 | -###############Credits###################################################### |
832 | -# Coded by: Javier Duran <jduran@corvus.com.ve> |
833 | +# Credits###################################################### |
834 | +# Coded by: Javier Duran <jduran@corvus.com.ve> |
835 | # Planified by: Nhomar Hernandez |
836 | # Audited by: Vauxoo C.A. |
837 | ############################################################################# |
838 | @@ -22,7 +22,7 @@ |
839 | # |
840 | # You should have received a copy of the GNU Affero General Public License |
841 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
842 | -################################################################################ |
843 | +########################################################################## |
844 | |
845 | from osv import fields, osv |
846 | |
847 | @@ -49,7 +49,7 @@ |
848 | domain="[('type', '=', 'other')]", |
849 | help="This account will be used credit local withholding amount"), |
850 | |
851 | - } |
852 | + } |
853 | |
854 | |
855 | res_partner() |
856 | |
857 | === renamed file 'l10n_ve_withholding_muni/wh_muni.py' => 'l10n_ve_withholding_muni/model/wh_muni.py' |
858 | --- l10n_ve_withholding_muni/wh_muni.py 2012-06-13 15:08:00 +0000 |
859 | +++ l10n_ve_withholding_muni/model/wh_muni.py 2013-02-05 03:03:22 +0000 |
860 | @@ -4,8 +4,8 @@ |
861 | # Module Writen to OpenERP, Open Source Management Solution |
862 | # Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>). |
863 | # All Rights Reserved |
864 | -###############Credits###################################################### |
865 | -# Coded by: Javier Duran <javier@vauxoo.com> |
866 | +# Credits###################################################### |
867 | +# Coded by: Javier Duran <javier@vauxoo.com> |
868 | # Planified by: Nhomar Hernandez |
869 | # Audited by: Vauxoo C.A. |
870 | ############################################################################# |
871 | @@ -21,7 +21,7 @@ |
872 | # |
873 | # You should have received a copy of the GNU Affero General Public License |
874 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
875 | -################################################################################ |
876 | +########################################################################## |
877 | |
878 | |
879 | from osv import osv, fields |
880 | @@ -32,7 +32,6 @@ |
881 | |
882 | |
883 | class account_wh_munici(osv.osv): |
884 | - |
885 | |
886 | def _get_type(self, cr, uid, context=None): |
887 | if context is None: |
888 | @@ -40,146 +39,158 @@ |
889 | type = context.get('type', 'in_invoice') |
890 | return type |
891 | |
892 | - def _get_journal(self, cr, uid, context): |
893 | + def _get_journal(self, cr, uid, context=None): |
894 | if context is None: |
895 | context = {} |
896 | type_inv = context.get('type', 'in_invoice') |
897 | - type2journal = {'out_invoice': 'mun_sale', 'in_invoice': 'mun_purchase'} |
898 | + type2journal = {'out_invoice': 'mun_sale', 'in_invoice': |
899 | + 'mun_purchase'} |
900 | journal_obj = self.pool.get('account.journal') |
901 | - res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'mun_purchase'))], limit=1) |
902 | + res = journal_obj.search(cr, uid, [('type', '=', type2journal.get( |
903 | + type_inv, 'mun_purchase'))], limit=1) |
904 | if res: |
905 | return res[0] |
906 | else: |
907 | return False |
908 | |
909 | - def _get_currency(self, cr, uid, context): |
910 | + def _get_currency(self, cr, uid, context=None): |
911 | + if context is None: |
912 | + context = {} |
913 | user = self.pool.get('res.users').browse(cr, uid, [uid])[0] |
914 | if user.company_id: |
915 | return user.company_id.currency_id.id |
916 | else: |
917 | - return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0] |
918 | + return self.pool.get('res.currency').search(cr, uid, [('rate', '=', 1.0)])[0] |
919 | |
920 | _name = "account.wh.munici" |
921 | _description = "Local Withholding" |
922 | _columns = { |
923 | - 'name': fields.char('Description', size=64, readonly=True, states={'draft':[('readonly',False)]}, required=True, help="Description of withholding"), |
924 | - 'code': fields.char('Code', size=32, readonly=True, states={'draft':[('readonly',False)]}, help="Withholding reference"), |
925 | - 'number': fields.char('Number', size=32, readonly=True, states={'draft':[('readonly',False)]}, help="Withholding number"), |
926 | + 'name': fields.char('Description', size=64, readonly=True, states={'draft': [('readonly', False)]}, required=True, help="Description of withholding"), |
927 | + 'code': fields.char('Code', size=32, readonly=True, states={'draft': [('readonly', False)]}, help="Withholding reference"), |
928 | + 'number': fields.char('Number', size=32, readonly=True, states={'draft': [('readonly', False)]}, help="Withholding number"), |
929 | 'type': fields.selection([ |
930 | - ('out_invoice','Customer Invoice'), |
931 | - ('in_invoice','Supplier Invoice'), |
932 | - ],'Type', readonly=True, help="Withholding type"), |
933 | + ('out_invoice', 'Customer Invoice'), |
934 | + ('in_invoice', 'Supplier Invoice'), |
935 | + ], 'Type', readonly=True, help="Withholding type"), |
936 | 'state': fields.selection([ |
937 | - ('draft','Draft'), |
938 | + ('draft', 'Draft'), |
939 | ('confirmed', 'Confirmed'), |
940 | - ('done','Done'), |
941 | - ('cancel','Cancelled') |
942 | - ],'Estado', readonly=True, help="Estado del Comprobante"), |
943 | - 'date_ret': fields.date('Withholding date', readonly=True, states={'draft':[('readonly',False)]}, help="Keep empty to use the current date"), |
944 | - 'date': fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Date"), |
945 | - 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True, states={'draft':[('readonly',False)]}, help="Keep empty to use the period of the validation(Withholding date) date."), |
946 | - 'account_id': fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="The pay account used for this withholding."), |
947 | - 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, required=True, states={'draft':[('readonly',False)]}, help="Withholding customer/supplier"), |
948 | - 'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Currency"), |
949 | - 'journal_id': fields.many2one('account.journal', 'Journal', required=True,readonly=True, states={'draft':[('readonly',False)]}, help="Journal entry"), |
950 | + ('done', 'Done'), |
951 | + ('cancel', 'Cancelled') |
952 | + ], 'State', readonly=True, help="Estado del Comprobante"), |
953 | + 'date_ret': fields.date('Withholding date', readonly=True, states={'draft': [('readonly', False)]}, help="Keep empty to use the current date"), |
954 | + 'date': fields.date('Date', readonly=True, states={'draft': [('readonly', False)]}, help="Date"), |
955 | + 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state', '<>', 'done')], readonly=True, states={'draft': [('readonly', False)]}, help="Keep empty to use the period of the validation(Withholding date) date."), |
956 | + 'account_id': fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="The pay account used for this withholding."), |
957 | + 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Withholding customer/supplier"), |
958 | + 'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Currency"), |
959 | + 'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Journal entry"), |
960 | 'company_id': fields.many2one('res.company', 'Company', required=True, help="Company"), |
961 | - 'munici_line_ids': fields.one2many('account.wh.munici.line', 'retention_id', 'Local withholding lines', readonly=True, states={'draft':[('readonly',False)]}, help="Invoices to will be made local withholdings"), |
962 | - 'amount': fields.float('Amount', required=False, digits_compute= dp.get_precision('Withhold'), help="Amount withheld"), |
963 | - 'move_id':fields.many2one('account.move', 'Account Entry'), |
964 | - |
965 | - |
966 | - } |
967 | + 'munici_line_ids': fields.one2many('account.wh.munici.line', 'retention_id', 'Local withholding lines', readonly=True, states={'draft': [('readonly', False)]}, help="Invoices to will be made local withholdings"), |
968 | + 'amount': fields.float('Amount', required=False, digits_compute=dp.get_precision('Withhold'), help="Amount withheld"), |
969 | + 'move_id': fields.many2one('account.move', 'Account Entry'), |
970 | + |
971 | + |
972 | + } |
973 | _defaults = { |
974 | 'type': _get_type, |
975 | 'state': lambda *a: 'draft', |
976 | 'journal_id': _get_journal, |
977 | 'currency_id': _get_currency, |
978 | - 'company_id': lambda self, cr, uid, context: \ |
979 | - self.pool.get('res.users').browse(cr, uid, uid, |
980 | - context=context).company_id.id, |
981 | + 'company_id': lambda self, cr, uid, context: |
982 | + self.pool.get('res.users').browse(cr, uid, uid, |
983 | + context=context).company_id.id, |
984 | |
985 | } |
986 | |
987 | _sql_constraints = [ |
988 | - ('ret_num_uniq', 'unique (number)', 'number must be unique !') |
989 | - ] |
990 | + ('ret_num_uniq', 'unique (number)', 'number must be unique !') |
991 | + ] |
992 | |
993 | - def action_confirm(self, cr, uid, ids, context={}): |
994 | - obj=self.pool.get('account.wh.munici').browse(cr,uid,ids) |
995 | - total=0 |
996 | + def action_confirm(self, cr, uid, ids, context=None): |
997 | + if context is None: |
998 | + context = {} |
999 | + obj = self.pool.get('account.wh.munici').browse(cr, uid, ids) |
1000 | + total = 0 |
1001 | for i in obj[0].munici_line_ids: |
1002 | - if i.amount >= i.invoice_id.check_total*0.15: |
1003 | - raise osv.except_osv(_('Invalid action !'), _("The line containing the document '%s' looks as if the amount withheld was wrong please check.!") % (i.invoice_id.reference)) |
1004 | - total+=i.amount |
1005 | - self.write(cr,uid,ids,{'amount':total}) |
1006 | + if i.amount >= i.invoice_id.check_total * 0.15: |
1007 | + raise osv.except_osv(_('Invalid action !'), _( |
1008 | + "The line containing the document '%s' looks as if the amount withheld was wrong please check.!") % (i.invoice_id.reference)) |
1009 | + total += i.amount |
1010 | + self.write(cr, uid, ids, {'amount': total}) |
1011 | return True |
1012 | |
1013 | - |
1014 | def action_number(self, cr, uid, ids, *args): |
1015 | obj_ret = self.browse(cr, uid, ids)[0] |
1016 | if obj_ret.type == 'in_invoice': |
1017 | - cr.execute('SELECT id, number ' \ |
1018 | - 'FROM account_wh_munici ' \ |
1019 | - 'WHERE id IN ('+','.join(map(str,ids))+')') |
1020 | + cr.execute('SELECT id, number ' |
1021 | + 'FROM account_wh_munici ' |
1022 | + 'WHERE id IN (' + ','.join(map(str, ids)) + ')') |
1023 | |
1024 | for (id, number) in cr.fetchall(): |
1025 | if not number: |
1026 | - number = self.pool.get('ir.sequence').get(cr, uid, 'account.wh.muni.%s' % obj_ret.type) |
1027 | - cr.execute('UPDATE account_wh_munici SET number=%s ' \ |
1028 | - 'WHERE id=%s', (number, id)) |
1029 | - |
1030 | - |
1031 | + number = self.pool.get('ir.sequence').get( |
1032 | + cr, uid, 'account.wh.muni.%s' % obj_ret.type) |
1033 | + cr.execute('UPDATE account_wh_munici SET number=%s ' |
1034 | + 'WHERE id=%s', (number, id)) |
1035 | return True |
1036 | |
1037 | - |
1038 | - def action_done(self, cr, uid, ids, context={}): |
1039 | + def action_done(self, cr, uid, ids, context=None): |
1040 | + if context is None: |
1041 | + context = {} |
1042 | self.action_number(cr, uid, ids) |
1043 | self.action_move_create(cr, uid, ids) |
1044 | return True |
1045 | |
1046 | - |
1047 | def action_move_create(self, cr, uid, ids, context=None): |
1048 | + if context is None: |
1049 | + context = {} |
1050 | inv_obj = self.pool.get('account.invoice') |
1051 | - if context is None: context = {} |
1052 | - context.update({'muni_wh':True}) |
1053 | + context.update({'muni_wh': True}) |
1054 | for ret in self.browse(cr, uid, ids): |
1055 | for line in ret.munici_line_ids: |
1056 | if line.move_id or line.invoice_id.wh_local: |
1057 | - raise osv.except_osv(_('Invoice already withhold !'),_("You must omit the follow invoice '%s' !") % (line.invoice_id.name,)) |
1058 | + raise osv.except_osv(_('Invoice already withhold !'), _( |
1059 | + "You must omit the follow invoice '%s' !") % (line.invoice_id.name,)) |
1060 | return False |
1061 | |
1062 | acc_id = ret.partner_id.property_wh_munici_payable.id |
1063 | if not ret.date_ret: |
1064 | - self.write(cr, uid, [ret.id], {'date_ret':time.strftime('%Y-%m-%d')}) |
1065 | + self.write(cr, uid, [ret.id], {'date_ret': |
1066 | + time.strftime('%Y-%m-%d')}) |
1067 | |
1068 | period_id = ret.period_id and ret.period_id.id or False |
1069 | journal_id = ret.journal_id.id |
1070 | if not period_id: |
1071 | - period_ids = self.pool.get('account.period').search(cr,uid,[('date_start','<=',ret.date_ret or time.strftime('%Y-%m-%d')),('date_stop','>=',ret.date_ret or time.strftime('%Y-%m-%d'))]) |
1072 | + period_ids = self.pool.get('account.period').search( |
1073 | + cr, uid, [('date_start', '<=', ret.date_ret or time.strftime('%Y-%m-%d')), ('date_stop', '>=', ret.date_ret or time.strftime('%Y-%m-%d'))]) |
1074 | if len(period_ids): |
1075 | period_id = period_ids[0] |
1076 | else: |
1077 | - raise osv.except_osv(_('Warning !'), _("No se encontro un periodo fiscal para esta fecha: '%s' por favor verificar.!") % (ret.date_ret or time.strftime('%Y-%m-%d'))) |
1078 | + raise osv.except_osv(_('Warning !'), _("No se encontro un periodo fiscal para esta fecha: '%s' por favor verificar.!") % ( |
1079 | + ret.date_ret or time.strftime('%Y-%m-%d'))) |
1080 | if ret.munici_line_ids: |
1081 | for line in ret.munici_line_ids: |
1082 | writeoff_account_id = False |
1083 | writeoff_journal_id = False |
1084 | amount = line.amount |
1085 | name = 'COMP. RET. MUN ' + ret.number |
1086 | - ret_move = inv_obj.ret_and_reconcile(cr, uid, [line.invoice_id.id], |
1087 | - amount, acc_id, period_id, journal_id, writeoff_account_id, |
1088 | - period_id, writeoff_journal_id, ret.date_ret, name,line,context) |
1089 | + ret_move = inv_obj.ret_and_reconcile( |
1090 | + cr, uid, [line.invoice_id.id], |
1091 | + amount, acc_id, period_id, journal_id, writeoff_account_id, |
1092 | + period_id, writeoff_journal_id, ret.date_ret, name, line, context) |
1093 | |
1094 | # make the retencion line point to that move |
1095 | rl = { |
1096 | 'move_id': ret_move['move_id'], |
1097 | } |
1098 | lines = [(1, line.id, rl)] |
1099 | - self.write(cr, uid, [ret.id], {'munici_line_ids':lines, 'period_id':period_id}) |
1100 | - inv_obj.write(cr, uid, [line.invoice_id.id], {'wh_muni_id':ret.id}) |
1101 | + self.write(cr, uid, [ret.id], { |
1102 | + 'munici_line_ids': lines, 'period_id': period_id}) |
1103 | + inv_obj.write( |
1104 | + cr, uid, [line.invoice_id.id], {'wh_muni_id': ret.id}) |
1105 | return True |
1106 | |
1107 | - |
1108 | def onchange_partner_id(self, cr, uid, ids, type, partner_id): |
1109 | acc_id = False |
1110 | if partner_id: |
1111 | @@ -196,21 +207,25 @@ |
1112 | |
1113 | return result |
1114 | |
1115 | - |
1116 | - def _update_check(self, cr, uid, ids, partner_id, context={}): |
1117 | + def _update_check(self, cr, uid, ids, partner_id, context=None): |
1118 | + if context is None: |
1119 | + context = {} |
1120 | if ids: |
1121 | ret = self.browse(cr, uid, ids[0]) |
1122 | inv_str = '' |
1123 | for line in ret.munici_line_ids: |
1124 | if line.invoice_id.partner_id.id != partner_id: |
1125 | - inv_str+= '%s'% '\n'+line.invoice_id.name |
1126 | + inv_str += '%s' % '\n' + line.invoice_id.name |
1127 | |
1128 | if inv_str: |
1129 | - raise osv.except_osv('Incorrect Invoices !',"The following invoices are not the selected partner: %s " % (inv_str,)) |
1130 | + raise osv.except_osv('Incorrect Invoices !', |
1131 | + "The following invoices are not the selected partner: %s " % (inv_str,)) |
1132 | |
1133 | return True |
1134 | |
1135 | - def _new_check(self, cr, uid, values, context={}): |
1136 | + def _new_check(self, cr, uid, values, context=None): |
1137 | + if context is None: |
1138 | + context = {} |
1139 | lst_inv = [] |
1140 | |
1141 | if 'munici_line_ids' in values and values['munici_line_ids']: |
1142 | @@ -220,22 +235,22 @@ |
1143 | lst_inv.append(l[2]['invoice_id']) |
1144 | |
1145 | if lst_inv: |
1146 | - invoices = self.pool.get('account.invoice').browse(cr, uid, lst_inv) |
1147 | + invoices = self.pool.get( |
1148 | + 'account.invoice').browse(cr, uid, lst_inv) |
1149 | inv_str = '' |
1150 | for inv in invoices: |
1151 | if inv.partner_id.id != values['partner_id']: |
1152 | - inv_str+= '%s'% '\n'+inv.name |
1153 | + inv_str += '%s' % '\n' + inv.name |
1154 | |
1155 | if inv_str: |
1156 | - raise osv.except_osv('Incorrect Invoices !',"The following invoices are not the selected partner: %s " % (inv_str,)) |
1157 | + raise osv.except_osv('Incorrect Invoices !', |
1158 | + "The following invoices are not the selected partner: %s " % (inv_str,)) |
1159 | |
1160 | return True |
1161 | |
1162 | - |
1163 | - |
1164 | def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True): |
1165 | - if not context: |
1166 | - context={} |
1167 | + if context is None: |
1168 | + context = {} |
1169 | ret = self.browse(cr, uid, ids[0]) |
1170 | if update_check: |
1171 | if 'partner_id' in vals and vals['partner_id']: |
1172 | @@ -245,10 +260,9 @@ |
1173 | |
1174 | return super(account_wh_munici, self).write(cr, uid, ids, vals, context=context) |
1175 | |
1176 | - |
1177 | def create(self, cr, uid, vals, context=None, check=True): |
1178 | - if not context: |
1179 | - context={} |
1180 | + if context is None: |
1181 | + context = {} |
1182 | if check: |
1183 | self._new_check(cr, uid, vals, context) |
1184 | |
1185 | @@ -257,17 +271,18 @@ |
1186 | account_wh_munici() |
1187 | |
1188 | |
1189 | - |
1190 | class account_wh_munici_line(osv.osv): |
1191 | |
1192 | - def default_get(self, cr, uid, fields, context={}): |
1193 | - data = super(account_wh_munici_line, self).default_get(cr, uid, fields, context) |
1194 | + def default_get(self, cr, uid, fields, context=None): |
1195 | + if context is None: |
1196 | + context = {} |
1197 | + data = super(account_wh_munici_line, self).default_get(cr, |
1198 | + uid, fields, context) |
1199 | self.munici_context = context |
1200 | return data |
1201 | -#TODO |
1202 | -#necesito crear el campo y tener la forma de calcular el monto del impuesto |
1203 | -#munici retenido en la factura |
1204 | - |
1205 | +# TODO |
1206 | +# necesito crear el campo y tener la forma de calcular el monto del impuesto |
1207 | +# munici retenido en la factura |
1208 | |
1209 | _name = "account.wh.munici.line" |
1210 | _description = "Local Withholding Line" |
1211 | @@ -275,41 +290,48 @@ |
1212 | 'name': fields.char('Description', size=64, required=True, help="Local Withholding line Description"), |
1213 | 'retention_id': fields.many2one('account.wh.munici', 'Local withholding', ondelete='cascade', help="Local withholding"), |
1214 | 'invoice_id': fields.many2one('account.invoice', 'Invoice', required=True, ondelete='set null', help="Withholding invoice"), |
1215 | - 'amount':fields.float('Amount', digits_compute= dp.get_precision('Withhold')), |
1216 | + 'amount': fields.float('Amount', digits_compute=dp.get_precision('Withhold')), |
1217 | 'move_id': fields.many2one('account.move', 'Account Entry', readonly=True, help="Account Entry"), |
1218 | - 'wh_loc_rate':fields.float('Rate', help="Local withholding rate"), |
1219 | + 'wh_loc_rate': fields.float('Rate', help="Local withholding rate"), |
1220 | 'concepto_id': fields.integer('Concept', size=3, help="Local withholding concept"), |
1221 | |
1222 | |
1223 | } |
1224 | _defaults = { |
1225 | 'concepto_id': lambda *a: 1, |
1226 | - |
1227 | + |
1228 | } |
1229 | _sql_constraints = [ |
1230 | - ('munici_fact_uniq', 'unique (invoice_id)', 'The invoice has already assigned in local withholding, you cannot assigned it twice!') |
1231 | - ] |
1232 | - |
1233 | - |
1234 | - def onchange_invoice_id(self, cr, uid, ids, invoice_id, context={}): |
1235 | + ('munici_fact_uniq', 'unique (invoice_id)', |
1236 | + 'The invoice has already assigned in local withholding, you cannot assigned it twice!') |
1237 | + ] |
1238 | + |
1239 | + def onchange_invoice_id(self, cr, uid, ids, invoice_id, context=None): |
1240 | + if context is None: |
1241 | + context = {} |
1242 | lines = [] |
1243 | |
1244 | - if hasattr(self, 'munici_context') and ('lines' in self.munici_context): |
1245 | + if hasattr(self, 'munici_context') and ('lines' in self.munici_context): |
1246 | lines = [x[2] for x in self.munici_context['lines']] |
1247 | if not invoice_id: |
1248 | - return {'value':{'amount':0.0}} |
1249 | + return {'value': {'amount': 0.0}} |
1250 | else: |
1251 | ok = True |
1252 | - res = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context) |
1253 | - cr.execute('select retention_id from account_wh_munici_line where invoice_id=%s', (invoice_id,)) |
1254 | + res = self.pool.get( |
1255 | + 'account.invoice').browse(cr, uid, invoice_id, context) |
1256 | + cr.execute( |
1257 | + 'select retention_id from account_wh_munici_line where invoice_id=%s', |
1258 | + (invoice_id,)) |
1259 | ret_ids = cr.fetchone() |
1260 | ok = ok and bool(ret_ids) |
1261 | if ok: |
1262 | - ret = self.pool.get('account.wh.munici').browse(cr, uid, ret_ids[0], context) |
1263 | - raise osv.except_osv('Assigned Invoice !',"The invoice has already assigned in local withholding code: '%s' !" % (ret.code,)) |
1264 | - |
1265 | + ret = self.pool.get( |
1266 | + 'account.wh.munici').browse(cr, uid, ret_ids[0], context) |
1267 | + raise osv.except_osv('Assigned Invoice !', |
1268 | + "The invoice has already assigned in local withholding code: '%s' !" % (ret.code,)) |
1269 | + |
1270 | total = res.amount_total |
1271 | - return {'value' : {'amount':total}} |
1272 | + return {'value': {'amount': total}} |
1273 | |
1274 | |
1275 | account_wh_munici_line() |
1276 | |
1277 | === modified file 'l10n_ve_withholding_muni/report/wh_muni_report.py' |
1278 | --- l10n_ve_withholding_muni/report/wh_muni_report.py 2012-11-07 21:33:58 +0000 |
1279 | +++ l10n_ve_withholding_muni/report/wh_muni_report.py 2013-02-05 03:03:22 +0000 |
1280 | @@ -28,9 +28,9 @@ |
1281 | from osv import osv |
1282 | import pooler |
1283 | |
1284 | -class rep_wh_muni(report_sxw.rml_parse): |
1285 | +class wh_muni_report(report_sxw.rml_parse): |
1286 | def __init__(self, cr, uid, name, context): |
1287 | - super(rep_wh_muni, self).__init__(cr, uid, name, context) |
1288 | + super(wh_muni_report, self).__init__(cr, uid, name, context) |
1289 | self.localcontext.update({ |
1290 | 'time': time, |
1291 | 'get_partner_addr': self._get_partner_addr, |
1292 | @@ -57,9 +57,9 @@ |
1293 | |
1294 | |
1295 | report_sxw.report_sxw( |
1296 | - 'report.wh.muni_rep', |
1297 | + 'report.wh.muni.report', |
1298 | 'account.wh.munici', |
1299 | - 'addons/l10n_ve_withholding_muni/report/wh_muni_report.rml', |
1300 | - parser=rep_wh_muni, |
1301 | + rml='l10n_ve_withholding_muni/report/wh_muni_report.rml', |
1302 | + parser=wh_muni_report, |
1303 | header=False |
1304 | ) |
1305 | |
1306 | === modified file 'l10n_ve_withholding_muni/report/wh_muni_report.rml' |
1307 | --- l10n_ve_withholding_muni/report/wh_muni_report.rml 2011-10-25 20:33:16 +0000 |
1308 | +++ l10n_ve_withholding_muni/report/wh_muni_report.rml 2013-02-05 03:03:22 +0000 |
1309 | @@ -90,7 +90,8 @@ |
1310 | <paraStyle name="Table Heading" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/> |
1311 | <paraStyle name="Table" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> |
1312 | </stylesheet> |
1313 | - <images/> |
1314 | + |
1315 | + |
1316 | <story> |
1317 | <para style="P9">[[repeatIn(objects,'o')]]</para> |
1318 | <para style="P6">COMPROBANTE RETENCION IMPUESTOS MUNICIPALES</para> |
1319 | |
1320 | === renamed file 'l10n_ve_withholding_muni/wh_muni_report.xml' => 'l10n_ve_withholding_muni/report/wh_muni_report.xml' |
1321 | --- l10n_ve_withholding_muni/wh_muni_report.xml 2011-10-25 20:33:16 +0000 |
1322 | +++ l10n_ve_withholding_muni/report/wh_muni_report.xml 2013-02-05 03:03:22 +0000 |
1323 | @@ -2,13 +2,15 @@ |
1324 | <openerp> |
1325 | <data> |
1326 | <report |
1327 | + auto="True" |
1328 | id="report_wh_muni" |
1329 | model="account.wh.munici" |
1330 | - name="wh.muni_rep" |
1331 | + name="wh.muni.report" |
1332 | rml="l10n_ve_withholding_muni/report/wh_muni_report.rml" |
1333 | string="Comprobante Retencion Municipal" |
1334 | + menu="True" |
1335 | header="False" |
1336 | - auto="False" /> |
1337 | + /> |
1338 | |
1339 | |
1340 | </data> |
1341 | |
1342 | === added directory 'l10n_ve_withholding_muni/view' |
1343 | === renamed file 'l10n_ve_withholding_muni/account_invoice_view.xml' => 'l10n_ve_withholding_muni/view/account_invoice_view.xml' |
1344 | --- l10n_ve_withholding_muni/account_invoice_view.xml 2012-09-11 00:38:30 +0000 |
1345 | +++ l10n_ve_withholding_muni/view/account_invoice_view.xml 2013-02-05 03:03:22 +0000 |
1346 | @@ -13,7 +13,6 @@ |
1347 | <record id="account_invoice_wh_muni_customer" model="ir.ui.view"> |
1348 | <field name="name">account.invoice.wh.local.customer</field> |
1349 | <field name="model">account.invoice</field> |
1350 | - <field name="type">form</field> |
1351 | <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_customer"/> |
1352 | <field name="arch" type="xml"> |
1353 | <xpath expr="//separator[3]" position="after"> |
1354 | @@ -33,7 +32,6 @@ |
1355 | <record id="account_invoice_wh_muni_supplier" model="ir.ui.view"> |
1356 | <field name="name">account.invoice.wh.local.supplier</field> |
1357 | <field name="model">account.invoice</field> |
1358 | - <field name="type">form</field> |
1359 | <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_supplier"/> |
1360 | <field name="arch" type="xml"> |
1361 | <xpath expr="//separator[3]" position="after"> |
1362 | @@ -53,7 +51,6 @@ |
1363 | <record id="account_invoice_wh_muni_tree" model="ir.ui.view"> |
1364 | <field name="name">account.invoice.wh.local.tree</field> |
1365 | <field name="model">account.invoice</field> |
1366 | - <field name="type">tree</field> |
1367 | <field name="inherit_id" ref="account.invoice_tree"/> |
1368 | <field name="arch" type="xml"> |
1369 | <xpath expr="/tree/field[@name='origin']" position="after"> |
1370 | |
1371 | === renamed file 'l10n_ve_withholding_muni/partner_view.xml' => 'l10n_ve_withholding_muni/view/partner_view.xml' |
1372 | --- l10n_ve_withholding_muni/partner_view.xml 2011-10-25 20:33:16 +0000 |
1373 | +++ l10n_ve_withholding_muni/view/partner_view.xml 2013-02-05 03:03:22 +0000 |
1374 | @@ -13,7 +13,6 @@ |
1375 | <record id="partner_ext_munici_view_form_loc_ve" model="ir.ui.view"> |
1376 | <field name="name">partner_extended_munici.partner.form.view.loc_ve</field> |
1377 | <field name="model">res.partner</field> |
1378 | - <field name="type">form</field> |
1379 | <field name="inherit_id" ref="l10n_ve_withholding.wh_partner"/> |
1380 | <field name="arch" type="xml"> |
1381 | <page string="Withholdings" position="inside"> |
1382 | |
1383 | === renamed file 'l10n_ve_withholding_muni/wh_muni_view.xml' => 'l10n_ve_withholding_muni/view/wh_muni_view.xml' |
1384 | --- l10n_ve_withholding_muni/wh_muni_view.xml 2012-09-27 18:49:59 +0000 |
1385 | +++ l10n_ve_withholding_muni/view/wh_muni_view.xml 2013-02-05 03:03:22 +0000 |
1386 | @@ -11,7 +11,6 @@ |
1387 | <record id="view_wh_muni_line_tree" model="ir.ui.view"> |
1388 | <field name="name">account.wh.munici.line.tree</field> |
1389 | <field name="model">account.wh.munici.line</field> |
1390 | - <field name="type">tree</field> |
1391 | <field name="arch" type="xml"> |
1392 | <tree string="Local Withholding line " editable="bottom"> |
1393 | <field name="name"/> |
1394 | @@ -26,7 +25,6 @@ |
1395 | <record id="view_wh_muni_line_form" model="ir.ui.view"> |
1396 | <field name="name">account.wh.munici.line.form</field> |
1397 | <field name="model">account.wh.munici.line</field> |
1398 | - <field name="type">form</field> |
1399 | <field name="arch" type="xml"> |
1400 | <form string="Local Withholding line "> |
1401 | <notebook> |
1402 | @@ -53,7 +51,6 @@ |
1403 | <record id="view_wh_muni_filter" model="ir.ui.view"> |
1404 | <field name="name">account.wh.munici.search</field> |
1405 | <field name="model">account.wh.munici</field> |
1406 | - <field name="type">search</field> |
1407 | <field name="arch" type="xml"> |
1408 | <search string="Search Withholding Local"> |
1409 | <group col="10" colspan="4"> |
1410 | @@ -84,7 +81,6 @@ |
1411 | <record id="view_wh_muni_tree" model="ir.ui.view"> |
1412 | <field name="name">account.wh.munici.tree</field> |
1413 | <field name="model">account.wh.munici</field> |
1414 | - <field name="type">tree</field> |
1415 | <field name="arch" type="xml"> |
1416 | <tree colors="blue:state=='draft'" string="Local Withholding"> |
1417 | <field name="name"/> |
1418 | @@ -106,7 +102,6 @@ |
1419 | <record id="view_wh_muni_form" model="ir.ui.view"> |
1420 | <field name="name">account.wh.munici.form</field> |
1421 | <field name="model">account.wh.munici</field> |
1422 | - <field name="type">form</field> |
1423 | <field name="arch" type="xml"> |
1424 | <form string="Local Withholding"> |
1425 | <group colspan="4" col="6"> |
1426 | |
1427 | === removed file 'l10n_ve_withholding_muni/wizard/out.txt' |
1428 | --- l10n_ve_withholding_muni/wizard/out.txt 2011-10-25 20:33:16 +0000 |
1429 | +++ l10n_ve_withholding_muni/wizard/out.txt 1970-01-01 00:00:00 +0000 |
1430 | @@ -1,1 +0,0 @@ |
1431 | -False,2009/003,01245898,1,500.0,20.0 |
1432 | |
1433 | === removed file 'l10n_ve_withholding_muni/wizard/prueba1.py' |
1434 | --- l10n_ve_withholding_muni/wizard/prueba1.py 2011-10-25 20:33:16 +0000 |
1435 | +++ l10n_ve_withholding_muni/wizard/prueba1.py 1970-01-01 00:00:00 +0000 |
1436 | @@ -1,33 +0,0 @@ |
1437 | -#!/usr/bin/python |
1438 | -# -*- encoding: utf-8 -*- |
1439 | -########################################################################### |
1440 | -# Module Writen to OpenERP, Open Source Management Solution |
1441 | -# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>). |
1442 | -# All Rights Reserved |
1443 | -###############Credits###################################################### |
1444 | -# Coded by: Javier Duran <javier@vauxoo.com> |
1445 | -# Planified by: Nhomar Hernandez |
1446 | -# Audited by: Vauxoo C.A. |
1447 | -############################################################################# |
1448 | -# This program is free software: you can redistribute it and/or modify |
1449 | -# it under the terms of the GNU Affero General Public License as published by |
1450 | -# the Free Software Foundation, either version 3 of the License, or |
1451 | -# (at your option) any later version. |
1452 | -# |
1453 | -# This program is distributed in the hope that it will be useful, |
1454 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1455 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1456 | -# GNU Affero General Public License for more details. |
1457 | -# |
1458 | -# You should have received a copy of the GNU Affero General Public License |
1459 | -# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1460 | -################################################################################ |
1461 | -import sys |
1462 | - |
1463 | - |
1464 | - |
1465 | -print 'Nombre Archivo:',sys.argv[0] |
1466 | -print 'Periodo:',sys.argv[1] |
1467 | - |
1468 | - |
1469 | - |
1470 | |
1471 | === renamed file 'l10n_ve_withholding_muni/retencion_munici_wizard.xml' => 'l10n_ve_withholding_muni/wizard/retencion_munici_wizard.xml' |
1472 | === modified file 'l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml' |
1473 | --- l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml 2012-06-13 15:08:00 +0000 |
1474 | +++ l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml 2013-02-05 03:03:22 +0000 |
1475 | @@ -23,9 +23,11 @@ |
1476 | |
1477 | <record id="act_done" model="workflow.activity"> |
1478 | <field name="wkf_id" ref="wh_muni_order"/> |
1479 | - <field name="action">action_number() |
1480 | - action_move_create() |
1481 | - write({'state':'done'})</field> |
1482 | + <field name="action"> |
1483 | + action_number() |
1484 | + action_move_create() |
1485 | + write({'state':'done'}) |
1486 | + </field> |
1487 | <field name="kind">function</field> |
1488 | <field name="name">done</field> |
1489 | </record> |
Will check tomorrow, :-)
On Feb 4, 2013 10:34 PM, "Katherine Zaoral (Vauxoo)" <
<email address hidden>> wrote:
> Katherine Zaoral (Vauxoo) has proposed merging www.vauxoo. com (humbertoarocha) /code.launchpad .net/~vauxoo/ openerp- venezuela- localization/ ovl70-whmuni- rev-kty/ +merge/ 146544 /code.launchpad .net/~vauxoo/ openerp- venezuela- localization/ ovl70-whmuni- rev-kty/ +merge/ 146544 withholding_ muni/__ init__. py' withholding_ muni/__ init__. py 2011-10-25 20:33:16 +0000 withholding_ muni/__ init__. py 2013-02-05 03:03:22 +0000 www.gnu. org/licenses/ ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### ### withholding_ muni/__ openerp_ _.py' withholding_ muni/__ openerp_ _.py 2012-09-11 00:38:30 +0000 withholding_ muni/__ openerp_ _.py 2013-02-05 03:03:22 +0000 ####### ####### ####### ####### ####### ####### ####### ####### ####### ###### ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### # openerp. com.ve>). ####### ##Credits# ####### ####### ####### ####### ####### ####### ####### #### ####### ##Credits# ####### ####### ####### ####### ####### ####### ####### ##### ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### www.gnu. org/licenses/ ####### ####### ####### ####### ####### ####### ####### ####### ####### ####### #### ####### ####### ...
> lp:~vauxoo/openerp-venezuela-localization/ovl70-whmuni-rev-kty into
> lp:openerp-venezuela-localization.
>
> Requested reviews:
> Nhomar - Vauxoo (nhomar)
> hbto [Vauxoo] http://
>
> For more details, see:
>
> https:/
>
> [MERGE] First Revision WH Muni
> from Yani and Kty's branch
> --
>
> https:/
> You are requested to review the proposed merge of
> lp:~vauxoo/openerp-venezuela-localization/ovl70-whmuni-rev-kty into
> lp:openerp-venezuela-localization.
>
> === modified file 'l10n_ve_
> --- l10n_ve_
> +++ l10n_ve_
> @@ -23,10 +23,4 @@
> # along with this program. If not, see <http://
> >.
>
> #######
>
> -
> -import wh_muni
> -import invoice
> -import partner
> -import report
> -#import wizard
> -import workflow
> +import model
>
> === modified file 'l10n_ve_
> --- l10n_ve_
> +++ l10n_ve_
> @@ -1,17 +1,17 @@
> #!/usr/bin/python
> # -*- encoding: utf-8 -*-
>
> -######
>
> +######
> # Module Writen to OpenERP, Open Source Management Solution
> # Copyright (C) OpenERP Venezuela (<http://
> # All Rights Reserved
>
> -######
> -# Coded by: <email address hidden>
>
> +######
> +# Coded by: <email address hidden>
> # Planified by: Nhomar Hernandez
> # Audited by: Vauxoo C.A.
>
> #######
> # This program is free software: you can redistribute it and/or modify
> -# it under the terms of the GNU Affero General Public License as
> published by
> -# the Free Software Foundation, either version 3 of the License, or
> +# it under the terms of the GNU Affero General Public License as
> published
> +# by the Free Software Foundation, either version 3 of the License, or
> # (at your option) any later version.
> #
> # This program is distributed in the hope that it will be useful,
> @@ -21,26 +21,29 @@
> #
> # You should have received a copy of the GNU Affero General Public
> License
> # along with this program. If not, see <http://
> >.
>
> -######
>
> +######