Merge lp:~a-camilli/openobject-italia/7.0_liq_IVA_opzioni_stampa into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0
- 7.0_liq_IVA_opzioni_stampa
- Merge into italian-addons-7.0
Status: | Approved |
---|---|
Approved by: | Alessandro Camilli |
Approved revision: | 238 |
Proposed branch: | lp:~a-camilli/openobject-italia/7.0_liq_IVA_opzioni_stampa |
Merge into: | lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0 |
Diff against target: |
902 lines (+344/-220) 7 files modified
account_vat_period_end_statement/AUTHORS.txt (+1/-0) account_vat_period_end_statement/account.py (+5/-0) account_vat_period_end_statement/account_view.xml (+9/-0) account_vat_period_end_statement/i18n/it.po (+182/-211) account_vat_period_end_statement/report/vat_period_end_statement.mako (+38/-8) account_vat_period_end_statement/report/vat_period_end_statement.py (+26/-0) account_vat_period_end_statement/reports.xml (+83/-1) |
To merge this branch: | bzr merge lp:~a-camilli/openobject-italia/7.0_liq_IVA_opzioni_stampa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lorenzo Battistini | Needs Information | ||
Review via email:
|
Commit message
Description of the change
Opzioni di stampa su liquidazione IVA:
- Raggruppa valori per conto contabile nel sommario
- Numerazione pagina
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Lorenzo Battistini (elbati) wrote : | # |
righe 793, 794 e 800: se non sbaglio 'print_page_year' e 'print_page_from' sono superflui
PS: puoi committare le modifiche direttamente su lp:~a-camilli/openobject-italia/7.0_liq_IVA_opzioni_stampa e poi mandare un messaggio qui sulla MP
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Alessandro Camilli (a-camilli) wrote : | # |
ho messo anche 1 come default sul pagina iniziale della liquidazione.
Ciao
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Lorenzo Battistini (elbati) wrote : | # |
Grazie!
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Lorenzo Battistini (elbati) wrote : | # |
Ciao Alessandro,
come mai le modifiche a it.po?
Ad esempio, come mai la traduzione di
'Not every tax linked to tax code %s is linked the same base code'
è stata rimossa, sebbene la stringa sia presente nel codice?
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Lorenzo Battistini (elbati) wrote : | # |
This project is now hosted on https:/
Unmerged revisions
- 238. By Alessandro Camilli
- 237. By Alessandro Camilli
-
Opzioni stampa: raggruppa conto contabile e numerazione pagina
Preview Diff
1 | === modified file 'account_vat_period_end_statement/AUTHORS.txt' |
2 | --- account_vat_period_end_statement/AUTHORS.txt 2013-03-16 13:18:33 +0000 |
3 | +++ account_vat_period_end_statement/AUTHORS.txt 2014-03-13 10:02:00 +0000 |
4 | @@ -1,3 +1,4 @@ |
5 | Lorenzo Battistini <lorenzo.battistini@domsense.com> |
6 | Marco Marchiori <marcomarkiori@gmail.com> |
7 | Sergio Corato <sergiocorato@gmail.com> |
8 | +Alessandro Camilli <a.camilli@yahoo.it> |
9 | \ No newline at end of file |
10 | |
11 | === modified file 'account_vat_period_end_statement/account.py' |
12 | --- account_vat_period_end_statement/account.py 2013-11-21 12:51:55 +0000 |
13 | +++ account_vat_period_end_statement/account.py 2014-03-13 10:02:00 +0000 |
14 | @@ -256,10 +256,15 @@ |
15 | help="Remaining amount due."), |
16 | 'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'), |
17 | 'period_ids': fields.one2many('account.period','vat_statement_id','Periods'), |
18 | + 'print_account_vat_group': fields.boolean('Group by account VAT'), |
19 | + 'print_page_from': fields.integer('Page number from'), |
20 | + 'print_page_year': fields.char('Page number year', size=10), |
21 | } |
22 | |
23 | _defaults = { |
24 | 'date': fields.date.context_today, |
25 | + 'print_account_vat_group': True, |
26 | + 'print_page_from': 1, |
27 | } |
28 | |
29 | def _get_tax_code_amount(self, cr, uid, tax_code_id, period_id, context): |
30 | |
31 | === modified file 'account_vat_period_end_statement/account_view.xml' |
32 | --- account_vat_period_end_statement/account_view.xml 2013-03-16 13:18:33 +0000 |
33 | +++ account_vat_period_end_statement/account_view.xml 2014-03-13 10:02:00 +0000 |
34 | @@ -81,6 +81,15 @@ |
35 | <separator string="Payments" colspan="4"/> |
36 | <field name="payment_ids" nolabel="1" colspan="4"/> |
37 | </page> |
38 | + <page string="Print Options"> |
39 | + <group colspan="4" string="Page Number"> |
40 | + <field name="print_page_from"/> |
41 | + <field name="print_page_year"/> |
42 | + </group> |
43 | + <group colspan="4" string="Summary"> |
44 | + <field name="print_account_vat_group"/> |
45 | + </group> |
46 | + </page> |
47 | </notebook> |
48 | <field name="state" select="1"/> |
49 | <field name="reconciled"/> |
50 | |
51 | === modified file 'account_vat_period_end_statement/i18n/it.po' |
52 | --- account_vat_period_end_statement/i18n/it.po 2013-03-16 13:18:33 +0000 |
53 | +++ account_vat_period_end_statement/i18n/it.po 2014-03-13 10:02:00 +0000 |
54 | @@ -4,429 +4,400 @@ |
55 | # |
56 | msgid "" |
57 | msgstr "" |
58 | -"Project-Id-Version: OpenERP Server 6.1\n" |
59 | +"Project-Id-Version: OpenERP Server 7.0\n" |
60 | "Report-Msgid-Bugs-To: \n" |
61 | -"POT-Creation-Date: 2012-06-22 10:31+0000\n" |
62 | -"PO-Revision-Date: 2012-06-22 12:35+0100\n" |
63 | -"Last-Translator: Lorenzo Battistini <lorenzo.battistini@agilebg.com>\n" |
64 | +"POT-Creation-Date: 2014-02-27 13:30+0000\n" |
65 | +"PO-Revision-Date: 2014-02-27 13:30+0000\n" |
66 | +"Last-Translator: <>\n" |
67 | "Language-Team: \n" |
68 | "MIME-Version: 1.0\n" |
69 | "Content-Type: text/plain; charset=UTF-8\n" |
70 | -"Content-Transfer-Encoding: 8bit\n" |
71 | +"Content-Transfer-Encoding: \n" |
72 | "Plural-Forms: \n" |
73 | |
74 | -#. module: account_vat_period_end_statement |
75 | -#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:35 |
76 | -#, python-format |
77 | -msgid "Too many occurences of tax code %s" |
78 | -msgstr "Troppe occorrenze del codice impotsa %s" |
79 | - |
80 | -#. module: account_vat_period_end_statement |
81 | #: selection:account.vat.period.end.statement,state:0 |
82 | +#. module: account_vat_period_end_statement |
83 | msgid "Confirmed" |
84 | msgstr "Confermato" |
85 | |
86 | +#: view:account.vat.period.end.statement:0 |
87 | #. module: account_vat_period_end_statement |
88 | -#: view:account.vat.period.end.statement:0 |
89 | msgid "Credit Account Lines" |
90 | msgstr "Righe conti di credito" |
91 | |
92 | +#: help:account.tax.code,vat_statement_sign:0 |
93 | #. module: account_vat_period_end_statement |
94 | +msgid "If tax code period sum is usually negative, set '-1' here" |
95 | +msgstr "If tax code period sum is usually negative, set '-1' here" |
96 | + |
97 | #: model:ir.model,name:account_vat_period_end_statement.model_statement_generic_account_line |
98 | +#. module: account_vat_period_end_statement |
99 | msgid "statement.generic.account.line" |
100 | msgstr "statement.generic.account.line" |
101 | |
102 | -#. module: account_vat_period_end_statement |
103 | -#: code:addons/account_vat_period_end_statement/account.py:381 |
104 | -#, python-format |
105 | -msgid "Other VAT Credits / Debits" |
106 | -msgstr "Altri Crediti / Debiti per IVA" |
107 | - |
108 | -#. module: account_vat_period_end_statement |
109 | #: help:account.vat.period.end.statement,reconciled:0 |
110 | +#. module: account_vat_period_end_statement |
111 | msgid "It indicates that the statement has been paid and the journal entry of the statement has been reconciled with one or several journal entries of payment." |
112 | msgstr "It indicates that the statement has been paid and the journal entry of the statement has been reconciled with one or several journal entries of payment." |
113 | |
114 | -#. module: account_vat_period_end_statement |
115 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:42 |
116 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:70 |
117 | #: model:ir.model,name:account_vat_period_end_statement.model_account_tax_code |
118 | #: field:statement.credit.account.line,tax_code_id:0 |
119 | #: field:statement.debit.account.line,tax_code_id:0 |
120 | +#. module: account_vat_period_end_statement |
121 | msgid "Tax Code" |
122 | msgstr "Codice imposta" |
123 | |
124 | +#: model:ir.model,name:account_vat_period_end_statement.model_account_vat_period_end_statement |
125 | #. module: account_vat_period_end_statement |
126 | -#: field:account.vat.period.end.statement,authority_partner_id:0 |
127 | -msgid "Tax Authority Partner" |
128 | -msgstr "Partner Erario" |
129 | +msgid "account.vat.period.end.statement" |
130 | +msgstr "account.vat.period.end.statement" |
131 | |
132 | -#. module: account_vat_period_end_statement |
133 | #: view:account.vat.period.end.statement:0 |
134 | #: field:account.vat.period.end.statement,previous_debit_vat_account_id:0 |
135 | -#: code:addons/account_vat_period_end_statement/account.py:364 |
136 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:134 |
137 | -#, python-format |
138 | +#. module: account_vat_period_end_statement |
139 | msgid "Previous Debits VAT" |
140 | msgstr "IVA debiti precedenti" |
141 | |
142 | +#: view:account.vat.period.end.statement:0 |
143 | #. module: account_vat_period_end_statement |
144 | -#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:43 |
145 | -#, python-format |
146 | -msgid "No base code found for tax code %s" |
147 | -msgstr "Nessun codice imponibile trovato per il codice imposta %s" |
148 | +msgid "Set to draft" |
149 | +msgstr "Imposta a bozza" |
150 | |
151 | -#. module: account_vat_period_end_statement |
152 | #: help:account.vat.period.end.statement,previous_credit_vat_account_id:0 |
153 | +#. module: account_vat_period_end_statement |
154 | msgid "Credit VAT from previous periods" |
155 | msgstr "IVA a credito da periodi precedenti" |
156 | |
157 | +#: view:account.vat.period.end.statement:0 |
158 | #. module: account_vat_period_end_statement |
159 | -#: view:account.vat.period.end.statement:0 |
160 | msgid "Tax Authority" |
161 | msgstr "Erario" |
162 | |
163 | +#: view:add.period.to.vat.statement:0 |
164 | #. module: account_vat_period_end_statement |
165 | -#: field:account.vat.period.end.statement,state:0 |
166 | -msgid "State" |
167 | -msgstr "Stato" |
168 | +msgid "Add" |
169 | +msgstr "Add" |
170 | |
171 | -#. module: account_vat_period_end_statement |
172 | #: selection:account.vat.period.end.statement,state:0 |
173 | +#. module: account_vat_period_end_statement |
174 | msgid "Draft" |
175 | msgstr "Bozza" |
176 | |
177 | -#. module: account_vat_period_end_statement |
178 | #: field:account.vat.period.end.statement,reconciled:0 |
179 | +#. module: account_vat_period_end_statement |
180 | msgid "Paid/Reconciled" |
181 | msgstr "Pagato/Riconciliato" |
182 | |
183 | +#: selection:account.tax.code,vat_statement_type:0 |
184 | #. module: account_vat_period_end_statement |
185 | -#: selection:account.tax.code,vat_statement_type:0 |
186 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:99 |
187 | msgid "Debit" |
188 | msgstr "Debito" |
189 | |
190 | -#. module: account_vat_period_end_statement |
191 | -#: code:addons/account_vat_period_end_statement/account.py:397 |
192 | -#, python-format |
193 | -msgid "Tax Authority VAT" |
194 | -msgstr "IVA Erario" |
195 | - |
196 | -#. module: account_vat_period_end_statement |
197 | #: help:account.vat.period.end.statement,residual:0 |
198 | +#. module: account_vat_period_end_statement |
199 | msgid "Remaining amount due." |
200 | msgstr "Importo dovuto rimanente" |
201 | |
202 | -#. module: account_vat_period_end_statement |
203 | #: view:account.vat.period.end.statement:0 |
204 | -msgid "General" |
205 | -msgstr "Generale" |
206 | - |
207 | -#. module: account_vat_period_end_statement |
208 | +#: view:add.period.to.vat.statement:0 |
209 | +#: model:ir.actions.act_window,name:account_vat_period_end_statement.action_add_period |
210 | +#. module: account_vat_period_end_statement |
211 | +msgid "Add period" |
212 | +msgstr "Add period" |
213 | + |
214 | +#: model:ir.ui.menu,name:account_vat_period_end_statement.menu_account_vat_period_end_statement |
215 | +#. module: account_vat_period_end_statement |
216 | +msgid "VAT statements" |
217 | +msgstr "Liquidazioni IVA" |
218 | + |
219 | #: field:account.tax.code,vat_statement_type:0 |
220 | +#. module: account_vat_period_end_statement |
221 | msgid "Type" |
222 | msgstr "Tipo" |
223 | |
224 | -#. module: account_vat_period_end_statement |
225 | #: field:account.vat.period.end.statement,previous_debit_vat_amount:0 |
226 | +#. module: account_vat_period_end_statement |
227 | msgid "Previous Debits VAT Amount" |
228 | msgstr "Importo IVA debiti precedenti" |
229 | |
230 | -#. module: account_vat_period_end_statement |
231 | #: field:account.vat.period.end.statement,credit_vat_account_line_ids:0 |
232 | -#: code:addons/account_vat_period_end_statement/account.py:330 |
233 | -#, python-format |
234 | +#. module: account_vat_period_end_statement |
235 | msgid "Credit VAT" |
236 | msgstr "IVA a credito" |
237 | |
238 | -#. module: account_vat_period_end_statement |
239 | -#: model:ir.ui.menu,name:account_vat_period_end_statement.menu_account_vat_period_end_statement |
240 | -msgid "VAT statements" |
241 | -msgstr "Liquidazioni IVA" |
242 | - |
243 | -#. module: account_vat_period_end_statement |
244 | #: view:account.vat.period.end.statement:0 |
245 | +#. module: account_vat_period_end_statement |
246 | msgid "Debit Account Lines" |
247 | msgstr "Righe conti di debito" |
248 | |
249 | +#: model:ir.model,name:account_vat_period_end_statement.model_account_period |
250 | #. module: account_vat_period_end_statement |
251 | -#: field:account.vat.period.end.statement,journal_id:0 |
252 | -msgid "Journal" |
253 | -msgstr "Sezionale" |
254 | +msgid "Account period" |
255 | +msgstr "Periodo contabile" |
256 | |
257 | -#. module: account_vat_period_end_statement |
258 | #: field:account.vat.period.end.statement,payable_vat_amount:0 |
259 | +#. module: account_vat_period_end_statement |
260 | msgid "Payable VAT Amount" |
261 | msgstr "Importo IVA Esigibile" |
262 | |
263 | +#: view:account.vat.period.end.statement:0 |
264 | +#: model:ir.actions.act_window,name:account_vat_period_end_statement.action_remove_period |
265 | +#: view:remove.period.from.vat.statement:0 |
266 | #. module: account_vat_period_end_statement |
267 | +msgid "Remove period" |
268 | +msgstr "Remove period" |
269 | + |
270 | #: selection:account.vat.period.end.statement,state:0 |
271 | +#. module: account_vat_period_end_statement |
272 | msgid "Paid" |
273 | msgstr "Pagato" |
274 | |
275 | -#. module: account_vat_period_end_statement |
276 | +#: field:account.period,vat_statement_id:0 |
277 | #: view:account.tax.code:0 |
278 | -#: code:addons/account_vat_period_end_statement/account.py:303 |
279 | #: field:statement.credit.account.line,statement_id:0 |
280 | #: field:statement.debit.account.line,statement_id:0 |
281 | #: field:statement.generic.account.line,statement_id:0 |
282 | -#, python-format |
283 | +#. module: account_vat_period_end_statement |
284 | msgid "VAT statement" |
285 | msgstr "Liquidazione IVA" |
286 | |
287 | -#. module: account_vat_period_end_statement |
288 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:39 |
289 | -msgid "Sales" |
290 | -msgstr "Vendite" |
291 | - |
292 | -#. module: account_vat_period_end_statement |
293 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:43 |
294 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:71 |
295 | -msgid "Base" |
296 | -msgstr "Imponibile" |
297 | - |
298 | -#. module: account_vat_period_end_statement |
299 | +#: view:add.period.to.vat.statement:0 |
300 | +#: view:remove.period.from.vat.statement:0 |
301 | +#. module: account_vat_period_end_statement |
302 | +msgid "Cancel" |
303 | +msgstr "Cancel" |
304 | + |
305 | #: model:ir.model,name:account_vat_period_end_statement.model_statement_credit_account_line |
306 | +#. module: account_vat_period_end_statement |
307 | msgid "statement.credit.account.line" |
308 | msgstr "statement.credit.account.line" |
309 | |
310 | -#. module: account_vat_period_end_statement |
311 | -#: code:addons/account_vat_period_end_statement/account.py:273 |
312 | -#: code:addons/account_vat_period_end_statement/account.py:298 |
313 | -#, python-format |
314 | -msgid "Error!" |
315 | -msgstr "Errore!" |
316 | - |
317 | -#. module: account_vat_period_end_statement |
318 | #: field:account.vat.period.end.statement,move_id:0 |
319 | +#. module: account_vat_period_end_statement |
320 | msgid "VAT statement move" |
321 | msgstr "Movimento liquidazione IVA" |
322 | |
323 | -#. module: account_vat_period_end_statement |
324 | -#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:48 |
325 | -#, python-format |
326 | -msgid "Not every tax linked to tax code %s is linked the same base code" |
327 | -msgstr "Non tutte le imposte collegate al codice imposta %s sono collegate allo stesso codice imponibile" |
328 | - |
329 | -#. module: account_vat_period_end_statement |
330 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:34 |
331 | +#: field:account.tax.code,vat_statement_sign:0 |
332 | +#. module: account_vat_period_end_statement |
333 | +msgid "Sign used in statement" |
334 | +msgstr "Sign used in statement" |
335 | + |
336 | +#: field:account.vat.period.end.statement,print_page_year:0 |
337 | +#. module: account_vat_period_end_statement |
338 | +msgid "Page number year" |
339 | +msgstr "Anno/Rif" |
340 | + |
341 | +#: field:account.vat.period.end.statement,date:0 |
342 | +#. module: account_vat_period_end_statement |
343 | +msgid "Date" |
344 | +msgstr "Date" |
345 | + |
346 | +#: field:account.vat.period.end.statement,print_page_from:0 |
347 | +#. module: account_vat_period_end_statement |
348 | +msgid "Page number from" |
349 | +msgstr "Da numero" |
350 | + |
351 | #: model:ir.actions.report.xml,name:account_vat_period_end_statement.print_vat_period_end_statement |
352 | +#. module: account_vat_period_end_statement |
353 | msgid "VAT Statement Summary" |
354 | msgstr "Prospetto liquidazione IVA" |
355 | |
356 | +#: view:account.vat.period.end.statement:0 |
357 | #. module: account_vat_period_end_statement |
358 | -#: view:account.vat.period.end.statement:0 |
359 | msgid "Account Lines" |
360 | msgstr "Righe conti" |
361 | |
362 | -#. module: account_vat_period_end_statement |
363 | #: field:statement.credit.account.line,account_id:0 |
364 | #: field:statement.debit.account.line,account_id:0 |
365 | #: field:statement.generic.account.line,account_id:0 |
366 | +#. module: account_vat_period_end_statement |
367 | msgid "Account" |
368 | msgstr "Conto" |
369 | |
370 | -#. module: account_vat_period_end_statement |
371 | #: field:account.vat.period.end.statement,generic_vat_account_line_ids:0 |
372 | +#. module: account_vat_period_end_statement |
373 | msgid "Other VAT Credits / Debits or Tax Compensations" |
374 | msgstr "Altri Crediti / Debiti per IVA o compensazioni di imposta" |
375 | |
376 | -#. module: account_vat_period_end_statement |
377 | #: help:account.tax.code,vat_statement_type:0 |
378 | +#. module: account_vat_period_end_statement |
379 | msgid "This establish whether amount will be loaded as debit or credit" |
380 | msgstr "Questo stabilisce se il saldo debba essere caricato come debito o come credito" |
381 | |
382 | -#. module: account_vat_period_end_statement |
383 | #: view:account.vat.period.end.statement:0 |
384 | #: field:account.vat.period.end.statement,previous_credit_vat_account_id:0 |
385 | -#: code:addons/account_vat_period_end_statement/account.py:347 |
386 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:129 |
387 | -#, python-format |
388 | +#. module: account_vat_period_end_statement |
389 | msgid "Previous Credits VAT" |
390 | msgstr "IVA crediti precedenti" |
391 | |
392 | -#. module: account_vat_period_end_statement |
393 | #: field:account.vat.period.end.statement,authority_vat_account_id:0 |
394 | +#. module: account_vat_period_end_statement |
395 | msgid "Tax Authority VAT Account" |
396 | msgstr "Conto IVA Erario" |
397 | |
398 | -#. module: account_vat_period_end_statement |
399 | -#: code:addons/account_vat_period_end_statement/account.py:273 |
400 | -#, python-format |
401 | -msgid "You cannot delete a confirmed or paid statement" |
402 | -msgstr "Non è possibile eliminare una liquidazione confermata o pagata" |
403 | - |
404 | -#. module: account_vat_period_end_statement |
405 | #: field:account.vat.period.end.statement,previous_credit_vat_amount:0 |
406 | +#. module: account_vat_period_end_statement |
407 | msgid "Previous Credits VAT Amount" |
408 | msgstr "Importo IVA crediti precedenti" |
409 | |
410 | +#: view:remove.period.from.vat.statement:0 |
411 | #. module: account_vat_period_end_statement |
412 | -#: field:account.tax.code,vat_statement_account_id:0 |
413 | -msgid "Account used for VAT statement" |
414 | -msgstr "Conto utilizzato per la liquidazione IVA" |
415 | +msgid "Remove" |
416 | +msgstr "Remove" |
417 | |
418 | +#: view:account.vat.period.end.statement:0 |
419 | #. module: account_vat_period_end_statement |
420 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:95 |
421 | msgid "Summary" |
422 | -msgstr "Riepilogo" |
423 | +msgstr "Sommario" |
424 | |
425 | -#. module: account_vat_period_end_statement |
426 | #: model:ir.model,name:account_vat_period_end_statement.model_statement_debit_account_line |
427 | +#. module: account_vat_period_end_statement |
428 | msgid "statement.debit.account.line" |
429 | msgstr "statement.debit.account.line" |
430 | |
431 | +#: selection:account.tax.code,vat_statement_type:0 |
432 | #. module: account_vat_period_end_statement |
433 | -#: field:account.vat.period.end.statement,deductible_vat_amount:0 |
434 | -msgid "Deductible VAT Amount" |
435 | -msgstr "Importo IVA Deducibile" |
436 | +msgid "Credit" |
437 | +msgstr "Credito" |
438 | |
439 | -#. module: account_vat_period_end_statement |
440 | #: field:statement.credit.account.line,amount:0 |
441 | #: field:statement.debit.account.line,amount:0 |
442 | #: field:statement.generic.account.line,amount:0 |
443 | +#. module: account_vat_period_end_statement |
444 | msgid "Amount" |
445 | msgstr "Importo" |
446 | |
447 | +#: view:account.vat.period.end.statement:0 |
448 | #. module: account_vat_period_end_statement |
449 | -#: code:addons/account_vat_period_end_statement/account.py:414 |
450 | -#, python-format |
451 | -msgid "The payment term %s does not have due dates" |
452 | -msgstr "Il termine di pagamento %s non ha date di scadenza" |
453 | +msgid "Recompute amounts" |
454 | +msgstr "Recompute amounts" |
455 | |
456 | -#. module: account_vat_period_end_statement |
457 | #: view:account.vat.period.end.statement:0 |
458 | #: field:account.vat.period.end.statement,payment_ids:0 |
459 | +#. module: account_vat_period_end_statement |
460 | msgid "Payments" |
461 | msgstr "Pagamenti" |
462 | |
463 | -#. module: account_vat_period_end_statement |
464 | -#: code:addons/account_vat_period_end_statement/account.py:413 |
465 | -#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:35 |
466 | -#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:43 |
467 | -#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:48 |
468 | -#, python-format |
469 | -msgid "Error" |
470 | -msgstr "Errore" |
471 | - |
472 | -#. module: account_vat_period_end_statement |
473 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:146 |
474 | -msgid "Amount to pay" |
475 | -msgstr "Totale da pagare" |
476 | - |
477 | -#. module: account_vat_period_end_statement |
478 | +#: field:account.vat.period.end.statement,authority_partner_id:0 |
479 | +#. module: account_vat_period_end_statement |
480 | +msgid "Tax Authority Partner" |
481 | +msgstr "Partner Erario" |
482 | + |
483 | +#: model:ir.model,name:account_vat_period_end_statement.model_add_period_to_vat_statement |
484 | +#. module: account_vat_period_end_statement |
485 | +msgid "add.period.to.vat.statement" |
486 | +msgstr "add.period.to.vat.statement" |
487 | + |
488 | +#: model:ir.model,name:account_vat_period_end_statement.model_remove_period_from_vat_statement |
489 | +#. module: account_vat_period_end_statement |
490 | +msgid "remove.period.from.vat.statement" |
491 | +msgstr "remove.period.from.vat.statement" |
492 | + |
493 | +#: view:account.vat.period.end.statement:0 |
494 | +#. module: account_vat_period_end_statement |
495 | +msgid "Print Options" |
496 | +msgstr "Opzioni di stampa" |
497 | + |
498 | #: field:account.vat.period.end.statement,residual:0 |
499 | +#. module: account_vat_period_end_statement |
500 | msgid "Balance" |
501 | msgstr "Saldo" |
502 | |
503 | -#. module: account_vat_period_end_statement |
504 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:44 |
505 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:72 |
506 | -msgid "VAT" |
507 | -msgstr "IVA" |
508 | - |
509 | -#. module: account_vat_period_end_statement |
510 | #: view:account.tax.code:0 |
511 | +#. module: account_vat_period_end_statement |
512 | msgid "Description" |
513 | msgstr "Descrizione" |
514 | |
515 | -#. module: account_vat_period_end_statement |
516 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:67 |
517 | -msgid "Purchases" |
518 | -msgstr "Acquisti" |
519 | - |
520 | -#. module: account_vat_period_end_statement |
521 | #: help:account.vat.period.end.statement,debit_vat_account_line_ids:0 |
522 | +#. module: account_vat_period_end_statement |
523 | msgid "The accounts containing the debit VAT amount to write-off" |
524 | msgstr "I conti contenenti l'IVA a debito da stornare" |
525 | |
526 | -#. module: account_vat_period_end_statement |
527 | #: help:account.vat.period.end.statement,previous_debit_vat_account_id:0 |
528 | +#. module: account_vat_period_end_statement |
529 | msgid "Debit VAT from previous periods" |
530 | msgstr "IVA a debito da periodi precedenti" |
531 | |
532 | -#. module: account_vat_period_end_statement |
533 | -#: model:ir.model,name:account_vat_period_end_statement.model_account_vat_period_end_statement |
534 | -msgid "account.vat.period.end.statement" |
535 | -msgstr "account.vat.period.end.statement" |
536 | - |
537 | -#. module: account_vat_period_end_statement |
538 | -#: selection:account.tax.code,vat_statement_type:0 |
539 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:100 |
540 | -msgid "Credit" |
541 | -msgstr "Credito" |
542 | - |
543 | -#. module: account_vat_period_end_statement |
544 | -#: view:account.vat.period.end.statement:0 |
545 | -#: model:ir.actions.act_window,name:account_vat_period_end_statement.action_account_vat_period_end_statement |
546 | -msgid "Vat statement" |
547 | -msgstr "Liquidazione IVA" |
548 | - |
549 | -#. module: account_vat_period_end_statement |
550 | +#: field:account.vat.period.end.statement,state:0 |
551 | +#. module: account_vat_period_end_statement |
552 | +msgid "State" |
553 | +msgstr "Stato" |
554 | + |
555 | +#: field:account.vat.period.end.statement,deductible_vat_amount:0 |
556 | +#. module: account_vat_period_end_statement |
557 | +msgid "Deductible VAT Amount" |
558 | +msgstr "Importo IVA Deducibile" |
559 | + |
560 | +#: field:account.vat.period.end.statement,print_account_vat_group:0 |
561 | +#. module: account_vat_period_end_statement |
562 | +msgid "Group by account VAT" |
563 | +msgstr "Raggruppa conti IVA" |
564 | + |
565 | #: field:account.vat.period.end.statement,debit_vat_account_line_ids:0 |
566 | -#: code:addons/account_vat_period_end_statement/account.py:313 |
567 | -#, python-format |
568 | +#. module: account_vat_period_end_statement |
569 | msgid "Debit VAT" |
570 | msgstr "IVA a debito" |
571 | |
572 | -#. module: account_vat_period_end_statement |
573 | #: field:account.vat.period.end.statement,payment_term_id:0 |
574 | +#. module: account_vat_period_end_statement |
575 | msgid "Payment Term" |
576 | msgstr "Termine di pagamento" |
577 | |
578 | +#: field:add.period.to.vat.statement,period_id:0 |
579 | +#: field:remove.period.from.vat.statement,period_id:0 |
580 | #. module: account_vat_period_end_statement |
581 | -#: field:account.vat.period.end.statement,period_id:0 |
582 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:35 |
583 | msgid "Period" |
584 | msgstr "Periodo" |
585 | |
586 | -#. module: account_vat_period_end_statement |
587 | -#: constraint:account.tax.code:0 |
588 | -msgid "Error ! You can not create recursive accounts." |
589 | -msgstr "Errore! Non puoi creare conti ricorsivi" |
590 | - |
591 | -#. module: account_vat_period_end_statement |
592 | -#: view:account.vat.period.end.statement:0 |
593 | -msgid "View chart of taxes for selected period" |
594 | -msgstr "Visualizza i conti imposta per il periodo selezionato" |
595 | - |
596 | -#. module: account_vat_period_end_statement |
597 | +#: view:account.vat.period.end.statement:0 |
598 | +#: model:ir.actions.act_window,name:account_vat_period_end_statement.action_account_vat_period_end_statement |
599 | +#. module: account_vat_period_end_statement |
600 | +msgid "Vat statement" |
601 | +msgstr "Liquidazione IVA" |
602 | + |
603 | +#: field:account.tax.code,vat_statement_account_id:0 |
604 | +#. module: account_vat_period_end_statement |
605 | +msgid "Account used for VAT statement. The tax code balance will be associated to this account after selecting the period in VAT statement" |
606 | +msgstr "Account used for VAT statement. The tax code balance will be associated to this account after selecting the period in VAT statement" |
607 | + |
608 | +#: view:account.vat.period.end.statement:0 |
609 | +#. module: account_vat_period_end_statement |
610 | +msgid "Accounts" |
611 | +msgstr "Accounts" |
612 | + |
613 | +#: view:account.vat.period.end.statement:0 |
614 | +#: field:account.vat.period.end.statement,period_ids:0 |
615 | +#. module: account_vat_period_end_statement |
616 | +msgid "Periods" |
617 | +msgstr "Periodi" |
618 | + |
619 | #: field:account.vat.period.end.statement,authority_vat_amount:0 |
620 | +#. module: account_vat_period_end_statement |
621 | msgid "Authority VAT Amount" |
622 | msgstr "Importo IVA Erario" |
623 | |
624 | +#: view:account.vat.period.end.statement:0 |
625 | #. module: account_vat_period_end_statement |
626 | -#: view:account.vat.period.end.statement:0 |
627 | msgid "Other VAT Credits / Debits or Tax Compensations (Positive amounts for credits, negative for debits)" |
628 | msgstr "Altri crediti / debiti per IVA o compensazioni di imposta (importi positivi per i crediti, negativi per i debiti)" |
629 | |
630 | +#: view:account.vat.period.end.statement:0 |
631 | #. module: account_vat_period_end_statement |
632 | -#: view:account.vat.period.end.statement:0 |
633 | msgid "Create Move" |
634 | msgstr "Crea movimento" |
635 | |
636 | -#. module: account_vat_period_end_statement |
637 | #: help:account.vat.period.end.statement,credit_vat_account_line_ids:0 |
638 | +#. module: account_vat_period_end_statement |
639 | msgid "The accounts containing the credit VAT amount to write-off" |
640 | msgstr "I conti contenenti l'IVA a credito da stornare" |
641 | |
642 | +#: field:account.vat.period.end.statement,journal_id:0 |
643 | #. module: account_vat_period_end_statement |
644 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:59 |
645 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:87 |
646 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:111 |
647 | -#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:124 |
648 | -msgid "Total" |
649 | -msgstr "Totale" |
650 | +msgid "Journal" |
651 | +msgstr "Sezionale" |
652 | |
653 | -#. module: account_vat_period_end_statement |
654 | #: view:account.vat.period.end.statement:0 |
655 | -msgid "Set to draft" |
656 | -msgstr "Imposta a bozza" |
657 | - |
658 | #. module: account_vat_period_end_statement |
659 | -#: code:addons/account_vat_period_end_statement/account.py:298 |
660 | -#, python-format |
661 | -msgid "The current period has VAT statement yet" |
662 | -msgstr "Il periodo selezionato ha già una dichiarazione IVA" |
663 | +msgid "Page Number" |
664 | +msgstr "Numerazione Pagine" |
665 | |
666 | |
667 | === modified file 'account_vat_period_end_statement/report/vat_period_end_statement.mako' |
668 | --- account_vat_period_end_statement/report/vat_period_end_statement.mako 2013-03-16 13:18:33 +0000 |
669 | +++ account_vat_period_end_statement/report/vat_period_end_statement.mako 2014-03-13 10:02:00 +0000 |
670 | @@ -140,26 +140,56 @@ |
671 | <th> ${ _('Debit') }</th> |
672 | <th> ${ _('Credit') }</th> |
673 | </tr> |
674 | - %for debit_line in statement.debit_vat_account_line_ids : |
675 | + ## VAT account DEBIT |
676 | + ## Vat account grouped by id |
677 | + %if statement.print_account_vat_group : |
678 | + <% totals_by_account = {} %> |
679 | + <% vat_accounts = account_vat_amounts("debit", statement.debit_vat_account_line_ids) %> |
680 | + %for vat_account_id in vat_accounts : |
681 | + <tr > |
682 | + <td>${ vat_accounts[vat_account_id]['account_name']|entity }</td> |
683 | + <td style="text-align:right">${ formatLang(vat_accounts[vat_account_id]['amount'])|entity }</td> |
684 | + <td></td> |
685 | + </tr> |
686 | + %endfor |
687 | + ## Vat account detail |
688 | + %else: |
689 | + %for debit_line in statement.debit_vat_account_line_ids : |
690 | <tr > |
691 | <td>${ debit_line.account_id.name|entity }</td> |
692 | <td>${ formatLang(debit_line.amount)|entity }</td> |
693 | <td></td> |
694 | </tr> |
695 | - %endfor |
696 | + %endfor |
697 | + %endif |
698 | <!-- |
699 | <tr > |
700 | <td>${_("Total")}</td> |
701 | <td>${ statement.payable_vat_amount|entity }</td> |
702 | </tr> |
703 | --> |
704 | - %for credit_line in statement.credit_vat_account_line_ids : |
705 | + ## VAT account CREDIT |
706 | + ## Vat account grouped by id |
707 | + %if statement.print_account_vat_group : |
708 | + <% totals_by_account = {} %> |
709 | + <% vat_accounts = account_vat_amounts("credit", statement.credit_vat_account_line_ids) %> |
710 | + %for vat_account_id in vat_accounts : |
711 | + <tr > |
712 | + <td>${ vat_accounts[vat_account_id]['account_name']|entity }</td> |
713 | + <td></td> |
714 | + <td style="text-align:right">${ formatLang(vat_accounts[vat_account_id]['amount'])|entity }</td> |
715 | + </tr> |
716 | + %endfor |
717 | + ## Vat account detail |
718 | + %else: |
719 | + %for credit_line in statement.credit_vat_account_line_ids : |
720 | <tr > |
721 | <td>${ credit_line.account_id.name|entity }</td> |
722 | <td></td> |
723 | <td>${ formatLang(credit_line.amount)|entity }</td> |
724 | </tr> |
725 | - %endfor |
726 | + %endfor |
727 | + %endif |
728 | <!-- |
729 | <tr > |
730 | <td>${_("Total")}</td> |
731 | @@ -169,18 +199,18 @@ |
732 | <tr > |
733 | <td>${_("Previous Credits VAT")}</td> |
734 | <td></td> |
735 | - <td>${ formatLang(statement.previous_credit_vat_amount)|entity }</td> |
736 | + <td style="text-align:right">${ formatLang(statement.previous_credit_vat_amount)|entity }</td> |
737 | </tr> |
738 | <tr > |
739 | <td>${_("Previous Debits VAT")}</td> |
740 | - <td>${ formatLang(statement.previous_debit_vat_amount)|entity }</td> |
741 | + <td style="text-align:right">${ formatLang(statement.previous_debit_vat_amount)|entity }</td> |
742 | <td></td> |
743 | </tr> |
744 | %for generic_line in statement.generic_vat_account_line_ids : |
745 | <tr > |
746 | <td>${ generic_line.account_id.name|entity }</td> |
747 | - <td>${ generic_line.amount < 0 and formatLang(generic_line.amount) or ''|entity }</td> |
748 | - <td>${ generic_line.amount > 0 and formatLang(generic_line.amount) or ''|entity }</td> |
749 | + <td style="text-align:right">${ generic_line.amount < 0 and formatLang(generic_line.amount) or ''|entity }</td> |
750 | + <td style="text-align:right">${ generic_line.amount > 0 and formatLang(generic_line.amount) or ''|entity }</td> |
751 | </tr> |
752 | %endfor |
753 | <tr > |
754 | |
755 | === modified file 'account_vat_period_end_statement/report/vat_period_end_statement.py' |
756 | --- account_vat_period_end_statement/report/vat_period_end_statement.py 2013-06-20 09:36:52 +0000 |
757 | +++ account_vat_period_end_statement/report/vat_period_end_statement.py 2014-03-13 10:02:00 +0000 |
758 | @@ -68,6 +68,29 @@ |
759 | res = self._build_codes_dict(tax_code, res=res, context=context) |
760 | return res |
761 | |
762 | + def _get_account_vat_amounts(self, type='credit', statement_account_line=[], context=None): |
763 | + if context is None: |
764 | + context = {} |
765 | + if type == 'credit': |
766 | + stat_line_obj = self.pool.get('statement.credit.account.line') |
767 | + elif type == 'debit': |
768 | + stat_line_obj = self.pool.get('statement.debit.account.line') |
769 | + else: |
770 | + raise orm.except_orm(_('Error'), _('Type account neither credit or debit !')) |
771 | + |
772 | + account_amounts = {} |
773 | + for line in statement_account_line: |
774 | + account_id = line.account_id.id |
775 | + if account_id not in account_amounts: |
776 | + account_amounts[account_id] = { |
777 | + 'account_id' : line.account_id.id, |
778 | + 'account_name' : line.account_id.name, |
779 | + 'amount' : line.amount |
780 | + } |
781 | + else: |
782 | + account_amounts[account_id]['amount'] += line.amount |
783 | + return account_amounts |
784 | + |
785 | def find_period(self, date,context=None): |
786 | if context is None: |
787 | context = {} |
788 | @@ -81,10 +104,13 @@ |
789 | if context is None: |
790 | context = {} |
791 | super(print_vat_period_end_statement, self).__init__(cr, uid, name, context=context) |
792 | + if context.get('active_id'): |
793 | + vat_statement = self.pool.get('account.vat.period.end.statement').browse(cr, uid, context.get('active_id')) |
794 | self.localcontext.update( { |
795 | 'time': time, |
796 | 'tax_codes_amounts': self._get_tax_codes_amounts, |
797 | 'find_period': self.find_period, |
798 | + 'account_vat_amounts': self._get_account_vat_amounts, |
799 | }) |
800 | self.context = context |
801 | |
802 | |
803 | === modified file 'account_vat_period_end_statement/reports.xml' |
804 | --- account_vat_period_end_statement/reports.xml 2013-03-16 13:18:33 +0000 |
805 | +++ account_vat_period_end_statement/reports.xml 2014-03-13 10:02:00 +0000 |
806 | @@ -1,6 +1,87 @@ |
807 | <?xml version="1.0"?> |
808 | <openerp> |
809 | - <data> |
810 | + <data noupdate="1"> |
811 | + <record id="ir_header_webkit_vat_period_end_statement" model="ir.header_webkit"> |
812 | + <field name="orientation">Portrait</field> |
813 | + <field name="format">A4</field> |
814 | + <field name="margin_top">50</field> |
815 | + <field name="html"><![CDATA[<html> |
816 | + <head> |
817 | + <meta content="text/html; charset=UTF-8" http-equiv="content-type"/> |
818 | + <script> |
819 | + function subst() { |
820 | + var vars={}; |
821 | + var x=document.location.search.substring(1).split('&'); |
822 | + for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);} |
823 | + var x=['frompage','topage','page','webpage','section','subsection','subsubsection']; |
824 | + for(var i in x) { |
825 | + var y = document.getElementsByClassName(x[i]); |
826 | + for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]]; |
827 | + } |
828 | + } |
829 | + </script> |
830 | + </head> |
831 | + <body style="border:0; margin: 0;" onload="subst()"> |
832 | + <% setLang(company.partner_id.lang or "en_US") %> |
833 | + <h3>${company.partner_id.name or ''|entity}</h3> |
834 | + <table style="border-bottom: 4px solid black; width: 100%; padding-bottom: 8px"> |
835 | + <tr> |
836 | + <td> |
837 | + <div>${company.partner_id.street or ''|entity}</div> |
838 | + <div>${company.partner_id.street2 or ''|entity}</div> |
839 | + <div>${company.partner_id.zip or ''|entity}</div> |
840 | + <div>${company.partner_id.city or ''|entity}</div> |
841 | + <div>${company.partner_id.province and company.partner_id.province.code or ''|entity}</div> |
842 | + </td> |
843 | + <td> |
844 | + <div>P. IVA: ${company.partner_id.vat or ''|entity}</div> |
845 | + <div>Codice Fiscale: ${company.partner_id.fiscalcode or ''|entity}</div> |
846 | + |
847 | + </td> |
848 | + </tr> |
849 | + </table> |
850 | + <br/> |
851 | + </body> |
852 | +</html>]]> |
853 | +</field> |
854 | + <field name="footer_html"><![CDATA[<html> |
855 | + <head> |
856 | + <meta content="text/html; charset=UTF-8" http-equiv="content-type"/> |
857 | + <script> |
858 | + function subst() { |
859 | + var vars={}; |
860 | + var x=document.location.search.substring(1).split('&'); |
861 | + for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);} |
862 | + var x=['frompage','topage','page','webpage','section','subsection','subsubsection']; |
863 | + for(var i in x) { |
864 | + var y = document.getElementsByClassName(x[i]); |
865 | + for(var j=0; j<y.length; ++j) { |
866 | + if(x[i] == 'page') {y[j].textContent = eval(vars[x[i]]) + ${objects[0].print_page_from -1};} |
867 | + else{y[j].textContent = vars[x[i]];} |
868 | + } |
869 | + |
870 | + } |
871 | + } |
872 | + </script> |
873 | + </head> |
874 | + <body style="border:0; margin: 0;" onload="subst()"> |
875 | + <table style="border-top: 1px solid black; width: 100%"> |
876 | + <tr > |
877 | + <td style="text-align:right;font-size:12;" width="95%">Page ${objects[0].print_page_year or ''|entity}/<span class="page"/></td><td style="text-align:left;font-size:12;"></td> |
878 | + </tr> |
879 | + </table> |
880 | + </body> |
881 | +</html>]]></field><field name="css" ><![CDATA[ |
882 | +tr { |
883 | + page-break-inside: avoid; |
884 | +} |
885 | +thead{ |
886 | + display: table-header-group; /* http://code.google.com/p/wkhtmltopdf/issues/detail?id=9#c8 */ |
887 | +} |
888 | +]]> </field> |
889 | + <field name="name">VAT Statement Summary</field> |
890 | + </record> |
891 | + |
892 | |
893 | <report |
894 | auto="False" |
895 | @@ -9,6 +90,7 @@ |
896 | name="account.print.vat.period.end.statement" |
897 | file="account_vat_period_end_statement/report/vat_period_end_statement.mako" |
898 | string="VAT Statement Summary" |
899 | + webkit_header = "ir_header_webkit_vat_period_end_statement" |
900 | report_type="webkit" /> |
901 | |
902 | </data> |
Ciao Lorenzo,
ho dovuto rifare il branch.
Cmq ho apportato le migliorie da te consigliate.
Grazie
Alessandro