← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1

 

Sbh (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #644398 Resource : there is no menu entry to configure resource.calendar
  https://bugs.launchpad.net/bugs/644398
  #671360 [RC1] base_report_designer can't push report to db
  https://bugs.launchpad.net/bugs/671360
  #680121 Partner : History tab should be invisible by default,must be available on request of concerned modules.
  https://bugs.launchpad.net/bugs/680121
  #684791 troubles with recurency in calendar
  https://bugs.launchpad.net/bugs/684791
  #689574 Not possible to create a Inbound call from the history tab of the partner form
  https://bugs.launchpad.net/bugs/689574
  #691006 cannot save new lead after have duplicated it.
  https://bugs.launchpad.net/bugs/691006
  #691640 Required field customer in project empty after customer delete
  https://bugs.launchpad.net/bugs/691640


Bug fix lp: 691640
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/sbh-dev-addons1/+merge/44312
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/sbh-dev-addons1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.
=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2010-11-22 10:37:53 +0000
+++ project_timesheet/project_timesheet.py	2010-12-21 04:46:57 +0000
@@ -220,4 +220,15 @@
         return super(task,self).write(cr, uid, ids, vals, context)
 
 task()
+
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    def unlink(self, cursor, user, ids, context=None):
+        parnter_id=self.pool.get('project.project').search(cursor, user, [('partner_id', 'in', ids)])
+        if parnter_id:
+            raise osv.except_osv(_('Invalid action !'), _('Cannot delete Partner which is Assigned to project  !'))            
+        return super(res_partner,self).unlink(cursor, user, ids,
+                context=context)
+res_partner()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:


Follow ups