Merge lp:~unifield-team/unifield-web/uf_408_remove_duplicate_button into lp:unifield-web

[Duy VO]

use a quick&dirty solution, if it's too dirty, then i will try another solution ...

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2011-08-01 15:24:01 +0000
+++ addons/openerp/controllers/form.py	2011-08-16 10:22:26 +0000
@@ -23,13 +23,16 @@
 import cherrypy
 from openerp import utils, widgets as tw, validators
 from openerp.controllers import SecuredController
-from openerp.utils import rpc, common, TinyDict, TinyForm, expr_eval
+from openerp.utils import rpc, common, TinyDict, TinyForm, expr_eval, node_attributes
 from error_page import _ep
 from openobject.tools import expose, redirect, validate, error_handler, exception_handler
 import openobject
 import openobject.paths
 import simplejson
 
+import xml.dom.minidom
+
+
 def make_domain(name, value, kind='char'):
     """A helper function to generate domain for the given name, value pair.
     Will be used for search window...
@@ -207,6 +210,13 @@
         buttons.new = (not editable or mode == 'tree') and mode != 'diagram'
         buttons.edit = not editable and (mode == 'form' or mode == 'diagram')
         buttons.save = editable and mode == 'form'
+
+
+        # UF-408: A quick&dirty fix to remove the button "duplicate" in the view Periods!
+        buttons.duplicate = True
+        if params.model == "account.period":
+            buttons.duplicate = False
+        
         buttons.cancel = editable and mode == 'form'
         buttons.delete = not editable and mode == 'form'
         buttons.pager =  mode == 'form' or mode == 'diagram'# Pager will visible in edit and non-edit mode in form view.
@@ -287,7 +297,6 @@
                                        '_terp_notebook_tab': notebook_tab})
         params.o2m_edit = o2m_edit
         params.editable = editable
-        params.action_id = kw.get('action_id')
 
         if kw.get('default_date'):
             params.context.update({'default_date' : kw['default_date']})
@@ -405,24 +414,10 @@
                 params.ids = (params.ids or []) + [params.id]
                 params.count += 1
             else:
-                ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
-                if params.button and params.button.name:
+                 ctx = utils.context_with_concurrency_info(params.context, params.concurrency_info)
+                 if params.button and params.button.name:
                     ctx.update({'button': params.button.name})
-                
-                #original_data = Model.read(params.id, data.keys())
-                #modified = {}
-                
-                #if original_data and isinstance(original_data, dict):
-                #    for field, original_value in original_data.iteritems():
-                #        if isinstance(original_value, tuple):
-                #            original_data[field] = original_value[0]
-                #        if field in data and data[field] != original_data[field]:
-                #            modified[field] = data[field]
-
-                #    Model.write([params.id], modified, ctx)
-                #else:
-                #    Model.write([params.id], data, ctx)
-                Model.write([params.id], data, ctx)
+                 Model.write([params.id], data, ctx)
 
             tw.ConcurrencyInfo.update(
                 params.model, Model.read([params.id], ['__last_update'], ctx)

=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako	2011-01-21 09:36:34 +0000
+++ addons/openerp/controllers/templates/form.mako	2011-08-16 10:22:26 +0000
@@ -125,7 +125,7 @@
                             <a href="javascript: void(0);" onclick="submit_form('save_and_edit')" class="button-a">${_("Save & Edit")}</a>
                         </li>
                         % endif
-                        % if buttons.edit and form.screen.view_type== 'form':
+                        % if buttons.edit and form.screen.view_type== 'form' and buttons.duplicate:
                         <li title="${_('Duplicate this resource')}">
                             <a href="javascript: void(0);" onclick="submit_form('duplicate')" class="button-a">${_("Duplicate")}</a>
                         </li>