Should create a multipart/mixed: from gmail,
bold, with attachment.
', res.get('body', ''),
'message_parse: html version should be in body after parsing multipart/mixed')
- @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+ # @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
def test_10_message_process(self):
""" Testing incoming emails processing. """
cr, uid, user_raoul = self.cr, self.uid, self.user_raoul
@@ -378,7 +378,7 @@ class TestMailgateway(TestMail):
frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
to='erroneous@example.com>', subject='Re: news',
- extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+ extra='In-Reply-To: <1198923581.41972151344608186799.JavaMail.diff1@agrolait.com>\n')
# Test: no group 'Re: news' created, still only 1 Frogs group
self.assertEqual(len(frog_groups), 0,
'message_process: reply on Frogs should not have created a new group with new subject')
@@ -387,16 +387,41 @@ class TestMailgateway(TestMail):
'message_process: reply on Frogs should not have created a duplicate group with old subject')
frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
# Test: one new message
- self.assertEqual(len(frog_group.message_ids), 3, 'message_process: group should contain 2 messages after reply')
+ self.assertEqual(len(frog_group.message_ids), 3, 'message_process: group should contain 3 messages after reply')
# Test: author (and not recipient) added as follower
frog_follower_ids = set([p.id for p in frog_group.message_follower_ids])
self.assertEqual(frog_follower_ids, set([p1id, p2id]),
'message_process: after reply, group should have 2 followers')
+ # Do: incoming email with ref holding model / res_id but that does not match any message in the thread: must raise since OpenERP saas-3
+ self.assertRaises(AssertionError,
+ format_and_process,
+ MAIL_TEMPLATE, email_from='other5@gmail.com',
+ to='noone@example.com', subject='spam',
+ extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>' % frog_group.id,
+ msg_id='<1.1.JavaMail.new@agrolait.com>')
+ # There are 6.1 messages, activate compat mode
+ tmp_msg_id = self.mail_message.create(cr, uid, {'message_id': False, 'model': 'mail.group', 'res_id': frog_group.id})
+ # Do: compat mode accepts partial-matching emails
+ frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other5@gmail.com',
+ msg_id='<1.2.JavaMail.new@agrolait.com>',
+ to='noone@example.com>', subject='spam',
+ extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>' % frog_group.id)
+ self.mail_message.unlink(cr, uid, [tmp_msg_id])
+ # Test: no group 'Re: news' created, still only 1 Frogs group
+ self.assertEqual(len(frog_groups), 0,
+ 'message_process: reply on Frogs should not have created a new group with new subject')
+ frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
+ self.assertEqual(len(frog_groups), 1,
+ 'message_process: reply on Frogs should not have created a duplicate group with old subject')
+ frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
+ # Test: one new message
+ self.assertEqual(len(frog_group.message_ids), 4, 'message_process: group should contain 4 messages after reply')
+
# Do: due to some issue, same email goes back into the mailgateway
frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
- subject='Re: news', extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+ subject='Re: news', extra='In-Reply-To: <1198923581.41972151344608186799.JavaMail.diff1@agrolait.com>\n')
# Test: no group 'Re: news' created, still only 1 Frogs group
self.assertEqual(len(frog_groups), 0,
'message_process: reply on Frogs should not have created a new group with new subject')
@@ -405,7 +430,7 @@ class TestMailgateway(TestMail):
'message_process: reply on Frogs should not have created a duplicate group with old subject')
frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
# Test: no new message
- self.assertEqual(len(frog_group.message_ids), 3, 'message_process: message with already existing message_id should not have been duplicated')
+ self.assertEqual(len(frog_group.message_ids), 4, 'message_process: message with already existing message_id should not have been duplicated')
# Test: message_id is still unique
msg_ids = self.mail_message.search(cr, uid, [('message_id', 'ilike', '<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>')])
self.assertEqual(len(msg_ids), 1,
@@ -422,7 +447,7 @@ class TestMailgateway(TestMail):
format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik
',
to='erroneous@example.com>', subject='Re: news (2)',
msg_id='<1198923581.41972151344608186760.JavaMail.new1@agrolait.com>',
- extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+ extra='In-Reply-To: <1198923581.41972151344608186799.JavaMail.diff1@agrolait.com>')
frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
# Test: author is A-Raoul (only existing)
@@ -436,7 +461,7 @@ class TestMailgateway(TestMail):
format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik ',
to='erroneous@example.com>', subject='Re: news (3)',
msg_id='<1198923581.41972151344608186760.JavaMail.new2@agrolait.com>',
- extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+ extra='In-Reply-To: <1198923581.41972151344608186799.JavaMail.diff1@agrolait.com>')
frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
# Test: author is Raoul (user), not A-Raoul
@@ -451,7 +476,7 @@ class TestMailgateway(TestMail):
format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik ',
to='erroneous@example.com>', subject='Re: news (3)',
msg_id='<1198923581.41972151344608186760.JavaMail.new3@agrolait.com>',
- extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+ extra='In-Reply-To: <1198923581.41972151344608186799.JavaMail.diff1@agrolait.com>')
frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
# Test: author is Raoul (user), not A-Raoul
@@ -498,7 +523,7 @@ class TestMailgateway(TestMail):
self.assertIn('\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n
', msg.body,
'message_process: plaintext incoming email incorrectly parsed')
- @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+ # @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
def test_20_thread_parent_resolution(self):
""" Testing parent/child relationships are correctly established when processing incoming mails """
cr, uid = self.cr, self.uid
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 750ae12995f..2da55bcb081 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -13,6 +13,7 @@
${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}
+ ${object.partner_id.lang}
@@ -102,6 +103,7 @@
Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}
+ ${object.partner_id.lang}
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 2368a9849de..88b4b14a36a 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -27,6 +27,7 @@ class sale_report(osv.osv):
_description = "Sales Orders Statistics"
_auto = False
_rec_name = 'date'
+
_columns = {
'date': fields.date('Date Order', readonly=True),
'date_confirm': fields.date('Date Confirm', readonly=True),
@@ -60,12 +61,9 @@ class sale_report(osv.osv):
}
_order = 'date desc'
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'sale_report')
- cr.execute("""
- create or replace view sale_report as (
- select
- min(l.id) as id,
+ def _select(self):
+ select_str = """
+ SELECT min(l.id) as id,
l.product_id as product_id,
t.uom_id as product_uom,
sum(l.product_uom_qty / u.factor * u2.factor) as product_uom_qty,
@@ -84,15 +82,23 @@ class sale_report(osv.osv):
t.categ_id as categ_id,
s.pricelist_id as pricelist_id,
s.project_id as analytic_account_id
- from
- sale_order_line l
+ """
+ return select_str
+
+ def _from(self):
+ from_str = """
+ sale_order_line l
join sale_order s on (l.order_id=s.id)
left join product_product p on (l.product_id=p.id)
left join product_template t on (p.product_tmpl_id=t.id)
left join product_uom u on (u.id=l.product_uom)
left join product_uom u2 on (u2.id=t.uom_id)
- group by
- l.product_id,
+ """
+ return from_str
+
+ def _group_by(self):
+ group_by_str = """
+ GROUP BY l.product_id,
l.order_id,
t.uom_id,
t.categ_id,
@@ -104,7 +110,16 @@ class sale_report(osv.osv):
s.state,
s.pricelist_id,
s.project_id
- )
- """)
+ """
+ return group_by_str
+
+ def init(self, cr):
+ # self._table = sale_report
+ tools.drop_view_if_exists(cr, self._table)
+ cr.execute("""CREATE or REPLACE VIEW %s as (
+ %s
+ FROM ( %s )
+ %s
+ )""" % (self._table, self._select(), self._from(), self._group_by()))
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 69e9cc5e119..28a6f83936a 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -47,10 +47,8 @@
-
-
-
-
+
+
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 557562275d7..c34f29fc81b 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -78,6 +78,13 @@
['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+ Sales Order Analysis multi-company
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+
@@ -93,6 +100,19 @@
+
+ Personal Orders Analysis
+
+ ['|',('user_id','=',user.id),('user_id','=',False)]
+
+
+
+
+ All Orders Analysis
+
+ [(1,'=',1)]
+
+
Personal Order Lines
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 7a57484eab8..9c227e39430 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -46,6 +46,7 @@ modules.
'security/sale_crm_security.xml',
'security/ir.model.access.csv',
'report/sale_crm_account_invoice_report_view.xml',
+ 'report/sale_report_view.xml',
],
'js': [
'static/src/js/sale_crm.js',
diff --git a/addons/sale_crm/report/__init__.py b/addons/sale_crm/report/__init__.py
index d7c6d373468..d86b3e66de9 100644
--- a/addons/sale_crm/report/__init__.py
+++ b/addons/sale_crm/report/__init__.py
@@ -20,6 +20,7 @@
##############################################################################
import sales_crm_account_invoice_report
+import sale_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/report/sale_report.py b/addons/sale_crm/report/sale_report.py
new file mode 100644
index 00000000000..eca020f82ad
--- /dev/null
+++ b/addons/sale_crm/report/sale_report.py
@@ -0,0 +1,18 @@
+ # -*- coding: utf-8 -*-
+
+from openerp.osv import fields, osv
+
+
+class sale_report(osv.osv):
+ _inherit = "sale.report"
+ _columns = {
+ 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+ }
+
+ def _select(self):
+ return super(sale_report, self)._select() + ", s.section_id as section_id"
+
+ def _group_by(self):
+ return super(sale_report, self)._group_by() + ", s.section_id"
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/report/sale_report_view.xml b/addons/sale_crm/report/sale_report_view.xml
new file mode 100644
index 00000000000..0d8243c1275
--- /dev/null
+++ b/addons/sale_crm/report/sale_report_view.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ sale.report.tree.sale.crm
+ sale.report
+
+
+
+
+
+
+
+
+
+ sale.report.search.sale.crm
+ sale.report
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index e5695daab09..f1370841fe9 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -53,10 +53,10 @@ class crm_case_section(osv.osv):
date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
for id in ids:
res[id] = dict()
- created_domain = [('section_id', '=', id), ('state', 'in', ['draft', 'sent']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
+ created_domain = [('section_id', '=', id), ('state', '=', ['draft']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
- validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent']), ('date_confirm', '>=', date_begin), ('date_order', '<=', date_end)]
- res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_confirm'], 'amount_total', 'date_confirm', context=context)
+ validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent', 'cancel']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
+ res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
return res
def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
@@ -90,7 +90,7 @@ class crm_case_section(osv.osv):
}
def action_forecast(self, cr, uid, id, value, context=None):
- return self.write(cr, uid, [id], {'invoiced_forecast': value}, context=context)
+ return self.write(cr, uid, [id], {'invoiced_forecast': round(float(value))}, context=context)
class res_users(osv.Model):
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 8c008339903..8c3c98c3f97 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -211,6 +211,36 @@
+
+ Quotations Analysis
+ sale.report
+ form
+ tree,graph
+ [('state','=','draft'),('section_id', '=', active_id)]
+ {'search_default_order_month':1}
+ This report performs analysis on your quotations. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.
+
+
+
+ Sales Analysis
+ sale.report
+ form
+ tree,graph
+ [('state','not in',('draft','sent','cancel')),('section_id', '=', active_id)]
+ {'search_default_order_month':1}
+ This report performs analysis on your sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.
+
+
+
+ Invoices Analysis
+ account.invoice.report
+ form
+ tree,graph
+ [('section_id', '=', active_id),('state', 'not in', ['draft', 'cancel'])]
+ {'search_default_month':1}
+ From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.
+
+
crm.case.section.form
crm.case.section
@@ -241,9 +271,9 @@
@@ -251,27 +281,29 @@
-
+
- Invoiced
- Forecast
+ Invoiced
+ Forecast
-
+
Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py
index bdcce410a5f..7a8234fa7fa 100644
--- a/addons/sale_stock/report/sale_report.py
+++ b/addons/sale_stock/report/sale_report.py
@@ -39,59 +39,11 @@ class sale_report(osv.osv):
('cancel', 'Cancelled')
], 'Order Status', readonly=True),
}
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'sale_report')
- # TODO: make parent view extensible similarly to invoice analysis and
- # remove the duplication
- cr.execute("""
- create or replace view sale_report as (
- select
- min(l.id) as id,
- l.product_id as product_id,
- t.uom_id as product_uom,
- sum(l.product_uom_qty / u.factor * u2.factor) as product_uom_qty,
- sum(l.product_uom_qty * l.price_unit * (100.0-l.discount) / 100.0) as price_total,
- count(*) as nbr,
- s.date_order as date,
- s.date_confirm as date_confirm,
- to_char(s.date_order, 'YYYY') as year,
- to_char(s.date_order, 'MM') as month,
- to_char(s.date_order, 'YYYY-MM-DD') as day,
- s.partner_id as partner_id,
- s.user_id as user_id,
- s.company_id as company_id,
- s.warehouse_id as warehouse_id,
- extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay,
- s.state,
- t.categ_id as categ_id,
- s.shipped,
- s.shipped::integer as shipped_qty_1,
- s.pricelist_id as pricelist_id,
- s.project_id as analytic_account_id
- from
- sale_order_line l
- join sale_order s on (l.order_id=s.id)
- left join product_product p on (l.product_id=p.id)
- left join product_template t on (p.product_tmpl_id=t.id)
- left join product_uom u on (u.id=l.product_uom)
- left join product_uom u2 on (u2.id=t.uom_id)
- group by
- l.product_id,
- l.order_id,
- t.uom_id,
- t.categ_id,
- s.date_order,
- s.date_confirm,
- s.partner_id,
- s.user_id,
- s.warehouse_id,
- s.company_id,
- s.state,
- s.shipped,
- s.pricelist_id,
- s.project_id
- )
- """)
+
+ def _select(self):
+ return super(sale_report, self)._select() + ", s.warehouse_id as warehouse_id, s.shipped, s.shipped::integer as shipped_qty_1"
+
+ def _group_by(self):
+ return super(sale_report, self)._group_by() + ", s.warehouse_id, s.shipped"
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml
index 6642bffcede..486cf3a7b11 100644
--- a/addons/sale_stock/report/sale_report_view.xml
+++ b/addons/sale_stock/report/sale_report_view.xml
@@ -17,6 +17,10 @@
sale.report
+
+
+
+
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 341aaef8ca8..26d9d80f13e 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -70,7 +70,7 @@ class sale_order(osv.osv):
company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', company_id)], context=context)
if not warehouse_ids:
- raise osv.except_osv(_('Error!'), _('There is no warehouse defined for current company.'))
+ return False
return warehouse_ids[0]
# This is False