From 54bd1efc6d845a53568269965a0823b6268b23f5 Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Mon, 15 Mar 2010 04:48:27 +0000 Subject: [PATCH 01/12] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100313045105-drjiyqsjjwkryu6s bzr revid: codehost@crowberry-20100314050224-lzrxzcq27be2qlxg bzr revid: codehost@crowberry-20100315044827-75bry7s7k1dev73q --- bin/addons/base/i18n/fi.po | 8 ++++---- bin/addons/base/i18n/hr.po | 4 ++-- bin/addons/base/i18n/it.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 | 30 +++++++++++++++--------------- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/bin/addons/base/i18n/fi.po b/bin/addons/base/i18n/fi.po index 554dc2dfb21..d76791b3541 100644 --- a/bin/addons/base/i18n/fi.po +++ b/bin/addons/base/i18n/fi.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: 2009-12-15 06:31+0000\n" -"Last-Translator: mra (Open ERP) \n" +"PO-Revision-Date: 2010-03-13 05:29+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-01-14 04:45+0000\n" +"X-Launchpad-Export-Date: 2010-03-14 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -7547,7 +7547,7 @@ msgstr "keskitetty" #. module: base #: field:maintenance.contract.wizard,state:0 msgid "States" -msgstr "Osavaltiot" +msgstr "Tilat" #. module: base #: view:multi_company.default:0 diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po index 195bcca96f7..fe562db02a5 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-11 05:23+0000\n" +"PO-Revision-Date: 2010-03-14 05:39+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-03-12 04:50+0000\n" +"X-Launchpad-Export-Date: 2010-03-15 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: hr\n" diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po index acca5687353..ed9e2a191a3 100644 --- a/bin/addons/base/i18n/it.po +++ b/bin/addons/base/i18n/it.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-11 11:29+0000\n" +"PO-Revision-Date: 2010-03-12 05:20+0000\n" "Last-Translator: Maurizio.Colella \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-03-12 04:50+0000\n" +"X-Launchpad-Export-Date: 2010-03-13 04:50+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po index 7edaec05ea2..dc4d590b5ac 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-11 05:20+0000\n" +"PO-Revision-Date: 2010-03-14 05:37+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-03-12 04:50+0000\n" +"X-Launchpad-Export-Date: 2010-03-15 04:48+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 3f0e1872dab..b72083a500a 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-11 05:02+0000\n" +"PO-Revision-Date: 2010-03-14 05:41+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-03-12 04:51+0000\n" +"X-Launchpad-Export-Date: 2010-03-15 04:48+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 2e9caa02d93..b4e60aa2480 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-11 05:11+0000\n" +"PO-Revision-Date: 2010-03-14 05:41+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-03-12 04:51+0000\n" +"X-Launchpad-Export-Date: 2010-03-15 04:48+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 b3f0c8573fd..a1012d925bd 100644 --- a/bin/addons/base/i18n/zh_CN.po +++ b/bin/addons/base/i18n/zh_CN.po @@ -7,19 +7,19 @@ 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-01-24 05:45+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2010-03-15 03:22+0000\n" +"Last-Translator: mrshelly \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-01-25 04:48+0000\n" +"X-Launchpad-Export-Date: 2010-03-15 04:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base #: model:res.country,name:base.sh msgid "Saint Helena" -msgstr "圣赫勒拿岛" +msgstr "圣赫勒拿" #. module: base #: wizard_view:res.partner.sms_send,init:0 @@ -34,13 +34,13 @@ msgstr "%j - 十进制表示的该年中的天数 [001,366]." #. module: base #: field:ir.values,meta_unpickle:0 msgid "Metadata" -msgstr "元数据" +msgstr "Metadata" #. module: base #: field:ir.ui.view,arch:0 #: field:ir.ui.view.custom,arch:0 msgid "View Architecture" -msgstr "视图结构" +msgstr "视图数据" #. module: base #: code:addons/base/ir/ir_model.py:0 @@ -68,7 +68,7 @@ msgstr "要浏览官方翻译，请访问此链接： " #. module: base #: selection:module.lang.install,init,lang:0 msgid "Hungarian / Magyar" -msgstr "匈牙利语 / 马札儿语" +msgstr "匈牙利/匈牙利语" #. module: base #: field:ir.actions.server,wkf_model_id:0 @@ -83,7 +83,7 @@ msgstr "已创建的视图" #. module: base #: view:workflow.activity:0 msgid "Outgoing transitions" -msgstr "传出转换" +msgstr "传出节点" #. module: base #: selection:ir.report.custom,frequency:0 @@ -113,7 +113,7 @@ msgstr "" #. module: base #: field:ir.rule,operand:0 msgid "Operand" -msgstr "操作数" +msgstr "操作符" #. module: base #: model:res.country,name:base.kr @@ -130,7 +130,7 @@ msgstr "转换" #. module: base #: model:ir.model,name:base.model_ir_ui_view_custom msgid "ir.ui.view.custom" -msgstr "ir.ui.view.custom" +msgstr "自定义视图" #. module: base #: model:res.country,name:base.sz @@ -141,7 +141,7 @@ msgstr "斯威士兰" #: model:ir.model,name:base.model_ir_actions_report_custom #: selection:ir.ui.menu,action:0 msgid "ir.actions.report.custom" -msgstr "ir.actions.report.custom" +msgstr "自定义报表" #. module: base #: selection:ir.ui.menu,icon:0 @@ -167,7 +167,7 @@ msgstr "公司结构" #. module: base #: model:ir.model,name:base.model_ir_report_custom_fields msgid "ir.report.custom.fields" -msgstr "ir.report.custom.fields" +msgstr "自定义报表字段" #. module: base #: view:res.partner:0 @@ -199,12 +199,12 @@ msgstr "模块数" #. module: base #: field:res.partner.bank.type.field,size:0 msgid "Max. Size" -msgstr "最大尺寸" +msgstr "" #. module: base #: field:res.partner.address,name:0 msgid "Contact Name" -msgstr "联系人名称" +msgstr "联系人姓名" #. module: base #: code:addons/base/module/wizard/wizard_export_lang.py:0 @@ -229,7 +229,7 @@ msgstr "密码不符合！" #: code:addons/base/module/module.py:0 #, python-format msgid "This url '%s' must provide an html file with links to zip modules" -msgstr "这个 URL '%s' 必须提供一个链接到 zip 模块文件的 HTML 页面" +msgstr "" #. module: base #: selection:res.request,state:0 From fe2e3b9d2fb0753992d65b7a04252090f113285d Mon Sep 17 00:00:00 2001 From: "HDA (OpenERP)" Date: Mon, 15 Mar 2010 12:12:12 +0530 Subject: [PATCH 02/12] Changed bae_quality_integration.py file path in Makefile bzr revid: hda@tinyerp.com-20100315064212-s57wk2qk3a62ne0z --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b4a57c2859b..782a3d51a3f 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ module := base database := terp language := fr_FR i18n-import := bin/addons/base/i18n/fr_FR.po -interrogation_file := bin/addons/quality_integration_server/base_quality_interrogation.py +interrogation_file := bin/addons/base_quality_interrogation.py login := admin password := admin From 65a150d3a3fd24cd8addbb384c4e493890d28da6 Mon Sep 17 00:00:00 2001 From: "HDA (OpenERP)" Date: Mon, 15 Mar 2010 12:30:37 +0530 Subject: [PATCH 03/12] Fixed procurement date and datetime widget problem bzr revid: hda@tinyerp.com-20100315070037-1ohwkjxrqh95uk1l --- addons/mrp/mrp_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 29e37f9532b..9c0b2000b94 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -819,7 +819,7 @@ - + From 9114ef2732f2b40b5beddb5d49860d4e2c19f302 Mon Sep 17 00:00:00 2001 From: "YSA(OpenERP)" <> Date: Mon, 15 Mar 2010 12:47:09 +0530 Subject: [PATCH 04/12] [FIX] Document : Import declaration was missing for Popen lp bug: https://launchpad.net/bugs/538225 fixed bzr revid: jvo@tinyerp.com-20100315071709-f8mjbm9vb5byht69 --- addons/document/document_directory.py | 6 +++--- addons/document/std_index.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index bcb86d589d2..17c3dfb66d9 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -65,14 +65,14 @@ class document_directory(osv.osv): objid=self.pool.get('ir.model.data') try: mid = objid._get_id(cr, uid, 'document', 'dir_root') - return None # TODO: check why not display root dir + return False # TODO: check why not display root dir if not mid: - return None + return False except Exception, e: import netsvc logger = netsvc.Logger() logger.notifyChannel("document", netsvc.LOG_WARNING, 'Cannot set directory root:'+ str(e)) - return None + return False return objid.browse(cr, uid, mid, context=context).res_id def _get_def_storage(self,cr,uid,context=None): diff --git a/addons/document/std_index.py b/addons/document/std_index.py index bd61c65e16b..1f639a32fa3 100644 --- a/addons/document/std_index.py +++ b/addons/document/std_index.py @@ -23,7 +23,7 @@ import StringIO import odt2txt from content_index import indexer, cntIndex - +from subprocess import Popen, PIPE def _to_unicode(s): try: From 43f356ec67f042ef97ac70e332913fd82a472276 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Mon, 15 Mar 2010 12:57:07 +0530 Subject: [PATCH 05/12] [IMP] Document : size for file_type column correceted lp bug: https://launchpad.net/bugs/538224 fixed bzr revid: jvo@tinyerp.com-20100315072707-1ajhzihk5u5z7wf0 --- addons/document/document.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/document/document.py b/addons/document/document.py index 824607fa2e8..375f24cd62a 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -77,7 +77,7 @@ class document_file(osv.osv): # the directory id now is mandatory. It can still be computed automatically. 'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True), 'file_size': fields.integer('File Size', required=True), - 'file_type': fields.char('Content Type', size=32), + 'file_type': fields.char('Content Type', size=64), # If ir.attachment contained any data before document is installed, preserve # the data, don't drop the column! 'db_datas': fields.binary('Data', oldname='datas'), @@ -141,6 +141,8 @@ class document_file(osv.osv): return super(document_file, self).copy(cr, uid, id, default, context) def write(self, cr, uid, ids, vals, context=None): + if not isinstance(ids, list): + ids = [ids] res = self.search(cr, uid, [('id', 'in', ids)]) if not len(res): return False From d96501aa74af87522161d122ef0096a48c8fd889 Mon Sep 17 00:00:00 2001 From: "GPA(OpenERP)" <> Date: Mon, 15 Mar 2010 13:03:26 +0530 Subject: [PATCH 06/12] [FIX] Analytic : Onchange_event corrected lp bug: https://launchpad.net/bugs/537493 fixed bzr revid: jvo@tinyerp.com-20100315073326-xtqoebz56fxs6lme --- addons/analytic/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/analytic/project.py b/addons/analytic/project.py index 1f24a99d235..e9558f7a101 100644 --- a/addons/analytic/project.py +++ b/addons/analytic/project.py @@ -255,7 +255,7 @@ class account_analytic_account(osv.osv): if not parent_id: return {} parent = self.read(cr, uid, [parent_id], ['partner_id','code'])[0] - childs = self.search(cr, uid, [('parent_id', '=', parent_id), ('active', 'in', [True, False])]) + childs = self.search(cr, uid, [('parent_id', '=', parent_id)]) numchild = len(childs) if parent['partner_id']: partner = parent['partner_id'][0] From a64e07de85f468adf4e9c5ec85fbb1c3acc33984 Mon Sep 17 00:00:00 2001 From: "GPA(OpenERP)" <> Date: Mon, 15 Mar 2010 15:18:19 +0530 Subject: [PATCH 07/12] [FIX] Account : Partner ledger wizard issue corrected lp bug: https://launchpad.net/bugs/537491 fixed bzr revid: jvo@tinyerp.com-20100315094819-017k2wgl0kqlny9w --- addons/account/wizard/wizard_third_party_ledger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py index c89f87fd8e0..6bf415d0ca6 100755 --- a/addons/account/wizard/wizard_third_party_ledger.py +++ b/addons/account/wizard/wizard_third_party_ledger.py @@ -114,7 +114,7 @@ class wizard_report(wizard.interface): sql = """ SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """ - cr.execute(sql,(data['form']['date1'])) + cr.execute(sql,(data['form']['date1'],)) res = cr.dictfetchall() if res: if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']): From c6ea518fbdb937b37a83d46a4a18eb7139c811d7 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Mon, 15 Mar 2010 17:33:38 +0530 Subject: [PATCH 08/12] [FIX] scrum: Fix problem on search view of scrum meeting (Date problem) bzr revid: mra@tinyerp.com-20100315120338-3z68no0akqeqbnz8 --- addons/scrum/scrum_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml index 57c97ef6f89..d0cad003216 100644 --- a/addons/scrum/scrum_view.xml +++ b/addons/scrum/scrum_view.xml @@ -319,7 +319,7 @@ - + From 6e90109b674a9488dde3eb471b0299546bd436a3 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Mon, 15 Mar 2010 13:39:08 +0100 Subject: [PATCH 09/12] [FIX] Remove the default values on the --no-netrpc and --no-xmlrpc flags of the command line. The system will check if these flags are None or not. lp bug: https://launchpad.net/bugs/531430 fixed bzr revid: stephane@openerp.com-20100315123908-6j6ii72g7ed4rvxn --- bin/tools/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/tools/config.py b/bin/tools/config.py index f814c3db6eb..670c20af1af 100644 --- a/bin/tools/config.py +++ b/bin/tools/config.py @@ -103,8 +103,8 @@ class configmanager(object): parser.add_option("-p", "--port", dest="port", help="specify the TCP port", type="int") parser.add_option("--net_interface", dest="netinterface", help="specify the TCP IP address for netrpc") parser.add_option("--net_port", dest="netport", help="specify the TCP port for netrpc", type="int") - parser.add_option("--no-netrpc", dest="netrpc", action="store_false", default=True, help="disable netrpc") - parser.add_option("--no-xmlrpc", dest="xmlrpc", action="store_false", default=True, help="disable xmlrpc") + parser.add_option("--no-netrpc", dest="netrpc", action="store_false", help="disable netrpc") + parser.add_option("--no-xmlrpc", dest="xmlrpc", action="store_false", help="disable xmlrpc") parser.add_option("-i", "--init", dest="init", help="init a module (use \"all\" for all modules)") parser.add_option("--without-demo", dest="without_demo", help="load demo data for a module (use \"all\" for all modules)", default=False) From b9dce4ea818e0fc6b5df524968a1c5a481f538a5 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Mon, 15 Mar 2010 16:53:10 +0100 Subject: [PATCH 10/12] [FIX] orm: Allows the inline modification of the _inherits fields lp bug: https://launchpad.net/bugs/527263 fixed bzr revid: stephane@openerp.com-20100315155310-fbti23cazpovjnpd --- bin/osv/orm.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 7f412be0a7a..0beee3be289 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -2996,7 +2996,7 @@ class orm(orm_template): if self._inherits[v] not in vals: tocreate[v] = {} else: - tocreate[v] = {self._inherits[v]:vals[self._inherits[v]]} + tocreate[v] = {'id' : vals[self._inherits[v]]} (upd0, upd1, upd2) = ('', '', []) upd_todo = [] for v in vals.keys(): @@ -3020,10 +3020,17 @@ class orm(orm_template): for table in tocreate: if self._inherits[table] in vals: del vals[self._inherits[table]] - id = self.pool.get(table).create(cr, user, tocreate[table]) + + record_id = tocreate[table].pop('id', None) + + if record_id is None: + record_id = self.pool.get(table).create(cr, user, tocreate[table], context=context) + else: + self.pool.get(table).write(cr, user, [record_id], tocreate[table], context=context) + upd0 += ','+self._inherits[table] upd1 += ',%s' - upd2.append(id) + upd2.append(record_id) #Start : Set bool fields to be False if they are not touched(to make search more powerful) bool_fields = [x for x in self._columns.keys() if self._columns[x]._type=='boolean'] From fb203e251e72d6a8248519f412c8275a288bfddb Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Tue, 16 Mar 2010 04:46:42 +0000 Subject: [PATCH 11/12] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100316044642-av44jo22e343qjqw --- addons/account/i18n/sv.po | 52 +++++++++++++++++------------------ addons/account/i18n/th.po | 14 +++++----- addons/document/i18n/sv.po | 8 +++--- addons/idea/i18n/sv.po | 8 +++--- addons/membership/i18n/sv.po | 14 +++++----- addons/report_sale/i18n/fi.po | 8 +++--- addons/stock/i18n/el.po | 8 +++--- 7 files changed, 56 insertions(+), 56 deletions(-) diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index d0ecd869810..071d06f1483 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/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-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-11 15:54+0000\n" +"PO-Revision-Date: 2010-03-15 14:11+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-03-12 04:51+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -813,7 +813,7 @@ msgstr "Flytta rader" #. module: account #: model:ir.model,name:account.model_account_config_wizard msgid "account.config.wizard" -msgstr "Kontokonfiguration guide" +msgstr "account.config.wizard" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree @@ -1555,7 +1555,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Statements" -msgstr "" +msgstr "Myndighetsrapporter" #. module: account #: field:account.tax.code,parent_id:0 @@ -2254,7 +2254,7 @@ msgstr "Öppna transaktionsjournal" #. module: account #: view:account.config.wizard:0 msgid "Create a Fiscal Year" -msgstr "Skapa nytt verksamhetsår" +msgstr "Skapa ett verksamhetsår" #. module: account #: field:product.template,taxes_id:0 @@ -3665,17 +3665,17 @@ msgstr "" #: wizard_view:account.invoice.refund,init:0 #: model:ir.actions.wizard,name:account.wizard_invoice_refund msgid "Credit Note" -msgstr "" +msgstr "Kreditnota" #. module: account #: model:ir.actions.todo,note:account.config_fiscalyear msgid "Define Fiscal Years and Select Charts of Account" -msgstr "" +msgstr "Definiera verksamhetsåren och välj kontoplan" #. module: account #: wizard_field:account.move.line.reconcile,addendum,period_id:0 msgid "Write-Off Period" -msgstr "" +msgstr "Avskrivningsperiod" #. module: account #: selection:account.config.wizard,period:0 @@ -3703,7 +3703,7 @@ msgstr "" #: selection:account.config.wizard,period:0 #: field:report.hr.timesheet.invoice.journal,name:0 msgid "Month" -msgstr "" +msgstr "Månad" #. module: account #: model:ir.model,name:account.model_account_subscription @@ -3737,7 +3737,7 @@ msgstr "" #: field:account.fiscalyear,date_start:0 #: field:account.subscription,date_start:0 msgid "Start Date" -msgstr "" +msgstr "Startdatum" #. module: account #: wizard_view:account.general.ledger.report,account_selection:0 @@ -3952,12 +3952,12 @@ msgstr "Importera från dina bankutdrag" #. module: account #: view:account.chart.template:0 msgid "Properties" -msgstr "" +msgstr "Egenskaper" #. module: account #: view:res.partner:0 msgid "Customer Accounting Properties" -msgstr "" +msgstr "Kundens bokföringsinställningar" #. module: account #: view:account.bank.statement:0 @@ -4021,7 +4021,7 @@ msgstr "" #: field:account.tax,account_paid_id:0 #: field:account.tax.template,account_paid_id:0 msgid "Refund Tax Account" -msgstr "" +msgstr "Skatteåterbäringskonto" #. module: account #: field:account.tax.code,child_ids:0 @@ -4038,17 +4038,17 @@ msgstr "" #: view:account.bank.statement:0 #: field:account.bank.statement,line_ids:0 msgid "Statement lines" -msgstr "" +msgstr "Verifikatrader" #. module: account #: field:account.move.line,amount_taxed:0 msgid "Taxed Amount" -msgstr "" +msgstr "Skatteunderlag" #. module: account #: field:account.invoice.line,price_subtotal:0 msgid "Subtotal w/o tax" -msgstr "" +msgstr "Nettobelopp" #. module: account #: field:account.invoice.line,invoice_id:0 @@ -4058,7 +4058,7 @@ msgstr "" #. module: account #: field:account.analytic.line,general_account_id:0 msgid "General Account" -msgstr "" +msgstr "Huvudkonton" #. module: account #: help:account.move.line,quantity:0 @@ -4114,12 +4114,12 @@ msgstr "" #. module: account #: field:wizard.multi.charts.accounts,seq_journal:0 msgid "Separated Journal Sequences" -msgstr "" +msgstr "Separerade nummerserier för böcker" #. module: account #: help:account.bank.statement.reconcile,total_second_currency:0 msgid "The currency of the journal" -msgstr "" +msgstr "Valuta för boken" #. module: account #: view:account.journal.column:0 @@ -4149,7 +4149,7 @@ msgstr "Klar" #: model:ir.ui.menu,name:account.menu_action_account_period_form #: model:ir.ui.menu,name:account.next_id_23 msgid "Periods" -msgstr "" +msgstr "Perioder" #. module: account #: rml:account.invoice:0 @@ -4166,7 +4166,7 @@ msgstr "Faktura" #: wizard_button:account.open_closed_fiscalyear,init,open:0 #: wizard_button:account_use_models,create,open_move:0 msgid "Open" -msgstr "" +msgstr "Öppen" #. module: account #: model:ir.ui.menu,name:account.next_id_29 @@ -4253,7 +4253,7 @@ msgstr "Ok" #. module: account #: rml:account.invoice:0 msgid "Taxes:" -msgstr "" +msgstr "Skatter:" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree7 @@ -4714,7 +4714,7 @@ msgstr "" #. module: account #: view:account.fiscalyear:0 msgid "Create Monthly Periods" -msgstr "" +msgstr "Skapa månatliga perioder" #. module: account #: wizard_button:account.aged.trial.balance,init,print:0 @@ -4841,7 +4841,7 @@ msgstr "Total:" #. module: account #: model:ir.model,name:account.model_account_analytic_journal msgid "account.analytic.journal" -msgstr "" +msgstr "account.analytic.journal" #. module: account #: view:account.fiscal.position:0 @@ -5478,7 +5478,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_tax_template msgid "account.tax.template" -msgstr "" +msgstr "account.tax.template" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 @@ -5746,7 +5746,7 @@ msgstr "Bokföringsegenskaper" #. module: account #: model:ir.model,name:account.model_account_sequence_fiscalyear msgid "account.sequence.fiscalyear" -msgstr "" +msgstr "account.sequence.fiscalyear" #. module: account #: wizard_field:account.print.journal.report,init,sort_selection:0 diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po index 481357d0db9..33077b537c0 100644 --- a/addons/account/i18n/th.po +++ b/addons/account/i18n/th.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-23 10:50+0000\n" +"PO-Revision-Date: 2010-03-15 03:12+0000\n" "Last-Translator: Songpon Phusing \n" "Language-Team: Thai \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 04:52+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -25,23 +25,23 @@ msgstr "ชื่อเรียกภายใน" #. module: account #: view:account.tax.code:0 msgid "Account Tax Code" -msgstr "" +msgstr "รหัสบัญชีภาษี" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree9 #: model:ir.ui.menu,name:account.menu_action_invoice_tree9 msgid "Unpaid Supplier Invoices" -msgstr "" +msgstr "ใบแจ้งหนี้ที่ยังไม่จ่าย" #. module: account #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Entries Encoding" -msgstr "" +msgstr "กรอกข้อมูล" #. module: account #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form msgid "Specify The Message for the Overdue Payment Report." -msgstr "" +msgstr "ระบุข้อความสำหรับรายงานของการจ่ายที่เกินกำหนด" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 @@ -66,7 +66,7 @@ msgstr "" #. module: account #: wizard_view:account_use_models,init_form:0 msgid "Select Message" -msgstr "" +msgstr "เลือกข้อความ" #. module: account #: help:product.category,property_account_income_categ:0 diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po index efdfca4d389..99f529889a6 100644 --- a/addons/document/i18n/sv.po +++ b/addons/document/i18n/sv.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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-24 14:45+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-03-15 14:11+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-03-11 05:03+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document @@ -203,7 +203,7 @@ msgstr "" #. module: document #: model:ir.ui.menu,name:document.menu_document msgid "Document Management" -msgstr "" +msgstr "Dokumenthantering" #. module: document #: selection:ir.attachment,store_method:0 diff --git a/addons/idea/i18n/sv.po b/addons/idea/i18n/sv.po index 100c38ed817..f5fb413e351 100644 --- a/addons/idea/i18n/sv.po +++ b/addons/idea/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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-17 09:48+0000\n" -"Last-Translator: Jay (Open ERP) \n" +"PO-Revision-Date: 2010-03-15 14:12+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-03-11 04:54+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: idea @@ -157,7 +157,7 @@ msgstr "" #. module: idea #: model:ir.ui.menu,name:idea.menu_reporting msgid "Reporting" -msgstr "" +msgstr "Rapportering" #. module: idea #: model:ir.model,name:idea.model_idea_vote_stat diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po index eb3fd0464cd..720ebc1e012 100644 --- a/addons/membership/i18n/sv.po +++ b/addons/membership/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-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-16 11:17+0000\n" -"Last-Translator: Treecko \n" +"PO-Revision-Date: 2010-03-15 14:14+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-03-11 04:45+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: membership @@ -179,7 +179,7 @@ msgstr "" #. module: membership #: model:ir.ui.menu,name:membership.menu_reporting msgid "Reporting" -msgstr "" +msgstr "Rapportering" #. module: membership #: view:res.partner:0 @@ -249,7 +249,7 @@ msgstr "" #: field:report.partner_member.year_new,canceled_amount:0 #: field:report.partner_member.year_new,canceled_number:0 msgid "Canceled" -msgstr "" +msgstr "Avbruten" #. module: membership #: model:product.pricelist,name:membership.list1m @@ -317,7 +317,7 @@ msgstr "" #: field:report.partner_member.year_new,paid_amount:0 #: field:report.partner_member.year_new,paid_number:0 msgid "Paid" -msgstr "" +msgstr "Betalad" #. module: membership #: selection:membership.membership_line,state:0 @@ -510,7 +510,7 @@ msgstr "" #. module: membership #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Fel: felaktig EAN-kod" #. module: membership #: field:report.partner_member.year,year:0 diff --git a/addons/report_sale/i18n/fi.po b/addons/report_sale/i18n/fi.po index 52896c232b5..1290fa29390 100644 --- a/addons/report_sale/i18n/fi.po +++ b/addons/report_sale/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-29 10:05+0000\n" -"Last-Translator: NightSpirit \n" +"PO-Revision-Date: 2010-03-15 14:30+0000\n" +"Last-Translator: Henri Kovalainen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 04:57+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: report_sale @@ -330,4 +330,4 @@ msgstr "Myynti tiloittain" #. module: report_sale #: field:report.sale.order.created,amount_untaxed:0 msgid "Untaxed Amount" -msgstr "Veroton määrä" +msgstr "Veroton summa" diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po index 8d5f16ac7e8..4eeaac056d9 100644 --- a/addons/stock/i18n/el.po +++ b/addons/stock/i18n/el.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-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-16 20:04+0000\n" -"Last-Translator: Andreas Porevopoulos \n" +"PO-Revision-Date: 2010-03-15 21:55+0000\n" +"Last-Translator: j0hn aka c7p \n" "Language-Team: nls@hellug.gr \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 04:40+0000\n" +"X-Launchpad-Export-Date: 2010-03-16 04:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" @@ -665,7 +665,7 @@ msgstr "Αναμενόμενη Ημερ/νία Αποστολής" #. module: stock #: rml:stock.picking.list:0 msgid "Shipping Address :" -msgstr "" +msgstr "Ταχυδρομική Διεύθυνση :" #. module: stock #: view:stock.tracking:0 From c983859b9d5002f8242dfe4d759712ba51d466a7 Mon Sep 17 00:00:00 2001 From: "mra (Open ERP)" Date: Tue, 16 Mar 2010 11:23:22 +0530 Subject: [PATCH 12/12] [FIX] project_timesheet: Creating and writing timesheet line from project task work lp bug: https://launchpad.net/bugs/539065 fixed bzr revid: mra@tinyerp.com-20100316055322-go9qvmqw4ckv17ri --- addons/project_timesheet/project_timesheet.py | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index fbafdb4a60a..a6743b10330 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## from osv import fields, osv @@ -58,11 +58,12 @@ class project_work(osv.osv): res['general_account_id'] = a res['product_uom_id'] = emp.product_id.uom_id.id return res - + def create(self, cr, uid, vals, *args, **kwargs): - obj = self.pool.get('hr.analytic.timesheet') + obj_timesheet = self.pool.get('hr.analytic.timesheet') + task_obj = self.pool.get('project.task') vals_line = {} - obj_task = self.pool.get('project.task').browse(cr, uid, vals['task_id']) + obj_task = task_obj.browse(cr, uid, vals['task_id']) result = self.get_user_related_details(cr, uid, vals.get('user_id', uid)) vals_line['name'] = '%s: %s' % (tools.ustr(obj_task.name), tools.ustr(vals['name']) or '/') vals_line['user_id'] = vals['user_id'] @@ -71,33 +72,36 @@ class project_work(osv.osv): vals_line['unit_amount'] = vals['hours'] acc_id = obj_task.project_id.category_id.id vals_line['account_id'] = acc_id - res = obj.on_change_account_id(cr, uid, False, acc_id) + res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id) if res.get('value'): vals_line.update(res['value']) vals_line['general_account_id'] = result['general_account_id'] vals_line['journal_id'] = result['journal_id'] vals_line['amount'] = 00.0 vals_line['product_uom_id'] = result['product_uom_id'] - timeline_id = obj.create(cr, uid, vals_line, {}) - + amount = vals_line['unit_amount'] + prod_id = vals_line['product_id'] + unit = False + timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=kwargs['context']) + # Compute based on pricetype - amount_unit=obj.on_change_unit_amount(cr, uid, line_id, - vals_line['product_id'], vals_line['unit_amount'], unit, context) - - vals_line['amount'] = (-1) * vals['hours']* (unit_amount or 0.0) - obj.write(cr, uid,[timeline_id], vals_line, {}) + amount_unit=obj_timesheet.on_change_unit_amount(cr, uid, timeline_id, + prod_id, amount, unit, context=kwargs['context']) + + vals_line['amount'] = (-1) * vals['hours']* (amount_unit['value']['amount'] or 0.0) + obj_timesheet.write(cr, uid,[timeline_id], vals_line, {}) vals['hr_analytic_timesheet_id'] = timeline_id return super(project_work,self).create(cr, uid, vals, *args, **kwargs) def write(self, cr, uid, ids, vals, context=None): vals_line = {} - - task = self.pool.get('project.task.work').browse(cr, uid, ids)[0] + obj = self.pool.get('hr.analytic.timesheet') + timesheet_obj = self.pool.get('hr.analytic.timesheet') + task = self.pool.get('project.task.work').browse(cr, uid, ids, context=context)[0] line_id = task.hr_analytic_timesheet_id # in case,if a record is deleted from timesheet,but we change it from tasks! - list_avail_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, []) + list_avail_ids = timesheet_obj.search(cr, uid, [], context=context) if line_id in list_avail_ids: - obj = self.pool.get('hr.analytic.timesheet') if 'name' in vals: vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/') if 'user_id' in vals: @@ -111,13 +115,13 @@ class project_work(osv.osv): vals_line['date'] = vals['date'][:10] if 'hours' in vals: vals_line['unit_amount'] = vals['hours'] - # Compute based on pricetype - amount_unit=obj.on_change_unit_amount(cr, uid, line_id, - vals_line['product_id'], vals_line['unit_amount'], unit, context) - - vals_line['amount'] = (-1) * vals['hours'] * (amount_unit or 0.0) - obj.write(cr, uid, [line_id], vals_line, {}) + unit = False + amount_unit=obj.on_change_unit_amount(cr, uid, line_id, + vals_line['product_id'], vals_line['unit_amount'], unit, context=context) + + vals_line['amount'] = (-1) * vals['hours'] * (amount_unit['value']['amount'] or 0.0) + obj.write(cr, uid, [line_id], vals_line, context=context) return super(project_work,self).write(cr, uid, ids, vals, context) @@ -147,9 +151,9 @@ class task(osv.osv): if task_obj.work_ids: work_ids = [x.id for x in task_obj.work_ids] self.pool.get('project.task.work').unlink(cr, uid, work_ids, *args, **kwargs) - + return super(task,self).unlink(cr, uid, ids, *args, **kwargs) - + def write(self, cr, uid, ids,vals,context={}): if (vals.has_key('project_id') and vals['project_id']) or (vals.has_key('name') and vals['name']): vals_line = {}