pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port of branch 8.0 up to a4c4c43

Browse Source
This commit is contained in:
Christophe Simonis
2016-05-02 12:37:35 +02:00
parent 03a2b6ba5e a4c4c43bd9
commit e2faeab4b8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/res_partner.py
+2 -1
View File
@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
############################################################################## ##############################################################################
from openerp import api
from openerp.osv import fields,osv from openerp.osv import fields,osv
class res_partner(osv.osv): class res_partner(osv.osv):
@@ -36,6 +36,7 @@ class res_partner(osv.osv):
'task_count': fields.function(_task_count, string='# Tasks', type='integer'), 'task_count': fields.function(_task_count, string='# Tasks', type='integer'),
} }
@api.cr_uid_id_context
def copy(self, cr, uid, record_id, default=None, context=None): def copy(self, cr, uid, record_id, default=None, context=None):
if default is None: if default is None:
default = {} default = {}
doc/cla/corporate/initos.md
+5 -3
View File
@@ -1,6 +1,6 @@
Germany, 2015-02-26 Germany, 2016-04-20
initOS GmbH & Co. KG agrees to the terms of the Odoo Corporate initOS GmbH agrees to the terms of the Odoo Corporate
Contributor License Agreement v1.0. Contributor License Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this I declare that I am authorized and able to make this agreement and sign this
@@ -8,7 +8,7 @@ declaration.
Signed, Signed,
Markus Schneider markus.schneider@initos.com https://github.com/OSguard Frederik Kramer frederik.kramer@initos.com https://github.com/OSevangelist
List of contributors: List of contributors:
@@ -19,3 +19,5 @@ Frederik Kramer frederik.kramer@initos.com https://github.com/OSevangelist
Nikolina Todorova nikolina.todorova@initos.com https://github.com/ntodorova Nikolina Todorova nikolina.todorova@initos.com https://github.com/ntodorova
Peter Hahn peter.hahn@initos.com https://github.com/codingforfun Peter Hahn peter.hahn@initos.com https://github.com/codingforfun
Claudia Haida claudia.haida@initos.com Claudia Haida claudia.haida@initos.com
Andreas Zöllner andreas.zoellner@initos.com https://github.com/azoellner
Rami Alwafaie rami.alwafaie@initos.com https://github.com/rami-wafaie