diff --git a/addons/account_analytic_analysis/i18n/sr@latin.po b/addons/account_analytic_analysis/i18n/sr@latin.po index 6311bbb991c..53715611d10 100644 --- a/addons/account_analytic_analysis/i18n/sr@latin.po +++ b/addons/account_analytic_analysis/i18n/sr@latin.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2011-11-03 22:52+0000\n" +"PO-Revision-Date: 2012-03-13 16:49+0000\n" "Last-Translator: Milan Milosevic \n" "Language-Team: Serbian latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-09 06:32+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-03-14 04:42+0000\n" +"X-Generator: Launchpad (build 14933)\n" #. module: account_analytic_analysis #: field:account.analytic.account,revenue_per_hour:0 msgid "Revenue per Time (real)" -msgstr "" +msgstr "Prihod po vremenu (realnom)" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_ca:0 @@ -38,11 +38,13 @@ msgid "" "The contracts to be renewed because the deadline is passed or the working " "hours are higher than the allocated hours" msgstr "" +"Ugovor treba da se obnovi jer je rok pređen, ili ima više radnih sati od " +"određenih sati" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Pending contracts to renew with your customer" -msgstr "" +msgstr "Ugovori na čekanju za potvrdu sa Vašom strankom" #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_non_invoiced:0 @@ -50,26 +52,28 @@ msgid "" "Number of time (hours/days) (from journal of type 'general') that can be " "invoiced if you invoice based on analytic account." msgstr "" +"Broj vremena (dana/sati) (iz dnevnika tipa 'opšte') koji se može fakturisati " +"ako Vam je fakturisanje bazirano na analitičkom kontu." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Analytic Accounts with a past deadline in one month." -msgstr "" +msgstr "Analitička konta sa pređenim rokom u jednom mesecu." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Group By..." -msgstr "" +msgstr "Grupiši po..." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "End Date" -msgstr "" +msgstr "Datum završetka" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Create Invoice" -msgstr "" +msgstr "Napravi fakturu" #. module: account_analytic_analysis #: field:account.analytic.account,last_invoice_date:0 @@ -87,16 +91,18 @@ msgid "" "Number of time you spent on the analytic account (from timesheet). It " "computes quantities on all journal of type 'general'." msgstr "" +"Vreme potrošeno na analitički konto (s vremenske tabele). Obračunava " +"kvantitete na sve dnevnike tipa 'opšte'." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts in progress" -msgstr "" +msgstr "Ugovori u toku" #. module: account_analytic_analysis #: field:account.analytic.account,is_overdue_quantity:0 msgid "Overdue Quantity" -msgstr "" +msgstr "Preloraečnja" #. module: account_analytic_analysis #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue @@ -108,6 +114,11 @@ msgid "" "pending accounts and reopen or close the according to the negotiation with " "the customer." msgstr "" +"Naći ćete ovde ugovore koje treba obnoviti jer je rok istekao, ili su radni " +"sati veći od određenih. OpenERP automatski postavlja ta analitička konta na " +"stanje 'na čekanju', da bi se iznelo upozorenje za vreme sačuvavanja u " +"tabelama vremena. Prodavci bi trebalo da provere sva konta na čekanju i " +"zatvore ili ih ponovo otvore, u zavisnosti od dogovora sa strankama." #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 @@ -117,7 +128,7 @@ msgstr "Teoretski prihod" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_non_invoiced:0 msgid "Uninvoiced Time" -msgstr "" +msgstr "Neobračunato vreme" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_invoiced_date:0 @@ -131,7 +142,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "To Renew" -msgstr "" +msgstr "Za obnovu" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_date:0 @@ -141,24 +152,25 @@ msgstr "Datum poslednje Cene / Rada" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_invoiced:0 msgid "Invoiced Time" -msgstr "" +msgstr "Obračunato vreme" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "" "A contract in OpenERP is an analytic account having a partner set on it." msgstr "" +"Ugovor u OpenERP-u je analitički konto sa partnerom koji mu je pripisan." #. module: account_analytic_analysis #: field:account.analytic.account,remaining_hours:0 msgid "Remaining Time" -msgstr "" +msgstr "Preostalo vreme" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue msgid "Contracts to Renew" -msgstr "" +msgstr "Ugovori za obnovu" #. module: account_analytic_analysis #: field:account.analytic.account,theorical_margin:0 @@ -168,7 +180,7 @@ msgstr "Teoretska stopa marže" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid " +1 Month" -msgstr "" +msgstr " +1 mesec" #. module: account_analytic_analysis #: help:account.analytic.account,ca_theorical:0 @@ -183,7 +195,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Pending" -msgstr "" +msgstr "Na čekanju" #. module: account_analytic_analysis #: field:account.analytic.account,ca_to_invoice:0 @@ -198,7 +210,7 @@ msgstr "Izračunato pomoću formule: Fakturisani iznos - Ukupni troškovi." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Parent" -msgstr "" +msgstr "Parent" #. module: account_analytic_analysis #: field:account.analytic.account,user_ids:0 @@ -214,7 +226,7 @@ msgstr "Izračunava se pomoću formule: (Realna marža / ukupni troškovi) * 100 #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user msgid "Hours Summary by User" -msgstr "Ukupno sati po Korisniku" +msgstr "Ukupno sati po korisniku" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 @@ -229,7 +241,7 @@ msgstr "Datum poslednjeg obračunatog troška" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contract" -msgstr "" +msgstr "Ugovor" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin_rate:0 @@ -264,7 +276,7 @@ msgstr "Preostali prihod" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours:0 msgid "Computed using the formula: Maximum Time - Total Time" -msgstr "" +msgstr "Obračunato koristeći formulu: Maksimalno vreme - ukupno vreme" #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_invoiced:0 @@ -272,6 +284,8 @@ msgid "" "Number of time (hours/days) that can be invoiced plus those that already " "have been invoiced." msgstr "" +"Trajanje vremena (dani/sati) koji se mogu obračunati, plus ono koje je već " +"obračunato." #. module: account_analytic_analysis #: help:account.analytic.account,ca_to_invoice:0 @@ -285,7 +299,7 @@ msgstr "" #. module: account_analytic_analysis #: help:account.analytic.account,revenue_per_hour:0 msgid "Computed using the formula: Invoiced Amount / Total Time" -msgstr "" +msgstr "Izračunato koristeći formulu: obračunat iznos / ukupno vreme" #. module: account_analytic_analysis #: field:account.analytic.account,total_cost:0 @@ -304,18 +318,18 @@ msgstr "Mesec" #: field:account_analytic_analysis.summary.user,account_id:0 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_account msgid "Analytic Account" -msgstr "Analitički nalog" +msgstr "Analitički konto" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all msgid "Contracts" -msgstr "" +msgstr "Ugovori" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Manager" -msgstr "" +msgstr "Rukovodilac" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all @@ -326,22 +340,22 @@ msgstr "Sve neobračunate stavke" #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 msgid "If invoice from the costs, this is the date of the latest invoiced." -msgstr "" +msgstr "ako se obračunava iz troškova, ovo je datum poslednjeg obračuna." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Associated Partner" -msgstr "" +msgstr "Povezani partner" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Open" -msgstr "" +msgstr "Otvori" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts that are not assigned to an account manager." -msgstr "" +msgstr "Ugovori koji oš nisu pripisani rukovodiocu naloga." #. module: account_analytic_analysis #: field:account.analytic.account,hours_quantity:0 diff --git a/addons/account_asset/i18n/lt.po b/addons/account_asset/i18n/lt.po new file mode 100644 index 00000000000..eea03149162 --- /dev/null +++ b/addons/account_asset/i18n/lt.po @@ -0,0 +1,793 @@ +# Lithuanian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 01:37+0100\n" +"PO-Revision-Date: 2012-03-09 15:10+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Lithuanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-10 04:54+0000\n" +"X-Generator: Launchpad (build 14914)\n" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in draft and open states" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,method_end:0 +#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0 +msgid "Ending date" +msgstr "Pabaigos data" + +#. module: account_asset +#: field:account.asset.asset,value_residual:0 +msgid "Residual Value" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_expense_depreciation_id:0 +msgid "Depr. Expense Account" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute Asset" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Group By..." +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,gross_value:0 +msgid "Gross Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 field:account.asset.asset,name:0 +#: field:account.asset.depreciation.line,asset_id:0 +#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0 +#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0 +#: model:ir.model,name:account_asset.model_account_asset_asset +msgid "Asset" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0 +msgid "" +"Indicates that the first depreciation entry for this asset have to be done " +"from the purchase date instead of the first January" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,name:0 +msgid "History name" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,company_id:0 +#: field:account.asset.category,company_id:0 view:asset.asset.report:0 +#: field:asset.asset.report,company_id:0 +msgid "Company" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Modify" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Running" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,amount:0 +msgid "Depreciation Amount" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report +#: model:ir.model,name:account_asset.model_asset_asset_report +#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report +msgid "Assets Analysis" +msgstr "" + +#. module: account_asset +#: field:asset.modify,name:0 +msgid "Reason" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_progress_factor:0 +#: field:account.asset.category,method_progress_factor:0 +msgid "Degressive Factor" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Asset Categories" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "" +"This wizard will post the depreciation lines of running assets that belong " +"to the selected period." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,account_move_line_ids:0 +#: field:account.move.line,entry_ids:0 +#: model:ir.actions.act_window,name:account_asset.act_entries_open +msgid "Entries" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,depreciation_line_ids:0 +msgid "Depreciation Lines" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,salvage_value:0 +msgid "It is the amount you plan to have that you cannot depreciate." +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciation_date:0 +#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0 +msgid "Depreciation Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_asset_id:0 +msgid "Asset Account" +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,posted_value:0 +msgid "Posted Amount" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_finance_assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets +msgid "Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_depreciation_id:0 +msgid "Depreciation Account" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0 +msgid "Notes" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_id:0 +msgid "Depreciation Entry" +msgstr "" + +#. module: account_asset +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,nbr:0 +msgid "# of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in draft state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_end:0 +#: selection:account.asset.asset,method_time:0 +#: selection:account.asset.category,method_time:0 +#: selection:account.asset.history,method_time:0 +msgid "Ending Date" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,code:0 +msgid "Reference" +msgstr "" + +#. module: account_asset +#: constraint:account.invoice:0 +msgid "Invalid BBA Structured Communication !" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Account Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard +#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard +msgid "Compute Assets" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,sequence:0 +msgid "Sequence of the depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_period:0 +#: field:account.asset.category,method_period:0 +#: field:account.asset.history,method_period:0 +#: field:asset.modify,method_period:0 +msgid "Period Length" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Draft" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of asset purchase" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_number:0 +msgid "Calculates Depreciation within specified interval" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change Duration" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,account_analytic_id:0 +msgid "Analytic account" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method:0 field:account.asset.category,method:0 +msgid "Computation Method" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_period:0 +msgid "State here the time during 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "" +"Prorata temporis can be applied only for time method \"number of " +"depreciations\"." +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_time:0 +msgid "" +"The method to use to compute the dates and number of depreciation lines.\n" +"Number of Depreciations: Fix the number of depreciation lines and the time " +"between 2 depreciations.\n" +"Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_value:0 +msgid "Gross value " +msgstr "" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "Error ! You can not create recursive assets." +msgstr "" + +#. module: account_asset +#: help:account.asset.history,method_period:0 +msgid "Time in month between two depreciations" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,name:0 +msgid "Year" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_modify +#: model:ir.model,name:account_asset.model_asset_modify +msgid "Modify Asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Other Information" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,salvage_value:0 +msgid "Salvage Value" +msgstr "" + +#. module: account_asset +#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0 +msgid "Asset Category" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Close" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute +msgid "Compute assets" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify +msgid "Modify asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in closed state" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent Asset" +msgstr "" + +#. module: account_asset +#: view:account.asset.history:0 +#: model:ir.model,name:account_asset.model_account_asset_history +msgid "Asset history" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in current year" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,state:0 field:asset.asset.report,state:0 +msgid "State" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "" +"The selected account of your Journal Entry forces to provide a secondary " +"currency. You should remove the secondary currency on the account or select " +"a multi-currency view on the journal." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Month" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation Board" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_asset +#: field:asset.asset.report,unposted_value:0 +msgid "Unposted Amount" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_time:0 +#: field:account.asset.category,method_time:0 +#: field:account.asset.history,method_time:0 +msgid "Time Method" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Analytic information" +msgstr "" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Asset durations to modify" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "" +"The date of your Journal Entry is not in the defined period! You should " +"change the date or remove this constraint from the journal." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,note:0 field:account.asset.category,note:0 +#: field:account.asset.history,note:0 +msgid "Note" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method:0 help:account.asset.category,method:0 +msgid "" +"Choose the method to use to compute the amount of depreciation lines.\n" +" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" +" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,method_time:0 +#: help:account.asset.category,method_time:0 +msgid "" +"Choose the method to use to compute the dates and number of depreciation " +"lines.\n" +" * Number of Depreciations: Fix the number of depreciation lines and the " +"time between 2 depreciations.\n" +" * Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in running state" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Closed" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +#: field:asset.asset.report,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0 +msgid "Amount of Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Posted depreciation lines" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "Company must be the same for its related account and period." +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Children Assets" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,user_id:0 +msgid "User" +msgstr "" + +#. module: account_asset +#: field:account.asset.history,date:0 +msgid "Date" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in current month" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "You can not create journal items on an account of type view." +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Extended Filters..." +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0 +msgid "Compute" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Search Asset Category" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard +msgid "asset.depreciation.confirmation.wizard" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_close +msgid "Close asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,parent_state:0 +msgid "State of Asset" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,name:0 +msgid "Depreciation Name" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0 +msgid "History" +msgstr "" + +#. module: account_asset +#: sql_constraint:account.invoice:0 +msgid "Invoice Number must be unique per Company!" +msgstr "" + +#. module: account_asset +#: field:asset.depreciation.confirmation.wizard,period_id:0 +msgid "Period" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0 +msgid "Prorata Temporis" +msgstr "" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Accounting information" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal +msgid "Review Asset Categories" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0 +msgid "Cancel" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0 +msgid "Close" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +msgid "Depreciation Method" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0 +#: field:asset.asset.report,purchase_date:0 +msgid "Purchase Date" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Degressive" +msgstr "" + +#. module: account_asset +#: help:asset.depreciation.confirmation.wizard,period_id:0 +msgid "" +"Choose the period for which you want to automatically post the depreciation " +"lines of running assets" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Current" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,remaining_value:0 +msgid "Amount to Depreciate" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,open_asset:0 +msgid "Skip Draft State" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +#: view:account.asset.history:0 +msgid "Depreciation Dates" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,currency_id:0 +msgid "Currency" +msgstr "" + +#. module: account_asset +#: field:account.asset.category,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciated_value:0 +msgid "Amount Already Depreciated" +msgstr "" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_check:0 +#: view:asset.asset.report:0 field:asset.asset.report,move_check:0 +msgid "Posted" +msgstr "" + +#. module: account_asset +#: help:account.asset.asset,state:0 +msgid "" +"When an asset is created, the state is 'Draft'.\n" +"If the asset is confirmed, the state goes in 'Running' and the depreciation " +"lines can be posted in the accounting.\n" +"You can manually close an asset when the depreciation is over. If the last " +"line of depreciation is posted, the asset automatically goes in that state." +msgstr "" + +#. module: account_asset +#: field:account.asset.category,name:0 +msgid "Name" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,open_asset:0 +msgid "" +"Check this if you want to automatically confirm the assets of this category " +"when created by invoices." +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Draft" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Linear" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Month-1" +msgstr "" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 view:account.asset.category:0 +#: field:asset.asset.report,asset_category_id:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in last month" +msgstr "" + +#. module: account_asset +#: code:addons/account_asset/wizard/wizard_asset_compute.py:49 +#, python-format +msgid "Created Asset Moves" +msgstr "" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "You can not create journal items on closed account." +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report +msgid "" +"From this report, you can have an overview on all depreciation. The tool " +"search can also be used to personalise your Assets reports and so, match " +"this analysis to your needs;" +msgstr "" + +#. module: account_asset +#: help:account.asset.category,method_period:0 +msgid "State here the time between 2 depreciations, in months" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,method_number:0 +#: selection:account.asset.asset,method_time:0 +#: field:account.asset.category,method_number:0 +#: selection:account.asset.category,method_time:0 +#: field:account.asset.history,method_number:0 +#: selection:account.asset.history,method_time:0 +#: field:asset.modify,method_number:0 +msgid "Number of Depreciations" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Create Move" +msgstr "" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Post Depreciation Lines" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm Asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "" diff --git a/addons/account_bank_statement_extensions/i18n/ar.po b/addons/account_bank_statement_extensions/i18n/ar.po new file mode 100644 index 00000000000..95f18c8ddb1 --- /dev/null +++ b/addons/account_bank_statement_extensions/i18n/ar.po @@ -0,0 +1,376 @@ +# Arabic translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:35+0000\n" +"PO-Revision-Date: 2012-03-09 13:28+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-10 04:54+0000\n" +"X-Generator: Launchpad (build 14914)\n" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Search Bank Transactions" +msgstr "بحث عن المعاملات البنكية" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +#: selection:account.bank.statement.line,state:0 +msgid "Confirmed" +msgstr "مصدق عليه" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement:0 +#: view:account.bank.statement.line:0 +msgid "Glob. Id" +msgstr "" + +#. module: account_bank_statement_extensions +#: selection:account.bank.statement.line.global,type:0 +msgid "CODA" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line.global,parent_id:0 +msgid "Parent Code" +msgstr "الكود الأم" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Debit" +msgstr "مدين" + +#. module: account_bank_statement_extensions +#: view:cancel.statement.line:0 +#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line +#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line +msgid "Cancel selected statement lines" +msgstr "الغاء الاسطر المحددة في الكشف" + +#. module: account_bank_statement_extensions +#: constraint:res.partner.bank:0 +msgid "The RIB and/or IBAN is not valid" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Group By..." +msgstr "تجميع حسب" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line,state:0 +msgid "State" +msgstr "حالة" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +#: selection:account.bank.statement.line,state:0 +msgid "Draft" +msgstr "مسودة" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Statement" +msgstr "كشف حساب" + +#. module: account_bank_statement_extensions +#: view:confirm.statement.line:0 +#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line +#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line +msgid "Confirm selected statement lines" +msgstr "" + +#. module: account_bank_statement_extensions +#: report:bank.statement.balance.report:0 +#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report +msgid "Bank Statement Balances Report" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:cancel.statement.line:0 +msgid "Cancel Lines" +msgstr "الغى الأسطر" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line.global:0 +#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global +msgid "Batch Payment Info" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:confirm.statement.line:0 +msgid "Confirm Lines" +msgstr "تأكيد الأسطر" + +#. module: account_bank_statement_extensions +#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130 +#, python-format +msgid "" +"Delete operation not allowed ! Please go to the associated bank " +"statement in order to delete and/or modify this bank statement line" +msgstr "" +"إلغاء العملية غير مسموح! يرجى الذهاب إلى الكشف البنكي المرتبط حتى تتمكن من " +"الغاء اوتغيير اسطر هذا الكشف" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line.global,type:0 +msgid "Type" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +#: field:account.bank.statement.line,journal_id:0 +#: report:bank.statement.balance.report:0 +msgid "Journal" +msgstr "السجل اليومي" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Confirmed Statement Lines." +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Credit Transactions." +msgstr "" + +#. module: account_bank_statement_extensions +#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line +msgid "cancel selected statement lines." +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line,counterparty_number:0 +msgid "Counterparty Number" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line.global:0 +msgid "Transactions" +msgstr "المعاملات البنكية" + +#. module: account_bank_statement_extensions +#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130 +#, python-format +msgid "Warning" +msgstr "تحذير" + +#. module: account_bank_statement_extensions +#: report:bank.statement.balance.report:0 +msgid "Closing Balance" +msgstr "رصيد الإغلاق" + +#. module: account_bank_statement_extensions +#: report:bank.statement.balance.report:0 +msgid "Date" +msgstr "التاريخ" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +#: field:account.bank.statement.line,globalisation_amount:0 +msgid "Glob. Amount" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Debit Transactions." +msgstr "معاملات المدين" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Extended Filters..." +msgstr "" + +#. module: account_bank_statement_extensions +#: view:confirm.statement.line:0 +msgid "Confirmed lines cannot be changed anymore." +msgstr "" + +#. module: account_bank_statement_extensions +#: constraint:res.partner.bank:0 +msgid "" +"\n" +"Please define BIC/Swift code on bank for bank type IBAN Account to make " +"valid payments" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line,val_date:0 +msgid "Valuta Date" +msgstr "" + +#. module: account_bank_statement_extensions +#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line +msgid "Confirm selected statement lines." +msgstr "" + +#. module: account_bank_statement_extensions +#: view:cancel.statement.line:0 +msgid "Are you sure you want to cancel the selected Bank Statement lines ?" +msgstr "" + +#. module: account_bank_statement_extensions +#: report:bank.statement.balance.report:0 +msgid "Name" +msgstr "" + +#. module: account_bank_statement_extensions +#: selection:account.bank.statement.line.global,type:0 +msgid "ISO 20022" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Notes" +msgstr "" + +#. module: account_bank_statement_extensions +#: selection:account.bank.statement.line.global,type:0 +msgid "Manual" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Credit" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line.global,amount:0 +msgid "Amount" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Fin.Account" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line,counterparty_currency:0 +msgid "Counterparty Currency" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line,counterparty_bic:0 +msgid "Counterparty BIC" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line.global,child_ids:0 +msgid "Child Codes" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:confirm.statement.line:0 +msgid "Are you sure you want to confirm the selected Bank Statement lines ?" +msgstr "" + +#. module: account_bank_statement_extensions +#: constraint:account.bank.statement.line:0 +msgid "" +"The amount of the voucher must be the same amount as the one on the " +"statement line" +msgstr "" + +#. module: account_bank_statement_extensions +#: help:account.bank.statement.line,globalisation_id:0 +msgid "" +"Code to identify transactions belonging to the same globalisation level " +"within a batch payment" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Draft Statement Lines." +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Glob. Am." +msgstr "" + +#. module: account_bank_statement_extensions +#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line.global,code:0 +msgid "Code" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line,counterparty_name:0 +msgid "Counterparty Name" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line.global,name:0 +msgid "Communication" +msgstr "" + +#. module: account_bank_statement_extensions +#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank +msgid "Bank Accounts" +msgstr "" + +#. module: account_bank_statement_extensions +#: constraint:account.bank.statement:0 +msgid "The journal and period chosen have to belong to the same company." +msgstr "" + +#. module: account_bank_statement_extensions +#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement +msgid "Bank Statement" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Statement Line" +msgstr "" + +#. module: account_bank_statement_extensions +#: sql_constraint:account.bank.statement.line.global:0 +msgid "The code must be unique !" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line.global,bank_statement_line_ids:0 +#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line +#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line +msgid "Bank Statement Lines" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line.global:0 +msgid "Child Batch Payments" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:cancel.statement.line:0 +#: view:confirm.statement.line:0 +msgid "Cancel" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Statement Lines" +msgstr "" + +#. module: account_bank_statement_extensions +#: view:account.bank.statement.line:0 +msgid "Total Amount" +msgstr "" + +#. module: account_bank_statement_extensions +#: field:account.bank.statement.line,globalisation_id:0 +msgid "Globalisation ID" +msgstr "" diff --git a/addons/account_bank_statement_extensions/i18n/sr@latin.po b/addons/account_bank_statement_extensions/i18n/sr@latin.po index b8551612a9e..369cc5f11a1 100644 --- a/addons/account_bank_statement_extensions/i18n/sr@latin.po +++ b/addons/account_bank_statement_extensions/i18n/sr@latin.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-03-07 18:50+0000\n" +"PO-Revision-Date: 2012-03-13 16:55+0000\n" "Last-Translator: Milan Milosevic \n" "Language-Team: Serbian Latin \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-03-08 04:43+0000\n" -"X-Generator: Launchpad (build 14914)\n" +"X-Launchpad-Export-Date: 2012-03-14 04:43+0000\n" +"X-Generator: Launchpad (build 14933)\n" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 @@ -274,7 +274,7 @@ msgstr "Podređeni kodovi" #. module: account_bank_statement_extensions #: view:confirm.statement.line:0 msgid "Are you sure you want to confirm the selected Bank Statement lines ?" -msgstr "Da li zaista želite da izabrane redove izvoda banke?" +msgstr "Da li zaista želite sa potvrdite izabrane redove izvoda banke?" #. module: account_bank_statement_extensions #: constraint:account.bank.statement.line:0 @@ -300,82 +300,82 @@ msgstr "Nacrt redova izvoda." #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 msgid "Glob. Am." -msgstr "" +msgstr "Glob.izn." #. module: account_bank_statement_extensions #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line msgid "Bank Statement Line" -msgstr "" +msgstr "Red izvoda banke" #. module: account_bank_statement_extensions #: field:account.bank.statement.line.global,code:0 msgid "Code" -msgstr "" +msgstr "Kod" #. module: account_bank_statement_extensions #: field:account.bank.statement.line,counterparty_name:0 msgid "Counterparty Name" -msgstr "" +msgstr "Ime druge strane" #. module: account_bank_statement_extensions #: field:account.bank.statement.line.global,name:0 msgid "Communication" -msgstr "" +msgstr "Komunikacija" #. module: account_bank_statement_extensions #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank msgid "Bank Accounts" -msgstr "" +msgstr "Bankovni računi" #. module: account_bank_statement_extensions #: constraint:account.bank.statement:0 msgid "The journal and period chosen have to belong to the same company." -msgstr "" +msgstr "Dnevnik i izabrani period treba da pripadaju istom preduzeću." #. module: account_bank_statement_extensions #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement msgid "Bank Statement" -msgstr "" +msgstr "Izvod banke" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 msgid "Statement Line" -msgstr "" +msgstr "Red izvoda" #. module: account_bank_statement_extensions #: sql_constraint:account.bank.statement.line.global:0 msgid "The code must be unique !" -msgstr "" +msgstr "Kod mora biti jedinstven !" #. module: account_bank_statement_extensions #: field:account.bank.statement.line.global,bank_statement_line_ids:0 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line msgid "Bank Statement Lines" -msgstr "" +msgstr "Redovi izvoda banke" #. module: account_bank_statement_extensions #: view:account.bank.statement.line.global:0 msgid "Child Batch Payments" -msgstr "" +msgstr "Podređena grupna plaćanja" #. module: account_bank_statement_extensions #: view:cancel.statement.line:0 #: view:confirm.statement.line:0 msgid "Cancel" -msgstr "" +msgstr "Otkaži" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 msgid "Statement Lines" -msgstr "" +msgstr "Redovi izvoda" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 msgid "Total Amount" -msgstr "" +msgstr "Ukupan iznos" #. module: account_bank_statement_extensions #: field:account.bank.statement.line,globalisation_id:0 msgid "Globalisation ID" -msgstr "" +msgstr "ID globalizacije" diff --git a/addons/account_cancel/i18n/lt.po b/addons/account_cancel/i18n/lt.po new file mode 100644 index 00000000000..6ff65fbc2af --- /dev/null +++ b/addons/account_cancel/i18n/lt.po @@ -0,0 +1,23 @@ +# Lithuanian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:35+0000\n" +"PO-Revision-Date: 2012-03-09 15:21+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Lithuanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-10 04:54+0000\n" +"X-Generator: Launchpad (build 14914)\n" + +#. module: account_cancel +#: view:account.invoice:0 +msgid "Cancel" +msgstr "Atšaukti" diff --git a/addons/base_iban/i18n/gu.po b/addons/base_iban/i18n/gu.po new file mode 100644 index 00000000000..e5cb9e63433 --- /dev/null +++ b/addons/base_iban/i18n/gu.po @@ -0,0 +1,94 @@ +# Gujarati translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-03-12 15:04+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Gujarati \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-13 05:08+0000\n" +"X-Generator: Launchpad (build 14933)\n" + +#. module: base_iban +#: constraint:res.partner.bank:0 +msgid "" +"\n" +"Please define BIC/Swift code on bank for bank type IBAN Account to make " +"valid payments" +msgstr "" + +#. module: base_iban +#: code:addons/base_iban/base_iban.py:139 +#, python-format +msgid "This IBAN does not pass the validation check, please verify it" +msgstr "" + +#. module: base_iban +#: model:res.partner.bank.type,format_layout:base_iban.bank_iban +msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s" +msgstr "" + +#. module: base_iban +#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field +msgid "bank_bic" +msgstr "" + +#. module: base_iban +#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field +msgid "zip" +msgstr "" + +#. module: base_iban +#: help:res.partner.bank,iban:0 +msgid "International Bank Account Number" +msgstr "" + +#. module: base_iban +#: model:ir.model,name:base_iban.model_res_partner_bank +msgid "Bank Accounts" +msgstr "" + +#. module: base_iban +#: model:res.partner.bank.type.field,name:base_iban.bank_country_field +msgid "country_id" +msgstr "" + +#. module: base_iban +#: code:addons/base_iban/base_iban.py:136 +#, python-format +msgid "" +"The IBAN does not seem to be correct. You should have entered something like " +"this %s" +msgstr "" + +#. module: base_iban +#: field:res.partner.bank,iban:0 +msgid "IBAN" +msgstr "" + +#. module: base_iban +#: code:addons/base_iban/base_iban.py:140 +#, python-format +msgid "The IBAN is invalid, it should begin with the country code" +msgstr "" + +#. module: base_iban +#: model:res.partner.bank.type,name:base_iban.bank_iban +msgid "IBAN Account" +msgstr "" + +#. module: base_iban +#: constraint:res.partner.bank:0 +msgid "The RIB and/or IBAN is not valid" +msgstr "" + +#~ msgid "Invalid XML for View Architecture!" +#~ msgstr "દ્રશ્ય બંધારણ માટે અમાન્ય એક્સ.એમ.એલ!" diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 3fc6aff1536..acefb10fd13 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -304,7 +304,10 @@ - + + + diff --git a/addons/crm/doc/crm_kanban_avatar.rst b/addons/crm/doc/crm_kanban_avatar.rst new file mode 100644 index 00000000000..90998b0b1b9 --- /dev/null +++ b/addons/crm/doc/crm_kanban_avatar.rst @@ -0,0 +1,4 @@ +CRM kanban avatar specs +======================= + +Kanban view of opportunities has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. diff --git a/addons/crm/doc/index.rst b/addons/crm/doc/index.rst new file mode 100644 index 00000000000..b67e59ac1e5 --- /dev/null +++ b/addons/crm/doc/index.rst @@ -0,0 +1,6 @@ +:orphan: + +CRM module documentation +======================== + +.. include:: index.rst.inc diff --git a/addons/crm/doc/index.rst.inc b/addons/crm/doc/index.rst.inc new file mode 100644 index 00000000000..42b8c576854 --- /dev/null +++ b/addons/crm/doc/index.rst.inc @@ -0,0 +1,8 @@ + +CRM Module +'''''''''' + +.. toctree:: + :maxdepth: 1 + + crm_kanban_avatar diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po index 779250403b4..760ddd6c791 100644 --- a/addons/crm_claim/i18n/es.po +++ b/addons/crm_claim/i18n/es.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-02-15 20:06+0000\n" +"PO-Revision-Date: 2012-03-12 08:00+0000\n" "Last-Translator: Carlos @ smile-iberia \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-16 05:06+0000\n" -"X-Generator: Launchpad (build 14781)\n" +"X-Launchpad-Export-Date: 2012-03-13 05:08+0000\n" +"X-Generator: Launchpad (build 14933)\n" #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -254,7 +254,7 @@ msgstr "Acción siguiente" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Mi(s) equipo(s) de ventas" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim3 @@ -475,7 +475,7 @@ msgstr "Junio" #. module: crm_claim #: view:res.partner:0 msgid "Partners Claim" -msgstr "" +msgstr "Reclamaciones de empresas" #. module: crm_claim #: field:crm.claim,partner_phone:0 @@ -490,7 +490,7 @@ msgstr "Usuario" #. module: crm_claim #: field:crm.claim,active:0 msgid "Active" -msgstr "" +msgstr "Activo" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -786,7 +786,7 @@ msgstr "ID" #. module: crm_claim #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "¡Error! No puede crear miembros asociados recursivamente." #. module: crm_claim #: view:crm.claim:0 diff --git a/addons/decimal_precision/i18n/lt.po b/addons/decimal_precision/i18n/lt.po new file mode 100644 index 00000000000..d9ea7610c48 --- /dev/null +++ b/addons/decimal_precision/i18n/lt.po @@ -0,0 +1,49 @@ +# Lithuanian translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-03-09 15:34+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Lithuanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-10 04:54+0000\n" +"X-Generator: Launchpad (build 14914)\n" + +#. module: decimal_precision +#: field:decimal.precision,digits:0 +msgid "Digits" +msgstr "Skaitmenys" + +#. module: decimal_precision +#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form +#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form +msgid "Decimal Accuracy" +msgstr "Dešimtainis tikslumas" + +#. module: decimal_precision +#: field:decimal.precision,name:0 +msgid "Usage" +msgstr "Naudojimas" + +#. module: decimal_precision +#: sql_constraint:decimal.precision:0 +msgid "Only one value can be defined for each given usage!" +msgstr "" + +#. module: decimal_precision +#: view:decimal.precision:0 +msgid "Decimal Precision" +msgstr "Dešimtainis tikslumas" + +#. module: decimal_precision +#: model:ir.model,name:decimal_precision.model_decimal_precision +msgid "decimal.precision" +msgstr "decimal.precision" diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py index 1a72403b84b..f92a9eb5617 100644 --- a/addons/event_sale/__openerp__.py +++ b/addons/event_sale/__openerp__.py @@ -37,6 +37,7 @@ It defines a new kind of service products that offers you the possibility to cho 'depends': ['event','sale','sale_crm'], 'update_xml': [ 'event_sale_view.xml', + 'event_demo.xml', ], 'test':['test/confirm.yml'], 'installable': True, diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml new file mode 100644 index 00000000000..6dd696225a3 --- /dev/null +++ b/addons/event_sale/event_demo.xml @@ -0,0 +1,25 @@ + + + + + Technical training in Grand-Rosiere + + + + + + + + Technical Training + True + + + service + 2500.0 + 1000.0 + produce + + + + + diff --git a/addons/event_sale_layout/__init__.py b/addons/event_sale_layout/__init__.py new file mode 100644 index 00000000000..26c654db9dd --- /dev/null +++ b/addons/event_sale_layout/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 . +# +############################################################################## + diff --git a/addons/event_sale_layout/__openerp__.py b/addons/event_sale_layout/__openerp__.py new file mode 100644 index 00000000000..c81c4c83c7b --- /dev/null +++ b/addons/event_sale_layout/__openerp__.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 . +# +############################################################################## + + +{ + 'name': 'Events Sales layout', + 'version': '0.1', + 'category': 'Tools', + 'complexity': "easy", + 'description': """ + This module ensures the compatibility of the changes made on the sale.order.line form view in event_sale with the sale_layout module (that is replacing the whole field in the view by another one). Its installation is automatically triggered when both modules are installed. + """, + 'author': 'OpenERP SA', + 'depends': ['event_sale','sale_layout'], + 'update_xml': [ + 'event_sale_layout.xml', + ], + 'installable': True, + 'auto_install':True, + 'category': 'Hidden', +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/event_sale_layout/event_sale_layout.xml b/addons/event_sale_layout/event_sale_layout.xml new file mode 100644 index 00000000000..26ba71b1938 --- /dev/null +++ b/addons/event_sale_layout/event_sale_layout.xml @@ -0,0 +1,18 @@ + + + + event.sale.order + sale.order + form + 10000 + + + + + + + + + + + diff --git a/addons/google_base_account/i18n/fr.po b/addons/google_base_account/i18n/fr.po new file mode 100644 index 00000000000..4dd89340310 --- /dev/null +++ b/addons/google_base_account/i18n/fr.po @@ -0,0 +1,120 @@ +# French translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-03-12 21:03+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-13 05:08+0000\n" +"X-Generator: Launchpad (build 14933)\n" + +#. module: google_base_account +#: field:res.users,gmail_user:0 +msgid "Username" +msgstr "Utilisateur" + +#. module: google_base_account +#: model:ir.actions.act_window,name:google_base_account.act_google_login_form +msgid "Google Login" +msgstr "" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "Google Contacts Import Error!" +msgstr "" + +#. module: google_base_account +#: view:res.users:0 +msgid " Synchronization " +msgstr " Synchronisation " + +#. module: google_base_account +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Vous ne pouvez pas avoir deux utilisateurs avec le même login !" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:75 +#, python-format +msgid "Error" +msgstr "Erreur" + +#. module: google_base_account +#: view:google.login:0 +msgid "Google login" +msgstr "Login Google" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: google_base_account +#: field:google.login,password:0 +msgid "Google Password" +msgstr "Mot de passe Google" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Cancel" +msgstr "Annuler" + +#. module: google_base_account +#: view:res.users:0 +msgid "Google Account" +msgstr "Compte Google" + +#. module: google_base_account +#: field:google.login,user:0 +msgid "Google Username" +msgstr "" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "" +"Please install gdata-python-client from http://code.google.com/p/gdata-" +"python-client/downloads/list" +msgstr "" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_google_login +msgid "Google Contact" +msgstr "" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Login" +msgstr "" + +#. module: google_base_account +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "La société choisie n'est pas autorisée pour cet utilisateur." + +#. module: google_base_account +#: field:res.users,gmail_password:0 +msgid "Password" +msgstr "Mot de passe" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:75 +#, python-format +msgid "Authentication fail check the user and password !" +msgstr "" +"Echec de l'uthentification, vérifier l'utilisateur et le mot de passe!" + +#. module: google_base_account +#: view:google.login:0 +msgid "ex: user@gmail.com" +msgstr "ex: nom.prenom@gmail.com" diff --git a/addons/hr/doc/hr_employee_img.rst b/addons/hr/doc/hr_employee_img.rst new file mode 100644 index 00000000000..0c7ca0bd9c6 --- /dev/null +++ b/addons/hr/doc/hr_employee_img.rst @@ -0,0 +1,8 @@ +HR photo specs +============== + +This revision modifies the photo for HR employees. Two fields now exist in the hr.employee model: + - photo, a binary field holding the image + - photo_mini, a binary field holding an automatically resized version of the avatar. Dimensions of the resized avatar are 180x150. + +Employee photo should be used only when dealing with employees, using the photo_mini field. When dealing with users, use the res.users avatar_mini field instead. diff --git a/addons/hr/doc/index.rst b/addons/hr/doc/index.rst new file mode 100644 index 00000000000..0a7d4a7132d --- /dev/null +++ b/addons/hr/doc/index.rst @@ -0,0 +1,6 @@ +:orphan: + +HR module documentation +======================= + +.. include:: index.rst.inc diff --git a/addons/hr/doc/index.rst.inc b/addons/hr/doc/index.rst.inc new file mode 100644 index 00000000000..9e5d4c277c8 --- /dev/null +++ b/addons/hr/doc/index.rst.inc @@ -0,0 +1,8 @@ + +HR Module +''''''''' + +.. toctree:: + :maxdepth: 1 + + hr_employee_img diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 30ca6a69239..27e429c8206 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -149,24 +149,28 @@ class hr_employee(osv.osv): _description = "Employee" _inherits = {'resource.resource': "resource_id"} + def onchange_photo_mini(self, cr, uid, ids, value, context=None): + return {'value': {'photo': value, 'photo_mini': self._photo_resize(cr, uid, value) } } + + def _set_photo_mini(self, cr, uid, id, name, value, args, context=None): + return self.write(cr, uid, [id], {'photo': value}, context=context) + + def _photo_resize(self, cr, uid, photo, context=None): + image_stream = io.BytesIO(photo.decode('base64')) + img = Image.open(image_stream) + img.thumbnail((180, 150), Image.ANTIALIAS) + img_stream = StringIO.StringIO() + img.save(img_stream, "JPEG") + return img_stream.getvalue().encode('base64') + def _get_photo_mini(self, cr, uid, ids, name, args, context=None): result = {} - for obj in self.browse(cr, uid, ids, context=context): - if not obj.photo: - result[obj.id] = False - continue - - image_stream = io.BytesIO(obj.photo.decode('base64')) - img = Image.open(image_stream) - img.thumbnail((180, 150), Image.ANTIALIAS) - img_stream = StringIO.StringIO() - img.save(img_stream, "JPEG") - result[obj.id] = img_stream.getvalue().encode('base64') + for hr_empl in self.browse(cr, uid, ids, context=context): + if not hr_empl.photo: + result[hr_empl.id] = False + else: + result[hr_empl.id] = self._photo_resize(cr, uid, hr_empl.photo, context=context) return result - - def _set_photo_mini(self, cr, uid, id, name, value, args, context=None): - self.write(cr, uid, [id], {'photo': value}, context=context) - return True _columns = { 'country_id': fields.many2one('res.country', 'Nationality'), @@ -244,11 +248,11 @@ class hr_employee(osv.osv): def _get_photo(self, cr, uid, context=None): photo_path = addons.get_module_resource('hr','images','photo.png') - return open(photo_path, 'rb').read().encode('base64') + return self._photo_resize(cr, uid, open(photo_path, 'rb').read().encode('base64')) _defaults = { 'active': 1, - 'photo': _get_photo, + 'photo_mini': _get_photo, 'marital': 'single', 'color': 0, } diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 81f1c655d33..c2961f2ccde 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -33,7 +33,7 @@ - + @@ -135,7 +135,7 @@
- +

()

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index d5331624350..230528777cc 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -358,16 +358,22 @@ class hr_holidays(osv.osv): # OpenChatter and notifications # ----------------------------- - def get_needaction_user_id(self, cr, uid, ids, name, arg, context=None): - result = {} + def get_needaction_user_ids(self, cr, uid, ids, context=None): + result = dict.fromkeys(ids, []) for obj in self.browse(cr, uid, ids, context=context): - result[obj.id] = False - if (obj.state == 'confirm' and obj.employee_id.parent_id): - result[obj.id] = obj.employee_id.parent_id.user_id.id + if obj.state == 'confirm' and obj.employee_id.parent_id: + result[obj.id] = [obj.employee_id.parent_id.user_id.id] + elif obj.state == 'validate1' or obj.state == 'validate': + # get group_hr_manager: everyone will be warned of second validation + res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_hr_manager') or False + obj_id = res and res[1] or False + if obj_id: + hr_manager_group = self.pool.get('res.groups').read(cr, uid, [obj_id], ['users'], context=context)[0] + result[obj.id] = hr_manager_group['users'] return result def message_get_subscribers(self, cr, uid, ids, context=None): - sub_ids = self._message_get_subscribers_ids(cr, uid, ids, context=context); + sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context); # add the employee and its manager if specified to the subscribed users for obj in self.browse(cr, uid, ids, context=context): if obj.employee_id.parent_id: @@ -377,38 +383,38 @@ class hr_holidays(osv.osv): def create_notificate(self, cr, uid, ids, context=None): for obj in self.browse(cr, uid, ids, context=context): self.message_append_note(cr, uid, ids, _('System notification'), - _("The %s request '%s' has been created and is waiting confirmation") - % ('leave' if obj.type == 'remove' else 'allocation', obj.name), type='notification', context=context) + _("The %s request has been created and is waiting confirmation") + % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context) return True def holidays_confirm_notificate(self, cr, uid, ids, context=None): for obj in self.browse(cr, uid, ids): self.message_append_note(cr, uid, [obj.id], _('System notification'), - _("The %s request '%s' has been confirmed and is waiting for validation by the manager.") - % ('leave' if obj.type == 'remove' else 'allocation', obj.name,), type='notification') + _("The %s request has been confirmed and is waiting for validation by the manager.") + % ('leave' if obj.type == 'remove' else 'allocation',), type='notification') def holidays_validate_notificate(self, cr, uid, ids, context=None): for obj in self.browse(cr, uid, ids): if obj.holiday_status_id.double_validation: self.message_append_note(cr, uid, [obj.id], _('System notification'), - _("The %s request '%s' has been validated. A second validation is necessary and is now pending.") - % ('leave' if obj.type == 'remove' else 'allocation', obj.name), type='notification', context=context) + _("The %s request has been validated. A second validation is necessary and is now pending.") + % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context) else: self.message_append_note(cr, uid, [obj.id], _('System notification'), - _("The %s request '%s' has been validated. The validation process is now over.") - % ('leave' if obj.type == 'remove' else 'allocation', obj.name), type='notification', context=context) + _("The %s request has been validated. The validation process is now over.") + % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context) def holidays_valid2_notificate(self, cr, uid, ids, context=None): for obj in self.browse(cr, uid, ids): self.message_append_note(cr, uid, [obj.id], _('System notification'), - _("The %s request '%s' has been double validated. The validation process is now over.") - % ('leave' if obj.type == 'remove' else 'allocation', obj.name,), type='notification', context=context) + _("The %s request has been double validated. The validation process is now over.") + % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context) def holidays_refuse_notificate(self, cr, uid, ids, approval, context=None): for obj in self.browse(cr, uid, ids): self.message_append_note(cr, uid, [obj.id], _('System notification'), - _("The %s request '%s' has been refused. The validation process is now over.") - % ('leave' if obj.type == 'remove' else 'allocation', obj.name,), type='notification', context=context) + _("The %s request has been refused. The validation process is now over.") + % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context) hr_holidays() diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 34e2cb9bb14..2096ae2bc61 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -95,9 +95,6 @@ - + +
@@ -47,8 +47,7 @@
User img
-