Merge lp:~a-camilli/openobject-italia/7.0_liq_IVA_opzioni_stampa into lp:~openobject-italia-core-devs/openobject-italia/italian-addons-7.0

[Alessandro Camilli]

Opzioni di stampa su liquidazione IVA:
- Raggruppa valori per conto contabile nel sommario
- Numerazione pagina

[Alessandro Camilli (a-camilli)]

Ciao Lorenzo,
ho dovuto rifare il branch.
Cmq ho apportato le migliorie da te consigliate.

Grazie
Alessandro

[Lorenzo Battistini (elbati)]

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

review: Needs Fixing

[lp:~a-camilli/openobject-italia/7.0_liq_IVA_opzioni_stampa]

238. By Alessandro Camilli on 2014-03-13

[Alessandro Camilli (a-camilli)]

ho messo anche 1 come default sul pagina iniziale della liquidazione.
Ciao

[Lorenzo Battistini (elbati)]

Grazie!

review: Approve (code review)

[Lorenzo Battistini (elbati)]

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?

review: Needs Information

[Lorenzo Battistini (elbati)]

This project is now hosted on https://github.com/OCA/l10n-italy. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

Unmerged revisions

238. By Alessandro Camilli on 2014-03-13

237. By Alessandro Camilli on 2014-03-12

Opzioni stampa: raggruppa conto contabile e numerazione pagina

=== modified file 'account_vat_period_end_statement/AUTHORS.txt'
--- account_vat_period_end_statement/AUTHORS.txt	2013-03-16 13:18:33 +0000
+++ account_vat_period_end_statement/AUTHORS.txt	2014-03-13 10:02:00 +0000
@@ -1,3 +1,4 @@
 Lorenzo Battistini <[e-mail]>
 Marco Marchiori <[e-mail]>
 Sergio Corato <[e-mail]>
+Alessandro Camilli <[e-mail]>
 \ No newline at end of file
 
=== modified file 'account_vat_period_end_statement/account.py'
--- account_vat_period_end_statement/account.py	2013-11-21 12:51:55 +0000
+++ account_vat_period_end_statement/account.py	2014-03-13 10:02:00 +0000
@@ -256,10 +256,15 @@
             help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'period_ids': fields.one2many('account.period','vat_statement_id','Periods'),
+        'print_account_vat_group': fields.boolean('Group by account VAT'),
+        'print_page_from': fields.integer('Page number from'),
+        'print_page_year': fields.char('Page number year', size=10),
     }
 
     _defaults = {
         'date': fields.date.context_today,
+        'print_account_vat_group': True,
+        'print_page_from': 1,
     }
 
     def _get_tax_code_amount(self, cr, uid, tax_code_id, period_id, context):
 
=== modified file 'account_vat_period_end_statement/account_view.xml'
--- account_vat_period_end_statement/account_view.xml	2013-03-16 13:18:33 +0000
+++ account_vat_period_end_statement/account_view.xml	2014-03-13 10:02:00 +0000
@@ -81,6 +81,15 @@
                             <separator string="Payments" colspan="4"/>
                             <field name="payment_ids" nolabel="1" colspan="4"/>
                         </page>
+                        <page string="Print Options">
+                            <group colspan="4" string="Page Number">
+                                <field name="print_page_from"/>
+                                <field name="print_page_year"/>
+                            </group>
+                            <group colspan="4" string="Summary">
+                                <field name="print_account_vat_group"/>
+                            </group>
+                        </page>
                     </notebook>
                     <field name="state"  select="1"/>
                     <field name="reconciled"/>
 
=== modified file 'account_vat_period_end_statement/i18n/it.po'
--- account_vat_period_end_statement/i18n/it.po	2013-03-16 13:18:33 +0000
+++ account_vat_period_end_statement/i18n/it.po	2014-03-13 10:02:00 +0000
@@ -4,429 +4,400 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-22 10:31+0000\n"
-"PO-Revision-Date: 2012-06-22 12:35+0100\n"
-"Last-Translator: Lorenzo Battistini <[e-mail]>\n"
+"POT-Creation-Date: 2014-02-27 13:30+0000\n"
+"PO-Revision-Date: 2014-02-27 13:30+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:35
-#, python-format
-msgid "Too many occurences of tax code %s"
-msgstr "Troppe occorrenze del codice impotsa %s"
-
-#. module: account_vat_period_end_statement
 #: selection:account.vat.period.end.statement,state:0
+#. module: account_vat_period_end_statement
 msgid "Confirmed"
 msgstr "Confermato"
 
+#: view:account.vat.period.end.statement:0
 #. module: account_vat_period_end_statement
-#: view:account.vat.period.end.statement:0
 msgid "Credit Account Lines"
 msgstr "Righe conti di credito"
 
+#: help:account.tax.code,vat_statement_sign:0
 #. module: account_vat_period_end_statement
+msgid "If tax code period sum is usually negative, set '-1' here"
+msgstr "If tax code period sum is usually negative, set '-1' here"
+
 #: model:ir.model,name:account_vat_period_end_statement.model_statement_generic_account_line
+#. module: account_vat_period_end_statement
 msgid "statement.generic.account.line"
 msgstr "statement.generic.account.line"
 
-#. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/account.py:381
-#, python-format
-msgid "Other VAT Credits / Debits"
-msgstr "Altri Crediti / Debiti per IVA"
-
-#. module: account_vat_period_end_statement
 #: help:account.vat.period.end.statement,reconciled:0
+#. module: account_vat_period_end_statement
 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."
 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."
 
-#. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:42
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:70
 #: model:ir.model,name:account_vat_period_end_statement.model_account_tax_code
 #: field:statement.credit.account.line,tax_code_id:0
 #: field:statement.debit.account.line,tax_code_id:0
+#. module: account_vat_period_end_statement
 msgid "Tax Code"
 msgstr "Codice imposta"
 
+#: model:ir.model,name:account_vat_period_end_statement.model_account_vat_period_end_statement
 #. module: account_vat_period_end_statement
-#: field:account.vat.period.end.statement,authority_partner_id:0
-msgid "Tax Authority Partner"
-msgstr "Partner Erario"
+msgid "account.vat.period.end.statement"
+msgstr "account.vat.period.end.statement"
 
-#. module: account_vat_period_end_statement
 #: view:account.vat.period.end.statement:0
 #: field:account.vat.period.end.statement,previous_debit_vat_account_id:0
-#: code:addons/account_vat_period_end_statement/account.py:364
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:134
-#, python-format
+#. module: account_vat_period_end_statement
 msgid "Previous Debits VAT"
 msgstr "IVA debiti precedenti"
 
+#: view:account.vat.period.end.statement:0
 #. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:43
-#, python-format
-msgid "No base code found for tax code %s"
-msgstr "Nessun codice imponibile trovato per il codice imposta %s"
+msgid "Set to draft"
+msgstr "Imposta a bozza"
 
-#. module: account_vat_period_end_statement
 #: help:account.vat.period.end.statement,previous_credit_vat_account_id:0
+#. module: account_vat_period_end_statement
 msgid "Credit VAT from previous periods"
 msgstr "IVA a credito da periodi precedenti"
 
+#: view:account.vat.period.end.statement:0
 #. module: account_vat_period_end_statement
-#: view:account.vat.period.end.statement:0
 msgid "Tax Authority"
 msgstr "Erario"
 
+#: view:add.period.to.vat.statement:0
 #. module: account_vat_period_end_statement
-#: field:account.vat.period.end.statement,state:0
-msgid "State"
-msgstr "Stato"
+msgid "Add"
+msgstr "Add"
 
-#. module: account_vat_period_end_statement
 #: selection:account.vat.period.end.statement,state:0
+#. module: account_vat_period_end_statement
 msgid "Draft"
 msgstr "Bozza"
 
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,reconciled:0
+#. module: account_vat_period_end_statement
 msgid "Paid/Reconciled"
 msgstr "Pagato/Riconciliato"
 
+#: selection:account.tax.code,vat_statement_type:0
 #. module: account_vat_period_end_statement
-#: selection:account.tax.code,vat_statement_type:0
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:99
 msgid "Debit"
 msgstr "Debito"
 
-#. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/account.py:397
-#, python-format
-msgid "Tax Authority VAT"
-msgstr "IVA Erario"
-
-#. module: account_vat_period_end_statement
 #: help:account.vat.period.end.statement,residual:0
+#. module: account_vat_period_end_statement
 msgid "Remaining amount due."
 msgstr "Importo dovuto rimanente"
 
-#. module: account_vat_period_end_statement
 #: view:account.vat.period.end.statement:0
-msgid "General"
-msgstr "Generale"
-
-#. module: account_vat_period_end_statement
+#: view:add.period.to.vat.statement:0
+#: model:ir.actions.act_window,name:account_vat_period_end_statement.action_add_period
+#. module: account_vat_period_end_statement
+msgid "Add period"
+msgstr "Add period"
+
+#: model:ir.ui.menu,name:account_vat_period_end_statement.menu_account_vat_period_end_statement
+#. module: account_vat_period_end_statement
+msgid "VAT statements"
+msgstr "Liquidazioni IVA"
+
 #: field:account.tax.code,vat_statement_type:0
+#. module: account_vat_period_end_statement
 msgid "Type"
 msgstr "Tipo"
 
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,previous_debit_vat_amount:0
+#. module: account_vat_period_end_statement
 msgid "Previous Debits VAT Amount"
 msgstr "Importo IVA debiti precedenti"
 
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,credit_vat_account_line_ids:0
-#: code:addons/account_vat_period_end_statement/account.py:330
-#, python-format
+#. module: account_vat_period_end_statement
 msgid "Credit VAT"
 msgstr "IVA a credito"
 
-#. module: account_vat_period_end_statement
-#: model:ir.ui.menu,name:account_vat_period_end_statement.menu_account_vat_period_end_statement
-msgid "VAT statements"
-msgstr "Liquidazioni IVA"
-
-#. module: account_vat_period_end_statement
 #: view:account.vat.period.end.statement:0
+#. module: account_vat_period_end_statement
 msgid "Debit Account Lines"
 msgstr "Righe conti di debito"
 
+#: model:ir.model,name:account_vat_period_end_statement.model_account_period
 #. module: account_vat_period_end_statement
-#: field:account.vat.period.end.statement,journal_id:0
-msgid "Journal"
-msgstr "Sezionale"
+msgid "Account period"
+msgstr "Periodo contabile"
 
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,payable_vat_amount:0
+#. module: account_vat_period_end_statement
 msgid "Payable VAT Amount"
 msgstr "Importo IVA Esigibile"
 
+#: view:account.vat.period.end.statement:0
+#: model:ir.actions.act_window,name:account_vat_period_end_statement.action_remove_period
+#: view:remove.period.from.vat.statement:0
 #. module: account_vat_period_end_statement
+msgid "Remove period"
+msgstr "Remove period"
+
 #: selection:account.vat.period.end.statement,state:0
+#. module: account_vat_period_end_statement
 msgid "Paid"
 msgstr "Pagato"
 
-#. module: account_vat_period_end_statement
+#: field:account.period,vat_statement_id:0
 #: view:account.tax.code:0
-#: code:addons/account_vat_period_end_statement/account.py:303
 #: field:statement.credit.account.line,statement_id:0
 #: field:statement.debit.account.line,statement_id:0
 #: field:statement.generic.account.line,statement_id:0
-#, python-format
+#. module: account_vat_period_end_statement
 msgid "VAT statement"
 msgstr "Liquidazione IVA"
 
-#. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:39
-msgid "Sales"
-msgstr "Vendite"
-
-#. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:43
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:71
-msgid "Base"
-msgstr "Imponibile"
-
-#. module: account_vat_period_end_statement
+#: view:add.period.to.vat.statement:0
+#: view:remove.period.from.vat.statement:0
+#. module: account_vat_period_end_statement
+msgid "Cancel"
+msgstr "Cancel"
+
 #: model:ir.model,name:account_vat_period_end_statement.model_statement_credit_account_line
+#. module: account_vat_period_end_statement
 msgid "statement.credit.account.line"
 msgstr "statement.credit.account.line"
 
-#. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/account.py:273
-#: code:addons/account_vat_period_end_statement/account.py:298
-#, python-format
-msgid "Error!"
-msgstr "Errore!"
-
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,move_id:0
+#. module: account_vat_period_end_statement
 msgid "VAT statement move"
 msgstr "Movimento liquidazione IVA"
 
-#. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:48
-#, python-format
-msgid "Not every tax linked to tax code %s is linked the same base code"
-msgstr "Non tutte le imposte collegate al codice imposta %s sono collegate allo stesso codice imponibile"
-
-#. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:34
+#: field:account.tax.code,vat_statement_sign:0
+#. module: account_vat_period_end_statement
+msgid "Sign used in statement"
+msgstr "Sign used in statement"
+
+#: field:account.vat.period.end.statement,print_page_year:0
+#. module: account_vat_period_end_statement
+msgid "Page number year"
+msgstr "Anno/Rif"
+
+#: field:account.vat.period.end.statement,date:0
+#. module: account_vat_period_end_statement
+msgid "Date"
+msgstr "Date"
+
+#: field:account.vat.period.end.statement,print_page_from:0
+#. module: account_vat_period_end_statement
+msgid "Page number from"
+msgstr "Da numero"
+
 #: model:ir.actions.report.xml,name:account_vat_period_end_statement.print_vat_period_end_statement
+#. module: account_vat_period_end_statement
 msgid "VAT Statement Summary"
 msgstr "Prospetto liquidazione IVA"
 
+#: view:account.vat.period.end.statement:0
 #. module: account_vat_period_end_statement
-#: view:account.vat.period.end.statement:0
 msgid "Account Lines"
 msgstr "Righe conti"
 
-#. module: account_vat_period_end_statement
 #: field:statement.credit.account.line,account_id:0
 #: field:statement.debit.account.line,account_id:0
 #: field:statement.generic.account.line,account_id:0
+#. module: account_vat_period_end_statement
 msgid "Account"
 msgstr "Conto"
 
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,generic_vat_account_line_ids:0
+#. module: account_vat_period_end_statement
 msgid "Other VAT Credits / Debits or Tax Compensations"
 msgstr "Altri Crediti / Debiti per IVA o compensazioni di imposta"
 
-#. module: account_vat_period_end_statement
 #: help:account.tax.code,vat_statement_type:0
+#. module: account_vat_period_end_statement
 msgid "This establish whether amount will be loaded as debit or credit"
 msgstr "Questo stabilisce se il saldo debba essere caricato come debito o come credito"
 
-#. module: account_vat_period_end_statement
 #: view:account.vat.period.end.statement:0
 #: field:account.vat.period.end.statement,previous_credit_vat_account_id:0
-#: code:addons/account_vat_period_end_statement/account.py:347
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:129
-#, python-format
+#. module: account_vat_period_end_statement
 msgid "Previous Credits VAT"
 msgstr "IVA crediti precedenti"
 
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,authority_vat_account_id:0
+#. module: account_vat_period_end_statement
 msgid "Tax Authority VAT Account"
 msgstr "Conto IVA Erario"
 
-#. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/account.py:273
-#, python-format
-msgid "You cannot delete a confirmed or paid statement"
-msgstr "Non è possibile eliminare una liquidazione confermata o pagata"
-
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,previous_credit_vat_amount:0
+#. module: account_vat_period_end_statement
 msgid "Previous Credits VAT Amount"
 msgstr "Importo IVA crediti precedenti"
 
+#: view:remove.period.from.vat.statement:0
 #. module: account_vat_period_end_statement
-#: field:account.tax.code,vat_statement_account_id:0
-msgid "Account used for VAT statement"
-msgstr "Conto utilizzato per la liquidazione IVA"
+msgid "Remove"
+msgstr "Remove"
 
+#: view:account.vat.period.end.statement:0
 #. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:95
 msgid "Summary"
-msgstr "Riepilogo"
+msgstr "Sommario"
 
-#. module: account_vat_period_end_statement
 #: model:ir.model,name:account_vat_period_end_statement.model_statement_debit_account_line
+#. module: account_vat_period_end_statement
 msgid "statement.debit.account.line"
 msgstr "statement.debit.account.line"
 
+#: selection:account.tax.code,vat_statement_type:0
 #. module: account_vat_period_end_statement
-#: field:account.vat.period.end.statement,deductible_vat_amount:0
-msgid "Deductible VAT Amount"
-msgstr "Importo IVA Deducibile"
+msgid "Credit"
+msgstr "Credito"
 
-#. module: account_vat_period_end_statement
 #: field:statement.credit.account.line,amount:0
 #: field:statement.debit.account.line,amount:0
 #: field:statement.generic.account.line,amount:0
+#. module: account_vat_period_end_statement
 msgid "Amount"
 msgstr "Importo"
 
+#: view:account.vat.period.end.statement:0
 #. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/account.py:414
-#, python-format
-msgid "The payment term %s does not have due dates"
-msgstr "Il termine di pagamento %s non ha date di scadenza"
+msgid "Recompute amounts"
+msgstr "Recompute amounts"
 
-#. module: account_vat_period_end_statement
 #: view:account.vat.period.end.statement:0
 #: field:account.vat.period.end.statement,payment_ids:0
+#. module: account_vat_period_end_statement
 msgid "Payments"
 msgstr "Pagamenti"
 
-#. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/account.py:413
-#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:35
-#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:43
-#: code:addons/account_vat_period_end_statement/report/vat_period_end_statement.py:48
-#, python-format
-msgid "Error"
-msgstr "Errore"
-
-#. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:146
-msgid "Amount to pay"
-msgstr "Totale da pagare"
-
-#. module: account_vat_period_end_statement
+#: field:account.vat.period.end.statement,authority_partner_id:0
+#. module: account_vat_period_end_statement
+msgid "Tax Authority Partner"
+msgstr "Partner Erario"
+
+#: model:ir.model,name:account_vat_period_end_statement.model_add_period_to_vat_statement
+#. module: account_vat_period_end_statement
+msgid "add.period.to.vat.statement"
+msgstr "add.period.to.vat.statement"
+
+#: model:ir.model,name:account_vat_period_end_statement.model_remove_period_from_vat_statement
+#. module: account_vat_period_end_statement
+msgid "remove.period.from.vat.statement"
+msgstr "remove.period.from.vat.statement"
+
+#: view:account.vat.period.end.statement:0
+#. module: account_vat_period_end_statement
+msgid "Print Options"
+msgstr "Opzioni di stampa"
+
 #: field:account.vat.period.end.statement,residual:0
+#. module: account_vat_period_end_statement
 msgid "Balance"
 msgstr "Saldo"
 
-#. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:44
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:72
-msgid "VAT"
-msgstr "IVA"
-
-#. module: account_vat_period_end_statement
 #: view:account.tax.code:0
+#. module: account_vat_period_end_statement
 msgid "Description"
 msgstr "Descrizione"
 
-#. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:67
-msgid "Purchases"
-msgstr "Acquisti"
-
-#. module: account_vat_period_end_statement
 #: help:account.vat.period.end.statement,debit_vat_account_line_ids:0
+#. module: account_vat_period_end_statement
 msgid "The accounts containing the debit VAT amount to write-off"
 msgstr "I conti contenenti l'IVA a debito da stornare"
 
-#. module: account_vat_period_end_statement
 #: help:account.vat.period.end.statement,previous_debit_vat_account_id:0
+#. module: account_vat_period_end_statement
 msgid "Debit VAT from previous periods"
 msgstr "IVA a debito da periodi precedenti"
 
-#. module: account_vat_period_end_statement
-#: model:ir.model,name:account_vat_period_end_statement.model_account_vat_period_end_statement
-msgid "account.vat.period.end.statement"
-msgstr "account.vat.period.end.statement"
-
-#. module: account_vat_period_end_statement
-#: selection:account.tax.code,vat_statement_type:0
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:100
-msgid "Credit"
-msgstr "Credito"
-
-#. module: account_vat_period_end_statement
-#: view:account.vat.period.end.statement:0
-#: model:ir.actions.act_window,name:account_vat_period_end_statement.action_account_vat_period_end_statement
-msgid "Vat statement"
-msgstr "Liquidazione IVA"
-
-#. module: account_vat_period_end_statement
+#: field:account.vat.period.end.statement,state:0
+#. module: account_vat_period_end_statement
+msgid "State"
+msgstr "Stato"
+
+#: field:account.vat.period.end.statement,deductible_vat_amount:0
+#. module: account_vat_period_end_statement
+msgid "Deductible VAT Amount"
+msgstr "Importo IVA Deducibile"
+
+#: field:account.vat.period.end.statement,print_account_vat_group:0
+#. module: account_vat_period_end_statement
+msgid "Group by account VAT"
+msgstr "Raggruppa conti IVA"
+
 #: field:account.vat.period.end.statement,debit_vat_account_line_ids:0
-#: code:addons/account_vat_period_end_statement/account.py:313
-#, python-format
+#. module: account_vat_period_end_statement
 msgid "Debit VAT"
 msgstr "IVA a debito"
 
-#. module: account_vat_period_end_statement
 #: field:account.vat.period.end.statement,payment_term_id:0
+#. module: account_vat_period_end_statement
 msgid "Payment Term"
 msgstr "Termine di pagamento"
 
+#: field:add.period.to.vat.statement,period_id:0
+#: field:remove.period.from.vat.statement,period_id:0
 #. module: account_vat_period_end_statement
-#: field:account.vat.period.end.statement,period_id:0
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:35
 msgid "Period"
 msgstr "Periodo"
 
-#. module: account_vat_period_end_statement
-#: constraint:account.tax.code:0
-msgid "Error ! You can not create recursive accounts."
-msgstr "Errore! Non puoi creare conti ricorsivi"
-
-#. module: account_vat_period_end_statement
-#: view:account.vat.period.end.statement:0
-msgid "View chart of taxes for selected period"
-msgstr "Visualizza i conti imposta per il periodo selezionato"
-
-#. module: account_vat_period_end_statement
+#: view:account.vat.period.end.statement:0
+#: model:ir.actions.act_window,name:account_vat_period_end_statement.action_account_vat_period_end_statement
+#. module: account_vat_period_end_statement
+msgid "Vat statement"
+msgstr "Liquidazione IVA"
+
+#: field:account.tax.code,vat_statement_account_id:0
+#. module: account_vat_period_end_statement
+msgid "Account used for VAT statement. The tax code balance will be associated to this account after selecting the period in VAT statement"
+msgstr "Account used for VAT statement. The tax code balance will be associated to this account after selecting the period in VAT statement"
+
+#: view:account.vat.period.end.statement:0
+#. module: account_vat_period_end_statement
+msgid "Accounts"
+msgstr "Accounts"
+
+#: view:account.vat.period.end.statement:0
+#: field:account.vat.period.end.statement,period_ids:0
+#. module: account_vat_period_end_statement
+msgid "Periods"
+msgstr "Periodi"
+
 #: field:account.vat.period.end.statement,authority_vat_amount:0
+#. module: account_vat_period_end_statement
 msgid "Authority VAT Amount"
 msgstr "Importo IVA Erario"
 
+#: view:account.vat.period.end.statement:0
 #. module: account_vat_period_end_statement
-#: view:account.vat.period.end.statement:0
 msgid "Other VAT Credits / Debits or Tax Compensations (Positive amounts for credits, negative for debits)"
 msgstr "Altri crediti / debiti per IVA o compensazioni di imposta (importi positivi per i crediti, negativi per i debiti)"
 
+#: view:account.vat.period.end.statement:0
 #. module: account_vat_period_end_statement
-#: view:account.vat.period.end.statement:0
 msgid "Create Move"
 msgstr "Crea movimento"
 
-#. module: account_vat_period_end_statement
 #: help:account.vat.period.end.statement,credit_vat_account_line_ids:0
+#. module: account_vat_period_end_statement
 msgid "The accounts containing the credit VAT amount to write-off"
 msgstr "I conti contenenti l'IVA a credito da stornare"
 
+#: field:account.vat.period.end.statement,journal_id:0
 #. module: account_vat_period_end_statement
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:59
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:87
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:111
-#: report:addons/account_vat_period_end_statement/report/vat_period_end_statement.mako:124
-msgid "Total"
-msgstr "Totale"
+msgid "Journal"
+msgstr "Sezionale"
 
-#. module: account_vat_period_end_statement
 #: view:account.vat.period.end.statement:0
-msgid "Set to draft"
-msgstr "Imposta a bozza"
-
 #. module: account_vat_period_end_statement
-#: code:addons/account_vat_period_end_statement/account.py:298
-#, python-format
-msgid "The current period has VAT statement yet"
-msgstr "Il periodo selezionato ha già una dichiarazione IVA"
+msgid "Page Number"
+msgstr "Numerazione Pagine"
 
 
=== modified file 'account_vat_period_end_statement/report/vat_period_end_statement.mako'
--- account_vat_period_end_statement/report/vat_period_end_statement.mako	2013-03-16 13:18:33 +0000
+++ account_vat_period_end_statement/report/vat_period_end_statement.mako	2014-03-13 10:02:00 +0000
@@ -140,26 +140,56 @@
         <th> ${ _('Debit') }</th>
         <th> ${ _('Credit') }</th>
     </tr>
-    %for debit_line in statement.debit_vat_account_line_ids :
+    ## VAT account DEBIT
+        ## Vat account grouped by id
+    %if statement.print_account_vat_group :
+        <% totals_by_account = {} %>
+        <% vat_accounts = account_vat_amounts("debit", statement.debit_vat_account_line_ids) %>
+        %for vat_account_id in vat_accounts :
+            <tr >
+                <td>${ vat_accounts[vat_account_id]['account_name']|entity }</td>
+                <td style="text-align:right">${ formatLang(vat_accounts[vat_account_id]['amount'])|entity }</td>
+                <td></td>
+            </tr>
+        %endfor
+        ## Vat account detail
+    %else:
+        %for debit_line in statement.debit_vat_account_line_ids :
         <tr >
             <td>${ debit_line.account_id.name|entity }</td>
             <td>${ formatLang(debit_line.amount)|entity }</td>
             <td></td>
         </tr>
-    %endfor
+        %endfor
+    %endif
     <!--
     <tr >
         <td>${_("Total")}</td>
         <td>${ statement.payable_vat_amount|entity }</td>
     </tr>
     -->
-    %for credit_line in statement.credit_vat_account_line_ids :
+    ## VAT account CREDIT
+        ## Vat account grouped by id
+    %if statement.print_account_vat_group :
+        <% totals_by_account = {} %>
+        <% vat_accounts = account_vat_amounts("credit", statement.credit_vat_account_line_ids) %>
+        %for vat_account_id in vat_accounts :
+            <tr >
+                <td>${ vat_accounts[vat_account_id]['account_name']|entity }</td>
+                <td></td>
+                <td style="text-align:right">${ formatLang(vat_accounts[vat_account_id]['amount'])|entity }</td>
+            </tr>
+        %endfor
+        ## Vat account detail
+    %else:
+        %for credit_line in statement.credit_vat_account_line_ids :
         <tr >
             <td>${ credit_line.account_id.name|entity }</td>
             <td></td>
             <td>${ formatLang(credit_line.amount)|entity }</td>
         </tr>
-    %endfor
+        %endfor
+    %endif
     <!--
     <tr >
         <td>${_("Total")}</td>
@@ -169,18 +199,18 @@
     <tr >
         <td>${_("Previous Credits VAT")}</td>
         <td></td>
-        <td>${ formatLang(statement.previous_credit_vat_amount)|entity }</td>
+        <td style="text-align:right">${ formatLang(statement.previous_credit_vat_amount)|entity }</td>
     </tr>
     <tr >
         <td>${_("Previous Debits VAT")}</td>
-        <td>${ formatLang(statement.previous_debit_vat_amount)|entity }</td>
+        <td style="text-align:right">${ formatLang(statement.previous_debit_vat_amount)|entity }</td>
         <td></td>
     </tr>
     %for generic_line in statement.generic_vat_account_line_ids :
         <tr >
             <td>${ generic_line.account_id.name|entity }</td>
-            <td>${ generic_line.amount < 0 and formatLang(generic_line.amount) or ''|entity }</td>
-            <td>${ generic_line.amount > 0 and formatLang(generic_line.amount) or ''|entity }</td>
+            <td style="text-align:right">${ generic_line.amount < 0 and formatLang(generic_line.amount) or ''|entity }</td>
+            <td style="text-align:right">${ generic_line.amount > 0 and formatLang(generic_line.amount) or ''|entity }</td>
         </tr>
     %endfor
     <tr >
 
=== modified file 'account_vat_period_end_statement/report/vat_period_end_statement.py'
--- account_vat_period_end_statement/report/vat_period_end_statement.py	2013-06-20 09:36:52 +0000
+++ account_vat_period_end_statement/report/vat_period_end_statement.py	2014-03-13 10:02:00 +0000
@@ -68,6 +68,29 @@
             res = self._build_codes_dict(tax_code, res=res, context=context)
         return res
     
+    def _get_account_vat_amounts(self, type='credit', statement_account_line=[], context=None):
+        if context is None:
+            context = {}
+        if type == 'credit':
+            stat_line_obj = self.pool.get('statement.credit.account.line')
+        elif type == 'debit':
+            stat_line_obj = self.pool.get('statement.debit.account.line')
+        else:
+            raise orm.except_orm(_('Error'), _('Type account neither credit or debit !'))
+            
+        account_amounts = {}
+        for line in statement_account_line:
+            account_id = line.account_id.id
+            if account_id not in account_amounts:
+                account_amounts[account_id] = {
+                           'account_id' : line.account_id.id,
+                           'account_name' : line.account_id.name,
+                           'amount' : line.amount
+                           }
+            else:
+                account_amounts[account_id]['amount'] += line.amount
+        return account_amounts
+    
     def find_period(self, date,context=None):
         if context is None:
             context = {}
@@ -81,10 +104,13 @@
         if context is None:
             context = {}
         super(print_vat_period_end_statement, self).__init__(cr, uid, name, context=context)
+        if context.get('active_id'):
+            vat_statement = self.pool.get('account.vat.period.end.statement').browse(cr, uid, context.get('active_id'))
         self.localcontext.update( {
             'time': time,
             'tax_codes_amounts': self._get_tax_codes_amounts,
             'find_period': self.find_period,
+            'account_vat_amounts': self._get_account_vat_amounts,
         })
         self.context = context
 
 
=== modified file 'account_vat_period_end_statement/reports.xml'
--- account_vat_period_end_statement/reports.xml	2013-03-16 13:18:33 +0000
+++ account_vat_period_end_statement/reports.xml	2014-03-13 10:02:00 +0000
@@ -1,6 +1,87 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
+    	<record id="ir_header_webkit_vat_period_end_statement" model="ir.header_webkit">
+            <field name="orientation">Portrait</field>
+            <field name="format">A4</field>
+            <field name="margin_top">50</field>
+            <field name="html"><![CDATA[<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+        <script>
+            function subst() {
+            var vars={};
+            var x=document.location.search.substring(1).split('&');
+            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+            for(var i in x) {
+            var y = document.getElementsByClassName(x[i]);
+            for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+                }
+            }
+        </script>
+    </head>
+    <body style="border:0; margin: 0;" onload="subst()">
+    <% setLang(company.partner_id.lang or "en_US") %>
+    <h3>${company.partner_id.name or ''|entity}</h3>
+    <table style="border-bottom: 4px solid black; width: 100%; padding-bottom: 8px">
+    <tr>
+    <td>
+    <div>${company.partner_id.street or ''|entity}</div>
+    <div>${company.partner_id.street2 or ''|entity}</div>
+    <div>${company.partner_id.zip or ''|entity}</div>
+    <div>${company.partner_id.city or ''|entity}</div>
+    <div>${company.partner_id.province and company.partner_id.province.code or ''|entity}</div>
+    </td>
+    <td>
+    <div>P. IVA: ${company.partner_id.vat or ''|entity}</div>
+    <div>Codice Fiscale: ${company.partner_id.fiscalcode or ''|entity}</div>
+
+    </td>
+    </tr>
+    </table>
+    <br/>
+    </body>
+</html>]]>
+</field>
+            <field name="footer_html"><![CDATA[<html>
+    <head>
+        <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+        <script>
+            function subst() {
+            var vars={};
+            var x=document.location.search.substring(1).split('&');
+            for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+            var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+            for(var i in x) {
+            var y = document.getElementsByClassName(x[i]);
+            for(var j=0; j<y.length; ++j) {
+            if(x[i] == 'page') {y[j].textContent = eval(vars[x[i]]) + ${objects[0].print_page_from -1};}
+            else{y[j].textContent = vars[x[i]];}
+            }
+
+                }
+            }
+        </script>
+    </head>
+    <body style="border:0; margin: 0;" onload="subst()">
+        <table style="border-top: 1px solid black; width: 100%">
+            <tr >
+                <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>
+            </tr>
+        </table>
+    </body>
+</html>]]></field><field name="css" ><![CDATA[
+tr {
+    page-break-inside: avoid;
+}
+thead{
+    display: table-header-group; /* http://code.google.com/p/wkhtmltopdf/issues/detail?id=9#c8 */
+}
+]]> </field>
+            <field  name="name">VAT Statement Summary</field>
+        </record>
+        
 
         <report
             auto="False"
@@ -9,6 +90,7 @@
             name="account.print.vat.period.end.statement"
             file="account_vat_period_end_statement/report/vat_period_end_statement.mako"
             string="VAT Statement Summary"
+            webkit_header = "ir_header_webkit_vat_period_end_statement"
             report_type="webkit" />
 
     </data>