From ee854ffcf19de888170d8a9fc62b7664f8b82b3a Mon Sep 17 00:00:00 2001 From: "Harry (Open ERP)" Date: Thu, 1 Apr 2010 19:07:42 +0530 Subject: [PATCH 1/3] [FIX] orm: fixed problem on function field with store=True in create method bzr revid: hmo@tinyerp.com-20100401133742-lnq4fhjvishnl10i --- bin/osv/orm.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 6b78c18b83e..430745deaa0 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -3269,8 +3269,9 @@ class orm(orm_template): upd0.append('"'+v+'"='+self._columns[v]._symbol_set[0]) upd1.append(self._columns[v]._symbol_set[1](value[v])) upd1.append(id) - cr.execute('update "' + self._table + '" set ' + \ - string.join(upd0, ',') + ' where id = %s', upd1) + if upd0 and upd1: + cr.execute('update "' + self._table + '" set ' + \ + string.join(upd0, ',') + ' where id = %s', upd1) else: for f in val: From 68124ff51d286d79c73b9fd18dd22af6539a749a Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Fri, 2 Apr 2010 04:41:45 +0100 Subject: [PATCH 2/3] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100402034145-55ukt1iltnloq83v --- bin/addons/base/i18n/bg.po | 4 ++-- bin/addons/base/i18n/hr.po | 4 ++-- bin/addons/base/i18n/ja.po | 4 ++-- bin/addons/base/i18n/sv.po | 4 ++-- bin/addons/base/i18n/uk.po | 4 ++-- bin/addons/base/i18n/zh_CN.po | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bin/addons/base/i18n/bg.po b/bin/addons/base/i18n/bg.po index a0d0053c68e..297b2d31301 100644 --- a/bin/addons/base/i18n/bg.po +++ b/bin/addons/base/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-03-31 08:05+0000\n" +"PO-Revision-Date: 2010-04-01 04:11+0000\n" "Last-Translator: Boris \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po index 7e9a7965906..55f4faa1f59 100644 --- a/bin/addons/base/i18n/hr.po +++ b/bin/addons/base/i18n/hr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-03-31 06:01+0000\n" +"PO-Revision-Date: 2010-04-01 04:15+0000\n" "Last-Translator: goranc \n" "Language-Team: openerp-translators\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: hr\n" diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po index 81af2e76f06..b3b586b82a7 100644 --- a/bin/addons/base/i18n/ja.po +++ b/bin/addons/base/i18n/ja.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-03-31 05:47+0000\n" +"PO-Revision-Date: 2010-04-01 04:13+0000\n" "Last-Translator: Harry (Open ERP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po index c342e6457fb..4021ba05f39 100644 --- a/bin/addons/base/i18n/sv.po +++ b/bin/addons/base/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-03-31 04:49+0000\n" +"PO-Revision-Date: 2010-04-01 04:09+0000\n" "Last-Translator: Anders Wallenquist \n" "Language-Team: <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po index 822ac82f43d..bb304a6d3a1 100644 --- a/bin/addons/base/i18n/uk.po +++ b/bin/addons/base/i18n/uk.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-03-31 05:27+0000\n" +"PO-Revision-Date: 2010-04-01 04:14+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po index 9573d0c4996..18feb650de8 100644 --- a/bin/addons/base/i18n/zh_CN.po +++ b/bin/addons/base/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-03-31 05:03+0000\n" +"PO-Revision-Date: 2010-04-01 04:12+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n" +"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base From 12d76c10ec92af58cd9708e5e729f2cd1f7af723 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 2 Apr 2010 09:51:40 +0200 Subject: [PATCH 3/3] [IMP] crm deadlines bzr revid: fp@tinyerp.com-20100402075140-0ih2h9m3pd017s0c --- addons/crm/crm.py | 1 - addons/crm/crm_opportunity.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index a6baed45b4e..da3de2831dc 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -271,7 +271,6 @@ class crm_case(osv.osv): 'partner_address_id': _get_default_partner_address, 'email_from': _get_default_email, 'state': lambda *a: 'draft', - 'date_deadline': lambda *a:(datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'), 'section_id': _get_section, 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c), } diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py index ea70e850ed8..b33fce22104 100644 --- a/addons/crm/crm_opportunity.py +++ b/addons/crm/crm_opportunity.py @@ -47,6 +47,7 @@ class crm_opportunity(osv.osv): 'date_closed': fields.datetime('Closed', readonly=True), 'user_id': fields.many2one('res.users', 'Salesman'), 'phone': fields.char("Phone", size=64), + 'date_deadline': fields.date('Expected Closing'), 'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\