summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2017-08-03 15:14:24 +0200
committerNicolas Martinelli <nim@odoo.com>2017-08-04 08:25:33 +0200
commit7cd2f63705f8c4ddfd05c70d79aa6261ae191d18 (patch)
tree7518af4a55db50845782a251011ec9fb46ca9309 /addons
parent54e4e3156f5990a9e58abaad5e051c7ea67aea74 (diff)
[FIX] *: cancel settings
To reproduce: - Go Website Admin > Configuration > Settings - Change the Website Name - Click on 'Cancel' The name is saved. When the "Cancel" button is clicked, we automatically save the record (which is a transient model). Since the field is a related to the company, the name is changed even if we canceled. opw-760749
Diffstat (limited to 'addons')
-rw-r--r--addons/account/views/res_config_view.xml2
-rw-r--r--addons/base_setup/views/res_config_views.xml2
-rw-r--r--addons/event/views/event_config_settings_views.xml2
-rw-r--r--addons/hr_attendance/views/res_config_view.xml4
-rw-r--r--addons/hr_expense/views/res_config_views.xml2
-rw-r--r--addons/hr_payroll/views/res_config_views.xml2
-rw-r--r--addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml2
-rw-r--r--addons/mass_mailing/views/res_config_views.xml2
-rw-r--r--addons/mrp/views/mrp_config_settings_views.xml2
-rw-r--r--addons/point_of_sale/views/res_config_view.xml2
-rw-r--r--addons/project/views/res_config_views.xml2
-rw-r--r--addons/purchase/views/res_config_views.xml2
-rw-r--r--addons/sales_team/views/res_config_view.xml4
-rw-r--r--addons/stock/views/stock_config_settings_views.xml2
-rw-r--r--addons/web/static/src/js/views/form_view.js2
-rw-r--r--addons/website/views/res_config_views.xml2
16 files changed, 18 insertions, 18 deletions
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml
index 3a0843956c7..8f26321b522 100644
--- a/addons/account/views/res_config_view.xml
+++ b/addons/account/views/res_config_view.xml
@@ -16,7 +16,7 @@
<form string="Configure Accounting" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<field name="has_default_company" invisible="1" />
<field name="has_chart_of_accounts" invisible="1"/>
diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/res_config_views.xml
index 0e2b3f7274b..09d551f72cd 100644
--- a/addons/base_setup/views/res_config_views.xml
+++ b/addons/base_setup/views/res_config_views.xml
@@ -7,7 +7,7 @@
<form string="General Settings" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<separator string="General Settings"/>
<div>
diff --git a/addons/event/views/event_config_settings_views.xml b/addons/event/views/event_config_settings_views.xml
index ddee7374813..9f24c09bb98 100644
--- a/addons/event/views/event_config_settings_views.xml
+++ b/addons/event/views/event_config_settings_views.xml
@@ -9,7 +9,7 @@
<form class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Events">
<field name="module_event_sale" widget="radio"/>
diff --git a/addons/hr_attendance/views/res_config_view.xml b/addons/hr_attendance/views/res_config_view.xml
index 9e1b9b5ef4c..6d274659962 100644
--- a/addons/hr_attendance/views/res_config_view.xml
+++ b/addons/hr_attendance/views/res_config_view.xml
@@ -8,7 +8,7 @@
<form string="Configuration" class= "oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Settings">
<field name="group_attendance_use_pin" widget="radio"/>
@@ -27,4 +27,4 @@
<menuitem id="hr_attendance.menu_hr_attendance_settings" name="Configuration" parent="menu_hr_attendance_root"
sequence="99" action="action_hr_attendance_settings" groups="hr_attendance.group_hr_attendance_manager"/>
-</odoo> \ No newline at end of file
+</odoo>
diff --git a/addons/hr_expense/views/res_config_views.xml b/addons/hr_expense/views/res_config_views.xml
index e4435d5ab6c..86842c95cba 100644
--- a/addons/hr_expense/views/res_config_views.xml
+++ b/addons/hr_expense/views/res_config_views.xml
@@ -9,7 +9,7 @@
<form class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Expenses" name="config_alias">
<label for="id" string="Expense Email Alias"/>
diff --git a/addons/hr_payroll/views/res_config_views.xml b/addons/hr_payroll/views/res_config_views.xml
index a37f0223c91..029041e6f68 100644
--- a/addons/hr_payroll/views/res_config_views.xml
+++ b/addons/hr_payroll/views/res_config_views.xml
@@ -15,7 +15,7 @@
<form string="Configure Payroll" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Payroll">
<label for="id" string="Settings"/>
diff --git a/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml b/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml
index 61fe41112b2..0aa3d29de7c 100644
--- a/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_config_settings_views.xml
@@ -8,7 +8,7 @@
<form string="Configure HR Recruitment" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Recruitment">
<field name="module_hr_recruitment_survey" widget="radio"/>
diff --git a/addons/mass_mailing/views/res_config_views.xml b/addons/mass_mailing/views/res_config_views.xml
index f6ef49c620a..63502868658 100644
--- a/addons/mass_mailing/views/res_config_views.xml
+++ b/addons/mass_mailing/views/res_config_views.xml
@@ -7,7 +7,7 @@
<form string="Configure Mass Mailing" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Mass Mailing" name="mass_mailing_group">
<field name="group_mass_mailing_campaign" widget="radio"/>
diff --git a/addons/mrp/views/mrp_config_settings_views.xml b/addons/mrp/views/mrp_config_settings_views.xml
index c5d960500e0..86ad509d963 100644
--- a/addons/mrp/views/mrp_config_settings_views.xml
+++ b/addons/mrp/views/mrp_config_settings_views.xml
@@ -8,7 +8,7 @@
<form string="Configure Manufacturing" class= "oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Logistics" name="logistics">
<field name="company_id" invisible="1"/>
diff --git a/addons/point_of_sale/views/res_config_view.xml b/addons/point_of_sale/views/res_config_view.xml
index 4e82b88ef7d..f4297cd0295 100644
--- a/addons/point_of_sale/views/res_config_view.xml
+++ b/addons/point_of_sale/views/res_config_view.xml
@@ -7,7 +7,7 @@
<form class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Importable Point of Sale Data">
<label for="div" string="Beverages"/>
diff --git a/addons/project/views/res_config_views.xml b/addons/project/views/res_config_views.xml
index 4e14e4466cb..81508ee8cd9 100644
--- a/addons/project/views/res_config_views.xml
+++ b/addons/project/views/res_config_views.xml
@@ -8,7 +8,7 @@
<form class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Project Management" name="project_management">
<field name="company_id" invisible="1"/>
diff --git a/addons/purchase/views/res_config_views.xml b/addons/purchase/views/res_config_views.xml
index e2fa760df15..538744f1211 100644
--- a/addons/purchase/views/res_config_views.xml
+++ b/addons/purchase/views/res_config_views.xml
@@ -7,7 +7,7 @@
<form string="Configure Purchases" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Logistics">
<group>
diff --git a/addons/sales_team/views/res_config_view.xml b/addons/sales_team/views/res_config_view.xml
index 73475d196c4..58bd967562f 100644
--- a/addons/sales_team/views/res_config_view.xml
+++ b/addons/sales_team/views/res_config_view.xml
@@ -8,7 +8,7 @@
<form string="Configure Sales" class="oe_form_configuration" name="sale_config_form">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<div id="main"/>
</form>
@@ -23,4 +23,4 @@
<field name="view_mode">form</field>
<field name="target">inline</field>
</record>
-</odoo> \ No newline at end of file
+</odoo>
diff --git a/addons/stock/views/stock_config_settings_views.xml b/addons/stock/views/stock_config_settings_views.xml
index ee15b4dc1c8..659e39c654c 100644
--- a/addons/stock/views/stock_config_settings_views.xml
+++ b/addons/stock/views/stock_config_settings_views.xml
@@ -8,7 +8,7 @@
<form string="Configure Warehouse" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<group string="Traceability" name="traceability">
<field name="group_stock_production_lot" widget="radio"/>
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index 2ca20d5f9ab..ce850dc5ff5 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -942,7 +942,7 @@ var FormView = View.extend(common.FieldManagerMixin, {
var self = this;
return this.reload_mutex.exec(function() {
if (self.dataset.index === null || self.dataset.index === undefined) {
- self.trigger("previous_view");
+ self.do_action('reload');
return $.Deferred().reject().promise();
}
if (self.dataset.index < 0) {
diff --git a/addons/website/views/res_config_views.xml b/addons/website/views/res_config_views.xml
index 9cb790a4d04..7632c77d812 100644
--- a/addons/website/views/res_config_views.xml
+++ b/addons/website/views/res_config_views.xml
@@ -9,7 +9,7 @@
<form string="Configure Website" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
- <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+ <button string="Cancel" type="object" name="cancel" class="oe_link" special="cancel"/>
</header>
<div>
<field name="website_id" invisible="1"/>