diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 1c58efb161f..3fabb495ba1 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -61,6 +61,8 @@ 'sequence_view.xml', 'company_view.xml', 'account_installer.xml', + 'report/account_invoice_report_view.xml', + 'report/account_report_view.xml', ], 'demo_xml': [ #'demo/price_accuracy00.yml', diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index b1394d47d19..932d4e3cf3d 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-01-13 11:48+0000\n" -"Last-Translator: Kuvaly [LCT] \n" +"PO-Revision-Date: 2010-03-17 20:55+0000\n" +"Last-Translator: mitev.dmitry \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 04:49+0000\n" +"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -154,7 +154,7 @@ msgstr "Položky" #. module: account #: selection:account.move.line,centralisation:0 msgid "Debit Centralisation" -msgstr "" +msgstr "Debetní Centralizace" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm @@ -257,7 +257,7 @@ msgstr "Celkový dluh" #. module: account #: rml:account.tax.code.entries:0 msgid "Accounting Entries-" -msgstr "" +msgstr "Účetní zápisy" #. module: account #: help:account.journal,view_id:0 @@ -299,7 +299,7 @@ msgstr "Zpožděné platby" #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 #: wizard_view:account.vat.declaration,init:0 msgid "Select period" -msgstr "" +msgstr "Vyberte období" #. module: account #: field:account.invoice,origin:0 @@ -384,7 +384,7 @@ msgstr "Celkové částky" #: field:account.fiscal.position.account,account_src_id:0 #: field:account.fiscal.position.account.template,account_src_id:0 msgid "Account Source" -msgstr "" +msgstr "Zdroj účtu" #. module: account #: field:account.journal,update_posted:0 @@ -420,7 +420,7 @@ msgstr "" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "" +msgstr "(Účet / Partner) Název" #. module: account #: selection:account.move,type:0 diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po index f2364683845..26a51ff5469 100644 --- a/addons/account/i18n/fi.po +++ b/addons/account/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-02 11:01+0000\n" -"Last-Translator: smii \n" +"PO-Revision-Date: 2010-03-16 13:30+0000\n" +"Last-Translator: Henri Kovalainen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 04:50+0000\n" +"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -97,7 +97,7 @@ msgstr "Suorittamattomat tapahtumat" #: field:account.tax,base_code_id:0 #: field:account.tax.template,base_code_id:0 msgid "Base Code" -msgstr "Perustekoodi" +msgstr "Peruskoodi" #. module: account #: view:account.account:0 @@ -131,7 +131,7 @@ msgstr "Jäännös" #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" -msgstr "Perustekoodin merkki" +msgstr "Peruskoodin merkki" #. module: account #: model:ir.actions.wizard,name:account.wizard_unreconcile_select @@ -183,7 +183,7 @@ msgstr "Summa kredit" #. module: account #: field:account.config.wizard,charts:0 msgid "Charts of Account" -msgstr "Tilikartta" +msgstr "Tilikartat" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select @@ -334,7 +334,7 @@ msgstr "Viite" #. module: account #: wizard_view:account.subscription.generate,init:0 msgid "Subscription Compute" -msgstr "Ennakkomaksun arvio" +msgstr "Laske ennakkomaksut" #. module: account #: rml:account.central.journal:0 @@ -500,8 +500,8 @@ msgid "" "Set if the amount of tax must be included in the base amount before " "computing the next taxes." msgstr "" -"Aseta jos veromäärä täytyy sisältyä perusmäärään ennen seuraavien verojen " -"laskemista" +"Aseta jos veron määrä täytyy sisällyttää perusmäärään ennen seuraavien " +"verojen laskemista." #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing @@ -517,7 +517,7 @@ msgstr "Analyyttisten merkintöjen tilastot" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "Verokoodipohjat" +msgstr "Verokoodimallit" #. module: account #: view:account.invoice:0 @@ -528,7 +528,7 @@ msgstr "Toimittajan lasku" #: model:process.transition,name:account.process_transition_reconcilepaid0 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "Reconcile Paid" -msgstr "Kirjaa maksetut tapahtumat" +msgstr "Suorita maksetut" #. module: account #: wizard_field:account.chart,init,target_move:0 @@ -539,12 +539,12 @@ msgstr "Kohteen liikkeet" #: model:ir.actions.act_window,name:account.action_account_tax_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form msgid "Tax Templates" -msgstr "Veropohjat" +msgstr "Veromallit" #. module: account #: field:account.invoice,reconciled:0 msgid "Paid/Reconciled" -msgstr "Maksettu/kirjattu" +msgstr "Maksettu/Suoritettu" #. module: account #: field:account.account.type,close_method:0 @@ -554,7 +554,7 @@ msgstr "Jaksotusmenetelmä" #. module: account #: field:account.tax.template,include_base_amount:0 msgid "Include in Base Amount" -msgstr "Sisällytä pohjamäärään" +msgstr "Sisällytä perusmäärään" #. module: account #: field:account.tax,ref_base_code_id:0 @@ -601,7 +601,7 @@ msgstr "Tulostuspäivämäärä" #. module: account #: rml:account.general.ledger:0 msgid "Mvt" -msgstr "" +msgstr "Mvt" #. module: account #: model:ir.actions.wizard,name:account.wizard_aged_trial_balance @@ -632,7 +632,7 @@ msgstr "Jätä tyhjäksi avataksesi nykyisen tilanteen" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account msgid "Fiscal Position Accounts Mapping" -msgstr "Verotuksen sijainti tilikartoituksessa" +msgstr "Talouskannan tilien kartoitus" #. module: account #: field:account.analytic.account,contact_id:0 @@ -648,7 +648,7 @@ msgstr "Kumppani maksutermi" #. module: account #: view:account.move.reconcile:0 msgid "Account Entry Reconcile" -msgstr "Tilin merkintä sovittelu" +msgstr "Tilimerkintöjen suoritus" #. module: account #: wizard_button:account.move.bank.reconcile,init,open:0 @@ -664,12 +664,12 @@ msgstr "Alennus (%)" #: wizard_field:account.move.line.reconcile,init_full,writeoff:0 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0 msgid "Write-Off amount" -msgstr "Poiston määrä" +msgstr "Arvonalennuksen määrä" #. module: account #: help:account.fiscalyear,company_id:0 msgid "Keep empty if the fiscal year belongs to several companies." -msgstr "Jätä tyhjäksi jos verovuosi kuuluu useammalle yritykselle." +msgstr "Jätä tyhjäksi jos tilikausi kuuluu useammalle yritykselle." #. module: account #: model:ir.ui.menu,name:account.menu_analytic_accounting @@ -751,7 +751,7 @@ msgstr "Kentän nimi" #: field:account.tax.code,sign:0 #: field:account.tax.code.template,sign:0 msgid "Sign for parent" -msgstr "Kirjaudu tämänhetkiseen" +msgstr "Etumerkki ylemmälle" #. module: account #: field:account.fiscalyear,end_journal_period_id:0 @@ -762,7 +762,7 @@ msgstr "Päätösmerkintöjen päiväkirja" #: view:product.product:0 #: view:product.template:0 msgid "Purchase Properties" -msgstr "Osto tarpeisto" +msgstr "Ostojen ominaisuudet" #. module: account #: model:process.node,note:account.process_node_paymententries0 @@ -819,7 +819,7 @@ msgstr "Maksu tilikirja" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "(Keep empty for all open fiscal years)" -msgstr "(Jätä tyhjäksi kaikille avoimille verovuosille)" +msgstr "(Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia)" #. module: account #: field:account.invoice,move_lines:0 @@ -859,7 +859,7 @@ msgstr "Pankki sovinto" #. module: account #: model:ir.model,name:account.model_account_account_template msgid "Templates for Accounts" -msgstr "Tilipohjat" +msgstr "Tilimallit" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_form @@ -905,7 +905,7 @@ msgstr "Menotili" #. module: account #: wizard_field:account.move.line.reconcile,addendum,journal_id:0 msgid "Write-Off Journal" -msgstr "Poistojen päiväkirja" +msgstr "Arvonalennuspäiväkirja" #. module: account #: field:account.model.line,amount_currency:0 @@ -921,7 +921,7 @@ msgstr "Menoluokkatili" #. module: account #: wizard_field:account.fiscalyear.close,init,fy2_id:0 msgid "New Fiscal Year" -msgstr "Uusi verovuosi" +msgstr "Uusi tilikausi" #. module: account #: help:account.tax,tax_group:0 @@ -935,12 +935,12 @@ msgstr "" #. module: account #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0 msgid "Fiscal Year to Open" -msgstr "Verovuoden avaus" +msgstr "Avattava tilikausi" #. module: account #: view:account.config.wizard:0 msgid "Select Chart of Accounts" -msgstr "Valitse kaavio tileistä" +msgstr "Valitse tilikartta" #. module: account #: field:account.analytic.account,quantity:0 @@ -1035,7 +1035,7 @@ msgstr "Netto:" #: model:ir.model,name:account.model_account_fiscal_position #: field:res.partner,property_account_position:0 msgid "Fiscal Position" -msgstr "Verosijainti" +msgstr "Talouskanta" #. module: account #: field:account.analytic.line,product_uom_id:0 @@ -1057,7 +1057,7 @@ msgstr "Alatilit" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax msgid "Fiscal Position Taxes Mapping" -msgstr "Verosijainin verokartoitus" +msgstr "Talouskannan verojen kartoitus" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree2_new @@ -1080,7 +1080,7 @@ msgstr "Asiakaslasku" #. module: account #: wizard_view:account.open_closed_fiscalyear,init:0 msgid "Choose Fiscal Year" -msgstr "Valitse verovuosi" +msgstr "Valitse tilikausi" #. module: account #: field:account.sequence.fiscalyear,sequence_main_id:0 @@ -1110,7 +1110,7 @@ msgstr "" #. module: account #: field:account.bank.statement.reconcile,total_new:0 msgid "Total write-off" -msgstr "Poistot yhteensä" +msgstr "Arvonalennus yhteensä" #. module: account #: view:account.tax.template:0 @@ -1129,7 +1129,7 @@ msgstr "Varokoodit" #: field:account.tax.template,chart_template_id:0 #: field:wizard.multi.charts.accounts,chart_template_id:0 msgid "Chart Template" -msgstr "Tilikartan mallipohja" +msgstr "Tilikarttamalli" #. module: account #: field:account.chart.template,property_account_income_categ:0 @@ -1146,7 +1146,7 @@ msgstr "Uusi analyyttinen tili" #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template msgid "Fiscal Position Templates" -msgstr "" +msgstr "Talouskantojen mallit" #. module: account #: rml:account.invoice:0 @@ -1172,13 +1172,13 @@ msgstr "Myyntipäiväkirja" #. module: account #: help:account.model.line,amount_currency:0 msgid "The amount expressed in an optional other currency." -msgstr "Määrä valinnaisena valuuttana." +msgstr "Summa ilmoitettuna valinnaisessa toisessa valuutassa." #. module: account #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Position Template" -msgstr "" +msgstr "Talouskannan malli" #. module: account #: field:account.payment.term,line_ids:0 @@ -1194,12 +1194,12 @@ msgstr "Veroraportti" #: wizard_button:account.analytic.account.chart,init,open:0 #: wizard_button:account.chart,init,open:0 msgid "Open Charts" -msgstr "Avoimet kaaviot" +msgstr "Avoimet kartat" #. module: account #: wizard_view:account.fiscalyear.close.state,init:0 msgid "Are you sure you want to close the fiscal year ?" -msgstr "Oletko varma että haluat sulkea verovuoden?" +msgstr "Oletko varma että haluat sulkea tilikauden?" #. module: account #: selection:account.move,type:0 @@ -1249,17 +1249,17 @@ msgstr "Yritysvaluutta" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account_template msgid "Fiscal Position Template Account Mapping" -msgstr "" +msgstr "Talouskannan mallin tilien kartoitukset" #. module: account #: field:account.analytic.account,parent_id:0 msgid "Parent Analytic Account" -msgstr "" +msgstr "Ylempi analyyttinen tili" #. module: account #: wizard_button:account.move.line.reconcile,init_partial,addendum:0 msgid "Reconcile With Write-Off" -msgstr "" +msgstr "Suorita arvonalennuksella" #. module: account #: field:account.move.line,tax_amount:0 @@ -1300,12 +1300,12 @@ msgstr "Analyyttinen luotto" #: field:account.move.line,reconcile_partial_id:0 #: wizard_button:account.move.line.reconcile,init_partial,partial:0 msgid "Partial Reconcile" -msgstr "Osittainen sovitus" +msgstr "Osittaissuoritus" #. module: account #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0 msgid "Not reconciled transactions" -msgstr "Ei sovitettu transaktio" +msgstr "Suorittamattomat tapahtumat" #. module: account #: view:account.fiscal.position:0 @@ -1328,7 +1328,7 @@ msgstr "Arvo" #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0 msgid "Write-Off account" -msgstr "Poistotili" +msgstr "Arvonalennustili" #. module: account #: field:account.model.line,model_id:0 @@ -1340,12 +1340,12 @@ msgstr "Malli" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "Sulje verovuosi" +msgstr "Sulje tilikausi" #. module: account #: field:account.journal,centralisation:0 msgid "Centralised counterpart" -msgstr "" +msgstr "Keskitetty vastine" #. module: account #: view:wizard.company.setup:0 @@ -1398,6 +1398,8 @@ msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disable" msgstr "" +"Jos poistat suorituksia siirroista, sinun tulee myös varmistaa kaikki " +"siirtoihin liittyvät toiminnot koska niitä ei poisteta" #. module: account #: model:process.node,name:account.process_node_electronicfile0 @@ -1417,7 +1419,7 @@ msgstr "Verorivit" #. module: account #: field:ir.sequence,fiscal_ids:0 msgid "Sequences" -msgstr "" +msgstr "Sarjat" #. module: account #: model:ir.actions.act_window,name:account.action_account_type_form @@ -1472,7 +1474,7 @@ msgstr "Näytä tilit " #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile_line msgid "Statement reconcile line" -msgstr "Tiliotteen sovittelurivi" +msgstr "Tiliotteen suoritusrivi" #. module: account #: view:account.tax:0 @@ -1486,7 +1488,7 @@ msgstr "Jätä tyhjäksi käyttääksesi tulotiliä" #: wizard_view:account.move.line.reconcile,init_full:0 #: wizard_view:account.move.line.reconcile,init_partial:0 msgid "Write-Off" -msgstr "Poisto" +msgstr "Arvonalennus" #. module: account #: help:account.invoice,partner_bank:0 @@ -1500,7 +1502,7 @@ msgstr "" #. module: account #: field:res.partner,debit:0 msgid "Total Payable" -msgstr "Maksettava yhteensä" +msgstr "Maksettavat yhteensä" #. module: account #: wizard_button:account.fiscalyear.close.state,init,close:0 @@ -1520,7 +1522,7 @@ msgstr "account.analytic.line.extended" #. module: account #: field:account.journal,refund_journal:0 msgid "Refund Journal" -msgstr "Hyvitysloki" +msgstr "Hyvityspäiväkirja" #. module: account #: model:account.account.type,name:account.account_type_income @@ -1558,7 +1560,7 @@ msgstr "Tulosta yleinen päiväkirja" #: model:ir.actions.act_window,name:account.action_account_chart_template_form #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form msgid "Chart of Accounts Templates" -msgstr "Tilikarttapohjat" +msgstr "Tilikarttamallit" #. module: account #: field:account.invoice,move_id:0 @@ -1570,7 +1572,7 @@ msgstr "Laskun liikehdintä" #: model:ir.ui.menu,name:account.menu_wizard #: view:wizard.multi.charts.accounts:0 msgid "Generate Chart of Accounts from a Chart Template" -msgstr "Luo tilikartta mallipohjasta" +msgstr "Luo tilikartta mallista" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement @@ -1581,7 +1583,7 @@ msgstr "Lailliset lausunnot" #: field:account.tax.code,parent_id:0 #: field:account.tax.code.template,parent_id:0 msgid "Parent Code" -msgstr "" +msgstr "Ylempi koodi" #. module: account #: wizard_button:account.move.line.reconcile.select,init,open:0 @@ -1613,20 +1615,20 @@ msgstr "Jätä tyhjäksi jos haluat käyttää kulutiliä" #. module: account #: wizard_field:account.automatic.reconcile,init,account_ids:0 msgid "Account to reconcile" -msgstr "Tili jolle kirjaukset tehdään" +msgstr "Tili suorituksille" #. module: account #: rml:account.invoice:0 #: field:account.model.line,partner_id:0 #: field:account.move.line,partner_id:0 msgid "Partner Ref." -msgstr "" +msgstr "Kumppanin viite" #. module: account #: selection:account.partner.balance.report,init,result_selection:0 #: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Receivable and Payable Accounts" -msgstr "Vastaavien ja vastattavien tilit" +msgstr "Saatavat ja maksettavat tilit" #. module: account #: view:account.subscription:0 @@ -1757,7 +1759,7 @@ msgstr "Sivuluotto" #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile #: model:ir.actions.wizard,name:account.wizard_unreconcile msgid "Unreconcile Entries" -msgstr "Ei sovitetut merkinnät" +msgstr "Poista merkintöjen suoritukset" #. module: account #: model:process.node,note:account.process_node_supplierdraftinvoices0 @@ -1779,7 +1781,7 @@ msgstr "Uusi tiliote" #: wizard_field:account.analytic.account.chart,init,from_date:0 #: wizard_field:account.analytic.line,init,from_date:0 msgid "From" -msgstr "" +msgstr "Mistä" #. module: account #: model:process.node,note:account.process_node_reconciliation0 @@ -1809,7 +1811,7 @@ msgstr "Prosentti" #. module: account #: model:ir.ui.menu,name:account.menu_finance_charts msgid "Charts" -msgstr "Kaaviot" +msgstr "Tilikartat" #. module: account #: selection:account.analytic.journal,type:0 @@ -1830,7 +1832,7 @@ msgstr "Seuraava" msgid "" "The fiscal position will determine taxes and the accounts used for the the " "partner." -msgstr "" +msgstr "Talouskanta määrittelee kumppaniin sovellettavat verot ja tilit." #. module: account #: rml:account.analytic.account.cost_ledger:0 @@ -1883,7 +1885,7 @@ msgstr "Aloituspäivä" #. module: account #: model:account.journal,name:account.refund_expenses_journal msgid "x Expenses Credit Notes Journal" -msgstr "Hyvityslaskujen kulupäiväkirja" +msgstr "x Hyvityslaskujen kulupäiväkirja" #. module: account #: field:account.analytic.journal,type:0 @@ -1926,7 +1928,7 @@ msgstr "Maksa lasku" #. module: account #: constraint:account.invoice:0 msgid "Error: Invalid Bvr Number (wrong checksum)." -msgstr "" +msgstr "Virhe: Virheellinen BVR-numero (väärä tarkistussumma)." #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree5 @@ -1960,7 +1962,7 @@ msgstr "Kumppanin viite tässä laskussa." #. module: account #: wizard_field:account.general.ledger.report,checktype,sortbydate:0 msgid "Sort by:" -msgstr "" +msgstr "Järjestys:" #. module: account #: field:account.move,to_check:0 @@ -1990,7 +1992,7 @@ msgstr "Li" #. module: account #: wizard_view:account.chart,init:0 msgid "Account charts" -msgstr "Tilikaaviot" +msgstr "Tilikartat" #. module: account #: help:account.tax,name:0 @@ -2032,7 +2034,7 @@ msgstr "Verotili" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "J.C./Move name" -msgstr "" +msgstr "J.C. / Siirron nimi" #. module: account #: field:account.journal.period,name:0 @@ -2149,7 +2151,7 @@ msgstr "Maksamattomat laskut" #. module: account #: model:process.transition,name:account.process_transition_paymentreconcile0 msgid "Payment Reconcile" -msgstr "Maksun sovittelu" +msgstr "Maksun suoritusmerkinnät" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form @@ -2192,7 +2194,7 @@ msgstr "Arvon määrä" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open msgid "Reconciled entries" -msgstr "Sovitetut merkinnät" +msgstr "Suoritetut merkinnät" #. module: account #: field:account.invoice,address_contact_id:0 @@ -2229,7 +2231,7 @@ msgstr "Yksityiskohdat" #: selection:account.account,type:0 #: selection:account.account.template,type:0 msgid "Consolidation" -msgstr "Vahvistaminen" +msgstr "Yhdistetty" #. module: account #: field:account.chart.template,account_root_id:0 @@ -2243,6 +2245,8 @@ msgid "" "stay unpaid. Please, take appropriate measures in order to carry out this " "payment in the next 8 days." msgstr "" +"Seuraavat laskut ovat edelleen maksamatta. Ole hyvä ja maksa nämä laskut " +"seuraavan 8 päivän kuluessa." #. module: account #: rml:account.invoice:0 @@ -2256,28 +2260,28 @@ msgstr "ALV:" #: model:ir.ui.menu,name:account.menu_action_account_tree #: model:ir.ui.menu,name:account.menu_action_account_tree2 msgid "Chart of Accounts" -msgstr "Tilikaaviot" +msgstr "Tilikartat" #. module: account #: model:account.journal,name:account.check_journal msgid "x Checks Journal" -msgstr "" +msgstr "x Shekkipäiväkirja" #. module: account #: model:ir.actions.wizard,name:account.wizard_generate_subscription #: model:ir.ui.menu,name:account.menu_generate_subscription msgid "Create subscription entries" -msgstr "Luo ennakkomaksukohdat" +msgstr "Luo ennakkomaksun merkinnät" #. module: account #: wizard_field:account.fiscalyear.close,init,journal_id:0 msgid "Opening Entries Journal" -msgstr "Avataan merkintälokea" +msgstr "Avauspäiväkirja" #. module: account #: view:account.config.wizard:0 msgid "Create a Fiscal Year" -msgstr "Luo verovuosi" +msgstr "Luo uusi tilikausi" #. module: account #: field:product.template,taxes_id:0 @@ -2311,7 +2315,7 @@ msgstr "2" #. module: account #: wizard_view:account.chart,init:0 msgid "(If you do not select Fiscal year it will take all open fiscal years)" -msgstr "(Jos et valitse verovuotta se ottaa kaikki avoimet verovuodet)" +msgstr "(Jos et valitse tilikautta, käytetään kaikkia avoimia tilikausia)" #. module: account #: help:account.invoice.tax,base_code_id:0 @@ -2347,7 +2351,7 @@ msgstr "Viitetyyppi" #: wizard_button:account.move.line.unreconcile,init,unrec:0 #: wizard_button:account.reconcile.unreconcile,init,unrec:0 msgid "Unreconcile" -msgstr "Sovittelematon" +msgstr "Poista suoritukset" #. module: account #: field:account.tax,type:0 @@ -2375,12 +2379,12 @@ msgstr "Tilimallit" #. module: account #: view:account.chart.template:0 msgid "Chart of Accounts Template" -msgstr "Tilimallikartat" +msgstr "Tilikarttamalli" #. module: account #: model:account.journal,name:account.refund_sales_journal msgid "Journal d'extourne" -msgstr "Lokikirja d'extourne" +msgstr "Palautuspäiväkirja" #. module: account #: rml:account.journal.period.print:0 @@ -2401,7 +2405,7 @@ msgstr "Tuo lasku" #. module: account #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 msgid "and Journals" -msgstr "" +msgstr "ja päiväkirjat" #. module: account #: view:account.tax:0 @@ -2424,13 +2428,12 @@ msgid "" "Set if the tax computation is based on the computation of child taxes rather " "than on the total amount." msgstr "" -"Aseta jos verolaskelmat perustuvat mieluummin alaverokohtiin kuin " -"lopulliseen määrään." +"Määritä perustuuko verojen laskenta alemmille veroille vai loppusummaan." #. module: account #: rml:account.central.journal:0 msgid "Journal Code" -msgstr "Lokikoodi" +msgstr "Päiväkirjakoodi" #. module: account #: help:account.tax,applicable_type:0 @@ -2468,7 +2471,7 @@ msgstr "Soveltuva koodi (jos tyyppi=koodi)" #. module: account #: wizard_button:account.move.journal,init,open:0 msgid "Open Journal" -msgstr "Avoin loki" +msgstr "Avaa päiväkirja" #. module: account #: rml:account.analytic.account.journal:0 @@ -2481,7 +2484,7 @@ msgstr "" #: model:ir.ui.menu,name:account.account_entries_analytic_entries #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form msgid "Entries Encoding by Line" -msgstr "Kohdat riveittäin" +msgstr "Merkinnät riveittäin" #. module: account #: help:account.chart.template,tax_template_ids:0 @@ -2511,12 +2514,12 @@ msgstr "Lisäsopimustiedot" #: model:process.transition,name:account.process_transition_entriesreconcile0 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0 msgid "Entries Reconcile" -msgstr "Merkintä sovittelu" +msgstr "Merkintöjen suoritus" #. module: account #: help:account.bank.statement.reconcile,total_second_amount:0 msgid "The amount in the currency of the journal" -msgstr "" +msgstr "Summa tämän päiväkirjan valuutassa" #. module: account #: wizard_field:account.general.ledger.report,checktype,landscape:0 @@ -2615,7 +2618,7 @@ msgstr "Veroraportit" #. module: account #: field:res.partner,property_account_payable:0 msgid "Account Payable" -msgstr "Tili maksukelvollinen" +msgstr "Tili maksettavat" #. module: account #: wizard_view:populate_statement_from_inv,init:0 @@ -2635,13 +2638,14 @@ msgstr "Oletus luottotili" #. module: account #: model:process.node,name:account.process_node_supplierpaymentorder0 msgid "Payment Order" -msgstr "Maksujärjestys" +msgstr "Maksumääräys" #. module: account #: help:account.account.template,reconcile:0 msgid "" "Check this option if you want the user to reconcile entries in this account." -msgstr "Valitse tämä jos haluat käyttäjän sovittelevan kohdat tällä tilillä." +msgstr "" +"Valitse tämä jos haluat käyttäjän tekevän suoritusmerkinnät tällä tilillä." #. module: account #: rml:account.analytic.account.journal:0 @@ -2685,6 +2689,11 @@ msgid "" "partners accounts (for debit/credit computations), closed for deprecated " "accounts." msgstr "" +"Tyyppiä käytetään erottamaan tilejä joilla on OpenERP:ssä erityisiä " +"ominaisuuksia: \"näkymä\" ei voi sisältää merkintöjä, \"yhdistetty\" tili " +"muodostuu useammasta alatilistä (esim. useammasta yrityksestä), " +"\"maksettavat\" / \"saatavat\" ovat kumppanien tilejä (käytetään velka-" +"/luottolaskelmiin) ja \"suljettu\" tili on poistettu käytöstä." #. module: account #: model:ir.ui.menu,name:account.menu_account_end_year_treatments @@ -2730,17 +2739,17 @@ msgstr "" #: model:ir.ui.menu,name:account.account_analytic_def_chart #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2 msgid "Analytic Chart of Accounts" -msgstr "Analyyttienn kaavio tileistä" +msgstr "Analyyttinen tilikartat" #. module: account #: wizard_view:account.analytic.line,init:0 msgid "View Account Analytic Lines" -msgstr "Näytä tilien analyyttisetrivit" +msgstr "Näytä tilin analyyttiset rivit" #. module: account #: wizard_view:account.move.validate,init:0 msgid "Select Period and Journal for Validation" -msgstr "" +msgstr "Valitse jakso ja päiväkirja hyväksymistä varten" #. module: account #: field:account.invoice,number:0 @@ -2772,7 +2781,7 @@ msgstr "Vastaava analyyttinen saldo" #: field:account.tax,applicable_type:0 #: field:account.tax.template,applicable_type:0 msgid "Applicable Type" -msgstr "" +msgstr "Sovellettava tyyppi" #. module: account #: field:account.invoice,reference:0 @@ -2838,7 +2847,7 @@ msgstr "" #: field:account.journal.view,name:0 #: model:ir.model,name:account.model_account_journal_view msgid "Journal View" -msgstr "Lokinäkymä" +msgstr "Päiväkirjanäkymä" #. module: account #: selection:account.move.line,centralisation:0 @@ -2860,7 +2869,7 @@ msgstr "Kumppani tunnus" #: wizard_view:account.invoice.pay,addendum:0 #: wizard_view:account.move.line.reconcile,addendum:0 msgid "Write-Off Move" -msgstr "" +msgstr "Arvonalennussiirto" #. module: account #: view:account.move.line:0 @@ -2978,7 +2987,7 @@ msgstr "Sovittamattomat tapahtumat" #: model:process.transition,note:account.process_transition_paymentorderbank0 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0 msgid "Reconcilation of entries from payment order." -msgstr "" +msgstr "Suoritusten kirjaus maksumääräyksestä." #. module: account #: field:account.bank.statement,move_line_ids:0 @@ -3015,7 +3024,7 @@ msgstr "Verokoodi" #. module: account #: rml:account.analytic.account.journal:0 msgid "Analytic Journal -" -msgstr "Analyyttinen loki -" +msgstr "Analyyttinen päiväkirja -" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -3045,6 +3054,9 @@ msgid "" "between the date of the creation action or the the date of the creation of " "the entries plus the partner payment terms." msgstr "" +"Luotujen merkintöjen erääntymispäivä tässä mallissa. Voit valita " +"päivämääräksi joko luomispäivän, tai luomispäivän päivämäärän johon lisätään " +"kumppanin maksuehdon mukainen aika." #. module: account #: selection:account.analytic.journal,type:0 @@ -3061,7 +3073,7 @@ msgstr "Dokumentti" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "Siirry pois tältä merkintäriviltä" +msgstr "Merkinnän rivin siirto." #. module: account #: field:account.invoice.line,uos_id:0 @@ -3071,7 +3083,7 @@ msgstr "Yksikön mitta" #. module: account #: field:account.chart.template,property_account_receivable:0 msgid "Receivable Account" -msgstr "Saatavien tili" +msgstr "Saatavat tili" #. module: account #: help:account.journal,group_invoice_lines:0 @@ -3100,12 +3112,12 @@ msgstr "Peruuta valitut laskut" #: model:ir.actions.report.xml,name:account.analytic_journal_print #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report msgid "Analytic Journal" -msgstr "Analyyttinen loki" +msgstr "Analyyttinen päiväkirja" #. module: account #: rml:account.general.ledger:0 msgid "Entry Label" -msgstr "" +msgstr "Merkinnän nimike" #. module: account #: model:process.transition,note:account.process_transition_paymentreconcile0 @@ -3135,7 +3147,7 @@ msgstr "Dokumentin viite joka on luonut tämän laskun." #: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Payable" -msgstr "Maksettava" +msgstr "Maksettavat" #. module: account #: rml:account.invoice:0 @@ -3180,7 +3192,7 @@ msgstr "Ehdotus laskusta tarkistusta, vahvistusta ja tulostusta varten" #. module: account #: model:ir.actions.act_window,name:account.action_move_line_select msgid "account.move.line.select" -msgstr "" +msgstr "account.move.line.select" #. module: account #: view:account.account:0 @@ -3203,7 +3215,7 @@ msgstr "Tili" #. module: account #: model:account.journal,name:account.bank_journal msgid "Journal de Banque CHF" -msgstr "" +msgstr "Pankkipäiväkirja CHF" #. module: account #: selection:account.account.balance.report,checktype,state:0 @@ -3230,6 +3242,8 @@ msgid "" "The account moves of the invoice have been reconciled with account moves of " "the payment(s)." msgstr "" +"Laskun tilisiirtomerkinnät on suoritettu maksun (maksujen) " +"tilisiirtomerkinnöillä." #. module: account #: rml:account.invoice:0 @@ -3244,7 +3258,7 @@ msgstr "Verot" #. module: account #: wizard_view:account.fiscalyear.close,init:0 msgid "Close Fiscal Year with new entries" -msgstr "Sulje verovuosi uusilla merkinnöillä" +msgstr "Sulje tilikausi uusilla merkinnöillä" #. module: account #: selection:account.account,currency_mode:0 @@ -3255,7 +3269,7 @@ msgstr "Keskimääräinen kurssi" #: model:process.node,note:account.process_node_bankstatement0 #: model:process.node,note:account.process_node_supplierbankstatement0 msgid "Statement encoding produces payment entries" -msgstr "Tiliotekoodaus tuottaa maksurivit" +msgstr "Tiliotteen syöttäminen tuottaa maksumerkinnät" #. module: account #: field:account.account,code:0 @@ -3292,17 +3306,17 @@ msgstr "Ei mikään" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close #: model:ir.ui.menu,name:account.menu_wizard_fy_close msgid "Generate Fiscal Year Opening Entries" -msgstr "" +msgstr "Luo merkinnät tilikauden avaukselle" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile msgid "Reconcile Entries" -msgstr "Sovitellut merkinnät" +msgstr "Tee suoritusmerkintöjä" #. module: account #: wizard_view:account.wizard_paid_open,init:0 msgid "(Invoice should be unreconciled if you want to open it)" -msgstr "(Laskun sovitus täytyisi purkaa jos haluat avata sen)" +msgstr "(Laskun suoritusmerkinnät tulisi poistaa jos se halutaan avata)" #. module: account #: view:account.invoice:0 @@ -3319,7 +3333,7 @@ msgstr "Veronimi" #. module: account #: wizard_view:account.fiscalyear.close.state,init:0 msgid " Close states of Fiscal year and periods" -msgstr "" +msgstr " Sulje tilikauden ja jaksojen tilat" #. module: account #: model:account.payment.term,name:account.account_payment_term @@ -3334,7 +3348,7 @@ msgstr "Juuriverokoodi" #. module: account #: constraint:account.invoice:0 msgid "Error: BVR reference is required." -msgstr "" +msgstr "Virhe: BVR-viite on pakollinen." #. module: account #: field:account.tax.code,notprintable:0 @@ -3367,7 +3381,7 @@ msgstr "Kokonais debet" #. module: account #: selection:account.analytic.account,state:0 msgid "Pending" -msgstr "" +msgstr "Odottaa" #. module: account #: view:wizard.multi.charts.accounts:0 @@ -3398,7 +3412,7 @@ msgstr "Kolmannen osapuolen tilikirja" msgid "" "This account will be used instead of the default one as the receivable " "account for the current partner" -msgstr "Tätä tiliä käytetään oletuksen sijaan kumppanin saataville" +msgstr "Tätä tiliä käytetään oletustilin sijasta tämän kumppanin saataville." #. module: account #: selection:account.tax,applicable_type:0 @@ -3446,12 +3460,12 @@ msgstr "Tuo lasku" #: view:wizard.company.setup:0 #: view:wizard.multi.charts.accounts:0 msgid "Create" -msgstr "" +msgstr "Luo" #. module: account #: model:process.transition.action,name:account.process_transition_action_createentries0 msgid "Create entry" -msgstr "Luo tapahtuma" +msgstr "Luo merkintä" #. module: account #: model:ir.model,name:account.model_account_invoice_line @@ -3470,8 +3484,8 @@ msgid "" "All draft account entries in this journal and period will be validated. It " "means you won't be able to modify their accouting fields." msgstr "" -"Kaikki tilin luonnoskohdat tässä lokissa ja jaksossa tarkistetaan. Se " -"tarkoittaa ettet voi muokata niiden tilikenttiä." +"Kaikki luonnostilassa olevat tilimerkinnät tässä päiväkirjassa hyväksytään. " +"Tämä tarkoittaa ettet voi enää muokata niiden tilikenttiä." #. module: account #: selection:account.model.line,date:0 @@ -3485,7 +3499,8 @@ msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." msgstr "" -"Määrä on pakotettu valinnaisessa valuutassa jos se on monivaluutta kohta." +"Summa on ilmoitettu valinnaisessa toisessa valuutassa jos tämä on " +"monivaluuttainen merkintä." #. module: account #: field:account.tax,parent_id:0 @@ -3518,18 +3533,18 @@ msgstr "Jaksojen suodatin" #. module: account #: field:res.partner,property_account_receivable:0 msgid "Account Receivable" -msgstr "Saatava -tili" +msgstr "Tili saatavat" #. module: account #: wizard_button:account.invoice.pay,addendum,reconcile:0 msgid "Pay and reconcile" -msgstr "Maksa ja sovita" +msgstr "Maksa ja suorita" #. module: account #: rml:account.central.journal:0 #: model:ir.actions.report.xml,name:account.account_central_journal msgid "Central Journal" -msgstr "" +msgstr "Keskitetty päiväkirja" #. module: account #: rml:account.third_party_ledger:0 @@ -3540,7 +3555,7 @@ msgstr "Saldoa tuotu eteenpäin" #. module: account #: field:account.account,child_consol_ids:0 msgid "Consolidated Children" -msgstr "Vahvistettu alajaos" +msgstr "Yhdistetyt alatilit" #. module: account #: wizard_field:account.account.balance.report,checktype,fiscalyear:0 @@ -3549,7 +3564,7 @@ msgstr "Vahvistettu alajaos" #: wizard_field:account.partner.balance.report,init,fiscalyear:0 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0 msgid "Fiscal year" -msgstr "" +msgstr "Tilikausi" #. module: account #: rml:account.overdue:0 @@ -3565,7 +3580,7 @@ msgstr "Saldo ei ole tasan 0" #. module: account #: selection:account.automatic.reconcile,init,power:0 msgid "3" -msgstr "" +msgstr "3" #. module: account #: model:ir.actions.report.xml,name:account.account_vat_declaration @@ -3575,7 +3590,7 @@ msgstr "Veroraportti" #. module: account #: selection:account.journal.period,state:0 msgid "Printed" -msgstr "" +msgstr "Tulostettu" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree4_new @@ -3586,7 +3601,7 @@ msgstr "Uusi toimittajahyvitys" #. module: account #: view:account.model:0 msgid "Entry Model" -msgstr "Kohdemalli" +msgstr "Merkintämalli" #. module: account #: wizard_field:account.general.ledger.report,checktype,amount_currency:0 @@ -3606,7 +3621,7 @@ msgstr "Ennakkomaksu" #. module: account #: field:account.analytic.journal,code:0 msgid "Journal code" -msgstr "" +msgstr "Päiväkirjakoodi" #. module: account #: wizard_button:account.fiscalyear.close,init,close:0 @@ -3622,12 +3637,12 @@ msgstr "Projektirivi" #. module: account #: wizard_field:account.automatic.reconcile,init,max_amount:0 msgid "Maximum write-off amount" -msgstr "Suurin alennusmäärä" +msgstr "Maksimi arvonalennuksen määrä" #. module: account #: field:account.invoice.tax,manual:0 msgid "Manual" -msgstr "" +msgstr "Manuaalinen" #. module: account #: view:account.invoice:0 @@ -3650,7 +3665,7 @@ msgstr "Tätä maksuehtoa käytetään oletuksen sijaan nykyiselle kumppanille" #: wizard_field:account.invoice.pay,addendum,comment:0 #: wizard_field:account.invoice.pay,init,name:0 msgid "Entry Name" -msgstr "" +msgstr "Merkinnän nimi" #. module: account #: help:account.invoice,account_id:0 @@ -3676,17 +3691,17 @@ msgstr "Valitse tämä jos et halua ALV:tä liitettävän verokoodeihin laskuill #: field:account.tax.template,sequence:0 #: field:fiscalyear.seq,sequence_id:0 msgid "Sequence" -msgstr "" +msgstr "Sarja" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template msgid "Template for Fiscal Position" -msgstr "" +msgstr "Malli talouskannalle" #. module: account #: view:account.bank.statement:0 msgid "Entry encoding" -msgstr "Kohdan laittaminen" +msgstr "Merkinnän syöttäminen" #. module: account #: wizard_view:account.invoice.refund,init:0 @@ -3697,17 +3712,17 @@ msgstr "Luottoilmoitus" #. module: account #: model:ir.actions.todo,note:account.config_fiscalyear msgid "Define Fiscal Years and Select Charts of Account" -msgstr "" +msgstr "Määrittele tilikausi ja valitse tilikartat" #. module: account #: wizard_field:account.move.line.reconcile,addendum,period_id:0 msgid "Write-Off Period" -msgstr "Alennusjakso" +msgstr "Arvonalennusjakso" #. module: account #: selection:account.config.wizard,period:0 msgid "3 Months" -msgstr "" +msgstr "3 kuukautta" #. module: account #: wizard_view:account.move.journal,init:0 @@ -3732,7 +3747,7 @@ msgstr "Maksuehtorivi" #: selection:account.config.wizard,period:0 #: field:report.hr.timesheet.invoice.journal,name:0 msgid "Month" -msgstr "" +msgstr "Kuukausi" #. module: account #: model:ir.model,name:account.model_account_subscription @@ -3749,7 +3764,7 @@ msgstr "Eräpäivä" #. module: account #: view:account.subscription:0 msgid "Entry Subscription" -msgstr "Ennakkomaksukohta" +msgstr "Ennakkomaksun merkintä" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 @@ -3766,7 +3781,7 @@ msgstr "Tilin ohjattu konfigurointi toiminto " #: field:account.fiscalyear,date_start:0 #: field:account.subscription,date_start:0 msgid "Start Date" -msgstr "" +msgstr "Aloituspäivämäärä" #. module: account #: wizard_view:account.general.ledger.report,account_selection:0 @@ -3777,7 +3792,7 @@ msgstr "Valitse kartta" #: selection:account.chart,init,target_move:0 #: model:ir.actions.report.xml,name:account.account_move_line_list msgid "All Entries" -msgstr "" +msgstr "Kaikki merkinnät" #. module: account #: model:process.node,name:account.process_node_draftinvoices0 @@ -3788,23 +3803,23 @@ msgstr "Luonnostele Laskut" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template msgid "Fiscal Position Template Tax Mapping" -msgstr "" +msgstr "Talouskannan mallin veron kartoitukset" #. module: account #: rml:account.invoice:0 msgid "Invoice Date" -msgstr "" +msgstr "Laskun päivämäärä" #. module: account #: selection:account.account.type,close_method:0 msgid "Unreconciled" -msgstr "Sovittelematon" +msgstr "Suorittamaton" #. module: account #: field:account.account,note:0 #: field:account.account.template,note:0 msgid "Note" -msgstr "" +msgstr "Huomautus" #. module: account #: model:ir.module.module,description:account.module_meta_information @@ -3832,23 +3847,23 @@ msgstr "" #. module: account #: field:account.journal,sequence_id:0 msgid "Entry Sequence" -msgstr "" +msgstr "Merkinnän sarja" #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 msgid "Closed" -msgstr "" +msgstr "Suljettu" #. module: account #: model:process.node,name:account.process_node_paymententries0 msgid "Payment Entries" -msgstr "" +msgstr "Maksumerkinnät" #. module: account #: help:account.move.line,tax_code_id:0 msgid "The Account can either be a base tax code or tax code account." -msgstr "" +msgstr "Tili voi olla joko perusveron tai verokoodin tili." #. module: account #: help:account.automatic.reconcile,init,account_ids:0 @@ -3869,7 +3884,7 @@ msgstr "Myöhästyneen maksun viesti" #: selection:account.tax,tax_group:0 #: selection:account.tax.template,tax_group:0 msgid "Other" -msgstr "" +msgstr "Muu" #. module: account #: model:ir.actions.report.xml,name:account.account_general_ledger @@ -3882,12 +3897,12 @@ msgstr "Yleinen tilikirja" #. module: account #: field:account.journal.view,columns_id:0 msgid "Columns" -msgstr "" +msgstr "Sarakkeet" #. module: account #: selection:account.general.ledger.report,checktype,sortbydate:0 msgid "Movement" -msgstr "" +msgstr "Siirto" #. module: account #: help:account.period,special:0 @@ -3900,17 +3915,19 @@ msgid "" "This account will be used instead of the default one to value outgoing stock " "for the current product" msgstr "" +"Tätä tiliä käytetään oletustilin sijasta tämän tuotteen lähtevän varaston " +"arvottamiseen." #. module: account #: model:process.node,note:account.process_node_manually0 msgid "Encode manually the statement" -msgstr "" +msgstr "Syötä tiliote manuaalisesti" #. module: account #: model:ir.actions.act_window,name:account.action_account_journal_form #: model:ir.ui.menu,name:account.menu_action_account_journal_form msgid "Financial Journals" -msgstr "" +msgstr "Talouden päiväkirjat" #. module: account #: selection:account.account.balance.report,checktype,state:0 @@ -3928,7 +3945,7 @@ msgstr "Jätä tyhjäksi käyttääksesi nykyistä päivämäärää" #. module: account #: rml:account.overdue:0 msgid "." -msgstr "" +msgstr "." #. module: account #: field:account.analytic.account,quantity_max:0 @@ -3938,7 +3955,7 @@ msgstr "Maksimimäärä" #. module: account #: field:account.period,name:0 msgid "Period Name" -msgstr "" +msgstr "Jakson nimi" #. module: account #: help:account.analytic.journal,type:0 @@ -3947,11 +3964,14 @@ msgid "" "needs to create analytic entries, Open ERP will look for a matching journal " "of the same type." msgstr "" +"Asettaa päiväkirjan tyypin analyyttiseksi. Kun jokin dokumentti (esim. " +"lasku) vaatii analyyttisten merkintöjen kirjausta, OpenERP etsii tämän " +"tyyppisen vastaavan päiväkirjan." #. module: account #: field:account.journal,groups_id:0 msgid "Groups" -msgstr "" +msgstr "Ryhmät" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 @@ -3967,7 +3987,7 @@ msgstr "Koodi/Päivämäärä" #: field:account.payment.term,active:0 #: field:account.tax,active:0 msgid "Active" -msgstr "" +msgstr "Aktiivinen" #. module: account #: model:process.node,note:account.process_node_electronicfile0 @@ -3977,7 +3997,7 @@ msgstr "Tuo pankkisi tiliotteista" #. module: account #: view:account.chart.template:0 msgid "Properties" -msgstr "" +msgstr "Ominaisuudet" #. module: account #: view:res.partner:0 @@ -3987,17 +4007,17 @@ msgstr "Asiakkaan kirjanpidon asetukset" #. module: account #: view:account.bank.statement:0 msgid "Select entries" -msgstr "" +msgstr "Valitse merkinnät" #. module: account #: selection:account.chart,init,target_move:0 msgid "All Posted Entries" -msgstr "" +msgstr "Kaikki viedyt merkinnät" #. module: account #: wizard_field:account.vat.declaration,init,based_on:0 msgid "Base on" -msgstr "" +msgstr "Peruste" #. module: account #: selection:account.move,type:0 @@ -4007,7 +4027,7 @@ msgstr "Käteismaksu" #. module: account #: field:account.chart.template,property_account_payable:0 msgid "Payable Account" -msgstr "Maksukelpoinen tili" +msgstr "Maksettavat tili" #. module: account #: field:account.account,currency_id:0 @@ -4033,7 +4053,7 @@ msgstr "Toissijainen valuutta" #: rml:account.vat.declaration:0 #: field:report.hr.timesheet.invoice.journal,cost:0 msgid "Credit" -msgstr "" +msgstr "Kredit" #. module: account #: help:account.tax.template,child_depend:0 @@ -4041,6 +4061,7 @@ msgid "" "Indicate if the tax computation is based on the value computed for the " "computation of child taxes or based on the total amount." msgstr "" +"Määritä perustuuko verojen laskenta alemmille veroille vai loppusummaan." #. module: account #: field:account.tax,account_paid_id:0 @@ -4073,17 +4094,17 @@ msgstr "Verotettu määrä" #. module: account #: field:account.invoice.line,price_subtotal:0 msgid "Subtotal w/o tax" -msgstr "" +msgstr "Välisumma ilman veroa" #. module: account #: field:account.invoice.line,invoice_id:0 msgid "Invoice Ref" -msgstr "" +msgstr "Laskun viite" #. module: account #: field:account.analytic.line,general_account_id:0 msgid "General Account" -msgstr "" +msgstr "Yleinen tili" #. module: account #: help:account.move.line,quantity:0 @@ -4091,14 +4112,14 @@ msgid "" "The optional quantity expressed by this line, eg: number of product sold. " "The quantity is not a legal requirement but is very usefull for some reports." msgstr "" -"Valinnainen määrä täytetään tälle riville, esim. myytyjen tuotteiden määrä. " -"Tämä ei ole laillinen vaatimus, mutta käytännöllinen esimerkiksi joissakin " +"Valinnainen lukumäärä tälle riville, esim. myytyjen tuotteiden lukumäärä. " +"Lukumäärä ei ole lain vaatima, mutta se on käytännöllinen joissain " "raporteissa." #. module: account #: wizard_field:account.third_party_ledger.report,init,reconcil:0 msgid " Include Reconciled Entries" -msgstr "" +msgstr " Sisällytä suoritetut merkinnät" #. module: account #: help:account.move.line,blocked:0 @@ -4106,6 +4127,7 @@ msgid "" "You can check this box to mark the entry line as a litigation with the " "associated partner" msgstr "" +"Tämä laatikko voidaan valita jos merkintä on riidanalainen kumppanin kanssa." #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree1 @@ -4116,7 +4138,7 @@ msgstr "Asiakas Laskutus" #. module: account #: field:res.partner,debit_limit:0 msgid "Payable Limit" -msgstr "" +msgstr "Maksettavat raja" #. module: account #: wizard_field:account.account.balance.report,checktype,state:0 @@ -4132,28 +4154,28 @@ msgstr "Päivämäärä/Jakso suodatin" #: selection:account.bank.statement.line,type:0 #: selection:account.journal,type:0 msgid "General" -msgstr "" +msgstr "Yleinen" #. module: account #: rml:account.general.journal:0 msgid "Credit Trans." -msgstr "" +msgstr "Kredit siirt." #. module: account #: field:wizard.multi.charts.accounts,seq_journal:0 msgid "Separated Journal Sequences" -msgstr "Erotellut lokijaksot" +msgstr "Erotellut päiväkirjan sarjat" #. module: account #: help:account.bank.statement.reconcile,total_second_currency:0 msgid "The currency of the journal" -msgstr "" +msgstr "Päiväkirjan valuutta" #. module: account #: view:account.journal.column:0 #: model:ir.model,name:account.model_account_journal_column msgid "Journal Column" -msgstr "" +msgstr "Päiväkirjan sarake" #. module: account #: selection:account.fiscalyear,state:0 @@ -4162,7 +4184,7 @@ msgstr "" #: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Done" -msgstr "" +msgstr "Valmis" #. module: account #: wizard_field:account.account.balance.report,checktype,periods:0 @@ -4177,7 +4199,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_account_period_form #: model:ir.ui.menu,name:account.next_id_23 msgid "Periods" -msgstr "" +msgstr "Jaksot" #. module: account #: rml:account.invoice:0 @@ -4186,7 +4208,7 @@ msgstr "" #: model:ir.model,name:account.model_account_invoice #: model:res.request.link,name:account.req_link_invoice msgid "Invoice" -msgstr "" +msgstr "Lasku" #. module: account #: selection:account.analytic.account,state:0 @@ -4194,7 +4216,7 @@ msgstr "" #: wizard_button:account.open_closed_fiscalyear,init,open:0 #: wizard_button:account_use_models,create,open_move:0 msgid "Open" -msgstr "" +msgstr "Avoin" #. module: account #: model:ir.ui.menu,name:account.next_id_29 @@ -4206,7 +4228,7 @@ msgstr "Etsintäkohteet" #: model:process.node,note:account.process_node_analyticcost0 msgid "Analytic costs to reinvoice purchases, timesheets, ..." msgstr "" -"Analyyttiset kustannukset myynnin uudelleen laskutuksesta, tuntilistat, ..." +"Analyyttiset kustannukset uudelleenlaskuttaa ostoja, tuntilistoja jne." #. module: account #: field:account.account,tax_ids:0 @@ -4218,7 +4240,7 @@ msgstr "Oletusverot" #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" -msgstr "" +msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!" #. module: account #: help:account.account.type,sign:0 @@ -4228,12 +4250,12 @@ msgid "" "expenses accounts." msgstr "" "Sallii saldon etumerkin muuttamisen raporteilla, joten voit nähdä " -"positiivisia lukuja negatiivisten sijaan kustannuksissa." +"positiivisia lukuja negatiivisten sijasta esim. kustannuksissa." #. module: account #: help:account.config.wizard,code:0 msgid "Name of the fiscal year as displayed in reports." -msgstr "" +msgstr "Tilikauden nimi siten kun se näytetään raporteissa." #. module: account #: help:account.move.line,date_maturity:0 @@ -4241,6 +4263,8 @@ msgid "" "This field is used for payable and receivable entries. You can put the limit " "date for the payment of this entry line." msgstr "" +"Tätä kenttää käytetään merkintöihin maksettavista ja saatavista. Voit " +"asettaa rajapäivämäärän merkintärivin maksulle." #. module: account #: rml:account.tax.code.entries:0 @@ -4255,7 +4279,7 @@ msgstr "Ylävasen" #. module: account #: help:account.journal,sequence_id:0 msgid "The sequence gives the display order for a list of journals" -msgstr "" +msgstr "Sarja määrää päiväkirjojen järjestyksen niitä listattaessa" #. module: account #: field:account.journal,type_control_ids:0 @@ -4268,7 +4292,7 @@ msgstr "Tyyppihallinnat" #: rml:account.analytic.account.balance:0 #: rml:account.central.journal:0 msgid "Account Name" -msgstr "" +msgstr "Tilin nimi" #. module: account #: wizard_field:account.invoice.pay,init,date:0 @@ -4278,12 +4302,12 @@ msgstr "Maksu päivämäärä" #. module: account #: wizard_button:account_use_models,create,end:0 msgid "Ok" -msgstr "" +msgstr "OK" #. module: account #: rml:account.invoice:0 msgid "Taxes:" -msgstr "" +msgstr "Verot:" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree7 @@ -4302,17 +4326,17 @@ msgstr "Toimittajan laskut" #: field:account.invoice.line,product_id:0 #: field:account.move.line,product_id:0 msgid "Product" -msgstr "" +msgstr "Tuote" #. module: account #: rml:account.tax.code.entries:0 msgid ")" -msgstr "" +msgstr ")" #. module: account #: field:res.partner,credit:0 msgid "Total Receivable" -msgstr "Kaikki saatavat" +msgstr "Saatavat yhteensä" #. module: account #: model:ir.model,name:account.model_account_period @@ -4322,12 +4346,12 @@ msgstr "Tilijakso" #. module: account #: wizard_field:account.invoice.pay,init,journal_id:0 msgid "Journal/Payment Mode" -msgstr "" +msgstr "Päiväkirja-/maksutyyppi" #. module: account #: rml:account.invoice:0 msgid "Canceled Invoice" -msgstr "" +msgstr "Peruutettu lasku" #. module: account #: view:account.subscription:0 @@ -4349,7 +4373,7 @@ msgstr "Tilimalli" #. module: account #: field:account.tax.code,sum:0 msgid "Year Sum" -msgstr "" +msgstr "Vuoden summa" #. module: account #: model:process.transition,note:account.process_transition_filestatement0 @@ -4365,13 +4389,13 @@ msgstr "Sisäinen tyyppi" #. module: account #: selection:account.automatic.reconcile,init,power:0 msgid "9" -msgstr "" +msgstr "9" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_running #: model:ir.ui.menu,name:account.menu_action_subscription_form_running msgid "Running Subscriptions" -msgstr "Juoksevat ennakkomaksut" +msgstr "Voimassa olevat ennakkomaksut" #. module: account #: selection:account.move,type:0 @@ -4393,13 +4417,13 @@ msgstr "Luottotiedot" #: field:account.config.wizard,date2:0 #: field:account.fiscalyear,date_stop:0 msgid "End Date" -msgstr "" +msgstr "Lopetuspäivämäärä" #. module: account #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy msgid "Cancel Opening Entries" -msgstr "" +msgstr "Peruuta avausmerkinnät" #. module: account #: model:process.transition,name:account.process_transition_invoicemanually0 @@ -4415,7 +4439,7 @@ msgstr "Kuukaudenpäivä" #: field:account.analytic.journal,line_ids:0 #: field:account.tax.code,line_ids:0 msgid "Lines" -msgstr "" +msgstr "Rivit" #. module: account #: rml:account.overdue:0 @@ -4447,12 +4471,12 @@ msgstr "Arkistotiliote" #. module: account #: view:ir.sequence:0 msgid "Fiscal Year Sequences" -msgstr "Tilivuoden Sekvenssit" +msgstr "Tilikausien sarjat" #. module: account #: view:account.model.line:0 msgid "Entry Model Line" -msgstr "" +msgstr "Merkintämallin rivi" #. module: account #: view:account.tax.template:0 @@ -4462,7 +4486,7 @@ msgstr "Tiliveron malli" #. module: account #: help:account.model,name:0 msgid "This is a model for recurring accounting entries" -msgstr "" +msgstr "Tämä on malli toistuvasta kirjanpidon merkinnästä" #. module: account #: wizard_view:account.wizard_paid_open,init:0 @@ -4492,26 +4516,26 @@ msgstr "Toimittajan velat" #. module: account #: help:account.model.line,quantity:0 msgid "The optional quantity on entries" -msgstr "" +msgstr "Valinnainen merkintöjen määrä" #. module: account #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "JNRL" -msgstr "" +msgstr "JNRL" #. module: account #: view:account.fiscalyear:0 #: view:account.period:0 msgid "States" -msgstr "" +msgstr "Tilat" #. module: account #: view:account.move:0 #: model:process.node,name:account.process_node_accountingentries0 #: model:process.node,name:account.process_node_supplieraccountingentries0 msgid "Accounting Entries" -msgstr "" +msgstr "Kirjanpidon merkinnät" #. module: account #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled @@ -4526,12 +4550,12 @@ msgstr "Yleinen Tilikirja -" #. module: account #: field:report.hr.timesheet.invoice.journal,quantity:0 msgid "Quantities" -msgstr "" +msgstr "Määrät" #. module: account #: field:account.analytic.account,date_start:0 msgid "Date Start" -msgstr "" +msgstr "Aloituspäivämäärä" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -4541,13 +4565,13 @@ msgstr "" #: field:account.invoice,amount_total:0 #: field:account.invoice,check_total:0 msgid "Total" -msgstr "" +msgstr "Yhteensä" #. module: account #: model:process.transition,note:account.process_transition_customerinvoice0 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0 msgid "Number of entries are generated" -msgstr "" +msgstr "Luotavien merkintöjen lukumäärä" #. module: account #: model:process.transition,name:account.process_transition_suppliervalidentries0 @@ -4560,7 +4584,7 @@ msgstr "Sallitut merkinnät" #: model:ir.actions.wizard,name:account.wizard_line_account_use_model #: model:ir.ui.menu,name:account.menu_account_use_model msgid "Create Entries From Models" -msgstr "" +msgstr "Luo merkinnät malleista" #. module: account #: field:account.account.template,reconcile:0 @@ -4573,7 +4597,7 @@ msgstr "Salli sovittelu" #: selection:account.partner.balance.report,init,state:0 #: selection:account.third_party_ledger.report,init,state:0 msgid "By Date" -msgstr "" +msgstr "Päivämäärän mukaan" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree4 @@ -4584,7 +4608,7 @@ msgstr "Toimittajan hyvitykset" #. module: account #: help:account.model.line,date:0 msgid "The date of the generated entries" -msgstr "" +msgstr "Luotujen merkintöjen päivämäärä" #. module: account #: wizard_button:account.invoice.refund,init,modify_invoice:0 @@ -4607,21 +4631,21 @@ msgid "" "This will automatically configure your chart of accounts, bank accounts, " "taxes and journals according to the selected template" msgstr "" -"Toiminto konfiguroi automaattisesti kirjapitokartat, pankkitilit, verot ja " -"lokit valitun mallin mukaan" +"Tämä toiminto konfiguroi automaattisesti kirjanpidon tilikartat, " +"pankkitilit, verot ja päiväkirjat valitun mallin mukaan" #. module: account #: view:account.bank.statement:0 #: field:account.bank.statement.line,statement_id:0 #: field:account.move.line,statement_id:0 msgid "Statement" -msgstr "" +msgstr "Tiliote" #. module: account #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move #: model:ir.ui.menu,name:account.menu_encode_entries_by_move msgid "Entries Encoding by Move" -msgstr "" +msgstr "Merkinnät siirroittain" #. module: account #: wizard_view:account.analytic.account.chart,init:0 @@ -4642,13 +4666,13 @@ msgstr "Vero lisätty hintaan" #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2 #: model:ir.ui.menu,name:account.account_analytic_journal_entries msgid "Analytic Entries by Journal" -msgstr "" +msgstr "Analyyttiset merkinnät päiväkirjoittain" #. module: account #: model:process.transition,note:account.process_transition_suppliervalidentries0 #: model:process.transition,note:account.process_transition_validentries0 msgid "Valid entries from invoice" -msgstr "" +msgstr "Hyväksytyt merkinnät laskulta" #. module: account #: field:account.account,company_id:0 @@ -4668,17 +4692,17 @@ msgstr "" #: field:wizard.company.setup,company_id:0 #: field:wizard.multi.charts.accounts,company_id:0 msgid "Company" -msgstr "" +msgstr "Yritys" #. module: account #: rml:account.general.ledger:0 msgid "Crebit" -msgstr "" +msgstr "Kredit" #. module: account #: selection:account.subscription,state:0 msgid "Running" -msgstr "" +msgstr "Käytössä" #. module: account #: help:account.tax,include_base_amount:0 @@ -4686,8 +4710,8 @@ msgid "" "Indicate if the amount of tax must be included in the base amount for the " "computation of the next taxes" msgstr "" -"Kerro jos veronmäärä pitää olla sisällytettynä perusmäärään seuraavissa " -"verolaskelmissa" +"Ilmoita jos veron määrä täytyy sisällyttää perusmäärään seuraavia veroja " +"laskettaessa" #. module: account #: model:process.node,name:account.process_node_draftstatement0 @@ -4697,7 +4721,7 @@ msgstr "Luonnostiliote" #. module: account #: field:account.analytic.journal,name:0 msgid "Journal name" -msgstr "Lokinimi" +msgstr "Päiväkirjan nimi" #. module: account #: model:process.transition,note:account.process_transition_invoiceimport0 @@ -4707,7 +4731,7 @@ msgstr "Tuo lasku tiliotteesta" #. module: account #: selection:account.automatic.reconcile,init,power:0 msgid "4" -msgstr "" +msgstr "4" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form @@ -4725,22 +4749,22 @@ msgstr "Tuo laskuista tai maksuista" #: model:ir.actions.wizard,name:account.wizard_reconcile_select #: model:ir.ui.menu,name:account.menu_reconcile_select msgid "Reconcile entries" -msgstr "" +msgstr "Tee suoritusmerkinnät" #. module: account #: xsl:account.transfer:0 msgid "Change" -msgstr "" +msgstr "Muuta" #. module: account #: field:account.journal.period,icon:0 msgid "Icon" -msgstr "" +msgstr "Kuvake" #. module: account #: model:ir.model,name:account.model_account_journal_period msgid "Journal - Period" -msgstr "Loki - Jakso" +msgstr "Päiväkirja - Jakso" #. module: account #: wizard_field:account.move.line.reconcile,init_full,credit:0 @@ -4756,7 +4780,7 @@ msgstr "Luo kuukausijaksot" #. module: account #: wizard_button:account.aged.trial.balance,init,print:0 msgid "Print Aged Trial Balance" -msgstr "" +msgstr "Tulosta välitase" #. module: account #: field:account.analytic.line,ref:0 @@ -4766,7 +4790,7 @@ msgstr "" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Ref." -msgstr "" +msgstr "Viite" #. module: account #: field:account.invoice,address_invoice_id:0 @@ -4785,11 +4809,14 @@ msgid "" "new counterpart but will share the same counterpart. This is used in fiscal " "year closing." msgstr "" +"Valitse määrittääksesi että jokainen merkintä tähän päiväkirjaan ei luo " +"uutta vastinetta vaan käyttää jaettua vastinetta. Tätä käytetään tilikauden " +"päätökseen." #. module: account #: selection:account.invoice,state:0 msgid "Cancelled" -msgstr "" +msgstr "Peruttu" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree @@ -4805,19 +4832,19 @@ msgstr "Maksupäivä" #. module: account #: rml:account.journal.period.print:0 msgid "A/c No." -msgstr "" +msgstr "Tilinumero" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month msgid "Account cost and revenue by journal (This Month)" -msgstr "Tilin kustannukset ja tuotot lokin mukaan (Tässä kuussa)" +msgstr "Tilin kustannukset ja tuotot päiväkirjan mukaan (Tässä kuussa)" #. module: account #: selection:account.partner.balance.report,init,result_selection:0 #: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Receivable Accounts" -msgstr "Saatavat kirjanpidot" +msgstr "Saatavat tilit" #. module: account #: wizard_button:account.move.line.unreconcile.select,init,open:0 @@ -4833,7 +4860,7 @@ msgstr "Pankin tiliotteen rivi" #. module: account #: wizard_button:account.automatic.reconcile,reconcile,end:0 msgid "OK" -msgstr "" +msgstr "OK" #. module: account #: model:process.node,name:account.process_node_supplierinvoiceinvoice0 @@ -4845,7 +4872,7 @@ msgstr "Ohjaa laskua" #: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Receivable" -msgstr "Saatava" +msgstr "Saatavat" #. module: account #: model:ir.actions.report.xml,name:account.account_account_balance @@ -4873,12 +4900,12 @@ msgstr "ALV:" #: rml:account.general.journal:0 #: rml:account.invoice:0 msgid "Total:" -msgstr "" +msgstr "Yhteensä:" #. module: account #: model:ir.model,name:account.model_account_analytic_journal msgid "account.analytic.journal" -msgstr "" +msgstr "account.analytic.journal" #. module: account #: view:account.fiscal.position:0 @@ -4901,7 +4928,7 @@ msgstr "Tili sovittelu" #: view:account.bank.statement:0 #: selection:account.bank.statement,state:0 msgid "Confirm" -msgstr "" +msgstr "Hyväksy" #. module: account #: wizard_view:account.account.balance.report,account_selection:0 @@ -4938,12 +4965,12 @@ msgstr "Analyyttinen kirjanpito" #: rml:account.invoice:0 #: selection:account.invoice,type:0 msgid "Supplier Invoice" -msgstr "" +msgstr "Toimittajan lasku" #. module: account #: selection:account.move.line,state:0 msgid "Valid" -msgstr "" +msgstr "Voimassa" #. module: account #: field:account.account,debit:0 @@ -4964,12 +4991,12 @@ msgstr "" #: rml:account.vat.declaration:0 #: field:report.hr.timesheet.invoice.journal,revenue:0 msgid "Debit" -msgstr "" +msgstr "Debet" #. module: account #: model:ir.ui.menu,name:account.next_id_42 msgid "All Months" -msgstr "" +msgstr "Kaikki kuukaudet" #. module: account #: wizard_field:account.invoice.refund,init,date:0 @@ -4979,7 +5006,7 @@ msgstr "Toimenpiteen päivämäärä" #. module: account #: field:account.invoice,invoice_line:0 msgid "Invoice Lines" -msgstr "" +msgstr "Laskurivit" #. module: account #: field:account.period,date_start:0 @@ -4989,12 +5016,12 @@ msgstr "Jakson alku" #. module: account #: wizard_field:account.fiscalyear.close,init,report_name:0 msgid "Name of new entries" -msgstr "" +msgstr "Uusien merkintöjen nimi" #. module: account #: wizard_button:account_use_models,init_form,create:0 msgid "Create Entries" -msgstr "" +msgstr "Luo merkinnät" #. module: account #: field:account.tax,ref_tax_code_id:0 @@ -5015,24 +5042,24 @@ msgstr "Linkitä automaattisesti luotuihin tilisiirtoihin" #. module: account #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0 msgid "Reconciled transactions" -msgstr "Sovitellut liiketoimet" +msgstr "Suoritetut tapahtumat" #. module: account #: model:ir.ui.menu,name:account.menu_finance_reporting msgid "Reporting" -msgstr "" +msgstr "Raportointi" #. module: account #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "/" -msgstr "" +msgstr "/" #. module: account #: model:process.node,note:account.process_node_invoiceinvoice0 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0 msgid "Have a number and entries are generated" -msgstr "" +msgstr "On numero ja merkinnät luotu" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -5052,28 +5079,28 @@ msgstr "Ryhmittele laskurivit" #. module: account #: model:ir.ui.menu,name:account.menu_finance_configuration msgid "Configuration" -msgstr "" +msgstr "Konfiguraatio" #. module: account #: view:account.analytic.line:0 #: view:account.invoice:0 msgid "Total amount" -msgstr "" +msgstr "Yhteensä" #. module: account #: view:account.journal:0 msgid "Account Journal" -msgstr "" +msgstr "Tilipäiväkirja" #. module: account #: view:account.subscription.line:0 msgid "Subscription lines" -msgstr "Tilausrivit" +msgstr "Ennakkomaksun rivit" #. module: account #: field:account.chart.template,property_account_income:0 msgid "Income Account on Product Template" -msgstr "" +msgstr "Tili tuloille tuotteen mallissa" #. module: account #: help:account.account,currency_id:0 @@ -5085,7 +5112,7 @@ msgstr "Pakota kaikille siirroille tällä tilillä toissijainen valuutta." #: wizard_button:populate_statement_from_inv,go,end:0 #: wizard_button:populate_statement_from_inv,init,end:0 msgid "_Cancel" -msgstr "" +msgstr "_Peruuta" #. module: account #: wizard_view:account.general.ledger.report,checktype:0 @@ -5129,8 +5156,8 @@ msgid "" "Check this box if you want to use a different sequence for each created " "journal. Otherwise, all will use the same sequence." msgstr "" -"Valitse tämä jos haluat käyttää eri sekvenssiä jokaiselle luodulle lokille. " -"Muutoin kaikki käyttävät samaa sekvenssiä." +"Valitse tämä jos haluat käyttää eri sarjaa jokaiselle luodulle " +"päiväkirjalle. Muuten kaikki käyttävät samaa sarjaa." #. module: account #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv @@ -5147,13 +5174,13 @@ msgstr "Sovittelematon" #. module: account #: model:ir.model,name:account.model_fiscalyear_seq msgid "Maintains Invoice sequences with Fiscal Year" -msgstr "Ylläpitää laskusekvenssejä Tilikauden kanssa" +msgstr "Ylläpitää laskusarjoja tilikauden kanssa" #. module: account #: selection:account.account.balance.report,checktype,display_account:0 #: selection:account.general.ledger.report,checktype,display_account:0 msgid "With movements" -msgstr "" +msgstr "Siirtojen kanssa" #. module: account #: field:account.tax,domain:0 @@ -5169,17 +5196,17 @@ msgstr "Tilitiedot" #. module: account #: view:account.tax.code.template:0 msgid "Account Tax Code Template" -msgstr "" +msgstr "Tilin verokoodin malli" #. module: account #: view:account.subscription:0 msgid "Subscription Periods" -msgstr "Ennakkomaksujaksot" +msgstr "Ennakkomaksun jaksot" #. module: account #: model:process.node,name:account.process_node_manually0 msgid "Manually" -msgstr "" +msgstr "Manuaalisesti" #. module: account #: view:account.invoice:0 @@ -5192,24 +5219,24 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_finance_invoice #: wizard_field:populate_statement_from_inv,go,lines:0 msgid "Invoices" -msgstr "" +msgstr "Laskut" #. module: account #: selection:account.partner.balance.report,init,result_selection:0 #: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Payable Accounts" -msgstr "" +msgstr "Maksettavat tilit" #. module: account #: view:account.invoice.line:0 #: field:account.invoice.tax,invoice_id:0 msgid "Invoice Line" -msgstr "" +msgstr "Laskun rivi" #. module: account #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0 msgid "Write-Off journal" -msgstr "Arvonalennusloki" +msgstr "Arvonalennuspäiväkirja" #. module: account #: wizard_button:account.invoice.pay,init,writeoff_check:0 @@ -5219,7 +5246,7 @@ msgstr "Kokonaismaksu" #. module: account #: selection:account.move,type:0 msgid "Journal Purchase" -msgstr "" +msgstr "Päiväkirja osto" #. module: account #: selection:account.move,type:0 @@ -5235,34 +5262,34 @@ msgstr "Korvaava vero" #. module: account #: model:process.transition,note:account.process_transition_invoicemanually0 msgid "Encode manually statement comes into the draft statement" -msgstr "" +msgstr "Manuaalisesti syötetty tiliote tulee luonnostiliotteeseen" #. module: account #: model:ir.ui.menu,name:account.next_id_43 msgid "This Month" -msgstr "" +msgstr "Tässä kuussa" #. module: account #: field:account.account.type,sign:0 msgid "Sign on Reports" -msgstr "" +msgstr "Etumerkki raporteissa" #. module: account #: help:account.move.line,currency_id:0 msgid "The optional other currency if it is a multi-currency entry." -msgstr "" +msgstr "Valinnainen toinen valuutta jos merkintä on monivaluuttainen." #. module: account #: view:account.invoice:0 #: field:account.invoice,payment_ids:0 #: selection:account.vat.declaration,init,based_on:0 msgid "Payments" -msgstr "" +msgstr "Maksut" #. module: account #: model:process.node,note:account.process_node_accountingstatemententries0 msgid "Accounting entries at statement's confirmation" -msgstr "" +msgstr "Kirjanpidon merkinnät tiliotteen vahvistuksessa" #. module: account #: wizard_view:account_use_models,create:0 @@ -5272,12 +5299,12 @@ msgstr "käytä mallia" #. module: account #: wizard_button:account.wizard_paid_open,init,end:0 msgid "No" -msgstr "" +msgstr "Ei" #. module: account #: model:ir.actions.act_window,name:account.act_account_partner_account_move msgid "All account entries" -msgstr "" +msgstr "Kaikki tilin merkinnät" #. module: account #: help:account.invoice.tax,tax_code_id:0 @@ -5295,7 +5322,7 @@ msgstr "Päivämääräsuodatin" #. module: account #: wizard_view:populate_statement_from_inv,init:0 msgid "Choose Journal and Payment Date" -msgstr "" +msgstr "Valitse päiväkirja ja maksupäivä" #. module: account #: selection:account.analytic.account,state:0 @@ -5308,12 +5335,12 @@ msgstr "" #: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Draft" -msgstr "" +msgstr "Luonnos" #. module: account #: rml:account.overdue:0 msgid "Paid" -msgstr "" +msgstr "Maksettu" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree11 @@ -5335,17 +5362,17 @@ msgstr "Oletko varma?" #: rml:account.invoice:0 #: view:account.invoice:0 msgid "PRO-FORMA" -msgstr "" +msgstr "Proforma" #. module: account #: field:account.move.reconcile,line_partial_ids:0 msgid "Partial Entry lines" -msgstr "" +msgstr "Osittaiset merkintärivit" #. module: account #: help:account.move.line,statement_id:0 msgid "The bank statement used for bank reconciliation" -msgstr "" +msgstr "Pankkisuorituksiin käytettävä pankkitiliote" #. module: account #: view:account.fiscalyear:0 @@ -5355,13 +5382,13 @@ msgstr "Tilikausi" #. module: account #: wizard_button:account.analytic.line,init,open:0 msgid "Open Entries" -msgstr "" +msgstr "Avoimet merkinnät" #. module: account #: selection:account.analytic.account,type:0 #: selection:account.move.line,centralisation:0 msgid "Normal" -msgstr "" +msgstr "Normaali" #. module: account #: model:process.process,name:account.process_process_supplierinvoiceprocess0 @@ -5380,19 +5407,19 @@ msgstr "Toimittajan laskutus prosessi" #: rml:account.third_party_ledger_other:0 #: rml:account.vat.declaration:0 msgid "Page" -msgstr "" +msgstr "Sivu" #. module: account #: view:account.move:0 #: view:account.move.line:0 msgid "Optional Information" -msgstr "" +msgstr "Lisätiedot" #. module: account #: model:ir.actions.act_window,name:account.action_payment_term_form #: model:ir.ui.menu,name:account.menu_action_payment_term_form msgid "Payment Terms" -msgstr "" +msgstr "Maksuehdot" #. module: account #: selection:account.aged.trial.balance,init,result_selection:0 @@ -5403,12 +5430,12 @@ msgstr "Saatavat ja maksettavat" #: rml:account.account.balance:0 #: rml:account.general.journal:0 msgid ":" -msgstr "" +msgstr ":" #. module: account #: field:account.bank.statement.line,reconcile_amount:0 msgid "Amount reconciled" -msgstr "Soviteltu määrä" +msgstr "Suoritettu määrä" #. module: account #: selection:account.account,currency_mode:0 @@ -5422,13 +5449,16 @@ msgid "" "amount.If the tax account is base tax code, this field " "will contain the basic amount(without tax)." msgstr "" +"Jos verotili on verokooditili, tässä kentässä on veron määrä. Jos verotili " +"on perusverokoodi, tämä kenttä sisältää perusteena olevan summan (ilman " +"veroa)." #. module: account #: view:account.bank.statement:0 #: view:account.bank.statement.reconcile:0 #: view:account.subscription:0 msgid "Compute" -msgstr "" +msgstr "Laske" #. module: account #: help:account.invoice.line,account_id:0 @@ -5444,7 +5474,7 @@ msgstr "Verosovellus" #: model:ir.actions.act_window,name:account.action_subscription_form #: model:ir.ui.menu,name:account.menu_action_subscription_form msgid "Subscription Entries" -msgstr "" +msgstr "Ennakkomaksun merkinnät" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree6 @@ -5466,19 +5496,19 @@ msgstr "Jaksojen määrä" #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0 #: wizard_field:account.automatic.reconcile,init,date2:0 msgid "End of period" -msgstr "" +msgstr "Jakson loppu" #. module: account #: view:account.move:0 #: model:ir.model,name:account.model_account_move msgid "Account Entry" -msgstr "" +msgstr "Tilimerkintä" #. module: account #: rml:account.general.journal:0 #: model:ir.actions.report.xml,name:account.account_general_journal msgid "General Journal" -msgstr "Yleinen loki" +msgstr "Yleinen päiväkirja" #. module: account #: field:account.account,balance:0 @@ -5498,7 +5528,7 @@ msgstr "Yleinen loki" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Balance" -msgstr "" +msgstr "Saldo" #. module: account #: rml:account.invoice:0 @@ -5514,17 +5544,17 @@ msgstr "Laskuta vero" #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form #: model:ir.ui.menu,name:account.account_def_analytic_journal msgid "Analytic Journal Definition" -msgstr "Analyyttisen lokin määritys" +msgstr "Analyyttisen päiväkirjan määritys" #. module: account #: model:ir.model,name:account.model_account_tax_template msgid "account.tax.template" -msgstr "" +msgstr "account.tax.template" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 msgid "Bank Accounts" -msgstr "" +msgstr "Pankkitilit" #. module: account #: constraint:account.period:0 @@ -5532,13 +5562,13 @@ msgid "" "Invalid period ! Some periods overlap or the date period is not in the scope " "of the fiscal year. " msgstr "" -"Virheellinen jakso ! Jotkin jaksot ovat päällekkäisiä tai jakson päivämäärä " -"ei ole tilikauden käsittävällä laajuudella. " +"Jakso on virheellinen! Jotkin jaksot ovat päällekkäisiä tai jakson " +"päivämäärä ei ole tilikaudella. " #. module: account #: help:account.journal,invoice_sequence_id:0 msgid "The sequence used for invoice numbers in this journal." -msgstr "" +msgstr "Sarja jota käytetään laskujen numeroihin tässä päiväkirjassa." #. module: account #: view:account.account:0 @@ -5547,7 +5577,7 @@ msgstr "" #: view:account.move:0 #: view:account.move.line:0 msgid "General Information" -msgstr "" +msgstr "Yleistiedot" #. module: account #: help:populate_statement_from_inv,init,journal_id:0 @@ -5556,21 +5586,23 @@ msgid "" "filtering the invoices. If you left this field empty, it will search on all " "sale, purchase and cash journals." msgstr "" +"Tällä kentällä voidaan valita päiväkirja josta laskuja etsitään. Jos tämä on " +"tyhjä, etsitään kaikista myynti-, osto- ja kassapäiväkirjoista." #. module: account #: constraint:account.fiscalyear:0 msgid "Error ! The duration of the Fiscal Year is invalid. " -msgstr "Virhe ! Tilikauden kesto on epäkelpo. " +msgstr "Virhe! Tilikauden pituus on virheellinen. " #. module: account #: selection:account.analytic.account,state:0 msgid "Close" -msgstr "" +msgstr "Sulje" #. module: account #: field:account.bank.statement.line,move_ids:0 msgid "Moves" -msgstr "" +msgstr "Siirrot" #. module: account #: selection:account.invoice,state:0 @@ -5587,7 +5619,7 @@ msgstr "Tililistaus" #: view:product.product:0 #: view:product.template:0 msgid "Sales Properties" -msgstr "" +msgstr "Myynnin ominaisuudet" #. module: account #: rml:account.general.journal:0 @@ -5603,7 +5635,7 @@ msgstr "Kustannustilikirja (Vain määrät)" #. module: account #: wizard_view:account.move.validate,init:0 msgid "Validate Account Entries" -msgstr "" +msgstr "Hyväksy tilimerkinnät" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 @@ -5619,12 +5651,12 @@ msgstr "Kaikkiaan myöhässä:" #: wizard_field:account.analytic.account.chart,init,to_date:0 #: wizard_field:account.analytic.line,init,to_date:0 msgid "To" -msgstr "" +msgstr "päättyen" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form msgid "Entries of Open Analytic Journals" -msgstr "" +msgstr "Avoimien analyyttisten päiväkirjojen merkinnät" #. module: account #: view:account.invoice.tax:0 @@ -5634,12 +5666,12 @@ msgstr "Laskuta verot manuaalisesti" #. module: account #: field:account.model.line,date:0 msgid "Current Date" -msgstr "" +msgstr "Nykyinen päivämäärä" #. module: account #: selection:account.move,type:0 msgid "Journal Sale" -msgstr "Myynnin loki" +msgstr "Päiväkirja myynti" #. module: account #: wizard_field:account.fiscalyear.close,init,fy_id:0 @@ -5657,12 +5689,12 @@ msgstr "Suljettava tilikausi" #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0 #: wizard_field:account.automatic.reconcile,init,date1:0 msgid "Start of period" -msgstr "" +msgstr "Jakson alku" #. module: account #: model:ir.ui.menu,name:account.account_template_folder msgid "Templates" -msgstr "" +msgstr "Mallit" #. module: account #: wizard_button:account.vat.declaration,init,report:0 @@ -5688,7 +5720,7 @@ msgstr "IntraCom" #: field:account.tax.code,info:0 #: field:account.tax.code.template,info:0 msgid "Description" -msgstr "" +msgstr "Kuvaus" #. module: account #: help:product.template,property_account_income:0 @@ -5702,7 +5734,7 @@ msgstr "" #. module: account #: field:account.tax,child_ids:0 msgid "Child Tax Accounts" -msgstr "" +msgstr "Alemmat verotilit" #. module: account #: field:account.account,parent_right:0 @@ -5729,7 +5761,8 @@ msgstr "Tilikonfigurointi" msgid "" "This account will be used instead of the default one as the payable account " "for the current partner" -msgstr "Tätä tiliä käytetään oletuksen sijaan kumppanin maksutilinä" +msgstr "" +"Tätä tiliä käytetään oletustilin sijasta tämän kumppanin maksettaville." #. module: account #: field:account.tax.code,code:0 @@ -5788,17 +5821,17 @@ msgstr "Kirjanpidon ominaisuudet" #. module: account #: model:ir.model,name:account.model_account_sequence_fiscalyear msgid "account.sequence.fiscalyear" -msgstr "" +msgstr "account.sequence.fiscalyear" #. module: account #: wizard_field:account.print.journal.report,init,sort_selection:0 msgid "Entries Sorted By" -msgstr "" +msgstr "Merkintöjen järjestelyn peruste" #. module: account #: rml:account.journal.period.print:0 msgid "Print Journal -" -msgstr "Tulosta loki -" +msgstr "Tulosta päiväkirja -" #. module: account #: field:account.bank.accounts.wizard,bank_account_id:0 @@ -5839,7 +5872,7 @@ msgstr "Erääntyneet" #: field:fiscalyear.seq,fiscalyear_id:0 #: model:ir.model,name:account.model_account_fiscalyear msgid "Fiscal Year" -msgstr "Tilivuosi" +msgstr "Tilikausi" #. module: account #: selection:account.aged.trial.balance,init,direction_selection:0 @@ -5853,7 +5886,7 @@ msgstr "Tulevat" #: help:account.partner.balance.report,init,fiscalyear:0 #: help:account.third_party_ledger.report,init,fiscalyear:0 msgid "Keep empty for all open fiscal year" -msgstr "Pidä tyhjänä avoimien tilivuosien aikana" +msgstr "Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia" #. module: account #: rml:account.invoice:0 @@ -5865,12 +5898,12 @@ msgstr "Toimittajan hyvitys" #: model:process.transition,note:account.process_transition_entriesreconcile0 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 msgid "Reconcile Entries." -msgstr "" +msgstr "Suorita merkinnät." #. module: account #: field:account.subscription.line,move_id:0 msgid "Entry" -msgstr "" +msgstr "Merkintä" #. module: account #: model:process.node,note:account.process_node_paidinvoice0 @@ -5878,7 +5911,7 @@ msgstr "" #: model:process.transition,note:account.process_transition_reconcilepaid0 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0 msgid "Paid invoice when reconciled." -msgstr "Maksettu lasku soviteltaessa." +msgstr "Lasku maksettu kun suoritukset on tehty." #. module: account #: field:account.tax,python_compute_inv:0 @@ -5889,7 +5922,7 @@ msgstr "Python -koodi (vastakohta)" #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information msgid "Accounting and financial management" -msgstr "Kirjanpidon -ja taloudenhallinta" +msgstr "Kirjanpidon- ja taloudenhallinta" #. module: account #: view:account.fiscal.position.template:0 @@ -5938,7 +5971,7 @@ msgstr "Tilikoodi" #. module: account #: help:account.config.wizard,name:0 msgid "Name of the fiscal year as displayed on screens." -msgstr "Tilivuoden nimi (näkymä ruudulla)" +msgstr "Tilikauden nimi siten kun se näytetään ruudulla." #. module: account #: field:account.invoice,payment_term:0 @@ -5955,7 +5988,7 @@ msgstr "Maksuehto" #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form msgid "Fiscal Positions" -msgstr "" +msgstr "Talouskannat" #. module: account #: model:process.process,name:account.process_process_statementprocess0 @@ -5965,7 +5998,7 @@ msgstr "Tilioteprosessi" #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile msgid "Statement reconcile" -msgstr "Tiliote sovittelu" +msgstr "Tiliotteen suoritukset" #. module: account #: wizard_field:account.fiscalyear.close,init,sure:0 @@ -6004,11 +6037,13 @@ msgstr "Kyllä" msgid "" "Check this if the user is allowed to reconcile entries in this account." msgstr "" +"Valitse tämä jos käyttäjän on sallittua tehdä suoritusmerkintöjä tässä " +"tilissä." #. module: account #: wizard_button:account.subscription.generate,init,generate:0 msgid "Compute Entry Dates" -msgstr "Lasketut merkintäpäivät" +msgstr "Laske merkintäpäivät" #, python-format #~ msgid "No period found !" @@ -6021,23 +6056,6 @@ msgstr "Lasketut merkintäpäivät" #~ msgid "You must first select a partner !" #~ msgstr "Sinun täytyy ensiksi valita yhteistyökumppani!" -#~ msgid "" -#~ "Would your payment have been carried out after this mail was sent, please " -#~ "consider the present one as void. Do not hesitate to contact our accounting " -#~ "departement at +32 81 81 37 00." -#~ msgstr "" -#~ "Oliko maksusi suoritettu kun tämä sähköposti lähetettiin, ota huomioon " -#~ "nykyinen mitätöidyksi. Älä epäröi ottaa yhteyttä kirjanpito-osastoon +32 81 " -#~ "81 37 00" - -#, python-format -#~ msgid "" -#~ "You can not do this modification on a reconciled entry ! Please note that " -#~ "you can just change some non important fields !" -#~ msgstr "" -#~ "Et voi tehdä tätä muokkausta sovitetulle merkinnälle! Huomioi että voit " -#~ "muuttaa vain joitain ei tärkeitä kenttiä!" - #, python-format #~ msgid "No Data Available" #~ msgstr "Ei tietoa saatavilla" @@ -6049,14 +6067,6 @@ msgstr "Lasketut merkintäpäivät" #~ msgid "No Partner Defined !" #~ msgstr "Ei kumppania määriteltynä!" -#, python-format -#~ msgid "" -#~ "You can not do this modification on a confirmed entry ! Please note that you " -#~ "can just change some non important fields !" -#~ msgstr "" -#~ "Et voi muokata tätä hyväksyttyä merkintää! Ota huomioon että voit muuttaa " -#~ "ainoastaan ei tärkeitä kenttiä" - #, python-format #~ msgid "Cannot delete invoice(s) that are already opened or paid !" #~ msgstr "Laskua(laskuja) jotka ovat avatuja tai maksettuja ei voida poistaa" @@ -6072,18 +6082,6 @@ msgstr "Lasketut merkintäpäivät" #~ msgid "Configration Error !" #~ msgstr "Asetusvirhe" -#, python-format -#~ msgid "Some entries are already reconciled !" -#~ msgstr "Jotkut merkinnät ovat jo soviteltuja" - -#, python-format -#~ msgid "No Analytic Journal !" -#~ msgstr "Ei analyyttinen loki" - -#, python-format -#~ msgid "Already Reconciled" -#~ msgstr "Jo soviteltu" - #, python-format #~ msgid "Unable to change tax !" #~ msgstr "Veroa ei voida muuttaa!" @@ -6092,10 +6090,6 @@ msgstr "Lasketut merkintäpäivät" #~ msgid "No records found for your selection!" #~ msgstr "Tietoja ei löydy valinnalle" -#, python-format -#~ msgid "Unable to reconcile entry \"%s\": %.2f" -#~ msgstr "Merkintöä \"%s\": %.2f ei voida sovittaa" - #~ msgid "Move name" #~ msgstr "Siirrä nimi" @@ -6103,22 +6097,6 @@ msgstr "Lasketut merkintäpäivät" #~ msgid "Date to must be set between %s and %s" #~ msgstr "Päiväys täytyy asettaa välille %s ja %s" -#, python-format -#~ msgid "Sales Journal" -#~ msgstr "Myyntiloki" - -#, python-format -#~ msgid "You can not modify/delete a journal with entries for this period !" -#~ msgstr "Et voi muokata/poistaa lokikirjaa jossa merkintöjä tälle kaudelle" - -#, python-format -#~ msgid "Invoice is already reconciled" -#~ msgstr "Lasku on jo sovitettu" - -#, python-format -#~ msgid "The account is not defined to be reconcile !" -#~ msgstr "Tiliä ei ole määritelty sovitelluksi" - #, python-format #~ msgid "Entries: " #~ msgstr "Merkinnät: " diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index 0311398420b..71f612e0329 100644 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -34,7 +34,8 @@ import general_ledger_landscape import account_tax_code import account_balance_landscape import compare_account_balance - +import account_invoice_report +import account_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py new file mode 100644 index 00000000000..0d4ac30323d --- /dev/null +++ b/addons/account/report/account_invoice_report.py @@ -0,0 +1,90 @@ +# -*- 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 . +# +############################################################################## + +import tools +from osv import fields,osv + +class account_invoice_report(osv.osv): + _name = "account.invoice.report" + _description = "Invoices Statistics" + _auto = False + _rec_name = 'date' + _columns = { + 'date': fields.date('Date', readonly=True), + 'year': fields.char('Year', size=4, readonly=True), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), + ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), + 'product_id':fields.many2one('product.product', 'Product', readonly=True), + 'product_qty':fields.float('Qty', readonly=True), + 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), + 'company_id':fields.many2one('res.company', 'Company', readonly=True), + 'user_id':fields.many2one('res.users', 'Salesman', readonly=True), + 'price_total':fields.float('Total Price', readonly=True), + 'price_average':fields.float('Average Price', readonly=True), + 'nbr':fields.integer('# of Lines', readonly=True), + 'type': fields.selection([ + ('out_invoice','Customer Invoice'), + ('in_invoice','Supplier Invoice'), + ('out_refund','Customer Refund'), + ('in_refund','Supplier Refund'), + ],'Type', readonly=True), + 'state': fields.selection([ + ('draft','Draft'), + ('proforma','Pro-forma'), + ('proforma2','Pro-forma'), + ('open','Open'), + ('paid','Done'), + ('cancel','Cancelled') + ], 'Order State', readonly=True), + } + _order = 'date desc' + def init(self, cr): + tools.drop_view_if_exists(cr, 'account_invoice_report') + cr.execute(""" + create or replace view account_invoice_report as ( + select + min(l.id) as id, + s.date_invoice as date, + to_char(s.date_invoice, 'YYYY') as year, + to_char(s.date_invoice, 'MM') as month, + l.product_id as product_id, + sum(l.quantity * u.factor) as product_qty, + s.partner_id as partner_id, + s.user_id as user_id, + s.company_id as company_id, + sum(l.quantity*l.price_unit) as price_total, + (sum(l.quantity*l.price_unit)/sum(l.quantity * u.factor))::decimal(16,2) as price_average, + count(*) as nbr, + s.type as type, + s.state + from + account_invoice_line l + left join + account_invoice s on (s.id=l.invoice_id) + left join product_uom u on (u.id=l.uos_id) + group by + s.type,s.date_invoice, s.partner_id, l.product_id, + l.uos_id, s.user_id, s.state, + s.company_id + ) + """) +account_invoice_report() diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml new file mode 100644 index 00000000000..de046de6211 --- /dev/null +++ b/addons/account/report/account_invoice_report_view.xml @@ -0,0 +1,113 @@ + + + + + account.invoice.report.tree + account.invoice.report + tree + + + + + + + + + + + + + + + + + + + + + + account.invoice.report.graph + account.invoice.report + graph + + + + + + + + + + account.invoice.report.search + account.invoice.report + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invoices + account.invoice.report + form + tree,graph + + + + + + + diff --git a/addons/report_account/report_receivable.py b/addons/account/report/account_report.py similarity index 100% rename from addons/report_account/report_receivable.py rename to addons/account/report/account_report.py diff --git a/addons/report_account/report_receivable_view.xml b/addons/account/report/account_report_view.xml similarity index 100% rename from addons/report_account/report_receivable_view.xml rename to addons/account/report/account_report_view.xml diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 271a4efe0ab..656e05e2a9b 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -88,3 +88,10 @@ "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0 "access_account_installer","account.installer","model_account_installer","base.group_user",1,0,0,0 +"access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,0,0,0 +"access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0 +"access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0 +"access_report_invoice_created","report.invoice.created","model_report_invoice_created","account.group_account_manager",1,0,0,0 +"access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0 +"access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0 +"access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0 diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po new file mode 100644 index 00000000000..e05851e42f0 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/hi.po @@ -0,0 +1,64 @@ +# Hindi translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-03-16 23:00+0000\n" +"Last-Translator: Neetesh Biswas \n" +"Language-Team: Hindi \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-18 04:35+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "संरचना देखने के लिए अमान्य XML!" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" diff --git a/addons/account_balance/i18n/pt_BR.po b/addons/account_balance/i18n/pt_BR.po index 39d22acf820..ed13516eb17 100644 --- a/addons/account_balance/i18n/pt_BR.po +++ b/addons/account_balance/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:49+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-03-18 02:19+0000\n" +"Last-Translator: Zergar \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 04:53+0000\n" +"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_balance @@ -24,56 +24,56 @@ msgstr "" #. module: account_balance #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "All accounts" -msgstr "" +msgstr "Todas as Contas" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,period_manner:0 msgid "Entries Selection Based on" -msgstr "" +msgstr "Seleção de entradas baseada em" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "Notification" -msgstr "" +msgstr "Notificação" #. module: account_balance #: selection:account.balance.account.balance.report,init,period_manner:0 msgid "Financial Period" -msgstr "" +msgstr "Período Financeiro" #. module: account_balance #: model:ir.actions.report.xml,name:account_balance.account_account_balance #: model:ir.actions.report.xml,name:account_balance.account_account_balance_landscape msgid "Account balance" -msgstr "" +msgstr "Saldo da Conta" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Account Name" -msgstr "" +msgstr "Nome da Conta" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Debit" -msgstr "" +msgstr "Débito" #. module: account_balance #: wizard_button:account.balance.account.balance.report,init,checkyear:0 msgid "Print" -msgstr "" +msgstr "Impressão" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period(s)" -msgstr "" +msgstr "Selecione o(s) Período(s)" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Percentage" -msgstr "" +msgstr "Porcentagem" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0 @@ -83,17 +83,17 @@ msgstr "" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Fiscal Year(s)(Maximum Three Years)" -msgstr "" +msgstr "Selecione Ano(s) Fiscal(is) (máximo três anos)" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,select_account:0 msgid "Select Reference Account(for % comparision)" -msgstr "" +msgstr "Selecione conta de referência (para comparação %)" #. module: account_balance #: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report msgid "Account balance-Compare Years" -msgstr "" +msgstr "Conta Saldo Comparar Anos" #. module: account_balance #: model:ir.module.module,description:account_balance.module_meta_information @@ -125,70 +125,70 @@ msgstr "" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,landscape:0 msgid "Show Report in Landscape Form" -msgstr "" +msgstr "Mostrar relatório em formato de paisagem" #. module: account_balance #: help:account.balance.account.balance.report,init,periods:0 msgid "All periods if empty" -msgstr "" +msgstr "Todos os períodos se vazio" #. module: account_balance #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "With balance is not equal to 0" -msgstr "" +msgstr "Com saldo diferente de zero" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Total :" -msgstr "" +msgstr "Total :" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Account Balance -" -msgstr "" +msgstr "Saldo da conta -" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,format_perc:0 msgid "Show Comparision in %" -msgstr "" +msgstr "Mostrar comparação em %" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period" -msgstr "" +msgstr "Selecione o Período" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Report Options" -msgstr "" +msgstr "Opções de Relatório" #. module: account_balance #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "With movements" -msgstr "" +msgstr "Com movimentos" #. module: account_balance #: wizard_button:account.balance.account.balance.report,backtoinit,end:0 #: wizard_button:account.balance.account.balance.report,zero_years,end:0 msgid "Ok" -msgstr "" +msgstr "Ok" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Cash" -msgstr "" +msgstr "Dinheiro" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Don't Compare" -msgstr "" +msgstr "Não Comparar" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,account_choice:0 msgid "Show Accounts" -msgstr "" +msgstr "Mostrar Contas" #. module: account_balance #: rml:account.account.balance.landscape:0 diff --git a/addons/account_tax_include/i18n/fi.po b/addons/account_tax_include/i18n/fi.po new file mode 100644 index 00000000000..0b9ec7dbf7d --- /dev/null +++ b/addons/account_tax_include/i18n/fi.po @@ -0,0 +1,53 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-03-17 10:06+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_tax_include +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Virheellinen XML näkymä-arkkitehtuurille!" + +#. module: account_tax_include +#: field:account.invoice,price_type:0 +msgid "Price method" +msgstr "Hinnan tyyppi" + +#. module: account_tax_include +#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information +msgid "Invoices and prices with taxes included" +msgstr "Laskut ja hinnat veroilla" + +#. module: account_tax_include +#: selection:account.invoice,price_type:0 +msgid "Tax included" +msgstr "Vero sisältyy" + +#. module: account_tax_include +#: selection:account.invoice,price_type:0 +msgid "Tax excluded" +msgstr "Ilman veroa" + +#. module: account_tax_include +#: view:account.tax:0 +msgid "Compute Code for Taxes included prices" +msgstr "Laske koodi hinnoille joissa on vero mukana" + +#. module: account_tax_include +#: field:account.invoice.line,price_subtotal_incl:0 +msgid "Subtotal" +msgstr "Välisumma" diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 4d0f85376f3..62ffc7c39d8 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -325,26 +325,17 @@ class calendar_attendee(osv.osv): result[id][name] = ', '.join(fromdata) if name == 'event_date': if attdata.ref: - model, res_id = tuple(attdata.ref.split(',')) - model_obj = self.pool.get(model) - obj = model_obj.read(cr, uid, res_id, ['date'])[0] - result[id][name] = obj.get('date') + result[id][name] = attdata.ref.date else: result[id][name] = False if name == 'event_end_date': if attdata.ref: - model, res_id = tuple(attdata.ref.split(',')) - model_obj = self.pool.get(model) - obj = model_obj.read(cr, uid, res_id, ['date_deadline'])[0] - result[id][name] = obj.get('date_deadline') + result[id][name] = attdata.ref.date_deadline else: result[id][name] = False if name == 'sent_by_uid': if attdata.ref: - model, res_id = tuple(attdata.ref.split(',')) - model_obj = self.pool.get(model) - obj = model_obj.read(cr, uid, res_id, ['user_id'])[0] - result[id][name] = obj.get('user_id') + result[id][name] = (attdata.ref.user_id.id,attdata.ref.user_id.name) else: result[id][name] = uid if name == 'language': @@ -441,8 +432,7 @@ request was delegated to"), for att in self.browse(cr, uid, ids, context=context): sign = att.sent_by_uid and att.sent_by_uid.signature or '' sign = '
'.join(sign and sign.split('\n') or []) - model, res_id = tuple(att.ref.split(',')) - res_obj = self.pool.get(model).browse(cr, uid, res_id) + res_obj = att.ref if res_obj and len(res_obj): res_obj = res_obj[0] sub = '[%s Invitation][%d] %s' % (company, att.id, res_obj.name) @@ -490,9 +480,7 @@ request was delegated to"), if user: ref = vals.get('ref', None) if ref: - model, event = ref.split(',') - model_obj = self.pool.get(model) - event_ref = model_obj.browse(cr, uid, event, context=context)[0] + event_ref = ref if event_ref.user_id.id != user[0]: defaults = {'user_id': user[0]} new_event = model_obj.copy(cr, uid, event, default=defaults, context=context) diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index d6430ca98a2..f1e59583cc1 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -159,8 +159,8 @@ - + diff --git a/addons/base_module_quality/i18n/zh_CN.po b/addons/base_module_quality/i18n/zh_CN.po index a968421924a..5df4212e113 100644 --- a/addons/base_module_quality/i18n/zh_CN.po +++ b/addons/base_module_quality/i18n/zh_CN.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-01 15:33+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2010-03-17 14:08+0000\n" +"Last-Translator: 英华 \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 05:04+0000\n" +"X-Launchpad-Export-Date: 2010-03-18 04:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality @@ -86,7 +86,7 @@ msgstr "已跳过" msgid "" "The test will be completed only if the module is installed or if the test " "may be processed on uninstalled module." -msgstr "" +msgstr "只有模块已经安装或测试能在已卸载的模块上运行的情况下测试才能完成。" #. module: base_module_quality #: constraint:ir.ui.view:0 @@ -132,7 +132,7 @@ msgstr "概要" #. module: base_module_quality #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save msgid "Report Save" -msgstr "" +msgstr "保存报告" #. module: base_module_quality #: wizard_view:quality_detail_save,init:0 diff --git a/addons/base_report_creator/i18n/hr.po b/addons/base_report_creator/i18n/hr.po index abef2835b05..2bf87d25ef5 100644 --- a/addons/base_report_creator/i18n/hr.po +++ b/addons/base_report_creator/i18n/hr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-18 06:19+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-03-16 14:28+0000\n" +"Last-Translator: goranc \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 05:00+0000\n" +"X-Launchpad-Export-Date: 2010-03-18 04:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator @@ -23,6 +23,8 @@ msgid "" "records.\n" " e.g. res_partner.id=3" msgstr "" +"Unesite izraz za polje po kojem želite filtrirati zapise.\n" +"npr. res_partner.id=3" #. module: base_report_creator #: field:base_report_creator.report,view_graph_type:0 @@ -47,7 +49,7 @@ msgstr "Grafički" #. module: base_report_creator #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Pogrešno ime modela u definiciji akcije." #. module: base_report_creator #: view:base_report_creator.report:0 @@ -158,7 +160,7 @@ msgstr "Kreiraj izbornik izvještaja" #: selection:base_report_creator.report,view_type2:0 #: selection:base_report_creator.report,view_type3:0 msgid "Form" -msgstr "" +msgstr "Ekran" #. module: base_report_creator #: selection:base_report_creator.report,view_type3:0 @@ -335,7 +337,7 @@ msgstr "Potvrdi filter" #. module: base_report_creator #: field:base_report_creator.report.filter,name:0 msgid "Filter Name" -msgstr "" +msgstr "Filter" #. module: base_report_creator #: model:ir.actions.wizard,name:base_report_creator.wizard_report_open diff --git a/addons/board_account/i18n/sv.po b/addons/board_account/i18n/sv.po index 978c89a0a0c..a59773f2d7e 100644 --- a/addons/board_account/i18n/sv.po +++ b/addons/board_account/i18n/sv.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 06:25+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2010-03-16 08:14+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 05:01+0000\n" +"X-Launchpad-Export-Date: 2010-03-18 04:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_account #: view:board.board:0 msgid "Analytic accounts to close" -msgstr "" +msgstr "Objektkonton att stänga" #. module: board_account #: view:board.board:0 diff --git a/addons/board_manufacturing/__terp__.py b/addons/board_manufacturing/__terp__.py index 9c644262969..50afa0d6cbc 100644 --- a/addons/board_manufacturing/__terp__.py +++ b/addons/board_manufacturing/__terp__.py @@ -32,7 +32,7 @@ * List of procurement in exception """, 'author': 'Tiny', - 'depends': ['board', 'mrp', 'stock', 'report_mrp'], + 'depends': ['board', 'mrp', 'stock' ], 'update_xml': ['board_manufacturing_view.xml'], 'demo_xml': ['board_manufacturing_demo.xml'], 'installable': True, diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml index 7e913209c4a..df4a6805afb 100644 --- a/addons/board_manufacturing/board_manufacturing_view.xml +++ b/addons/board_manufacturing/board_manufacturing_view.xml @@ -20,9 +20,9 @@ - + - + diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py index 994f11f3212..72222a00668 100644 --- a/addons/crm/__terp__.py +++ b/addons/crm/__terp__.py @@ -41,73 +41,74 @@ appropriate staff, and making sure all future correspondence gets to the right place. The CRM module has a email gateway for the synchronisation interface -between mails and Open ERP.""", - 'author': 'Tiny', - 'website': 'http://www.openerp.com', - 'depends': ['base', 'base_action_rule', - 'process', - 'mail_gateway', +between mails and Open ERP.""", + 'author': 'Tiny', + 'website': 'http://www.openerp.com', + 'depends': ['base', 'base_action_rule', + 'process', + 'mail_gateway', 'base_calendar', - ], - 'init_xml': ['crm_data.xml', - 'crm_meeting_data.xml', - 'crm_claims_data.xml', - 'crm_fund_data.xml', - 'crm_helpdesk_data.xml', - 'crm_lead_data.xml', - 'crm_meeting_data.xml', - 'crm_opportunity_data.xml', - 'crm_phonecall_data.xml', - ], + ], + 'init_xml': ['crm_data.xml', + 'crm_meeting_data.xml', + 'crm_claims_data.xml', + 'crm_fund_data.xml', + 'crm_helpdesk_data.xml', + 'crm_lead_data.xml', + 'crm_meeting_data.xml', + 'crm_opportunity_data.xml', + 'crm_phonecall_data.xml', + ], 'update_xml': [ - 'crm_wizard.xml', - 'crm_view.xml', - 'crm_action_rule_view.xml', - 'crm_lead_wizard.xml', - 'crm_lead_view.xml', - 'crm_lead_menu.xml', - 'crm_meeting_wizard.xml', - 'crm_meeting_view.xml', - 'crm_meeting_menu.xml', - 'crm_phonecall_wizard.xml', - 'crm_phonecall_view.xml', - 'crm_phonecall_menu.xml', - 'crm_opportunity_wizard.xml', - 'crm_opportunity_view.xml', - 'crm_opportunity_menu.xml', - 'crm_fund_view.xml', - 'crm_fund_menu.xml', - 'crm_claims_view.xml', - 'crm_claims_menu.xml', + 'crm_wizard.xml', + 'crm_view.xml', + 'crm_action_rule_view.xml', + 'crm_lead_wizard.xml', + 'crm_lead_view.xml', + 'crm_lead_menu.xml', + 'crm_meeting_wizard.xml', + 'crm_meeting_view.xml', + 'crm_meeting_menu.xml', + 'crm_phonecall_wizard.xml', + 'crm_phonecall_view.xml', + 'crm_phonecall_menu.xml', + 'crm_opportunity_wizard.xml', + 'crm_opportunity_view.xml', + 'crm_opportunity_menu.xml', + 'crm_fund_view.xml', + 'crm_fund_menu.xml', + 'crm_claims_view.xml', + 'crm_claims_menu.xml', 'crm_helpdesk_view.xml', - 'crm_helpdesk_menu.xml', - - 'security/crm_security.xml', - 'security/ir.model.access.csv', + 'crm_helpdesk_menu.xml', + + 'security/crm_security.xml', + 'security/ir.model.access.csv', 'report/crm_report_view.xml', 'report/crm_claim_report_view.xml', 'report/crm_lead_report_view.xml', 'report/crm_fundraising_report_view.xml', - 'report/crm_opportunity_report_view.xml' , + 'report/crm_opportunity_report_view.xml' , 'report/crm_phonecall_report_view.xml', - + 'report/crm_helpdesk_report_view.xml', + 'process/crm_configuration_process.xml', - + ], 'demo_xml': [ - 'crm_demo.xml', - 'crm_claims_demo.xml', - 'crm_fund_demo.xml', - 'crm_helpdesk_demo.xml', - 'crm_lead_demo.xml', - 'crm_meeting_demo.xml', - 'crm_opportunity_demo.xml', - 'crm_phonecall_demo.xml'], - 'installable': True, - 'active': False, - 'certificate': '0079056041421', + 'crm_demo.xml', + 'crm_claims_demo.xml', + 'crm_fund_demo.xml', + 'crm_helpdesk_demo.xml', + 'crm_lead_demo.xml', + 'crm_meeting_demo.xml', + 'crm_opportunity_demo.xml', + 'crm_phonecall_demo.xml'], + 'installable': True, + 'active': False, + 'certificate': '0079056041421', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 282584b8c6f..ebaa437ff41 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -156,6 +156,7 @@ class crm_case_stage(osv.osv): 'object_id': fields.many2one('ir.model','Object Name'), 'probability': fields.float('Probability (%)', required=True), 'on_change': fields.boolean('Change Probability Automatically',help="Change Probability on next and previous stages."), + 'requirements': fields.text('Requirements') } def _find_object_id(self, cr, uid, context=None): object_id = context and context.get('object_id', False) or False @@ -356,7 +357,7 @@ class crm_case(osv.osv): 'section_id': case.section_id.id } obj = self.pool.get('crm.case.log') - if history and case.description: + if history: obj = self.pool.get('crm.case.history') data['description'] = details or case.description data['email'] = email or \ diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml index 5a4c6a3f6ad..f51f6890d0c 100644 --- a/addons/crm/crm_claims_view.xml +++ b/addons/crm/crm_claims_view.xml @@ -45,7 +45,7 @@ crm.claim tree - + diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml index 75aae19a4af..a78d5e3eeb6 100644 --- a/addons/crm/crm_fund_view.xml +++ b/addons/crm/crm_fund_view.xml @@ -202,24 +202,24 @@ - - - - - + default="1" domain="[('user_id','=',uid)]" + separator="1" + help="Funds Related to Current User" + /> + + + + + - + - - + + /> diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml index 68a47fef9f8..ec662885a04 100644 --- a/addons/crm/crm_helpdesk_view.xml +++ b/addons/crm/crm_helpdesk_view.xml @@ -122,7 +122,8 @@ crm.helpdesk tree - + diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index ce818fa0189..de0f1f01c33 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -74,17 +74,14 @@ class calendar_attendee(osv.osv): result[id] = {} if name == 'categ_id': if attdata.ref: - model, res_id = tuple(attdata.ref.split(',')) - model_obj = self.pool.get(model) - obj = model_obj.read(cr, uid, res_id, ['categ_id'])[0] - result[id][name] = obj.get('categ_id') + result[id][name] = (attdata.ref.categ_id.id,attdata.ref.categ_id.name,) else: result[id][name] = False return result _columns = { 'categ_id': fields.function(_compute_data, method=True, \ string='Event Type', type="many2one", \ - relation="crm.case.categ", multi='categ_id'), + relation="crm.case.categ", multi='categ_id'), } calendar_attendee() diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index 4bf7a0b858d..4ce8c647c13 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -215,24 +215,24 @@ /> + - - - - + + + diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 7ac6e119c27..908cdd6fa91 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -71,13 +71,15 @@ form
+ - + + @@ -632,7 +634,7 @@ - + diff --git a/addons/crm/report/__init__.py b/addons/crm/report/__init__.py index c93c51dd742..7030c43cfe2 100644 --- a/addons/crm/report/__init__.py +++ b/addons/crm/report/__init__.py @@ -26,6 +26,7 @@ import crm_lead_report import crm_phonecall_report import crm_fundraising_report import crm_opportunity_report +import crm_helpdesk_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/report/crm_helpdesk_report.py b/addons/crm/report/crm_helpdesk_report.py new file mode 100644 index 00000000000..7a855378d19 --- /dev/null +++ b/addons/crm/report/crm_helpdesk_report.py @@ -0,0 +1,63 @@ +# -*- 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 . +# +############################################################################## +from osv import fields,osv +import tools + +class crm_helpdesk_report(osv.osv): + _name = "crm.helpdesk.report" + _description = "Helpdesk report after Sales Services" + _auto = False + _inherit = "crm.case.report" + _columns = { + 'delay_close': fields.char('Delay to close', size=20, readonly=True), + 'partner_id': fields.many2one('res.partner', 'Partner' ,readonly=True), + 'company_id': fields.many2one('res.company','Company',readonly=True), + 'date_deadline': fields.date('Deadline'), + 'priority': fields.selection([('5','Lowest'),('4','Low'),('3','Normal'),('2','High'),('1','Highest')], 'Priority'), + } + + def init(self, cr): + tools.drop_view_if_exists(cr, 'crm_helpdesk_report') + cr.execute(""" + create or replace view crm_helpdesk_report as ( + select + min(c.id) as id, + to_char(c.create_date, 'YYYY') as name, + to_char(c.create_date, 'MM') as month, + c.state, + c.user_id, + c.section_id, + c.partner_id, + c.company_id, + c.priority, + c.date_deadline, + count(*) as nbr, + 0 as avg_answers, + 0.0 as perc_done, + 0.0 as perc_cancel, + to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close + from + crm_helpdesk c + group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), c.state, c.user_id,c.section_id,c.priority, c.partner_id,c.company_id,c.date_deadline + )""") +crm_helpdesk_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/report/crm_helpdesk_report_view.xml b/addons/crm/report/crm_helpdesk_report_view.xml new file mode 100644 index 00000000000..06a69333bd7 --- /dev/null +++ b/addons/crm/report/crm_helpdesk_report_view.xml @@ -0,0 +1,148 @@ + + + + + + + crm.helpdesk.report.tree + crm.helpdesk.report + tree + + + + + + + + + + + + + + + + + + crm.helpdesk.report.form + crm.helpdesk.report + + form + + + + + + + + + + + + crm.helpdesk.report.graph + crm.helpdesk.report + graph + + + + + + + + + + + crm.helpdesk.report.select + crm.helpdesk.report + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Helpdesk + crm.helpdesk.report + form + tree,graph + + + + + + + tree + + + + + + + graph + + + + + + + + + diff --git a/addons/crm/report/crm_report_view.xml b/addons/crm/report/crm_report_view.xml index 7427fe64588..aa5eadde787 100644 --- a/addons/crm/report/crm_report_view.xml +++ b/addons/crm/report/crm_report_view.xml @@ -1,6 +1,6 @@ - + crm.case.report.tree @@ -56,11 +56,11 @@ - + - + - + + + @@ -87,12 +89,12 @@ - + - + @@ -112,7 +114,7 @@ - + @@ -162,6 +164,6 @@ [('state','=','open')] - + diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index c3888951d4c..b6c7b0e8735 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -32,4 +32,4 @@ "access_crm_phonecall_report_user","crm.phonecall.report","model_crm_phonecall_report","crm.group_crm_user",1,0,0,0 "access_crm_opportunity_report_user","crm.opportunity.report","model_crm_opportunity_report","crm.group_crm_user",1,0,0,0 "access_report_crm_case_service_dashboard","report.crm.case.service.dashboard","model_report_crm_case_service_dashboard","crm.group_crm_user",1,0,0,0 - +"access_report_crm_helpdesk","report.crm.helpdesk","model_crm_helpdesk_report","crm.group_crm_user",1,0,0,0 diff --git a/addons/crm/wizard/wizard_crm_new_send_email.py b/addons/crm/wizard/wizard_crm_new_send_email.py index b9a43546132..ef878f3249f 100644 --- a/addons/crm/wizard/wizard_crm_new_send_email.py +++ b/addons/crm/wizard/wizard_crm_new_send_email.py @@ -72,11 +72,7 @@ def _mass_mail_send(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) case_pool=pool.get(data.get('model')) - case = case_pool.browse(cr,uid,data['ids'])[0] - case_pool.write(cr, uid, [case.id], { - #'som': False, - 'canal_id': False, - }) + case = case_pool.browse(cr,uid,data['ids'])[0] emails = [data['form']['to']] + (data['form']['cc'] or '').split(',') emails = filter(None, emails) body = data['form']['text'] diff --git a/addons/document/__init__.py b/addons/document/__init__.py index 547205b1313..694989bdd79 100644 --- a/addons/document/__init__.py +++ b/addons/document/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -26,5 +26,6 @@ import document_directory import directory_content import directory_report import document +import report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py index a9d7026776b..2ffb708738c 100644 --- a/addons/document/__terp__.py +++ b/addons/document/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -24,14 +24,14 @@ 'name': 'Integrated Document Management System', 'version': '1.99', 'category': 'Generic Modules/Others', - 'description': """This is a complete document management system: + 'description': """This is a complete document management system: * User Authentication * Document Indexation - ATTENTION: - - When you install this module in a running company that have already PDF files stored into the database, - you will lose them all. - - After installing this module PDF's are not longer stored into the database, + ATTENTION: + - When you install this module in a running company that have already PDF files stored into the database, + you will lose them all. + - After installing this module PDF's are not longer stored into the database, but in the servers rootpad like /server/bin/filestore. """, 'author': 'Tiny', @@ -42,7 +42,8 @@ 'document_view.xml', 'document_data.xml', 'security/document_security.xml', - 'security/ir.model.access.csv' + 'security/ir.model.access.csv', + 'report/document_report_view.xml' ], 'demo_xml': [ 'document_demo.xml',], 'installable': True, diff --git a/addons/report_mrp/__init__.py b/addons/document/report/__init__.py similarity index 89% rename from addons/report_mrp/__init__.py rename to addons/document/report/__init__.py index cac56f5f3bf..bfdeacdaae8 100644 --- a/addons/report_mrp/__init__.py +++ b/addons/document/report/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,11 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## - -import report_mrp - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - +import document_report \ No newline at end of file diff --git a/addons/report_document/report_document.py b/addons/document/report/document_report.py similarity index 100% rename from addons/report_document/report_document.py rename to addons/document/report/document_report.py diff --git a/addons/report_document/report_document_view.xml b/addons/document/report/document_report_view.xml similarity index 100% rename from addons/report_document/report_document_view.xml rename to addons/document/report/document_report_view.xml diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv index 4993ebc049e..245bcbffeab 100644 --- a/addons/document/security/ir.model.access.csv +++ b/addons/document/security/ir.model.access.csv @@ -11,3 +11,11 @@ "access_document_storage_group_system","document.storage group system","model_document_storage","base.group_user",1,0,0,0 "access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","group_document_manager",1,1,1,1 "access_document_directory_dctx_group_system","document.directory.dctx group system","model_document_directory_dctx","base.group_system",1,1,1,1 +"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","document.group_document_manager",1,0,0,0 +"access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0 +"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","document.group_document_manager",1,0,0,0 +"access_report_files_partner_group_system","report.files.partner group system","model_report_files_partner","base.group_system",1,0,0,0 +"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","document.group_document_manager",1,0,0,0 +"access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0 +"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0 +"access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0 diff --git a/addons/event_project/i18n/hi.po b/addons/event_project/i18n/hi.po index 3b14d462bc4..4fc025eee58 100644 --- a/addons/event_project/i18n/hi.po +++ b/addons/event_project/i18n/hi.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-01-15 13:24+0000\n" -"Last-Translator: vir (Open ERP) \n" +"PO-Revision-Date: 2010-03-16 22:57+0000\n" +"Last-Translator: Neetesh Biswas \n" "Language-Team: Hindi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n" +"X-Launchpad-Export-Date: 2010-03-18 04:35+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: event_project #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "संरचना देखने के लिए अमान्य XML" #. module: event_project #: model:ir.actions.wizard,name:event_project.wizard_event_task diff --git a/addons/hr_evaluation/__init__.py b/addons/hr_evaluation/__init__.py index 7fe03d1245a..e8abcb28e1d 100644 --- a/addons/hr_evaluation/__init__.py +++ b/addons/hr_evaluation/__init__.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,11 +15,12 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## import hr_evaluation +import report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_evaluation/__terp__.py b/addons/hr_evaluation/__terp__.py index 978018a5e90..26b71c795c8 100644 --- a/addons/hr_evaluation/__terp__.py +++ b/addons/hr_evaluation/__terp__.py @@ -31,7 +31,9 @@ "demo_xml" : ["hr_evaluation_demo.xml"], "update_xml" : [ "security/ir.model.access.csv", - "hr_evaluation_view.xml"], + "hr_evaluation_view.xml", + "hr_evaluation_data.xml", + "report/hr_evaluation_report_view.xml"], "active": False, "installable": True } diff --git a/addons/report_task/__init__.py b/addons/hr_evaluation/report/__init__.py similarity index 82% rename from addons/report_task/__init__.py rename to addons/hr_evaluation/report/__init__.py index 38945a471fe..193a389c85d 100644 --- a/addons/report_task/__init__.py +++ b/addons/hr_evaluation/report/__init__.py @@ -1,8 +1,8 @@ -# -*- coding: utf-8 -*- +# -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). +# Copyright (C) 2004-2009 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 @@ -15,11 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## - -import report_task - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - +import hr_evaluation_report \ No newline at end of file diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py new file mode 100644 index 00000000000..5e27b568c4f --- /dev/null +++ b/addons/hr_evaluation/report/hr_evaluation_report.py @@ -0,0 +1,74 @@ +# -*- 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 . +# +############################################################################## + +import tools +from osv import fields,osv + + +class hr_evaluation_report(osv.osv): + _name = "hr.evaluation.report" + _description = "Evaluations Statistics" + _auto = False + _rec_name = 'date' + _columns = { + 'create_date': fields.datetime('Create Date', readonly=True), + 'deadline': fields.date("Deadline", readonly=True), + 'closed': fields.date("closed", readonly=True), + 'year': fields.char('Year', size=4, readonly=True), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), + ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), + 'employee_id': fields.many2one('hr.employee', "Employee", readonly=True), + 'nbr':fields.integer('# of Requests', readonly=True), + 'state': fields.selection([ + ('draft','Draft'), + ('wait','Plan In Progress'), + ('progress','Final Validation'), + ('done','Done'), + ('cancel','Cancelled'), + ], 'State',readonly=True), + } + _order = 'create_date desc' + def init(self, cr): + tools.drop_view_if_exists(cr, 'hr_evaluation_report') + cr.execute(""" + create or replace view hr_evaluation_report as ( + select + min(l.id) as id, + s.create_date as create_date, + s.employee_id, + s.date as deadline, + s.date_close as closed, + to_char(s.create_date, 'YYYY') as year, + to_char(s.create_date, 'MM') as month, + count(*) as nbr, + s.state + from + hr_evaluation_interview l + left join + hr_evaluation_evaluation s on (s.id=l.evaluation_id) + group by + s.create_date,s.state,s.employee_id, + s.date,s.date_close + ) + """) +hr_evaluation_report() + diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml new file mode 100644 index 00000000000..fe24b7c373f --- /dev/null +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -0,0 +1,70 @@ + + + + + hr.evaluation.report.tree + hr.evaluation.report + tree + + + + + + + + + + + + + + + + hr.evaluation.report.search + hr.evaluation.report + search + + + + + + + + + + + + + + + + + + + + + + + + Evaluations + hr.evaluation.report + form + tree + + + + + + + + diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv index c9962231e6c..3f3948c00db 100644 --- a/addons/hr_evaluation/security/ir.model.access.csv +++ b/addons/hr_evaluation/security/ir.model.access.csv @@ -1,9 +1,10 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation",hr.group_hr_user,1,0,0,0 -"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation",hr.group_hr_manager,1,1,1,1 -"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation",hr.group_hr_user,1,0,0,0 -"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan",hr.group_hr_manager,1,1,1,1 -"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase",hr.group_hr_user,1,0,0,0 -"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase",hr.group_hr_manager,1,1,1,1 -"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview",hr.group_hr_user,1,0,0,0 -"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview",hr.group_hr_manager,1,1,1,1 +"access_hr_evaluation_evaluation","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_user",1,0,0,0 +"access_hr_evaluation_evaluation_manager","hr_evaluation.evaluation","model_hr_evaluation_evaluation","hr.group_hr_manager",1,1,1,1 +"access_hr_evaluation_plan","hr_evaluation.plan","model_hr_evaluation_evaluation","hr.group_hr_user",1,0,0,0 +"access_hr_evaluation_plan_manager","hr_evaluation.plan","model_hr_evaluation_plan","hr.group_hr_manager",1,1,1,1 +"access_hr_evaluation_plan_phase","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_user",1,0,0,0 +"access_hr_evaluation_plan_phase_manager","hr_evaluation.plan.phase","model_hr_evaluation_plan_phase","hr.group_hr_manager",1,1,1,1 +"access_hr_evaluation_interview","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_user",1,0,0,0 +"access_hr_evaluation_interview_manager","hr.evaluation.interview","model_hr_evaluation_interview","hr.group_hr_manager",1,1,1,1 +"access_hr_evaluation_report","hr.evaluation.report","model_hr_evaluation_report",,1,0,0,0 diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py index 6cdf8acdd3a..03fab346c77 100644 --- a/addons/hr_expense/__terp__.py +++ b/addons/hr_expense/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -48,7 +48,8 @@ 'hr_expense_workflow.xml', 'hr_expense_view.xml', 'hr_expense_report.xml', - 'process/hr_expense_process.xml' + 'process/hr_expense_process.xml', + 'report/hr_expense_report_view.xml' ], 'demo_xml': ['hr.expense.expense.csv'], 'installable': True, diff --git a/addons/hr_expense/report/__init__.py b/addons/hr_expense/report/__init__.py index f55bc86bc12..4ddd1d33933 100644 --- a/addons/hr_expense/report/__init__.py +++ b/addons/hr_expense/report/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,10 +15,11 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## import expense +import hr_expense_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py new file mode 100644 index 00000000000..81cb18dcc09 --- /dev/null +++ b/addons/hr_expense/report/hr_expense_report.py @@ -0,0 +1,90 @@ +# -*- 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 . +# +############################################################################## + +import tools +from osv import fields,osv + + +class hr_expense_report(osv.osv): + _name = "hr.expense.report" + _description = "Expenses Statistics" + _auto = False + _rec_name = 'date' + _columns = { + 'date': fields.date('Date', readonly=True), + 'year': fields.char('Year', size=4, readonly=True), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), + ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), + 'product_id':fields.many2one('product.product', 'Product', readonly=True), + 'product_qty':fields.float('Qty', readonly=True), + 'employee_id': fields.many2one('hr.employee', "Employee's Name", readonly=True), + 'invoice_id': fields.many2one('account.invoice', 'Invoice',readonly=True), + 'department_id':fields.many2one('hr.department','Department',readonly=True), + 'company_id':fields.many2one('res.company', 'Company', readonly=True), + 'user_id':fields.many2one('res.users', 'User', readonly=True), + 'price_total':fields.float('Total Price', readonly=True), + 'price_average':fields.float('Average Price', readonly=True), + 'nbr':fields.integer('# of Lines', readonly=True), + 'state': fields.selection([ + ('draft', 'Draft'), + ('confirm', 'Waiting confirmation'), + ('accepted', 'Accepted'), + ('invoiced', 'Invoiced'), + ('paid', 'Reimbursed'), + ('cancelled', 'Cancelled')], + 'State', readonly=True), + } + _order = 'date desc' + def init(self, cr): + tools.drop_view_if_exists(cr, 'hr_expense_report') + cr.execute(""" + create or replace view hr_expense_report as ( + select + min(l.id) as id, + s.date as date, + s.employee_id, + s.invoice_id, + s.department_id, + to_char(s.date, 'YYYY') as year, + to_char(s.date, 'MM') as month, + l.product_id as product_id, + sum(l.unit_quantity * u.factor) as product_qty, + s.user_id as user_id, + s.company_id as company_id, + sum(l.unit_quantity*l.unit_amount) as price_total, + (sum(l.unit_quantity*l.unit_amount)/sum(l.unit_quantity * u.factor))::decimal(16,2) as price_average, + count(*) as nbr, + s.state + from + hr_expense_line l + left join + hr_expense_expense s on (s.id=l.expense_id) + left join product_uom u on (u.id=l.uom_id) + group by + s.date, l.product_id,s.invoice_id, + s.department_id, + l.uom_id, s.user_id, s.state, + s.company_id,s.employee_id + ) + """) +hr_expense_report() + diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml new file mode 100644 index 00000000000..9e30e6688f2 --- /dev/null +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -0,0 +1,100 @@ + + + + + hr.expense.report.tree + hr.expense.report + tree + + + + + + + + + + + + + + + + + + + + + + hr.expense.report.graph + hr.expense.report + graph + + + + + + + + + + hr.expense.report.search + hr.expense.report + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Expenses + hr.expense.report + form + tree,graph + + + + + + + + diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index f84a026748b..26dc78675cc 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -53,8 +53,8 @@ 'security/ir.model.access.csv', 'hr_workflow.xml', 'hr_view.xml', - 'hr_holidays_report.xml', 'hr_holidays_wizard.xml', + 'hr_holidays_report.xml', #'process/hr_holidays_process.xml' ], 'demo_xml': [], diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py index b6c0313e13f..12cb02f659f 100755 --- a/addons/hr_holidays/hr.py +++ b/addons/hr_holidays/hr.py @@ -37,17 +37,13 @@ class hr_holidays_status(osv.osv): for record in self.browse(cr, uid, ids, context): res[record.id] = {} max_leaves = leaves_taken = 0 - obj_ids = self.pool.get('hr.holidays.per.user').search(cr, uid, [('user_id','=',uid),('employee_id','=',employee_id),('holiday_status','=',record.id)]) - if obj_ids: - br_ob=self.pool.get('hr.holidays.per.user').browse(cr, uid, obj_ids)[0] - max_leaves=br_ob.max_leaves if not return_false: cr.execute("""SELECT type, sum(number_of_days) FROM hr_holidays WHERE employee_id = %s AND state='validate' AND holiday_status_id = %s GROUP BY type""", (str(employee_id), str(record.id))) for line in cr.fetchall(): if line[0] =='remove': - leaves_taken = -line[1] + leaves_taken = -line[1] if line[0] =='add': - max_leaves = line[1] + max_leaves = line[1] res[record.id]['max_leaves'] = max_leaves res[record.id]['leaves_taken'] = leaves_taken res[record.id]['remaining_leaves'] = max_leaves - leaves_taken @@ -66,18 +62,19 @@ class hr_holidays_status(osv.osv): employee_id = employee_ids[0] else: return_false = True - res = self.get_days(cr, uid, ids, employee_id, return_false, context=context) + if employee_id: + res = self.get_days(cr, uid, ids, employee_id, return_false, context=context) return res _columns = { 'name' : fields.char('Name', size=64, required=True, translate=True), - 'section_id': fields.many2one('crm.case.section', 'CRM Section', help='If you link this type of leave with a section in the CRM, it will synchronize each leave asked with a case in this section, to display it in the company shared calendar for example.'), + 'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'), 'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color of the status', required=True, help='This color will be used in the leaves summary located in Reporting\Print Summary of Leaves'), 'limit' : fields.boolean('Allow to override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'), - 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the leave type without removing it."), + 'active' : fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."), 'max_leaves' : fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'), 'leaves_taken' : fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'), - 'remaining_leaves' : fields.function(_user_left_days, method=True, string='Remaining Leaves', multi='user_left_days'), + 'remaining_leaves' : fields.function(_user_left_days, method=True, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'), } _defaults = { @@ -86,48 +83,6 @@ class hr_holidays_status(osv.osv): } hr_holidays_status() -class hr_holidays_per_user(osv.osv): - _name = "hr.holidays.per.user" - _description = "Holidays Per User" - _rec_name = "user_id" - - def _get_remaining_leaves(self, cr, uid, ids, field_name, arg=None, context={}): - obj_holiday = self.pool.get('hr.holidays') - result = {} - for holiday_user in self.browse(cr, uid, ids): - days = 0.0 - ids_request = obj_holiday.search(cr, uid, [('employee_id', '=', holiday_user.employee_id.id),('state', '=', 'validate'),('holiday_status_id', '=', holiday_user.holiday_status.id)]) - if ids_request: - holidays = obj_holiday.browse(cr, uid, ids_request) - for holiday in holidays: - days -= holiday.number_of_days - days = holiday_user.max_leaves - days - result[holiday_user.id] = days - return result - - _columns = { - 'employee_id': fields.many2one('hr.employee', "Employee's Name",required=True), - 'user_id' : fields.many2one('res.users','User'), - 'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", required=True), - 'max_leaves' : fields.float('Maximum Leaves Allowed',required=True), - 'leaves_taken' : fields.float('Leaves Already Taken',readonly=True), - 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the holidays per user without removing it."), - 'notes' : fields.text('Notes'), - 'remaining_leaves': fields.function(_get_remaining_leaves, method=True, string='Remaining Leaves', type='float'), - 'holiday_ids': fields.one2many('hr.holidays', 'holiday_user_id', 'Holidays') - } - _defaults = { - 'active' : lambda *a: True, - } - - def create(self, cr, uid, vals, *args, **kwargs): - if vals['employee_id']: - obj_emp=self.pool.get('hr.employee').browse(cr,uid,vals['employee_id']) - vals.update({'user_id': obj_emp.user_id.id}) - return super(osv.osv,self).create(cr, uid, vals, *args, **kwargs) - -hr_holidays_per_user() - class hr_holidays(osv.osv): _name = "hr.holidays" _description = "Holidays" @@ -152,13 +107,12 @@ class hr_holidays(osv.osv): 'notes' : fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}), 'number_of_days': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}), 'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}), - 'case_id': fields.many2one('crm.case', 'Case'), + 'case_id': fields.many2one('crm.meeting', 'Case'), 'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone"), 'allocation_type': fields.selection([('employee','Employee Request'),('company','Company Allocation')], 'Allocation Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help='This field is only for informative purposes, to depict if the leave request/allocation comes from an employee or from the company'), 'parent_id': fields.many2one('hr.holidays', 'Parent'), 'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',), - 'holiday_user_id' : fields.many2one('hr.holidays.per.user', 'User'), - 'department_id':fields.many2one('hr.department','Department'), + 'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)]} ), } _defaults = { @@ -170,6 +124,14 @@ class hr_holidays(osv.osv): } _order = 'date_from desc' + def create(self, cr, uid, vals, context={}): + if context: + if context.has_key('type'): + vals['type'] = context['type'] + if context.has_key('allocation_type'): + vals['allocation_type'] = context['allocation_type'] + return super(osv.osv,self).create(cr, uid, vals, context) + def onchange_date_from(self, cr, uid, ids, date_to, date_from): result = {} if date_to and date_from: @@ -188,16 +150,14 @@ class hr_holidays(osv.osv): def _update_user_holidays(self, cr, uid, ids): for record in self.browse(cr, uid, ids): if record.state=='validate': - holiday_id=self.pool.get('hr.holidays.per.user').search(cr, uid, [('employee_id','=', record.employee_id.id),('holiday_status','=',record.holiday_status_id.id)]) - if holiday_id: - obj_holidays_per_user=self.pool.get('hr.holidays.per.user').browse(cr, uid,holiday_id[0]) - self.pool.get('hr.holidays.per.user').write(cr,uid,obj_holidays_per_user.id,{'leaves_taken':obj_holidays_per_user.leaves_taken - record.number_of_days}) if record.case_id: - if record.case_id.state <> 'draft': - raise osv.except_osv(_('Warning !'), - _('You can not cancel this holiday request. first You have to make its case in draft state.')) - else: - self.pool.get('crm.case').unlink(cr,uid,[record.case_id.id]) + self.pool.get('crm.meeting').unlink(cr,uid,[record.case_id.id]) + if record.linked_request_ids: + list_ids = [] + for id in record.linked_request_ids: + list_ids.append(id.id) + self.holidays_cancel(cr,uid,list_ids) + self.unlink(cr,uid,list_ids) def _check_date(self, cr, uid, ids): if ids: @@ -209,26 +169,11 @@ class hr_holidays(osv.osv): _constraints = [(_check_date, 'Start date should not be larger than end date! ', ['number_of_days'])] - def create(self, cr, uid, vals, *args, **kwargs): - id_holiday = super(hr_holidays, self).create(cr, uid, vals, *args, **kwargs) - self._create_holiday(cr, uid, [id_holiday]) - return id_holiday def unlink(self, cr, uid, ids, context={}): self._update_user_holidays(cr, uid, ids) return super(hr_holidays, self).unlink(cr, uid, ids, context) - def _create_holiday(self, cr, uid, ids): - holidays_user_obj = self.pool.get('hr.holidays.per.user') - holidays_data = self.browse(cr, uid, ids[0]) - list_holiday = [] - ids_user_hdays = holidays_user_obj.search(cr, uid, [('employee_id', '=', holidays_data.employee_id.id),('holiday_status', '=', holidays_data.holiday_status_id.id)]) - for hdays in holidays_user_obj.browse(cr, uid, ids_user_hdays): - for req in hdays.holiday_ids: - list_holiday.append(req.id) - list_holiday.append(ids[0]) - holidays_user_obj.write(cr, uid, ids_user_hdays, {'holiday_ids': [(6, 0, list_holiday)]}) - return True def onchange_date_to(self, cr, uid, ids, date_from, date_to): result = {} @@ -249,7 +194,7 @@ class hr_holidays(osv.osv): warning = {} if status: brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status])[0] - if brows_obj.section_id and not brows_obj.section_id.allow_unlink: + if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink: warning = { 'title': "Warning for ", 'message': "You won\'t be able to cancel this leave request because the CRM Section of the leave type disallows." @@ -283,6 +228,7 @@ class hr_holidays(osv.osv): def holidays_confirm(self, cr, uid, ids, *args): for record in self.browse(cr, uid, ids): + user_id = False leave_asked = record.number_of_days_temp if record.type == 'remove': if record.employee_id and not record.holiday_status_id.limit: @@ -300,14 +246,14 @@ class hr_holidays(osv.osv): 'number_of_days': nb, 'user_id': user_id }) - vals= { - 'name':record.name, - 'date_from':record.date_from, - 'date_to':record.date_to, - 'calendar_id':record.employee_id.calendar_id.id, - 'company_id':record.employee_id.company_id.id, - 'resource_id':record.employee_id.resource_id.id - } + #vals= { + # 'name':record.name, + # 'date_from':record.date_from, + # 'date_to':record.date_to, + # 'calendar_id':record.employee_id.calendar_id.id, + # 'company_id':record.employee_id.company_id.id, + # 'resource_id':record.employee_id.resource_id.id + # } #self.pool.get('resource.calendar.leaves').create(cr,uid,vals) return True @@ -365,14 +311,17 @@ class hr_holidays(osv.osv): employee_ids = self.pool.get('hr.employee').search(cr, uid, []) for employee in employee_ids: vals['employee_id'] = employee + user_id = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)]) + if user_id: + vals['user_id'] = user_id[0] holiday_ids.append(self.create(cr, uid, vals, context={})) self.holidays_confirm(cr, uid, holiday_ids) self.holidays_validate(cr, uid, holiday_ids) - if record.holiday_status_id.section_id and record.date_from and record.date_to and record.employee_id: + if record.holiday_status_id.categ_id and record.date_from and record.date_to and record.employee_id: vals={} vals['name']=record.name - vals['section_id']=record.holiday_status_id.section_id.id + vals['categ_id']=record.holiday_status_id.categ_id.id epoch_c = time.mktime(time.strptime(record.date_to,'%Y-%m-%d %H:%M:%S')) epoch_d = time.mktime(time.strptime(record.date_from,'%Y-%m-%d %H:%M:%S')) diff_day = (epoch_c - epoch_d)/(3600*24) @@ -380,7 +329,7 @@ class hr_holidays(osv.osv): vals['note'] = record.notes vals['user_id'] = record.user_id.id vals['date'] = record.date_from - case_id = self.pool.get('crm.case').create(cr,uid,vals) + case_id = self.pool.get('crm.meeting').create(cr,uid,vals) self.write(cr, uid, ids, {'case_id':case_id}) return True hr_holidays() diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml index 23d1e1a75bf..66669bd2f51 100644 --- a/addons/hr_holidays/hr_holidays_report.xml +++ b/addons/hr_holidays/hr_holidays_report.xml @@ -9,6 +9,77 @@ auto="False" menu="False"/> + + + + + + + hr.holidays.report.tree + hr.holidays.report + tree + + + + + + + + + + + hr.holidays.report.form + hr.holidays.report + form + + + + + + + + + + hr.holiday.report.graph + hr.holidays.report + graph + + + + + + + + + + + Available Holidays + hr.holidays.report + form + tree,graph + + + + + + + tree + + + + + + + + graph + + + + + + + + diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml index fb505d65497..fc433a181e7 100644 --- a/addons/hr_holidays/hr_holidays_wizard.xml +++ b/addons/hr_holidays/hr_holidays_wizard.xml @@ -11,10 +11,11 @@ name="Holidays" parent="hr.menu_hr_reporting" sequence="3" /> - - @@ -24,7 +25,7 @@ - diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml index 146e06d25a3..d46898bd6bb 100644 --- a/addons/hr_holidays/hr_view.xml +++ b/addons/hr_holidays/hr_view.xml @@ -1,13 +1,6 @@ - - - hr.holidays.filter hr.holidays @@ -38,7 +31,6 @@ - Leave Request hr.holidays @@ -73,7 +65,6 @@ - Allocation Request hr.holidays @@ -104,18 +95,17 @@ - - + - Company Allocation + Leaves Management hr.holidays form -
+ - + @@ -153,13 +143,13 @@ - + - + - + + Leave Request(s) hr.holidays @@ -226,13 +195,8 @@ - @@ -256,16 +220,32 @@ form - + - + action="open_allocation_holidays"/> + + + hr.holidays + form + tree,form + + {'allocation_type':'company'} + + + @@ -276,7 +256,7 @@ - + @@ -303,10 +283,6 @@ - - - Holiday Per User - hr.holidays.per.user - form - tree,form - - - - - diff --git a/addons/hr_holidays/report/__init__.py b/addons/hr_holidays/report/__init__.py index 39882f6cd59..00783721fe3 100644 --- a/addons/hr_holidays/report/__init__.py +++ b/addons/hr_holidays/report/__init__.py @@ -20,5 +20,6 @@ ############################################################################## import holidays_summary_report +import available_holidays # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py new file mode 100644 index 00000000000..259aea0dec9 --- /dev/null +++ b/addons/hr_holidays/report/available_holidays.py @@ -0,0 +1,33 @@ +from osv import fields,osv +import tools + +class hr_holidays_report(osv.osv): + _name = "hr.holidays.report" + _auto = False + _columns = { + 'employee_id': fields.many2one ('hr.employee', 'Employee', readonly=True), + 'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True), + # 'max_leave': fields.float('Allocated Leaves', readonly=True), +# 'taken_leaves': fields.float('Taken Leaves', readonly=True), + 'remaining_leave': fields.float('Remaining Leaves',readonly=True), + } + def init(self, cr): + tools.drop_view_if_exists(cr, 'hr_holidays_report') + cr.execute(""" + create or replace view hr_holidays_report as ( + select + min(h.id) as id, + h.employee_id as employee_id, + h.holiday_status_id as holiday_status_id, + sum(number_of_days) as remaining_leave + from + hr_holidays h + left join hr_holidays_status s on (s.id = h.holiday_status_id) + where h.state = 'validate' + and h.employee_id is not null + and s.active <> 'f' + group by h.holiday_status_id, h.employee_id + )""") +hr_holidays_report() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py index e0cb697b3b9..c61e8f733b4 100644 --- a/addons/hr_holidays/report/holidays_summary_report.py +++ b/addons/hr_holidays/report/holidays_summary_report.py @@ -44,7 +44,6 @@ def strToDate(dt): def emp_create_xml(self,cr,uid,dept,holiday_type,row_id,empid,name,som,eom): display={} - if dept==0: count=0 p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr,uid,[('employee_id','in',[empid,False]), ('type', '=', 'remove')]) diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py new file mode 100644 index 00000000000..59a0a361eeb --- /dev/null +++ b/addons/hr_holidays/report/hr_holidays_report.py @@ -0,0 +1,72 @@ +# -*- 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 . +# +############################################################################## + +import tools +from osv import fields,osv + +class hr_holidays_report(osv.osv): + _name = "hr.holidays.report" + _description = "Leaves Statistics" + _auto = False + _rec_name = 'date' + _columns = { + 'date': fields.datetime('Date', readonly=True), + 'year': fields.char('Year', size=4, readonly=True), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), + ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), + 'date_from' : fields.datetime('Start Date', readonly=True), + 'date_to' : fields.datetime('End Date', readonly=True), + 'number_of_days_temp': fields.float('Number of Days', readonly=True), + 'employee_id' : fields.many2one('hr.employee', "Employee's Name",readonly=True), + 'user_id':fields.many2one('res.users', 'User', readonly=True), + 'state': fields.selection([('draft', 'Draft'), + ('confirm', 'Waiting Validation'), + ('refuse', 'Refused'), + ('validate', 'Validated'), + ('cancel', 'Cancelled')] + ,'State', readonly=True), + } + _order = 'date desc' + def init(self, cr): + tools.drop_view_if_exists(cr, 'hr_holidays_report') + cr.execute(""" + create or replace view hr_holidays_report as ( + select + min(s.id) as id, + date_trunc('seconds',s.create_date) as date, + date_trunc('day',s.date_from) as date_from, + date_trunc('day',s.date_to) as date_to, + s.number_of_days_temp, + s.employee_id, + s.user_id as user_id, + to_char(s.create_date, 'YYYY') as year, + to_char(s.create_date, 'MM') as month, + s.state + from + hr_holidays s + group by + s.create_date,s.state,s.date_from,s.date_to, + s.number_of_days_temp,s.employee_id,s.user_id + ) + """) +hr_holidays_report() + diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml new file mode 100644 index 00000000000..6a8d1461799 --- /dev/null +++ b/addons/hr_holidays/report/hr_holidays_report_view.xml @@ -0,0 +1,87 @@ + + + + + hr.holidays.report.tree + hr.holidays.report + tree + + + + + + + + + + + + + + + + hr.holidays.report.graph + hr.holidays.report + graph + + + + + + + + + + hr.holidays.report.search + hr.holidays.report + search + + + + + + + + + + + + + + + + + + + + + + + + + + + Leaves + hr.holidays.report + form + tree,graph + + + + + + + diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index a7fc3d153b5..a7426724594 100644 --- a/addons/hr_holidays/security/ir.model.access.csv +++ b/addons/hr_holidays/security/ir.model.access.csv @@ -1,4 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,1,1,1 -"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,1 -"access_hr_holidays_per_user","hr.holidays.per.user","model_hr_holidays_per_user","hr.group_hr_user",1,1,1,1 +"access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","hr.group_hr_user",1,0,0,0 +"access_hr_holidays_user","hr holidays user","model_hr_holidays","hr.group_hr_user",1,1,1,0 +"access_hr_holydays_status_manager","hr.holidays.status manager","model_hr_holidays_status","hr.group_hr_manager",1,1,1,1 +"access_hr_holidays_manager","hr holidays manager","model_hr_holidays","hr.group_hr_manager",1,1,1,1 diff --git a/addons/hr_recruitment/__terp__.py b/addons/hr_recruitment/__terp__.py index e80b22bb9db..59f74ea4e69 100644 --- a/addons/hr_recruitment/__terp__.py +++ b/addons/hr_recruitment/__terp__.py @@ -42,10 +42,10 @@ system to store and search in your CV base. 'hr_hr_wizard.xml', 'hr_hr_view.xml', 'hr_hr_menu.xml', - 'report_hr_hr_view.xml', 'security/hr_hr_security.xml', 'security/ir.model.access.csv', 'board_hr_hr_statistical_view.xml', + 'report/hr_recruitment_report_view.xml' ], 'demo_xml': [ 'hr_hr_demo.xml' diff --git a/addons/hr_recruitment/report/__init__.py b/addons/hr_recruitment/report/__init__.py index 418da576c4e..86094f98916 100644 --- a/addons/hr_recruitment/report/__init__.py +++ b/addons/hr_recruitment/report/__init__.py @@ -20,6 +20,6 @@ # ############################################################################## -import report_hr_hr +import hr_recruitment_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py new file mode 100644 index 00000000000..2f48dabd7a9 --- /dev/null +++ b/addons/hr_recruitment/report/hr_recruitment_report.py @@ -0,0 +1,67 @@ +# -*- 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 . +# +############################################################################## + +import tools +from osv import fields,osv +from hr_recruitment import hr_hr + +class hr_recruitment_report(osv.osv): + _name = "hr.recruitment.report" + _description = "Recruitments Statistics" + _inherit = "crm.case.report" + _auto = False + _rec_name = 'date' + _columns = { + 'date': fields.datetime('Date', readonly=True), + 'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True), + 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]",readonly=True), + 'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"), + 'department_id':fields.many2one('hr.department','Department',readonly=True), + 'priority': fields.selection(hr_hr.AVAILABLE_PRIORITIES, 'Appreciation'), + + } + _order = 'date desc' + def init(self, cr): + tools.drop_view_if_exists(cr, 'hr_recruitment_report') + cr.execute(""" + create or replace view hr_recruitment_report as ( + select + min(s.id) as id, + s.date as date, + to_char(s.date, 'YYYY') as name, + to_char(s.date, 'MM') as month, + s.state, + s.company_id, + s.user_id, + s.job_id, + s.type_id, + s.department_id, + s.priority, + s.stage_id, + count(*) as nbr + from hr_applicant s + group by + s.date,s.state,s.company_id,s.user_id,s.stage_id,s.type_id,s.priority, + s.job_id,s.department_id + ) + """) +hr_recruitment_report() + diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml new file mode 100644 index 00000000000..30f1ec3d8ed --- /dev/null +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -0,0 +1,110 @@ + + + + + hr.recruitment.report.tree + hr.recruitment.report + tree + + + + + + + + + + + + + + + + + + hr.recruitment.report.graph + hr.recruitment.report + graph + + + + + + + + + + hr.recruitment.report.search + hr.recruitment.report + search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Recruitments + hr.recruitment.report + form + tree,graph + + + + + + + diff --git a/addons/hr_recruitment/report/report_hr_hr.py b/addons/hr_recruitment/report/report_hr_hr.py deleted file mode 100644 index b49de4f66d5..00000000000 --- a/addons/hr_recruitment/report/report_hr_hr.py +++ /dev/null @@ -1,3 +0,0 @@ -from osv import fields,osv -import tools - diff --git a/addons/hr_recruitment/report_hr_hr_view.xml b/addons/hr_recruitment/report_hr_hr_view.xml deleted file mode 100644 index 1fbce7663ea..00000000000 --- a/addons/hr_recruitment/report_hr_hr_view.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/addons/hr_timesheet_invoice/__terp__.py b/addons/hr_timesheet_invoice/__terp__.py index cbb2ace596a..f335c7dbd77 100644 --- a/addons/hr_timesheet_invoice/__terp__.py +++ b/addons/hr_timesheet_invoice/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -36,7 +36,9 @@ reports, eso.""", 'security/ir.model.access.csv', 'hr_timesheet_invoice_view.xml', 'hr_timesheet_invoice_wizard.xml', - 'hr_timesheet_invoice_report.xml' + 'hr_timesheet_invoice_report.xml', + 'report/report_analytic_view.xml', + 'report/hr_timesheet_invoice_report_view.xml', ], 'demo_xml': ['hr_timesheet_invoice_demo.xml'], 'installable': True, diff --git a/addons/hr_timesheet_invoice/report/__init__.py b/addons/hr_timesheet_invoice/report/__init__.py index 9d87b1fdd1c..b351c097a12 100644 --- a/addons/hr_timesheet_invoice/report/__init__.py +++ b/addons/hr_timesheet_invoice/report/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,12 +15,14 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## import cost_ledger import account_analytic_profit +import report_analytic +import hr_timesheet_invoice_report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_timesheet/report_timesheet.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py similarity index 100% rename from addons/report_timesheet/report_timesheet.py rename to addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml similarity index 100% rename from addons/report_timesheet/report_timesheet_view.xml rename to addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml diff --git a/addons/report_analytic/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py similarity index 100% rename from addons/report_analytic/report_analytic.py rename to addons/hr_timesheet_invoice/report/report_analytic.py diff --git a/addons/report_analytic/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml similarity index 100% rename from addons/report_analytic/report_analytic_view.xml rename to addons/hr_timesheet_invoice/report/report_analytic_view.xml diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv index 670f835a50d..6349b4f766c 100644 --- a/addons/hr_timesheet_invoice/security/ir.model.access.csv +++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv @@ -1,3 +1,11 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_hr_timesheet_invoice_factor_hr_user","hr_timesheet_invoice.factor.hr.user","model_hr_timesheet_invoice_factor","hr.group_hr_user",1,0,0,0 "access_hr_timesheet_invoice_factor_acc_inv","hr_timesheet_invoice.factor.account.invoice","model_hr_timesheet_invoice_factor","account.group_account_invoice",1,1,1,1 +"access_report_analytic_account_close","report.analytic.account.close","model_report_analytic_account_close","account.group_account_manager",1,0,0,0 +"access_report_account_analytic_line_to_invoice","report.account.analytic.line.to.invoice","model_report_account_analytic_line_to_invoice","account.group_account_manager",1,0,0,0 +"access_report_timesheet_user","report_timesheet.user","model_report_timesheet_user","base.group_user",1,0,0,0 +"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_user",1,0,0,0 +"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_user",1,0,0,0 +"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_user",1,0,0,0 +"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_user",1,0,0,0 +"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_user",1,0,0,0 diff --git a/addons/idea/i18n/ro.po b/addons/idea/i18n/ro.po index c1d68868d9f..7628b4a48ef 100644 --- a/addons/idea/i18n/ro.po +++ b/addons/idea/i18n/ro.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 06:57+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-03-16 13:31+0000\n" +"Last-Translator: George Dumitrescu \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 04:54+0000\n" +"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: idea @@ -380,7 +380,7 @@ msgstr "Punctaj mediu" #. module: idea #: view:idea.idea:0 msgid "Open" -msgstr "Deschidere" +msgstr "Deschide" #. module: idea #: help:idea.idea,description:0 diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index e77cabcabbd..9e0a65718fa 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -73,6 +73,8 @@ 'process/service_product_process.xml', 'process/procurement_process.xml', 'mrp_installer.xml', + 'report/mrp_report_view.xml', + 'report/mrp_production_order_view.xml', ], 'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'], 'installable': True, diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 0a6d03aa0a3..2a46fc0286c 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -605,11 +605,15 @@ class mrp_production(osv.osv): consumed_products = {} produced_qty = 0 for consumed_product in production.move_lines2: + if consumed_product.scraped: + continue if not consumed_products.get(consumed_product.product_id.id, False): consumed_products[consumed_product.product_id.id] = 0 consumed_products[consumed_product.product_id.id] += consumed_product.product_qty for produced_product in production.move_created_ids2: + if produced_product.scraped: + continue produced_qty += produced_product.product_qty for raw_product in production.move_lines: @@ -628,6 +632,8 @@ class mrp_production(osv.osv): stock_mov_obj.write(cr, uid, final_product_todo, vals) produced_products = {} for produced_product in production.move_created_ids2: + if produced_product.scraped: + continue if not produced_products.get(produced_product.product_id.id, False): produced_products[produced_product.product_id.id] = 0 produced_products[produced_product.product_id.id] += produced_product.product_qty diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 7eb8466d8a2..bf63d89666c 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -485,6 +485,8 @@ + +