diff --git a/addons/account_greek_fiscal/__init__.py b/addons/account_greek_fiscal/__init__.py index b140bac1860..4b0438f7d35 100644 --- a/addons/account_greek_fiscal/__init__.py +++ b/addons/account_greek_fiscal/__init__.py @@ -23,6 +23,7 @@ import fiscal_prints import account_invoice_print import wizard +import report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_greek_fiscal/__terp__.py b/addons/account_greek_fiscal/__terp__.py index 5477851736f..896a746b23d 100644 --- a/addons/account_greek_fiscal/__terp__.py +++ b/addons/account_greek_fiscal/__terp__.py @@ -20,7 +20,7 @@ # ############################################################################## { - "name" : "account_greek_fiscal", + "name" : "Greek Fiscal printing", "version" : "0.1", "depends" : ["account" ], "author" : "P. Christeas", diff --git a/addons/account_greek_fiscal/account_invoice_data.xml b/addons/account_greek_fiscal/account_invoice_data.xml index be961e0a089..39d436a6bd9 100644 --- a/addons/account_greek_fiscal/account_invoice_data.xml +++ b/addons/account_greek_fiscal/account_invoice_data.xml @@ -1,11 +1,5 @@ - - - property_fiscalgr_invoice_report - - - diff --git a/addons/account_greek_fiscal/account_invoice_report.xml b/addons/account_greek_fiscal/account_invoice_report.xml index fd0d8f7141e..894d21a730d 100644 --- a/addons/account_greek_fiscal/account_invoice_report.xml +++ b/addons/account_greek_fiscal/account_invoice_report.xml @@ -1,6 +1,13 @@ + + + + property_fiscalgr_invoice_report + + + + + + + Tax + + + Base + + + Amount + + + + + + + + + + + [[ repeatIn(o.tax_line,'t') ]] + + + + [[ t.name ]] + + + [[ formatLang(t.base) or '0.00' ]] + + + [[ formatLang(t.amount) or '0.00' ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [[ format(o.comment or removeParentNode('blockTable')) ]] + + + + + + + + + + [[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]] + + + + + + + + \ No newline at end of file