Merge lp:~inddiana/sisb/sisb_caja_chica_cierre_comparar_plus_reposiciones into lp:sisb
- sisb_caja_chica_cierre_comparar_plus_reposiciones
- Merge into sisb
Proposed by
[SISB] Aryrosa Fuentes
Status: | Merged |
---|---|
Merged at revision: | 983 |
Proposed branch: | lp:~inddiana/sisb/sisb_caja_chica_cierre_comparar_plus_reposiciones |
Merge into: | lp:sisb |
Diff against target: |
648 lines (+223/-132) 5 files modified
l10n_ve_caja_chica/i18n/es_VE.po (+65/-42) l10n_ve_caja_chica/model/caja_chica.py (+141/-80) l10n_ve_caja_chica/view/caja_chica.xml (+7/-1) l10n_ve_caja_chica/view/caja_reposicion.xml (+1/-1) l10n_ve_caja_chica_presupuesto/model/caja_chica_presupuesto.py (+9/-8) |
To merge this branch: | bzr merge lp:~inddiana/sisb/sisb_caja_chica_cierre_comparar_plus_reposiciones |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juan Lugo | Pending | ||
Review via email: mp+335402@code.launchpad.net |
Commit message
Description of the change
[MOD] Modificaciones en el proceso de cierre de caja chica. Permite
cerrar sin reposicion o sin diferencial.
[MOD] Se listan las reposiciones asociadas.
[MOD] Se incluye validacion para que el apunte del diferencial corresponda
con el monto del asiento.
[MOD] Ajustes en el requerido de la cuenta analitica desde la vista en las
lineas de la reposicion.
To post a comment you must log in.
- 985. By [SISB] Aryrosa Fuentes
-
[MOD] Ajustes en el requerido de la cuenta analitica desde la vista en las lineas de la reposicion.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'l10n_ve_caja_chica/i18n/es_VE.mo' | |||
2 | 0 | Binary files l10n_ve_caja_chica/i18n/es_VE.mo 2016-11-29 14:28:14 +0000 and l10n_ve_caja_chica/i18n/es_VE.mo 2017-12-19 18:13:57 +0000 differ | 0 | Binary files l10n_ve_caja_chica/i18n/es_VE.mo 2016-11-29 14:28:14 +0000 and l10n_ve_caja_chica/i18n/es_VE.mo 2017-12-19 18:13:57 +0000 differ |
3 | === modified file 'l10n_ve_caja_chica/i18n/es_VE.po' | |||
4 | --- l10n_ve_caja_chica/i18n/es_VE.po 2016-11-29 14:28:14 +0000 | |||
5 | +++ l10n_ve_caja_chica/i18n/es_VE.po 2017-12-19 18:13:57 +0000 | |||
6 | @@ -6,8 +6,8 @@ | |||
7 | 6 | msgstr "" | 6 | msgstr "" |
8 | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" | 7 | "Project-Id-Version: OpenERP Server 6.0.4\n" |
9 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
12 | 9 | "POT-Creation-Date: 2016-11-29 14:22+0000\n" | 9 | "POT-Creation-Date: 2017-12-19 17:42+0000\n" |
13 | 10 | "PO-Revision-Date: 2016-11-29 10:25-0400\n" | 10 | "PO-Revision-Date: 2017-12-19 13:13-0400\n" |
14 | 11 | "Last-Translator: Aryrosa Fuentes <afuentes@industriasdiana.gob.ve>\n" | 11 | "Last-Translator: Aryrosa Fuentes <afuentes@industriasdiana.gob.ve>\n" |
15 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
16 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
17 | @@ -79,7 +79,7 @@ | |||
18 | 79 | msgstr "Presupuesto" | 79 | msgstr "Presupuesto" |
19 | 80 | 80 | ||
20 | 81 | #. module: l10n_ve_caja_chica | 81 | #. module: l10n_ve_caja_chica |
22 | 82 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:204 | 82 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:205 |
23 | 83 | #, python-format | 83 | #, python-format |
24 | 84 | msgid "Petty Cash updated " | 84 | msgid "Petty Cash updated " |
25 | 85 | msgstr "Actualizada caja chica " | 85 | msgstr "Actualizada caja chica " |
26 | @@ -120,7 +120,7 @@ | |||
27 | 120 | msgstr "Monto de Reposición" | 120 | msgstr "Monto de Reposición" |
28 | 121 | 121 | ||
29 | 122 | #. module: l10n_ve_caja_chica | 122 | #. module: l10n_ve_caja_chica |
31 | 123 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:198 | 123 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:199 |
32 | 124 | #, python-format | 124 | #, python-format |
33 | 125 | msgid "Petty Cash opened " | 125 | msgid "Petty Cash opened " |
34 | 126 | msgstr "Abierta caja chica " | 126 | msgstr "Abierta caja chica " |
35 | @@ -146,6 +146,12 @@ | |||
36 | 146 | msgstr "¿Desea cerrar la caja chica?" | 146 | msgstr "¿Desea cerrar la caja chica?" |
37 | 147 | 147 | ||
38 | 148 | #. module: l10n_ve_caja_chica | 148 | #. module: l10n_ve_caja_chica |
39 | 149 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:354 | ||
40 | 150 | #, python-format | ||
41 | 151 | msgid "You cant open! Must be indicate fiscal year before open it." | ||
42 | 152 | msgstr "No puede aperturar! Debe indicar el año fiscal antes de abrir la caja chica." | ||
43 | 153 | |||
44 | 154 | #. module: l10n_ve_caja_chica | ||
45 | 149 | #: field:caja.reposicion,move_ids:0 | 155 | #: field:caja.reposicion,move_ids:0 |
46 | 150 | msgid "Asientos Contable" | 156 | msgid "Asientos Contable" |
47 | 151 | msgstr "Asientos Contable" | 157 | msgstr "Asientos Contable" |
48 | @@ -162,13 +168,13 @@ | |||
49 | 162 | msgstr "Agrupar Por..." | 168 | msgstr "Agrupar Por..." |
50 | 163 | 169 | ||
51 | 164 | #. module: l10n_ve_caja_chica | 170 | #. module: l10n_ve_caja_chica |
53 | 165 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:538 | 171 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:599 |
54 | 166 | #, python-format | 172 | #, python-format |
55 | 167 | msgid "You cant do it!" | 173 | msgid "You cant do it!" |
56 | 168 | msgstr "No puede realizar ésta operación!" | 174 | msgstr "No puede realizar ésta operación!" |
57 | 169 | 175 | ||
58 | 170 | #. module: l10n_ve_caja_chica | 176 | #. module: l10n_ve_caja_chica |
60 | 171 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:534 | 177 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:582 |
61 | 172 | #, python-format | 178 | #, python-format |
62 | 173 | msgid "You cant close! You should check the differential." | 179 | msgid "You cant close! You should check the differential." |
63 | 174 | msgstr "¡No puede cerrar! Debe verificar el diferencial." | 180 | msgstr "¡No puede cerrar! Debe verificar el diferencial." |
64 | @@ -179,12 +185,17 @@ | |||
65 | 179 | msgstr "Reposición de Caja Chica:" | 185 | msgstr "Reposición de Caja Chica:" |
66 | 180 | 186 | ||
67 | 181 | #. module: l10n_ve_caja_chica | 187 | #. module: l10n_ve_caja_chica |
68 | 188 | #: view:caja.chica:0 | ||
69 | 189 | msgid "Reopen" | ||
70 | 190 | msgstr "Reapertura" | ||
71 | 191 | |||
72 | 192 | #. module: l10n_ve_caja_chica | ||
73 | 182 | #: field:caja.reposicion,fecha_confirmado:0 | 193 | #: field:caja.reposicion,fecha_confirmado:0 |
74 | 183 | msgid "Fecha Confirmado" | 194 | msgid "Fecha Confirmado" |
75 | 184 | msgstr "Fecha Confirmado" | 195 | msgstr "Fecha Confirmado" |
76 | 185 | 196 | ||
77 | 186 | #. module: l10n_ve_caja_chica | 197 | #. module: l10n_ve_caja_chica |
79 | 187 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:482 | 198 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:524 |
80 | 188 | #, python-format | 199 | #, python-format |
81 | 189 | msgid "You cant pre-close! Repositioning is not state done." | 200 | msgid "You cant pre-close! Repositioning is not state done." |
82 | 190 | msgstr "No puede realizar el pre-cierre! La reposición no está aprobada." | 201 | msgstr "No puede realizar el pre-cierre! La reposición no está aprobada." |
83 | @@ -221,7 +232,7 @@ | |||
84 | 221 | msgstr "Abierta" | 232 | msgstr "Abierta" |
85 | 222 | 233 | ||
86 | 223 | #. module: l10n_ve_caja_chica | 234 | #. module: l10n_ve_caja_chica |
88 | 224 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:493 | 235 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:535 |
89 | 225 | #, python-format | 236 | #, python-format |
90 | 226 | msgid "You cant pre-close! Repositioning associated in other document." | 237 | msgid "You cant pre-close! Repositioning associated in other document." |
91 | 227 | msgstr "No puede realizar el pre-cierre! La reposición está asociada en otro documento." | 238 | msgstr "No puede realizar el pre-cierre! La reposición está asociada en otro documento." |
92 | @@ -247,13 +258,14 @@ | |||
93 | 247 | msgstr "Líneas la Reposición de Caja" | 258 | msgstr "Líneas la Reposición de Caja" |
94 | 248 | 259 | ||
95 | 249 | #. module: l10n_ve_caja_chica | 260 | #. module: l10n_ve_caja_chica |
97 | 250 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:392 | 261 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:406 |
98 | 262 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:417 | ||
99 | 251 | #, python-format | 263 | #, python-format |
100 | 252 | msgid "Error !" | 264 | msgid "Error !" |
101 | 253 | msgstr "Error !" | 265 | msgstr "Error !" |
102 | 254 | 266 | ||
103 | 255 | #. module: l10n_ve_caja_chica | 267 | #. module: l10n_ve_caja_chica |
105 | 256 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:343 | 268 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:344 |
106 | 257 | #, python-format | 269 | #, python-format |
107 | 258 | msgid "You cant open! The init date or the end date have an error." | 270 | msgid "You cant open! The init date or the end date have an error." |
108 | 259 | msgstr "No puede aperturar! La fecha desde o la fecha hasta está fuera del ejercicio fiscal." | 271 | msgstr "No puede aperturar! La fecha desde o la fecha hasta está fuera del ejercicio fiscal." |
109 | @@ -377,7 +389,7 @@ | |||
110 | 377 | msgstr "Configuracion Caja Chica" | 389 | msgstr "Configuracion Caja Chica" |
111 | 378 | 390 | ||
112 | 379 | #. module: l10n_ve_caja_chica | 391 | #. module: l10n_ve_caja_chica |
114 | 380 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:486 | 392 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:528 |
115 | 381 | #, python-format | 393 | #, python-format |
116 | 382 | msgid "You cant pre-close! Exist repositioning of petty cash in state different of paid." | 394 | msgid "You cant pre-close! Exist repositioning of petty cash in state different of paid." |
117 | 383 | msgstr "No puede realizar el pre-cierre! Existe alguna reposición de la caja chica con estado diferente a pagado." | 395 | msgstr "No puede realizar el pre-cierre! Existe alguna reposición de la caja chica con estado diferente a pagado." |
118 | @@ -389,21 +401,21 @@ | |||
119 | 389 | msgstr "Caja Reposición" | 401 | msgstr "Caja Reposición" |
120 | 390 | 402 | ||
121 | 391 | #. module: l10n_ve_caja_chica | 403 | #. module: l10n_ve_caja_chica |
137 | 392 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:343 | 404 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:344 |
138 | 393 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:351 | 405 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:352 |
139 | 394 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:353 | 406 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:354 |
140 | 395 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:364 | 407 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:365 |
141 | 396 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:482 | 408 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:524 |
142 | 397 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:486 | 409 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:528 |
143 | 398 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:493 | 410 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:535 |
144 | 399 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:495 | 411 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:540 |
145 | 400 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:509 | 412 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:560 |
146 | 401 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:515 | 413 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:566 |
147 | 402 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:518 | 414 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:570 |
148 | 403 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:534 | 415 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:582 |
149 | 404 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:538 | 416 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:599 |
150 | 405 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:823 | 417 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:884 |
151 | 406 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:970 | 418 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:1031 |
152 | 407 | #, python-format | 419 | #, python-format |
153 | 408 | msgid "Message" | 420 | msgid "Message" |
154 | 409 | msgstr "Mensaje" | 421 | msgstr "Mensaje" |
155 | @@ -424,7 +436,7 @@ | |||
156 | 424 | msgstr "Elaborado por:" | 436 | msgstr "Elaborado por:" |
157 | 425 | 437 | ||
158 | 426 | #. module: l10n_ve_caja_chica | 438 | #. module: l10n_ve_caja_chica |
160 | 427 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:515 | 439 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:566 |
161 | 428 | #, python-format | 440 | #, python-format |
162 | 429 | msgid "You cant close! The differential move associated is not valid." | 441 | msgid "You cant close! The differential move associated is not valid." |
163 | 430 | msgstr "No puede cerrar! El movimiento diferencial no es válido." | 442 | msgstr "No puede cerrar! El movimiento diferencial no es válido." |
164 | @@ -479,6 +491,11 @@ | |||
165 | 479 | 491 | ||
166 | 480 | #. module: l10n_ve_caja_chica | 492 | #. module: l10n_ve_caja_chica |
167 | 481 | #: view:caja.chica:0 | 493 | #: view:caja.chica:0 |
168 | 494 | msgid "Esta accion reabre la Caja Chica, ¿Desea reabrir la caja chica?" | ||
169 | 495 | msgstr "Esta accion reabre la Caja Chica, ¿Desea reabrir la caja chica?" | ||
170 | 496 | |||
171 | 497 | #. module: l10n_ve_caja_chica | ||
172 | 498 | #: view:caja.chica:0 | ||
173 | 482 | #: field:caja.chica,user_ids:0 | 499 | #: field:caja.chica,user_ids:0 |
174 | 483 | msgid "Responsables" | 500 | msgid "Responsables" |
175 | 484 | msgstr "Responsables" | 501 | msgstr "Responsables" |
176 | @@ -504,7 +521,7 @@ | |||
177 | 504 | msgstr "Asientos Contables" | 521 | msgstr "Asientos Contables" |
178 | 505 | 522 | ||
179 | 506 | #. module: l10n_ve_caja_chica | 523 | #. module: l10n_ve_caja_chica |
181 | 507 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:823 | 524 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:884 |
182 | 508 | #, python-format | 525 | #, python-format |
183 | 509 | msgid "You cant confirm the document! The opening payment order should be posted." | 526 | msgid "You cant confirm the document! The opening payment order should be posted." |
184 | 510 | msgstr "No puede confirmar el documento! La orden de pago de apertura debe ser contabilizada." | 527 | msgstr "No puede confirmar el documento! La orden de pago de apertura debe ser contabilizada." |
185 | @@ -515,13 +532,13 @@ | |||
186 | 515 | msgstr "Buscar Caja Chica" | 532 | msgstr "Buscar Caja Chica" |
187 | 516 | 533 | ||
188 | 517 | #. module: l10n_ve_caja_chica | 534 | #. module: l10n_ve_caja_chica |
190 | 518 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:202 | 535 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:203 |
191 | 519 | #, python-format | 536 | #, python-format |
192 | 520 | msgid "Petty Cash closed " | 537 | msgid "Petty Cash closed " |
193 | 521 | msgstr "Cerrada caja chica " | 538 | msgstr "Cerrada caja chica " |
194 | 522 | 539 | ||
195 | 523 | #. module: l10n_ve_caja_chica | 540 | #. module: l10n_ve_caja_chica |
197 | 524 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:351 | 541 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:352 |
198 | 525 | #, python-format | 542 | #, python-format |
199 | 526 | msgid "You cant open! Petty cash of previous fiscal year is open." | 543 | msgid "You cant open! Petty cash of previous fiscal year is open." |
200 | 527 | msgstr "No puede aperturar! Caja chica de año fiscal anterior está abierta." | 544 | msgstr "No puede aperturar! Caja chica de año fiscal anterior está abierta." |
201 | @@ -558,7 +575,7 @@ | |||
202 | 558 | msgstr "Diario de Gasto" | 575 | msgstr "Diario de Gasto" |
203 | 559 | 576 | ||
204 | 560 | #. module: l10n_ve_caja_chica | 577 | #. module: l10n_ve_caja_chica |
206 | 561 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:509 | 578 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:560 |
207 | 562 | #, python-format | 579 | #, python-format |
208 | 563 | msgid "You cant close! Differential is associated in other document." | 580 | msgid "You cant close! Differential is associated in other document." |
209 | 564 | msgstr "No puede cerrar! El diferencial está asociado en otro documento." | 581 | msgstr "No puede cerrar! El diferencial está asociado en otro documento." |
210 | @@ -614,7 +631,7 @@ | |||
211 | 614 | msgstr "Borrador" | 631 | msgstr "Borrador" |
212 | 615 | 632 | ||
213 | 616 | #. module: l10n_ve_caja_chica | 633 | #. module: l10n_ve_caja_chica |
215 | 617 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:495 | 634 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:540 |
216 | 618 | #, python-format | 635 | #, python-format |
217 | 619 | msgid "You cant pre-close! You must indicate repositioning document." | 636 | msgid "You cant pre-close! You must indicate repositioning document." |
218 | 620 | msgstr "No puede realizar el pre-cierre! Debe indicar el documento de reposición." | 637 | msgstr "No puede realizar el pre-cierre! Debe indicar el documento de reposición." |
219 | @@ -631,7 +648,7 @@ | |||
220 | 631 | msgstr "Confirmar" | 648 | msgstr "Confirmar" |
221 | 632 | 649 | ||
222 | 633 | #. module: l10n_ve_caja_chica | 650 | #. module: l10n_ve_caja_chica |
224 | 634 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:518 | 651 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:570 |
225 | 635 | #, python-format | 652 | #, python-format |
226 | 636 | msgid "You cant close! You must associate the differential." | 653 | msgid "You cant close! You must associate the differential." |
227 | 637 | msgstr "No puede cerrar! Debe asociar el movimiento diferencial." | 654 | msgstr "No puede cerrar! Debe asociar el movimiento diferencial." |
228 | @@ -657,10 +674,10 @@ | |||
229 | 657 | msgstr "-" | 674 | msgstr "-" |
230 | 658 | 675 | ||
231 | 659 | #. module: l10n_ve_caja_chica | 676 | #. module: l10n_ve_caja_chica |
236 | 660 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:353 | 677 | #: view:caja.chica:0 |
237 | 661 | #, python-format | 678 | #: field:caja.chica,reposicion_ids:0 |
238 | 662 | msgid "You cant open! Must be indicate fiscal year before open it." | 679 | msgid "Reposiciones" |
239 | 663 | msgstr "No puede aperturar! Debe indicar el año fiscal antes de abrir la caja chica." | 680 | msgstr "Reposiciones" |
240 | 664 | 681 | ||
241 | 665 | #. module: l10n_ve_caja_chica | 682 | #. module: l10n_ve_caja_chica |
242 | 666 | #: field:caja.chica,journal_id:0 | 683 | #: field:caja.chica,journal_id:0 |
243 | @@ -668,19 +685,19 @@ | |||
244 | 668 | msgstr "Diario de Pago" | 685 | msgstr "Diario de Pago" |
245 | 669 | 686 | ||
246 | 670 | #. module: l10n_ve_caja_chica | 687 | #. module: l10n_ve_caja_chica |
248 | 671 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:324 | 688 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:325 |
249 | 672 | #, python-format | 689 | #, python-format |
250 | 673 | msgid "Created account voucher in draft: " | 690 | msgid "Created account voucher in draft: " |
251 | 674 | msgstr "Creada la orden de pago en borrador: " | 691 | msgstr "Creada la orden de pago en borrador: " |
252 | 675 | 692 | ||
253 | 676 | #. module: l10n_ve_caja_chica | 693 | #. module: l10n_ve_caja_chica |
255 | 677 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:970 | 694 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:1031 |
256 | 678 | #, python-format | 695 | #, python-format |
257 | 679 | msgid "You cant create the pay order! Repositioning associated in the closed petty cash." | 696 | msgid "You cant create the pay order! Repositioning associated in the closed petty cash." |
258 | 680 | msgstr "No puede crear la orden de pago! La reposición está asociada en una caja chica cerrada." | 697 | msgstr "No puede crear la orden de pago! La reposición está asociada en una caja chica cerrada." |
259 | 681 | 698 | ||
260 | 682 | #. module: l10n_ve_caja_chica | 699 | #. module: l10n_ve_caja_chica |
262 | 683 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:364 | 700 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:365 |
263 | 684 | #, python-format | 701 | #, python-format |
264 | 685 | msgid "You cant open!" | 702 | msgid "You cant open!" |
265 | 686 | msgstr "No puede realizar la apertura de la caja chica!" | 703 | msgstr "No puede realizar la apertura de la caja chica!" |
266 | @@ -721,13 +738,13 @@ | |||
267 | 721 | msgstr "Año fiscal" | 738 | msgstr "Año fiscal" |
268 | 722 | 739 | ||
269 | 723 | #. module: l10n_ve_caja_chica | 740 | #. module: l10n_ve_caja_chica |
271 | 724 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:392 | 741 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:406 |
272 | 725 | #, python-format | 742 | #, python-format |
273 | 726 | msgid "Dont exist differential move" | 743 | msgid "Dont exist differential move" |
274 | 727 | msgstr "No existe el asiento diferencial" | 744 | msgstr "No existe el asiento diferencial" |
275 | 728 | 745 | ||
276 | 729 | #. module: l10n_ve_caja_chica | 746 | #. module: l10n_ve_caja_chica |
278 | 730 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:200 | 747 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:201 |
279 | 731 | #, python-format | 748 | #, python-format |
280 | 732 | msgid "Petty Cash pre-closed " | 749 | msgid "Petty Cash pre-closed " |
281 | 733 | msgstr "Pre-cerrada la caja chica " | 750 | msgstr "Pre-cerrada la caja chica " |
282 | @@ -764,6 +781,12 @@ | |||
283 | 764 | msgstr "“" | 781 | msgstr "“" |
284 | 765 | 782 | ||
285 | 766 | #. module: l10n_ve_caja_chica | 783 | #. module: l10n_ve_caja_chica |
286 | 784 | #: code:addons/l10n_ve_caja_chica/model/caja_chica.py:417 | ||
287 | 785 | #, python-format | ||
288 | 786 | msgid "Error from differential move" | ||
289 | 787 | msgstr "Error en el asiento diferencial" | ||
290 | 788 | |||
291 | 789 | #. module: l10n_ve_caja_chica | ||
292 | 767 | #: field:caja.reposicion,name:0 | 790 | #: field:caja.reposicion,name:0 |
293 | 768 | msgid "Secuencia de movimiento" | 791 | msgid "Secuencia de movimiento" |
294 | 769 | msgstr "Secuencia de movimiento" | 792 | msgstr "Secuencia de movimiento" |
295 | 770 | 793 | ||
296 | === modified file 'l10n_ve_caja_chica/model/caja_chica.py' | |||
297 | --- l10n_ve_caja_chica/model/caja_chica.py 2016-11-29 14:28:14 +0000 | |||
298 | +++ l10n_ve_caja_chica/model/caja_chica.py 2017-12-19 18:13:57 +0000 | |||
299 | @@ -146,6 +146,7 @@ | |||
300 | 146 | 'repo_amount': fields.function(_calculate_amount, digits_compute=dp.get_precision('Account'), method=True, string='Reposition Amount', multi='balance'), | 146 | 'repo_amount': fields.function(_calculate_amount, digits_compute=dp.get_precision('Account'), method=True, string='Reposition Amount', multi='balance'), |
301 | 147 | 'diff_amount': fields.function(_calculate_amount, digits_compute=dp.get_precision('Account'), method=True, string='Differential Amount', multi='balance'), | 147 | 'diff_amount': fields.function(_calculate_amount, digits_compute=dp.get_precision('Account'), method=True, string='Differential Amount', multi='balance'), |
302 | 148 | 'balance_total': fields.function(_calculate_amount, digits_compute=dp.get_precision('Account'), method=True, string='Balance Total', multi='balance'), | 148 | 'balance_total': fields.function(_calculate_amount, digits_compute=dp.get_precision('Account'), method=True, string='Balance Total', multi='balance'), |
303 | 149 | 'reposicion_ids': fields.one2many('caja.reposicion', 'caja_chica_id', 'Reposiciones', readonly=True), | ||
304 | 149 | } | 150 | } |
305 | 150 | 151 | ||
306 | 151 | _defaults = { | 152 | _defaults = { |
307 | @@ -364,7 +365,20 @@ | |||
308 | 364 | raise osv.except_osv(_('Message'),_('You cant open!')) | 365 | raise osv.except_osv(_('Message'),_('You cant open!')) |
309 | 365 | return True | 366 | return True |
310 | 366 | 367 | ||
312 | 367 | 368 | def action_reopen(self, cr, uid, ids, context=None): | |
313 | 369 | """ Reabrir la caja chica para crear asiento de apertura | ||
314 | 370 | @return: True | ||
315 | 371 | """ | ||
316 | 372 | if not type(ids) == type([]): | ||
317 | 373 | up_ids = [ids] | ||
318 | 374 | else: | ||
319 | 375 | up_ids = ids | ||
320 | 376 | self.write(cr, uid, up_ids, {'state': 'opened'}, context=context) | ||
321 | 377 | context.update({'estado': 'opened'}) | ||
322 | 378 | self.log_caja_chica(cr, uid, up_ids, context=context) | ||
323 | 379 | |||
324 | 380 | return True | ||
325 | 381 | |||
326 | 368 | def create_close_move(self, cr, uid, ids, move_differential, context=None): | 382 | def create_close_move(self, cr, uid, ids, move_differential, context=None): |
327 | 369 | 383 | ||
328 | 370 | am_obj = self.pool.get("account.move") | 384 | am_obj = self.pool.get("account.move") |
329 | @@ -387,85 +401,113 @@ | |||
330 | 387 | 401 | ||
331 | 388 | #Apunte del diferencial Caja Chica x Pagar | 402 | #Apunte del diferencial Caja Chica x Pagar |
332 | 389 | if move_differential: | 403 | if move_differential: |
334 | 390 | apunte_id = aml_obj.search(cr, uid, [('move_id','=',move_differential.id),('account_id','=',account_id_cred)], context=context) | 404 | apunte_id = aml_obj.search(cr, uid, [('move_id','=',move_differential.id),('account_id','=',account_id_cred),('credit','>',0.00)], context=context) |
335 | 391 | if not apunte_id: | 405 | if not apunte_id: |
336 | 392 | raise osv.except_osv(_('Error !'), _('Dont exist differential move')) | 406 | raise osv.except_osv(_('Error !'), _('Dont exist differential move')) |
337 | 393 | 407 | ||
338 | 394 | apunte_brw = aml_obj.browse(cr, uid, apunte_id, context=context)[0] | 408 | apunte_brw = aml_obj.browse(cr, uid, apunte_id, context=context)[0] |
339 | 395 | 409 | ||
351 | 396 | move = { | 410 | monto_dif = 0.00 |
341 | 397 | 'name': seq_obj.get_id(cr, uid, seq_journal_move_id), | ||
342 | 398 | 'journal_id': journal_move_id, | ||
343 | 399 | 'date': date_doc, | ||
344 | 400 | 'ref': 'Cierre caja chica %s'%ca_ch.name, | ||
345 | 401 | 'period_id': period_id | ||
346 | 402 | } | ||
347 | 403 | move_id = am_obj.create(cr, uid, move, context=context) | ||
348 | 404 | |||
349 | 405 | #create lines | ||
350 | 406 | #cuenta deudora | ||
352 | 407 | if apunte_brw.debit: | 411 | if apunte_brw.debit: |
355 | 408 | credit = 0.0 | 412 | monto_dif = apunte_brw.debit |
354 | 409 | debit = ca_ch.amount | ||
356 | 410 | else: | 413 | else: |
365 | 411 | credit = ca_ch.amount | 414 | monto_dif = apunte_brw.credit |
366 | 412 | debit = 0.0 | 415 | |
367 | 413 | move_line = { | 416 | if not abs(move_differential.amount - monto_dif) < 0.0001: |
368 | 414 | 'name': name_line_deb, | 417 | raise osv.except_osv(_('Error !'), _('Error from differential move')) |
369 | 415 | 'debit': debit, | 418 | |
370 | 416 | 'credit': credit, | 419 | move = { |
371 | 417 | 'account_id': account_id_deb, | 420 | 'name': seq_obj.get_id(cr, uid, seq_journal_move_id), |
364 | 418 | 'move_id': move_id, | ||
372 | 419 | 'journal_id': journal_move_id, | 421 | 'journal_id': journal_move_id, |
404 | 420 | 'period_id': period_id, | 422 | 'date': date_doc, |
405 | 421 | 'partner_id': partner_id, | 423 | 'ref': 'Cierre caja chica %s'%ca_ch.name, |
406 | 422 | 'date': date_doc, | 424 | 'period_id': period_id |
407 | 423 | 'date_maturity': date_doc, | 425 | } |
408 | 424 | 'analytic_account_id': ca_ch.analytic_id and ca_ch.analytic_id.id or False, | 426 | move_id = am_obj.create(cr, uid, move, context=context) |
409 | 425 | } | 427 | |
410 | 426 | account_credit = aml_obj.create(cr, uid, move_line, context=context) | 428 | #create lines |
411 | 427 | #cuenta acreedora | 429 | |
412 | 428 | if apunte_brw.debit: | 430 | if move_differential: |
413 | 429 | credit = ca_ch.amount | 431 | #cuenta deudora |
414 | 430 | debit = 0.0 | 432 | if apunte_brw.debit: |
415 | 431 | else: | 433 | credit = 0.0 |
416 | 432 | credit = 0.0 | 434 | debit = ca_ch.amount |
417 | 433 | debit = ca_ch.amount | 435 | else: |
418 | 434 | move_line = { | 436 | credit = ca_ch.amount |
419 | 435 | 'name': name_line_cred, | 437 | debit = 0.0 |
420 | 436 | 'debit': debit, | 438 | else: |
421 | 437 | 'credit': credit, | 439 | #cuenta deudora |
422 | 438 | 'account_id': account_id_cred, | 440 | credit = ca_ch.amount |
423 | 439 | 'move_id': move_id, | 441 | debit = 0.0 |
424 | 440 | 'journal_id': journal_move_id, | 442 | |
425 | 441 | 'period_id': period_id, | 443 | move_line = { |
426 | 442 | 'date': date_doc, | 444 | 'name': name_line_deb, |
427 | 443 | 'date_maturity': date_doc, | 445 | 'debit': debit, |
428 | 444 | 'analytic_account_id': ca_ch.analytic_id and ca_ch.analytic_id.id or False, | 446 | 'credit': credit, |
429 | 445 | } | 447 | 'account_id': account_id_deb, |
430 | 446 | account_debit = aml_obj.create(cr, uid, move_line, context=context) | 448 | 'move_id': move_id, |
431 | 447 | isok = am_obj.button_validate(cr, uid, [move_id], context=context) | 449 | 'journal_id': journal_move_id, |
432 | 448 | 450 | 'period_id': period_id, | |
433 | 449 | #asociar asiento de cierre | 451 | 'partner_id': partner_id, |
434 | 450 | self.write(cr, uid, [ca_ch.id], {'close_move_id':move_id}, context=context) | 452 | 'date': date_doc, |
435 | 453 | 'date_maturity': date_doc, | ||
436 | 454 | 'analytic_account_id': ca_ch.analytic_id and ca_ch.analytic_id.id or False, | ||
437 | 455 | } | ||
438 | 456 | account_credit = aml_obj.create(cr, uid, move_line, context=context) | ||
439 | 457 | |||
440 | 458 | if move_differential: | ||
441 | 459 | #cuenta acreedora | ||
442 | 460 | if apunte_brw.debit: | ||
443 | 461 | credit = ca_ch.amount | ||
444 | 462 | debit = 0.0 | ||
445 | 463 | else: | ||
446 | 464 | credit = 0.0 | ||
447 | 465 | debit = ca_ch.amount | ||
448 | 466 | |||
449 | 467 | |||
450 | 468 | else: | ||
451 | 469 | #cuenta acreedora | ||
452 | 470 | credit = 0.0 | ||
453 | 471 | debit = ca_ch.amount | ||
454 | 472 | |||
455 | 473 | move_line = { | ||
456 | 474 | 'name': name_line_cred, | ||
457 | 475 | 'debit': debit, | ||
458 | 476 | 'credit': credit, | ||
459 | 477 | 'account_id': account_id_cred, | ||
460 | 478 | 'move_id': move_id, | ||
461 | 479 | 'journal_id': journal_move_id, | ||
462 | 480 | 'period_id': period_id, | ||
463 | 481 | 'date': date_doc, | ||
464 | 482 | 'date_maturity': date_doc, | ||
465 | 483 | 'analytic_account_id': ca_ch.analytic_id and ca_ch.analytic_id.id or False, | ||
466 | 484 | } | ||
467 | 485 | account_debit = aml_obj.create(cr, uid, move_line, context=context) | ||
468 | 486 | isok = am_obj.button_validate(cr, uid, [move_id], context=context) | ||
469 | 487 | |||
470 | 488 | #asociar asiento de cierre | ||
471 | 489 | self.write(cr, uid, [ca_ch.id], {'close_move_id':move_id}, context=context) | ||
472 | 451 | 490 | ||
480 | 452 | 491 | ||
481 | 453 | #conciliar | 492 | #conciliar |
482 | 454 | conciliation_ids = [] | 493 | conciliation_ids = [] |
483 | 455 | #Caja chica por pagar del asiento del cierre | 494 | #Caja chica por pagar del asiento del cierre |
484 | 456 | conciliation_ids.append(account_debit) | 495 | conciliation_ids.append(account_debit) |
485 | 457 | 496 | ||
486 | 458 | #caja chica por pagar del asiento de reposicion | 497 | #caja chica por pagar del asiento de reposicion |
487 | 498 | if ca_ch.repo_id: | ||
488 | 459 | for k in ca_ch.repo_id.move_ids: | 499 | for k in ca_ch.repo_id.move_ids: |
489 | 460 | if k.account_id.id == account_id_cred: | 500 | if k.account_id.id == account_id_cred: |
490 | 461 | conciliation_ids.append(k.id) | 501 | conciliation_ids.append(k.id) |
492 | 462 | 502 | ||
493 | 503 | if move_differential: | ||
494 | 463 | #caja chica por pagar del asiento diferencial | 504 | #caja chica por pagar del asiento diferencial |
495 | 464 | conciliation_ids.append(apunte_brw.id) | 505 | conciliation_ids.append(apunte_brw.id) |
500 | 465 | 506 | ||
501 | 466 | #conciliar todo | 507 | #conciliar todo |
502 | 467 | aml_obj.reconcile_partial(cr, uid, conciliation_ids, 'auto', context=context) | 508 | aml_obj.reconcile_partial(cr, uid, conciliation_ids, 'auto', context=context) |
503 | 468 | 509 | ||
504 | 510 | |||
505 | 469 | return True | 511 | return True |
506 | 470 | 512 | ||
507 | 471 | def action_pre_close(self, cr, uid, ids, context=None): | 513 | def action_pre_close(self, cr, uid, ids, context=None): |
508 | @@ -491,8 +533,17 @@ | |||
509 | 491 | self.log_caja_chica(cr, uid, [caja.id], context=context) | 533 | self.log_caja_chica(cr, uid, [caja.id], context=context) |
510 | 492 | else: | 534 | else: |
511 | 493 | raise osv.except_osv(_('Message'),_('You cant pre-close! Repositioning associated in other document.')) | 535 | raise osv.except_osv(_('Message'),_('You cant pre-close! Repositioning associated in other document.')) |
512 | 536 | |||
513 | 537 | ##### | ||
514 | 538 | #ya no aplica esta validacion en este punto | ||
515 | 539 | #~ else: | ||
516 | 540 | #~ raise osv.except_osv(_('Message'),_('You cant pre-close! You must indicate repositioning document.')) | ||
517 | 541 | ##### | ||
518 | 494 | else: | 542 | else: |
520 | 495 | raise osv.except_osv(_('Message'),_('You cant pre-close! You must indicate repositioning document.')) | 543 | self.write(cr, uid, caja.id, {'state': 'pre-closed'}, context=context) |
521 | 544 | context.update({'estado': 'pre-closed'}) | ||
522 | 545 | self.log_caja_chica(cr, uid, [caja.id], context=context) | ||
523 | 546 | |||
524 | 496 | return True | 547 | return True |
525 | 497 | 548 | ||
526 | 498 | 549 | ||
527 | @@ -514,24 +565,34 @@ | |||
528 | 514 | if not existe_cta: | 565 | if not existe_cta: |
529 | 515 | raise osv.except_osv(_('Message'),_('You cant close! The differential move associated is not valid.')) | 566 | raise osv.except_osv(_('Message'),_('You cant close! The differential move associated is not valid.')) |
530 | 516 | 567 | ||
532 | 517 | elif caja.balance_total != 0.00: | 568 | #~ elif caja.balance_total != 0.00: |
533 | 569 | elif not (abs(caja.balance_total) < 0.0001): | ||
534 | 518 | raise osv.except_osv(_('Message'),_('You cant close! You must associate the differential.')) | 570 | raise osv.except_osv(_('Message'),_('You cant close! You must associate the differential.')) |
537 | 519 | 571 | ||
538 | 520 | if (caja.differential_move_id and caja.balance_total == 0.00): | 572 | #~ if (caja.differential_move_id and caja.balance_total == 0.00): |
539 | 573 | if (caja.differential_move_id and abs(caja.balance_total) < 0.0001): | ||
540 | 521 | #crear asiento | 574 | #crear asiento |
541 | 522 | result = self.create_close_move(cr, uid, [caja.id], caja.differential_move_id, context=context) | 575 | result = self.create_close_move(cr, uid, [caja.id], caja.differential_move_id, context=context) |
542 | 523 | 576 | ||
547 | 524 | #cambiar estado de la caja chica a closed | 577 | elif (not caja.differential_move_id and abs(caja.balance_total) < 0.0001): |
548 | 525 | if result: | 578 | #crear asiento |
549 | 526 | self.write(cr, uid, [caja.id], {'state': 'closed'}, context=context) | 579 | result = self.create_close_move(cr, uid, [caja.id], False, context=context) |
550 | 527 | #CAMBIAR ESTADO DE LA REPOSICION A PAGADO | 580 | |
551 | 581 | else: | ||
552 | 582 | raise osv.except_osv(_('Message'),_('You cant close! You should check the differential.')) | ||
553 | 583 | |||
554 | 584 | |||
555 | 585 | #cambiar estado de la caja chica a closed | ||
556 | 586 | if result: | ||
557 | 587 | self.write(cr, uid, [caja.id], {'state': 'closed'}, context=context) | ||
558 | 588 | #CAMBIAR ESTADO DE LA REPOSICION A PAGADO | ||
559 | 589 | if caja.repo_id: | ||
560 | 528 | repo_obj = self.pool.get('caja.reposicion') | 590 | repo_obj = self.pool.get('caja.reposicion') |
561 | 529 | repo_obj.write(cr, uid, [caja.repo_id.id], {'state': 'final'}, context=context) | 591 | repo_obj.write(cr, uid, [caja.repo_id.id], {'state': 'final'}, context=context) |
567 | 530 | 592 | ||
568 | 531 | context.update({'estado': 'closed'}) | 593 | context.update({'estado': 'closed'}) |
569 | 532 | self.log_caja_chica(cr, uid, [caja.id], context=context) | 594 | self.log_caja_chica(cr, uid, [caja.id], context=context) |
570 | 533 | else: | 595 | |
566 | 534 | raise osv.except_osv(_('Message'),_('You cant close! You should check the differential.')) | ||
571 | 535 | return True | 596 | return True |
572 | 536 | 597 | ||
573 | 537 | def copy(self, cr, uid, id, default=None, context=None): | 598 | def copy(self, cr, uid, id, default=None, context=None): |
574 | @@ -581,7 +642,7 @@ | |||
575 | 581 | 'caja_reposicion_id': fields.many2one('caja.reposicion', 'Caja Reposicion'), | 642 | 'caja_reposicion_id': fields.many2one('caja.reposicion', 'Caja Reposicion'), |
576 | 582 | 'amount': fields.float('Monto', required=True), | 643 | 'amount': fields.float('Monto', required=True), |
577 | 583 | 'account_id': fields.many2one('account.account', 'Cuenta Contable', required=True), | 644 | 'account_id': fields.many2one('account.account', 'Cuenta Contable', required=True), |
579 | 584 | 'analytic_id': fields.many2one('account.analytic.account', 'Cuenta Analitica', required=True), | 645 | 'analytic_id': fields.many2one('account.analytic.account', 'Cuenta Analitica'), |
580 | 585 | 'product_id': fields.many2one('product.product', 'Servicio', required=True), | 646 | 'product_id': fields.many2one('product.product', 'Servicio', required=True), |
581 | 586 | 'date' : fields.date('Fecha de Emision', required=True), | 647 | 'date' : fields.date('Fecha de Emision', required=True), |
582 | 587 | 'state': fields.selection([('draft','Borrador'), ('done','Pagado'), | 648 | 'state': fields.selection([('draft','Borrador'), ('done','Pagado'), |
583 | 588 | 649 | ||
584 | === modified file 'l10n_ve_caja_chica/view/caja_chica.xml' | |||
585 | --- l10n_ve_caja_chica/view/caja_chica.xml 2016-11-29 14:28:14 +0000 | |||
586 | +++ l10n_ve_caja_chica/view/caja_chica.xml 2017-12-19 18:13:57 +0000 | |||
587 | @@ -156,6 +156,11 @@ | |||
588 | 156 | <field name='diff_amount' colspan="2"/> | 156 | <field name='diff_amount' colspan="2"/> |
589 | 157 | </group> | 157 | </group> |
590 | 158 | </page> | 158 | </page> |
591 | 159 | <page string="Reposiciones"> | ||
592 | 160 | <group col='6' colspan='4'> | ||
593 | 161 | <field name='reposicion_ids' colspan="2" nolabel='True' mode="tree"/> | ||
594 | 162 | </group> | ||
595 | 163 | </page> | ||
596 | 159 | </notebook> | 164 | </notebook> |
597 | 160 | <group col='4' colspan='4'> | 165 | <group col='4' colspan='4'> |
598 | 161 | <group colspan="2" col="2"> | 166 | <group colspan="2" col="2"> |
599 | @@ -165,7 +170,8 @@ | |||
600 | 165 | </group> | 170 | </group> |
601 | 166 | <group col='2' colspan='2'> | 171 | <group col='2' colspan='2'> |
602 | 167 | <button name="action_open" string="Open" type="object" icon="gtk-jump-to" attrs="{'invisible': ['|',('state','<>','draft'),('active','=',False)]}" confirm='Esta accion creara la Caja Chica en la Contabilidad, ¿Desea abrir la caja chica?' groups="l10n_ve_caja_chica.group_caja_chica_creacion"/> | 172 | <button name="action_open" string="Open" type="object" icon="gtk-jump-to" attrs="{'invisible': ['|',('state','<>','draft'),('active','=',False)]}" confirm='Esta accion creara la Caja Chica en la Contabilidad, ¿Desea abrir la caja chica?' groups="l10n_ve_caja_chica.group_caja_chica_creacion"/> |
604 | 168 | <button name="action_pre_close" string="Pre Close" type="object" icon="gtk-cancel" attrs="{'invisible': ['|','|',('repo_id','=',False),('state','<>','opened'),('active','=',False)]}" confirm='¿Desea pre-cerrar la caja chica?' groups="l10n_ve_caja_chica.group_caja_chica_creacion"/> | 173 | <button name="action_reopen" string="Reopen" type="object" icon="gtk-jump-to" attrs="{'invisible': ['|',('state','<>','pre-closed'),('active','=',False)]}" confirm='Esta accion reabre la Caja Chica, ¿Desea reabrir la caja chica?' groups="l10n_ve_caja_chica.group_caja_chica_creacion"/> |
605 | 174 | <button name="action_pre_close" string="Pre Close" type="object" icon="gtk-cancel" attrs="{'invisible': ['|',('state','<>','opened'),('active','=',False)]}" confirm='¿Desea pre-cerrar la caja chica?' groups="l10n_ve_caja_chica.group_caja_chica_creacion"/> | ||
606 | 169 | <button name="action_close" string="Close" type="object" icon="terp-dialog-close" attrs="{'invisible': ['|',('state','<>','pre-closed'),('active','=',False)]}" confirm='¿Desea cerrar la caja chica?' groups="l10n_ve_caja_chica.group_caja_chica_creacion"/> | 175 | <button name="action_close" string="Close" type="object" icon="terp-dialog-close" attrs="{'invisible': ['|',('state','<>','pre-closed'),('active','=',False)]}" confirm='¿Desea cerrar la caja chica?' groups="l10n_ve_caja_chica.group_caja_chica_creacion"/> |
607 | 170 | </group> | 176 | </group> |
608 | 171 | </group> | 177 | </group> |
609 | 172 | 178 | ||
610 | === modified file 'l10n_ve_caja_chica/view/caja_reposicion.xml' | |||
611 | --- l10n_ve_caja_chica/view/caja_reposicion.xml 2016-11-29 14:28:14 +0000 | |||
612 | +++ l10n_ve_caja_chica/view/caja_reposicion.xml 2017-12-19 18:13:57 +0000 | |||
613 | @@ -86,7 +86,7 @@ | |||
614 | 86 | <field name='product_id' domain="[('categ_id', '=', parent.product_categ),('type', '=', 'service')]" on_change="onchange_product_id(product_id, context)"/> | 86 | <field name='product_id' domain="[('categ_id', '=', parent.product_categ),('type', '=', 'service')]" on_change="onchange_product_id(product_id, context)"/> |
615 | 87 | <field name='amount'/> | 87 | <field name='amount'/> |
616 | 88 | <field name='account_id' domain="[('type', '<>', 'view')]"/> | 88 | <field name='account_id' domain="[('type', '<>', 'view')]"/> |
618 | 89 | <field name='analytic_id' domain="[('type', '<>', 'view')]"/> | 89 | <field name='analytic_id' domain="[('type', '<>', 'view')]" required='True'/> |
619 | 90 | </page> | 90 | </page> |
620 | 91 | </notebook> | 91 | </notebook> |
621 | 92 | </form> | 92 | </form> |
622 | 93 | 93 | ||
623 | === modified file 'l10n_ve_caja_chica_presupuesto/model/caja_chica_presupuesto.py' | |||
624 | --- l10n_ve_caja_chica_presupuesto/model/caja_chica_presupuesto.py 2016-11-29 14:28:14 +0000 | |||
625 | +++ l10n_ve_caja_chica_presupuesto/model/caja_chica_presupuesto.py 2017-12-19 18:13:57 +0000 | |||
626 | @@ -38,14 +38,15 @@ | |||
627 | 38 | caja_chica_brw = self.browse(cr, uid, ids, context=context) | 38 | caja_chica_brw = self.browse(cr, uid, ids, context=context) |
628 | 39 | 39 | ||
629 | 40 | for caja in caja_chica_brw: | 40 | for caja in caja_chica_brw: |
638 | 41 | for line in caja.repo_id.reposicion_linea_ids: | 41 | if caja.repo_id: |
639 | 42 | """ | 42 | for line in caja.repo_id.reposicion_linea_ids: |
640 | 43 | Desde aqui se llaman las funciones para la imputacion de la caja chica. | 43 | """ |
641 | 44 | """ | 44 | Desde aqui se llaman las funciones para la imputacion de la caja chica. |
642 | 45 | #Imputacion del pagado | 45 | """ |
643 | 46 | val = repo_obj._imputar_gasto_reposicion(cr, uid, caja.repo_id.id, line, 'pagado', line.enlace_id, context=None) | 46 | #Imputacion del pagado |
644 | 47 | if val: | 47 | val = repo_obj._imputar_gasto_reposicion(cr, uid, caja.repo_id.id, line, 'pagado', line.enlace_id, context=None) |
645 | 48 | repo_obj.write(cr, uid, [caja.repo_id.id], {'imputacion_ids': [(4, val)]}, context=context) | 48 | if val: |
646 | 49 | repo_obj.write(cr, uid, [caja.repo_id.id], {'imputacion_ids': [(4, val)]}, context=context) | ||
647 | 49 | 50 | ||
648 | 50 | return res | 51 | return res |
649 | 51 | 52 |