From aba97f892a5e3a699c3074b402445af5d68724c3 Mon Sep 17 00:00:00 2001 From: "pso (OpenERP)" Date: Mon, 25 Apr 2011 17:40:48 +0530 Subject: [FIX] analytic_user_function: Fixed KeyError ('amount') lp bug: https://launchpad.net/bugs/768968 fixed bzr revid: pso@tinyerp.com-20110425121048-rbur3dny3ou88tpf --- addons/analytic_user_function/analytic_user_function.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/analytic_user_function') diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 04f66fb8daa..79f3a17fdbc 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -66,7 +66,7 @@ class hr_analytic_timesheet(osv.osv): return False - def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0): + def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0.0): res = {} if not (account_id): #avoid a useless call to super @@ -98,11 +98,11 @@ class hr_analytic_timesheet(osv.osv): 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) # Compute based on pricetype - amount_unit = self.on_change_unit_amount(cr, uid, ids, - r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount'] - - amount = unit_amount * amount_unit - res ['value']['amount']= - round(amount, 2) + if unit_amount: + amount_unit = self.on_change_unit_amount(cr, uid, ids, + r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount'] + amount = unit_amount * amount_unit + res ['value']['amount']= - round(amount, 2) res ['value']['general_account_id']= a return res -- cgit v1.2.3 From ec5cbcc7857a172f302ca952650ed711254dbdb9 Mon Sep 17 00:00:00 2001 From: "pso (OpenERP)" Date: Mon, 25 Apr 2011 18:33:41 +0530 Subject: [IMP] analytic_user_function: Improved on_change_user_id method bzr revid: pso@tinyerp.com-20110425130341-tkjmjmeg9e76sxyg --- addons/analytic_user_function/analytic_user_function.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'addons/analytic_user_function') diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 79f3a17fdbc..d9d260c6940 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -106,7 +106,7 @@ class hr_analytic_timesheet(osv.osv): res ['value']['general_account_id']= a return res - def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0): + def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0.0): res = {} if not (user_id): #avoid a useless call to super @@ -133,11 +133,12 @@ class hr_analytic_timesheet(osv.osv): 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) # Compute based on pricetype - amount_unit = self.on_change_unit_amount(cr, uid, ids, - r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount'] + if unit_amount: + amount_unit = self.on_change_unit_amount(cr, uid, ids, + r.product_id.id, unit_amount, False, r.product_id.uom_id.id)['value']['amount'] - amount = unit_amount * amount_unit - res ['value']['amount']= - round(amount, 2) + amount = unit_amount * amount_unit + res ['value']['amount']= - round(amount, 2) res ['value']['general_account_id']= a return res -- cgit v1.2.3 From 3889421b1a6073e028b323624e49363209067a62 Mon Sep 17 00:00:00 2001 From: "pso (OpenERP)" Date: Mon, 25 Apr 2011 18:50:30 +0530 Subject: [IMP] analytic_user_function: Improvement bzr revid: pso@tinyerp.com-20110425132030-hgbb7l0j37xaje5x --- addons/analytic_user_function/analytic_user_function.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/analytic_user_function') diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index d9d260c6940..7fbd53db3de 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -66,7 +66,7 @@ class hr_analytic_timesheet(osv.osv): return False - def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0.0): + def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0): res = {} if not (account_id): #avoid a useless call to super @@ -106,7 +106,7 @@ class hr_analytic_timesheet(osv.osv): res ['value']['general_account_id']= a return res - def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0.0): + def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0): res = {} if not (user_id): #avoid a useless call to super -- cgit v1.2.3 From cc3d7333c87dcd5e164ec88ea5bc1cfef4bc8cd5 Mon Sep 17 00:00:00 2001 From: "AVP(Axelor)" <> Date: Fri, 29 Apr 2011 14:19:48 +0530 Subject: [FIX][IMP] all modules improvement. bzr revid: amp@tinyerp.com-20110429084948-x0pny8n2ersc4h8m --- addons/analytic_user_function/analytic_user_function.py | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/analytic_user_function') diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 04f66fb8daa..96da99386c7 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -20,7 +20,6 @@ ############################################################################## from osv import fields,osv -from osv import orm from tools.translate import _ class analytic_user_funct_grid(osv.osv): -- cgit v1.2.3 From f08cf2f85f9a95f43cf2894b8819d0d655ab97f4 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Mon, 9 May 2011 04:36:58 +0000 Subject: Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045323-azozpfkhj7vaix3f bzr revid: launchpad_translations_on_behalf_of_openerp-20110507045352-2mjk93fx426eijy4 bzr revid: launchpad_translations_on_behalf_of_openerp-20110508043753-3bcytaz1rrn2vvbh bzr revid: launchpad_translations_on_behalf_of_openerp-20110509043658-oyhxuwreey6yc4r1 --- addons/analytic_user_function/i18n/tr.po | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'addons/analytic_user_function') diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po index 9b08a805b9e..27907e602d7 100644 --- a/addons/analytic_user_function/i18n/tr.po +++ b/addons/analytic_user_function/i18n/tr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-03 16:56+0000\n" -"PO-Revision-Date: 2010-10-30 14:34+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2011-05-08 17:12+0000\n" +"Last-Translator: Ayhan KIZILTAN \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: 2011-04-29 05:35+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-05-09 04:36+0000\n" +"X-Generator: Launchpad (build 12959)\n" #. module: analytic_user_function #: field:analytic_user_funct_grid,product_id:0 @@ -31,7 +31,7 @@ msgstr "Hata !" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet msgid "Timesheet Line" -msgstr "" +msgstr "Mesai Kartı Satırı" #. module: analytic_user_function #: field:analytic_user_funct_grid,account_id:0 @@ -55,14 +55,14 @@ msgstr "Kullanıcı" msgid "" "Error! The currency has to be the same as the currency of the selected " "company" -msgstr "" +msgstr "Hata! Para birim seçilen şirketin para birimiyle aynı olmalı" #. module: analytic_user_function #: code:addons/analytic_user_function/analytic_user_function.py:97 #: code:addons/analytic_user_function/analytic_user_function.py:132 #, python-format msgid "There is no expense account define for this product: \"%s\" (id:%d)" -msgstr "" +msgstr "Bu ürün için tanımlı masraf hesabı yok: \"%s\" (id:%d)" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid @@ -85,6 +85,18 @@ msgid "" "\n" " " msgstr "" +"\n" +"\n" +" Bu modül, belirli bir kullanıcının varsayılan işlevinin ne olduğunu " +"tanımlamanızı sağlar. Bu çoğunlukla bir kullanıcı zaman çizelgesi kodlaması " +"yaparken kullanılır: değerler alınır ve alanlar otomatik doldurulur ... " +"ancak bu değerleri değiştirme olasılığı hala mevcuttur.\n" +"\n" +" Mevcut hesap için hiçbir veri kaydedilmemişse, varsayılan değer genel " +"olarak personel bilgisi olarak verilir ki; bu modülün eski yapılandırmalarla " +"ne mükemmel bir uyum içinde olduğunu gösterir.\n" +"\n" +" " #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information @@ -94,7 +106,7 @@ msgstr "Analitik Kullanıcı Fonksiyonu" #. module: analytic_user_function #: constraint:account.analytic.account:0 msgid "Error! You can not create recursive analytic accounts." -msgstr "" +msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız." #. module: analytic_user_function #: view:analytic_user_funct_grid:0 -- cgit v1.2.3