- 
+ 
+ 
- .png)
-
- 
+
+
+
+
+ +
No blog post yet.
+ ++ Click on "Content" on the top menu to write your first blog post. +
+
+
+
+
+
+ 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:
+
+ +
+
+
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index cc661f2bf7f..859e676c68f 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -29,7 +29,7 @@
'sequence': 18,
'summary': 'Manufacturing Orders, Bill of Materials, Routing',
'images': ['images/bill_of_materials.jpeg', 'images/manufacturing_order.jpeg', 'images/planning_manufacturing_order.jpeg', 'images/manufacturing_analysis.jpeg', 'images/production_dashboard.jpeg','images/routings.jpeg','images/work_centers.jpeg'],
- 'depends': ['product','procurement', 'stock', 'resource', 'purchase','process'],
+ 'depends': ['product','procurement', 'stock', 'resource', 'purchase','process', 'report'],
'description': """
Manage the Manufacturing process in OpenERP
===========================================
diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py
index 98949ed75dc..1b286feac46 100644
--- a/addons/mrp/report/bom_structure.py
+++ b/addons/mrp/report/bom_structure.py
@@ -19,22 +19,18 @@
#
##############################################################################
+import time
from openerp.osv import osv
+from openerp.report import report_sxw
-class bom_structure(osv.AbstractModel):
- _name = 'report.mrp.report_mrpbomstructure'
-
- def render_html(self, cr, uid, ids, data=None, context=None):
- mrpbom_obj = self.pool['mrp.bom']
- report_obj = self.pool['report']
- docs = mrpbom_obj.browse(cr, uid, ids, context=context)
-
- docargs = {
- 'docs': docs,
- 'get_children': self.get_children,
- }
- return report_obj.render(cr, uid, [], 'mrp.report_mrpbomstructure', docargs, context=context)
+class bom_structure(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(bom_structure, self).__init__(cr, uid, name, context=context)
+ self.localcontext.update({
+ 'time': time,
+ 'get_children':self.get_children,
+ })
def get_children(self, object, level=0):
result = []
@@ -62,4 +58,11 @@ class bom_structure(osv.AbstractModel):
return children
+
+class report_lunchorder(osv.AbstractModel):
+ _name = 'report.mrp.report_mrpbomstructure'
+ _inherit = 'report.abstract_report'
+ _template = 'mpr.report_mrpbomstructure'
+ _wrapped_report_class = bom_structure
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/note/note.py b/addons/note/note.py
index 7f03f43b36a..38b2395a852 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -116,7 +116,7 @@ class note_note(osv.osv):
}
_order = 'sequence'
- def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
+ def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False, lazy=True):
if groupby and groupby[0]=="stage_id":
#search all stages
@@ -169,7 +169,7 @@ class note_note(osv.osv):
else:
return super(note_note, self).read_group(self, cr, uid, domain, fields, groupby,
- offset=offset, limit=limit, context=context, orderby=orderby)
+ offset=offset, limit=limit, context=context, orderby=orderby,lazy=lazy)
#upgrade config setting page to configure pad, fancy and tags mode
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index d3a6394ee5d..cf6768e0f1f 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -13,6 +13,7 @@ openerp.pad = function(instance) {
event.preventDefault();
self.set("configured", true);
});
+ this.pad_loading_request = null;
},
initialize_content: function() {
var self = this;
@@ -30,14 +31,14 @@ openerp.pad = function(instance) {
},
render_value: function() {
var self = this;
- this._configured_deferred.always(function() {
+ $.when(this._configured_deferred, this.pad_loading_request).always(function() {
if (! self.get('configured')) {
return;
};
var value = self.get('value');
if (self.get('effective_readonly')) {
if (_.str.startsWith(value, 'http')) {
- this.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) {
+ self.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) {
self.$('.oe_pad_content').removeClass('oe_pad_loading').html('/', type='http', auth='user', website=True, multilang=True)
- def report_html(self, reportname, docids):
- cr, uid, context = request.cr, request.uid, request.context
- docids = self._eval_params(docids)
- return request.registry['report'].get_html(cr, uid, docids, reportname, context=context)
-
- @route('/report/pdf/report//', type='http', auth="user", website=True)
- def report_pdf(self, reportname, docids):
- cr, uid, context = request.cr, request.uid, request.context
- docids = self._eval_params(docids)
- pdf = request.registry['report'].get_pdf(cr, uid, docids, reportname, context=context)
- pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
- return request.make_response(pdf, headers=pdfhttpheaders)
-
- #------------------------------------------------------
- # Particular reports controller
- #------------------------------------------------------
- @route('/report/', type='http', auth='user', website=True, multilang=True)
- def report_html_particular(self, reportname, **data):
- cr, uid, context = request.cr, request.uid, request.context
+ @route([
+ '/report//',
+ '/report///',
+ ], type='http', auth='user', website=True, multilang=True)
+ def report_routes(self, reportname, docids=None, converter=None, **data):
report_obj = request.registry['report']
- data = self._eval_params(data) # Sanitizing
- return report_obj.get_html(cr, uid, [], reportname, data=data, context=context)
-
- @route('/report/pdf/report/', type='http', auth='user', website=True, multilang=True)
- def report_pdf_particular(self, reportname, **data):
cr, uid, context = request.cr, request.uid, request.context
- report_obj = request.registry['report']
- data = self._eval_params(data) # Sanitizing
- pdf = report_obj.get_pdf(cr, uid, [], reportname, data=data, context=context)
- pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
- return request.make_response(pdf, headers=pdfhttpheaders)
+
+ if docids:
+ docids = [int(i) for i in docids.split(',')]
+ options_data = None
+ if data.get('options'):
+ options_data = simplejson.loads(data['options'])
+ if data.get('context'):
+ context.update(simplejson.loads(data['context']))
+
+ if converter == 'html':
+ html = report_obj.get_html(cr, uid, docids, reportname, data=options_data, context=context)
+ return request.make_response(html)
+ elif converter == 'pdf':
+ pdf = report_obj.get_pdf(cr, uid, docids, reportname, data=options_data, context=context)
+ pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
+ return request.make_response(pdf, headers=pdfhttpheaders)
+ else:
+ raise exceptions.HTTPException(description='Converter %s not implemented.' % converter)
#------------------------------------------------------
# Misc. route utils
@@ -94,7 +89,7 @@ class ReportController(Controller):
@route(['/report/download'], type='http', auth="user", website=True)
def report_download(self, data, token):
"""This function is used by 'qwebactionmanager.js' in order to trigger the download of
- a pdf report.
+ a pdf/controller report.
:param data: a javascript array JSON.stringified containg report internal url ([0]) and
type [1]
@@ -102,26 +97,26 @@ class ReportController(Controller):
"""
requestcontent = simplejson.loads(data)
url, type = requestcontent[0], requestcontent[1]
- if type == 'qweb-pdf':
- reportname = url.split('/report/pdf/report/')[1].split('?')[0].split('/')[0]
- if '?' not in url:
+ if type == 'qweb-pdf':
+ reportname = url.split('/report/pdf/')[1].split('?')[0]
+
+ docids = None
+ if '/' in reportname:
+ reportname, docids = reportname.split('/')
+
+ if docids:
# Generic report:
- docids = url.split('/')[-1]
- response = self.report_pdf(reportname, docids)
+ response = self.report_routes(reportname, docids=docids, converter='pdf')
else:
# Particular report:
- querystring = url.split('?')[1]
- querystring = dict(urlparse.parse_qsl(querystring))
- response = self.report_pdf_particular(reportname, **querystring)
+ data = url_decode(url.split('?')[1]).items() # decoding the args represented in JSON
+ response = self.report_routes(reportname, converter='pdf', **dict(data))
response.headers.add('Content-Disposition', 'attachment; filename=%s.pdf;' % reportname)
response.set_cookie('fileToken', token)
return response
elif type =='controller':
- from werkzeug.test import Client
- from werkzeug.wrappers import BaseResponse
- from werkzeug.datastructures import Headers
reqheaders = Headers(request.httprequest.headers)
response = Client(request.httprequest.app, BaseResponse).get(url, headers=reqheaders, follow_redirects=True)
response.set_cookie('fileToken', token)
@@ -132,28 +127,3 @@ class ReportController(Controller):
@route(['/report/check_wkhtmltopdf'], type='json', auth="user")
def check_wkhtmltopdf(self):
return request.registry['report']._check_wkhtmltopdf()
-
- def _eval_params(self, param):
- """Parse a dict generated by the webclient (javascript) into a python dict.
- """
- if isinstance(param, dict):
- for key, value in param.iteritems():
- if value.lower() == 'false':
- param[key] = False
- elif value.lower() == 'true':
- param[key] = True
- elif ',' in value:
- param[key] = [int(i) for i in value.split(',')]
- else:
- try:
- param[key] = int(value)
- except (ValueError, TypeError):
- pass
- else:
- if isinstance(param, (str, unicode)):
- param = [int(i) for i in param.split(',')]
- if isinstance(param, list):
- param = list(set(param))
- if isinstance(param, int):
- param = [param]
- return param
diff --git a/addons/report/models/__init__.py b/addons/report/models/__init__.py
index e048e10eb91..d21f03e5bcb 100644
--- a/addons/report/models/__init__.py
+++ b/addons/report/models/__init__.py
@@ -1,2 +1,3 @@
import report
import report_paperformat
+import abstract_report
diff --git a/addons/report/models/abstract_report.py b/addons/report/models/abstract_report.py
new file mode 100644
index 00000000000..2da32b6c0f6
--- /dev/null
+++ b/addons/report/models/abstract_report.py
@@ -0,0 +1,65 @@
+# -*- 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
-
:param doc_id: id of the record to translate
:param model: model of the record to translate
- :param template: name of the template to translate into the partner's lang
+ :param lang_field': field of the record containing the lang
+ :param template: name of the template to translate into the lang_field
"""
ctx = context.copy()
doc = self.pool[model].browse(cr, uid, doc_id, context=ctx)
@@ -205,26 +123,28 @@ class Report(osv.Model):
if ctx.get('translatable') is True:
qcontext['o'] = doc
else:
- ctx['lang'] = doc.partner_id.lang
+ # Reach the lang we want to translate the doc into
+ ctx['lang'] = eval('doc.%s' % lang_field, {'doc': doc})
qcontext['o'] = self.pool[model].browse(cr, uid, doc_id, context=ctx)
return view_obj.render(cr, uid, template, qcontext, context=ctx)
+ user = self.pool['res.users'].browse(cr, uid, uid)
+ website = None
+ if request and hasattr(request, 'website'):
+ website = request.website
values.update({
'time': time,
- 'formatLang': partial(self.formatLang, cr=cr, uid=uid),
- 'get_digits': self._get_digits,
- 'render_doc': render_doc,
+ 'translate_doc': translate_doc,
'editable': True, # Will active inherit_branding
- 'res_company': self.pool['res.users'].browse(cr, uid, uid).company_id,
- 'website': False, # Will be overidden by ir.ui.view if the request has website enabled
+ 'user': user,
+ 'res_company': user.company_id,
+ 'website': website,
})
-
return view_obj.render(cr, uid, template, values, context=context)
#--------------------------------------------------------------------------
- # Main reports methods
+ # Main report methods
#--------------------------------------------------------------------------
-
def get_html(self, cr, uid, ids, report_name, data=None, context=None):
"""This method generates and returns html version of a report.
"""
@@ -233,7 +153,7 @@ class Report(osv.Model):
try:
report_model_name = 'report.%s' % report_name
particularreport_obj = self.pool[report_model_name]
- return particularreport_obj.render_html(cr, uid, ids, data={'form': data}, context=context)
+ return particularreport_obj.render_html(cr, uid, ids, data=data, context=context)
except KeyError:
report = self._get_report_from_name(cr, uid, report_name)
report_obj = self.pool[report.model]
@@ -254,15 +174,122 @@ class Report(osv.Model):
if html is None:
html = self.get_html(cr, uid, ids, report_name, data=data, context=context)
- html = html.decode('utf-8')
+ html = html.decode('utf-8') # Ensure the current document is utf-8 encoded.
# Get the ir.actions.report.xml record we are working on.
report = self._get_report_from_name(cr, uid, report_name)
+ # Check if we have to save the report or if we have to get one from the db.
+ save_in_attachment = self._check_attachment_use(cr, uid, ids, report)
+ # Get the paperformat associated to the report, otherwise fallback on the company one.
+ if not report.paperformat_id:
+ user = self.pool['res.users'].browse(cr, uid, uid)
+ paperformat = user.company_id.paperformat_id
+ else:
+ paperformat = report.paperformat_id
- # Check attachment_use field. If set to true and an existing pdf is already saved, load
- # this one now. Else, mark save it.
+ # Preparing the minimal html pages
+ subst = " "
+ css = '' # Will contain local css
+ headerhtml = []
+ contenthtml = []
+ footerhtml = []
+ base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
+
+ # The received html report must be simplified. We convert it in a xml tree
+ # in order to extract headers, bodies and footers.
+ try:
+ root = lxml.html.fromstring(html)
+
+ for node in root.xpath("//html/head/style"):
+ css += node.text
+
+ for node in root.xpath("//div[@class='header']"):
+ body = lxml.html.tostring(node)
+ header = self.MINIMAL_HTML_PAGE.format(css=css, subst=subst, body=body, base_url=base_url)
+ headerhtml.append(header)
+
+ for node in root.xpath("//div[@class='footer']"):
+ body = lxml.html.tostring(node)
+ footer = self.MINIMAL_HTML_PAGE.format(css=css, subst=subst, body=body, base_url=base_url)
+ footerhtml.append(footer)
+
+ for node in root.xpath("//div[@class='page']"):
+ # Previously, we marked some reports to be saved in attachment via their ids, so we
+ # must set a relation between report ids and report's content. We use the QWeb
+ # branding in order to do so: searching after a node having a data-oe-model
+ # attribute with the value of the current report model and read its oe-id attribute
+ oemodelnode = node.find(".//*[@data-oe-model='%s']" % report.model)
+ if oemodelnode is not None:
+ reportid = oemodelnode.get('data-oe-id')
+ if reportid:
+ reportid = int(reportid)
+ else:
+ reportid = False
+
+ body = lxml.html.tostring(node)
+ reportcontent = self.MINIMAL_HTML_PAGE.format(css=css, subst='', body=body, base_url=base_url)
+
+ # FIXME: imo the best way to extract record id from html reports is by using the
+ # qweb branding. As website editor is not yet splitted in a module independant from
+ # website, when we print a unique report we can use the id passed in argument to
+ # identify it.
+ if ids and len(ids) == 1:
+ reportid = ids[0]
+
+ contenthtml.append(tuple([reportid, reportcontent]))
+
+ except lxml.etree.XMLSyntaxError:
+ contenthtml = []
+ contenthtml.append(html)
+ save_in_attachment = {} # Don't save this potentially malformed document
+
+ # Get paperformat arguments set in the root html tag. They are prioritized over
+ # paperformat-record arguments.
+ specific_paperformat_args = {}
+ for attribute in root.items():
+ if attribute[0].startswith('data-report-'):
+ specific_paperformat_args[attribute[0]] = attribute[1]
+
+ # Run wkhtmltopdf process
+ pdf = self._generate_wkhtml_pdf(
+ cr, uid, headerhtml, footerhtml, contenthtml, context.get('landscape'),
+ paperformat, specific_paperformat_args, save_in_attachment
+ )
+ return pdf
+
+ def get_action(self, cr, uid, ids, report_name, data=None, context=None):
+ """Return an action of type ir.actions.report.xml.
+
+ :param report_name: Name of the template to generate an action for
+ """
+ if context is None:
+ context = {}
+
+ report_obj = self.pool['ir.actions.report.xml']
+ idreport = report_obj.search(cr, uid, [('report_name', '=', report_name)], context=context)
+ try:
+ report = report_obj.browse(cr, uid, idreport[0], context=context)
+ except IndexError:
+ raise osv.except_osv(_('Bad Report'), _('This report is not loaded into the database.'))
+
+ action = {
+ 'context': context,
+ 'data': data,
+ 'type': 'ir.actions.report.xml',
+ 'report_name': report.report_name,
+ 'report_type': report.report_type,
+ 'report_file': report.report_file,
+ }
+ return action
+
+ #--------------------------------------------------------------------------
+ # Report generation helpers
+ #--------------------------------------------------------------------------
+ def _check_attachment_use(self, cr, uid, ids, report):
+ """ Check attachment_use field. If set to true and an existing pdf is already saved, load
+ this one now. Else, mark save it.
+ """
save_in_attachment = {}
-
if report.attachment_use is True:
save_in_attachment['model'] = report.model
save_in_attachment['loaded_documents'] = {}
@@ -287,132 +314,8 @@ class Report(osv.Model):
_logger.info('The PDF document %s was loaded from the database' % filename)
else:
# Mark current document to be saved
- save_in_attachment[id] = filename
-
- # Get the paperformat associated to the report, otherwise fallback on the company one.
- if not report.paperformat_id:
- user = self.pool['res.users'].browse(cr, uid, uid)
- paperformat = user.company_id.paperformat_id
- else:
- paperformat = report.paperformat_id
-
- # Preparing the minimal html pages
- #subst = self._get_url_content('/report/static/src/js/subst.js')[0] # Used in age numbering
- subst = " "
- css = '' # Will contain local css
-
- headerhtml = []
- contenthtml = []
- footerhtml = []
- base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
-
- minimalhtml = """
-
\ 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 ().
+#
+# 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
-
+
-
+
+
+
+
+
Followers
@@ -42,8 +48,12 @@| - | + | + + | ++ + |
');
self.$('.oe_pad_readonly').html(data);
}).fail(function() {
diff --git a/addons/payment/__openerp__.py b/addons/payment/__openerp__.py
index bc5d3896ac2..c192bec7c1b 100644
--- a/addons/payment/__openerp__.py
+++ b/addons/payment/__openerp__.py
@@ -7,11 +7,12 @@
'version': '1.0',
'description': """Payment Acquirer Base Module""",
'author': 'OpenERP SA',
- 'depends': ['mail', 'account'],
+ 'depends': ['account'],
'data': [
'views/payment_acquirer.xml',
'views/res_config_view.xml',
'security/ir.model.access.csv',
],
'installable': True,
+ 'auto_install': True,
}
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index d82fa94c132..b86a799e19c 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -59,7 +59,7 @@ class procurement_order(osv.osv):
context = {}
try:
if use_new_cursor:
- cr = openerp.registry(use_new_cursor).db.cursor()
+ cr = openerp.registry(use_new_cursor).cursor()
procurement_obj = self.pool.get('procurement.order')
if not skip_exception:
@@ -199,7 +199,7 @@ class procurement_order(osv.osv):
if context is None:
context = {}
if use_new_cursor:
- cr = openerp.registry(use_new_cursor).db.cursor()
+ cr = openerp.registry(use_new_cursor).cursor()
orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
procurement_obj = self.pool.get('procurement.order')
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index afc8e2a721f..c8d41c5c655 100644
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -49,7 +49,7 @@ class procurement_compute(osv.osv_memory):
"""
proc_obj = self.pool.get('procurement.order')
#As this function is in a new thread, I need to open a new cursor, because the old one may be closed
- new_cr = self.pool.db.cursor()
+ new_cr = self.pool.cursor()
for proc in self.browse(new_cr, uid, ids, context=context):
proc_obj._procure_orderpoint_confirm(new_cr, uid, automatic=proc.automatic, use_new_cursor=new_cr.dbname, context=context)
#close the new cursor
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index aab9657ae5d..c0f1cfcc2df 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -45,7 +45,7 @@ class procurement_compute_all(osv.osv_memory):
"""
proc_obj = self.pool.get('procurement.order')
#As this function is in a new thread, i need to open a new cursor, because the old one may be closed
- new_cr = self.pool.db.cursor()
+ new_cr = self.pool.cursor()
for proc in self.browse(new_cr, uid, ids, context=context):
proc_obj.run_scheduler(new_cr, uid, automatic=proc.automatic, use_new_cursor=new_cr.dbname,\
context=context)
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 4946a71f80b..c547a611cd4 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -118,6 +118,7 @@
\ 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: + + | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| + *** + | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
- on -
- -Read Next
+