From e95c182608bfd40f72bac16e25de937c3824b951 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Wed, 18 May 2011 18:22:34 +0530 Subject: [PATCH 01/25] [FIX]procurement:Fixed:procurement scheduling report=>not Translation properly lp bug: https://launchpad.net/bugs/783135 fixed bzr revid: ron@tinyerp.com-20110518125234-9cea4larl1uub313 --- addons/procurement/schedulers.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 3a6e3336472..8bc2fef615b 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -100,7 +100,7 @@ class procurement_order(osv.osv): report_total += 1 for proc in procurement_obj.browse(cr, uid, report_ids, context=context): if proc.state == 'exception': - report.append('PROC %d: from stock - %3.2f %-5s - %s' % \ + report.append(_('PROC %d: from stock - %3.2f %-5s - %s') % \ (proc.id, proc.product_qty, proc.product_uom.name, proc.product_id.name,)) report_except += 1 @@ -111,15 +111,15 @@ class procurement_order(osv.osv): end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss') if uid: request = self.pool.get('res.request') - summary = '''Here is the procurement scheduling report. - - Start Time: %s - End Time: %s - Total Procurements processed: %d - Procurements with exceptions: %d - Skipped Procurements (scheduled date outside of scheduler range) %d - - Exceptions:\n'''% (start_date, end_date, report_total, report_except, report_later) + summary = _("Here is the procurement scheduling report. \ +\ + Start Time: %s \ + End Time: %s \ + Total Procurements processed: %d \ + Procurements with exceptions: %d \ + Skipped Procurements (scheduled date outside of scheduler range) %d \ +\ + Exceptions:\n") % (start_date, end_date, report_total, report_except, report_later) summary += '\n'.join(report) request.create(cr, uid, {'name': "Procurement Processing Report.", From db63cecdcbf119691fb8ad1767e299087fff6035 Mon Sep 17 00:00:00 2001 From: "mayur maheshwari (Open ERP)" Date: Tue, 24 May 2011 17:34:42 +0530 Subject: [PATCH 02/25] [FIX]stock_planning_:Now edit generated Sales Forecasts in Form View By wizard lp bug: https://launchpad.net/bugs/781655 fixed bzr revid: mma@tinyerp.com-20110524120442-xcvn3e0mslp5mdfo --- addons/stock_planning/wizard/stock_planning_forecast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock_planning/wizard/stock_planning_forecast.py b/addons/stock_planning/wizard/stock_planning_forecast.py index 60b3de62243..cee44d7bd6f 100644 --- a/addons/stock_planning/wizard/stock_planning_forecast.py +++ b/addons/stock_planning/wizard/stock_planning_forecast.py @@ -102,7 +102,7 @@ class stock_sale_forecast_createlines(osv.osv_memory): return { 'domain': "[('id','in', ["+','.join(map(str, forecast_lines))+"])]", 'view_type': 'form', - "view_mode": 'tree, form', + "view_mode": 'tree,form', 'res_model': 'stock.sale.forecast', 'type': 'ir.actions.act_window', 'search_view_id': id['res_id'], From 331760830f64b9702f0f12edf1c997f646000a07 Mon Sep 17 00:00:00 2001 From: "mayur maheshwari (Open ERP)" Date: Thu, 2 Jun 2011 15:15:33 +0530 Subject: [PATCH 03/25] [FIX]stock_planning_:Now edit Sales planning lines in Form View By wizard lp bug: https://launchpad.net/bugs/781655 fixed bzr revid: mma@tinyerp.com-20110602094533-impg0p3sw69uz33i --- addons/stock_planning/wizard/stock_planning_createlines.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock_planning/wizard/stock_planning_createlines.py b/addons/stock_planning/wizard/stock_planning_createlines.py index 7abb15b6e7d..d5a9a0ddc74 100644 --- a/addons/stock_planning/wizard/stock_planning_createlines.py +++ b/addons/stock_planning/wizard/stock_planning_createlines.py @@ -133,7 +133,7 @@ class stock_planning_createlines(osv.osv_memory): return { 'domain': "[('id','in', ["+','.join(map(str, planning_lines))+"])]", 'view_type': 'form', - "view_mode": 'tree, form', + "view_mode": 'tree,form', 'res_model': 'stock.planning', 'type': 'ir.actions.act_window', 'search_view_id': id['res_id'], From 48871849770800f1fd7d5fe6686e543951c49e6b Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 2 Jun 2011 17:34:55 +0530 Subject: [PATCH 04/25] [IMP]procurement:Improvement in Traslation string bzr revid: ron@tinyerp.com-20110602120455-lgadptlti782btgm --- addons/procurement/schedulers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 8bc2fef615b..0c0372660d9 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -77,7 +77,7 @@ class procurement_order(osv.osv): report_later += 1 for proc in procurement_obj.browse(cr, uid, ids, context=context): if proc.state == 'exception': - report.append('PROC %d: on order - %3.2f %-5s - %s' % \ + report.append(_('PROC %d: on order - %3.2f %-5s - %s') % \ (proc.id, proc.product_qty, proc.product_uom.name, proc.product_id.name)) report_except += 1 From bcb551f338919368265b8f5835f696fce77b22e3 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 6 Jun 2011 15:42:33 +0530 Subject: [PATCH 05/25] [IMP]procurement:fixed=>Lines breaks in Traslation string bzr revid: ron@tinyerp.com-20110606101233-o3hi56uin99gdj60 --- addons/procurement/schedulers.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 0c0372660d9..62fcf652b47 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -111,15 +111,15 @@ class procurement_order(osv.osv): end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss') if uid: request = self.pool.get('res.request') - summary = _("Here is the procurement scheduling report. \ -\ - Start Time: %s \ - End Time: %s \ - Total Procurements processed: %d \ - Procurements with exceptions: %d \ - Skipped Procurements (scheduled date outside of scheduler range) %d \ -\ - Exceptions:\n") % (start_date, end_date, report_total, report_except, report_later) + summary = _("""Here is the procurement scheduling report. \n\ +\n\ + Start Time: %s \n\ + End Time: %s \n\ + Total Procurements processed: %d \n\ + Procurements with exceptions: %d \n\ + Skipped Procurements (scheduled date outside of scheduler range) %d \n\ +\n\ + Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later) summary += '\n'.join(report) request.create(cr, uid, {'name': "Procurement Processing Report.", From fecd5e29f41132c8d9df5600ad57c0d0e95d88da Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 6 Jun 2011 16:06:04 +0530 Subject: [PATCH 06/25] [IMP]procurement:improvements in lines breack code bzr revid: ron@tinyerp.com-20110606103604-gh7o9jpm5lfnc3ay --- addons/procurement/schedulers.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 62fcf652b47..d72651ed55a 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -111,14 +111,14 @@ class procurement_order(osv.osv): end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss') if uid: request = self.pool.get('res.request') - summary = _("""Here is the procurement scheduling report. \n\ -\n\ - Start Time: %s \n\ - End Time: %s \n\ - Total Procurements processed: %d \n\ - Procurements with exceptions: %d \n\ - Skipped Procurements (scheduled date outside of scheduler range) %d \n\ -\n\ + summary = _("""Here is the procurement scheduling report. + + Start Time: %s + End Time: %s + Total Procurements processed: %d + Procurements with exceptions: %d + Skipped Procurements (scheduled date outside of scheduler range) %d + Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later) summary += '\n'.join(report) request.create(cr, uid, From 7d7ae4b0fea22b16a140c0c83e8f54dd7ce07623 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Mon, 25 Jul 2011 14:14:16 +0530 Subject: [PATCH 07/25] [FIX] Invoice company change (Multi-company) lp bug: https://launchpad.net/bugs/812843 fixed bzr revid: ara@tinyerp.com-20110725084416-ct30t2i2s2feze0k --- openerp/addons/base/ir/ir.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 1280ad5f5e7..ea3103f9b9a 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -1748,7 +1748,7 @@ Property multi-company - ['|',('company_id','=',user.company_id.id),('company_id','=',False)] + ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)] From 432931dda597f72261f2d68c9252b41f3d50791d Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 24 Aug 2011 23:19:43 +0200 Subject: [PATCH 08/25] Add active field on account.fiscal.position. Fixes LP bug #768847 lp bug: https://launchpad.net/bugs/768847 fixed bzr revid: alexis@via.ecp.fr-20110824211943-kcfp6133556zropc --- addons/account/partner.py | 5 +++++ addons/account/partner_view.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/addons/account/partner.py b/addons/account/partner.py index 6ff3879889c..36fd88183f2 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -28,12 +28,17 @@ class account_fiscal_position(osv.osv): _description = 'Fiscal Position' _columns = { 'name': fields.char('Fiscal Position', size=64, required=True), + 'active': fields.boolean('Active', help="By unchecking the active field, you may hide a fiscal position without deleting it."), 'company_id': fields.many2one('res.company', 'Company'), 'account_ids': fields.one2many('account.fiscal.position.account', 'position_id', 'Account Mapping'), 'tax_ids': fields.one2many('account.fiscal.position.tax', 'position_id', 'Tax Mapping'), 'note': fields.text('Notes', translate=True), } + _defaults = { + 'active': True, + } + def map_tax(self, cr, uid, fposition_id, taxes, context=None): if not taxes: return [] diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index fbee97875ae..6051e2bc943 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -9,6 +9,7 @@
+ From b933c9608582c44db501dcdeefce19612e34ed62 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 21 Sep 2011 04:51:00 +0000 Subject: [PATCH 09/25] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20110921045100-dgx5b3vgawaxqe19 --- addons/hr_contract/i18n/cs.po | 146 +++++++++++---------- addons/hr_timesheet/i18n/cs.po | 227 ++++++++++++++++++--------------- addons/wiki/i18n/hr.po | 4 +- 3 files changed, 207 insertions(+), 170 deletions(-) diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po index ff63ed93a37..493196fe014 100644 --- a/addons/hr_contract/i18n/cs.po +++ b/addons/hr_contract/i18n/cs.po @@ -4,119 +4,120 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.4\n" +"Project-Id-Version: openeobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2009-02-03 06:25+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" +"PO-Revision-Date: 2011-09-20 07:48+0000\n" +"Last-Translator: Jiří Hajda \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:31+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-09-21 04:50+0000\n" +"X-Generator: Launchpad (build 13996)\n" +"X-Poedit-Language: Czech\n" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Hourly cost computation" -msgstr "" +msgstr "Výpočet hodinové ceny" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Gross" -msgstr "" +msgstr "Hrubého" #. module: hr_contract #: view:hr.contract:0 msgid "Trial Period" -msgstr "" +msgstr "Zkušební období" #. module: hr_contract #: field:hr.contract,trial_date_start:0 msgid "Trial Start Date" -msgstr "" +msgstr "Zkušební počáteční datum" #. module: hr_contract #: view:hr.contract:0 msgid "Passport" -msgstr "" +msgstr "Pas" #. module: hr_contract #: view:hr.employee:0 msgid "Medical Examination" -msgstr "" +msgstr "Zdravotní vyšetření" #. module: hr_contract #: field:hr.employee,vehicle:0 msgid "Company Vehicle" -msgstr "" +msgstr "Firemní vozidlo" #. module: hr_contract #: field:hr.contract.wage.type,name:0 msgid "Wage Type Name" -msgstr "" +msgstr "Jméno typu mzdy" #. module: hr_contract #: view:hr.employee:0 msgid "Miscellaneous" -msgstr "" +msgstr "Různé" #. module: hr_contract #: view:hr.contract:0 msgid "Current" -msgstr "" +msgstr "Aktuální" #. module: hr_contract #: field:hr.contract.wage.type,factor_type:0 msgid "Factor for hour cost" -msgstr "" +msgstr "Koeficient pro cenu hodiny" #. module: hr_contract #: view:hr.contract:0 msgid "Overpassed" -msgstr "" +msgstr "Uplynulý" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Wage Types" -msgstr "" +msgstr "Typ mzdy" #. module: hr_contract #: field:hr.contract,department_id:0 msgid "Department" -msgstr "" +msgstr "Oddělení" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Basic" -msgstr "" +msgstr "Základní" #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,employee_id:0 #: model:ir.model,name:hr_contract.model_hr_employee msgid "Employee" -msgstr "" +msgstr "Zaměstnanec" #. module: hr_contract #: selection:hr.contract.wage.type,type:0 msgid "Net" -msgstr "" +msgstr "Čistého" #. module: hr_contract #: model:ir.module.module,shortdesc:hr_contract.module_meta_information msgid "Human Resources Contracts" -msgstr "" +msgstr "Smlouvy lidských zdrojů" #. module: hr_contract #: field:hr.contract.wage.type.period,factor_days:0 msgid "Hours in the period" -msgstr "" +msgstr "Hodin v období" #. module: hr_contract #: field:hr.employee,vehicle_distance:0 msgid "Home-Work Distance" -msgstr "" +msgstr "Vzdálenost z domu do práce" #. module: hr_contract #: view:hr.contract:0 @@ -125,32 +126,32 @@ msgstr "" #: model:ir.actions.act_window,name:hr_contract.action_hr_contract #: model:ir.ui.menu,name:hr_contract.hr_menu_contract msgid "Contracts" -msgstr "" +msgstr "Smlouvy" #. module: hr_contract #: view:hr.employee:0 msgid "Personal Info" -msgstr "" +msgstr "Osobní informace" #. module: hr_contract #: view:hr.contract:0 msgid "Job" -msgstr "" +msgstr "Práce" #. module: hr_contract #: view:hr.contract:0 msgid "Search Contract" -msgstr "" +msgstr "Hledat smlouvu" #. module: hr_contract #: help:hr.employee,contract_id:0 msgid "Latest contract of the employee" -msgstr "" +msgstr "Poslední smlouva zaměstnance" #. module: hr_contract #: field:hr.contract,advantages_net:0 msgid "Deductions" -msgstr "" +msgstr "Odpočty" #. module: hr_contract #: model:ir.module.module,description:hr_contract.module_meta_information @@ -163,33 +164,40 @@ msgid "" " You can assign several contracts per employee.\n" " " msgstr "" +"\n" +" Přidává všechny informace zaměstnance ke správě smluv:\n" +" * Rodinný stav,\n" +" * Bezpečnostní číslo,\n" +" * Místo narození, datum narození, ...\n" +" Ke každému zaměstnanci můžete přiřadit několik smluv.\n" +" " #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,advantages:0 msgid "Advantages" -msgstr "" +msgstr "Výhody" #. module: hr_contract #: view:hr.contract:0 msgid "Valid for" -msgstr "" +msgstr "Platné pro" #. module: hr_contract #: view:hr.contract:0 msgid "Work Permit" -msgstr "" +msgstr "Pracovní povolení" #. module: hr_contract #: field:hr.employee,children:0 msgid "Number of Children" -msgstr "" +msgstr "Počet dětí" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type msgid "Contract Types" -msgstr "" +msgstr "Typy smluv" #. module: hr_contract #: field:hr.contract,wage_type_id:0 @@ -198,44 +206,44 @@ msgstr "" #: model:ir.model,name:hr_contract.model_hr_contract_wage_type #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type msgid "Wage Type" -msgstr "" +msgstr "Typ mzdy" #. module: hr_contract #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "" +msgstr "Chyba ! Nemůžete vytvořit rekurzivní Hiearchii zaměstnanců" #. module: hr_contract #: field:hr.contract,date_end:0 msgid "End Date" -msgstr "" +msgstr "Datum ukončení" #. module: hr_contract #: field:hr.contract,wage:0 msgid "Wage" -msgstr "" +msgstr "Mzda" #. module: hr_contract #: field:hr.contract,name:0 msgid "Contract Reference" -msgstr "" +msgstr "Odkaz smlouvy" #. module: hr_contract #: help:hr.employee,vehicle_distance:0 msgid "In kilometers" -msgstr "" +msgstr "V kilometrech" #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,notes:0 msgid "Notes" -msgstr "" +msgstr "Poznámky" #. module: hr_contract #: constraint:hr.employee:0 msgid "" "Error ! You cannot select a department for which the employee is the manager." -msgstr "" +msgstr "Chyba ! Nemůžete vybrat oddělení, kterého je zaměstnance vedoucí." #. module: hr_contract #: view:hr.contract:0 @@ -243,7 +251,7 @@ msgstr "" #: model:ir.model,name:hr_contract.model_hr_contract #: model:ir.ui.menu,name:hr_contract.next_id_56 msgid "Contract" -msgstr "" +msgstr "Smlouva" #. module: hr_contract #: view:hr.contract:0 @@ -252,92 +260,92 @@ msgstr "" #: field:hr.contract.type,name:0 #: model:ir.model,name:hr_contract.model_hr_contract_type msgid "Contract Type" -msgstr "" +msgstr "Typ smlouvy" #. module: hr_contract #: view:hr.contract.wage.type.period:0 msgid "Search Wage Period" -msgstr "" +msgstr "Hledat mzdové období" #. module: hr_contract #: view:hr.contract:0 #: field:hr.contract,working_hours:0 msgid "Working Schedule" -msgstr "" +msgstr "Pracovní plán" #. module: hr_contract #: view:hr.employee:0 msgid "Job Info" -msgstr "" +msgstr "Pracovní informace" #. module: hr_contract #: field:hr.contract.wage.type,period_id:0 #: view:hr.contract.wage.type.period:0 #: model:ir.model,name:hr_contract.model_hr_contract_wage_type_period msgid "Wage Period" -msgstr "" +msgstr "Mzdové období" #. module: hr_contract #: field:hr.contract,job_id:0 msgid "Job Title" -msgstr "" +msgstr "Název pozice" #. module: hr_contract #: field:hr.employee,manager:0 msgid "Is a Manager" -msgstr "" +msgstr "Je vedoucí" #. module: hr_contract #: field:hr.contract,date_start:0 msgid "Start Date" -msgstr "" +msgstr "Počáteční datum" #. module: hr_contract #: constraint:hr.contract:0 msgid "Error! contract start-date must be lower then contract end-date." -msgstr "" +msgstr "Chyba! Počáteční datum smlouvy musí být nižší než konečné datum." #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Search Wage Type" -msgstr "" +msgstr "Hledat typ mzdy" #. module: hr_contract #: field:hr.contract.wage.type,type:0 msgid "Type" -msgstr "" +msgstr "Typ" #. module: hr_contract #: field:hr.contract,trial_date_end:0 msgid "Trial End Date" -msgstr "" +msgstr "Zkušební koncové datum" #. module: hr_contract #: view:hr.contract:0 #: view:hr.contract.wage.type:0 msgid "Group By..." -msgstr "" +msgstr "Seskupit podle..." #. module: hr_contract #: field:hr.contract.wage.type.period,name:0 msgid "Period Name" -msgstr "" +msgstr "Název období" #. module: hr_contract #: view:hr.contract.wage.type:0 msgid "Period" -msgstr "" +msgstr "Období" #. module: hr_contract #: field:hr.employee,place_of_birth:0 msgid "Place of Birth" -msgstr "" +msgstr "Místo narození" #. module: hr_contract #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period msgid "Wage period" -msgstr "" +msgstr "Mzdové období" #. module: hr_contract #: help:hr.contract.wage.type,factor_type:0 @@ -346,28 +354,30 @@ msgid "" "This field is used by the timesheet system to compute the price of an hour " "of work wased on the contract of the employee" msgstr "" +"Toto pole je použito časovým rozvrhem systému pro výpočet ceny za hodinu " +"práce vynaložené na smlouvu zaměstnance" #. module: hr_contract #: view:hr.contract:0 msgid "Duration" -msgstr "" +msgstr "Trvání" #. module: hr_contract #: field:hr.employee,medic_exam:0 msgid "Medical Examination Date" -msgstr "" +msgstr "Datum zdravotní prohlídky" #. module: hr_contract #: field:hr.contract,advantages_gross:0 msgid "Allowances" -msgstr "" +msgstr "Dávky" #. module: hr_contract #: view:hr.contract:0 msgid "Main Data" -msgstr "" +msgstr "Hlavní data" #. module: hr_contract #: view:hr.contract.type:0 msgid "Search Contract Type" -msgstr "" +msgstr "Hledat typ smlouvy" diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po index c6dd897c9a0..089a96b1d85 100644 --- a/addons/hr_timesheet/i18n/cs.po +++ b/addons/hr_timesheet/i18n/cs.po @@ -4,45 +4,46 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.4\n" +"Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2009-02-03 20:59+0000\n" -"Last-Translator: Fabien (Open ERP) \n" -"Language-Team: \n" +"PO-Revision-Date: 2011-09-20 08:48+0000\n" +"Last-Translator: Jiří Hajda \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:24+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-09-21 04:50+0000\n" +"X-Generator: Launchpad (build 13996)\n" +"X-Poedit-Language: Czech\n" #. module: hr_timesheet #: model:product.template,name:hr_timesheet.product_consultant_product_template msgid "Service on Timesheet" -msgstr "" +msgstr "SLužby v časovém rozvrhu" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:43 #: code:addons/hr_timesheet/report/users_timesheet.py:77 #, python-format msgid "Wed" -msgstr "" +msgstr "St" #. module: hr_timesheet #: view:hr.sign.out.project:0 msgid "(Keep empty for current_time)" -msgstr "" +msgstr "(Nechejte prázdné pro aktuální čas)" #. module: hr_timesheet #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132 #, python-format msgid "No employee defined for your user !" -msgstr "" +msgstr "Pro vašeho uživatele nebyl určen zaměstnanec !" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Group By..." -msgstr "" +msgstr "Seskupit podle..." #. module: hr_timesheet #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in @@ -52,16 +53,20 @@ msgid "" "analytic account. This feature allows to record at the same time the " "attendance and the timesheet." msgstr "" +"Zaměstnanci mohou vkládat své časy strávené na různých projektech. Projekt " +"je analytický účet a čas strávený na projektu generuje ceny na na " +"analytickém účtu. Tato funkce umožňuje zaznamenat ve stejný čas docházku a " +"časový rozvrh." #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Today" -msgstr "" +msgstr "Dnes" #. module: hr_timesheet #: field:hr.employee,journal_id:0 msgid "Analytic Journal" -msgstr "" +msgstr "Analytický deník" #. module: hr_timesheet #: view:hr.sign.out.project:0 @@ -72,31 +77,31 @@ msgstr "Ukončit práci" #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee msgid "Employee Timesheet" -msgstr "" +msgstr "Časový rozvrh zaměstnance" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Work done stats" -msgstr "" +msgstr "Statistika dokončené práce" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet msgid "Timesheet" -msgstr "" +msgstr "Časový rozvrh" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "janvier" -msgstr "" +msgstr "leden" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:43 #: code:addons/hr_timesheet/report/users_timesheet.py:77 #, python-format msgid "Mon" -msgstr "" +msgstr "Po" #. module: hr_timesheet #: view:hr.sign.in.project:0 @@ -111,27 +116,31 @@ msgid "" "project generates costs on the analytic account. This feature allows to " "record at the same time the attendance and the timesheet." msgstr "" +"Zaměstnanci mohou vkládat své časy strávené na různých projektech, ke kterým " +"jsou přiřazeni. Projekt je analytický účet a čas strávený na projektu " +"generuje ceny na na analytickém účtu. Tato funkce umožňuje zaznamenat ve " +"stejný čas docházku a časový rozvrh." #. module: hr_timesheet #: field:hr.sign.out.project,analytic_amount:0 msgid "Minimum Analytic Amount" -msgstr "" +msgstr "Minimální analytická částka" #. module: hr_timesheet #: view:hr.analytical.timesheet.employee:0 msgid "Monthly Employee Timesheet" -msgstr "" +msgstr "Měsíční časový rozvrh zaměstnance" #. module: hr_timesheet #: view:hr.sign.out.project:0 msgid "Work done in the last period" -msgstr "" +msgstr "Dokončená práce v minulém období" #. module: hr_timesheet #: constraint:hr.employee:0 msgid "" "Error ! You cannot select a department for which the employee is the manager." -msgstr "" +msgstr "Chyba ! Nemůžete vybrat oddělení, kterého je zaměstnance vedoucí." #. module: hr_timesheet #: field:hr.sign.in.project,state:0 @@ -143,39 +152,39 @@ msgstr "Současné datum" #: field:hr.sign.in.project,name:0 #: field:hr.sign.out.project,name:0 msgid "Employees name" -msgstr "" +msgstr "Jméno zaměstnance" #. module: hr_timesheet #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users msgid "Print Employees Timesheet" -msgstr "" +msgstr "Tisknou časový rozvrh zaměstnance" #. module: hr_timesheet #: code:addons/hr_timesheet/hr_timesheet.py:174 #: code:addons/hr_timesheet/hr_timesheet.py:176 #, python-format msgid "Warning !" -msgstr "" +msgstr "Varování !" #. module: hr_timesheet #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132 #, python-format msgid "UserError" -msgstr "" +msgstr "UserError" #. module: hr_timesheet #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77 #, python-format msgid "No cost unit defined for this employee !" -msgstr "" +msgstr "Pro tohoto zaměstnance nebyla určena cenová jednotka !" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:43 #: code:addons/hr_timesheet/report/users_timesheet.py:77 #, python-format msgid "Tue" -msgstr "" +msgstr "Út" #. module: hr_timesheet #: field:hr.sign.out.project,account_id:0 @@ -186,32 +195,32 @@ msgstr "Analytický účet" #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42 #, python-format msgid "Warning" -msgstr "" +msgstr "Varování" #. module: hr_timesheet #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information msgid "Human Resources (Timesheet encoding)" -msgstr "" +msgstr "Lidské zdroje (Kódování časových rozvrhů)" #. module: hr_timesheet #: view:hr.sign.in.project:0 #: view:hr.sign.out.project:0 msgid "Sign In/Out By Project" -msgstr "" +msgstr "Přihlášení/Odhlášení podle projektu" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:43 #: code:addons/hr_timesheet/report/users_timesheet.py:77 #, python-format msgid "Sat" -msgstr "" +msgstr "So" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:43 #: code:addons/hr_timesheet/report/users_timesheet.py:77 #, python-format msgid "Sun" -msgstr "" +msgstr "Ne" #. module: hr_timesheet #: view:hr.analytical.timesheet.employee:0 @@ -222,18 +231,18 @@ msgstr "Tisk" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Timesheet Lines" -msgstr "" +msgstr "Řádky časového rozvrhu" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "juillet" -msgstr "" +msgstr "červenec" #. module: hr_timesheet #: view:hr.analytical.timesheet.users:0 msgid "Monthly Employees Timesheet" -msgstr "" +msgstr "Měsíční časový rozvrh zaměstnance" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -242,7 +251,7 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "July" -msgstr "" +msgstr "Červenec" #. module: hr_timesheet #: field:hr.sign.in.project,date:0 @@ -253,13 +262,13 @@ msgstr "Počáteční datum" #. module: hr_timesheet #: view:hr.employee:0 msgid "Categories" -msgstr "" +msgstr "Kategorie" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "novembre" -msgstr "" +msgstr "listopad" #. module: hr_timesheet #: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form @@ -267,6 +276,8 @@ msgid "" "Through Working Hours you can register your working hours by project every " "day." msgstr "" +"Pomocí pracovních hodin můžete každý den registrovat vaše pracovní hodiny " +"podle projektu." #. module: hr_timesheet #: model:ir.module.module,description:hr_timesheet.module_meta_information @@ -283,6 +294,18 @@ msgid "" "to set up a management by affair.\n" " " msgstr "" +"\n" +"Tento modul realizuje systém časového rozvrhu. Každý zaměstnanec může " +"zadávat a\n" +"sledovat svůj čas strávený na různých projektech. Projekt je \n" +"analytický účet a čas strávený na projektu generuje ceny na\n" +"analytickém účtu.\n" +"\n" +"Je poskytováno mnoho vykazování nad časem a sledováním zaměstnanců.\n" +"\n" +"Je celkově integrováno s module účtování cen. Umožňuje vám\n" +"nastavit správu podle poměru.\n" +" " #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -291,18 +314,18 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "March" -msgstr "" +msgstr "Březen" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Total cost" -msgstr "" +msgstr "Celková cena" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "décembre" -msgstr "" +msgstr "prosinec" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -311,22 +334,22 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "September" -msgstr "" +msgstr "Září" #. module: hr_timesheet #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet msgid "Timesheet Line" -msgstr "" +msgstr "Řádek časového rozvrhu" #. module: hr_timesheet #: field:hr.analytical.timesheet.users,employee_ids:0 msgid "employees" -msgstr "" +msgstr "zaměstnanci" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Stats by month" -msgstr "" +msgstr "Statistika podle měsíce" #. module: hr_timesheet #: view:account.analytic.account:0 @@ -343,25 +366,25 @@ msgstr "Popis práce" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "To be invoiced" -msgstr "" +msgstr "K fakturaci" #. module: hr_timesheet #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet msgid "Employee timesheet" -msgstr "" +msgstr "Časový rozvrh zaměstnance" #. module: hr_timesheet #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out msgid "Sign in / Sign out by project" -msgstr "" +msgstr "Přihlášení / Odhlášení podle projektu" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:43 #: code:addons/hr_timesheet/report/users_timesheet.py:77 #, python-format msgid "Fri" -msgstr "" +msgstr "Pá" #. module: hr_timesheet #: view:hr.sign.in.project:0 @@ -375,27 +398,29 @@ msgid "" "Analytic journal is not defined for employee %s \n" "Define an employee for the selected user and assign an analytic journal!" msgstr "" +"Pro zaměstnance %s není určen Analytický deník \n" +"Určete zaměstnance pro vybraného uživatele a přiřaďte analxtický deník!" #. module: hr_timesheet #: view:hr.sign.in.project:0 msgid "(Keep empty for current time)" -msgstr "" +msgstr "(Nechejte prázdné pro aktuální čas)" #. module: hr_timesheet #: view:hr.employee:0 msgid "Timesheets" -msgstr "" +msgstr "Časové rozvrhy" #. module: hr_timesheet #: help:hr.employee,product_id:0 msgid "Specifies employee's designation as a product with type 'service'." -msgstr "" +msgstr "Určuje zařazení zaměstnance jako výrobek s typem 'služba'." #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "août" -msgstr "" +msgstr "srpen" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -404,7 +429,7 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "August" -msgstr "" +msgstr "Srpen" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -413,23 +438,23 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "June" -msgstr "" +msgstr "Červen" #. module: hr_timesheet #: view:hr.analytical.timesheet.employee:0 msgid "Print My Timesheet" -msgstr "" +msgstr "Tisknout můj časový rozvrh" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "mars" -msgstr "" +msgstr "březen" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Date" -msgstr "" +msgstr "Datum" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -438,12 +463,12 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "November" -msgstr "" +msgstr "Listopad" #. module: hr_timesheet #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "" +msgstr "Chyba ! Nemůžete vytvořit rekurzivní Hierarchii zaměstnanců" #. module: hr_timesheet #: field:hr.sign.out.project,date:0 @@ -457,7 +482,7 @@ msgstr "Koncové datum" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "October" -msgstr "" +msgstr "Říjen" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -466,35 +491,35 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "January" -msgstr "" +msgstr "Leden" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Key dates" -msgstr "" +msgstr "Klíčové dny" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:43 #: code:addons/hr_timesheet/report/users_timesheet.py:77 #, python-format msgid "Thu" -msgstr "" +msgstr "Čt" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Analysis stats" -msgstr "" +msgstr "Statistiká analýza" #. module: hr_timesheet #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee msgid "Print Employee Timesheet & Print My Timesheet" -msgstr "" +msgstr "Tisknout Časový rozvrh zaměstnance & Tisknou můj časový rozvrh" #. module: hr_timesheet #: field:hr.sign.in.project,emp_id:0 #: field:hr.sign.out.project,emp_id:0 msgid "Employee ID" -msgstr "" +msgstr "ID zaměstnance" #. module: hr_timesheet #: view:hr.sign.out.project:0 @@ -504,12 +529,12 @@ msgstr "Obecné informace" #. module: hr_timesheet #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my msgid "My Timesheet" -msgstr "" +msgstr "Moje časové rozvrhy" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Analysis summary" -msgstr "" +msgstr "Souhrn analýzy" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -518,7 +543,7 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "December" -msgstr "" +msgstr "Prosinec" #. module: hr_timesheet #: view:hr.analytical.timesheet.employee:0 @@ -526,7 +551,7 @@ msgstr "" #: view:hr.sign.in.project:0 #: view:hr.sign.out.project:0 msgid "Cancel" -msgstr "Storno" +msgstr "Zrušit" #. module: hr_timesheet #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users @@ -534,30 +559,30 @@ msgstr "Storno" #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users msgid "Employees Timesheet" -msgstr "" +msgstr "Časové rozvrhy zaměstnanců" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "février" -msgstr "" +msgstr "únor" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Information" -msgstr "" +msgstr "Informace" #. module: hr_timesheet #: field:hr.analytical.timesheet.employee,employee_id:0 #: model:ir.model,name:hr_timesheet.model_hr_employee msgid "Employee" -msgstr "" +msgstr "Zaměstnanec" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "avril" -msgstr "" +msgstr "duben" #. module: hr_timesheet #: field:hr.sign.in.project,server_date:0 @@ -568,23 +593,23 @@ msgstr "Současné datum" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Anlytic account" -msgstr "" +msgstr "Analytický účet" #. module: hr_timesheet #: view:hr.analytical.timesheet.employee:0 msgid "This wizard will print monthly timesheet" -msgstr "" +msgstr "Tento průvodce bude tisknout měsíční časový rozvrh" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 #: field:hr.employee,product_id:0 msgid "Product" -msgstr "" +msgstr "Výrobek" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Invoicing" -msgstr "" +msgstr "Fakturace" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -593,34 +618,34 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "May" -msgstr "" +msgstr "Květen" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Total time" -msgstr "" +msgstr "Celkový čas" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "juin" -msgstr "" +msgstr "červen" #. module: hr_timesheet #: view:hr.sign.in.project:0 msgid "(local time on the server side)" -msgstr "(lokální čas na serveru)" +msgstr "(místní čas na straně serveru)" #. module: hr_timesheet #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours msgid "Working Hours" -msgstr "" +msgstr "Pracovní hodiny" #. module: hr_timesheet #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project msgid "Sign In By Project" -msgstr "" +msgstr "Přihlášení podle projektu" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -629,28 +654,28 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "February" -msgstr "" +msgstr "Únor" #. module: hr_timesheet #: field:hr.analytic.timesheet,line_id:0 msgid "Analytic line" -msgstr "" +msgstr "Analytický řádek" #. module: hr_timesheet #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project msgid "Sign Out By Project" -msgstr "" +msgstr "Odhlášení podle projektu" #. module: hr_timesheet #: view:hr.analytical.timesheet.users:0 msgid "Employees" -msgstr "" +msgstr "Zaměstnanci" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "octobre" -msgstr "" +msgstr "říjen" #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:40 @@ -659,7 +684,7 @@ msgstr "" #: selection:hr.analytical.timesheet.users,month:0 #, python-format msgid "April" -msgstr "" +msgstr "Duben" #. module: hr_timesheet #: code:addons/hr_timesheet/hr_timesheet.py:176 @@ -668,12 +693,14 @@ msgid "" "No analytic account defined on the project.\n" "Please set one or we can not automatically fill the timesheet." msgstr "" +"U projektu nebyl určen analytický účet.\n" +"Prosíme nastavte jej nebo nemůžeme automaticky vyplnit časový rozvrh." #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "mai" -msgstr "" +msgstr "květen" #. module: hr_timesheet #: view:account.analytic.account:0 @@ -689,13 +716,13 @@ msgstr "Začít pracovat" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Stats by user" -msgstr "" +msgstr "Statistiky podle uživatele" #. module: hr_timesheet #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42 #, python-format msgid "No employee defined for this user" -msgstr "" +msgstr "Pro tohoto uživatele nebyl určen zaměstnanec" #. module: hr_timesheet #: field:hr.analytical.timesheet.employee,year:0 @@ -706,23 +733,23 @@ msgstr "Rok" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Accounting" -msgstr "" +msgstr "Účetnictví" #. module: hr_timesheet #: field:hr.analytic.timesheet,partner_id:0 msgid "Partner Id" -msgstr "" +msgstr "Id partnera" #. module: hr_timesheet #: view:hr.sign.out.project:0 msgid "Change Work" -msgstr "" +msgstr "Změnit práci" #. module: hr_timesheet #: selection:hr.analytical.timesheet.employee,month:0 #: selection:hr.analytical.timesheet.users,month:0 msgid "septembre" -msgstr "" +msgstr "září" #~ msgid "Choose Users" #~ msgstr "Uživatelé" diff --git a/addons/wiki/i18n/hr.po b/addons/wiki/i18n/hr.po index 749a7f15372..62023e0099d 100644 --- a/addons/wiki/i18n/hr.po +++ b/addons/wiki/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-20 04:54+0000\n" -"X-Generator: Launchpad (build 13980)\n" +"X-Launchpad-Export-Date: 2011-09-21 04:50+0000\n" +"X-Generator: Launchpad (build 13996)\n" #. module: wiki #: field:wiki.groups,template:0 From b9869f93545b711ce4157a1f47a469d7c86bb284 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 21 Sep 2011 09:19:25 +0200 Subject: [PATCH 10/25] [FIX] empty root groups in aggregations bzr revid: xmo@openerp.com-20110921071925-by8fl0o85v76d6am --- addons/web/static/src/js/view_list.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index f8a89cd34a1..0a27704b741 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -541,6 +541,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# if (_.isEmpty(records)) { records = this.groups.get_records(); } + records = _(records).compact(); var count = 0, sums = {}; _(columns).each(function (column) { @@ -1235,6 +1236,9 @@ openerp.web.ListView.Groups = openerp.web.Class.extend( /** @lends openerp.web.L }, get_records: function () { if (_(this.children).isEmpty()) { + if (!this.datagroup.length) { + return; + } return { count: this.datagroup.length, values: this.datagroup.aggregates From 354a4d48c033d28f2ce5072f8c79b693ea3a2bed Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 21 Sep 2011 09:33:59 +0200 Subject: [PATCH 11/25] [IMP] useability, warning on change of pricelist in the middle of the SO lp bug: https://launchpad.net/bugs/782168 fixed bzr revid: fp@tinyerp.com-20110921073359-t20q6m88ocnm746z --- addons/sale/sale.py | 10 ++++++++++ addons/sale/sale_view.xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 9c585801ffa..12c27c197ed 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -322,6 +322,16 @@ class sale_order(osv.osv): self.log(cr, uid, id, message) return True + def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context={}): + print order_lines + if (not pricelist_id) or (not order_lines): + return {} + warning = { + 'title': _('Pricelist Warning!'), + 'message' : _('If you change the pricelist of this order (and eventually the currency), prices of existing order lines will not be updated.') + } + return {'warning': warning} + def onchange_partner_id(self, cr, uid, ids, part): if not part: return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False, 'partner_order_id': False, 'payment_term': False, 'fiscal_position': False}} diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 51c543279ae..a12a4c566f5 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -112,7 +112,7 @@ - + From cdef8d8f8f4142c5eacfd912675b28d7ddb532c5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 21 Sep 2011 09:45:09 +0200 Subject: [PATCH 12/25] [FIX] correctly handle 'false' domain on listview dataset: filter it out bzr revid: xmo@openerp.com-20110921074509-2gkgp3ai4ly1vwdf --- addons/web/static/src/js/view_list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 0a27704b741..eeda44c4c99 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -415,8 +415,8 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# */ do_search: function (domains, contexts, groupbys) { return this.rpc('/web/session/eval_domain_and_context', { - domains: [this.dataset.get_domain()].concat(domains), - contexts: [this.dataset.get_context()].concat(contexts), + domains: _([this.dataset.get_domain()].concat(domains)).compact(), + contexts: _([this.dataset.get_context()].concat(contexts)).compact(), group_by_seq: groupbys }, $.proxy(this, 'do_actual_search')); }, From 7b80bd155c948e2b009f4238aa88fe11d34d69cf Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 21 Sep 2011 10:16:51 +0200 Subject: [PATCH 13/25] [FIX] issues with missing window.console object in Firefox 3.6 when Firebug is not active bzr revid: xmo@openerp.com-20110921081651-a4usbx7flv91xko5 --- addons/web/static/src/js/chrome.js | 2 -- addons/web/static/src/js/core.js | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 8a8962fd27b..fd3ea690245 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -581,7 +581,6 @@ openerp.web.Header = openerp.web.Widget.extend(/** @lends openerp.web.Header# * this._super(parent); this.qs = "?" + jQuery.param.querystring(); this.$content = $(); - console.debug("initializing header with id", this.element_id); this.update_promise = $.Deferred().resolve(); }, start: function() { @@ -963,7 +962,6 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie this.session.start(); this.login.start(); this.menu.start(); - console.debug("The openerp client has been initialized."); }, on_logged: function() { if(this.action_manager) diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index a33fca458d0..e26e01e5b29 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -1,7 +1,10 @@ /*--------------------------------------------------------- * OpenERP Web core *--------------------------------------------------------*/ - +var console; +if (!console) { + console = {log: function () {}}; +} if (!console.debug) { console.debug = console.log; } @@ -943,7 +946,6 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg * If that's not the case this method will simply return `false`. */ do_action: function(action, on_finished) { - console.log('Widget.do_action', action, on_finished); if (this.widget_parent) { return this.widget_parent.do_action(action, on_finished); } From 8df96caa72fc55820f85bbd7a2055a36624020ac Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 21 Sep 2011 12:41:36 +0200 Subject: [PATCH 14/25] [imp] refactored datetime components to allow usage in the search view bzr revid: nicolas.vanhoren@openerp.com-20110921104136-pu8yvny228jyi5so --- addons/web/static/src/js/core.js | 5 +- addons/web/static/src/js/view_form.js | 91 ++++++++++++++++++--------- addons/web/static/src/xml/base.xml | 17 ++--- 3 files changed, 76 insertions(+), 37 deletions(-) diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index a33fca458d0..fc4e3b4c2c4 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -771,7 +771,6 @@ openerp.web.SessionAware = openerp.web.CallbackEnabled.extend(/** @lends openerp * // stuff that you want to init before the rendering * }, * start: function() { - * this._super(); * // stuff you want to make after the rendering, `this.$element` holds a correct value * this.$element.find(".my_button").click(/* an example of event binding * /); * @@ -915,6 +914,8 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg * @returns {jQuery.Deferred} */ start: function() { + /* The default implementation is only useful for retro-compatibility, it is + not necessary to call it using _super() when using Widget for new components. */ if (!this.$element) { var tmp = document.getElementById(this.element_id); this.$element = tmp ? $(tmp) : undefined; @@ -922,7 +923,7 @@ openerp.web.Widget = openerp.web.SessionAware.extend(/** @lends openerp.web.Widg return $.Deferred().done().promise(); }, /** - * Destroys the current widget, also destory all its children before destroying itself. + * Destroys the current widget, also destroy all its children before destroying itself. */ stop: function() { _.each(_.clone(this.widget_children), function(el) { diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 31779648f3b..e2a83679da7 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1121,16 +1121,13 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({ } }); -openerp.web.form.FieldDatetime = openerp.web.form.Field.extend({ - init: function(view, node) { - this._super(view, node); - this.template = "FieldDate"; - this.jqueryui_object = 'datetimepicker'; - }, +openerp.web.DateTimeWidget = openerp.web.Widget.extend({ + template: "web.datetimepicker", + jqueryui_object: 'datetimepicker', + type_of_date: "datetime", start: function() { var self = this; - this._super.apply(this, arguments); - this.$element.find('input').change(this.on_ui_change); + this.$element.find('input').change(this.on_change); this.picker({ onSelect: this.on_picker_select, changeMonth: true, @@ -1158,7 +1155,7 @@ openerp.web.form.FieldDatetime = openerp.web.form.Field.extend({ }, set_value: function(value) { value = this.parse(value); - this._super(value); + this.value = value; this.$element.find('input').val(value ? this.format_client(value) : ''); }, get_value: function() { @@ -1167,24 +1164,22 @@ openerp.web.form.FieldDatetime = openerp.web.form.Field.extend({ set_value_from_ui: function() { var value = this.$element.find('input').val() || false; this.value = this.parse_client(value); - this._super(); }, - update_dom: function() { - this._super.apply(this, arguments); + set_readonly: function(readonly) { + this.readonly = readonly; this.$element.find('input').attr('disabled', this.readonly); - this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', this.readonly); + this.$element.find('img.oe_datepicker_trigger').toggleClass('oe_input_icon_disabled', readonly); }, - validate: function() { - this.invalid = false; + is_valid: function(required) { var value = this.$element.find('input').val(); if (value === "") { - this.invalid = this.required; + return !required; } else { try { this.parse_client(value); - this.invalid = false; + return true; } catch(e) { - this.invalid = true; + return false; } } }, @@ -1193,24 +1188,64 @@ openerp.web.form.FieldDatetime = openerp.web.form.Field.extend({ }, parse: openerp.web.auto_str_to_date, parse_client: function(v) { - return openerp.web.parse_value(v, this.field); + return openerp.web.parse_value(v, {"widget": this.type_of_date}); }, format: function(val) { - return openerp.web.auto_date_to_str(val, this.field.type); + return openerp.web.auto_date_to_str(val, this.type_of_date); }, format_client: function(v) { - return openerp.web.format_value(v, this.field); + return openerp.web.format_value(v, {"widget": this.type_of_date}); + }, + on_change: function() { + if (this.is_valid()) { + this.set_value_from_ui(); + } + } +}); + +openerp.web.DateWidget = openerp.web.DateTimeWidget.extend({ + jqueryui_object: 'datepicker', + type_of_date: "date", + on_picker_select: function(text, instance) { + this._super(text, instance); + this.$element.find('.oe_datepicker').hide(); + } +}); + +openerp.web.form.FieldDatetime = openerp.web.form.Field.extend({ + template: "EmptyComponent", + build_widget: function() { + return new openerp.web.DateTimeWidget(this); + }, + start: function() { + var self = this; + this._super.apply(this, arguments); + this.datewidget = this.build_widget(); + this.datewidget.on_change.add(this.on_ui_change); + this.datewidget.appendTo(this.$element); + }, + set_value: function(value) { + this._super(value); + this.datewidget.set_value(value); + }, + get_value: function() { + return this.datewidget.get_value(); + }, + update_dom: function() { + this._super.apply(this, arguments); + this.datewidget.set_readonly(this.readonly); + }, + validate: function() { + this.invalid = !this.datewidget.is_valid(this.required); + }, + focus: function() { + this.datewidget.focus(); } }); openerp.web.form.FieldDate = openerp.web.form.FieldDatetime.extend({ - init: function(view, node) { - this._super(view, node); - this.jqueryui_object = 'datepicker'; - }, - on_picker_select: function(text, instance) { - this._super(text, instance); - this.$element.find('.oe_datepicker').hide(); + build_widget: function() { + return new openerp.web.DateWidget(this); } }); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index da5f2e0638e..d2b2f618eec 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -800,13 +800,16 @@ > - - - -