diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 8fecf85ee0b..7a5ce9c0fb1 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -98,6 +98,24 @@ class account_invoice_report(osv.osv): } _order = 'date desc' + _depends = { + 'account.invoice': [ + 'account_id', 'amount_total', 'commercial_partner_id', 'company_id', + 'currency_id', 'date_due', 'date_invoice', 'fiscal_position', + 'journal_id', 'partner_bank_id', 'partner_id', 'payment_term', + 'period_id', 'residual', 'state', 'type', 'user_id', + ], + 'account.invoice.line': [ + 'account_id', 'invoice_id', 'price_subtotal', 'product_id', + 'quantity', 'uos_id', + ], + 'product.product': ['product_tmpl_id'], + 'product.template': ['categ_id'], + 'product.uom': ['category_id', 'factor', 'name', 'uom_type'], + 'res.currency.rate': ['currency_id', 'name'], + 'res.partner': ['country_id'], + } + def _select(self): select_str = """ SELECT sub.id, sub.date, sub.product_id, sub.partner_id, sub.country_id, diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 3b5819968a3..6015f7f4e05 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -700,7 +700,9 @@ class account_analytic_account(osv.osv): def _prepare_invoice_lines(self, cr, uid, contract, fiscal_position_id, context=None): fpos_obj = self.pool.get('account.fiscal.position') - fiscal_position = fpos_obj.browse(cr, uid, fiscal_position_id, context=context) + fiscal_position = None + if fiscal_position_id: + fiscal_position = fpos_obj.browse(cr, uid, fiscal_position_id, context=context) invoice_lines = [] for line in contract.recurring_invoice_line_ids: @@ -804,6 +806,12 @@ class account_analytic_account_summary_user(osv.osv): 'user': fields.many2one('res.users', 'User'), } + _depends = { + 'res.users': ['id'], + 'account.analytic.line': ['account_id', 'journal_id', 'unit_amount', 'user_id'], + 'account.analytic.journal': ['type'], + } + def init(self, cr): openerp.tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user') cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS ( @@ -837,6 +845,11 @@ class account_analytic_account_summary_month(osv.osv): 'month': fields.char('Month', size=32, readonly=True), } + _depends = { + 'account.analytic.line': ['account_id', 'date', 'journal_id', 'unit_amount'], + 'account.analytic.journal': ['type'], + } + def init(self, cr): openerp.tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month') cr.execute('CREATE VIEW account_analytic_analysis_summary_month AS (' \ diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index 83100723edb..550ca753059 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -42,6 +42,14 @@ class account_followup_stat_by_partner(osv.osv): 'company_id': fields.many2one('res.company', 'Company', readonly=True), } + _depends = { + 'account.move.line': [ + 'account_id', 'company_id', 'credit', 'date', 'debit', + 'followup_date', 'followup_line_id', 'partner_id', 'reconcile_id', + ], + 'account.account': ['active', 'type'], + } + def init(self, cr): tools.drop_view_if_exists(cr, 'account_followup_stat_by_partner') # Here we don't have other choice but to create a virtual ID based on the concatenation diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py index 872d0390303..1cd494b845f 100644 --- a/addons/crm/__init__.py +++ b/addons/crm/__init__.py @@ -24,6 +24,7 @@ import crm_segmentation import crm_lead import sales_team import calendar_event +import ir_http import crm_phonecall import report import wizard diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 88933aaf2b9..20d025fd64d 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -19,13 +19,8 @@ # ############################################################################## -import calendar -from datetime import date, datetime -from dateutil import relativedelta - -from openerp import tools -from openerp.osv import fields -from openerp.osv import osv +from openerp.osv import osv, fields +from openerp.http import request AVAILABLE_PRIORITIES = [ ('0', 'Very Low'), @@ -35,8 +30,10 @@ AVAILABLE_PRIORITIES = [ ('4', 'Very High'), ] -class crm_case_channel(osv.osv): - _name = "crm.case.channel" + +class crm_tracking_medium(osv.Model): + # OLD crm.case.channel + _name = "crm.tracking.medium" _description = "Channels" _order = 'name' _columns = { @@ -47,6 +44,67 @@ class crm_case_channel(osv.osv): 'active': lambda *a: 1, } + +class crm_tracking_campaign(osv.Model): + # OLD crm.case.resource.type + _name = "crm.tracking.campaign" + _description = "Campaign" + _rec_name = "name" + _columns = { + 'name': fields.char('Campaign Name', required=True, translate=True), + 'section_id': fields.many2one('crm.case.section', 'Sales Team'), + } + + +class crm_tracking_source(osv.Model): + _name = "crm.tracking.source" + _description = "Source" + _rec_name = "name" + _columns = { + 'name': fields.char('Source Name', required=True, translate=True), + } + + +class crm_tracking_mixin(osv.AbstractModel): + """Mixin class for objects which can be tracked by marketing. """ + _name = 'crm.tracking.mixin' + + _columns = { + 'campaign_id': fields.many2one('crm.tracking.campaign', 'Campaign', # old domain ="['|',('section_id','=',section_id),('section_id','=',False)]" + help="This is a name that helps you keep track of your different campaign efforts Example: Fall_Drive, Christmas_Special"), + 'source_id': fields.many2one('crm.tracking.source', 'Source', help="This is the source of the link Example: Search Engine, another domain, or name of email list"), + 'medium_id': fields.many2one('crm.tracking.medium', 'Channel', help="This is the method of delivery. EX: Postcard, Email, or Banner Ad"), + } + + def tracking_fields(self): + return [('utm_campaign', 'campaign_id'), ('utm_source', 'source_id'), ('utm_medium', 'medium_id')] + + def tracking_get_values(self, cr, uid, vals, context=None): + for key, field in self.tracking_fields(): + column = self._all_columns[field].column + value = vals.get(field) or (request and request.session.get(key)) # params.get sould be always in session by the dispatch from ir_http + if column._type in ['many2one'] and isinstance(value, basestring): # if we receive a string for a many2one, we search / create the id + if value: + Model = self.pool[column._obj] + rel_id = Model.name_search(cr, uid, value, context=context) + if not rel_id: + rel_id = Model.create(cr, uid, {'name': value}, context=context) + vals[field] = rel_id + # Here the code for other cases that many2one + else: + vals[field] = value + return vals + + def _get_default_track(self, cr, uid, field, context=None): + return self.tracking_get_values(cr, uid, {}, context=context).get(field) + + _defaults = { + 'source_id': lambda self, cr, uid, ctx: self._get_default_track(cr, uid, 'source_id', ctx), + 'campaign_id': lambda self, cr, uid, ctx: self._get_default_track(cr, uid, 'campaign_id', ctx), + 'medium_id': lambda self, cr, uid, ctx: self._get_default_track(cr, uid, 'medium_id', ctx), + } + + class crm_case_stage(osv.osv): """ Model for case stages. This models the main stages of a document management flow. Main CRM objects (leads, opportunities, project @@ -106,16 +164,6 @@ class crm_case_categ(osv.osv): 'object_id' : _find_object_id } -class crm_case_resource_type(osv.osv): - """ Resource Type of case """ - _name = "crm.case.resource.type" - _description = "Campaign" - _rec_name = "name" - _columns = { - 'name': fields.char('Campaign Name', required=True, translate=True), - 'section_id': fields.many2one('crm.case.section', 'Sales Team'), - } - class crm_payment_mode(osv.osv): """ Payment Mode for Fund """ _name = "crm.payment.mode" diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml index a5a732747ab..c354e2d10c6 100644 --- a/addons/crm/crm_data.xml +++ b/addons/crm/crm_data.xml @@ -13,18 +13,35 @@ open - + + + + Search engine + + + Mailing Partner + + + Newsletter + + + + Website - + Phone - + Direct - + Email + + Banner Ad + + True diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 7d53c1d51eb..b82f5a4d41f 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -32,13 +32,14 @@ from openerp.tools.translate import _ CRM_LEAD_FIELDS_TO_MERGE = ['name', 'partner_id', - 'channel_id', + 'campaign_id', 'company_id', 'country_id', 'section_id', 'state_id', 'stage_id', - 'type_id', + 'medium_id', + 'source_id', 'user_id', 'title', 'city', @@ -67,7 +68,7 @@ class crm_lead(format_address, osv.osv): _name = "crm.lead" _description = "Lead/Opportunity" _order = "priority,date_action,id desc" - _inherit = ['mail.thread', 'ir.needaction_mixin'] + _inherit = ['mail.thread', 'ir.needaction_mixin', 'crm.tracking.mixin'] _track = { 'stage_id': { @@ -214,9 +215,6 @@ class crm_lead(format_address, osv.osv): 'write_date': fields.datetime('Update Date', readonly=True), 'categ_ids': fields.many2many('crm.case.categ', 'crm_lead_category_rel', 'lead_id', 'category_id', 'Tags', \ domain="['|', ('section_id', '=', section_id), ('section_id', '=', False), ('object_id.model', '=', 'crm.lead')]", help="Classify and analyze your lead/opportunity categories like: Training, Service"), - 'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \ - domain="['|',('section_id','=',section_id),('section_id','=',False)]", help="From which campaign (seminar, marketing campaign, mass mailing, ...) did this contact come from?"), - 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel (mail, direct, phone, ...)"), 'contact_name': fields.char('Contact Name', size=64), 'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner company that will be created while converting the lead into opportunity', select=1), 'opt_out': fields.boolean('Opt-Out', oldname='optout', diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml index 9ea859937a2..4d5e1982306 100644 --- a/addons/crm/crm_lead_data.xml +++ b/addons/crm/crm_lead_data.xml @@ -68,39 +68,6 @@ (4, ref('stage_lead7'))]"/> - - - Telesales - - - - Email Campaign - Services - - - - Email Campaign - Products - - - - Twitter Ads - - - - Google Adwords - - - - Banner Ads - - - - Television - - - - Newsletter - - diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index 8acefd5c610..f5b38f8078b 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -16,9 +16,7 @@ Paris 93190 +33 1 25 54 45 69 - - 1 @@ -51,9 +49,7 @@ Could you please send me the details ? Purchase Manager Bordeaux - - 1 @@ -80,9 +76,7 @@ Could you please send me the details ? New-York - - 2 @@ -101,9 +95,7 @@ Could you please send me the details ? Drury - - 2 @@ -126,9 +118,7 @@ Could you please send me the details ? Franklinville NJ 08322 +1 813 494 5005 - - 2 @@ -153,9 +143,7 @@ Contact: +1 813 494 5005 Consultant Roma - - 2 @@ -171,9 +159,7 @@ Contact: +1 813 494 5005 Journalist Kiev - - 0 @@ -190,9 +176,7 @@ Contact: +1 813 494 5005 Sales Cambridge - - 1 @@ -209,9 +193,7 @@ Contact: +1 813 494 5005 Sales Oxford - - 2 @@ -227,9 +209,7 @@ Contact: +1 813 494 5005 Medical illustrator Sevilla - - 2 @@ -250,9 +230,7 @@ Andrew Functional Consultant - - 2 @@ -268,9 +246,7 @@ Andrew Shenzhen - - 2 @@ -303,9 +279,7 @@ Andrew 1 rue Rockfeller Melbourne - - 1 @@ -328,9 +302,7 @@ Andrew Wavre 1300 - - 2 @@ -350,7 +322,6 @@ Andrew Wavre virginie@agrolait.com - 1 @@ -377,7 +348,6 @@ Andrew Liverpool L25 4RL - 2 @@ -401,9 +371,7 @@ Andrew Rue des Palais 51, bte 33 Brussels - - 1 @@ -429,7 +397,6 @@ Andrew 3661 Station Street - 1 @@ -456,7 +423,6 @@ Andrew Liverpool L25 4RL - 1 @@ -476,7 +442,6 @@ Andrew Epic Technologies john.b@tech.info - 2 @@ -489,9 +454,7 @@ Andrew “Resource Planning” project develpment - - 2 @@ -507,9 +470,7 @@ Andrew Benjamin Flores Nebula Business - - 1 @@ -522,9 +483,7 @@ Andrew - - 0 @@ -540,9 +499,7 @@ Andrew info@mycompany.net Lima - - 0 @@ -564,7 +521,6 @@ Andrew Buenos Aires B7313 - 2 Conf call with technical service @@ -585,9 +541,7 @@ Andrew Wavre 1300 - - 2 diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 62c5e14deed..3f10dcf2099 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -230,9 +230,9 @@ - + - + @@ -513,8 +513,9 @@ - - + + + diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 167fd26efc3..b0e64042af7 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -26,10 +26,10 @@ - - - crm.case.channel.tree - crm.case.channel + + + crm.tracking.medium.tree + crm.tracking.medium @@ -37,9 +37,9 @@ - - crm.case.channel.form - crm.case.channel + + crm.tracking.medium.form + crm.tracking.medium
@@ -49,26 +49,66 @@
- + Channels - crm.case.channel + crm.tracking.medium form tree,form

Click to define a new channel.

- Use channels to track the soure of your leads and opportunities. Channels + Use channels to track the type of source of your leads and opportunities. Channels are mostly used in reporting to analyse sales performance related to marketing efforts.

Some examples of channels: company website, phone call - campaign, reseller, etc. + campaign, reseller, banner, etc.

- + + + crm.tracking.source.tree + crm.tracking.source + + + + + + + + crm.tracking.source.form + crm.tracking.source + +
+ + + +
+ + + + Source + crm.tracking.source + form + tree,form + +

+ Click to define a new source. +

+ Use channels to track the source of your leads and opportunities. Channels + are mostly used in reporting to analyse sales performance + related to marketing efforts. +

+ Some examples of channels: partner's website, google.com, + email list name, etc. +

+ + + + @@ -155,9 +195,9 @@ - - crm.case.resource.type.tree - crm.case.resource.type + + crm.tracking.campaign.tree + crm.tracking.campaign @@ -168,9 +208,9 @@ - - crm.case.resource.type.form - crm.case.resource.type + + crm.tracking.campaign.form + crm.tracking.campaign
@@ -183,15 +223,15 @@ - + Campaigns - crm.case.resource.type + crm.tracking.campaign form - + - diff --git a/addons/crm/ir_http.py b/addons/crm/ir_http.py new file mode 100644 index 00000000000..e2bc9be4867 --- /dev/null +++ b/addons/crm/ir_http.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- +from openerp.http import request +from openerp.osv import orm + + +class ir_http(orm.AbstractModel): + _inherit = 'ir.http' + + def _dispatch(self): + for var, dummy in self.pool['crm.tracking.mixin'].tracking_fields(): + if var in request.params and (var not in request.session or request.session[var] != request.params[var]): + request.session[var] = request.params[var] + return super(ir_http, self)._dispatch() diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index 7cb355c74d4..32851a753bc 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -44,6 +44,7 @@ class crm_lead_report(osv.osv): _auto = False _description = "CRM Lead Analysis" _rec_name = 'date_deadline' + _inherit = ["crm.tracking.mixin"] _columns = { 'date_deadline': fields.date('Exp. Closing', readonly=True, help="Expected Closing"), @@ -58,10 +59,8 @@ class crm_lead_report(osv.osv): 'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"), 'user_id':fields.many2one('res.users', 'User', readonly=True), + 'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True), 'country_id':fields.many2one('res.country', 'Country', readonly=True), - 'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True), - 'channel_id':fields.many2one('crm.case.channel', 'Channel', readonly=True), - 'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True), 'company_id': fields.many2one('res.company', 'Company', readonly=True), 'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"), 'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True), @@ -101,8 +100,9 @@ class crm_lead_report(osv.osv): c.company_id, c.priority, c.section_id, - c.channel_id, - c.type_id, + c.campaign_id, + c.source_id, + c.medium_id, c.partner_id, c.country_id, c.planned_revenue, diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 74564d8df92..8882b8a1f81 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -74,13 +74,15 @@ - - + + + - - + + + diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index 3c6fc05a70d..abfe3ebc903 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -3,8 +3,10 @@ access_crm_segmentation_user,crm.segmentation user,model_crm_segmentation,base.g access_crm_segmentation_line_user,crm.segmentation.line user,model_crm_segmentation_line,base.group_sale_salesman,1,0,0,0 access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_sale_manager,1,1,1,1 access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_sale_manager,1,1,1,1 -access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.group_sale_salesman,1,0,0,0 -access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1 +access_crm_tracking_medium_user,crm.tracking.medium user,model_crm_tracking_medium,base.group_sale_salesman,1,0,0,0 +access_crm_tracking_medium_manager,crm.tracking.medium manager,model_crm_tracking_medium,base.group_sale_manager,1,1,1,1 +access_crm_tracking_source_user,crm.tracking.source user,model_crm_tracking_source,base.group_sale_salesman,1,0,0,0 +access_crm_tracking_source_manager,crm.tracking.source manager,model_crm_tracking_source,base.group_sale_manager,1,1,1,1 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0 access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1 access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1 @@ -13,8 +15,8 @@ access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0 access_crm_case_stage,crm.case.stage,model_crm_case_stage,,1,0,0,0 access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1 -access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0 -access_crm_case_resource_type_manager,crm_case_resource_type manager,model_crm_case_resource_type,base.group_sale_manager,1,1,1,1 +access_crm_tracking_campaign_user,crm_tracking_campaign user,model_crm_tracking_campaign,base.group_sale_salesman,1,1,1,0 +access_crm_tracking_campaign_manager,crm_tracking_campaign manager,model_crm_tracking_campaign,base.group_sale_manager,1,1,1,1 access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_report,base.group_sale_salesman,1,0,0,0 access_crm_phonecall_report_manager,crm.phonecall.report,model_crm_phonecall_report,base.group_sale_manager,1,1,1,1 access_res_partner_manager,res.partner.crm.manager,base.model_res_partner,base.group_sale_manager,1,0,0,0 @@ -29,4 +31,4 @@ access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_ access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0 access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1 access_crm_payment_mode_user,crm.payment.mode,model_crm_payment_mode,base.group_sale_salesman,1,0,0,0 -access_crm_payment_mode,crm.payment.mode,model_crm_payment_mode,base.group_sale_manager,1,1,1,1 +access_crm_payment_mode,crm.payment.mode,model_crm_payment_mode,base.group_sale_manager,1,1,1,1 \ No newline at end of file diff --git a/addons/crm/static/description/crm_sc_05.png b/addons/crm/static/description/crm_sc_05.png new file mode 100644 index 00000000000..b71ce805250 Binary files /dev/null and b/addons/crm/static/description/crm_sc_05.png differ diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml index 86cf988ff45..58ed29f0a0a 100644 --- a/addons/crm_claim/crm_claim_data.xml +++ b/addons/crm_claim/crm_claim_data.xml @@ -28,12 +28,12 @@ Case Category2 --> - + Corrective - + Preventive diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 0fdcfeb4210..3800efd7cf4 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -56,7 +56,7 @@ class crm_helpdesk(osv.osv): 'date': fields.datetime('Date'), 'ref': fields.reference('Reference', selection=openerp.addons.base.res.res_request.referencable_models), 'ref2': fields.reference('Reference 2', selection=openerp.addons.base.res.res_request.referencable_models), - 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), + 'channel_id': fields.many2one('crm.tracking.medium', 'Channel', help="Communication channel."), 'planned_revenue': fields.float('Planned Revenue'), 'planned_cost': fields.float('Planned Costs'), 'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'), diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py index 1163db948d2..f7180ef0908 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report.py +++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py @@ -56,7 +56,7 @@ class crm_helpdesk_report(osv.osv): 'date_deadline': fields.date('Deadline', select=True), 'priority': fields.selection([('5', 'Lowest'), ('4', 'Low'), \ ('3', 'Normal'), ('2', 'High'), ('1', 'Highest')], 'Priority'), - 'channel_id': fields.many2one('crm.case.channel', 'Channel'), + 'channel_id': fields.many2one('crm.tracking.medium', 'Channel'), 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="[('section_id','=',section_id),\ ('object_id.model', '=', 'crm.helpdesk')]"), diff --git a/addons/crm_mass_mailing/__init__.py b/addons/crm_mass_mailing/__init__.py new file mode 100644 index 00000000000..983faeb18a6 --- /dev/null +++ b/addons/crm_mass_mailing/__init__.py @@ -0,0 +1,22 @@ +# -*- 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 . +# +############################################################################## + +import mass_mailing diff --git a/addons/crm_mass_mailing/__openerp__.py b/addons/crm_mass_mailing/__openerp__.py new file mode 100644 index 00000000000..5e2e320f9f0 --- /dev/null +++ b/addons/crm_mass_mailing/__openerp__.py @@ -0,0 +1,18 @@ +{ + 'name': 'Campaign in Mass Mailing', + 'version': '1.0', + 'summary': 'This module allow to specify a campaign, a source and a channel for a mass mailing campaign.', + 'author': 'OpenERP SA', + 'description': """ +Mass Mailing with Crm Marketing +================================ + +Link module mass mailing with the marketing mixin from crm. + """, + 'depends': ['crm', 'mass_mailing'], + 'data': [ + 'mass_mailing.xml', + ], + 'installable': True, + 'auto_install': True, +} diff --git a/addons/crm_mass_mailing/mass_mailing.py b/addons/crm_mass_mailing/mass_mailing.py new file mode 100644 index 00000000000..6a2e1322136 --- /dev/null +++ b/addons/crm_mass_mailing/mass_mailing.py @@ -0,0 +1,6 @@ +from openerp.osv import osv + + +class MassMailing(osv.Model): + _name = 'mail.mass_mailing' + _inherit = ['mail.mass_mailing', 'crm.tracking.mixin'] diff --git a/addons/crm_mass_mailing/mass_mailing.xml b/addons/crm_mass_mailing/mass_mailing.xml new file mode 100644 index 00000000000..a6768e7be84 --- /dev/null +++ b/addons/crm_mass_mailing/mass_mailing.xml @@ -0,0 +1,23 @@ + + + + + mail.mass_mailing.inherit.form + mail.mass_mailing + + + + + + + + + + + + + + + + + diff --git a/addons/crm_mass_mailing/mass_mailing_data.xml b/addons/crm_mass_mailing/mass_mailing_data.xml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/addons/crm_partner_assign/crm_lead_demo.xml b/addons/crm_partner_assign/crm_lead_demo.xml index a6373ff2f8a..a9da6701c8b 100644 --- a/addons/crm_partner_assign/crm_lead_demo.xml +++ b/addons/crm_partner_assign/crm_lead_demo.xml @@ -12,9 +12,7 @@ Reseller Edinburgh - - 2 diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml index c3334cfb9ee..0efeaaa2ae7 100644 --- a/addons/crm_partner_assign/crm_portal_view.xml +++ b/addons/crm_partner_assign/crm_portal_view.xml @@ -15,9 +15,9 @@ - + - + + + + + + + product.product.procurement + product.product + + +
+ diff --git a/addons/product/product.py b/addons/product/product.py index 3d4d2350d1a..f0a207a8064 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -364,7 +364,7 @@ class product_attribute_value(osv.osv): _columns = { 'sequence': fields.integer('Sequence', help="Determine the display order"), 'name': fields.char('Value', translate=True, required=True), - 'attribute_id': fields.many2one('product.attribute', 'Attribute', required=True), + 'attribute_id': fields.many2one('product.attribute', 'Attribute', required=True, ondelete='cascade'), 'product_ids': fields.many2many('product.product', id1='att_id', id2='prod_id', string='Variants', readonly=True), 'price_extra': fields.function(_get_price_extra, type='float', string='Attribute Price Extra', fnct_inv=_set_price_extra, @@ -378,20 +378,26 @@ class product_attribute_value(osv.osv): _defaults = { 'price_extra': 0.0, } + def unlink(self, cr, uid, ids, context=None): + ctx = dict(context or {}, active_test=False) + product_ids = self.pool['product.product'].search(cr, uid, [('attribute_value_ids', 'in', ids)], context=ctx) + if product_ids: + raise osv.except_osv(_('Integrity Error!'), _('The operation cannot be completed:\nYou trying to delete an attribute value with a reference on a product variant.')) + return super(product_attribute_value, self).unlink(cr, uid, ids, context=context) class product_attribute_price(osv.osv): _name = "product.attribute.price" _columns = { - 'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True), - 'value_id': fields.many2one('product.attribute.value', 'Product Attribute Value', required=True), + 'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete='cascade'), + 'value_id': fields.many2one('product.attribute.value', 'Product Attribute Value', required=True, ondelete='cascade'), 'price_extra': fields.float('Price Extra', digits_compute=dp.get_precision('Product Price')), } class product_attribute_line(osv.osv): _name = "product.attribute.line" _columns = { - 'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True), - 'attribute_id': fields.many2one('product.attribute', 'Attribute', required=True), + 'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete='cascade'), + 'attribute_id': fields.many2one('product.attribute', 'Attribute', required=True, ondelete='restrict'), 'value_ids': fields.many2many('product.attribute.value', id1='line_id', id2='val_id', string='Product Attribute Value'), } @@ -898,7 +904,7 @@ class product_product(osv.osv): 'product.template': (_get_name_template_ids, ['name'], 10), 'product.product': (lambda self, cr, uid, ids, c=None: ids, [], 10), }, select=True), - 'attribute_value_ids': fields.many2many('product.attribute.value', id1='prod_id', id2='att_id', string='Attributes', readonly=True), + 'attribute_value_ids': fields.many2many('product.attribute.value', id1='prod_id', id2='att_id', string='Attributes', readonly=True, ondelete='restrict'), # image: all image fields are base64 encoded and PIL-supported 'image_variant': fields.binary("Variant Image", diff --git a/addons/product/product_report.xml b/addons/product/product_report.xml index 5d2c3b99f62..9c7ca7e390c 100644 --- a/addons/product/product_report.xml +++ b/addons/product/product_report.xml @@ -10,6 +10,6 @@ report_type="qweb-pdf" name="product.report_pricelist" file="product.report_pricelist" - /> + menu="False"/> diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 70e1838932e..106cc04a598 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -40,8 +40,9 @@ + - product.template.product.form + product.template.common.form product.template primary @@ -70,7 +71,7 @@ - + @@ -139,48 +140,27 @@ - - Product.template.product.kanban - product.template + + product.product.search + product.product + primary + - - - - - -
- -
-

- - - -

-
-
    -
  • Price:
    • -
-
-
- - - + + + + + + + + + + + + - - Products - ir.actions.act_window - product.template - kanban,tree,form - form - - - - - @@ -205,31 +185,123 @@ {'default_product_tmpl_id': active_id} - + + Product Variants + ir.actions.act_window + product.product + tree,form,kanban + form + + +

+ Click to define a new product. +

+ You must define a product for everything you buy or sell, + whether it's a physical product, a consumable or service. +

+ + + + Product Variants + ir.actions.act_window + product.product + tree,form,kanban + form + {'search_default_product_tmpl_id': [active_id], 'default_product_tmpl_id': active_id} + + +

+ Click to define a new product. +

+ You must define a product for everything you buy or sell, + whether it's a physical product, a consumable or service. +

+ + - - - product.product.search - product.product + + + product.template.product.form + product.template primary - + + - - - - - - - - - - - + + Product Template + + + +
+ +
+ + + + + + + + + Product.template.product.kanban + product.template + + + + + + + + + +
+ +
+

+ + + +

+ + Variants + +
+
    +
  • Price:
    • +
+
+
+ + + + + + + + Products + ir.actions.act_window + product.template + kanban,tree,form + form + + + + + + + + + product.product.tree product.product @@ -260,6 +332,9 @@ Product Variant + + lst_price + @@ -302,86 +377,52 @@ - - Product Variants - ir.actions.act_window - product.product - tree,form,kanban - form - - -

- Click to define a new product. -

- You must define a product for everything you buy or sell, - whether it's a physical product, a consumable or service. -

- - - - - - - Product Variants - ir.actions.act_window - product.product - tree,form,kanban - form - {'search_default_product_tmpl_id': [active_id], 'default_product_tmpl_id': active_id} - - -

- Click to define a new product. -

- You must define a product for everything you buy or sell, - whether it's a physical product, a consumable or service. -

- - - - - product.template.form.buttons - primary - product.template - + + product.attribute.tree + product.attribute - - -
- -
- - - - - - - - + + + - - product.template.form - product.template - + + Attributes + ir.actions.act_window + product.attribute + tree + form + + + + + + product.attribute.value.tree + product.attribute.value - - - - - -

- - Variants - -

+ + + + + + + Attribute Values + ir.actions.act_window + product.attribute.value + tree + form + + + + diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index a1ef56cbfe2..1d948de1ba3 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -209,9 +209,9 @@ class purchase_order(osv.osv): "It's mainly used to do the matching when you receive the " "products as this reference is usually written on the " "delivery order sent by your supplier."), - 'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], + 'date_order':fields.datetime('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, - select=True, help="Date on which this document has been created.", + select=True, help="Depicts the date where the Quotation should be validated and converted into a Purchase Order, by default it's the creation date.", copy=False), 'date_approve':fields.date('Date Approved', readonly=1, select=True, copy=False, help="Date on which purchase order has been approved"), @@ -290,7 +290,7 @@ class purchase_order(osv.osv): 'invoice_count': fields.function(_count_all, type='integer', string='Invoices', multi=True) } _defaults = { - 'date_order': fields.date.context_today, + 'date_order': fields.datetime.now, 'state': 'draft', 'name': lambda obj, cr, uid, context: '/', 'shipped': 0, @@ -710,7 +710,7 @@ class purchase_order(osv.osv): 'product_id': order_line.product_id.id, 'product_uom': order_line.product_uom.id, 'product_uos': order_line.product_uom.id, - 'date': fields.date.date_to_datetime(self, cr, uid, order.date_order, context), + 'date': order.date_order, 'date_expected': fields.date.date_to_datetime(self, cr, uid, order_line.date_planned, context), 'location_id': order.partner_id.property_stock_supplier.id, 'location_dest_id': order.location_id.id, @@ -980,8 +980,8 @@ class purchase_order_line(osv.osv): 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True, copy=False), 'invoiced': fields.boolean('Invoiced', readonly=True, copy=False), - 'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner", store=True), - 'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date"), + 'partner_id': fields.related('order_id', 'partner_id', string='Partner', readonly=True, type="many2one", relation="res.partner", store=True), + 'date_order': fields.related('order_id', 'date_order', string='Order Date', readonly=True, type="datetime"), 'procurement_ids': fields.one2many('procurement.order', 'purchase_line_id', string='Associated procurements'), } _defaults = { @@ -1026,13 +1026,13 @@ class purchase_order_line(osv.osv): :param browse_record | False supplier_info: product.supplierinfo, used to determine delivery delay (if False, default delay = 0) - :param str date_order_str: date of order, as a string in - DEFAULT_SERVER_DATE_FORMAT + :param str date_order_str: date of order field, as a string in + DEFAULT_SERVER_DATETIME_FORMAT :rtype: datetime :return: desired Schedule Date for the PO line """ supplier_delay = int(supplier_info.delay) if supplier_info else 0 - return datetime.strptime(date_order_str, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=supplier_delay) + return datetime.strptime(date_order_str, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=supplier_delay) def action_cancel(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'state': 'cancel'}, context=context) @@ -1101,7 +1101,7 @@ class purchase_order_line(osv.osv): # - determine product_qty and date_planned based on seller info if not date_order: - date_order = fields.date.context_today(self,cr,uid,context=context) + date_order = fields.datetime.now() supplierinfo = False @@ -1125,8 +1125,9 @@ class purchase_order_line(osv.osv): if state not in ('sent','bid'): # - determine price_unit and taxes_id if pricelist_id: + date_order_str = datetime.strptime(date_order, DEFAULT_SERVER_DATETIME_FORMAT).strftime(DEFAULT_SERVER_DATE_FORMAT) price = product_pricelist.price_get(cr, uid, [pricelist_id], - product.id, qty or 1.0, partner_id or False, {'uom': uom_id, 'date': date_order})[pricelist_id] + product.id, qty or 1.0, partner_id or False, {'uom': uom_id, 'date': date_order_str})[pricelist_id] else: price = product.standard_price @@ -1320,8 +1321,8 @@ class procurement_order(osv.osv): po_id = available_draft_po_ids[0] po_rec = po_obj.browse(cr, uid, po_id, context=context) #if the product has to be ordered earlier those in the existing PO, we replace the purchase date on the order to avoid ordering it too late - if datetime.strptime(po_rec.date_order, DEFAULT_SERVER_DATE_FORMAT) > purchase_date: - po_obj.write(cr, uid, [po_id], {'date_order': purchase_date}, context=context) + if datetime.strptime(po_rec.date_order, DEFAULT_SERVER_DATETIME_FORMAT) > purchase_date: + po_obj.write(cr, uid, [po_id], {'date_order': purchase_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, context=context) #look for any other PO line in the selected PO with same product and UoM to sum quantities instead of creating a new po line available_po_line_ids = po_line_obj.search(cr, uid, [('order_id', '=', po_id), ('product_id', '=', line_vals['product_id']), ('product_uom', '=', line_vals['product_uom'])], context=context) if available_po_line_ids: diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 445afa256b0..33e3228602b 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -632,7 +632,7 @@ product.template.purchase.button.inherit product.template - + ', - key, key, label)); - }); - html.push('
'); - html.push('
'); - _(this.sizes).each(function (label, key) { - html.push(_.str.sprintf( - '', - key, key, label)); - }); - html.push('
'); - html.push(''); - html.push('
'); - - block.element.setHtml(html.join(' ')); - var $panel = $(block.element.$); - $panel.on('click', 'button', function () { - self.clicked(this); - }); - }, - clicked: function (button) { - editor.focus(); - editor.fire('saveSnapshot'); - - var $button = $(button), - $link = $(get_selected_link(editor).$); - if (!$link.hasClass('btn')) { - $link.addClass('btn btn-default'); - } - switch($button.data('type')) { - case 'reset': - $link.removeClass('btn') - .removeClass(_.keys(this.types).join(' ')) - .removeClass(_.keys(this.sizes).join(' ')); - break; - case 'types': - $link.removeClass(_.keys(this.types).join(' ')) - .addClass($button.data('set-class')); - break; - case 'sizes': - $link.removeClass(_.keys(this.sizes).join(' ')) - .addClass($button.data('set-class')); - } - this._.panel.hide(); - - editor.fire('saveSnapshot'); - }, - - }); - } - }); - CKEDITOR.plugins.add('oeref', { requires: 'widget', @@ -1011,7 +862,7 @@ fillEmptyBlocks: false, filebrowserImageUploadUrl: "/website/attach", // Support for sharedSpaces in 4.x - extraPlugins: 'sharedspace,customdialogs,tablebutton,oeref,linkstyle', + extraPlugins: 'sharedspace,customdialogs,tablebutton,oeref', // Place toolbar in controlled location sharedSpaces: { top: 'oe_rte_toolbar' }, toolbar: [{ @@ -1020,7 +871,7 @@ "Superscript", "TextColor", "BGColor", "RemoveFormat" ]},{ name: 'span', items: [ - "Link", "LinkStyle", "Blockquote", "BulletedList", + "Link", "Blockquote", "BulletedList", "NumberedList", "Indent", "Outdent" ]},{ name: 'justify', items: [ @@ -1081,19 +932,23 @@ website.editor.LinkDialog = website.editor.Dialog.extend({ template: 'website.editor.dialog.link', events: _.extend({}, website.editor.Dialog.prototype.events, { - 'change :input.url-source': function (e) { this.changed($(e.target)); }, + 'change :input.url-source': 'changed', + 'keyup :input.url': 'onkeyup', + 'keyup :input': 'preview', 'mousedown': function (e) { - var $target = $(e.target).closest('.list-group-item'); + var $target = $(e.target).closest('.list-group-item:has(.url-source)'); if (!$target.length || $target.hasClass('active')) { // clicked outside groups, or clicked in active groups return; } - - this.changed($target.find('.url-source').filter(':input')); + $target.find("input.url-source").change(); }, 'click button.remove': 'remove_link', 'change input#link-text': function (e) { - this.text = $(e.target).val() + this.text = $(e.target).val(); + }, + 'change .link-style': function (e) { + this.preview(); }, }), init: function (editor) { @@ -1117,7 +972,7 @@ self.fetch_pages(q.term) ).then(function (exists, results) { var rs = _.map(results, function (r) { - return { id: r.url, text: r.name, }; + return { id: r.loc, text: r.loc, }; }); if (!exists) { rs.push({ @@ -1137,67 +992,90 @@ }); return this._super().then(this.proxy('bind_data')); }, - save: function () { - var self = this, _super = this._super.bind(this); - var $e = this.$('.list-group-item.active .url-source').filter(':input'); - var val = $e.val(); - if (!val || !$e[0].checkValidity()) { + get_data: function (test) { + var self = this, + def = new $.Deferred(), + $e = this.$('.active input.url-source').filter(':input'), + val = $e.val(), + label = this.$('#link-text').val() || val; + + if (test !== false && (!val || !$e[0].checkValidity())) { // FIXME: error message $e.closest('.form-group').addClass('has-error'); $e.focus(); - return; + def.reject(); } - var done = $.when(); - if ($e.hasClass('email-address')) { - this.make_link('mailto:' + val, false, val); - } else if ($e.hasClass('page')) { + var style = this.$("input[name='link-style-type']:checked").val(); + var size = this.$("input[name='link-style-size']:checked").val(); + var classes = (style && style.length ? "btn " : "") + style + " " + size; + + if ($e.hasClass('email-address') && $e.val().indexOf("@") !== -1) { + def.resolve('mailto:' + val, false, label); + } else if ($e.val() && $e.val().length && $e.hasClass('page')) { var data = $e.select2('data'); if (!data.create) { - self.make_link(data.id, false, data.text); + def.resolve(data.id, false, data.text); } else { // Create the page, get the URL back - done = $.get(_.str.sprintf( + $.get(_.str.sprintf( '/website/add/%s?noredirect=1', encodeURI(data.id))) .then(function (response) { - self.make_link(response, false, data.id); + def.resolve(response, false, data.id); }); } } else { - this.make_link(val, this.$('input.window-new').prop('checked')); + def.resolve(val, this.$('input.window-new').prop('checked'), label, classes); } - done.then(_super); + return def; }, - make_link: function (url, new_window, label) { + save: function () { + var self = this; + var _super = this._super.bind(this); + return this.get_data() + .then(function (url, new_window, label, classes) { + self.make_link(url, new_window, label, classes); + }).then(_super); }, - bind_data: function (text, href, new_window) { - href = href || this.element && (this.element.data( 'cke-saved-href') + make_link: function (url, new_window, label, classes) { + }, + bind_data: function () { + var href = this.element && (this.element.data( 'cke-saved-href') || this.element.getAttribute('href')); - - if (new_window === undefined) { - new_window = this.element + var new_window = this.element ? this.element.getAttribute('target') === '_blank' : false; - } - if (text === undefined) { - text = this.element ? this.element.getText() : ''; + var text = this.element ? this.element.getText() : ''; + if (!text.length) { + var selection = this.editor.getSelection(); + text = selection.getSelectedText(); } this.$('input#link-text').val(text); this.$('input.window-new').prop('checked', new_window); - if (!href) { return; } - var match, $control; - if ((match = /mailto:(.+)/.exec(href))) { - $control = this.$('input.email-address').val(match[1]); - } - if (!$control) { - $control = this.$('input.url').val(href); + var classes = this.element && this.element.$.className; + if (classes) { + this.$('input[value!=""]').each(function () { + var $option = $(this); + if (classes.indexOf($option.val()) !== -1) { + $option.attr("checked", "checked"); + } + }); } - this.changed($control); + var match, $control; + if (href && (match = /mailto:(.+)/.exec(href))) { + this.$('input.email-address').val(match[1]).change(); + } + if (href && !$control) { + this.$('input.url').val(href).change(); + this.$('input.window-new').closest("div").show(); + } + this.preview(); }, - changed: function ($e) { + changed: function (e) { + var $e = $(e.target); this.$('.url-source').filter(':input').not($e).val('') .filter(function () { return !!$(this).data('select2'); }) .select2('data', null); @@ -1205,6 +1083,7 @@ .addClass('active') .siblings().removeClass('active') .addBack().removeClass('has-error'); + this.preview(); }, call: function (method, args, kwargs) { var self = this; @@ -1232,6 +1111,20 @@ context: website.get_context(), }); }, + onkeyup: function (e) { + var $e = $(e.target); + var is_link = ($e.val()||'').length && $e.val().indexOf("@") === -1; + this.$('input.window-new').closest("div").toggle(is_link); + this.preview(); + }, + preview: function () { + var $preview = this.$("#link-preview"); + this.get_data(false).then(function (url, new_window, label, classes) { + $preview.attr("target", new_window ? '_blank' : "") + .text((label && label.length ? label : url)) + .attr("class", classes); + }); + } }); website.editor.RTELinkDialog = website.editor.LinkDialog.extend({ start: function () { @@ -1271,7 +1164,7 @@ * @param {Boolean} [new_window=false] * @param {String} [label=null] */ - make_link: function (url, new_window, label) { + make_link: function (url, new_window, label, classes) { var attributes = {href: url, 'data-cke-saved-href': url}; var to_remove = []; if (new_window) { @@ -1279,6 +1172,9 @@ } else { to_remove.push('target'); } + if (classes && classes.length) { + attributes['class'] = classes; + } if (this.element) { this.element.setAttributes(attributes); diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js index 7ba78a22748..8d28237f924 100644 --- a/addons/website/static/src/js/website.seo.js +++ b/addons/website/static/src/js/website.seo.js @@ -441,7 +441,7 @@ }, getMainObject: function () { var repr = $('html').data('main-object'); - var m = repr.match(/.+\((.+), (\d+)\)/); + var m = repr.match(/(.+)\((\d+),(.*)\)/); if (!m) { return null; } else { diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index d61b6ed2664..0e3873b1de6 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -51,7 +51,7 @@ id="link-page" type="hidden"/>
  • -
    +

    -
    • -
  • -

    - -

    - -
    • @@ -81,8 +72,71 @@ Link text
    - + +
    +
    +
    +
    +
    + +
    +
    + Color Style + +
    +
    +
    +
    + Size + +
    +
    +
    +
    +
    +
    + +
    +
    diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 0b705c3a52f..9db068dc658 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -11,7 +11,7 @@
    -
    +
    @@ -284,7 +284,7 @@
    -
    +
    @@ -358,7 +358,7 @@
    -
    +
    @@ -747,7 +747,7 @@
    -
    +
    diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 0f85be71d3b..dab436390a0 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -94,6 +94,17 @@ + + +
    @@ -150,17 +161,6 @@
    - - - @@ -696,13 +696,13 @@ Sitemap: sitemap.xml