From ffe8490aefa344cbf477ef7770a50a8cc3861a55 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 10 Oct 2013 11:11:25 +0200 Subject: [PATCH 1/8] Enabled sort in o2m bzr revid: nicolas.vanhoren@openerp.com-20131010091125-0t1v8wmkrn8bnc5y --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b9f1d91b700..0d4119af74b 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3542,7 +3542,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ _.extend(view.options, { addable: null, selectable: self.multi_selection, - sortable: false, + sortable: true, import_enabled: false, deletable: true }); From b801e6eab97cc8331b870654d37f57d228e13a2b Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 16 Oct 2013 17:03:35 +0200 Subject: [PATCH 2/8] [IMP] procurement: better workflow bzr revid: mat@openerp.com-20131016150335-oikqm6twbukp666t --- addons/procurement/procurement.py | 2 +- addons/procurement/procurement_workflow.xml | 2 -- addons/procurement/schedulers.py | 23 --------------------- addons/purchase/purchase.py | 3 +-- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 2bc095a9661..a39b2d79843 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -371,7 +371,7 @@ class procurement_order(osv.osv): #temporary context passed in write to prevent an infinite loop ctx_wkf = dict(context or {}) ctx_wkf['workflow.trg_write.%s' % self._name] = False - self.write(cr, uid, [procurement.id], {'message': message},context=ctx_wkf) + self.write(cr, uid, [procurement.id], {'message': message, 'state': 'exception'},context=ctx_wkf) return ok def _workflow_trigger(self, cr, uid, ids, trigger, context=None): diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml index 76b54370ef2..8ddd619a527 100644 --- a/addons/procurement/procurement_workflow.xml +++ b/addons/procurement/procurement_workflow.xml @@ -29,8 +29,6 @@ confirm_wait - function - write({'state':'exception'}) diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 07280b38ae7..cf08cb91a06 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -72,10 +72,6 @@ class procurement_order(osv.osv): maxdate = (datetime.today() + relativedelta(days=company.schedule_range)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT) start_date = fields.datetime.now() offset = 0 - report = [] - report_total = 0 - report_except = 0 - report_later = 0 while True: ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority, date_planned', context=context) for proc in procurement_obj.browse(cr, uid, ids, context=context): @@ -83,14 +79,7 @@ class procurement_order(osv.osv): wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr) else: offset += 1 - report_later += 1 - if proc.state == 'exception': - report.append(_('PROC %d: on order - %3.2f %-5s - %s') % \ - (proc.id, proc.product_qty, proc.product_uom.name, - proc.product_id.name)) - report_except += 1 - report_total += 1 if use_new_cursor: cr.commit() if not ids: @@ -98,22 +87,10 @@ class procurement_order(osv.osv): offset = 0 ids = [] while True: - report_ids = [] ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset) for proc in procurement_obj.browse(cr, uid, ids): if maxdate >= proc.date_planned: wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr) - report_ids.append(proc.id) - else: - report_later += 1 - report_total += 1 - - if proc.state == 'exception': - report.append(_('PROC %d: from stock - %3.2f %-5s - %s') % \ - (proc.id, proc.product_qty, proc.product_uom.name, - proc.product_id.name,)) - report_except += 1 - if use_new_cursor: cr.commit() diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 992af37222e..04b380ef098 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1044,10 +1044,9 @@ class procurement_order(osv.osv): message = _('No default supplier defined for this product') elif not partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']: message = _('No address defined for the supplier') - if message: if procurement.message != message: - cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id)) + cr.execute("update procurement_order set message=%s, state='exception' where id=%s", (message, procurement.id)) return False if user.company_id and user.company_id.partner_id: From 5c3b065bc80735ce01a7f746bc014e9f32fa1b71 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 17 Oct 2013 05:59:26 +0000 Subject: [PATCH 3/8] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20131017055926-8w96inwlj7rhey0e --- addons/account/i18n/hr.po | 175 +++++++++++++++++---- addons/account_analytic_default/i18n/hr.po | 12 +- addons/account_voucher/i18n/hr.po | 12 +- addons/board/i18n/lv.po | 18 +-- addons/contacts/i18n/lv.po | 37 +++++ 5 files changed, 205 insertions(+), 49 deletions(-) create mode 100644 addons/contacts/i18n/lv.po diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index 8671838bfee..352f8a8b197 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-10-15 13:59+0000\n" +"PO-Revision-Date: 2013-10-16 11:57+0000\n" "Last-Translator: Marko Carevic \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n" +"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n" "X-Generator: Launchpad (build 16799)\n" #. module: account @@ -482,7 +482,7 @@ msgstr "" #. module: account #: help:account.bank.statement.line,name:0 msgid "Originator to Beneficiary Information" -msgstr "" +msgstr "Informacije o pokretaču i korisniku" #. module: account #. openerp-web @@ -1840,7 +1840,7 @@ msgstr "Ponavljajući" #. module: account #: report:account.invoice:0 msgid "TIN :" -msgstr "" +msgstr "TIN :" #. module: account #: field:account.journal,groups_id:0 @@ -2054,7 +2054,7 @@ msgstr "" #. module: account #: view:account.analytic.account:0 msgid "Pending Accounts" -msgstr "" +msgstr "Konta na čekanju" #. module: account #: report:account.journal.period.print.sale.purchase:0 @@ -3757,6 +3757,86 @@ msgid "" "\n" " " msgstr "" +"\n" +"
\n" +"\n" +"

Pozdrav ${object.partner_id.name},

\n" +"\n" +"

Obavještavamo vam o novom računu:

\n" +" \n" +"

\n" +"   REFERENCA
\n" +"   Broj računa: ${object.number}
\n" +"   Ukupni iznos računa: ${object.amount_total} " +"${object.currency_id.name}
\n" +"   Datum računa: ${object.date_invoice}
\n" +" % if object.origin:\n" +"   Broj narudžbe: ${object.origin}
\n" +" % endif\n" +" % if object.user_id:\n" +"   Vaš kontakt: ${object.user_id.name}\n" +" % endif\n" +"

\n" +" \n" +" % if object.paypal_url:\n" +"
\n" +"

Ovaj račun je moguće platiti i direktno Paypal-om:

\n" +" \n" +" \n" +" \n" +" % endif\n" +" \n" +"
\n" +"

Stojimo na raspolaganju za sva dodatna pitanja.

\n" +"

Hvala vam što ste odabrali ${object.company_id.name or 'us'}!

\n" +"
\n" +"
\n" +"
\n" +"

\n" +" ${object.company_id.name}

\n" +"
\n" +"
\n" +" \n" +" % if object.company_id.street:\n" +" ${object.company_id.street}
\n" +" % endif\n" +" % if object.company_id.street2:\n" +" ${object.company_id.street2}
\n" +" % endif\n" +" % if object.company_id.city or object.company_id.zip:\n" +" ${object.company_id.zip} ${object.company_id.city}
\n" +" % endif\n" +" % if object.company_id.country_id:\n" +" ${object.company_id.state_id and ('%s, ' % " +"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name " +"or ''}
\n" +" % endif\n" +" \n" +" % if object.company_id.phone:\n" +"
\n" +" Phone:  ${object.company_id.phone}\n" +"
\n" +" % endif\n" +" % if object.company_id.website:\n" +"
\n" +" Web : ${object.company_id.website}\n" +"
\n" +" %endif\n" +"

\n" +"
\n" +"
\n" +" " #. module: account #: view:account.period:0 @@ -3793,7 +3873,7 @@ msgstr "Transakcije" #. module: account #: model:ir.model,name:account.model_account_unreconcile_reconcile msgid "Account Unreconcile Reconcile" -msgstr "" +msgstr "Zatvaranje neztvorenih konta" #. module: account #: help:account.account.type,close_method:0 @@ -4925,7 +5005,7 @@ msgstr "Bilješka" #. module: account #: selection:account.financial.report,sign:0 msgid "Reverse balance sign" -msgstr "" +msgstr "Obrnuti predznak" #. module: account #: selection:account.account.type,report_type:0 @@ -5200,7 +5280,7 @@ msgstr "ECNJ" #. module: account #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report msgid "Account Analytic Cost Ledger For Journal Report" -msgstr "" +msgstr "Analitički troškovnik za izvještaj dnevnika" #. module: account #: model:ir.actions.act_window,name:account.action_model_form @@ -6053,7 +6133,7 @@ msgstr "Pogled aktive" #. module: account #: model:ir.model,name:account.model_account_common_account_report msgid "Account Common Account Report" -msgstr "" +msgstr "Izvještaj za uobičajena konta" #. module: account #: view:account.analytic.account:0 @@ -9595,6 +9675,8 @@ msgid "" "created. If you leave that field empty, it will use the same journal as the " "current invoice." msgstr "" +"Možete odabrati dnevnik za odobrenja koja će se kreirati. Ako ostavite polje " +"praznokoristiti će se isti dnevnik kao i za trenutni račun." #. module: account #: help:account.bank.statement.line,sequence:0 @@ -10211,7 +10293,7 @@ msgstr "Izvor" #. module: account #: selection:account.model.line,date_maturity:0 msgid "Date of the day" -msgstr "" +msgstr "Datum dana" #. module: account #: code:addons/account/wizard/account_move_bank_reconcile.py:49 @@ -10229,6 +10311,7 @@ msgid "" "This field contains the information related to the numbering of the journal " "entries of this journal." msgstr "" +"Ovo polje sadržava informacije vezane uz sljednosti temeljnica dnevnika" #. module: account #: field:account.invoice,sent:0 @@ -10255,7 +10338,7 @@ msgstr "Saldo :" #: code:addons/account/account.py:1587 #, python-format msgid "Cannot create moves for different companies." -msgstr "" +msgstr "Nije moguće kreirati knjiženja za različite kompanije." #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing @@ -10265,7 +10348,7 @@ msgstr "Periodična obrada" #. module: account #: view:account.invoice.report:0 msgid "Customer And Supplier Invoices" -msgstr "Ulazni i izlazni računi Invoices" +msgstr "Ulazni i izlazni računi" #. module: account #: model:process.node,note:account.process_node_paymententries0 @@ -10296,7 +10379,7 @@ msgstr "Pretplata" #. module: account #: model:ir.model,name:account.model_account_analytic_balance msgid "Account Analytic Balance" -msgstr "Saldo Analitike" +msgstr "Saldo analitike" #. module: account #: report:account.account.balance:0 @@ -10340,13 +10423,13 @@ msgstr "Datum dospijeća" #: model:account.payment.term,name:account.account_payment_term_immediate #: model:account.payment.term,note:account.account_payment_term_immediate msgid "Immediate Payment" -msgstr "" +msgstr "Neposredno plaćanje" #. module: account #: code:addons/account/account.py:1502 #, python-format msgid " Centralisation" -msgstr "" +msgstr " Centralizacija" #. module: account #: help:account.journal,type:0 @@ -10357,6 +10440,11 @@ msgid "" "journals. Select 'Opening/Closing Situation' for entries generated for new " "fiscal years." msgstr "" +"Odaberite 'Prodaja' za dnevnike izlaznih računa. Odaberite 'Nabava' za " +"dnevnike ulaznih računa. Odaberite 'Gotovina' ili 'Banka' za dnevnike koji " +"se koriste kod plaćanja izlaznih ili ulaznih računa. Odaberite 'Općenito' za " +"dnevnike raznih drugih operacija. Odaberite 'Početno/završno stanje' za " +"unose generirane s novom fiskalnom godinom." #. module: account #: view:account.subscription:0 @@ -10410,12 +10498,14 @@ msgid "" "It indicates that the invoice has been paid and the journal entry of the " "invoice has been reconciled with one or several journal entries of payment." msgstr "" +"Označava da je račun plaćen i da je temeljnica računa zatvorena sa jednim " +"ili više izvoda." #. module: account #: code:addons/account/account_move_line.py:780 #, python-format msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!" -msgstr "" +msgstr "Stavka dnevnika '%s' (id: %s), Knjiženje '%s' je već zatvoreno!" #. module: account #: view:account.invoice:0 @@ -10429,7 +10519,7 @@ msgstr "Nacrti računa" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 #, python-format msgid "Nothing more to reconcile" -msgstr "" +msgstr "Nema stavaka za zatvaranje" #. module: account #: view:cash.box.in:0 @@ -10466,6 +10556,13 @@ msgid "" "open period. Close a period when you do not want to record new entries and " "want to lock this period for tax related calculation." msgstr "" +"Period je fiskalno razdoblje tijekom kojeg treba biti zabilježena evidencija " +"svih računovodstvenih aktivnosti. Mjesečni periodu su standard, ali ovisno o " +"vašoj državi ili potrebama kompanije možete također imati i kvartalne " +"periode. Zatvaranje perioda će onemogućiti unos novih knjiženja. Sva nova " +"knjiženja trebaju tada ići na sljedeći otvoreni period. Zatvorite perioda " +"kada ne želite nova knjiženja i kada želite zaključati period za potrebe " +"poreznih evidencija." #. module: account #: view:account.analytic.account:0 @@ -10492,7 +10589,7 @@ msgstr "Postavite fiskalnu godinu" #. module: account #: field:account.period,name:0 msgid "Period Name" -msgstr "Naziv Perioda" +msgstr "Naziv perioda" #. module: account #: code:addons/account/wizard/account_invoice_state.py:68 @@ -10507,7 +10604,7 @@ msgstr "" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 msgid "Code/Date" -msgstr "Šifra/Datum" +msgstr "Šifra/datum" #. module: account #: view:account.bank.statement:0 @@ -10539,6 +10636,9 @@ msgid "" "some non legal fields or you must unconfirm the journal entry first.\n" "%s." msgstr "" +"Ne možete raditi ovu promjenu na knjiženom unosu. Možete samo mijenjati neka " +"sporedna polja ili morate prvo otknjižiti temeljnicu.\n" +"%s." #. module: account #: help:account.config.settings,module_account_budget:0 @@ -10549,11 +10649,17 @@ msgid "" "analytic account.\n" " This installs the module account_budget." msgstr "" +"Ovo omogućuje računovođama da upravljalju analitičkim i miješanim " +"proračunima.\n" +" Jednom kada je glavni proračun definiran,\n" +" voditelji projekta mogu postaviti planirani iznos na svaki " +"analitički konto.\n" +" Instalira modul account_budget." #. module: account #: field:account.bank.statement.line,name:0 msgid "OBI" -msgstr "" +msgstr "OBI" #. module: account #: help:res.partner,property_account_payable:0 @@ -10579,7 +10685,7 @@ msgstr "Sekundarna valuta" #. module: account #: model:ir.model,name:account.model_validate_account_move msgid "Validate Account Move" -msgstr "" +msgstr "Potvrdi knjiženje" #. module: account #: field:account.account,credit:0 @@ -10686,7 +10792,7 @@ msgstr "Tečaj" #. module: account #: view:account.config.settings:0 msgid "e.g. sales@openerp.com" -msgstr "" +msgstr "npr. prodaja@openerp.com" #. module: account #: field:account.account,tax_ids:0 @@ -10708,12 +10814,12 @@ msgstr "Travanj" #. module: account #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0 msgid "Profit (Loss) to report" -msgstr "" +msgstr "Dobit (gubitak) za prijavu" #. module: account #: view:account.move.line.reconcile.select:0 msgid "Open for Reconciliation" -msgstr "" +msgstr "Otvori za saldakonti zatvaranje" #. module: account #: field:account.account,parent_left:0 @@ -10879,6 +10985,8 @@ msgstr "Statusi" #: help:product.template,property_account_income:0 msgid "This account will be used to value outgoing stock using sale price." msgstr "" +"Ovaj će se konto koristiti za vrednovanje skladišnog izlaza koristeći " +"prodajnu cijenu." #. module: account #: field:account.invoice,check_total:0 @@ -10901,12 +11009,12 @@ msgstr "Ukupno" #: code:addons/account/wizard/account_invoice_refund.py:109 #, python-format msgid "Cannot %s draft/proforma/cancel invoice." -msgstr "" +msgstr "Ne mogu %s nacrt/predračun/otkaži račun." #. module: account #: field:account.tax,account_analytic_paid_id:0 msgid "Refund Tax Analytic Account" -msgstr "" +msgstr "Analitički konto poreza kod povrata" #. module: account #: view:account.move.bank.reconcile:0 @@ -10994,6 +11102,8 @@ msgid "" "reconciliation process today. The current partner is counted as already " "processed." msgstr "" +"Ova brojka opisuje ukupni broj partenra koji su prošli proces zatvaranja " +"danas. Trenutni partner se računa." #. module: account #: view:account.fiscalyear:0 @@ -11032,6 +11142,8 @@ msgid "" "If you unreconcile transactions, you must also verify all the actions that " "are linked to those transactions because they will not be disable" msgstr "" +"Ako razvezujete transakcije, morate također provjeriti akcije koje su " +"povezane sa tim transakcijama jer će one ostati aktivne." #. module: account #: code:addons/account/account_move_line.py:1056 @@ -11066,6 +11178,9 @@ msgid "" "customer. The tool search can also be used to personalise your Invoices " "reports and so, match this analysis to your needs." msgstr "" +"Iz ovog izvještaja imate pregled iznosa fakturiranog vašem kupcu. Alat " +"pretrage može se također koristiti za personalizaciju vaših ispisa računa i " +"priagođavanje analize vašim potrebama." #. module: account #: view:account.partner.reconcile.process:0 @@ -11086,7 +11201,7 @@ msgstr "Stanje računa je zatvoreno/plaćeno" #. module: account #: field:account.config.settings,module_account_followup:0 msgid "Manage customer payment follow-ups" -msgstr "" +msgstr "Upravljanje naplatom" #. module: account #: model:ir.model,name:account.model_report_account_sales @@ -11184,6 +11299,10 @@ msgid "" "payable/receivable are for partners accounts (for debit/credit " "computations), closed for depreciated accounts." msgstr "" +"'Interni tip' se koristi za značajke dostupne na različitim tipovima konta: " +"pogled ne može imati stavke dnevnika, konsolidacija su konta koja mogu imati " +"podređena konta za potrebe konsolidacije više kompanija, obveze/potraživanja " +"su za saldakonti, zatvoreno za konta koja se više ne koriste." #. module: account #: report:account.account.balance:0 @@ -11543,7 +11662,7 @@ msgstr "Veljača" #: view:account.bank.statement:0 #: help:account.cashbox.line,number_closing:0 msgid "Closing Unit Numbers" -msgstr "" +msgstr "Broj jedinice zatvaranja" #. module: account #: field:account.bank.accounts.wizard,bank_account_id:0 diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po index e34f539cb83..376af7a888a 100644 --- a/addons/account_analytic_default/i18n/hr.po +++ b/addons/account_analytic_default/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-10-16 12:25+0000\n" +"Last-Translator: Marko Carevic \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:46+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n" +"X-Generator: Launchpad (build 16799)\n" #. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner @@ -32,7 +32,7 @@ msgstr "Grupiraj po..." #. module: account_analytic_default #: help:account.analytic.default,date_stop:0 msgid "Default end date for this Analytic Account." -msgstr "" +msgstr "Predodređeni datum završetka za ovaj analitički konto" #. module: account_analytic_default #: help:account.analytic.default,product_id:0 @@ -56,7 +56,7 @@ msgstr "Uvjeti" #: view:account.analytic.default:0 #: field:account.analytic.default,product_id:0 msgid "Product" -msgstr "Proizvod" +msgstr "Artikl" #. module: account_analytic_default #: help:account.analytic.default,partner_id:0 diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po index 5ffeb378842..d68411955db 100644 --- a/addons/account_voucher/i18n/hr.po +++ b/addons/account_voucher/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-09-25 11:32+0000\n" -"Last-Translator: Krešimir Jeđud \n" +"PO-Revision-Date: 2013-10-16 13:13+0000\n" +"Last-Translator: Marko Carevic \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-26 05:54+0000\n" -"X-Generator: Launchpad (build 16771)\n" +"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n" +"X-Generator: Launchpad (build 16799)\n" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -25,7 +25,7 @@ msgstr "Zatvaranje" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_config_settings msgid "account.config.settings" -msgstr "" +msgstr "account.config.settings" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:417 @@ -59,7 +59,7 @@ msgstr "Grupiraj po..." msgid "" "Computed as the difference between the amount stated in the voucher and the " "sum of allocation on the voucher lines." -msgstr "" +msgstr "Izračunato kao razlika između iznosa" #. module: account_voucher #: view:account.voucher:0 diff --git a/addons/board/i18n/lv.po b/addons/board/i18n/lv.po index 67aa565a7d1..654ace9cdea 100644 --- a/addons/board/i18n/lv.po +++ b/addons/board/i18n/lv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-10-16 19:14+0000\n" +"Last-Translator: Jānis-Marks Gailis \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:53+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n" +"X-Generator: Launchpad (build 16799)\n" #. module: board #: model:ir.actions.act_window,name:board.action_board_create @@ -26,7 +26,7 @@ msgstr "" #. module: board #: view:board.create:0 msgid "Create" -msgstr "" +msgstr "Izveidot" #. module: board #. openerp-web @@ -52,7 +52,7 @@ msgstr "" #: code:addons/board/static/src/xml/board.xml:70 #, python-format msgid "Add" -msgstr "" +msgstr "Pievienot" #. module: board #. openerp-web @@ -121,7 +121,7 @@ msgstr "" #: code:addons/board/static/src/xml/board.xml:6 #, python-format msgid "Reset" -msgstr "" +msgstr "Atstatīt" #. module: board #: field:board.create,menu_parent_id:0 @@ -147,7 +147,7 @@ msgstr "" #: code:addons/board/static/src/xml/board.xml:10 #, python-format msgid "Change Layout" -msgstr "" +msgstr "Mainīt Izkārtojumu" #. module: board #: view:board.create:0 @@ -157,7 +157,7 @@ msgstr "Atcelt" #. module: board #: view:board.create:0 msgid "or" -msgstr "" +msgstr "vai" #. module: board #. openerp-web diff --git a/addons/contacts/i18n/lv.po b/addons/contacts/i18n/lv.po new file mode 100644 index 00000000000..e0d92a9b88f --- /dev/null +++ b/addons/contacts/i18n/lv.po @@ -0,0 +1,37 @@ +# Latvian translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:36+0000\n" +"PO-Revision-Date: 2013-10-16 19:12+0000\n" +"Last-Translator: Jānis-Marks Gailis \n" +"Language-Team: Latvian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n" +"X-Generator: Launchpad (build 16799)\n" + +#. module: contacts +#: model:ir.actions.act_window,help:contacts.action_contacts +msgid "" +"

\n" +" Click to add a contact in your address book.\n" +"

\n" +" OpenERP helps you easily track all activities related to\n" +" a customer; discussions, history of business opportunities,\n" +" documents, etc.\n" +"

\n" +" " +msgstr "" + +#. module: contacts +#: model:ir.actions.act_window,name:contacts.action_contacts +#: model:ir.ui.menu,name:contacts.menu_contacts +msgid "Contacts" +msgstr "Kontakti" From c4370b47f8049cad7a5000aaf93de49bea5143a1 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 17 Oct 2013 09:46:35 +0200 Subject: [PATCH 4/8] [IMP] procurement: redifine workflow to avoid going back to confrmed state bzr revid: mat@openerp.com-20131017074635-qp1n3x8955bf3aqd --- addons/procurement/procurement_workflow.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml index 8ddd619a527..086a92214f0 100644 --- a/addons/procurement/procurement_workflow.xml +++ b/addons/procurement/procurement_workflow.xml @@ -119,7 +119,7 @@ - + button_restart @@ -129,7 +129,7 @@ - + button_restart From b98f935d271b6aa25329420ee3afe49f6bdd7616 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 17 Oct 2013 12:44:26 +0200 Subject: [PATCH 5/8] revert change of workflow bzr revid: mat@openerp.com-20131017104426-260y7v0113q8iue9 --- addons/procurement/procurement.py | 2 +- addons/procurement/procurement_workflow.xml | 6 ++++-- addons/procurement/schedulers.py | 23 +++++++++++++++++++++ addons/purchase/purchase.py | 3 ++- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index a39b2d79843..2bc095a9661 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -371,7 +371,7 @@ class procurement_order(osv.osv): #temporary context passed in write to prevent an infinite loop ctx_wkf = dict(context or {}) ctx_wkf['workflow.trg_write.%s' % self._name] = False - self.write(cr, uid, [procurement.id], {'message': message, 'state': 'exception'},context=ctx_wkf) + self.write(cr, uid, [procurement.id], {'message': message},context=ctx_wkf) return ok def _workflow_trigger(self, cr, uid, ids, trigger, context=None): diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml index 086a92214f0..76b54370ef2 100644 --- a/addons/procurement/procurement_workflow.xml +++ b/addons/procurement/procurement_workflow.xml @@ -29,6 +29,8 @@ confirm_wait + function + write({'state':'exception'}) @@ -119,7 +121,7 @@ - + button_restart @@ -129,7 +131,7 @@ - + button_restart diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index cf08cb91a06..07280b38ae7 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -72,6 +72,10 @@ class procurement_order(osv.osv): maxdate = (datetime.today() + relativedelta(days=company.schedule_range)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT) start_date = fields.datetime.now() offset = 0 + report = [] + report_total = 0 + report_except = 0 + report_later = 0 while True: ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_order')], offset=offset, limit=500, order='priority, date_planned', context=context) for proc in procurement_obj.browse(cr, uid, ids, context=context): @@ -79,7 +83,14 @@ class procurement_order(osv.osv): wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr) else: offset += 1 + report_later += 1 + if proc.state == 'exception': + report.append(_('PROC %d: on order - %3.2f %-5s - %s') % \ + (proc.id, proc.product_qty, proc.product_uom.name, + proc.product_id.name)) + report_except += 1 + report_total += 1 if use_new_cursor: cr.commit() if not ids: @@ -87,10 +98,22 @@ class procurement_order(osv.osv): offset = 0 ids = [] while True: + report_ids = [] ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset) for proc in procurement_obj.browse(cr, uid, ids): if maxdate >= proc.date_planned: wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr) + report_ids.append(proc.id) + else: + report_later += 1 + report_total += 1 + + if proc.state == 'exception': + report.append(_('PROC %d: from stock - %3.2f %-5s - %s') % \ + (proc.id, proc.product_qty, proc.product_uom.name, + proc.product_id.name,)) + report_except += 1 + if use_new_cursor: cr.commit() diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 04b380ef098..992af37222e 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1044,9 +1044,10 @@ class procurement_order(osv.osv): message = _('No default supplier defined for this product') elif not partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']: message = _('No address defined for the supplier') + if message: if procurement.message != message: - cr.execute("update procurement_order set message=%s, state='exception' where id=%s", (message, procurement.id)) + cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id)) return False if user.company_id and user.company_id.partner_id: From b60da2a9a3693866cd018e73faab2034d6673c45 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 17 Oct 2013 13:35:21 +0200 Subject: [PATCH 6/8] [IMP] procurement: track only once the change of state to exception and confirmed bzr revid: mat@openerp.com-20131017113521-5u2k9glb3o7cnmmk --- addons/procurement/procurement.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 2bc095a9661..f5d4761642b 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -128,6 +128,22 @@ class procurement_order(osv.osv): 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'procurement.order', context=c) } + def message_track(self, cr, uid, ids, tracked_fields, initial_values, context=None): + """ Overwrite message_track to avoid tracking more than once the confirm-exception loop + Add '_first_pass_done_' to the note field only the first time stuck in exception state + Will avoid getting furthur confirmed and exception change of state messages + + TODO: this hack is necessary for a stable version but should be avoided for the next release. + Instead find a more elegant way to prevent redundant messages or entirely stop tracking states on procurement orders + """ + for proc in self.browse(cr, uid, ids, context=context): + if not proc.note or '_first_pass_done_' not in proc.note or proc.state not in ('confirmed', 'exception'): + super(procurement_order, self).message_track(cr, uid, [proc.id], tracked_fields, initial_values, context=context) + if proc.state == 'exception': + cr.execute("""UPDATE procurement_order set note = CONCAT(note, %s) WHERE id = %s""", ('_first_pass_done_',proc.id)) + + return True + def unlink(self, cr, uid, ids, context=None): procurements = self.read(cr, uid, ids, ['state'], context=context) unlink_ids = [] From afe290b844b6444524dffe401a79b3ae2dd4f5d2 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 18 Oct 2013 06:11:29 +0000 Subject: [PATCH 7/8] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20131018061129-4wcyxayj6darv5op --- addons/mail/i18n/fi.po | 18 +++++++++--------- addons/mail/i18n/ja.po | 8 ++++---- addons/sale/i18n/fi.po | 18 +++++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po index 9efca3ee162..e9b3f9341a4 100644 --- a/addons/mail/i18n/fi.po +++ b/addons/mail/i18n/fi.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-10-17 16:34+0000\n" +"Last-Translator: Miku Laitinen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:08+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n" +"X-Generator: Launchpad (build 16799)\n" #. module: mail #: view:mail.followers:0 @@ -97,7 +97,7 @@ msgstr "" #. module: mail #: view:mail.group:0 msgid "Group Name" -msgstr "" +msgstr "Ryhmän nimi" #. module: mail #: selection:mail.group,public:0 @@ -190,7 +190,7 @@ msgstr "" #: code:addons/mail/static/src/js/mail.js:1029 #, python-format msgid "Do you really want to delete this message?" -msgstr "" +msgstr "Haluatko varmasti poistaa tämän viestin?" #. module: mail #: view:mail.message:0 @@ -912,7 +912,7 @@ msgstr "" #: code:addons/mail/static/src/xml/mail.xml:188 #, python-format msgid "Compose a new message" -msgstr "" +msgstr "Kirjoita uusi viesti" #. module: mail #: view:mail.mail:0 @@ -1233,7 +1233,7 @@ msgstr "" #: code:addons/mail/static/src/xml/mail.xml:193 #, python-format msgid "Write to my followers" -msgstr "" +msgstr "Kirjoita seuraajilleni" #. module: mail #: model:ir.model,name:mail.model_res_groups @@ -1694,7 +1694,7 @@ msgstr "" #: model:ir.ui.menu,name:mail.mail_feeds #: model:ir.ui.menu,name:mail.mail_feeds_main msgid "Messaging" -msgstr "" +msgstr "Viestit" #. module: mail #: view:mail.alias:0 diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po index e7254ede597..60e06c2ffcc 100644 --- a/addons/mail/i18n/ja.po +++ b/addons/mail/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-08-06 04:06+0000\n" +"PO-Revision-Date: 2013-10-17 09:12+0000\n" "Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-07 05:03+0000\n" -"X-Generator: Launchpad (build 16721)\n" +"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n" +"X-Generator: Launchpad (build 16799)\n" #. module: mail #: view:mail.followers:0 @@ -770,7 +770,7 @@ msgstr "高度" #: code:addons/mail/static/src/xml/mail.xml:244 #, python-format msgid "Move to Inbox" -msgstr "" +msgstr "受信箱に移動" #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:193 diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po index 96e8dca0f33..e74edde14aa 100644 --- a/addons/sale/i18n/fi.po +++ b/addons/sale/i18n/fi.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-10-17 16:42+0000\n" +"Last-Translator: Miku Laitinen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:21+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n" +"X-Generator: Launchpad (build 16799)\n" #. module: sale #: model:ir.model,name:sale.model_account_config_settings @@ -36,7 +36,7 @@ msgstr "" #: view:sale.report:0 #: field:sale.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Myyjä" #. module: sale #: help:sale.order,pricelist_id:0 @@ -456,8 +456,8 @@ msgid "" "The salesman confirms the quotation. The state of the sales order becomes " "'In progress' or 'Manual in progress'." msgstr "" -"Myyntimies vahvistaa tarjouksen. Myyntitilauksen tila muuttuu 'käynnissä' " -"tai 'manuaalinen käynnissä'." +"Myyjä vahvistaa tarjouksen. Myyntitilauksen tilaksi muuttuu \"käsittelyssä\" " +"tai \"manuaalisessa käsittelyssä\"." #. module: sale #: view:sale.order.line:0 @@ -621,7 +621,7 @@ msgstr "" #. module: sale #: model:ir.model,name:sale.model_sale_order_line msgid "Sales Order Line" -msgstr "Myyntitilauksen Rivi" +msgstr "Myyntitilausrivi" #. module: sale #: field:sale.config.settings,module_analytic_user_function:0 @@ -1746,7 +1746,7 @@ msgstr "Peruutettu" #. module: sale #: view:sale.order.line:0 msgid "Search Uninvoiced Lines" -msgstr "Etsi Laskuttamattomia Rivejä" +msgstr "Etsi laskuttamattomia rivejä" #. module: sale #: selection:sale.order,state:0 From 44bc4f3151df9af2a41a794798cd189ea7636faf Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 18 Oct 2013 13:44:00 +0200 Subject: [PATCH 8/8] [FIX] mrp_repair: use action_done to validate a operation componenents when ending a repair bzr revid: mat@openerp.com-20131018114400-f1iaoynu1vlq325o --- addons/mrp_repair/mrp_repair.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 7bab1c04c99..9c0ab0e2c18 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -521,8 +521,9 @@ class mrp_repair(osv.osv): 'location_dest_id': move.location_dest_id.id, 'tracking_id': False, 'prodlot_id': move.prodlot_id and move.prodlot_id.id or False, - 'state': 'done', + 'state': 'assigned', }) + move_obj.action_done(cr, uid, [move_id], context=context) repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context) if repair.deliver_bool: pick_name = seq_obj.get(cr, uid, 'stock.picking.out')