+
+
+
+
+ Analytic Balance -
+ +| Code | +Account Name | +Debit | +Credit | +Balance | +Quantity | +
|---|---|---|---|---|---|
| Total | ++ + | ++ + | ++ + | ++ + | +|
| + | + | + | + | + | + |
| + | + | + | + | + | + |
+
+
+
+
+ Cost Ledger
+ +
+
+
+
+ Period From:
+
+
+
+ Period To:
+
+
+
+ Printing Date:
+
+
+ | Date/Code | +J.C. /Move | +Name | +Debit | +Credit | +Balance | +
|---|---|---|---|---|---|
| Total: | ++ | + | + | + | + + | +
| + | + | + | + | + | + |
| + | + | + | + | + | + + | +
|
+ |
+ + | + | + | + | + + | +
+
+
+
+
+ Cost Ledger
+ +
+
+
+
+ Period From:
+
+
+
+ Period To:
+
+
+
+ Printing Date:
+
+
+ | Date/Code | +J.C./Move | +Name | +Quantity | +Total | +
|---|---|---|---|---|
| Total: | ++ | + | + | + + | +
| + | + | + |
+ + Max quantity : + + |
+ + + | +
| + | + | + | + | |
| + | + | + | + | + |
+
+
+
+
+ Analytic Journal
+ +
+
+
+
+ Period From:
+
+
+
+ Period To:
+
+
+
+ Currency:
+
+
+ | Date | +Code | +Move Name | +Account n° | +General | +Analytic | +
|---|---|---|---|---|---|
| + | + | ||||
| + | + | + + | ++ + + | ++ + | ++ |
| + + | +
+ + |
+ + + | +- | ++ | + |
| + | + | - | ++ | + | |
+
+
+
+
+ Inverted Analytic Balance -
+ +| Code | +Account Name | +Debit | +Credit | +Balance | +Quantity | +
|---|---|---|---|---|---|
| Total | ++ | + | + | + + | ++ |
| + + | ++ + | ++ + + + | ++ + + + | ++ + + + | ++ + + + | +
| + + | ++ + | ++ + | ++ + | ++ + | ++ + | +
+
+
+
+
+ Aged Trial Balance
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Start Date:
+
+
+
+ Period Length (days)
+
+
+
+
+
+
+ Partner's:
+
+ + Receivable Accounts + Payable Accounts + Receivable and Payable Accounts +
+
+ Analysis Direction:
+
+
+
+ Target Moves:
+
+
+ | Partners | ++ Due + Not due + | ++ | + | + | + | + | Total | +
|---|---|---|---|---|---|---|---|
| Account Total | ++ | + | + | + | + | + | + |
| + + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | +
| + + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | +
+
+
+
+
+ Centralized Journal
+ +
+
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Journals:
+
+
+
+ Filter By:
+
+ + Not filtered + Filtered by period + Filtered by date +
+ Start Period:
+ End Period:
+
+ Date from :
+ Date to :
+
+
+
+
+ Target Moves:
+
+
+ | A/C No. | +Account Name | +Debit | +Credit | +Balance | +Currency | +
|---|---|---|---|---|---|
| Total: | ++ + | ++ + | ++ + | ++ | |
| + | + | + | + | + | + + + | +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Filter By:
+
+ + Not filtered + Filtered by period + Filtered by date +
+ Start Period: + End Period: +
+
+ Date from :
+ Date to :
+
+ Target Moves:
+
+
+ | Name | +Debit | +Credit | +Balance | +
|---|---|---|---|
| + + + | ++ + | ++ + | ++ + | +
| Name | +Balance | +
|---|---|
| + + + | ++ |
| Name | +Balance | ++ |
|---|---|---|
| + + + | ++ | + |
+
+
+
+
+ General Journal
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Journals:
+
+
+
+ Filter By:
+
+ + Not filtered + Filtered by period + Filtered by date +
+ Start Period: + End Period: +
+
+ Date from :
+ Date to :
+
+
+
+
+ Target Moves:
+
+
+ | Code | +Journal Name | +Debit | +Credit | +Balance | +Currency | +
|---|---|---|---|---|---|
| Total: | ++ | + | + | + | + |
| : | ++ | + | + | + | + |
| + | + | + | + | + + |
+ |
+
+
+
+
+
+ : General ledger
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Journals:
+
+
+
+ Display Account
+
+ + All accounts' + With movements + With balance not equal to zero +
+
+
+
+
+ Filter By:
+
+ + Not filtered + Filtered by period + Filtered by date +
+ Start Period: + End Period: +
+
+ Date from :
+ Date to :
+
+ Sorted By:
+
+
+
+ Target Moves:
+
+
+ | Date | +JRNL | +Partner | +Ref | +Move | +Entry Label | +Counterpart | +Debit | +Credit | +Progress | +Currency | +
|---|---|---|---|---|---|---|---|---|---|---|
| + + + + | ++ + | ++ + | ++ + | ++ + | +||||||
| + | + | + | + | + | + | + | + + | ++ + | ++ + | ++ + + | +
+
+
+
+
+
+
+
+
+
+
+
+
+ + Invoice + PRO-FORMA + Draft Invoice + Cancelled Invoice + Refund + Supplier Refund + Supplier Invoice + +
+ +
+
+
+
+ Description:
+
+
+
+ Invoice Date:
+
+
+
+ Source:
+
+
+
+ Customer Code:
+
+
+ | Description | +Quantity | +Unit of measure | +Unit Price | +Discount (%) | +Taxes | +Amount | +
|---|---|---|---|---|---|---|
| + | + | + | + + | ++ | + + | ++ + | +
+
+
+
+
+
+
+ | Total Without Taxes | ++ + | +
| Taxes | ++ + | +
| Total | ++ + | +
+
+
+
+
+
+
+
+ | Tax | +Base | +Amount | +
|---|---|---|
| + | + + | ++ + | +
+ Comment: + +
++ Payment Term: + +
++ Fiscal Position: + +
+
+
+
+
+
+
+ Journal
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Journal:
+
+
+
+ Period:
+
+
+
+
+
+
+ Entries Sorted By:
+
+ Date
+Journal Entry Number
+
+ Target Moves:
+
+
+ | Move | +Date | +Account | +Partner | +Label | +Debit | +Credit | +Currency | +
|---|---|---|---|---|---|---|---|
| + | + + | +
+
+
+
+
+
+
+ | Total | ++ | + |
+
+
+
+
+
+
+
+
+
+
+ + +
+ + + +
+ Document: Customer account statement
+ Date:
+ Customer ref:
+
+
| Date | +Description | +Ref | +Maturity Date | +Due | +Paid | +Maturity | +Li. | +
|---|---|---|---|---|---|---|---|
| + + | ++ + | ++ + | ++ + | +
+ |
+
+ |
+
+ |
+ + x + | +
| + | Sub-Total : | ++ | + | + | + | ||
| + | Balance : | ++ + | ++ | + | + | ||
+ Total amount due: + +
+ ++ There is nothing due with this customer. +
+
+
+
+
+
+ Partner Balance
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Journals:
+
+
+
+ Partner's
+
+
+
+
+
+
+ Filter By:
+
+ + Not filtered + Filtered by period + Filtered by date +
+ Start Period: + End Period: +
+
+ Date from :
+ Date to :
+
+ Target Moves:
+
+
+ | Code | +(Account/Partner) Name | +Debit | +Credit | +Balance | +In dispute | +||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Total: | ++ | + + | ++ + | ++ + | ++ + | +||||||
| + + + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | ++ + | +
+
+
+
+
+ Partner Ledger
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Journals:
+
+
+
+ Partner's
+
+
+
+
+
+
+ Filter By:
+
+ + Not filtered + Filtered by period + Filtered by date +
+ Start Period: + End Period: +
+
+ Date from :
+ Date to :
+
+ Target Moves:
+
+
+ | Date | +JRNL | +Ref | +Account | +Entry Label | +Debit | +Credit | +Balance | +Currency | +
|---|---|---|---|---|---|---|---|---|
| + + - + | ++ + | ++ + | ++ + | +|||||
| Initial Balance | ++ + | ++ + | ++ + | +|||||
| + + | ++ + | ++ + | ++ + | ++ - + | ++ + | ++ + | ++ + | ++ + | +
+
+
+
+
+ Partner Ledger
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Journals:
+
+
+
+ Partner's
+
+
+
+
+
+
+ Filter By:
+
+ + Not filtered + Filtered by period + Filtered by date +
+ Start Period: + End Period: +
+
+ Date from :
+ Date to :
+
+ Target Moves:
+
+
+ | Date | +JRNL | +Ref | +Account | +Entry Label | +Debit | +Credit | +Balance | +Currency | +
|---|---|---|---|---|---|---|---|---|
| + + - + | ++ + | ++ + | ++ + | +|||||
| Initial Balance | ++ + | ++ + | ++ + | +|||||
| + + | ++ + | ++ + | ++ + | ++ - + | ++ + | ++ + | ++ + | ++ + | +
+
+
+
+
+
+ Sale/Purchase Journal
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Journal:
+
+
+
+ Period:
+
+
+
+
+
+
+ Entries Sorted By:
+
+ Journal Entry Number
+Date
+
+ Target Moves:
+
+
+ | Move | +Date | +Account | +Partner | +Label | +Tax | +Debit | +Credit | +Currency | +
|---|---|---|---|---|---|---|---|---|
| + | + | + | + | + | + | + | + | + + | +
+
+
+
+
+
+
+ | Total | ++ | + |
+
+
+
+
+
+
+
+ | Tax Declaration | ||
|---|---|---|
| : | ++ | + |
+
+
+
+
+ : Trial Balance
+ +
+
+
+ Chart of Accounts:
+
+
+
+ Fiscal Year:
+
+
+
+ Display Account:
+
+ + All accounts + With movements + With balance not equal to zero +
+
+ Filter By:
+
+ + Not filtered + Filtered by period + Filtered by date +
+ Start Period: + End Period: +
+
+ Date from :
+ Date to :
+
+
+
+
+ Target Moves:
+
+
+ | Code | +Account | +Debit | +Credit | +Balance | +
|---|---|---|---|---|
| + + | ++ + + | ++ + | ++ + | ++ + | +
+
+
+
+
+
+
+ Crossovered Analytic
+ +
+
+
+
+ From Date:
+
+
+
+ To Date:
+
+
+
+ Company:
+
+
+
+ Printing Date:
+
+
+ Analytic Account Reference
+ +| Account Name | +Code | +Quantity | +Amount | +Perc(%) | +
|---|---|---|---|---|
| + | + |
+ + + + |
+
+ + + + |
+ 100.00% | +
+
+
+
+
+ Bank Statement Balances Report
+ +| Name | +Date | +Journal | +Closing Balance | +
|---|---|---|---|
| + | + | + | + + | +
+
+
+
+
+ Analytic Budget
+ +
+
+
+
+ Analysis from
+
+ to +
+
+ Analytic Account
+
+
+
+ Currency
+
+
+ | Description | +Theoretical Amt | +Planned Amt | +Practical Amt | +Perc(%) | +
|---|---|---|---|---|
| + | + | + | + | % | +
| + | + | + | + | % | +
| Total: | ++ | + | + | % | +
+
+
+
+
+ Budget
+
+
+
+
+ Currency:
+
+
+
+ Printed at:
+
+ at +
+
+ Analysis from:
+
+ to +
+
+ Budget:
+
+
+ | Description | +Theoretical Amount | +Planned Amount | +Practical Amount | +Perc(%) | +
|---|---|---|---|---|
| + | + + | ++ | + | % | +
| + | + | + | + | % | +
| Total: | ++ | + | + | % | +
+
+
+
+
+ Budget
+ +
+
+
+
+ Analysis from:
+
+ to +
+
+ Budget:
+
+
+
+ Currency:
+
+
+ | Description | +Theoretical Amt | +Planned Amt | +Practical Amt | +Perc(%) | +
|---|---|---|---|---|
| + + + | ++ + | ++ + | ++ + | ++ % + | +
| + Total: + | ++ + | ++ + | ++ + | ++ % + | +
+
+
+
+
+ + +
+
+
+
+ +
+ + +
| Due Date | +Description | +Original Amount | +Open Balance | +Discount | +Payment | +
|---|---|---|---|---|---|
|
+ + + + |
+ + | + | + | + | + |
[[ format(get_text(o,data['form']['followup_id'])) ]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Document: Customer account statement
+ Date:
+ Customer ref:
+
| Invoice Date | +Description | +Ref | +Maturity Date | +Amount | +Li. | +
|---|---|---|---|---|---|
| + | + | + | + | + | + |
Total:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Payment Order / Payment
+ +
+
+
+
+ Payment Type:
+
+
+
+ Reference
+
+
+
+ Used Account:
+
+
+
+ Execution:
+
+
+
+ Company Currency:
+
+
+ | Partner | +Bank Account | +Invoice Ref | +Value Date | +Amount | +Currency | +
|---|---|---|---|---|---|
| + + | ++ + | ++ + | +
+ + |
+ + + | ++ + | +
+
+
+
+
+
+
+
+ | Total | ++ + | +
| Total (Currency) | ++ + | +
+
+ Accouting tests on
+
+
+
+ Name:
+ Description:
+
+ +
+\ wkhtmltopdf.org'), true); - window.open(report_url.substring(12), '_blank', 'height=768,width=1024'); + report_url = report_url.substring(12) + window.open('/report/html/' + report_url, '_blank', 'height=768,width=1024'); instance.web.unblockUI(); + return; } else { if (presence == 'upgrade') { self.do_notify(_t('Report'), _t('You should upgrade your version of\ @@ -75,22 +75,13 @@ openerp.report = function(instance) { support for table-breaking between pages.
wkhtmltopdf.org'), true); } - self.session.get_file({ - url: '/report/download', - data: {data: JSON.stringify(response)}, - complete: openerp.web.unblockUI, - error: c.rpc_error.bind(c) - }); } + return trigger_download(self.session, response, c); }); - } else { - self.session.get_file({ - url: '/report/download', - data: {data: JSON.stringify(response)}, - complete: openerp.web.unblockUI, - error: c.rpc_error.bind(c) - }); - } + } + else if (action.report_type == 'controller') { + return trigger_download(self.session, response, c); + } } } else { return self._super(action, options); diff --git a/addons/report/tests/test_reports.py b/addons/report/tests/test_reports.py index dda14442709..b1853489573 100644 --- a/addons/report/tests/test_reports.py +++ b/addons/report/tests/test_reports.py @@ -1,5 +1,23 @@ # -*- coding: utf-8 -*- - +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2014-Today OpenERP SA (
- ![]()
+ ![]()
+
@@ -158,5 +164,6 @@
-
-
-
-
diff --git a/addons/report_intrastat/report/__init__.py b/addons/report_intrastat/report/__init__.py
deleted file mode 100644
index 64e530bc278..00000000000
--- a/addons/report_intrastat/report/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see ).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [[ repeatIn(objects,'o') ]]
- [[ setLang(o.partner_id.lang) ]]
-
-
-
-
-
-
-
-
- [[ (o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]
- [[ o.partner_id and display_address(o.partner_id) ]]
-
-
-
- Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]
- Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]
- VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]
-
-
-
- Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]
- PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]
- Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]
- Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]
- Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]
- Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]
- Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]
-
-
-
-
-
-
- Document
-
-
- Invoice Date
-
-
- Partner Ref.
-
-
-
-
-
-
- [[ o.name or ' ' ]]
-
-
- [[ formatLang(o.date_invoice,date=True) ]]
-
-
- [[ (o.partner_id.ref) or ' ' ]]
-
-
-
-
-
-
-
-
-
- Description
-
-
- Taxes
-
-
- Intrastat
-
-
- Weight
-
-
- Quantity
-
-
- Unit Price
-
-
- Disc. (%)
-
-
- Price
-
-
-
-
- [[ repeatIn(o.invoice_line,'l') ]]
-
-
-
- [[ l.name ]]
-
-
- [[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]]
-
-
- [[l.product_id and l.product_id.intrastat_id and l.product_id.intrastat_id.name or '']]
-
-
- [[ l.product_id and l.product_id.weight or '']]
-
-
- [[ formatLang(l.quantity) ]] [[ (l.uos_id and l.uos_id.name) or '' ]]
-
-
- [[ formatLang(l.price_unit) ]]
-
-
- [[ l.discount and formatLang (l.discount) or '' ]]
-
-
- [[ formatLang(l.price_subtotal, currency_obj=o.currency_id) ]]
-
-
-
-
- [[ format(l.note or removeParentNode('tr')) ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Total (excl. taxes):
-
-
- [[ formatLang(o.amount_untaxed, currency_obj=o.currency_id) ]]
-
-
-
-
-
-
-
-
-
- Taxes:
-
-
- [[ formatLang(o.amount_tax, currency_obj=o.currency_id) ]]
-
-
-
-
-
-
-
-
-
- Total (inclu. taxes):
-
-
- [[ formatLang(o.amount_total, currency_obj=o.currency_id) ]]
-
-
-
-
-
-
-
-
-
- Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]
-
-
- Base
-
-
- Amount
-
-
-
-
-
-
-
-
-
- [[ repeatIn(o.tax_line,'t') ]]
-
-
-
- [[ t.name ]]
-
-
- [[ formatLang(t.base, digits=get_digits(dp='Account'), currency_obj = o.currency_id) ]]
-
-
- [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]
-
-
-
-
-
-
-
-
-
-
-
-
- [[ (o.comment and format(o.comment )) or removeParentNode('para') ]]
-
-
-
- [[ (o.payment_term and o.payment_term.note and format(o.payment_term and o.payment_term.note)) or removeParentNode('para') ]]
-
-
-
-
-
-
- Fiscal Position Remark :
-
-
- [[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('blockTable') ]]
-
-
-
-
-
-
-
-
diff --git a/addons/report_intrastat/test/report_intrastat_report.yml b/addons/report_intrastat/test/report_intrastat_report.yml
index 687f605b901..5c70ba67ef2 100644
--- a/addons/report_intrastat/test/report_intrastat_report.yml
+++ b/addons/report_intrastat/test/report_intrastat_report.yml
@@ -16,6 +16,6 @@
import os
import openerp.report
from openerp import tools
- data, format = openerp.report.render_report(cr, uid, [ref('test_invoice_1')], 'account.invoice.intrastat', {}, {})
+ data, format = openerp.report.render_report(cr, uid, [ref('test_invoice_1')], 'report_intrastat.report_intrastatinvoice', {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'report_intrastat-intrastat_report.'+format), 'wb+').write(data)
diff --git a/addons/report_intrastat/views/report_intrastatinvoice.xml b/addons/report_intrastat/views/report_intrastatinvoice.xml
new file mode 100644
index 00000000000..c534f808c95
--- /dev/null
+++ b/addons/report_intrastat/views/report_intrastatinvoice.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index bb5bac89e46..1684760debf 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -59,7 +59,7 @@ The Dashboard for the Sales Manager will include
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
- 'depends': ['account_voucher'],
+ 'depends': ['account_voucher', 'report'],
'data': [
'wizard/sale_make_invoice_advance.xml',
'wizard/sale_line_invoice.xml',
diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml
index c6f237e3ac3..c23e680e664 100644
--- a/addons/sale/views/report_saleorder.xml
+++ b/addons/sale/views/report_saleorder.xml
@@ -1,131 +1,135 @@
+
+
+
+
+
-
-
-
+
+
diff --git a/addons/sale_layout/__init__.py b/addons/sale_layout/__init__.py
new file mode 100644
index 00000000000..bff786c0885
--- /dev/null
+++ b/addons/sale_layout/__init__.py
@@ -0,0 +1 @@
+import models
diff --git a/addons/account/report/account_print_invoice.py b/addons/sale_layout/__openerp__.py
similarity index 51%
rename from addons/account/report/account_print_invoice.py
rename to addons/sale_layout/__openerp__.py
index 75680810254..b8fcefc6adc 100644
--- a/addons/account/report/account_print_invoice.py
+++ b/addons/sale_layout/__openerp__.py
@@ -2,7 +2,7 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
+# Copyright (C) 2014-Today OpenERP SA ().
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -19,19 +19,26 @@
#
##############################################################################
-import time
-from openerp.report import report_sxw
-
-class account_invoice(report_sxw.rml_parse):
- def __init__(self, cr, uid, name, context):
- super(account_invoice, self).__init__(cr, uid, name, context=context)
- self.localcontext.update({
- 'time': time,
- })
-report_sxw.report_sxw(
- 'report.account.invoice',
- 'account.invoice',
- 'addons/account/report/account_print_invoice.rml',
- parser=account_invoice
-)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+{
+ 'name': 'Sale Layout',
+ 'version': '1.0',
+ 'sequence': 14,
+ 'summary': 'Sale Layout, page-break, subtotals, separators, report',
+ 'description': """
+Manage your sales reports
+=========================
+With this module you can personnalize the sale order and invoice report with
+separators, page-breaks or subtotals.
+ """,
+ 'author': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ['sale', 'report'],
+ 'category': 'Sale',
+ 'data': ['views/sale_layout_category_view.xml',
+ 'views/report_invoice_layouted.xml',
+ 'views/report_quotation_layouted.xml',
+ 'views/sale_layout_template.xml',
+ 'security/ir.model.access.csv'],
+ 'demo': ['data/sale_layout_category_data.xml'],
+ 'installable': True,
+}
diff --git a/addons/sale_layout/data/sale_layout_category_data.xml b/addons/sale_layout/data/sale_layout_category_data.xml
new file mode 100644
index 00000000000..858654e427f
--- /dev/null
+++ b/addons/sale_layout/data/sale_layout_category_data.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ Services
+ 1
+
+
+
+ Material
+ 10
+
+
+
diff --git a/addons/sale_layout/models/__init__.py b/addons/sale_layout/models/__init__.py
new file mode 100644
index 00000000000..9e9b002e402
--- /dev/null
+++ b/addons/sale_layout/models/__init__.py
@@ -0,0 +1 @@
+import sale_layout
diff --git a/addons/sale_layout/models/sale_layout.py b/addons/sale_layout/models/sale_layout.py
new file mode 100644
index 00000000000..ac9d4241607
--- /dev/null
+++ b/addons/sale_layout/models/sale_layout.py
@@ -0,0 +1,146 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2014-Today OpenERP SA ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ]]>
+
+
+
+ ]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Invoice + PRO-FORMA + Draft Invoice + Cancelled Invoice + Refund + Supplier Refund + Supplier Invoice + +
+ +
+
+
+
+ Document:
+
+
+
+ Invoice Date:
+
+
+
+ Partner Ref.:
+
+
+ | Description | +Taxes | +Intrastat | +Weight | +Quantity | +Unit of measure | +Unit Price | +Discount (%) | +Amount | +
|---|---|---|---|---|---|---|---|---|
| + | + | + | + | + | + | + | + | + + | +
+
+
+
+
+
+
+ | Total Without Taxes | ++ + | +
| Taxes | ++ + | +
| Total | ++ + | +
+
+
+
+
+
+
+
+ | Tax | +Base | +Amount | +
|---|---|---|
| + | + + | ++ + | +
+ Comment: + +
++ Payment Term: + +
++ Fiscal Position: + +
+
+
+
+
+
+
+
+
+
+
+
+
+ Invoice and shipping address:
+Invoice address:
+ +VAT:
+
+
+ Shipping address :
+ +VAT:
+
+
+
+ + Order N° + Quotation N° + +
+ +
+
+
+
+ Your Reference:
+
+
+
+ Date Ordered:
+ Quotation Date:
+
+
+
+ Salesperson:
+
+
+
+ Payment Term:
+
+
+ | Description | +Taxes | +Quantity | +Unit Price | +Disc.(%) | +Price | +
|---|---|---|---|---|---|
| + + | ++ + | ++ + + | ++ + | ++ + | ++ + | +
+
+
+
+
+
+
+
+ | Total Without Taxes | ++ + | +
| Taxes | ++ + | +
| Total | ++ + | +
+ Payment Term: + +
+ +
-
-
-
-
-
-
-
-
-
-
-
- Invoice and shipping address:
-Invoice address:
- -VAT:
-
-
- Shipping address :
- -VAT:
-
-
-
- - Order N° - Quotation N° - -
- -
-
-
-
- Your Reference:
-
-
-
- Date Ordered:
- Quotation Date:
-
-
-
- Salesperson:
-
-
-
- Payment Term:
-
-
- | Description | -Taxes | -Quantity | -Unit Price | -Disc.(%) | -Price | -
|---|---|---|---|---|---|
| - - | -- - | -- - - | -- - | -- - | -- - | -
-
-
-
-
-
-
-
- | Total Without Taxes | -- - | -
| Taxes | -- - | -
| Total | -- - | -
- Payment Term: - -
- -+
| Description | +Quantity | +Unit of measure | +Unit Price | +Discount (%) | +Taxes | +Amount | +
|---|---|---|---|---|---|---|
| + + | ++ + | ++ + + | ++ + | ++ + | ++ + | +
+
| Description | +Taxes | +Quantity | +Unit Price | +Disc.(%) | +Price | +||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| •
+ |
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + Subtotal: + + | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + *** + | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||