[MERGE] forward port branch 9.0 up to 9c8422a

8 files changed, 53 insertions, 42 deletions

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 716175a5fd8..2718e47dd2a 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -63,8 +63,7 @@ class AuthSignupHome(Home):
                 qcontext['error'] = _("Could not reset your password")
                 _logger.exception('error when resetting password')
             except Exception, e:
-                qcontext['error'] = e.message
-
+                qcontext['error'] = e.message or e.name
 
         return request.render('auth_signup.reset_password', qcontext)
 
diff --git a/addons/l10n_si/__openerp__.py b/addons/l10n_si/__openerp__.py
index 2c522ed9f1d..8b6d29648df 100644
--- a/addons/l10n_si/__openerp__.py
+++ b/addons/l10n_si/__openerp__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "Slovenian - Accounting",
-    "version": "1.0",
+    "version": "1.1",
     "author": "Mentis d.o.o.",
     "website": "http://www.mentis.si",
     'category': 'Localization',
diff --git a/addons/l10n_si/data/account.account.tag.csv b/addons/l10n_si/data/account.account.tag.csv
index 7096069b786..c45fb606687 100644
--- a/addons/l10n_si/data/account.account.tag.csv
+++ b/addons/l10n_si/data/account.account.tag.csv
@@ -1,15 +1,15 @@
 "id","name","applicability"
 "DDV_I_0","Izstopni DDV 0%","taxes"
-"DDV_I_8_5","Izstopni DDV 8.5%","taxes"
-"DDV_I_20","Izstopni DDV 20%","taxes"
+"DDV_I_9_5","Izstopni DDV 9.5%","taxes"
+"DDV_I_22","Izstopni DDV 22%","taxes"
 "DDV_V_0","Vstopni DDV 0%","taxes"
-"DDV_V_8_5","Vstopni DDV 8.5%","taxes"
-"DDV_V_20","Vstopni DDV 20%","taxes"
-"DDV_V_8_5_NE","Vstopni DDV 8.5% - neodbitni","taxes"
-"DDV_V_20_NE","Vstopni DDV 20% - neodbitni","taxes"
-"DDV_V_8_5_SO","Vstopni DDV 8.5% - SO","taxes"
-"DDV_I_8_5_SO","Izstopni DDV 8.5% - SO","taxes"
-"DDV_V_8_5_sam","Vstopni DDV 8.5% - samoobdavčitev","taxes"
-"DDV_V_20_SO","Vstopni DDV 20% - SO","taxes"
-"DDV_I_20_SO","Izstopni DDV 20% - SO","taxes"
-"DDV_V_20_sam","Vstopni DDV 20% - samoobdavčitev","taxes"
+"DDV_V_9_5","Vstopni DDV 9.5%","taxes"
+"DDV_V_22","Vstopni DDV 22%","taxes"
+"DDV_V_9_5_NE","Vstopni DDV 9.5% - neodbitni","taxes"
+"DDV_V_22_NE","Vstopni DDV 22% - neodbitni","taxes"
+"DDV_V_9_5_SO","Vstopni DDV 9.5% - SO","taxes"
+"DDV_I_9_5_SO","Izstopni DDV 9.5% - SO","taxes"
+"DDV_V_9_5_sam","Vstopni DDV 9.5% - samoobdavčitev","taxes"
+"DDV_V_22_SO","Vstopni DDV 22% - SO","taxes"
+"DDV_I_22_SO","Izstopni DDV 22% - SO","taxes"
+"DDV_V_22_sam","Vstopni DDV 22% - samoobdavčitev","taxes"
diff --git a/addons/l10n_si/data/account.account.template.csv b/addons/l10n_si/data/account.account.template.csv
index 92cbf7ee3b3..40b08e97e60 100644
--- a/addons/l10n_si/data/account.account.template.csv
+++ b/addons/l10n_si/data/account.account.template.csv
@@ -96,14 +96,14 @@ code,id,user_type_id/id,name,reconcile,chart_template_id/id
 155000,gd_acc_155000,account.data_account_type_current_assets,"DRUGE KRATKOROČNE TERJATVE, POVEZANE S FINANČNIMI PRIHODKI",False,gd_chart
 159000,gd_acc_159000,account.data_account_type_current_assets,"OSLABITEV VREDNOSTI KRATKOROČNIH TERJATEV, POVEZANIH S FINANČNIMI PRIHODKI",False,gd_chart
 160001,gd_acc_160001,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA NEODBITNI DDV",False,gd_chart
-160002,gd_acc_160002,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 8,5%",False,gd_chart
-160003,gd_acc_160003,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 20%",False,gd_chart
-160004,gd_acc_160004,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 8,5% V EU",False,gd_chart
-160005,gd_acc_160005,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 20% V EU",False,gd_chart
-160006,gd_acc_160006,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 8,5% IZVEN EU",False,gd_chart
-160007,gd_acc_160007,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 20% IZVEN EU",False,gd_chart
-160008,gd_acc_160008,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 8,5% UVOZ",False,gd_chart
-160009,gd_acc_160009,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 20% UVOZ",False,gd_chart
+160002,gd_acc_160002,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 9,5%",False,gd_chart
+160003,gd_acc_160003,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 22%",False,gd_chart
+160004,gd_acc_160004,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 9,5% V EU",False,gd_chart
+160005,gd_acc_160005,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 22% V EU",False,gd_chart
+160006,gd_acc_160006,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 9,5% IZVEN EU",False,gd_chart
+160007,gd_acc_160007,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 22% IZVEN EU",False,gd_chart
+160008,gd_acc_160008,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 9,5% UVOZ",False,gd_chart
+160009,gd_acc_160009,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA ODBITNI DDV 22% UVOZ",False,gd_chart
 161000,gd_acc_161000,account.data_account_type_current_assets,"KRATKOROČNE TERJATVE ZA DAVEK OD DOHODKOV PRAVNIH OSEB, VKLJUČNO Z DAVKOM, PLAČANIM V TUJINI",False,gd_chart
 162000,gd_acc_162000,account.data_account_type_current_assets,"DRUGE KRATKOROČNE TERJATVE DO DRŽAVNIH IN DRUGIH INŠTITUCIJ",False,gd_chart
 165000,gd_acc_165000,account.data_account_type_current_assets,"OSTALE KRATKOROČNE TERJATVE",False,gd_chart
@@ -152,12 +152,12 @@ code,id,user_type_id/id,name,reconcile,chart_template_id/id
 255000,gd_acc_255000,account.data_account_type_current_liabilities,"KRATKOROČNE OBVEZNOSTI ZA DRUGE PREJEMKE IZ DELOVNEGA RAZMERJA",False,gd_chart
 256000,gd_acc_256000,account.data_account_type_current_liabilities,"KRATKOROČNE OBVEZNOSTI ZA PRISPEVKE IZ DRUGIH PREJEMKOV IZ DELOVNEGA RAZMERJA, KI SE NE OBRAČUNAVAJO SKUPAJ S PLAČAMI",False,gd_chart
 257000,gd_acc_257000,account.data_account_type_current_liabilities,"KRATKOROČNE OBVEZNOSTI ZA DAVEK IZ DRUGIH PREJEMKOV IZ DELOVNEGA RAZMERJA, KI SE NE OBRAČUNAVAJO SKUPAJ S PLAČAMI",False,gd_chart
-260001,gd_acc_260001,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 8,5%",False,gd_chart
-260002,gd_acc_260002,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 20%",False,gd_chart
-260003,gd_acc_260003,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 8,5% V EU",False,gd_chart
-260004,gd_acc_260004,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 20% V EU",False,gd_chart
-260005,gd_acc_260005,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 8,5% IZVEN EU",False,gd_chart
-260006,gd_acc_260006,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 20% IZVEN EU",False,gd_chart
+260001,gd_acc_260001,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 9,5%",False,gd_chart
+260002,gd_acc_260002,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 22%",False,gd_chart
+260003,gd_acc_260003,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 9,5% V EU",False,gd_chart
+260004,gd_acc_260004,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 22% V EU",False,gd_chart
+260005,gd_acc_260005,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 9,5% IZVEN EU",False,gd_chart
+260006,gd_acc_260006,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA ZARAČUNANI DDV 22% IZVEN EU",False,gd_chart
 261000,gd_acc_261000,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA DDV, CARINO IN DRUGE DAJATVE OD UVOŽENEGA BLAGA",False,gd_chart
 262000,gd_acc_262000,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA PRISPEVKE IZPLAČEVALCA",False,gd_chart
 263000,gd_acc_263000,account.data_account_type_current_liabilities,"OBVEZNOSTI ZA DAVEK OD IZPLAČANIH PLAČ",False,gd_chart
diff --git a/addons/l10n_si/data/account.tax.template.csv b/addons/l10n_si/data/account.tax.template.csv
index 0501428381b..7e5fcc05fff 100644
--- a/addons/l10n_si/data/account.tax.template.csv
+++ b/addons/l10n_si/data/account.tax.template.csv
@@ -1,15 +1,15 @@
 "id","chart_template_id/id","name","description","amount_type","amount","type_tax_use","price_include","refund_account_id/id","account_id/id","include_base_amount","sequence","children_tax_ids/id","tag_ids/id"
 "gd_taxr_1","gd_chart","Izstopni DDV 0%","DDV-I-0","percent","0","sale","True",,,,,,"DDV_I_0"
-"gd_taxr_2","gd_chart","Izstopni DDV 8.5%","DDV-I-8.5","percent","8.5","sale","True","gd_acc_260001","gd_acc_260001","False",,,"DDV_I_8_5"
-"gd_taxr_3","gd_chart","Izstopni DDV 20%","DDV-I-20","percent","20","sale","True","gd_acc_260002","gd_acc_260002","False",,,"DDV_I_20"
+"gd_taxr_2","gd_chart","Izstopni DDV 9.5%","DDV-I-9.5","percent","9.5","sale","True","gd_acc_260001","gd_acc_260001","False",,,"DDV_I_9_5"
+"gd_taxr_3","gd_chart","Izstopni DDV 22%","DDV-I-22","percent","22","sale","True","gd_acc_260002","gd_acc_260002","False",,,"DDV_I_22"
 "gd_taxp_1","gd_chart","Vstopni DDV 0%","DDV-V-0","percent","0","purchase","True",,,,,,"DDV_V_0"
-"gd_taxp_2","gd_chart","Vstopni DDV 8.5%","DDV-V-8.5","percent","8.5","purchase","True","gd_acc_160002","gd_acc_160002","False",,,"DDV_V_8_5"
-"gd_taxp_3","gd_chart","Vstopni DDV 20%","DDV-V-20","percent","20","purchase","True","gd_acc_160003","gd_acc_160003","False",,,"DDV_V_20"
-"gd_taxp_nr_1","gd_chart","Vstopni DDV 8.5% - neodbitni","DDV-V-8.5-NE","percent","8.5","purchase","True","gd_acc_160001","gd_acc_160001","False",,,"DDV_V_8_5_NE"
-"gd_taxp_nr_2","gd_chart","Vstopni DDV 20% - neodbitni","DDV-V-20-NE","percent","20","purchase","True","gd_acc_160001","gd_acc_160001","False",,,"DDV_V_20_NE"
-"gd_taxp_st_1_1","gd_chart","Vstopni DDV 8.5% - SO","SO-DDV-V-8.5","percent","8.5","none","False","gd_acc_160002","gd_acc_160002","False",,,"DDV_V_8_5_SO"
-"gd_taxp_st_1_2","gd_chart","Izstopni DDV 8.5% - SO","SO-DDV-I-8.5","percent","-8.5","none","False","gd_acc_260001","gd_acc_260001","False",,,"DDV_I_8_5_SO"
-"gd_taxp_st_1","gd_chart","Vstopni DDV 8.5% - samoobdavčitev","DDV-V-8.5-SO","group","0","purchase","False",,,"False",,"gd_taxp_st_1_1,gd_taxp_st_1_2","DDV_V_8_5_sam"
-"gd_taxp_st_2_1","gd_chart","Vstopni DDV 20% - SO","SO-DDV-V-20","percent","20","none","False","gd_acc_160003","gd_acc_160003","False",,,"DDV_V_20_SO"
-"gd_taxp_st_2_2","gd_chart","Izstopni DDV 20% - SO","SO-DDV-I-20","percent","-20","none","False","gd_acc_260002","gd_acc_260002","False",,,"DDV_I_20_SO"
-"gd_taxp_st_2","gd_chart","Vstopni DDV 20% - samoobdavčitev","DDV-V-20-SO","group","0","purchase","False",,,"False",,"gd_taxp_st_2_1,gd_taxp_st_2_2","DDV_V_20_sam"
+"gd_taxp_2","gd_chart","Vstopni DDV 9.5%","DDV-V-9.5","percent","9.5","purchase","True","gd_acc_160002","gd_acc_160002","False",,,"DDV_V_9_5"
+"gd_taxp_3","gd_chart","Vstopni DDV 22%","DDV-V-22","percent","22","purchase","True","gd_acc_160003","gd_acc_160003","False",,,"DDV_V_22"
+"gd_taxp_nr_1","gd_chart","Vstopni DDV 9.5% - neodbitni","DDV-V-9.5-NE","percent","9.5","purchase","True","gd_acc_160001","gd_acc_160001","False",,,"DDV_V_9_5_NE"
+"gd_taxp_nr_2","gd_chart","Vstopni DDV 22% - neodbitni","DDV-V-22-NE","percent","22","purchase","True","gd_acc_160001","gd_acc_160001","False",,,"DDV_V_22_NE"
+"gd_taxp_st_1_1","gd_chart","Vstopni DDV 9.5% - SO","SO-DDV-V-9.5","percent","9.5","none","False","gd_acc_160002","gd_acc_160002","False",,,"DDV_V_9_5_SO"
+"gd_taxp_st_1_2","gd_chart","Izstopni DDV 9.5% - SO","SO-DDV-I-9.5","percent","-9.5","none","False","gd_acc_260001","gd_acc_260001","False",,,"DDV_I_9_5_SO"
+"gd_taxp_st_1","gd_chart","Vstopni DDV 9.5% - samoobdavčitev","DDV-V-9.5-SO","group","0","purchase","False",,,"False",,"gd_taxp_st_1_1,gd_taxp_st_1_2","DDV_V_9_5_sam"
+"gd_taxp_st_2_1","gd_chart","Vstopni DDV 22% - SO","SO-DDV-V-22","percent","22","none","False","gd_acc_160003","gd_acc_160003","False",,,"DDV_V_22_SO"
+"gd_taxp_st_2_2","gd_chart","Izstopni DDV 22% - SO","SO-DDV-I-22","percent","-22","none","False","gd_acc_260002","gd_acc_260002","False",,,"DDV_I_22_SO"
+"gd_taxp_st_2","gd_chart","Vstopni DDV 22% - samoobdavčitev","DDV-V-22-SO","group","0","purchase","False",,,"False",,"gd_taxp_st_2_1,gd_taxp_st_2_2","DDV_V_22_sam"
diff --git a/doc/cla/corporate/goopen.md b/doc/cla/corporate/goopen.md
index 91f5cded22a..5d562fed621 100644
--- a/doc/cla/corporate/goopen.md
+++ b/doc/cla/corporate/goopen.md
@@ -12,4 +12,5 @@ Aleš Ferlan alefer89@protonmail.com
 
 List of contributors:
 
+Aleš Ferlan alefer89@gmail.com https://github.com/Alko89
 Aleš Ferlan alefer89@protonmail.com
diff --git a/doc/cla/individual/Sergio2409.md b/doc/cla/individual/Sergio2409.md
new file mode 100644
index 00000000000..dd118d31abf
--- /dev/null
+++ b/doc/cla/individual/Sergio2409.md
@@ -0,0 +1,11 @@
+Cuba, 2016-10-24
+
+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,
+
+Sergio Valdés sergiov@merchise.org https://github.com/Sergio2409
diff --git a/odoo.py b/odoo.py
index 6c204e101d6..4390ecedab9 100755
--- a/odoo.py
+++ b/odoo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 #----------------------------------------------------------
 # odoo cli
 #