diff --git a/addons/account/account.py b/addons/account/account.py
index bf5e25a6f69..1520c4f0646 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -154,7 +154,7 @@ class account_account_type(osv.osv):
('expense','Profit & Loss (Expense Accounts)'),
('asset','Balance Sheet (Assets Accounts)'),
('liability','Balance Sheet (Liability Accounts)')
- ],'Type Heads', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
+ ],'P&L / BS Category', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
'note': fields.text('Description'),
}
_defaults = {
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 2b736a514c3..495b4f4e5ba 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -45,7 +45,7 @@
-
+
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index e72bd584f9d..0825aad8831 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -209,8 +209,8 @@
-
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6612f628292..d4e51b7e194 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -482,8 +482,8 @@
-
+
@@ -564,9 +564,9 @@
+
-
@@ -596,9 +596,9 @@
+
-
@@ -1334,8 +1334,8 @@
-
+
@@ -1481,9 +1481,9 @@
+
-
@@ -2466,9 +2466,9 @@
+
-
@@ -2570,9 +2570,9 @@
+
-
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 94f0c92c017..dfcd273c439 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index ac5de3c9c51..9d97a299adf 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:55+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) \n"
+"PO-Revision-Date: 2010-10-12 16:53+0000\n"
+"Last-Translator: zmmaj \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-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -411,7 +411,7 @@ msgstr "Zatvaranje plaćanja"
#. module: account
#: model:account.journal,name:account.expenses_journal
msgid "Journal de frais"
-msgstr ""
+msgstr "Dnevnik Provizije"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -640,12 +640,12 @@ msgstr "Uvjeti plaćanja za partnera"
#. module: account
#: view:account.move.reconcile:0
msgid "Account Entry Reconcile"
-msgstr "Zatvaranje stavke"
+msgstr "Zatvaranje stavke konta"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
msgid "Open for bank reconciliation"
-msgstr "Otvor za zatvaranje banke"
+msgstr "Otvoreno za zatvaranje banke"
#. module: account
#: field:account.invoice.line,discount:0
@@ -830,6 +830,8 @@ msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
+"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
+"o kontu i njegovim specificnostima."
#. module: account
#: selection:account.automatic.reconcile,init,power:0
@@ -1040,7 +1042,7 @@ msgstr "Podređeni"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje poreza"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1063,7 +1065,7 @@ msgstr "Izlazni račun"
#. module: account
#: wizard_view:account.open_closed_fiscalyear,init:0
msgid "Choose Fiscal Year"
-msgstr "Odaberite poreznu godinu"
+msgstr "Izaberite fiskalnu godinu"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -1079,7 +1081,7 @@ msgstr "Ispiši analitičke dnevnike"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Voucher Nb"
-msgstr ""
+msgstr "Nbr Vaucera"
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -1129,7 +1131,7 @@ msgstr "Novi analitički konto"
#: 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 Mapping Templates"
-msgstr ""
+msgstr "Predlozci poreskih mapiranja"
#. module: account
#: rml:account.invoice:0
@@ -1145,17 +1147,17 @@ msgstr "Razdoblje od:"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "carobnjak.vise.kontnih.naloga"
#. module: account
#: model:account.journal,name:account.sales_journal
msgid "Journal de vente"
-msgstr ""
+msgstr "Dnevnik Prodaje"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
-msgstr "Iznos u drugoj valuti."
+msgstr "Iznos je predstavljen opciono u drugoj valuti"
#. module: account
#: view:account.fiscal.position.template:0
@@ -2081,7 +2083,7 @@ msgstr "Proces izlacnog računa"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Napomena Fiskalnog mapiranja:"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2144,7 +2146,7 @@ msgstr "Nova pretplata"
#. module: account
#: view:account.payment.term:0
msgid "Computation"
-msgstr "Izračun"
+msgstr "Proračun"
#. module: account
#: view:account.analytic.line:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 82262de0ce2..a2e5ce8ef6b 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.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-10-11 07:18+0000\n"
+"PO-Revision-Date: 2010-10-12 07:43+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index a2514f02d24..19a1204ca17 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.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-09-29 11:37+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-10-12 17:21+0000\n"
+"Last-Translator: zmmaj \n"
"Language-Team: Serbian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -41,12 +41,12 @@ msgstr "Enkodiranje unosa"
#. module: account
#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Poruka na opomenama za neplaćene račune."
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Potvrdi izvode iz pripreme"
#. module: account
#: model:account.account.type,name:account.account_type_asset
@@ -56,12 +56,12 @@ msgstr "Sredstvo"
#. module: account
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Valuta upotrebljena pri unosu izvoda"
#. module: account
#: wizard_view:account_use_models,init_form:0
@@ -74,6 +74,8 @@ msgid ""
"This account will be used to value incoming stock for the current product "
"category"
msgstr ""
+"Ovaj ce se nalog koristiti da vrednuje ulazni magacin za vazecu kategoriju "
+"proizvoda"
#. module: account
#: help:account.invoice,period_id:0
@@ -83,24 +85,24 @@ msgstr ""
#. module: account
#: wizard_view:account.automatic.reconcile,reconcile:0
msgid "Reconciliation result"
-msgstr ""
+msgstr "Rezultat zatvaranja"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled entries"
-msgstr "Nesnimljeni unos"
+msgstr "Otvorene stavke"
#. module: account
#: field:account.invoice.tax,base_code_id:0
#: field:account.tax,base_code_id:0
#: field:account.tax.template,base_code_id:0
msgid "Base Code"
-msgstr ""
+msgstr "Osnovna Šifra"
#. module: account
#: view:account.account:0
msgid "Account Statistics"
-msgstr "Statistike računa"
+msgstr "Knjigovodstvene statistike"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_vat_declaration
@@ -116,7 +118,7 @@ msgstr "Roditelj"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
-msgstr ""
+msgstr "Nalog za knjiženje"
#. module: account
#: field:account.invoice,residual:0
@@ -129,18 +131,18 @@ msgstr "Ostatak"
#: field:account.tax.template,base_sign:0
#: field:account.tax.template,ref_base_sign:0
msgid "Base Code Sign"
-msgstr ""
+msgstr "Predznak šifre osnovice"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
#: model:ir.ui.menu,name:account.menu_unreconcile_select
msgid "Unreconcile entries"
-msgstr ""
+msgstr "Ponisti stavke"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Greska! Dužina period(a) je loša/netačna. "
+msgstr "Greška! Trajanje razdoblja je pogrešno. "
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -150,7 +152,7 @@ msgstr "Greska! Dužina period(a) je loša/netačna. "
#: model:ir.actions.act_window,name:account.action_move_line_form
#: model:ir.ui.menu,name:account.menu_action_move_line_form
msgid "Entries"
-msgstr "Unosi"
+msgstr "Stavke"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -160,7 +162,7 @@ msgstr "Centralizacija Dugovanja"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Potvrdi nacrtne fakture"
#. module: account
#: help:account.payment.term.line,days2:0
@@ -170,18 +172,18 @@ msgid ""
"it's based on the beginning of the month)."
msgstr ""
"Dan u mesecu, podesiti na -1 za poslednji dan tekućeg meseca. Ako je "
-"pozitivan, daje dan u sledećem mesecu. Podešen na 0 za ukupan broj dana (u "
+"pozitivan, daje dan u sledećem mesecu. Podesi na 0 za ukupan broj dana (u "
"suprotnom zasnovan je na početku meseca)."
#. module: account
#: view:account.move:0
msgid "Total Credit"
-msgstr "Ukupno duguje"
+msgstr "Ukupno potrazuje"
#. module: account
#: field:account.config.wizard,charts:0
msgid "Charts of Account"
-msgstr "Kontni plan"
+msgstr "Kontni planovi"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -194,12 +196,12 @@ msgstr "Premesti izabranu liniju"
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "Entry label"
-msgstr ""
+msgstr "Oznaka stavke"
#. module: account
#: model:ir.model,name:account.model_account_model_line
msgid "Account Model Entries"
-msgstr ""
+msgstr "Stavke modela"
#. module: account
#: field:account.tax.code,sum_period:0
@@ -210,23 +212,23 @@ msgstr "Zbir perioda"
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Izracunaj Kod ( if type= code) *programiranje"
#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Entry Line"
-msgstr ""
+msgstr "Stavke knjiženja"
#. module: account
#: wizard_view:account.aged.trial.balance,init:0
msgid "Aged Trial Balance"
-msgstr ""
+msgstr "Bruto bilanca"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurrent Entries"
-msgstr ""
+msgstr "Ponavljajuće stavke"
#. module: account
#: field:account.analytic.line,amount:0
@@ -246,7 +248,7 @@ msgstr "Iznos"
#: model:ir.actions.wizard,name:account.wizard_third_party_ledger
#: model:ir.ui.menu,name:account.menu_third_party_ledger
msgid "Partner Ledger"
-msgstr "Partnerski dnevnik"
+msgstr "Salda konti partnera"
#. module: account
#: field:product.template,supplier_taxes_id:0
@@ -271,6 +273,10 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
+"Daje pogled korišten kada se zapisuju ili pretrazuju stavke ovog dnevnika. "
+"Pogled govori Open ERP-u koja polja trebaju biti vidljiva, neophodna ili "
+"samo za čitanje i u kojem redosledu. Možete kreirati vlastiti pogled za brži "
+"unos stavki ovog dnevnika."
#. module: account
#: help:account.invoice,date_due:0
@@ -281,18 +287,23 @@ msgid ""
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
+"Ako koristite uvjete plaćanja, datum valute plaćanja se izračunava "
+"automatski u trenutku generiranja stavki knjiženja.Ukoliko ostavite praznim "
+"uslove plaćanja i datum valute praznim, to označava direktno plaćanje. "
+"Uslovi plaćanja mogu izračunati više uplata, npr. 50% odmah, 50% za mjesec "
+"dana."
#. module: account
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Fixed"
-msgstr "Popravljeno"
+msgstr "Fiksno"
#. module: account
#: model:ir.actions.report.xml,name:account.account_overdue
#: view:res.company:0
msgid "Overdue Payments"
-msgstr ""
+msgstr "Dospela plaćanja"
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -314,7 +325,7 @@ msgstr "Poreklo"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Move Name"
-msgstr ""
+msgstr "Pomeri Ime"
#. module: account
#: xsl:account.transfer:0
@@ -324,7 +335,7 @@ msgstr "Referenca"
#. module: account
#: wizard_view:account.subscription.generate,init:0
msgid "Subscription Compute"
-msgstr ""
+msgstr "Proračun pretplate"
#. module: account
#: rml:account.central.journal:0
@@ -334,19 +345,19 @@ msgstr "Konto br."
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Delta Debit"
-msgstr ""
+msgstr "Razlika duguje"
#. module: account
#: rml:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
msgid "Tax"
-msgstr ""
+msgstr "Porez"
#. module: account
#: rml:account.general.journal:0
msgid "Debit Trans."
-msgstr ""
+msgstr "Dugovna transakcija"
#. module: account
#: field:account.analytic.line,account_id:0
@@ -360,14 +371,14 @@ msgstr "Analitički konto"
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
-msgstr ""
+msgstr "Porez na podređene"
#. module: account
#: rml:account.central.journal:0
#: rml:account.general.journal:0
#: field:account.journal,name:0
msgid "Journal Name"
-msgstr ""
+msgstr "Naziv dnevnika"
#. module: account
#: view:account.payment.term:0
@@ -377,7 +388,7 @@ msgstr "Opis na računima"
#. module: account
#: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
#. module: account
#: field:account.bank.statement.reconcile,total_entry:0
@@ -388,23 +399,23 @@ msgstr "Ukupno stavki"
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
-msgstr ""
+msgstr "Originalni konto"
#. module: account
#: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Dozvoli storniranje stavki"
#. module: account
#: model:process.transition,name:account.process_transition_paymentorderbank0
#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Zatvaranje plaćanja"
#. module: account
#: model:account.journal,name:account.expenses_journal
msgid "Journal de frais"
-msgstr ""
+msgstr "Dnevnik Provizije"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -424,12 +435,12 @@ msgstr "Negativno"
#. module: account
#: rml:account.partner.balance:0
msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Naziv (Konta/Partnera)"
#. module: account
#: selection:account.move,type:0
msgid "Contra"
-msgstr ""
+msgstr "Protuknjiženje"
#. module: account
#: field:account.analytic.account,state:0
@@ -439,36 +450,36 @@ msgstr ""
#: view:account.move.line:0
#: view:account.subscription:0
msgid "State"
-msgstr ""
+msgstr "Stanje"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree13
#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
msgid "Unpaid Supplier Refunds"
-msgstr ""
+msgstr "Neplaćeni povrati dobavljaču"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Special Computation"
-msgstr ""
+msgstr "Poseban proračun"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr ""
+msgstr "Potvrdi izvod sa/bez usklađivanja sa izvodom u pripremi."
#. module: account
#: wizard_view:account.move.bank.reconcile,init:0
#: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
msgid "Bank reconciliation"
-msgstr ""
+msgstr "Zatvaranje izvoda banke"
#. module: account
#: rml:account.invoice:0
msgid "Disc.(%)"
-msgstr ""
+msgstr "Popust(%)"
#. module: account
#: rml:account.general.ledger:0
@@ -477,12 +488,12 @@ msgstr ""
#: rml:account.overdue:0
#: field:account.subscription,ref:0
msgid "Ref"
-msgstr ""
+msgstr "Referenca"
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
-msgstr ""
+msgstr "Primena poreza za"
#. module: account
#: help:account.tax.template,include_base_amount:0
@@ -494,18 +505,18 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
msgid "Periodical Processing"
-msgstr ""
+msgstr "Periodična obrada"
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Statistika analitičkih stavki"
#. module: account
#: 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 "obrasci Perskih stopa/tarifa"
+msgstr "Predlošci PDV obrasca"
#. module: account
#: view:account.invoice:0
@@ -516,12 +527,12 @@ msgstr "Račun dobavljača"
#: model:process.transition,name:account.process_transition_reconcilepaid0
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "Reconcile Paid"
-msgstr ""
+msgstr "Zatvori plaćene"
#. module: account
#: wizard_field:account.chart,init,target_move:0
msgid "Target Moves"
-msgstr ""
+msgstr "Ciljna knjiženja"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -532,28 +543,28 @@ msgstr "Poreski obrasci"
#. module: account
#: field:account.invoice,reconciled:0
msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Plaćeno/Usklađeno"
#. module: account
#: field:account.account.type,close_method:0
msgid "Deferral Method"
-msgstr ""
+msgstr "Način odlaganja"
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
-msgstr ""
+msgstr "Dodaj u osnovicu"
#. module: account
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
-msgstr ""
+msgstr "Šifra osnovice povrata"
#. module: account
#: view:account.invoice.line:0
msgid "Line"
-msgstr ""
+msgstr "Red"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -564,7 +575,7 @@ msgstr ""
#: selection:account.tax,applicable_type:0
#: selection:account.tax.template,applicable_type:0
msgid "True"
-msgstr ""
+msgstr "Tačno"
#. module: account
#: help:account.payment.term.line,days:0
@@ -572,6 +583,8 @@ msgid ""
"Number of days to add before computation of the day of month.If Date=15/01, "
"Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgstr ""
+"Broj dana koje treba dodati prije proracuna dana u mesecu. Ako je "
+"datum=15.01, broj dana=22, dan u mesecu=-1, onda je datum dospeća 28.02."
#. module: account
#: model:ir.model,name:account.model_account_tax
@@ -597,7 +610,7 @@ msgstr ""
#. module: account
#: view:account.journal:0
msgid "Entry Controls"
-msgstr ""
+msgstr "Kontrole unosa"
#. module: account
#: help:account.model.line,sequence:0
@@ -610,59 +623,59 @@ msgstr ""
#: wizard_view:account.analytic.account.chart,init:0
#: wizard_view:account.analytic.line,init:0
msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(Zadržite prazno da biste otvorili trenutno stanje)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje konta"
#. module: account
#: field:account.analytic.account,contact_id:0
msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
#. module: account
#: selection:account.model.line,date:0
#: selection:account.model.line,date_maturity:0
msgid "Partner Payment Term"
-msgstr ""
+msgstr "Uslovi plaćanja za partnera"
#. module: account
#: view:account.move.reconcile:0
msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Zatvaranje stavke konta"
#. module: account
#: wizard_button:account.move.bank.reconcile,init,open:0
msgid "Open for bank reconciliation"
-msgstr ""
+msgstr "Otvoreno za zatvaranje banke"
#. module: account
#: field:account.invoice.line,discount:0
msgid "Discount (%)"
-msgstr ""
+msgstr "Popust (%)"
#. module: account
#: 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 ""
+msgstr "Iznos otpisa"
#. module: account
#: help:account.fiscalyear,company_id:0
msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr ""
+msgstr "Ostavi prazno ako je fiskalna godina vlasništvo više firmi."
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analitičko računovodstvo"
#. module: account
#: rml:account.overdue:0
msgid "Sub-Total :"
-msgstr ""
+msgstr "Među-iznos"
#. module: account
#: field:account.analytic.account,line_ids:0
@@ -670,32 +683,32 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
#: model:ir.ui.menu,name:account.next_id_41
msgid "Analytic Entries"
-msgstr ""
+msgstr "Analitičke stavke"
#. module: account
#: selection:account.subscription,period_type:0
msgid "month"
-msgstr ""
+msgstr "mesec"
#. module: account
#: field:account.analytic.account,partner_id:0
msgid "Associated Partner"
-msgstr ""
+msgstr "Povezani partner"
#. module: account
#: field:account.invoice,comment:0
msgid "Additional Information"
-msgstr ""
+msgstr "Dodatne informacije"
#. module: account
#: selection:account.invoice,type:0
msgid "Customer Refund"
-msgstr ""
+msgstr "Povrat novca kupcu"
#. module: account
#: wizard_view:account.analytic.account.chart,init:0
msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "Odaberite period analize"
#. module: account
#: field:account.tax,ref_tax_sign:0
@@ -703,12 +716,12 @@ msgstr ""
#: field:account.tax.template,ref_tax_sign:0
#: field:account.tax.template,tax_sign:0
msgid "Tax Code Sign"
-msgstr ""
+msgstr "Predznak Poreznog koda"
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Ukupan iznos dugovanja kupca"
#. module: account
#: view:account.move.line:0
@@ -723,39 +736,39 @@ msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
msgid "Analytic Invoice"
-msgstr ""
+msgstr "Analitički račun"
#. module: account
#: field:account.journal.column,field:0
msgid "Field Name"
-msgstr ""
+msgstr "Naziv polja"
#. module: account
#: field:account.tax.code,sign:0
#: field:account.tax.code.template,sign:0
msgid "Sign for parent"
-msgstr ""
+msgstr "Predznak za roditelja"
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Dnevnik knjiženja kraja godine"
#. module: account
#: view:product.product:0
#: view:product.template:0
msgid "Purchase Properties"
-msgstr ""
+msgstr "Nabavka"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
msgid "Can be draft or validated"
-msgstr ""
+msgstr "Može biti u pripremi ili potvrđen"
#. module: account
#: wizard_button:account.invoice.pay,init,reconcile:0
msgid "Partial Payment"
-msgstr ""
+msgstr "Delimično plaćanje"
#. module: account
#: wizard_view:account_use_models,create:0
@@ -770,23 +783,23 @@ msgstr ""
#: field:account.period,state:0
#: field:account.subscription,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Period to"
-msgstr ""
+msgstr "Razdoblje do"
#. module: account
#: field:account.account.type,partner_account:0
msgid "Partner account"
-msgstr ""
+msgstr "Konto partnera"
#. module: account
#: wizard_view:account.subscription.generate,init:0
msgid "Generate entries before:"
-msgstr ""
+msgstr "Generisi stavke pre:"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -794,7 +807,7 @@ msgstr ""
#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
#: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
msgid "Cost Ledger"
-msgstr ""
+msgstr "Knjiga troškova"
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
@@ -802,18 +815,18 @@ msgstr ""
#: 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 ""
+msgstr "(Ostaviti prazno za sve otvorene poslovne godine)"
#. module: account
#: field:account.invoice,move_lines:0
msgid "Move Lines"
-msgstr ""
+msgstr "Stavke knjiženja"
#. module: account
#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
#: model:ir.ui.menu,name:account.report_account_analytic_journal_print
msgid "Account cost and revenue by journal"
-msgstr ""
+msgstr "Troškovi i prihodi konta po dnevniku"
#. module: account
#: help:account.account.template,user_type:0
@@ -821,83 +834,85 @@ msgid ""
"These types are defined according to your country. The type contain more "
"information about the account and it's specificities."
msgstr ""
+"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
+"o kontu i njegovim specificnostima."
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "6"
-msgstr ""
+msgstr "6"
#. module: account
#: model:ir.ui.menu,name:account.next_id_30
msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Usklađivanje (zatvaranje) izvoda banke"
#. module: account
#: model:ir.model,name:account.model_account_account_template
msgid "Templates for Accounts"
-msgstr ""
+msgstr "Predlošci za konta"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
#: model:ir.model,name:account.model_account_analytic_account
#: model:ir.ui.menu,name:account.account_analytic_def_account
msgid "Analytic Accounts"
-msgstr ""
+msgstr "Analitička konta"
#. module: account
#: wizard_view:account.print.journal.report,init:0
#: model:ir.actions.wizard,name:account.wizard_print_journal
#: model:ir.ui.menu,name:account.menu_print_journal
msgid "Print Journal"
-msgstr ""
+msgstr "Stampa Dnevnika"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "konto.banka.nalozi,carobjak"
#. module: account
#: field:account.move.line,date_created:0
#: field:account.move.reconcile,create_date:0
msgid "Creation date"
-msgstr ""
+msgstr "Datum kreiranja"
#. module: account
#: wizard_button:account.invoice.refund,init,cancel_invoice:0
msgid "Cancel Invoice"
-msgstr ""
+msgstr "Storniraj račun"
#. module: account
#: field:account.journal.column,required:0
msgid "Required"
-msgstr ""
+msgstr "Neophodno"
#. module: account
#: field:product.category,property_account_expense_categ:0
#: field:product.template,property_account_expense:0
msgid "Expense Account"
-msgstr ""
+msgstr "Konto rashoda"
#. module: account
#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
msgid "Write-Off Journal"
-msgstr ""
+msgstr "Dnevnik otpisa"
#. module: account
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
msgid "Amount Currency"
-msgstr ""
+msgstr "Iznos u valuti"
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
msgid "Expense Category Account"
-msgstr ""
+msgstr "Konto kategorije troška"
#. module: account
#: wizard_field:account.fiscalyear.close,init,fy2_id:0
msgid "New Fiscal Year"
-msgstr ""
+msgstr "Nova poslovna godina"
#. module: account
#: help:account.tax,tax_group:0
@@ -909,12 +924,12 @@ msgstr ""
#. module: account
#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Poslovna godina za otvaranje"
#. module: account
#: view:account.config.wizard:0
msgid "Select Chart of Accounts"
-msgstr ""
+msgstr "Odaberite kontni plan"
#. module: account
#: field:account.analytic.account,quantity:0
@@ -927,7 +942,7 @@ msgstr ""
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
msgid "Quantity"
-msgstr ""
+msgstr "Količina"
#. module: account
#: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -935,33 +950,33 @@ msgstr ""
#: wizard_field:account.partner.balance.report,init,date2:0
#: wizard_field:account.third_party_ledger.report,init,date2:0
msgid "End date"
-msgstr ""
+msgstr "Krajnji datum"
#. module: account
#: field:account.invoice.tax,base_amount:0
msgid "Base Code Amount"
-msgstr ""
+msgstr "Iznos osnvice"
#. module: account
#: help:account.journal,user_id:0
msgid "The user responsible for this journal"
-msgstr ""
+msgstr "Odgovorna osoba za ovaj dnevnik"
#. module: account
#: field:account.journal,default_debit_account_id:0
msgid "Default Debit Account"
-msgstr ""
+msgstr "Osnovni dugovni konto"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Entries by Statements"
-msgstr ""
+msgstr "Stavke po izvodima"
#. module: account
#: model:process.transition,name:account.process_transition_analyticinvoice0
msgid "analytic Invoice"
-msgstr ""
+msgstr "analitički račun"
#. module: account
#: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -980,22 +995,22 @@ msgstr ""
#: wizard_field:account.print.journal.report,init,period_id:0
#: field:account.subscription,period_nbr:0
msgid "Period"
-msgstr ""
+msgstr "Razdoblje"
#. module: account
#: rml:account.partner.balance:0
msgid "Grand total"
-msgstr ""
+msgstr "Celokupni iznos"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_accounting
msgid "Financial Accounting"
-msgstr ""
+msgstr "Financijsko računovodstvo"
#. module: account
#: rml:account.invoice:0
msgid "Net Total:"
-msgstr ""
+msgstr "Neto Ukupno"
#. module: account
#: view:account.fiscal.position:0
@@ -1015,62 +1030,62 @@ msgstr ""
#: field:account.analytic.line,product_uom_id:0
#: field:account.move.line,product_uom_id:0
msgid "UoM"
-msgstr ""
+msgstr "JM"
#. module: account
#: wizard_field:account.third_party_ledger.report,init,page_split:0
msgid "One Partner Per Page"
-msgstr ""
+msgstr "Jedan partner po stranici"
#. module: account
#: field:account.account,child_parent_ids:0
#: field:account.account.template,child_parent_ids:0
msgid "Children"
-msgstr ""
+msgstr "Podređeni"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje poreza"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
#: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Novi nabavni račun"
#. module: account
#: wizard_field:account.invoice.pay,init,amount:0
msgid "Amount paid"
-msgstr ""
+msgstr "Plaćeni iznos"
#. module: account
#: selection:account.invoice,type:0
#: model:process.transition,name:account.process_transition_customerinvoice0
#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
msgid "Customer Invoice"
-msgstr ""
+msgstr "Račun kupca"
#. module: account
#: wizard_view:account.open_closed_fiscalyear,init:0
msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Izaberite fiskalnu godinu"
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
msgid "Main Sequence"
-msgstr ""
+msgstr "Glavna sekvenca"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
#: model:ir.ui.menu,name:account.account_analytic_journal_print
msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Stampaj analitičke dnevnike"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Voucher Nb"
-msgstr ""
+msgstr "Nbr Vaucera"
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -1078,73 +1093,75 @@ msgid ""
"The sequence field is used to order the payment term lines from the lowest "
"sequences to the higher ones"
msgstr ""
+"Polje redosled se upotrebljava za redjanje redova uslova plaćanja od "
+"najmanjeg do najvećeg"
#. module: account
#: field:account.bank.statement.reconcile,total_new:0
msgid "Total write-off"
-msgstr ""
+msgstr "Ukupni otpis"
#. module: account
#: view:account.tax.template:0
msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Kod za izračun cena sa uključenim porezima"
#. module: account
#: view:account.invoice.tax:0
#: model:ir.actions.act_window,name:account.action_tax_code_list
#: model:ir.ui.menu,name:account.menu_action_tax_code_list
msgid "Tax codes"
-msgstr ""
+msgstr "Šifre poreza"
#. module: account
#: field:account.fiscal.position.template,chart_template_id:0
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
-msgstr ""
+msgstr "Konto prihoda"
#. module: account
#: model:ir.actions.act_window,name:account.analytic_account_form
#: model:ir.ui.menu,name:account.account_analytic_form
msgid "New Analytic Account"
-msgstr ""
+msgstr "Novi analitički račun"
#. module: account
#: 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 Mapping Templates"
-msgstr ""
+msgstr "Predlozci poreskih mapiranja"
#. module: account
#: rml:account.invoice:0
#: field:account.invoice.line,price_unit:0
msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Period from :"
-msgstr ""
+msgstr "Razdoblje od :"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "carobnjak.vise.kontnih.naloga"
#. module: account
#: model:account.journal,name:account.sales_journal
msgid "Journal de vente"
-msgstr ""
+msgstr "Dnevnik Prodaje"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "Iznos je predstavljen opciono u drugoj valuti"
#. module: account
#: view:account.fiscal.position.template:0
@@ -1155,48 +1172,48 @@ msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
msgid "Terms"
-msgstr ""
+msgstr "Uslovi"
#. module: account
#: rml:account.vat.declaration:0
msgid "Tax Report"
-msgstr ""
+msgstr "Porezki izvestaj"
#. module: account
#: wizard_button:account.analytic.account.chart,init,open:0
#: wizard_button:account.chart,init,open:0
msgid "Open Charts"
-msgstr ""
+msgstr "Otvori kontne planove"
#. module: account
#: wizard_view:account.fiscalyear.close.state,init:0
msgid "Are you sure you want to close the fiscal year ?"
-msgstr ""
+msgstr "Da li ste sigurni da želite zatvoriti fiskalnu godinu ?"
#. module: account
#: selection:account.move,type:0
msgid "Bank Receipt"
-msgstr ""
+msgstr "Bancina primka"
#. module: account
#: view:res.partner:0
msgid "Bank account"
-msgstr ""
+msgstr "Bankovni račun"
#. module: account
#: field:account.chart.template,tax_template_ids:0
msgid "Tax Template List"
-msgstr ""
+msgstr "Lista predloška poreza"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Invoice import"
-msgstr ""
+msgstr "Uvoz računa"
#. module: account
#: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
msgid "Standard entry"
-msgstr ""
+msgstr "Standardna stavka"
#. module: account
#: help:account.account,currency_mode:0
@@ -1207,11 +1224,16 @@ msgid ""
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
+"Ovaj izbor ce diktirati kako ce se obracunavati stanje trenutnog kursa za "
+"izlazne transakcije. U vecini zemalja vazeci metod je \" srednji\", ali ce "
+"samo mali broj softwerskih sistema biti u mogucnosti da obradi to. Tako da "
+"ako uvozite iz nekog drugog softwerskog sistema bilo bi pametno da koristite "
+"kurs na datum. Dolazece transakcije uvek koriste vazeci kurs toga dana."
#. module: account
#: field:account.account,company_currency_id:0
msgid "Company Currency"
-msgstr ""
+msgstr "Valuta preduzeca"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1221,108 +1243,108 @@ msgstr ""
#. module: account
#: field:account.analytic.account,parent_id:0
msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Nadređeni analitički konto"
#. module: account
#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Zatvaranje s otpisom nezatvorenog dela"
#. module: account
#: field:account.move.line,tax_amount:0
msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Iznos poreza/osnovice"
#. module: account
#: help:wizard.multi.charts.accounts,code_digits:0
msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "Broj oznaka( brojeva) za upotrebu u šifri konta"
#. module: account
#: field:account.bank.statement,balance_end_real:0
msgid "Ending Balance"
-msgstr ""
+msgstr "Završni saldo"
#. module: account
#: view:product.product:0
msgid "Purchase Taxes"
-msgstr ""
+msgstr "Porezi nabavke"
#. module: account
#: field:account.payment.term.line,name:0
msgid "Line Name"
-msgstr ""
+msgstr "Naziv reda"
#. module: account
#: selection:account.payment.term.line,value:0
msgid "Fixed Amount"
-msgstr ""
+msgstr "Fiksni iznos"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Analytic Credit"
-msgstr ""
+msgstr "Analitika potraživanja"
#. module: account
#: field:account.move.line,reconcile_partial_id:0
#: wizard_button:account.move.line.reconcile,init_partial,partial:0
msgid "Partial Reconcile"
-msgstr ""
+msgstr "Delimično zatvaranje"
#. module: account
#: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
msgid "Not reconciled transactions"
-msgstr ""
+msgstr "Otvorene stavke"
#. module: account
#: view:account.fiscal.position:0
#: field:account.fiscal.position,tax_ids:0
#: field:account.fiscal.position.template,tax_ids:0
msgid "Tax Mapping"
-msgstr ""
+msgstr "Mapiranje poreza"
#. module: account
#: view:account.config.wizard:0
msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
#. module: account
#: field:account.payment.term.line,value:0
msgid "Value"
-msgstr ""
+msgstr "Vrednost"
#. module: account
#: 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 ""
+msgstr "Konto otpisa"
#. module: account
#: field:account.model.line,model_id:0
#: field:account.subscription,model_id:0
msgid "Model"
-msgstr ""
+msgstr "Model"
#. module: account
#: 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 ""
+msgstr "Zatvori fiskalnu godinu"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizirana stavka zatvaranja"
#. module: account
#: view:wizard.company.setup:0
msgid "Message"
-msgstr ""
+msgstr "Poruka"
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Odaberite račune koje želite da platite i unapredite ih"
#. module: account
#: selection:account.account,type:0
@@ -1331,7 +1353,7 @@ msgstr ""
#: selection:account.analytic.account,type:0
#: field:account.journal,view_id:0
msgid "View"
-msgstr ""
+msgstr "Pregled"
#. module: account
#: selection:account.account.balance.report,checktype,display_account:0
@@ -1339,24 +1361,24 @@ msgstr ""
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "All"
-msgstr ""
+msgstr "Sve"
#. module: account
#: field:account.move.line,analytic_lines:0
#: model:ir.model,name:account.model_account_analytic_line
msgid "Analytic lines"
-msgstr ""
+msgstr "Analiticki redovi"
#. module: account
#: help:account.tax,type:0
msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "Način izračuna iznosa poreza"
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Validated accounting entries."
-msgstr ""
+msgstr "Potvrđene računovodstvene stavke"
#. module: account
#: wizard_view:account.move.line.unreconcile,init:0
@@ -1365,32 +1387,34 @@ 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 ""
+"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
+"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
#. module: account
#: model:process.node,name:account.process_node_electronicfile0
msgid "Electronic File"
-msgstr ""
+msgstr "Elektronska datoteka"
#. module: account
#: view:res.partner:0
msgid "Customer Credit"
-msgstr ""
+msgstr "Potraživanja kupca"
#. module: account
#: field:account.invoice,tax_line:0
msgid "Tax Lines"
-msgstr ""
+msgstr "Redovi poreza"
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
-msgstr ""
+msgstr "Sekvence"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_type_form
#: model:ir.ui.menu,name:account.menu_action_account_type_form
msgid "Account Types"
-msgstr ""
+msgstr "Tipovi konta"
#. module: account
#: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1412,40 +1436,40 @@ msgstr ""
#: wizard_field:populate_statement_from_inv,init,journal_id:0
#: field:report.hr.timesheet.invoice.journal,journal_id:0
msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
#. module: account
#: field:account.account,child_id:0
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
-msgstr ""
+msgstr "Podređena konta"
#. module: account
#: field:account.account,check_history:0
msgid "Display History"
-msgstr ""
+msgstr "Prikaži Istoriju"
#. module: account
#: wizard_field:account.third_party_ledger.report,init,date1:0
msgid " Start date"
-msgstr ""
+msgstr " Početni datum"
#. module: account
#: wizard_field:account.account.balance.report,checktype,display_account:0
#: wizard_field:account.general.ledger.report,checktype,display_account:0
msgid "Display accounts "
-msgstr ""
+msgstr "Prikaži konta "
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
msgid "Statement reconcile line"
-msgstr ""
+msgstr "Red zatvaranja izvoda"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "Ostavite prazno za konto prihoda"
#. module: account
#: view:account.bank.statement.reconcile:0
@@ -1453,7 +1477,7 @@ msgstr ""
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
msgid "Write-Off"
-msgstr ""
+msgstr "Otpis"
#. module: account
#: help:account.invoice,partner_bank:0
@@ -1461,143 +1485,145 @@ msgid ""
"The partner bank account to pay\n"
"Keep empty to use the default"
msgstr ""
+"Partnerov bankovni racun da plati\n"
+"Ostavite prazno da koristite zadane vrednosti"
#. module: account
#: field:res.partner,debit:0
msgid "Total Payable"
-msgstr ""
+msgstr "Ukupno obaveze"
#. module: account
#: wizard_button:account.fiscalyear.close.state,init,close:0
msgid "Close states"
-msgstr ""
+msgstr "Zatvori stanja"
#. module: account
#: model:ir.model,name:account.model_wizard_company_setup
msgid "wizard.company.setup"
-msgstr ""
+msgstr "carobnjak.kompanija.setup"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "konto.analitika.prosireni.red"
#. module: account
#: field:account.journal,refund_journal:0
msgid "Refund Journal"
-msgstr ""
+msgstr "Dnevnik povrata"
#. module: account
#: model:account.account.type,name:account.account_type_income
msgid "Income"
-msgstr ""
+msgstr "Prihod"
#. module: account
#: selection:account.bank.statement.line,type:0
msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
#. module: account
#: rml:account.invoice:0
msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
-msgstr ""
+msgstr "Iznos poreza"
#. module: account
#: selection:account.account.type,sign:0
msgid "Positive"
-msgstr ""
+msgstr "Pozitivan"
#. module: account
#: wizard_view:account.general.journal.report,init:0
#: model:ir.actions.wizard,name:account.wizard_general_journal
#: model:ir.ui.menu,name:account.menu_general_journal
msgid "Print General Journal"
-msgstr ""
+msgstr "Stampa glavne knjige"
#. module: account
#: 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 ""
+msgstr "Predlošci kontnog plana"
#. module: account
#: field:account.invoice,move_id:0
msgid "Invoice Movement"
-msgstr ""
+msgstr "Knjiženja računa"
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
#: model:ir.ui.menu,name:account.menu_wizard
#: view:wizard.multi.charts.accounts:0
msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Generiraj kontni plan iz predloška"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Statements"
-msgstr ""
+msgstr "Zakonski izveštaji"
#. module: account
#: field:account.tax.code,parent_id:0
#: field:account.tax.code.template,parent_id:0
msgid "Parent Code"
-msgstr ""
+msgstr "Šifra nadređenog"
#. module: account
#: wizard_button:account.move.line.reconcile.select,init,open:0
msgid "Open for reconciliation"
-msgstr ""
+msgstr "Otvori za usklađivanje"
#. module: account
#: model:account.journal,name:account.bilan_journal
msgid "Journal d'ouverture"
-msgstr ""
+msgstr "Dnevnik Otvaranja"
#. module: account
#: selection:account.tax,tax_group:0
#: selection:account.tax.template,tax_group:0
msgid "VAT"
-msgstr ""
+msgstr "PDV"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "Account n°"
-msgstr ""
+msgstr "Br. računa"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
-msgstr "Zadrži prazno da bi koristio na kontu troškova"
+msgstr "Zadrži prazno za korištenje konta troška"
#. module: account
#: wizard_field:account.automatic.reconcile,init,account_ids:0
msgid "Account to reconcile"
-msgstr ""
+msgstr "Konto za zatvaranje"
#. 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 "Vezani partner"
#. 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 ""
+msgstr "Konta potraživanja i dugovanja partnera"
#. module: account
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
-msgstr ""
+msgstr "Redovi pretplate"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1605,43 +1631,43 @@ msgstr ""
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "Purchase"
-msgstr ""
+msgstr "Nabavka"
#. module: account
#: view:account.analytic.line:0
msgid "Total quantity"
-msgstr ""
+msgstr "Ukupna količina"
#. module: account
#: field:account.invoice,date_due:0
msgid "Due Date"
-msgstr ""
+msgstr "Datum dospeća"
#. module: account
#: wizard_view:account.period.close,init:0
#: wizard_button:account.period.close,init,close:0
msgid "Close Period"
-msgstr ""
+msgstr "Zatvori razdoblje"
#. module: account
#: rml:account.overdue:0
msgid "Due"
-msgstr ""
+msgstr "Рок"
#. module: account
#: rml:account.journal.period.print:0
msgid "Third party"
-msgstr ""
+msgstr "Treća strana"
#. module: account
#: view:account.journal:0
msgid "Accounts Type Allowed (empty for no control)"
-msgstr ""
+msgstr "Dozvoljene vrste konta (prazno za bez kontrole)"
#. module: account
#: field:account.bank.statement,balance_start:0
msgid "Starting Balance"
-msgstr ""
+msgstr "Početni saldo"
#. module: account
#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1649,132 +1675,132 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
#: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
msgid "Journals"
-msgstr ""
+msgstr "Dnevnici"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Max Qty:"
-msgstr ""
+msgstr "Max. kol.:"
#. module: account
#: wizard_button:account.invoice.refund,init,refund:0
msgid "Refund Invoice"
-msgstr ""
+msgstr "Storno računi"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_period_tree
#: model:ir.actions.wizard,name:account.wizard_period_close
#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
msgid "Close a Period"
-msgstr ""
+msgstr "Zatvori razdoblje"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
msgid "Costs & Revenues"
-msgstr ""
+msgstr "Troškovi & prihodi"
#. module: account
#: constraint:account.account:0
msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivna konta"
#. module: account
#: rml:account.tax.code.entries:0
msgid "Account Number"
-msgstr ""
+msgstr "Broj računa"
#. module: account
#: view:account.config.wizard:0
msgid "Skip"
-msgstr ""
+msgstr "Preskoči"
#. module: account
#: field:account.invoice,period_id:0
msgid "Force Period"
-msgstr ""
+msgstr "Forsiraj razdoblje"
#. module: account
#: help:account.account.type,sequence:0
msgid "Gives the sequence order when displaying a list of account types."
-msgstr ""
+msgstr "Daje redoslijed pri prikazu liste vrsta konta."
#. module: account
#: view:account.invoice:0
msgid "Re-Open"
-msgstr ""
+msgstr "Ponovno otvori"
#. module: account
#: wizard_view:account.fiscalyear.close,init:0
msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "Jeste sigurni da želite kreirati stavke?"
#. module: account
#: field:account.tax,include_base_amount:0
msgid "Include in base amount"
-msgstr ""
+msgstr "Uključi u osnovicu"
#. module: account
#: rml:account.analytic.account.analytic.check:0
msgid "Delta Credit"
-msgstr ""
+msgstr "Razlika potražuje"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
#: model:ir.actions.wizard,name:account.wizard_unreconcile
msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Poništi zatvaranje stavki"
#. module: account
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Pre-generated invoice from control"
-msgstr ""
+msgstr "Prethodno generisani račun iz kontrole"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
msgid "Cost Legder for period"
-msgstr ""
+msgstr "Knjiga troškova za razdoblje"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
msgid "New Statement"
-msgstr ""
+msgstr "Nova Stavka"
#. module: account
#: wizard_field:account.analytic.account.chart,init,from_date:0
#: wizard_field:account.analytic.line,init,from_date:0
msgid "From"
-msgstr ""
+msgstr "Od"
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
#: model:process.node,note:account.process_node_supplierreconciliation0
msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr ""
+msgstr "Zatvaranje stavke računa i plaćanja"
#. module: account
#: wizard_view:account.central.journal.report,init:0
#: model:ir.actions.wizard,name:account.wizard_central_journal
#: model:ir.ui.menu,name:account.menu_central_journal
msgid "Print Central Journal"
-msgstr ""
+msgstr "Stampa Glavnog dnevnika"
#. module: account
#: wizard_field:account.aged.trial.balance,init,period_length:0
msgid "Period length (days)"
-msgstr ""
+msgstr "Duzina razdoblja (dana)"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Percent"
-msgstr ""
+msgstr "Procenat"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_charts
msgid "Charts"
-msgstr ""
+msgstr "Kontni planovi"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1782,46 +1808,46 @@ msgstr ""
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "Sale"
-msgstr ""
+msgstr "Prodaja"
#. module: account
#: wizard_button:account.account.balance.report,account_selection,checktype:0
#: wizard_button:account.general.ledger.report,account_selection,checktype:0
msgid "Next"
-msgstr ""
+msgstr "Sledeće"
#. module: account
#: help:res.partner,property_account_position:0
msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
-msgstr ""
+msgstr "Fiskalno mapiranje ce odrediti poreze i konta koristena za partnera"
#. module: account
#: rml:account.analytic.account.cost_ledger:0
msgid "Date or Code"
-msgstr ""
+msgstr "Datum ili šifra"
#. module: account
#: field:account.analytic.account,user_id:0
msgid "Account Manager"
-msgstr ""
+msgstr "Upravnik računovodstva"
#. module: account
#: rml:account.analytic.account.journal:0
msgid "to :"
-msgstr ""
+msgstr "u :"
#. module: account
#: wizard_field:account.move.line.reconcile,init_full,debit:0
#: wizard_field:account.move.line.reconcile,init_partial,debit:0
msgid "Debit amount"
-msgstr ""
+msgstr "Iznos duguje"
#. module: account
#: selection:account.subscription,period_type:0
msgid "year"
-msgstr ""
+msgstr "година"
#. module: account
#: wizard_button:account.account.balance.report,checktype,report:0
@@ -1838,17 +1864,17 @@ msgstr ""
#: wizard_button:account.print.journal.report,init,print:0
#: wizard_button:account.third_party_ledger.report,init,checkreport:0
msgid "Print"
-msgstr ""
+msgstr "Štampaj"
#. module: account
#: wizard_field:account.account.balance.report,checktype,date_from:0
msgid "Start date"
-msgstr ""
+msgstr "Datum početka"
#. module: account
#: model:account.journal,name:account.refund_expenses_journal
msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "x Dnevnik knjižnih odobrenja troškova"
#. module: account
#: field:account.analytic.journal,type:0
@@ -1859,50 +1885,50 @@ msgstr ""
#: field:account.move.reconcile,type:0
#: xsl:account.transfer:0
msgid "Type"
-msgstr ""
+msgstr "Tip"
#. module: account
#: view:account.journal:0
msgid "Accounts Allowed (empty for no control)"
-msgstr ""
+msgstr "Dozvoljena konta (prazno bez kontrole)"
#. module: account
#: view:account.invoice:0
msgid "Untaxed amount"
-msgstr ""
+msgstr "Neoporezovani iznos"
#. module: account
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Konto poreza"
#. module: account
#: view:account.move.line:0
msgid "Analytic Lines"
-msgstr ""
+msgstr "Redovi analitike"
#. module: account
#: wizard_view:account.invoice.pay,init:0
#: model:ir.actions.wizard,name:account.wizard_invoice_pay
msgid "Pay invoice"
-msgstr ""
+msgstr "Plati račun"
#. module: account
#: constraint:account.invoice:0
msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Greška: Neispravan Bvr broj (kontrolna oznaka)."
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree5
#: model:ir.ui.menu,name:account.menu_invoice_draft
msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Izlazni računi u pripremi"
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
msgid "Account Subscription Line"
-msgstr ""
+msgstr "Redovi pretplatnog naloga"
#. module: account
#: selection:account.account.balance.report,checktype,state:0
@@ -1910,89 +1936,89 @@ msgstr ""
#: selection:account.partner.balance.report,init,state:0
#: selection:account.third_party_ledger.report,init,state:0
msgid "No Filter"
-msgstr ""
+msgstr "Bez filtera"
#. module: account
#: field:account.payment.term.line,days:0
msgid "Number of Days"
-msgstr ""
+msgstr "Broj Dana"
#. module: account
#: help:account.invoice,reference:0
msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Partnerova refenerenca ovog racuna"
#. module: account
#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
msgid "Sort by:"
-msgstr ""
+msgstr "Poređaj po:"
#. module: account
#: field:account.move,to_check:0
msgid "To Be Verified"
-msgstr ""
+msgstr "Da bude verifikovano"
#. module: account
#: help:res.partner,debit:0
msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "Ukupni iznos koji trebas platiti ovom dobavljacu"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "7"
-msgstr ""
+msgstr "7"
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
-msgstr ""
+msgstr "Prenos"
#. module: account
#: rml:account.overdue:0
msgid "Li."
-msgstr ""
+msgstr "Li."
#. module: account
#: wizard_view:account.chart,init:0
msgid "Account charts"
-msgstr ""
+msgstr "Kontni planovi"
#. module: account
#: help:account.tax,name:0
msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Naziv koji će se ispisati na izvještajima."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
#: rml:account.analytic.account.quantity_cost_ledger:0
msgid "Printing date"
-msgstr ""
+msgstr "Datum stampe"
#. module: account
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
#. module: account
#: wizard_field:account.partner.balance.report,init,date1:0
msgid " Start date"
-msgstr ""
+msgstr " Početni datum"
#. module: account
#: wizard_view:account.analytic.account.journal.report,init:0
msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Dnevnik knjiženja analitike"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
-msgstr ""
+msgstr "Povrat Musteriji"
#. module: account
#: rml:account.vat.declaration:0
msgid "Tax Amount"
-msgstr ""
+msgstr "Iznos poreza"
#. module: account
#: rml:account.analytic.account.quantity_cost_ledger:0
@@ -2002,7 +2028,7 @@ msgstr ""
#. module: account
#: field:account.journal.period,name:0
msgid "Journal-Period Name"
-msgstr ""
+msgstr "Naziv dnevnika-razdoblja"
#. module: account
#: field:account.tax.code,name:0
@@ -2028,7 +2054,7 @@ msgstr ""
#: wizard_field:account.third_party_ledger.report,init,result_selection:0
#: field:wizard.company.setup,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Partner"
#. module: account
#: help:account.invoice,number:0
@@ -2036,41 +2062,42 @@ msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
msgstr ""
+"Jedinstveni broj racuna, koji se automatski kreira kada se racun kreira"
#. module: account
#: rml:account.invoice:0
msgid "Draft Invoice"
-msgstr ""
+msgstr "Neodobreni računi"
#. module: account
#: model:account.account.type,name:account.account_type_expense
msgid "Expense"
-msgstr ""
+msgstr "Trošak"
#. module: account
#: field:account.journal,invoice_sequence_id:0
msgid "Invoice Sequence"
-msgstr ""
+msgstr "Sekvenca računa"
#. module: account
#: wizard_view:account.automatic.reconcile,init:0
msgid "Options"
-msgstr ""
+msgstr "Opcije"
#. module: account
#: model:process.process,name:account.process_process_invoiceprocess0
msgid "Customer Invoice Process"
-msgstr ""
+msgstr "Proces izlacnog računa"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Napomena Fiskalnog mapiranja:"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
msgid "Opening Entries Period"
-msgstr ""
+msgstr "Period početnog stanja"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2082,12 +2109,12 @@ msgstr ""
#. module: account
#: selection:account.subscription,period_type:0
msgid "days"
-msgstr ""
+msgstr "dana"
#. module: account
#: selection:account.aged.trial.balance,init,direction_selection:0
msgid "Past"
-msgstr ""
+msgstr "Prošlost"
#. module: account
#: field:account.analytic.account,company_currency_id:0
@@ -2101,103 +2128,103 @@ msgstr ""
#: field:account.model.line,currency_id:0
#: field:account.move.line,currency_id:0
msgid "Currency"
-msgstr ""
+msgstr "Valuta"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
msgid "Unpaid invoices"
-msgstr ""
+msgstr "Neplaćeni računi"
#. module: account
#: model:process.transition,name:account.process_transition_paymentreconcile0
msgid "Payment Reconcile"
-msgstr ""
+msgstr "Zatvaranje plaćanja"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
msgid "Statements reconciliation"
-msgstr ""
+msgstr "Zatvaranje izvoda"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
#: model:ir.ui.menu,name:account.menu_action_subscription_form_new
msgid "New Subscription"
-msgstr ""
+msgstr "Nova pretplata"
#. module: account
#: view:account.payment.term:0
msgid "Computation"
-msgstr ""
+msgstr "Proračun"
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Entry"
-msgstr ""
+msgstr "Stavka analitike"
#. module: account
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Poruka kod prekoračenja roka plaćanja"
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_tree
#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
msgid "Chart of Taxes"
-msgstr ""
+msgstr "Shema poreza"
#. module: account
#: field:account.payment.term.line,value_amount:0
msgid "Value Amount"
-msgstr ""
+msgstr "Iznos"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
msgid "Reconciled entries"
-msgstr ""
+msgstr "Zatvorene stavke"
#. module: account
#: field:account.invoice,address_contact_id:0
msgid "Contact Address"
-msgstr ""
+msgstr "Kontakt Adresa"
#. module: account
#: view:account.fiscalyear:0
msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "Kreiraj 3-mesecni period"
#. module: account
#: view:account.invoice:0
msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(ostaviti prazno ako želite koristiti tekuće razdoblje)"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree8
#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
msgid "Draft Supplier Invoices"
-msgstr ""
+msgstr "Nepotvrđeni ulazni računi"
#. module: account
#: wizard_field:account.invoice.refund,init,period:0
msgid "Force period"
-msgstr ""
+msgstr "Forsiraj period"
#. module: account
#: selection:account.account.type,close_method:0
msgid "Detail"
-msgstr ""
+msgstr "Detalji"
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
msgid "Consolidation"
-msgstr ""
+msgstr "Konsolidacija"
#. module: account
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
-msgstr ""
+msgstr "Osnovni nalog (root)"
#. module: account
#: rml:account.overdue:0
@@ -2206,11 +2233,14 @@ msgid ""
"stay unpaid. Please, take appropriate measures in order to carry out this "
"payment in the next 8 days."
msgstr ""
+"Ako se ne radi o našoj grešci, čini se da su sledeći računi ostali "
+"neplaćeni. Molimo preduzmite potrebne mere da se izvrši plaćanje u roku od "
+"sljedećih 8 dana."
#. module: account
#: rml:account.invoice:0
msgid "VAT :"
-msgstr ""
+msgstr "PDV :"
#. module: account
#: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2219,38 +2249,38 @@ msgstr ""
#: 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 ""
+msgstr "Kontni plan"
#. module: account
#: model:account.journal,name:account.check_journal
msgid "x Checks Journal"
-msgstr ""
+msgstr "x Dnevnik čekova"
#. 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 ""
+msgstr "Kreiraj stavke pretplate"
#. module: account
#: wizard_field:account.fiscalyear.close,init,journal_id:0
msgid "Opening Entries Journal"
-msgstr ""
+msgstr "Dnevnik početnog stanja"
#. module: account
#: view:account.config.wizard:0
msgid "Create a Fiscal Year"
-msgstr ""
+msgstr "Kreiraj Fiskalnu Godinu"
#. module: account
#: field:product.template,taxes_id:0
msgid "Customer Taxes"
-msgstr ""
+msgstr "Porezi kod prodaje"
#. module: account
#: field:account.invoice,date_invoice:0
msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum izrade računa"
#. module: account
#: help:account.account.balance.report,checktype,periods:0
@@ -2259,27 +2289,29 @@ msgstr ""
#: help:account.third_party_ledger.report,init,periods:0
#: help:account.vat.declaration,init,periods:0
msgid "All periods if empty"
-msgstr ""
+msgstr "Ako je prazno, sva razdoblja"
#. module: account
#: model:account.account.type,name:account.account_type_liability
msgid "Liability"
-msgstr ""
+msgstr "Obveza"
#. module: account
#: selection:account.automatic.reconcile,init,power:0
msgid "2"
-msgstr ""
+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 ""
+"(Ukoliko ne selektujete Fiskalnu godinu, uzece se u obzir sve otvorene "
+"fiskalne godine)"
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Porezka osnovica"
#. module: account
#: rml:account.analytic.account.journal:0
@@ -2299,46 +2331,46 @@ msgstr ""
#: rml:account.third_party_ledger_other:0
#: xsl:account.transfer:0
msgid "Date"
-msgstr ""
+msgstr "Datum"
#. module: account
#: field:account.invoice,reference_type:0
msgid "Reference Type"
-msgstr ""
+msgstr "Tip reference"
#. module: account
#: wizard_button:account.move.line.unreconcile,init,unrec:0
#: wizard_button:account.reconcile.unreconcile,init,unrec:0
msgid "Unreconcile"
-msgstr ""
+msgstr "Poništi zatvaranje"
#. module: account
#: field:account.tax,type:0
#: field:account.tax.template,type:0
msgid "Tax Type"
-msgstr ""
+msgstr "Vrsta poreza"
#. module: account
#: model:process.transition,name:account.process_transition_statemententries0
msgid "Statement Entries"
-msgstr ""
+msgstr "Stavke izvoda"
#. module: account
#: field:account.analytic.line,user_id:0
#: field:account.journal,user_id:0
msgid "User"
-msgstr ""
+msgstr "Korisnik"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_template_form
#: model:ir.ui.menu,name:account.menu_action_account_template_form
msgid "Account Templates"
-msgstr ""
+msgstr "Predlošci konta"
#. module: account
#: view:account.chart.template:0
msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
#. module: account
#: model:account.journal,name:account.refund_sales_journal
@@ -2348,28 +2380,28 @@ msgstr ""
#. module: account
#: rml:account.journal.period.print:0
msgid "Voucher No"
-msgstr ""
+msgstr "Br Potvrde"
#. module: account
#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatsko zatvaranje"
#. module: account
#: view:account.bank.statement:0
msgid "Import Invoice"
-msgstr ""
+msgstr "Uvezi račun(e)"
#. module: account
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
msgid "and Journals"
-msgstr ""
+msgstr "i dnevnike"
#. module: account
#: view:account.tax:0
msgid "Account Tax"
-msgstr ""
+msgstr "Konto poreza"
#. module: account
#: field:account.analytic.line,move_id:0
@@ -2379,7 +2411,7 @@ msgstr "Pomeri liniju"
#. module: account
#: field:account.bank.accounts.wizard,acc_no:0
msgid "Account No."
-msgstr ""
+msgstr "Broj računa"
#. module: account
#: help:account.tax,child_depend:0
@@ -2387,11 +2419,13 @@ msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
+"Označite ako se porez računa na osnovi podređenih poreza umesto na osnovi "
+"ukupnog iznosa."
#. module: account
#: rml:account.central.journal:0
msgid "Journal Code"
-msgstr ""
+msgstr "Šifra dnevnika"
#. module: account
#: help:account.tax,applicable_type:0
@@ -2399,16 +2433,18 @@ msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
+"Ako nije primenjivo (izračunato Python kodom), porez se neće iskazati na "
+"računu."
#. module: account
#: field:account.model,lines_id:0
msgid "Model Entries"
-msgstr ""
+msgstr "Stavke modela"
#. module: account
#: field:account.analytic.account,date:0
msgid "Date End"
-msgstr ""
+msgstr "Završni datum"
#. module: account
#: view:account.bank.statement:0
@@ -2417,13 +2453,13 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_move_line_tree1
#: model:ir.ui.menu,name:account.menu_action_move_line_search
msgid "Entry Lines"
-msgstr ""
+msgstr "Stavke"
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "Primjenjeni kod (ako je tip=Python kod)"
#. module: account
#: wizard_button:account.move.journal,init,open:0
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 6f1094599b5..6e1ba112606 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -58,8 +58,7 @@
-
-
+
@@ -67,6 +66,8 @@
+
+
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 6f6dca22e46..8e9c04b788d 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -33,8 +33,8 @@
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index d6c4b82e960..a1aeb93252c 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -147,10 +147,10 @@
+
-
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 58987e1ff3e..2d3a600a78b 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 20:16+0000\n"
-"Last-Translator: simone.sandri \n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 1ad3edd0760..79509542015 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -77,9 +77,9 @@
+
-
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 7bc64a825ae..ad44b842587 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -148,12 +148,14 @@
-
+
-
+
+
+
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5f68cf98c1a..bfaa59adf2d 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -187,7 +187,7 @@ class account_analytic_account(osv.osv):
'credit': fields.function(_credit_calc, method=True, type='float', string='Credit'),
'quantity': fields.function(_quantity_calc, method=True, type='float', string='Quantity'),
'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'),
- 'partner_id': fields.many2one('res.partner', 'Associated Partner'),
+ 'partner_id': fields.many2one('res.partner', 'Partner'),
'contact_id': fields.many2one('res.partner.address', 'Contact'),
'user_id': fields.many2one('res.users', 'Account Manager'),
'date_start': fields.date('Date Start'),
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 1d151da2e95..fea9b2cd23e 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 29affbf3bf3..478065209f3 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.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-08-11 05:35+0000\n"
-"Last-Translator: ub121 \n"
+"PO-Revision-Date: 2010-10-12 14:21+0000\n"
+"Last-Translator: sugi \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
@@ -41,7 +41,7 @@ msgstr "Аналитик данс"
#: view:account.analytic.account:0
#: field:account.analytic.account,user_product_ids:0
msgid "Users/Products Rel."
-msgstr ""
+msgstr "Хэрэглэгч/Бүтээгдэхүүн"
#. module: analytic_user_function
#: field:analytic_user_funct_grid,user_id:0
@@ -59,9 +59,9 @@ msgstr ""
#. module: analytic_user_function
#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
msgid "Analytic User Function"
-msgstr ""
+msgstr "Аналитик хэрэглэгчийн үүрэг"
#. module: analytic_user_function
#: view:analytic_user_funct_grid:0
msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик данс"
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index a3fb7b5a28a..43de651e554 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -123,7 +123,7 @@
-
+
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
index 8ec4746dcf8..42eb72c18ff 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/addons/auction/wizard/auction_lots_make_invoice_view.xml b/addons/auction/wizard/auction_lots_make_invoice_view.xml
index 56903865e5f..4399c689f25 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_view.xml
+++ b/addons/auction/wizard/auction_lots_make_invoice_view.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index ba91c4b75dd..bc581955571 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -313,6 +313,11 @@
+
-
@@ -475,7 +475,7 @@
-
+
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 986ab70c5c5..9a8776d2680 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -7,15 +7,23 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:48+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-10-12 12:08+0000\n"
+"Last-Translator: Quentin THEURET \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-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
+#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid ""
+"Enable the VAT Number for the partner. Check the validity of that VAT Number."
+msgstr ""
+"Active le numéro de TVA sur la fiche partenaire. Vérifie la validité du "
+"numéro de TVA."
+
#. module: base_vat
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
index 99f04fa4284..258499f1a37 100644
--- a/addons/claim_from_delivery/i18n/de.po
+++ b/addons/claim_from_delivery/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: claim_from_delivery
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 978b6e1a889..e934fe2980f 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -36,7 +36,7 @@
+ on_change="onchange_dates(date,duration,False,allday)" readonly="1" />
@@ -244,6 +244,9 @@
+
@@ -253,9 +256,6 @@
-
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 595da873115..127f006544c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -40,10 +40,10 @@
states="draft,open,pending" icon="gtk-redo"
name="action_make_meeting" type="object" />
+
-
@@ -105,6 +105,9 @@
+
@@ -116,9 +119,6 @@
-
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index d3da4ded812..7fe654c511f 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-11 13:45+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) \n"
+"PO-Revision-Date: 2010-10-12 07:49+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 6ca978ea153..75189fb70f5 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -26,6 +26,9 @@
invisible="context.get('invisible_section', True)" />
+
@@ -39,9 +42,6 @@
-
@@ -59,10 +59,10 @@
+
-
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6b5f21df920..a52c5d7e93f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -53,6 +53,9 @@
+
@@ -62,9 +65,6 @@
-
@@ -130,6 +130,9 @@
+
@@ -139,9 +142,6 @@
-
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 6bcf019dabe..f38b46c0a5e 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -54,6 +54,9 @@
+
@@ -66,9 +69,6 @@
-
@@ -115,6 +115,9 @@
+
@@ -128,9 +131,6 @@
-
diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po
index fe0003a7ecc..9175de4b202 100644
--- a/addons/crm_fundraising/i18n/nl.po
+++ b/addons/crm_fundraising/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 12:29+0000\n"
-"PO-Revision-Date: 2010-10-11 09:58+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) \n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_fundraising
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0531092dd98..b792097534d 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -69,6 +69,9 @@
+
@@ -82,9 +85,6 @@
-
+
@@ -200,9 +203,6 @@
-
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index e1d802b6cf6..0db6e9f1a16 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 13:01+0000\n"
-"PO-Revision-Date: 2010-10-11 08:22+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) \n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_helpdesk
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index ab14e7ca7b0..c340483f024 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -100,6 +100,9 @@
invisible="context.get('invisible_section', True)" />
+
@@ -113,9 +116,6 @@
-
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index d2218ef9d4c..12710962429 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: decimal_precision
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
new file mode 100644
index 00000000000..06dd36acc4e
--- /dev/null
+++ b/addons/document_webdav/i18n/da.po
@@ -0,0 +1,31 @@
+# Danish 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-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-10-12 13:21+0000\n"
+"Last-Translator: Martin Pihl \n"
+"Language-Team: Danish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Dette er et komplet dokumenthåndteringssystem\n"
+"\t* WebDav Interface\n"
+"\t* Brugergodkendelse\n"
+"\t* Dokumentindeksering\n"
diff --git a/addons/event/event.py b/addons/event/event.py
index 5c510ede613..192844f3f20 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -211,7 +211,7 @@ class event_event(osv.osv):
'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
help="Total of Open and Done Registrations"),
'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
- help="Total of Prospect Registrations"),
+ help="Total of Prospect Registrati./event/event.py:41:ons"),
'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
@@ -262,8 +262,15 @@ class event_event(osv.osv):
return True
+ def _check_closing_date(self, cr, uid, ids):
+ for event in self.browse(cr, uid, ids):
+ if event.date_end < event.date_begin:
+ return False
+ return True
+
_constraints = [
- (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id'])
+ (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id']),
+ (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
]
def do_team_change(self, cr, uid, ids, team_id, context=None):
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 58204352ac4..c740114789a 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -7,7 +7,7 @@
name="Human Resources"
parent="base.dashboard"/>
-
+
board.hr.form
board.board
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 655b9d9bfd1..c05836c393a 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -97,7 +97,7 @@ class hr_job(osv.osv):
'requirements': fields.text('Requirements'),
'department_id': fields.many2one('hr.department', 'Department'),
'company_id': fields.many2one('res.company', 'Company'),
- 'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
+ 'state': fields.selection([('open', 'In Position'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
}
_defaults = {
'expected_employees': 1,
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index f76d1457aa1..ae8e30b23f0 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -16,5 +16,10 @@
Widower
+
+ Administrator
+
+
+
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e171f2dfba7..2b1cd596024 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -340,10 +340,10 @@
-
-
-
-
+
+
+
+
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 1bd615b8699..cdeb2ca77a3 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -48,10 +48,6 @@ class hr_installer(osv.osv_memory):
'hr_payroll_account': fields.boolean('Payroll Accounting',
help="Generic Payroll system Integrated with Accountings."),
}
- _defaults = {
- 'hr_holidays': True,
- 'hr_expense': True,
- }
hr_installer()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 44d09bec6cd..7070db1d5b2 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -52,11 +52,11 @@
-
+
-
-
-
+
+
+
@@ -72,7 +72,7 @@
hr.attendance
form
tree,form
- {"search_default_employee":1}
+ {"search_default_today":1}
Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attendance machine using OpenERP's webservices features.
@@ -81,7 +81,7 @@
-
+
hr.action.reason.form
@@ -116,7 +116,9 @@
-
+
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index bfcd9ff8b76..440afa2894e 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -105,7 +105,7 @@
-
+
@@ -146,8 +146,8 @@
-
-
+
+
@@ -157,9 +157,12 @@
-
+
+
+
+
diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml
index 5a67fe1945d..70d6245b1ee 100644
--- a/addons/hr_evaluation/board_hr_evaluation_view.xml
+++ b/addons/hr_evaluation/board_hr_evaluation_view.xml
@@ -14,19 +14,14 @@
board.hr.evaluation.form
board.board
-
+
form
-
-
-
+
+
+
-
+
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 69dbad767d9..e79f581dce0 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -20,12 +20,12 @@
board.hr.expense.form
board.board
-
+
form
-
-
-
+
+
+
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b30b22c559a..5d22113272c 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -145,12 +145,12 @@
+
-
@@ -168,7 +168,7 @@
Expenses
hr.expense.expense
form
- {"search_default_user_id":uid,"search_default_department_id": department_id,"search_default_this":1}
+ {"search_default_user_id":uid}
The OpenERP expenses management module allows you to track the full flow. Every month, the employees record their expenses. At the end of the month, their managers validates the expenses sheets which creates costs on projects/analytic accounts. The accountant validates the proposed entries and the employee can be reimbursed. You can also reinvoice the customer at the end of the flow.
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 435465e3ddd..f06b41e69da 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -56,6 +56,7 @@
'security/ir.model.access.csv',
'hr_holidays_workflow.xml',
'hr_holidays_view.xml',
+ 'hr_holidays_data.xml',
'hr_holidays_wizard.xml',
'hr_holidays_report.xml',
'report/hr_holidays_report_view.xml',
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index 86786ad1baf..00412073532 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -22,36 +22,36 @@
board.hr.holidays.form
board.board
-
+
form
-
-
-
+
+
+
-
+
-
- Leaves by Month
- ir.actions.act_window
- available.holidays.report
- form
- graph,tree
- [('user_id','=',uid)]
+
+ Leaves by Month
+ ir.actions.act_window
+ available.holidays.report
+ form
+ graph,tree
+ [('user_id','=',uid)]
{'group_by_no_leaf':1,'group_by':['month']}
-
-
-
+
+
+
board.hr.holidays.leave.month.form
board.board
- form
-
+ form
+
-
-
-
+
+
+
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 356d697f2c1..eca3c02f301 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -110,9 +110,9 @@ class hr_holidays_status(osv.osv):
# To do: we can add remaining_leaves_category field to display remaining leaves for particular type
_columns = {
- 'name': fields.char('Name', size=64, required=True, translate=True),
+ 'name': fields.char('Leave Type', size=64, required=True, translate=True),
'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 in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
+ 'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('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 in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
'limit': fields.boolean('Allow to Override Limit', help='If you tick 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 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'),
@@ -162,7 +162,7 @@ class hr_holidays(osv.osv):
'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
'category_id': fields.many2one('hr.employee.category', "Category", help='Category Of employee'),
- 'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category'),
+ 'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
}
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
new file mode 100644
index 00000000000..54f53f47a32
--- /dev/null
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ Casual Leave
+ True
+ black
+
+
+
+
+ Legal Holidays
+ blue
+
+
+
+
+ Sick Leave
+ True
+ red
+
+
+
+
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index e59bd5a0353..e12d7de16b5 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -2,13 +2,6 @@
-
-
- Casual Leave
- True
- black
-
-
Casual Leave for Fabien Pinckaers
@@ -27,13 +20,6 @@
-
-
- Sick Leave
- True
- red
-
-
Doctor Appointment
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 124e424f620..1f57b25d402 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -15,10 +15,15 @@
-
-
+
+
+
@@ -32,14 +37,14 @@
-
+
-
-
+
-
-
+
+
@@ -89,9 +94,9 @@
-
-
+
+
@@ -112,7 +117,7 @@
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 0780f644296..406f344f044 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_payroll
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 75ad6101e11..84e7db409ab 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -33,6 +33,29 @@ class hr_employee(osv.osv):
'product_id': fields.many2one('product.product', 'Product', help="Specifies employee's designation as a product with type 'service'."),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal')
}
+
+ def _getAnalyticJournal(self, cr, uid, context=None):
+ md = self.pool.get('ir.model.data')
+ try:
+ result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+ return result[1]
+ except ValueError, e:
+ pass
+ return False
+
+ def _getEmployeeProduct(self, cr, uid, context=None):
+ md = self.pool.get('ir.model.data')
+ try:
+ result = md.get_object_reference(cr, uid, 'hr_timesheet', 'product_consultant')
+ return result[1]
+ except ValueError, e:
+ pass
+ return False
+
+ _defaults = {
+ 'journal_id' : _getAnalyticJournal,
+ 'product_id' : _getEmployeeProduct
+ }
hr_employee()
diff --git a/addons/hr_timesheet/hr_timesheet_data.xml b/addons/hr_timesheet/hr_timesheet_data.xml
index 08a769d7ee6..e7cb3d5e0d4 100644
--- a/addons/hr_timesheet/hr_timesheet_data.xml
+++ b/addons/hr_timesheet/hr_timesheet_data.xml
@@ -6,5 +6,17 @@
Timesheet Journal
general
+
+
+ 75.0
+ 30.0
+
+
+ Service on Timesheet
+
+ service
+
+
+
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index f344b60c83e..e7ba5c91342 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -2,20 +2,6 @@
-
- DEV
- 75.0
- 30.0
-
-
- Consultancy - Senior Developer
-
- service
- produce
- make_to_order
-
-
-
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a47fbf24685..08ec23bd872 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -22,7 +22,6 @@
-
@@ -111,7 +110,7 @@
-
+
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 7f79051edce..f605fd760be 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -63,7 +63,8 @@ class account_analytic_account(osv.osv):
_inherit = "account.analytic.account"
_columns = {
- 'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
+ 'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist',
+ help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."),
'amount_max': fields.float('Max. Invoice Price'),
'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
help="Total invoiced"),
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 4beda0999d0..4a70a80f381 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -80,7 +80,7 @@
-
+
@@ -112,7 +112,7 @@
- Costs to Invoice
+ Bill Tasks Works
account.analytic.line
form
tree,form
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 1bb7765b372..475315068ae 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -35,31 +35,14 @@ class hr_timesheet_invoice_create(osv.osv_memory):
_name = 'hr.timesheet.invoice.create'
_description = 'Create invoice from timesheet'
_columns = {
- 'accounts': fields.many2many('account.analytic.account', 'invoice_id', 'account_id', 'Analytic Accounts', required=True),
'date': fields.boolean('Date', help='The real date of each work will be displayed on the invoice'),
'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'),
'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'),
'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'),
'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'),
- }
-
- def _get_accounts(self, cr, uid, context=None):
- if context is None:
- context = {}
- if not len(context['active_ids']):
- return {}
- #Checking whether the analytic line is invoiced or not
- analytic_line_obj = self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context)
- for obj_acc in analytic_line_obj:
- if obj_acc.invoice_id and obj_acc.invoice_id.state !='cancel':
- raise osv.except_osv(_('Warning'),_('The analytic entry "%s" is already invoiced!')%(obj_acc.name,))
-
- cr.execute("SELECT distinct(account_id) from account_analytic_line where id IN %s",(tuple(context['active_ids']),))
- account_ids = cr.fetchall()
- return [x[0] for x in account_ids]
+ }
_defaults = {
- 'accounts': _get_accounts,
'date': lambda *args: 1,
'name': lambda *args: 1
}
@@ -82,12 +65,17 @@ class hr_timesheet_invoice_create(osv.osv_memory):
result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
res = mod_obj.read(cr, uid, result, ['res_id'], context=context)
data = self.read(cr, uid, ids, [], context=context)[0]
- account_ids = data['accounts']
+
+ account_ids = {}
+ for line in self.pool.get('account.analytic.line').browse(cr, uid, context['active_ids'], context=context):
+ account_ids[line.account_id.id] = True
+
+ account_ids = account_ids.keys() #data['accounts']
for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
partner = account.partner_id
if (not partner) or not (account.pricelist_id):
raise osv.except_osv(_('Analytic Account incomplete'),
- _('Please fill in the Associate Partner and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
+ _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s') % (account.name,))
if not partner.address:
raise osv.except_osv(_('Partner incomplete'),
@@ -190,7 +178,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
invoice_line_obj.create(cr, uid, curr_line, context=context)
cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s" ,(last_invoice, account.id, tuple(context['active_ids'])))
- invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
+ invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
mod_obj = self.pool.get('ir.model.data')
act_obj = self.pool.get('ir.actions.act_window')
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index 7b3f5ed4d6a..b45deeae8a2 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -20,7 +20,7 @@
-
+
@@ -46,4 +46,4 @@
-
\ No newline at end of file
+
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index fc6d6da911e..c02215cf742 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -10,23 +10,23 @@
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 1b554a6b242..d00ee91a304 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -49,14 +49,14 @@ The validation can be configured in the company:
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
- 'security/hr_timesheet_data.xml',
+ 'security/hr_timesheet_sheet_security.xml',
'hr_timesheet_sheet_view.xml',
'hr_timesheet_workflow.xml',
'process/hr_timesheet_sheet_process.xml',
- 'report/timesheet_report_view.xml',
'board_hr_timesheet_view.xml',
'report/hr_timesheet_report_view.xml',
'wizard/hr_timesheet_current_view.xml',
+ 'hr_timesheet_sheet_data.xml'
],
'demo_xml': ['hr_timesheet_sheet_demo.xml',
diff --git a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
index f299cb94298..a50042c3dfb 100644
--- a/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
+++ b/addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
@@ -1,7 +1,9 @@
-
+
-
- Timesheets by Month
- ir.actions.act_window
- timesheet.report
- form
- graph,tree
- [('user_id','=',uid), ('month', '=' , time.strftime('%m')), ('year', '=', time.strftime('%Y'))]
-
-
-
Timesheets
ir.actions.act_window
@@ -28,39 +20,6 @@
-
- Employee Attendance Graph
- timesheet.report
- graph
-
-
-
-
-
-
-
-
-
-
- Employee Attendance Graph
- timesheet.report
- form
- graph
-
-
-
-
- board.hr.timesheet.form
- board.board
-
- form
-
-
-
-
-
-
-
hr.timesheet.sheet.tree.simplified.board
hr_timesheet_sheet.sheet
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index ce074715888..44bda56739f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -334,11 +334,16 @@ class hr_timesheet_sheet(osv.osv):
return time.strftime('%Y-12-31')
return time.strftime('%Y-%m-%d')
+ def _default_employee(self,cr, uid, context=None):
+ emp_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
+ return emp_ids and emp_ids[0] or False
+
_defaults = {
'date_from' : _default_date_from,
'date_current' : lambda *a: time.strftime('%Y-%m-%d'),
'date_to' : _default_date_to,
'state': 'new',
+ 'employee_id': _default_employee,
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr_timesheet_sheet.sheet', context=c)
}
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
new file mode 100644
index 00000000000..e7fae82ec70
--- /dev/null
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py
index b06b0608356..8dac73f07ec 100644
--- a/addons/hr_timesheet_sheet/report/__init__.py
+++ b/addons/hr_timesheet_sheet/report/__init__.py
@@ -19,7 +19,5 @@
#
##############################################################################
-import timesheet_report
import hr_timesheet_report
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
deleted file mode 100644
index 6688c747983..00000000000
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# -*- 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 timesheet_report(osv.osv):
- _name = "timesheet.report"
- _description = "Timesheet"
- _auto = False
- _columns = {
- 'year': fields.char('Year',size=64,required=False, 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),
- 'day': fields.char('Day', size=128, readonly=True),
- 'name': fields.char('Description', size=64,readonly=True),
- 'product_id' : fields.many2one('product.product', 'Product'),
- 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
- 'employee_id': fields.many2one('hr.employee', 'Employee',readonly=True),
- 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True),
- 'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
- 'nbr': fields.integer('#Nbr',readonly=True),
- 'total_diff': fields.float('#Total Diff',readonly=True),
- 'total_timesheet': fields.float('#Total Timesheet',readonly=True),
- 'total_attendance': fields.float('#Total Attendance',readonly=True),
- 'company_id': fields.many2one('res.company', 'Company',readonly=True),
- 'department_id':fields.many2one('hr.department','Department',readonly=True),
- 'date_from': fields.date('Date from',readonly=True,),
- 'date_to': fields.date('Date to',readonly=True),
- 'date_current': fields.date('Current date', required=True),
- 'state' : fields.selection([
- ('new', 'New'),
- ('draft','Draft'),
- ('confirm','Confirmed'),
- ('done','Done')], 'State', readonly=True),
- 'quantity': fields.float('#Quantity',readonly=True),
- 'cost': fields.float('#Cost',readonly=True),
- }
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'timesheet_report')
- cr.execute("""
- create or replace view timesheet_report as (
- select
- min(aal.id) as id,
- htss.date_current,
- htss.name,
- htss.date_from,
- htss.date_to,
- to_char(htss.date_current,'YYYY') as year,
- to_char(htss.date_current,'MM') as month,
- to_char(htss.date_current, 'YYYY-MM-DD') as day,
- count(*) as nbr,
- aal.unit_amount as quantity,
- aal.amount as cost,
- aal.account_id,
- aal.product_id,
- (SELECT sum(day.total_difference)
- FROM hr_timesheet_sheet_sheet AS sheet
- LEFT JOIN hr_timesheet_sheet_sheet_day AS day
- ON (sheet.id = day.sheet_id
- AND day.name = sheet.date_current) where sheet.id=htss.id) as total_diff,
- (SELECT sum(day.total_timesheet)
- FROM hr_timesheet_sheet_sheet AS sheet
- LEFT JOIN hr_timesheet_sheet_sheet_day AS day
- ON (sheet.id = day.sheet_id
- AND day.name = sheet.date_current) where sheet.id=htss.id) as total_timesheet,
- (SELECT sum(day.total_attendance)
- FROM hr_timesheet_sheet_sheet AS sheet
- LEFT JOIN hr_timesheet_sheet_sheet_day AS day
- ON (sheet.id = day.sheet_id
- AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
- aal.to_invoice,
- aal.general_account_id,
- htss.employee_id as employee_id,
- htss.company_id,
- htss.department_id,
- htss.state
- from hr_timesheet_sheet_sheet as htss
- left join hr_analytic_timesheet as hat ON (hat.create_uid=htss.create_uid)
- left join account_analytic_line as aal ON (hat.line_id=aal.id)
- group by
- to_char(htss.date_current,'YYYY'),
- to_char(htss.date_current,'MM'),
- to_char(htss.date_current, 'YYYY-MM-DD'),
- aal.account_id,
- htss.date_from,
- htss.date_to,
- aal.unit_amount,
- aal.amount,
- htss.date_current,
- aal.to_invoice,
- aal.product_id,
- aal.general_account_id,
- htss.name,
- htss.company_id,
- htss.state,
- htss.id,
- htss.department_id,
- htss.employee_id
-
- )
- """)
-timesheet_report()
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
deleted file mode 100644
index 34397ba1c7d..00000000000
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
- timesheet.report.graph
- timesheet.report
- graph
-
-
-
-
-
-
-
-
-
- timesheet.report.tree
- timesheet.report
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- timesheet.report.search
- timesheet.report
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Timesheet Sheet Analysis
- timesheet.report
- form
- tree,graph
- {'search_default_month':1,'search_default_Employee_id':1,'group_by_no_leaf':1,'group_by':[]}
-
-
-
-
-
diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
similarity index 100%
rename from addons/hr_timesheet_sheet/security/hr_timesheet_data.xml
rename to addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index c11a3ce7099..54d303d116a 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -4,6 +4,6 @@
"access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
"access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
"access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
+"access_timesheet_report_employee","timesheet.report.employee","model_hr_timesheet_report","base.group_hr_user",1,1,1,1
"access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
"access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
diff --git a/addons/idea/i18n/tr.po b/addons/idea/i18n/tr.po
index e1bd6fc3db3..b3cadf12a88 100644
--- a/addons/idea/i18n/tr.po
+++ b/addons/idea/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 07:12+0000\n"
-"Last-Translator: Mustafa Yılmaz \n"
+"PO-Revision-Date: 2010-10-12 23:56+0000\n"
+"Last-Translator: cafer can \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-09-29 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
@@ -96,7 +96,7 @@ msgstr "Taslak"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_vote
msgid "Idea's vote"
-msgstr "Fikrin oyu"
+msgstr ""
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_vote_stat
@@ -193,7 +193,7 @@ msgstr "Kategoriler"
#. module: idea
#: view:idea.stat:0
msgid "stat"
-msgstr "durum"
+msgstr ""
#. module: idea
#: field:idea.idea,my_vote:0
@@ -237,7 +237,7 @@ msgstr "Oluşturulma tarihi"
#. module: idea
#: field:idea.idea,count_votes:0
msgid "Count of votes"
-msgstr "Oy sayısı"
+msgstr "Oy Sayımı"
#. module: idea
#: field:idea.vote.stat,nbr:0
@@ -354,7 +354,7 @@ msgstr "Çok Kötü"
#. module: idea
#: selection:idea.idea,state:0
msgid "Canceled"
-msgstr "İptal edilmiş"
+msgstr "İptal Edildi"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_idea_vote
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index f7ddb8bf504..456c4dd1f7a 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -65,7 +65,7 @@
+ id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
@@ -90,7 +90,8 @@
+ action="action_idea_select"
+ groups="base.group_tool_user"/>
@@ -382,12 +383,12 @@
form
graph,tree
-
+
+ id="menu_idea_vote_stat" action="action_idea_vote_stat" groups="base.group_tool_user"/>
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 8418377065c..c68c829794b 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -91,7 +91,7 @@
{'search_default_User':1,'search_default_State':1,'group_by_no_leaf':1,'group_by':[]}
-
+
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index ef377c799c9..4b060c51e6c 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -2,10 +2,6 @@
-
- Sales / User
-
-
Tools / Manager
@@ -13,7 +9,6 @@
Tools / User
-
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 30dc0850c3f..b76cc9bd58a 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,26 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_idea_category","idea.category","model_idea_category","base.group_user",1,1,1,1
-"access_idea_idea","idea.idea","model_idea_idea","base.group_user",1,1,1,1
-"access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
-"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,1,1,1
-"access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
-"access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
-"access_idea_comment_base_user","idea.comment.base.user","model_idea_comment","base.group_user",1,1,1,1
-"access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
-"access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
-"access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
"access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
-"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,1,1,1
-"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,1,1,1
"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,1,1,1
"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
"access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
-"access_idea_idea_system","idea.idea system","model_idea_idea","base.group_system",1,0,0,0
-"access_idea_vote_system","idea.vote system","model_idea_vote","base.group_system",1,0,0,0
-"access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
-"access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
-"access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1
-"access_idea_comment_manager","idea.comment.manager","model_idea_comment","base.group_tool_manager",1,1,1,1
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index e6e08e83b01..2b869e56306 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -81,7 +81,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
- data_of_file = '\n'
+ data_of_file = '\n'
data_of_file +='\n\t\n\t\t'+str(vat_no)+'\n\t\t'+ obj_company.name +'\n\t\t'+address+''
data_of_file +='\n\t\t'+post_code+'\n\t\t'+city+'\n\t\t'+country_code+'\n\t\t'+send_ref+'\n\t'
data_of_file +='\n\t\n\t\t1\n\t\t'+((vat_no and str(vat_no[2:])) or '')+'\n\t\t\n\t\t\t'
@@ -127,4 +127,4 @@ class l10n_be_vat_declaration(osv.osv_memory):
l10n_be_vat_declaration()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 6b0e4c4b8c7..0ecdea5c017 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,14 +6,14 @@
id="menu_lunch" sequence="1" />
+ id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>
+ id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index b936b26a55e..59670a8d1b1 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -1,20 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_lunch_category","lunch.category","model_lunch_category","base.group_user",1,1,1,1
-"access_lunch_product","lunch.product","model_lunch_product","base.group_user",1,1,1,1
-"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox","base.group_user",1,1,1,1
-"access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
-"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
-"access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
-"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,1,1,1
"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
-"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,1,1,1
"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
-"access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
-"access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
-"access_lunch_cashbox_system","lunch.cashbox system","model_lunch_cashbox","base.group_system",1,1,1,1
-"access_lunch_order_system","lunch.order system","model_lunch_order","base.group_system",1,0,0,0
-"access_lunch_cashmove_system","lunch.cashmove system","model_lunch_cashmove","base.group_system",1,0,0,0
+"access_lunch_category_manager","lunch.category.user","model_lunch_category","base.group_tool_user",1,1,1,1
"access_report_lunch_order_manager","report.lunch.order manager","model_report_lunch_order","base.group_tool_manager",1,1,1,1
"access_lunch_product_user","lunch.product user","model_lunch_product","base.group_tool_user",1,1,1,1
"access_lunch_cashbox_user","lunch.cashbox user","model_lunch_cashbox","base.group_tool_user",1,1,1,1
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 6c3559fa138..0014f38182b 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -2,9 +2,6 @@
-
- Sales / User
-
Tools / Manager
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index d47cc6d8ee9..e50f4ad222c 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -34,7 +34,7 @@
+ view_mode="form" target="new" view_type="form"/>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index dabcd7d5e84..eba7d12c846 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -36,7 +36,7 @@
+ view_mode="form" target="new" view_type="form"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 614055dddcd..b23826969a8 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -36,10 +36,10 @@
+
-
@@ -161,9 +161,9 @@
+
-
@@ -382,9 +382,9 @@
+
-
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7addfbc3194..32f3100b868 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -604,7 +604,7 @@
-
+
@@ -627,12 +627,12 @@
+
-
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9a93b67a36f..62298f4aa5f 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -14,10 +14,10 @@
+
-
@@ -32,10 +32,10 @@
+
-
@@ -114,10 +114,10 @@
+
-
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 04c9587b6c5..15878ec1b37 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -2,24 +2,24 @@
-
- mrp.repair.tree
- mrp.repair
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ mrp.repair.tree
+ mrp.repair
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
mrp.repair.form
@@ -177,30 +177,30 @@
search
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 982ee5d4bc0..4c3f6ede30d 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -17,7 +17,7 @@
+ colspan="1" type="object" icon="terp-gtk-go-back-rtl" />
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 98c46039a41..2005696db44 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.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-10-11 21:13+0000\n"
-"Last-Translator: zmmaj \n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Serbian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
@@ -438,7 +438,7 @@ msgstr ""
#. module: point_of_sale
#: rml:pos.invoice:0
msgid "Draft Invoice"
-msgstr "Nacrti računa"
+msgstr "Neodobreni računi"
#. module: point_of_sale
#: field:pos.order.line,discount:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 9ff3c68e11a..f6f3b4106a8 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-20 08:51+0000\n"
-"PO-Revision-Date: 2010-09-29 11:36+0000\n"
-"Last-Translator: ub121 \n"
+"PO-Revision-Date: 2010-10-12 14:21+0000\n"
+"Last-Translator: sugi \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: procurement
@@ -29,6 +29,9 @@ msgid ""
"under 0. You should probably not use this option, we suggest using a MTO "
"configuration on products."
msgstr ""
+"Виртуал агуулах нь тэгтэй тэнцүү бүх бараанд автомат татан авалтыг "
+"эхлүүлдэг. Та энэ сонголтыг ашиглахгүй байх нь дээр, бид танд барааны МТО "
+"тохиргоог ашиглахыг зөвлөж байна."
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -92,7 +95,7 @@ msgstr "Шалтгаан"
#. module: procurement
#: view:procurement.order.compute:0
msgid "Compute Procurements"
-msgstr ""
+msgstr "Татан авалт тооцоолох"
#. module: procurement
#: field:procurement.order,message:0
@@ -102,7 +105,7 @@ msgstr "Сүүлийн алдаа"
#. module: procurement
#: help:mrp.property,composition:0
msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Тооцоололд ашиглагдахгүй, зөвхөн мэдээллийн зорилгоор ашиглана."
#. module: procurement
#: field:stock.warehouse.orderpoint,procurement_id:0
@@ -117,7 +120,7 @@ msgstr "Тэмдэглэгээ"
#. module: procurement
#: help:procurement.order,message:0
msgid "Exception occurred while computing procurement orders."
-msgstr ""
+msgstr "Татан авалтын захиалгыг тооцоолж байх үед онцгой тохиолдол гардаг."
#. module: procurement
#: help:procurement.order,state:0
@@ -131,6 +134,13 @@ msgid ""
" It is in 'Waiting'. state when the procurement is waiting for another one "
"to finish."
msgstr ""
+"Татан авалт үүсэхэд төлөв нь 'Draft'.\n"
+"Татан авалт нь баталгаажсан бол төлөв нь 'Confirmed'.\n"
+"Баталгаажсаны дараа төлөв нь 'Running'.\n"
+"Хэрэв ямар нэгэн онцгой тохиолдол захиалгад үүсвэл төлөв нь 'Exception'.\n"
+"Онцгой тохиолдол устхад төлөв нь 'Ready'.\n"
+"Нэг татан авалт нь нөгөө татан авалтаа дуусахыг хүлээж байхад төлөв нь "
+"'Waiting' байна."
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -143,11 +153,14 @@ msgid ""
"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
"procurement to bring the virtual stock to the Max Quantity."
msgstr ""
+"Виртуал агуулах нь хамгийн бага тоо хэмжээнд ойртож байвал, OpenERP нь "
+"виртуал агуулахыг хамгийн их тоо хэмжээнд хүргэхийн тулд татан авалтыг "
+"боловсруулдаг."
#. module: procurement
#: view:procurement.order.compute.all:0
msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Төлөвлөгчийн үзүүлэлт"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.procurement_action11
@@ -168,7 +181,7 @@ msgstr "Бэлэн"
#. module: procurement
#: field:procurement.order.compute.all,automatic:0
msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
#. module: procurement
#: selection:procurement.order,state:0
@@ -197,11 +210,13 @@ msgid ""
"Reference of the document that created this Procurement.\n"
"This is automatically completed by OpenERP."
msgstr ""
+"Татан авалтын үүсгэсэн баримтын дугаар. Үүнийг OpenERP автоматаар "
+"гүйцэтгэдэг."
#. module: procurement
#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Хамгийн бага эрхтэй оролцогч"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.procurement_action4
@@ -257,7 +272,7 @@ msgstr "Нийлүүлэлт"
#. module: procurement
#: field:res.company,schedule_range:0
msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Төлөвлөгчийн өдрийн хязгаар"
#. module: procurement
#: view:make.procurement:0
@@ -318,6 +333,8 @@ msgid ""
"If you encode manually a Procurement, you probably want to use a make to "
"order method."
msgstr ""
+"Татан авалтыг гараар кодлохоор бол, методуудыг цэгцлэхийн тулд загвар харах "
+"болно."
#. module: procurement
#: view:res.company:0
@@ -330,6 +347,8 @@ msgid ""
"Wizard run all the procurements, and generate task, production order or "
"purchase order based on the product type"
msgstr ""
+"Визард нь татан авалтыг ажиллуулдаг ба даалгавруудыг биелүүлдэг, барааны "
+"захиалга эсвэл худалдан авалтын захиалга нь барааны төрлөөс хамаарна."
#. module: procurement
#: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -422,6 +441,8 @@ msgid ""
"Please check the Quantity in Procurement Order(s), it should not be less "
"than 1!"
msgstr ""
+"Татан авалтын захиалгын тоо хэмжээг шалгана уу, энэ нь нэгээс бага байх "
+"ёсгүй!"
#. module: procurement
#: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -429,6 +450,9 @@ msgid ""
"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
"procurement to bring the virtual stock to the Max Quantity."
msgstr ""
+"Виртуал агуулах нь хамгийн бага тоо хэмжээнд ойртож байвал, OpenERP нь "
+"виртуал агуулахыг хамгийн их тоо хэмжээнд хүргэхийн тулд татан авалтыг "
+"боловсруулдаг."
#. module: procurement
#: help:procurement.orderpoint.compute,automatic:0
@@ -477,6 +501,9 @@ msgid ""
"procurements. All procurements that are not between today and today+range "
"are skipped for futur computation."
msgstr ""
+"Энэ бол Татан авалтыг тооцоолж байх үед төлөвлөгчийн дүгнэсэн боломжит "
+"хугацаа юм. Өнөөдөр болон өнөөдрийн хязгаар хооронд багтаагүй татан авалт нь "
+"дараагийн тооцоолол хүртэл орхигдоно."
#. module: procurement
#: selection:procurement.order,priority:0
@@ -494,6 +521,8 @@ msgid ""
"If the active field is set to true, it will allow you to hide the orderpoint "
"without removing it."
msgstr ""
+"Хэрэв идэвхтэй талбар нь үнэн болсон бол, захиалгын цэгийг устгалгүйгээр "
+"нуух боломжийг олгоно."
#. module: procurement
#: code:addons/procurement/procurement.py:0
@@ -525,12 +554,12 @@ msgstr "Алдаа"
#. module: procurement
#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
msgid "Automatic Order Point"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
#. module: procurement
#: field:stock.warehouse.orderpoint,qty_multiple:0
msgid "Qty Multiple"
-msgstr ""
+msgstr "Хуваагдах тоо хэмжээ"
#. module: procurement
#: model:ir.model,name:procurement.model_res_company
@@ -561,7 +590,7 @@ msgstr ""
#. module: procurement
#: selection:stock.warehouse.orderpoint,logic:0
msgid "Order to Max"
-msgstr ""
+msgstr "Хамгийн их захиалга"
#. module: procurement
#: field:procurement.order,date_close:0
@@ -571,7 +600,7 @@ msgstr "Хаагдсан огноо"
#. module: procurement
#: view:procurement.order:0
msgid "Late"
-msgstr ""
+msgstr "Хожимдсон"
#. module: procurement
#: field:mrp.property,composition:0
@@ -604,7 +633,7 @@ msgstr "Байршлууд"
#. module: procurement
#: selection:procurement.order,procure_method:0
msgid "from stock"
-msgstr ""
+msgstr "Агуулахаас"
#. module: procurement
#: view:stock.warehouse.orderpoint:0
@@ -624,7 +653,7 @@ msgstr "Дууссан"
#. module: procurement
#: help:stock.warehouse.orderpoint,qty_multiple:0
msgid "The procurement quantity will by rounded up to this multiple."
-msgstr ""
+msgstr "Татан авалтын тоо хэмжээ нь дараа дараагийн талбарт тоймлогдоно."
#. module: procurement
#: view:make.procurement:0
@@ -659,7 +688,7 @@ msgstr ""
#. module: procurement
#: view:procurement.order:0
msgid "Current"
-msgstr ""
+msgstr "Одоо"
#. module: procurement
#: code:addons/procurement/procurement.py:0
@@ -695,7 +724,7 @@ msgstr ""
#. module: procurement
#: view:procurement.order:0
msgid "Scheduled Date"
-msgstr ""
+msgstr "Төлөвлөгдсөн огноо"
#. module: procurement
#: field:make.procurement,product_id:0
@@ -749,7 +778,7 @@ msgstr "Хүлээж байна"
#. module: procurement
#: selection:procurement.order,procure_method:0
msgid "on order"
-msgstr ""
+msgstr "Захиалга"
#. module: procurement
#: field:procurement.order,move_id:0
@@ -767,6 +796,9 @@ msgid ""
"This wizard will plan the procurement for this product. This procurement may "
"generate task, production orders or purchase orders."
msgstr ""
+"Энэ визард нь тухайн барааны татан авалтыг төлөвлөдөг. Энэ татан авалт нь "
+"даалгаварууд, барааны захиалга эсвэл худалдан авалтын захиалгыг боловсруулах "
+"боломжтой."
#. module: procurement
#: code:addons/procurement/procurement.py:0
@@ -800,13 +832,15 @@ msgstr ""
#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
#: view:procurement.order.compute.all:0
msgid "Compute Schedulers"
-msgstr ""
+msgstr "Тооцоолол төлөвлөгч"
#. module: procurement
#: view:procurement.orderpoint.compute:0
msgid ""
"Wizard checks all the stock minimum rules and generate procurement order."
msgstr ""
+"Визард нь агуулахын хамгийн бага дүрмийг шалгаад татан авалтын захиалгыг "
+"биелүүлдэг."
#. module: procurement
#: field:procurement.order,product_uom:0
@@ -826,7 +860,7 @@ msgstr "Маш яаралтай"
#. module: procurement
#: field:procurement.orderpoint.compute,automatic:0
msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
#. module: procurement
#: view:procurement.order:0
@@ -848,6 +882,16 @@ msgid ""
" if product_id:\n"
" w = self.pool.get('product.product"
msgstr ""
+"Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
+" return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
+"\n"
+" def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
+" \"\"\" Finds UoM and UoS of changed product.\n"
+" @param product_id: Changed id of product.\n"
+" @return: Dictionary of values.\n"
+" \"\"\"\n"
+" if product_id:\n"
+" w = self.pool.get('product.product"
#. module: procurement
#: constraint:ir.rule:0
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 03a4c5aad82..3c9bff9be9c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -72,9 +72,9 @@
+
-
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index b4bcd1e1f04..23b0a08af78 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -188,14 +188,14 @@
action_check_finished()
- stock.move
- [move_id.id]
+ stock.move
+ move_id and [move_id.id] or []
check_move_cancel()
-
+
diff --git a/addons/product/product.py b/addons/product/product.py
index 05ec8459bcd..04a5232b1ea 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -308,6 +308,7 @@ class product_template(osv.osv):
'uos_coeff' : lambda *a: 1.0,
'mes_type' : lambda *a: 'fixed',
'categ_id' : _default_category,
+ 'type' : lambda *a: 'consu',
}
def _check_uom(self, cursor, user, ids):
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a9409e62aa8..b58fa4cc811 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -9,10 +9,8 @@
search
-
-
-
+
+
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 275a969cbe9..71b5d87aa1f 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -88,16 +88,10 @@
-
+
-
-
-
-
-
-
-
-
+
+
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5e5be5ee4b0..6fd11bd245f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -27,7 +27,7 @@
-
+
@@ -46,11 +46,11 @@
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
@@ -242,13 +244,13 @@
+
-
@@ -323,10 +325,10 @@
-
+
+
-
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index a5032047c2a..4623f968c05 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -84,10 +84,10 @@
+
-
@@ -191,9 +191,9 @@
+
-
@@ -290,9 +290,9 @@
+
-
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index fa645af4127..f2e4c6efd68 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -146,11 +146,11 @@
+
-
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index ff354c69ccd..8e14631fb2c 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -104,14 +104,13 @@
+
-
-
@@ -139,12 +138,12 @@
+
-
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 843b35646e4..7ae07d9eea8 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -113,12 +113,12 @@
+
-
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 2a1b94620a8..61834abbe66 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -11,9 +11,9 @@
-
-
-
+
+
+
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 9beab0c4d59..82ab4a9320c 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index de25b07ff9d..d209ef6b3fd 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -61,10 +61,10 @@
+
-
@@ -78,9 +78,9 @@
+
-
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index 1accab65c0b..f849392d328 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -31,7 +31,6 @@ class report_designer_installer(osv.osv_memory):
"upload the report using the same wizard."),
'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
"reports on several objects. It's a SQL query builder and browser for end users."),
- 'olap':fields.boolean('Business Intelligence Report',help="Helps you manage Online Analytical Process with the mdx query and provides Cube Designing and Cube Browsing"),
}
report_designer_installer()
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index b377331a208..2f838c0b74c 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -28,7 +28,6 @@
-
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index 2c83dde0cb7..4dba312df22 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\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 10:23+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-10-12 20:22+0000\n"
+"Last-Translator: simone.sandri \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-09-29 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
@@ -27,7 +27,7 @@ msgstr ""
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Canceled Invoice"
-msgstr ""
+msgstr "Fattura Cancellata"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
@@ -43,7 +43,7 @@ msgstr "Intrastat (questo mese)"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Supplier Invoice"
-msgstr ""
+msgstr "Fattura Fornitore"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
@@ -58,7 +58,7 @@ msgstr ""
#. module: report_intrastat
#: field:report.intrastat,name:0
msgid "Period"
-msgstr ""
+msgstr "Periodo"
#. module: report_intrastat
#: model:ir.ui.menu,name:report_intrastat.next_id_90
@@ -73,22 +73,22 @@ msgstr "Importa"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "VAT :"
-msgstr ""
+msgstr "IVA"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Document"
-msgstr ""
+msgstr "Documento"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Taxes:"
-msgstr ""
+msgstr "Tasse:"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
@@ -109,7 +109,7 @@ msgstr ""
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Invoice Date"
-msgstr ""
+msgstr "Data della fattura"
#. module: report_intrastat
#: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
@@ -119,17 +119,17 @@ msgstr ""
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Base"
-msgstr ""
+msgstr "Base"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Quantity"
-msgstr ""
+msgstr "Quantità"
#. module: report_intrastat
#: model:ir.ui.menu,name:report_intrastat.next_id_89
@@ -144,12 +144,12 @@ msgstr ""
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Totale (tasse incluse)"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Refund"
-msgstr ""
+msgstr "Rimborso"
#. module: report_intrastat
#: constraint:ir.ui.view:0
@@ -164,17 +164,17 @@ msgstr "Report Intrastat"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Taxes"
-msgstr ""
+msgstr "Tasse"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Amount"
-msgstr ""
+msgstr "Importo"
#. module: report_intrastat
#: view:report.intrastat:0
@@ -214,7 +214,7 @@ msgstr "Codice Intrastat"
#. module: report_intrastat
#: field:report.intrastat,ref:0
msgid "Origin"
-msgstr ""
+msgstr "Origine"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
@@ -230,7 +230,7 @@ msgstr "Membro Intrastat"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Tax"
-msgstr ""
+msgstr "Tassa"
#. module: report_intrastat
#: field:report.intrastat,code:0
@@ -250,22 +250,22 @@ msgstr "Esporta"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Supplier Refund"
-msgstr ""
+msgstr "Rimborso Fornitore"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Totale (tasse escluse)"
#. module: report_intrastat
#: rml:account.invoice.intrastat:0
msgid "Price"
-msgstr ""
+msgstr "Prezzo"
#. module: report_intrastat
#: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 6f3d120040d..63c3fdd1e05 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: resource
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index bfb0bc36ad2..6848c21c15b 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-18 06:50+0000\n"
-"PO-Revision-Date: 2010-10-11 12:36+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) \n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: resource
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0c7da4cad2d..85dd4c86c27 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -206,7 +206,7 @@
-
+
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index c1e9d9c3b89..774759c82c7 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -9,7 +9,7 @@
diff --git a/addons/sale/wizard/sale_make_invoice.xml b/addons/sale/wizard/sale_make_invoice.xml
index 106e6945207..e8e698e56b9 100644
--- a/addons/sale/wizard/sale_make_invoice.xml
+++ b/addons/sale/wizard/sale_make_invoice.xml
@@ -13,7 +13,7 @@
-
+
@@ -38,4 +38,4 @@
sale.order
-
\ No newline at end of file
+
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 3257d1aafe8..6e192d31108 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -15,7 +15,7 @@
-
+
@@ -55,4 +55,4 @@
new
-
\ No newline at end of file
+
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 561bb9f2206..60fab009d0e 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -61,8 +61,8 @@
-
-
+
+
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index e1db3ebfa49..1d9dc4a5ce4 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -74,7 +74,6 @@
+
-
@@ -732,10 +732,10 @@
+
-
@@ -746,7 +746,7 @@
-
+
@@ -922,10 +922,10 @@
+
-
@@ -936,7 +936,7 @@
-
+
@@ -1137,10 +1137,10 @@
+
-
@@ -1151,7 +1151,7 @@
-
+
@@ -1589,8 +1589,8 @@
-
- stock.move.search2
+
+ stock.move.incoming.search2
stock.move
search
@@ -1625,6 +1625,42 @@
+
+ stock.move.outgoing.search2
+ stock.move
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Incoming Products
stock.move
@@ -1634,7 +1670,7 @@
['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')]
{"search_default_receive":1}
-
+
@@ -1768,7 +1804,7 @@
['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')]
{"search_default_receive":1}
-
+
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index eddffb594aa..6284121553c 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index e19fdde993b..4d4f829092b 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -1,10 +1,8 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_subscription_document,subscription.document,model_subscription_document,base.group_system,1,1,1,1
-access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_system,1,1,1,1
-access_subscription_subscription,subscription.subscription,model_subscription_subscription,base.group_user,1,1,1,1
-access_subscription_subscription_history,subscription.subscription.history,model_subscription_subscription_history,base.group_user,1,1,1,1
+access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
-access_subscription_subscription_manager,subscription.subscription manager,model_subscription_subscription,base.group_tool_manager,1,0,0,0
access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
-access_subscription_subscription_system,subscription.subscription system,model_subscription_subscription,base.group_system,1,0,0,0
access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
+access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
+access_res_partner_address_user,res.partner.address.user,base.model_res_partner_address,base.group_tool_user,1,1,1,1
+access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index b27414bb60c..37841919b1b 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -212,7 +212,7 @@
+ id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager" />
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index 5ea4017fb01..1a1c8cab818 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,51 +1,37 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type_manager","survey.type manager","model_survey_type","base.group_tool_manager",1,1,1,1
-"access_survey_type_user","survey.type user","model_survey_type","base.group_tool_user",1,1,1,1
-"access_survey_manager","survey","model_survey","base.group_tool_manager",1,1,1,1
-"access_survey_system","survey","model_survey","base.group_system",1,0,0,0
-"access_survey_user","survey","model_survey","base.group_tool_user",1,1,1,1
+"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
+"access_survey_type_manager","survey.type.manager","model_survey_type","base.group_tool_manager",1,1,1,1
+"access_survey_manager","survey.manager","model_survey","base.group_tool_manager",1,1,1,1
"access_survey_page_manager","survey.page manager","model_survey_page","base.group_tool_manager",1,1,1,1
-"access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
-"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
"access_survey_question_manager","survey.question manager","model_survey_question","base.group_tool_manager",1,1,1,1
-"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_tool_manager",1,1,1,1
-"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
"access_survey_response_manager","survey.response manager","model_survey_response","base.group_tool_manager",1,1,1,1
-"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_tool_manager",1,1,1,1
+"access_survey_history_manager","survey.history.manager","model_survey_history","base.group_tool_manager",1,1,1,1
+"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
+"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
+"access_survey_res_partner_address_manager","survey.res.partner.address.manager","base.model_res_partner_address","base.group_tool_manager",1,1,1,0
+"access_survey_res_partner_manager","survey.res.partner.manager","base.model_res_partner","base.group_tool_manager",1,1,1,1
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
+"access_survey_user","survey.user","model_survey","base.group_tool_user",1,1,1,1
+"access_survey_page_user","survey.page user","model_survey_page","base.group_tool_user",1,1,1,1
+"access_survey_question_user","survey.question user","model_survey_question","base.group_tool_user",1,1,1,1
+"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_tool_user",1,1,1,1
+"access_survey_response_user","survey.response user","model_survey_response","base.group_tool_user",1,1,1,1
"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_tool_user",1,1,1,1
"access_survey_history_user","survey.history.user","model_survey_history","base.group_tool_user",1,1,1,1
-"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_tool_manager",1,1,1,1
-"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,0,0,0
-"access_survey_request_manager","survey.request manager","model_survey_request","base.group_tool_manager",1,1,1,1
-"access_survey_request_user","survey.request user","model_survey_request","base.group_tool_user",1,1,1,1
-"access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
-"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_tool_manager",1,1,1,1
-"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_tool_user",1,1,1,1
-"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_tool_manager",1,1,1,1
"access_survey_response_line_user","survey.response.line user","model_survey_response_line","base.group_tool_user",1,1,1,1
-"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_tool_manager",1,1,1,1
-"access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
-"access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
-"access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
-"access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
-"access_survey_answer_base_user","survey.answer.base.user","model_survey_answer","base.group_user",1,1,1,1
-"access_survey_question_base_user","survey.question.base.user","model_survey_question","base.group_user",1,1,1,1
"access_survey_res_partner_address_user","survey.res.partner.address.user","base.model_res_partner_address","base.group_tool_user",1,1,1,0
-"access_survey_request_employee","survey.request.employee","model_survey_request","base.group_user",1,0,0,0
-"access_survey_response_employee","survey.response employee","model_survey_response","base.group_user",1,0,0,0
-"access_survey_employee","survey.employee","model_survey","base.group_user",1,0,0,0
+"access_survey_res_partner_user","survey.res.partner.user","base.model_res_partner","base.group_tool_user",1,1,1,1
"access_survey_survey_user","survey.survey.user","model_survey","group_survey_user",1,1,1,1
-"access_survey_type_survey_user","survey.type.survey.user","model_survey_type","group_survey_user",1,1,1,1
"access_survey_page_survey_user","survey.page.survey.user","model_survey_page","group_survey_user",1,1,1,1
-"access_survey_request_survey_user","survey.request.survey.user","model_survey_request","group_survey_user",1,1,1,1
"access_survey_question_survey_user","survey.question.survey.user","model_survey_question","group_survey_user",1,1,1,1
"access_survey_answer_survey_user","survey.answer.survey.user","model_survey_answer","group_survey_user",1,1,1,1
"access_survey_response_survey_user","survey.response.survey.user","model_survey_response","group_survey_user",1,1,1,1
"access_survey_response_answer_survey_user","survey.response.answer.survey.user","model_survey_response_answer","group_survey_user",1,1,1,1
"access_survey_history_survey_user","survey.history.survey.user","model_survey_history","group_survey_user",1,1,1,1
-"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
-"access_survey_tbl_column_heading_survey_user","survey.tbl.column.heading.survey.user","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
"access_survey_response_line_survey_user","survey.response.line.survey.user","model_survey_response_line","group_survey_user",1,1,1,1
-"access_survey_res_partner_address_survey_user","survey.res.partner.address.survey.user","base.model_res_partner_address","group_survey_user",1,1,1,0
+"access_survey_question_column_heading_survey_user","survey.question.column.heading.survey.user","model_survey_question_column_heading","group_survey_user",1,0,0,0
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_tool_user",1,1,1,1
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 4fc58962442..44bcb4475b5 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -3,12 +3,11 @@
-
+
-
+
@@ -184,6 +183,8 @@
+
@@ -191,8 +192,6 @@
states="draft" type="object" icon="gtk-go-forward"/>
-
@@ -292,7 +291,7 @@
+ groups="base.group_tool_manager"/>