diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 148227b8082..7acdb119a11 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -424,7 +424,7 @@ class account_move_line(osv.osv): 'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')), 'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')), 'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2), - 'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2), + 'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", help="The move of this entry line.", select=2, required=True), 'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Narration'), 'ref': fields.char('Ref.', size=64), 'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1), @@ -447,7 +447,7 @@ class account_move_line(osv.osv): 'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'), 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation')], 'Centralisation', size=6), 'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'), - 'state': fields.selection([('draft','Draft'), ('valid','Valid')], 'State', readonly=True, + 'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True, help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'), 'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."), 'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\ @@ -917,6 +917,9 @@ class account_move_line(osv.osv): elif field == 'credit': attrs.append('sum="Total credit"') + elif field == 'move_id': + attrs.append('required="False"') + elif field == 'account_tax_id': attrs.append('domain="[(\'parent_id\',\'=\',False)]"') attrs.append("context=\"{'journal_id':journal_id}\"") diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 111fafdd18c..5ade15ff918 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -925,16 +925,16 @@ - - - + + + - + @@ -1044,13 +1044,13 @@ - + - + @@ -1289,13 +1289,12 @@ - + - diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 4f3ce260220..3ed82c75f6f 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:28+0000\n" +"PO-Revision-Date: 2010-08-24 06:07+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index da08557cbfb..4cb9e9bc57e 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:31+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2010-08-24 17:21+0000\n" +"Last-Translator: Ferdinand @ ChriCar \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -272,6 +272,9 @@ msgid "" "in which order. You can create your own view for a faster encoding in each " "journal." msgstr "" +"Definiert Felder (sichtbar, zwingend, nur lesen) für die Sicht für dieses " +"Journal. Für jedes Journal können eingene Sichten erzeugt wrden um scheller " +"erfassen zu können" #. module: account #: help:account.invoice,date_due:0 @@ -1504,7 +1507,7 @@ msgstr "Beende Jahr" #. module: account #: model:ir.model,name:account.model_wizard_company_setup msgid "wizard.company.setup" -msgstr "" +msgstr "wizard.company.setup" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form @@ -5386,7 +5389,7 @@ msgstr "Teilbuchung" #. module: account #: help:account.move.line,statement_id:0 msgid "The bank statement used for bank reconciliation" -msgstr "" +msgstr "Der Bankauszug für den Bankausgleich" #. module: account #: view:account.fiscalyear:0 @@ -5477,7 +5480,7 @@ msgstr "Berechne" #. module: account #: help:account.invoice.line,account_id:0 msgid "The income or expense account related to the selected product." -msgstr "Aufwand- und Ertragskonto des Produktes" +msgstr "Aufwand- und Erlöskonto des Produktes" #. module: account #: field:account.tax,type_tax_use:0 @@ -5795,7 +5798,7 @@ msgstr "5" #: field:product.category,property_account_income_categ:0 #: field:product.template,property_account_income:0 msgid "Income Account" -msgstr "Ertragskonto" +msgstr "Erlöskonto" #. module: account #: field:account.period,special:0 diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index c48642f4a98..cce3ec4b817 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:30+0000\n" +"PO-Revision-Date: 2010-08-24 06:09+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index c020a2ed0cf..9e59b136c6b 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 08:17+0000\n" +"PO-Revision-Date: 2010-08-24 06:07+0000\n" "Last-Translator: eLBati - albatos.com \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po index 4303bd5fbac..563d2f4db0c 100644 --- a/addons/account/i18n/lt.po +++ b/addons/account/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:24+0000\n" +"PO-Revision-Date: 2010-08-24 06:04+0000\n" "Last-Translator: Giedrius Slavinskas \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 73b99add034..567f4f93dee 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:24+0000\n" +"PO-Revision-Date: 2010-08-24 06:04+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po index 30bc418f94f..4a640ee12ac 100644 --- a/addons/account/i18n/sq.po +++ b/addons/account/i18n/sq.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: ASTRIT BOKSHI \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:05+0000\n" +"PO-Revision-Date: 2010-08-24 05:53+0000\n" "Last-Translator: bokshas \n" "Language-Team: Albanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 46d555beb5a..399b44f5995 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:29+0000\n" +"PO-Revision-Date: 2010-08-24 06:09+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: <> <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 3ebe448ffad..5478ae1bc63 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:23+0000\n" +"PO-Revision-Date: 2010-08-24 06:04+0000\n" "Last-Translator: Omer Barlas \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index c891a4f2646..fd8f277215f 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-20 06:10+0000\n" +"PO-Revision-Date: 2010-08-24 05:57+0000\n" "Last-Translator: Jeff Wang \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-21 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-08-25 03:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/partner.py b/addons/account/partner.py index cd4d34976d4..04c97c32c9d 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -187,8 +187,8 @@ class res_partner(osv.osv): help="This payment term will be used instead of the default one for the current partner"), 'ref_companies': fields.one2many('res.company', 'partner_id', 'Companies that refers to partner'), - 'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which partner account entries reconciled last time') + 'last_reconciliation_date': fields.datetime('Last Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time') } res_partner() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py index 8815369375e..2de6ada841a 100644 --- a/addons/account/project/report/analytic_balance.py +++ b/addons/account/project/report/analytic_balance.py @@ -154,7 +154,7 @@ class account_analytic_balance(report_sxw.rml_parse): report_sxw.report_sxw('report.account.analytic.account.balance', 'account.analytic.account', 'addons/account/project/report/analytic_balance.rml', - parser=account_analytic_balance, header=False) + parser=account_analytic_balance, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/project/report/analytic_check.py b/addons/account/project/report/analytic_check.py index 3075a7821bb..a35f2ec718c 100644 --- a/addons/account/project/report/analytic_check.py +++ b/addons/account/project/report/analytic_check.py @@ -95,6 +95,6 @@ class account_analytic_analytic_check(report_sxw.rml_parse): def _delta_cred(self, date1, date2): return (self._gen_cred(date1,date2)-self._ana_cred(date1,date2)) -report_sxw.report_sxw('report.account.analytic.account.analytic.check', 'account.analytic.account', 'addons/account/project/report/analytic_check.rml',parser=account_analytic_analytic_check, header=False) +report_sxw.report_sxw('report.account.analytic.account.analytic.check', 'account.analytic.account', 'addons/account/project/report/analytic_check.rml',parser=account_analytic_analytic_check, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py index e3da7636c0a..88d56108550 100644 --- a/addons/account/project/report/analytic_journal.py +++ b/addons/account/project/report/analytic_journal.py @@ -57,7 +57,7 @@ class account_analytic_journal(report_sxw.rml_parse): res = self.cr.dictfetchone() return res['sum'] or 0 -report_sxw.report_sxw('report.account.analytic.journal', 'account.analytic.journal', 'addons/account/project/report/analytic_journal.rml',parser=account_analytic_journal,header=False) +report_sxw.report_sxw('report.account.analytic.journal', 'account.analytic.journal', 'addons/account/project/report/analytic_journal.rml',parser=account_analytic_journal,header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py index 4317831998c..c711eeb2b30 100644 --- a/addons/account/project/report/cost_ledger.py +++ b/addons/account/project/report/cost_ledger.py @@ -108,7 +108,7 @@ class account_analytic_cost_ledger(report_sxw.rml_parse): credit = self._sum_credit(accounts, date1, date2) or 0.0 return (debit-credit) -report_sxw.report_sxw('report.account.analytic.account.cost_ledger', 'account.analytic.account', 'addons/account/project/report/cost_ledger.rml',parser=account_analytic_cost_ledger, header=False) +report_sxw.report_sxw('report.account.analytic.account.cost_ledger', 'account.analytic.account', 'addons/account/project/report/cost_ledger.rml',parser=account_analytic_cost_ledger, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py index f313a9c55db..6ba8e724d35 100644 --- a/addons/account/project/report/inverted_analytic_balance.py +++ b/addons/account/project/report/inverted_analytic_balance.py @@ -120,7 +120,7 @@ class account_inverted_analytic_balance(report_sxw.rml_parse): WHERE account_id IN %s AND date>=%s AND date<=%s", (tuple(ids),date1, date2,)) return self.cr.fetchone()[0] or 0.0 -report_sxw.report_sxw('report.account.analytic.account.inverted.balance', 'account.analytic.account', 'addons/account/project/report/inverted_analytic_balance.rml',parser=account_inverted_analytic_balance, header=False) +report_sxw.report_sxw('report.account.analytic.account.inverted.balance', 'account.analytic.account', 'addons/account/project/report/inverted_analytic_balance.rml',parser=account_inverted_analytic_balance, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py index 37b09827c51..c593d05566e 100644 --- a/addons/account/project/report/quantity_cost_ledger.py +++ b/addons/account/project/report/quantity_cost_ledger.py @@ -120,6 +120,6 @@ class account_analytic_quantity_cost_ledger(report_sxw.rml_parse): report_sxw.report_sxw('report.account.analytic.account.quantity_cost_ledger', 'account.analytic.account', 'addons/account/project/report/quantity_cost_ledger.rml', - parser=account_analytic_quantity_cost_ledger, header=False) + parser=account_analytic_quantity_cost_ledger, header="internal") -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py index 8e07f3ad56c..1883f48b912 100644 --- a/addons/account/report/account_aged_partner_balance.py +++ b/addons/account/report/account_aged_partner_balance.py @@ -216,7 +216,7 @@ class aged_trial_report(rml_parse.rml_parse, common_report_header): return '' report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner', - 'addons/account/report/account_aged_partner_balance.rml',parser=aged_trial_report, header=False) + 'addons/account/report/account_aged_partner_balance.rml',parser=aged_trial_report, header="internal landscape") -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 79e2334b7dc..d688741f1aa 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -57,10 +57,10 @@ class account_balance(report_sxw.rml_parse, common_report_header): self.query_get_clause = data['form'].get('query_line', False) or '' return super(account_balance, self).set_context(objects, data, new_ids, report_type=report_type) - def _add_header(self, node, header=1): - if header == 0: - self.rml_header = "" - return True + #def _add_header(self, node, header=1): + # if header == 0: + # self.rml_header = "" + # return True def _get_account(self, data): if data['model']=='account.account': @@ -121,4 +121,4 @@ class account_balance(report_sxw.rml_parse, common_report_header): report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header="internal") -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py index e8b8502e331..04f7cc8ec7f 100644 --- a/addons/account/report/account_balance_landscape.py +++ b/addons/account/report/account_balance_landscape.py @@ -395,6 +395,6 @@ class account_balance_landscape(rml_parse.rml_parse): def total_cr(self): return self.cr_total -report_sxw.report_sxw('report.account.account.balance.landscape', 'account.account', 'addons/account/report/account_balance_landscape.rml', parser=account_balance_landscape, header=False) +report_sxw.report_sxw('report.account.account.balance.landscape', 'account.account', 'addons/account/report/account_balance_landscape.rml', parser=account_balance_landscape, header="internal landscape") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index e76c8450573..084a7de8c14 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -196,10 +196,10 @@ class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header): report_sxw.report_sxw('report.account.balancesheet.horizontal', 'account.account', 'addons/account/report/account_balance_sheet_horizontal.rml',parser=report_balancesheet_horizontal, - header='internal') + header='internal landscape') report_sxw.report_sxw('report.account.balancesheet', 'account.account', 'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal, header='internal') -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index 2c4bad0938c..2cf9a489a1a 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -240,6 +240,6 @@ class general_ledger(rml_parse.rml_parse, common_report_header): return 'Date' report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal') -report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/account_general_ledger_landscape.rml', parser=general_ledger, header='internal') +report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/account_general_ledger_landscape.rml', parser=general_ledger, header='internal landscape') -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index c1c74a1f54d..a7c732cf379 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -170,9 +170,9 @@ class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header): return self.result.get(group, []) report_sxw.report_sxw('report.pl.account.horizontal', 'account.account', - 'addons/account/report/account_profit_horizontal.rml',parser=report_pl_account_horizontal, header='internal') + 'addons/account/report/account_profit_horizontal.rml',parser=report_pl_account_horizontal, header='internal landscape') report_sxw.report_sxw('report.pl.account', 'account.account', 'addons/account/report/account_profit_loss.rml',parser=report_pl_account_horizontal, header='internal') -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py index 9a72c83fab5..2f123fd00be 100644 --- a/addons/account/report/account_tax_code.py +++ b/addons/account/report/account_tax_code.py @@ -63,6 +63,6 @@ class account_tax_code_report(rml_parse.rml_parse): .browse(self.cr, self.uid, line_ids)) report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code', - 'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False) + 'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/compare_account_balance.py b/addons/account/report/compare_account_balance.py index b29b2ea4648..b3b4231c027 100644 --- a/addons/account/report/compare_account_balance.py +++ b/addons/account/report/compare_account_balance.py @@ -392,6 +392,6 @@ class account_balance(report_sxw.rml_parse): def total_cr(self): return self.cr_total -report_sxw.report_sxw('report.account.balance.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False) +report_sxw.report_sxw('report.account.balance.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py index 9178c0fd2e8..cc8299bcecf 100644 --- a/addons/account/report/rml_parse.py +++ b/addons/account/report/rml_parse.py @@ -150,13 +150,3 @@ class rml_parse(report_sxw.rml_parse): else: return Stringer - def _add_header(self, node, header=1): - if header==2: - rml_head = self.rml_header2 - else: - rml_head = self.rml_header - rml_head = rml_head.replace('',''' [[company.logo]] ''') - return True - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/tax_report.py b/addons/account/report/tax_report.py index 5e5f68a3fa8..15607a79011 100644 --- a/addons/account/report/tax_report.py +++ b/addons/account/report/tax_report.py @@ -217,6 +217,6 @@ class tax_report(rml_parse.rml_parse): report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code', - 'addons/account/report/tax_report.rml', parser=tax_report, header=True) + 'addons/account/report/tax_report.rml', parser=tax_report, header="internal") # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/voucher_print.py b/addons/account/report/voucher_print.py index 829f0f7e397..7501bab7bf0 100644 --- a/addons/account/report/voucher_print.py +++ b/addons/account/report/voucher_print.py @@ -58,5 +58,5 @@ report_sxw.report_sxw( 'report.account.move.voucher', 'account.move', 'addons/account/report/voucher_print.rml', - parser=report_voucher_move,header=False + parser=report_voucher_move,header="external" ) diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml index 06dccb5f801..a80ffbc05cd 100644 --- a/addons/account/wizard/account_reconcile_view.xml +++ b/addons/account/wizard/account_reconcile_view.xml @@ -63,7 +63,7 @@