diff --git a/addons/account/account.py b/addons/account/account.py
index 9f0ac88ad35..8c38566f79d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1554,6 +1554,14 @@ class account_config_fiscalyear(osv.osv_memory):
'date1': lambda *a: time.strftime('%Y-01-01'),
'date2': lambda *a: time.strftime('%Y-12-31'),
}
+ def action_cancel(self,cr,uid,ids,conect=None):
+ return {
+ 'view_type': 'form',
+ "view_mode": 'form',
+ 'res_model': 'ir.module.module.configuration.wizard',
+ 'type': 'ir.actions.act_window',
+ 'target':'new',
+ }
def action_create(self, cr, uid,ids, context=None):
res=self.read(cr,uid,ids)[0]
if 'date1' in res and 'date2' in res:
@@ -1589,6 +1597,15 @@ class account_config_journal_bank_accounts(osv.osv_memory):
'lines_id': fields.one2many('account.config.journal.bank.account.line', 'journal_id', 'Journal Lines'),
}
+ def action_cancel(self,cr,uid,ids,conect=None):
+ return {
+ 'view_type': 'form',
+ "view_mode": 'form',
+ 'res_model': 'ir.module.module.configuration.wizard',
+ 'type': 'ir.actions.act_window',
+ 'target':'new',
+ }
+
def action_create(self, cr, uid, ids, context=None):
config_res=self.read(cr,uid,ids)[0]
res_obj = self.pool.get('account.journal')
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index acf47668ea5..5e0790f5af3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1421,7 +1421,7 @@
-
+
@@ -1460,7 +1460,7 @@
-
+
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 4bdb1692350..e8f4cd528f7 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -91,6 +91,14 @@ class config_install_extra_modules(osv.osv_memory):
'holidays_module':fields.boolean('Holidays module'),
}
+ def action_cancel(self,cr,uid,ids,conect=None):
+ return {
+ 'view_type': 'form',
+ "view_mode": 'form',
+ 'res_model': 'ir.module.module.configuration.wizard',
+ 'type': 'ir.actions.act_window',
+ 'target':'new',
+ }
def action_install(self, cr, uid, ids, context=None):
res=self.read(cr,uid,ids)[0]
mod_obj = self.pool.get('ir.module.module')
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index 4c8b5a3da44..19068597808 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -22,7 +22,7 @@
-->
-
+
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6b1e3cc3ac9..7aed9be9058 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -864,4 +864,12 @@ class sale_config_picking_policy(osv.osv_memory):
'type': 'ir.actions.act_window',
'target':'new',
}
+ def action_cancel(self,cr,uid,ids,conect=None):
+ return {
+ 'view_type': 'form',
+ "view_mode": 'form',
+ 'res_model': 'ir.module.module.configuration.wizard',
+ 'type': 'ir.actions.act_window',
+ 'target':'new',
+ }
sale_config_picking_policy()
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4bfe452fc1a..2806d93877e 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -2,7 +2,7 @@
-
+
sale.shop
sale.shop
@@ -33,7 +33,7 @@
-
+
Shop
ir.actions.act_window
@@ -43,7 +43,7 @@
-
+
sale.order.tree
sale.order
@@ -61,7 +61,7 @@
-
+
sale.order.form
sale.order
@@ -187,7 +187,7 @@
form
-
+
My Sales Order
ir.actions.act_window
@@ -197,8 +197,8 @@
[('user_id','=',uid)]
-
-
+
+
All Sales Order
ir.actions.act_window
@@ -207,8 +207,8 @@
tree,form
-
-
+
+
Sales in Exception
ir.actions.act_window
@@ -218,7 +218,7 @@
[('state','in',('shipping_except','invoice_except')]
-
+
Sales Order To Be Invoiced
ir.actions.act_window
@@ -228,7 +228,7 @@
[('state','=','manual')]
-
+
Sales Order in Progress
ir.actions.act_window
@@ -238,8 +238,8 @@
[('state','in',('progress','waiting_date','manual'))]
-
-
+
+
All Quotations
ir.actions.act_window
@@ -249,7 +249,7 @@
[('state','=','draft')]
-
+
My sales in shipping exception
ir.actions.act_window
@@ -259,7 +259,7 @@
[('state','in',('shipping_except','invoice_except')),('user_id','=',uid)]
-
+
My sales order waiting Invoice
ir.actions.act_window
@@ -269,7 +269,7 @@
[('state','=','manual'),('user_id','=',uid)]
-
+
My sales order in progress
ir.actions.act_window
@@ -279,8 +279,8 @@
[('state','in',('progress','waiting_date','manual')),('user_id','=',uid)]
-
-
+
+
My Quotations
ir.actions.act_window
@@ -290,8 +290,8 @@
[('state','=','draft'),('user_id','=',uid)]
-
-
+
+
sale.order.line.graph
sale.order.line
@@ -303,8 +303,8 @@
-
-
+
+
sale.order.line.tree
sale.order.line
@@ -337,7 +337,7 @@
-
+
@@ -365,8 +365,8 @@
-
-
+
+
Sales Order Lines
ir.actions.act_window
@@ -375,7 +375,7 @@
-
+
Uninvoiced lines
ir.actions.act_window
@@ -385,7 +385,7 @@
[('invoiced','<>', 1),('state','<>','draft'),('state','<>','cancel')]
-
+
Uninvoiced and Delivered Lines
ir.actions.act_window
@@ -395,7 +395,7 @@
[('invoiced','<>', 1),('state','=','done')]
-
+
All Sale Order Lines
ir.actions.act_window
@@ -404,16 +404,16 @@
tree,form
-
+
-
+
-
-
-
-
+
+
+
+
-
+
Configure Picking Policy for Sale Order
sale.config.picking_policy
@@ -424,13 +424,13 @@
-
+
-
+
Configure Picking Policy for Sale Order
ir.actions.act_window
@@ -439,7 +439,7 @@
form
new
-
+
Select the default picking policy for Sale Order
@@ -447,7 +447,7 @@
open
-
-
+
+