From fb49ef287cf96f8f3b176d7913ad1917523c3805 Mon Sep 17 00:00:00 2001
From: "ddm@openerp.com" <>
Date: Fri, 24 Jan 2014 13:51:40 +0100
Subject: [PATCH 1/8] [IMP] new module for integrating livechat into website
bzr revid: ddm@openerp.com-20140124125140-pr9h42j6p6kp31qt
---
addons/website_livechat/__init__.py | 1 +
addons/website_livechat/__openerp__.py | 21 +++++++++++++++++++
addons/website_livechat/models/__init__.py | 1 +
addons/website_livechat/models/website.py | 8 +++++++
.../views/website_livechat.xml | 20 ++++++++++++++++++
5 files changed, 51 insertions(+)
create mode 100644 addons/website_livechat/__init__.py
create mode 100644 addons/website_livechat/__openerp__.py
create mode 100644 addons/website_livechat/models/__init__.py
create mode 100644 addons/website_livechat/models/website.py
create mode 100644 addons/website_livechat/views/website_livechat.xml
diff --git a/addons/website_livechat/__init__.py b/addons/website_livechat/__init__.py
new file mode 100644
index 00000000000..2c4eac3f855
--- /dev/null
+++ b/addons/website_livechat/__init__.py
@@ -0,0 +1 @@
+import models
\ No newline at end of file
diff --git a/addons/website_livechat/__openerp__.py b/addons/website_livechat/__openerp__.py
new file mode 100644
index 00000000000..98af0eb8d8d
--- /dev/null
+++ b/addons/website_livechat/__openerp__.py
@@ -0,0 +1,21 @@
+{
+ 'name': 'Website LiveChat',
+ 'category': 'Website',
+ 'summary': 'Instant Messaging for your Website',
+ 'version': '1.0',
+ 'description': """
+OpenERP Website LiveChat
+========================
+
+ """,
+ 'author': 'OpenERP SA',
+ 'depends': ['website', 'im_livechat'],
+ 'installable': True,
+ 'data': [
+ 'views/website_livechat.xml'
+ ],
+ 'demo': [ ],
+ 'js': [],
+ 'qweb': [],
+ 'css': [],
+}
diff --git a/addons/website_livechat/models/__init__.py b/addons/website_livechat/models/__init__.py
new file mode 100644
index 00000000000..b8b239729b6
--- /dev/null
+++ b/addons/website_livechat/models/__init__.py
@@ -0,0 +1 @@
+import website
\ No newline at end of file
diff --git a/addons/website_livechat/models/website.py b/addons/website_livechat/models/website.py
new file mode 100644
index 00000000000..7e86042a67a
--- /dev/null
+++ b/addons/website_livechat/models/website.py
@@ -0,0 +1,8 @@
+from openerp.osv import osv, fields
+
+class website(osv.osv):
+ _inherit = "website"
+
+ _columns = {
+ 'channel_id': fields.many2one('im_livechat.channel', string="Channel"),
+ }
\ No newline at end of file
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
new file mode 100644
index 00000000000..c7d2a5d84ac
--- /dev/null
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ website.form
+ website
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From edaf96d2837e473a16e23c3ee516fc1e3491d433 Mon Sep 17 00:00:00 2001
From: "ddm@openerp.com" <>
Date: Fri, 24 Jan 2014 14:05:57 +0100
Subject: [PATCH 2/8] [IMP] add livechat snippet
bzr revid: ddm@openerp.com-20140124130557-1rmrtbabrz0mt1ed
---
.../views/website_livechat.xml | 40 ++++++++++++-------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index c7d2a5d84ac..d4da07f2bf0 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -1,20 +1,30 @@
-
- website.form
- website
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ website.form
+ website
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From f0606d3cc060f7a3ddcfa3477dae1f3f783c6bc1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi
Date: Fri, 24 Jan 2014 14:23:04 +0100
Subject: [PATCH 3/8] [FIX] Contact field encoding issue
bzr revid: fme@openerp.com-20140124132304-4kmjd9k4k2xgjecv
---
addons/website/models/ir_qweb.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 18a5724fb02..6a4f5b2fd1a 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -415,7 +415,7 @@ class Contact(orm.AbstractModel):
'options': options
}
- html = self.pool["ir.ui.view"].render(cr, uid, "website.contact", val, engine='website.qweb', context=context)
+ html = self.pool["ir.ui.view"].render(cr, uid, "website.contact", val, engine='website.qweb', context=context).decode('utf8')
return ir_qweb.HTMLSafe(html)
From 9548b71db846fa65cee823655a185c56a81c70e9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu
Date: Fri, 24 Jan 2014 14:23:57 +0100
Subject: [PATCH 4/8] [FIX] event_sale: traceback when confirming an event
bzr revid: chm@openerp.com-20140124132357-90mx68jr7vbxjw1c
---
addons/event_sale/event_sale.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index ba8250b0978..eae145ba948 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -143,7 +143,8 @@ class event_event(osv.osv):
def check_registration_limits(self, cr, uid, ids, context=None):
for event in self.browse(cr, uid, ids, context=context):
if event.event_ticket_ids:
- event.event_ticket_ids.check_registration_limits_before(0)
+ for ticket in event.event_ticket_ids:
+ ticket.check_registration_limits_before(0)
return super(event_event, self).check_registration_limits(cr, uid, ids, context=context)
From 11c23253747f2b585957b877c62855bc6a7a8ff6 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Fri, 24 Jan 2014 14:47:29 +0100
Subject: [PATCH 5/8] [ADD] viewport meta, so the responsive bootstrapy stuff
actually does things
bzr revid: xmo@openerp.com-20140124134729-epag5dnbjk8y2hcw
---
addons/website/views/website_templates.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index f40474ac75a..ac7ae2add82 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -52,12 +52,13 @@
-
- <t t-esc="title"/>
+
+ <t t-esc="title"/>
From ab300843ce2ad96b9f45f0d8af21e55d67f16a28 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu
Date: Fri, 24 Jan 2014 14:52:16 +0100
Subject: [PATCH 6/8] [FIX] website_sale_crm: create a bridge to add order into
website sale teams if crm is installed
bzr revid: chm@openerp.com-20140124135216-3ikjg2glx29stk1j
---
addons/website_sale/data/website_sale_data.xml | 7 -------
addons/website_sale/models/website.py | 7 -------
addons/website_sale_crm/__init__.py | 0
addons/website_sale_crm/__openerp__.py | 15 +++++++++++++++
addons/website_sale_crm/data/website_sale_crm.xml | 13 +++++++++++++
addons/website_sale_crm/models/__init__.py | 1 +
addons/website_sale_crm/models/website.py | 14 ++++++++++++++
7 files changed, 43 insertions(+), 14 deletions(-)
create mode 100644 addons/website_sale_crm/__init__.py
create mode 100644 addons/website_sale_crm/__openerp__.py
create mode 100644 addons/website_sale_crm/data/website_sale_crm.xml
create mode 100644 addons/website_sale_crm/models/__init__.py
create mode 100644 addons/website_sale_crm/models/website.py
diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml
index d54b25fad0b..fcb62312275 100644
--- a/addons/website_sale/data/website_sale_data.xml
+++ b/addons/website_sale/data/website_sale_data.xml
@@ -32,12 +32,5 @@
oe_image_full
-
- Website
- Website
- Website
-
-
-
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
index 6a16a5d9543..8ea4e01cb4d 100644
--- a/addons/website_sale/models/website.py
+++ b/addons/website_sale/models/website.py
@@ -145,14 +145,7 @@ class Website(orm.Model):
""" Create a new quotation used in the ecommerce (event, sale) """
SaleOrder = self.pool.get('sale.order')
quotation_values = self._ecommerce_get_quotation_values(cr, uid, context=context)
-
- section_ids = request.registry["crm.case.section"].search(
- request.cr, SUPERUSER_ID, [("code", "=", "Website")], context=context)
- if section_ids:
- quotation_values['section_id'] = section_ids[0]
-
quotation_values['user_id'] = False
-
return SaleOrder.create(cr, SUPERUSER_ID, quotation_values, context=context)
def ecommerce_get_new_order(self, cr, uid, context=None):
diff --git a/addons/website_sale_crm/__init__.py b/addons/website_sale_crm/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/website_sale_crm/__openerp__.py b/addons/website_sale_crm/__openerp__.py
new file mode 100644
index 00000000000..8cecbb17a36
--- /dev/null
+++ b/addons/website_sale_crm/__openerp__.py
@@ -0,0 +1,15 @@
+{
+ 'name': 'E-Commerce with CRM',
+ 'version': '0.1',
+ 'category': 'Hidden',
+ 'description': """
+""",
+ 'author': 'OpenERP SA',
+ 'depends': ['website_sale', 'sale_crm'],
+ 'data': [
+ 'data/website_sale_crm.xml',
+ ],
+ 'installable': True,
+ 'auto_install': True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_sale_crm/data/website_sale_crm.xml b/addons/website_sale_crm/data/website_sale_crm.xml
new file mode 100644
index 00000000000..dad22228f01
--- /dev/null
+++ b/addons/website_sale_crm/data/website_sale_crm.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+ Website
+ Website
+ Website
+
+
+
+
+
diff --git a/addons/website_sale_crm/models/__init__.py b/addons/website_sale_crm/models/__init__.py
new file mode 100644
index 00000000000..b8b239729b6
--- /dev/null
+++ b/addons/website_sale_crm/models/__init__.py
@@ -0,0 +1 @@
+import website
\ No newline at end of file
diff --git a/addons/website_sale_crm/models/website.py b/addons/website_sale_crm/models/website.py
new file mode 100644
index 00000000000..50cb70d7009
--- /dev/null
+++ b/addons/website_sale_crm/models/website.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+from openerp.osv import orm
+from openerp import SUPERUSER_ID
+
+
+class Website(orm.Model):
+ _inherit = 'website'
+
+ def _ecommerce_create_quotation(self, cr, uid, context=None):
+ order_id = super(Website, self)._ecommerce_create_quotation(cr, uid, context=context)
+ section_ids = self.pool["crm.case.section"].search(cr, SUPERUSER_ID, [("code", "=", "Website")], context=context)
+ if section_ids:
+ self.pool["sale.order"].write(cr, SUPERUSER_ID, {'section_id': section_ids[0]}, context=context)
+ return order_id
From ce155acefef1087b94717f839c04bfcc774904e5 Mon Sep 17 00:00:00 2001
From: Xavier Morel
Date: Fri, 24 Jan 2014 14:57:13 +0100
Subject: [PATCH 7/8] [IMP] with device-width, iOS devices don't respond to
orientation changes. Use initial-scale instead
bzr revid: xmo@openerp.com-20140124135713-e0uzbnaq5m9hiocr
---
addons/website/views/website_templates.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index ac7ae2add82..9cdbe1b39b1 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -52,7 +52,7 @@
-
-
+
From 098381385afdf6b22a8aa65bccc31e400d5952bf Mon Sep 17 00:00:00 2001
From: Christophe Matthieu
Date: Fri, 24 Jan 2014 15:02:47 +0100
Subject: [PATCH 8/8] [IMP] website_event: the event list right screen is
confusing when they are no demo data. Put it as an option
bzr revid: chm@openerp.com-20140124140247-7tfewwf8o440vgka
---
addons/website_event/views/website_event.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 39c3ca05a51..040a52f8e58 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -96,7 +96,7 @@
-
+