[MERGE] forward port of branch saas-3 up to 48ffbb6

diff --cc addons/account/account_report.xml
index 90d2c16,afed361..9409e88
--- 1/addons/account/account_report.xml
--- 2/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@@ -1,162 -1,40 +1,162 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <openerp>
      <data>
 -        <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
 -        <report auto="False" id="account_general_ledger_landscape" menu="False" model="account.account" name="account.general.ledger_landscape" rml="account/report/account_general_ledger_landscape.rml" string="General Ledger"/>
 -        <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
 -        <report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Ledger"/>
 -        <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Trial Balance"/>
 -        <report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/account_partner_balance.rml" string="Partner Balance"/>
 -        <report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/account_central_journal.rml" string="Central Journal" header="False"/>
 -        <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journal" header="False"/>
 -        <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal" header="False"/>
 -        <report auto="False" id="account_journal_sale_purchase" model="account.journal.period" name="account.journal.period.print.sale.purchase" rml="account/report/account_journal_sale_purchase.rml" string="Sale/Purchase Journal" header="False"/>
 -        <report id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Due Payments" parser="account.report.account_print_overdue.Overdue"/>
 +        <report 
 +            id="account_transfers"
 +            model="account.transfer"
 +            name="account.transfer"
 +            string="Transfers"
 +            xml="account/report/transfer.xml"
 +            xsl="account/report/transfer.xsl"
 +        />
 +        
          <report
              auto="False"
 +            id="account_intracom"
 +            menu="False"
 +            model="account.move.line"
 +            name="account.intracom"
 +            string="IntraCom"
 +        />
 +
 +        <!-- QWeb Reports -->
 +        <report
 +            id="action_report_vat"
 +            model="account.tax.code"
 +            report_type="qweb-pdf"
 +            string="Account tax"
 +            name="account.report_vat"
 +            file="account.report_vat"
 +        />
 +
 +        <report 
              id="account_invoices"
              model="account.invoice"
 -            name="account.invoice"
 -            rml="account/report/account_print_invoice.rml"
              string="Invoices"
 -            attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
 +            report_type="qweb-pdf"
 +            name="account.report_invoice"
 +            file="account.report_invoice"
              attachment_use="True"
 -            usage="default"
 -            />
 -        <report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
 -        <report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
 +            attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
 +        />
 +
 +        <report 
 +            id="action_report_trial_balance"
 +            model="account.balance.report"
 +            string="Trial Balance"
 +            report_type="qweb-pdf"
 +            name="account.report_trialbalance" 
 +            file="account.report_trialbalance"
 +        />
 +
 +        <report 
 +            id="action_report_central_journal"
 +            model="account.journal.period"
 +            string="Central Journal"
 +            report_type="qweb-pdf"
 +            name="account.report_centraljournal"
 +            file="account.report_centraljournal"
 +        />
 +
 +        <report 
 +            id="action_report_print_overdue"
 +            model="res.partner"
 +            report_type="qweb-pdf"
-             string="Overdue Payments"
++            string="Due Payments"
 +            name="account.report_overdue"
 +            file="account.report_overdue"
 +        />
 +
 +        <report 
 +            id="action_report_general_journal"
 +            model="account.journal.period"
 +            string="General Journal"
 +            report_type="qweb-pdf"
 +            name="account.report_generaljournal"
 +            file="account.report_generaljournal"
 +            menu="False"
 +        />
 +
 +        <report 
 +            id="action_report_account_journal" 
 +            model="account.journal.period" 
 +            string="Journal"
 +            report_type="qweb-pdf"
 +            name="account.report_journal" 
 +            file="account.report_journal"
 +        />
 +
 +        <report 
 +            id="action_report_account_salepurchasejournal" 
 +            model="account.journal.period" 
 +            string="Journal"
 +            report_type="qweb-pdf"
 +            name="account.report_salepurchasejournal" 
 +            file="account.report_salepurchasejournal"
 +        />
 +
 +        <report 
 +            id="action_account_3rdparty_account_balance" 
 +            model="account.account" 
 +            string="Partner Balance"
 +            report_type="qweb-pdf" 
 +            name="account.report_partnerbalance" 
 +            file="account.report_partnerbalance" 
 +            menu="False" 
 +        />
 +
 +        <report 
 +            id="action_report_aged_partner_balance"
 +            model="res.partner"
 +            string="Aged Partner Balance"
 +            report_type="qweb-pdf"
 +            name="account.report_agedpartnerbalance"
 +            file="account.report_agedpartnerbalance"
 +            menu="False"
 +        />
  
          <report
 -            auto="False"
 -            id="account_vat_declaration"
 +            id="action_report_partner_ledger"
 +            model="res.partner"
 +            string="Partner Ledger"
 +            report_type="qweb-pdf"
 +            name="account.report_partnerledger"
 +            file="account.report_partnerledger"
              menu="False"
 -            model="account.tax.code"
 -            name="account.vat.declaration"
 -            rml="account/report/account_tax_report.rml"
 -            string="Taxes Report"/>
 +        />
 +
 +        <report
 +            id="action_report_partner_ledger_other"
 +            model="res.partner"
 +            string="Partner Ledger"
 +            report_type="qweb-pdf"
 +            name="account.report_partnerledgerother"
 +            file="account.report_partnerledgerother"
 +            menu="False"
 +        />
 +
 +        <report 
 +            id="action_report_financial"
 +            model="account.financial.report"
 +            string="Financial report"
 +            report_type="qweb-pdf"
 +            name="account.report_financial"
 +            file="account.report_financial"
 +            menu="False"
 +        />
  
 +        <report 
 +            id="action_report_general_ledger" 
 +            model="account.report.general.ledger" 
 +            string="General Ledger"
 +            report_type="qweb-pdf"
 +            name="account.report_generalledger" 
 +            file="account.report_generalledger"
 +            menu="False"
 +            auto="False"
 +        />
 +
 +        <!-- Menu items -->
          <menuitem
              id="menu_tax_report"
              name="Taxes"