- ![]()
+ ![]()
diff --git a/addons/website_portal/controllers/main.py b/addons/website_portal/controllers/main.py
index a11adac2ab4..05627e83416 100644
--- a/addons/website_portal/controllers/main.py
+++ b/addons/website_portal/controllers/main.py
@@ -60,6 +60,7 @@ class website_account(http.Controller):
error_message = []
mandatory_billing_fields = ["name", "phone", "email", "street2", "city", "country_id"]
+ optional_billing_fields = ["zipcode", "state_id", "vat", "street"]
# Validation
for field_name in mandatory_billing_fields:
@@ -86,4 +87,9 @@ class website_account(http.Controller):
if [err for err in error.values() if err == 'missing']:
error_message.append(_('Some required fields are empty.'))
+ unknown = [k for k in data.iterkeys() if k not in mandatory_billing_fields + optional_billing_fields]
+ if unknown:
+ error['common'] = 'Unknown field'
+ error_message.append("Unknown field '%s'" % ','.join(unknown))
+
return error, error_message
diff --git a/addons/website_quote/models/order.py b/addons/website_quote/models/order.py
index 9ddebf1f3c1..c268a5ac5de 100644
--- a/addons/website_quote/models/order.py
+++ b/addons/website_quote/models/order.py
@@ -228,7 +228,6 @@ class sale_order(osv.osv):
'website_description': line.website_description,
'state': 'draft',
'customer_lead': self._get_customer_lead(cr, uid, line.product_id.product_tmpl_id),
- 'delay': line.product_id.sale_delay
})
lines.append((0, 0, data))
options = []
diff --git a/doc/cla/corporate/microcom.md b/doc/cla/corporate/microcom.md
new file mode 100644
index 00000000000..819259990dd
--- /dev/null
+++ b/doc/cla/corporate/microcom.md
@@ -0,0 +1,20 @@
+Canada, 2016-06-09
+
+Microcom agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Martin Malorni mmalorni@gmail.com https://github.com/mmalorni
+
+List of contributors:
+
+- Vincent Coll vincentgagnnoncoll@gmail.com https://github.com/vincentcoll
+- Stéphane Le Cornec stephane.lecornec@gmail.com https://github.com/coleste
+- Eric Lemire elemire@users.noreply.github.com https://github.com/elemire
+- Martin Malorni mmalorni@gmail.com https://github.com/mmalorni
+- Gregory Savoie gs.microcom@gmail.com https://github.com/gregsavoie
+- Noreddine Ben Jillali nbj.microcom@gmail.com https://github.com/nbj-microcom
diff --git a/doc/cla/corporate/ridingbytes.md b/doc/cla/corporate/ridingbytes.md
new file mode 100644
index 00000000000..9abfb539d20
--- /dev/null
+++ b/doc/cla/corporate/ridingbytes.md
@@ -0,0 +1,15 @@
+Germany, 2016-05-02
+
+RIDING BYTES agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Ramon Bartl, rb@ridingbytes.com https://github.com/ridingbytes
+
+List of contributors:
+
+Ramon Bartl, rb@ridingbytes.com https://github.com/ramonski
diff --git a/doc/cla/corporate/telnet_servizi_srl.md b/doc/cla/corporate/telnet_servizi_srl.md
new file mode 100644
index 00000000000..0178e1ce407
--- /dev/null
+++ b/doc/cla/corporate/telnet_servizi_srl.md
@@ -0,0 +1,16 @@
+Italy, 2016-02-23
+
+Telnet Servizi Srl agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Telnet Data github@telnetservizi.it https://github.com/telnetdata
+
+List of contributors:
+
+Telnet Data github@telnetservizi.it https://github.com/telnetdata
+Matteo Cantarutti cantarutti.matteo@live.it https://github.com/mteok
diff --git a/doc/cla/individual/jarmokortetjarvi.md b/doc/cla/individual/jarmokortetjarvi.md
new file mode 100644
index 00000000000..523d2857af2
--- /dev/null
+++ b/doc/cla/individual/jarmokortetjarvi.md
@@ -0,0 +1,11 @@
+Finland, 2016-02-18
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Jarmo Kortetjärvi jarmo.kortetjarvi@gmail.com https://github.com/jarmokortetjarvi
diff --git a/doc/cla/individual/rossigee.md b/doc/cla/individual/rossigee.md
new file mode 100644
index 00000000000..4cc35956206
--- /dev/null
+++ b/doc/cla/individual/rossigee.md
@@ -0,0 +1,11 @@
+Thailand, 2016-03-26
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Ross Golder ross@golder.org https://github.com/rossigee
diff --git a/doc/cla/individual/salishaukat.md b/doc/cla/individual/salishaukat.md
new file mode 100644
index 00000000000..21f1c734a45
--- /dev/null
+++ b/doc/cla/individual/salishaukat.md
@@ -0,0 +1,11 @@
+
+
+Pakistan, 2016-05-05
+
+I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+Sharjeel Ali Shaukat as_ns2002@hotmail.com https://github.com/salishaukat
diff --git a/openerp/service/db.py b/openerp/service/db.py
index 1d30dc2c457..711dab17662 100644
--- a/openerp/service/db.py
+++ b/openerp/service/db.py
@@ -102,6 +102,11 @@ def exp_duplicate_database(db_original_name, db_name):
_drop_conn(cr, db_original_name)
cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "%s" """ % (db_name, db_original_name))
+ registry = openerp.modules.registry.RegistryManager.new(db_name)
+ with registry.cursor() as cr:
+ # if it's a copy of a database, force generation of a new dbuuid
+ registry['ir.config_parameter'].init(cr, force=True)
+
from_fs = openerp.tools.config.filestore(db_original_name)
to_fs = openerp.tools.config.filestore(db_name)
if os.path.exists(from_fs) and not os.path.exists(to_fs):
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 4eb580b4787..3da1e620908 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -502,6 +502,15 @@ def mod10r(number):
report = codec[ (int(digit) + report) % 10 ]
return result + str((10 - report) % 10)
+def str2bool(s, default=None):
+ s = ustr(s).lower()
+ y = 'y yes 1 true t on'.split()
+ n = 'n no 0 false f off'.split()
+ if s not in (y + n):
+ if default is None:
+ raise ValueError('Use 0/1/yes/no/true/false/on/off')
+ return bool(default)
+ return s in y
def human_size(sz):
"""