diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index e189f30a6fa..4702a1a2cf4 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-12-21 17:04+0000\n" -"PO-Revision-Date: 2012-06-20 16:14+0000\n" -"Last-Translator: Jiří Hajda \n" +"PO-Revision-Date: 2014-02-02 15:35+0000\n" +"Last-Translator: Jakub Drozd \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-28 05:54+0000\n" -"X-Generator: Launchpad (build 16914)\n" +"X-Launchpad-Export-Date: 2014-02-03 05:18+0000\n" +"X-Generator: Launchpad (build 16916)\n" "X-Poedit-Language: Czech\n" #. module: account @@ -195,7 +195,7 @@ msgstr "Označení sloupce" #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" -msgstr "" +msgstr "Počet číslic použitých v čísle účtu" #. module: account #: help:account.analytic.journal,type:0 @@ -258,7 +258,7 @@ msgstr "" #. module: account #: field:account.config.settings,sale_refund_sequence_next:0 msgid "Next credit note number" -msgstr "" +msgstr "Další číslo dobropisu" #. module: account #: help:account.config.settings,module_account_voucher:0 @@ -444,7 +444,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 #, python-format msgid "Period :" -msgstr "" +msgstr "Období :" #. module: account #: field:account.account.template,chart_template_id:0 @@ -660,12 +660,12 @@ msgstr "Hlavní číselná řada musí být odlišná od současné!" #: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not configured properly." -msgstr "" +msgstr "Stávající měna není správně nakonfigurována." #. module: account #: field:account.journal,profit_account_id:0 msgid "Profit Account" -msgstr "" +msgstr "Účet zisků" #. module: account #: code:addons/account/account_move_line.py:1156 @@ -761,6 +761,8 @@ msgid "" "The date of your Journal Entry is not in the defined period! You should " "change the date or remove this constraint from the journal." msgstr "" +"Datum vašeho záznamu deníku není v určeném období! Měli byste změnit datum " +"nebo odstranit omezení z deníku." #. module: account #: model:ir.model,name:account.model_account_report_general_ledger @@ -781,7 +783,7 @@ msgstr "Opravdu chcete vytvořit záznamy?" #: code:addons/account/account_invoice.py:1361 #, python-format msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)." -msgstr "" +msgstr "Faktura částečně uhrazena: %s%s z %s%s (%s%s zbývá)." #. module: account #: view:account.invoice:0 @@ -890,7 +892,7 @@ msgstr "Analytický účet knihy" #. module: account #: view:account.invoice:0 msgid "Send by Email" -msgstr "" +msgstr "Odeslat e-mailem" #. module: account #: help:account.central.journal,amount_currency:0 @@ -992,7 +994,7 @@ msgstr "" #. module: account #: model:mail.message.subtype,description:account.mt_invoice_paid msgid "Invoice paid" -msgstr "" +msgstr "Faktura uhrazena" #. module: account #: view:validate.account.move:0 @@ -1095,7 +1097,7 @@ msgstr "Kód" #. module: account #: view:account.config.settings:0 msgid "Features" -msgstr "" +msgstr "Vlastnosti" #. module: account #: code:addons/account/account.py:2346 @@ -1162,7 +1164,7 @@ msgstr "Režim na šířku" #. module: account #: help:account.fiscalyear.close,fy_id:0 msgid "Select a Fiscal year to close" -msgstr "Vyberte finanční rok k uzavření" +msgstr "Vyberte fiskální rok k uzavření" #. module: account #: help:account.account.template,user_type:0 @@ -1296,7 +1298,7 @@ msgstr "Kód bude zobrazen na výkazech." #. module: account #: view:account.tax.template:0 msgid "Taxes used in Purchases" -msgstr "Daně použité při nákuu" +msgstr "Daně použité při nákupu" #. module: account #: field:account.invoice.tax,tax_code_id:0 @@ -1310,13 +1312,13 @@ msgstr "Kód daně" #. module: account #: field:account.account,currency_mode:0 msgid "Outgoing Currencies Rate" -msgstr "Odchozí měnový poměr" +msgstr "Odchozí měnový kurz" #. module: account #: view:account.analytic.account:0 #: field:account.config.settings,chart_template_id:0 msgid "Template" -msgstr "" +msgstr "Šablona" #. module: account #: selection:account.analytic.journal,type:0 @@ -1389,7 +1391,7 @@ msgstr "Účet" #. module: account #: field:account.tax,include_base_amount:0 msgid "Included in base amount" -msgstr "Včetně základu" +msgstr "Zahrnuto v základní částce" #. module: account #: view:account.entries.report:0 @@ -1457,7 +1459,7 @@ msgstr "Položky vyrovnání" #: model:ir.actions.report.xml,name:account.account_overdue #: view:res.company:0 msgid "Overdue Payments" -msgstr "Zpožděné platby" +msgstr "Platby po splatnosti" #. module: account #: report:account.third_party_ledger:0 @@ -1529,7 +1531,7 @@ msgstr "Účet pohledávek" #: code:addons/account/account.py:768 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (kopie)" #. module: account #: report:account.account.balance:0 @@ -1572,7 +1574,7 @@ msgstr "# z položek" #. module: account #: field:account.automatic.reconcile,max_amount:0 msgid "Maximum write-off amount" -msgstr "Max.množství odpisu" +msgstr "Maximální hodnota odpisu" #. module: account #. openerp-web @@ -1605,7 +1607,7 @@ msgstr "" #. module: account #: view:account.invoice.refund:0 msgid "Credit Note" -msgstr "" +msgstr "Dobropis" #. module: account #: view:account.config.settings:0 @@ -1615,7 +1617,7 @@ msgstr "Elektronická fakturace a platby" #. module: account #: view:account.analytic.cost.ledger.journal.report:0 msgid "Cost Ledger for Period" -msgstr "Kniha nákladových účtu za období" +msgstr "Kniha nákladových účtú za období" #. module: account #: view:account.entries.report:0 @@ -1690,7 +1692,7 @@ msgstr "Bez daně" #. module: account #: view:account.journal:0 msgid "Advanced Settings" -msgstr "" +msgstr "Rozšířená nastavení" #. module: account #: view:account.bank.statement:0 @@ -1796,7 +1798,7 @@ msgstr "Analytické účtenictví" #. module: account #: report:account.overdue:0 msgid "Sub-Total :" -msgstr "Mezisoučet" +msgstr "Mezisoučet :" #. module: account #: help:res.company,tax_calculation_rounding_method:0 @@ -1826,7 +1828,7 @@ msgstr "15 dnů" #. module: account #: model:ir.ui.menu,name:account.periodical_processing_invoicing msgid "Invoicing" -msgstr "Fakturování" +msgstr "Fakturace" #. module: account #: code:addons/account/report/account_partner_balance.py:115 @@ -1951,7 +1953,7 @@ msgstr "" #. module: account #: help:account.period,special:0 msgid "These periods can overlap." -msgstr "Tyto období se mohou překrývat." +msgstr "Tato období se mohou překrývat." #. module: account #: model:process.node,name:account.process_node_draftstatement0 @@ -1977,7 +1979,7 @@ msgstr "Částka Dal" #: field:account.bank.statement,message_ids:0 #: field:account.invoice,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Zprávy" #. module: account #: view:account.vat.declaration:0 @@ -2075,7 +2077,7 @@ msgstr "Analýza faktur" #. module: account #: model:ir.model,name:account.model_mail_compose_message msgid "Email composition wizard" -msgstr "" +msgstr "Průvodce vytvořením emailu" #. module: account #: model:ir.model,name:account.model_account_period_close @@ -7494,7 +7496,7 @@ msgstr "Pro procenta zadejte násobek mezi 0-1." #: field:account.invoice,date_invoice:0 #: field:report.invoice.created,date_invoice:0 msgid "Invoice Date" -msgstr "Datum vystavení" +msgstr "Datum vystavení faktury" #. module: account #: view:account.invoice.report:0 diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 2db1e3dff65..06c916d9580 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -30,7 +30,7 @@ from openerp.tools import exception_to_unicode _logger = logging.getLogger(__name__) -class Home(openerp.addons.web.controllers.main.Home): +class AuthSignup(openerp.addons.web.controllers.main.Home): @http.route() def web_login(self, *args, **kw): @@ -60,7 +60,7 @@ class Home(openerp.addons.web.controllers.main.Home): qcontext.update(config) if 'error' in qcontext or mode not in ('reset', 'signup') or (not token and not config[mode]): - response = super(Home, self).web_login(*args, **kw) + response = super(AuthSignup, self).web_login(*args, **kw) if isinstance(response, LazyResponse): response.params['values'].update(config) return response @@ -86,7 +86,7 @@ class Home(openerp.addons.web.controllers.main.Home): request.cr.commit() except SignupError, e: qcontext['error'] = exception_to_unicode(e) - return super(Home, self).web_login(*args, **kw) + return super(AuthSignup, self).web_login(*args, **kw) return response diff --git a/addons/email_template/i18n/bs.po b/addons/email_template/i18n/bs.po new file mode 100644 index 00000000000..d0b24648c32 --- /dev/null +++ b/addons/email_template/i18n/bs.po @@ -0,0 +1,515 @@ +# Bosnian translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:05+0000\n" +"PO-Revision-Date: 2014-02-01 22:19+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Bosnian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-02-02 05:31+0000\n" +"X-Generator: Launchpad (build 16916)\n" + +#. module: email_template +#: field:email.template,email_from:0 +#: field:email_template.preview,email_from:0 +msgid "From" +msgstr "Od" + +#. module: email_template +#: field:mail.compose.message,template_id:0 +msgid "Template" +msgstr "Predložak" + +#. module: email_template +#: help:email.template,ref_ir_value:0 +#: help:email_template.preview,ref_ir_value:0 +msgid "Sidebar button to open the sidebar action" +msgstr "Dugme za otvaranje akcije sidebar-a" + +#. module: email_template +#: field:res.partner,opt_out:0 +msgid "Opt-Out" +msgstr "Isključiti iz masovne e-pošte" + +#. module: email_template +#: field:email.template,email_to:0 +#: field:email_template.preview,email_to:0 +msgid "To (Emails)" +msgstr "Za (E-mailovi)" + +#. module: email_template +#: field:email.template,mail_server_id:0 +#: field:email_template.preview,mail_server_id:0 +msgid "Outgoing Mail Server" +msgstr "Odlazni E-mail server" + +#. module: email_template +#: help:email.template,ref_ir_act_window:0 +#: help:email_template.preview,ref_ir_act_window:0 +msgid "" +"Sidebar action to make this template available on records of the related " +"document model" +msgstr "" +"Akcija sidebar-a za postavljanje ovog prijedloga dostupnog na akcijama " +"povezanog modela dokumenta" + +#. module: email_template +#: field:email.template,model_object_field:0 +#: field:email_template.preview,model_object_field:0 +msgid "Field" +msgstr "Polje" + +#. module: email_template +#: help:email.template,email_from:0 +#: help:email_template.preview,email_from:0 +msgid "Sender address (placeholders may be used here)" +msgstr "" + +#. module: email_template +#: view:email.template:0 +msgid "Remove context action" +msgstr "Ukloni kontekstnu akciju" + +#. module: email_template +#: help:email.template,mail_server_id:0 +#: help:email_template.preview,mail_server_id:0 +msgid "" +"Optional preferred server for outgoing mails. If not set, the highest " +"priority one will be used." +msgstr "" +"Opcioni preferirani server za izlaznu poštu. Ako nije podešen koristiti će " +"se onaj sa najvišim prioritetom." + +#. module: email_template +#: field:email.template,report_name:0 +#: field:email_template.preview,report_name:0 +msgid "Report Filename" +msgstr "Naziv fajla izvještaja" + +#. module: email_template +#: view:email.template:0 +msgid "Preview" +msgstr "Pregled" + +#. module: email_template +#: field:email.template,reply_to:0 +#: field:email_template.preview,reply_to:0 +msgid "Reply-To" +msgstr "Odgovori na" + +#. module: email_template +#: view:mail.compose.message:0 +msgid "Use template" +msgstr "Koristi predložak" + +#. module: email_template +#: field:email.template,body_html:0 +#: field:email_template.preview,body_html:0 +msgid "Body" +msgstr "Sadržaj" + +#. module: email_template +#: code:addons/email_template/email_template.py:247 +#, python-format +msgid "%s (copy)" +msgstr "%s (kopija)" + +#. module: email_template +#: help:email.template,user_signature:0 +#: help:email_template.preview,user_signature:0 +msgid "" +"If checked, the user's signature will be appended to the text version of the " +"message" +msgstr "" +"Ako je odabrano, potpis korisnika biti će dodan tekst verziji poruke." + +#. module: email_template +#: view:email.template:0 +msgid "SMTP Server" +msgstr "SMTP server" + +#. module: email_template +#: view:mail.compose.message:0 +msgid "Save as new template" +msgstr "Spremi kao novi predložak" + +#. module: email_template +#: help:email.template,sub_object:0 +#: help:email_template.preview,sub_object:0 +msgid "" +"When a relationship field is selected as first field, this field shows the " +"document model the relationship goes to." +msgstr "" +"Kada je relaciono polje odabrano kao prvo polje, ovo polje prikazuje model " +"dokumenta kojem relacija odlazi." + +#. module: email_template +#: model:ir.model,name:email_template.model_email_template +msgid "Email Templates" +msgstr "E-mail predlošci" + +#. module: email_template +#: help:email.template,report_name:0 +#: help:email_template.preview,report_name:0 +msgid "" +"Name to use for the generated report file (may contain placeholders)\n" +"The extension can be omitted and will then come from the report type." +msgstr "" +"Naziv za korišćenje generisanog fajla izvještaja(može da sadrži držače " +"mjesta)\n" +"Ekstenzija može biti zanemarena i biće zamjenjena tipom izvještaja." + +#. module: email_template +#: field:email.template,ref_ir_act_window:0 +#: field:email_template.preview,ref_ir_act_window:0 +msgid "Sidebar action" +msgstr "Akcija sidebar-a" + +#. module: email_template +#: help:email.template,lang:0 +#: help:email_template.preview,lang:0 +msgid "" +"Optional translation language (ISO code) to select when sending out an " +"email. If not set, the english version will be used. This should usually be " +"a placeholder expression that provides the appropriate language code, e.g. " +"${object.partner_id.lang.code}." +msgstr "" +"Opcioni jezik prevoda (ISO šifra) za izbor prilikom slanja email-a. Ako nije " +"postavljeno, koristiće se engleska verzija. Ovo bi najčešće treblo biti " +"izraz držača mjesta koja obezbjeđuje odgovarajuću šifru jezika, npr: " +"${object.partner_id.lang.code}." + +#. module: email_template +#: field:email_template.preview,res_id:0 +msgid "Sample Document" +msgstr "Primjer dokumenta" + +#. module: email_template +#: help:email.template,model_object_field:0 +#: help:email_template.preview,model_object_field:0 +msgid "" +"Select target field from the related document model.\n" +"If it is a relationship field you will be able to select a target field at " +"the destination of the relationship." +msgstr "" +"Odaberite ciljno polje iz povezanog modela dokumenta.\n" +"Ako je ovo relaciono polje moći će te odabrati ciljano polje na odredištu " +"relacije." + +#. module: email_template +#: view:email.template:0 +msgid "Dynamic Value Builder" +msgstr "Kreator dinamičke vrijednosti" + +#. module: email_template +#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview +msgid "Template Preview" +msgstr "Pregled predloška" + +#. module: email_template +#: view:mail.compose.message:0 +msgid "Save as a new template" +msgstr "Spremi kao novi predložak" + +#. module: email_template +#: view:email.template:0 +msgid "" +"Display an option on related documents to open a composition wizard with " +"this template" +msgstr "" +"Na povezanim dokumentima prikaži opciju koja poziva čarobnjak sa ovim " +"predloškom" + +#. module: email_template +#: help:email.template,email_cc:0 +#: help:email_template.preview,email_cc:0 +msgid "Carbon copy recipients (placeholders may be used here)" +msgstr "Primaoci kopije(mogu se koristiti držači mjesta)" + +#. module: email_template +#: help:email.template,email_to:0 +#: help:email_template.preview,email_to:0 +msgid "Comma-separated recipient addresses (placeholders may be used here)" +msgstr "Adrese primatelja odvojene zarezom" + +#. module: email_template +#: view:email.template:0 +msgid "Advanced" +msgstr "Napredno" + +#. module: email_template +#: view:email_template.preview:0 +msgid "Preview of" +msgstr "Pregled" + +#. module: email_template +#: view:email_template.preview:0 +msgid "Using sample document" +msgstr "Koristi primjer dokumenta" + +#. module: email_template +#: view:email.template:0 +#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all +#: model:ir.ui.menu,name:email_template.menu_email_templates +msgid "Templates" +msgstr "Predlošci" + +#. module: email_template +#: field:email.template,name:0 +#: field:email_template.preview,name:0 +msgid "Name" +msgstr "Naziv" + +#. module: email_template +#: field:email.template,lang:0 +#: field:email_template.preview,lang:0 +msgid "Language" +msgstr "Jezik" + +#. module: email_template +#: model:ir.model,name:email_template.model_email_template_preview +msgid "Email Template Preview" +msgstr "Pregled e-mail predloška" + +#. module: email_template +#: view:email_template.preview:0 +msgid "Email Preview" +msgstr "Pregled e-maila" + +#. module: email_template +#: view:email.template:0 +msgid "" +"Remove the contextual action to use this template on related documents" +msgstr "" +"Ukloni dodatnu akciju da se ovaj predložak koristi na povezanim dokumentima" + +#. module: email_template +#: field:email.template,copyvalue:0 +#: field:email_template.preview,copyvalue:0 +msgid "Placeholder Expression" +msgstr "Izraz držača mjesta" + +#. module: email_template +#: field:email.template,sub_object:0 +#: field:email_template.preview,sub_object:0 +msgid "Sub-model" +msgstr "Podmodel" + +#. module: email_template +#: help:email.template,subject:0 +#: help:email_template.preview,subject:0 +msgid "Subject (placeholders may be used here)" +msgstr "Tema(mogu se koristiti držači mjesta)" + +#. module: email_template +#: help:email.template,reply_to:0 +#: help:email_template.preview,reply_to:0 +msgid "Preferred response address (placeholders may be used here)" +msgstr "Preferirana adresa za odgovor (modu se koristiti držači mjesta)" + +#. module: email_template +#: field:email.template,ref_ir_value:0 +#: field:email_template.preview,ref_ir_value:0 +msgid "Sidebar Button" +msgstr "Dugme sidebar-a" + +#. module: email_template +#: field:email.template,report_template:0 +#: field:email_template.preview,report_template:0 +msgid "Optional report to print and attach" +msgstr "Opcioni izvještaj za ispis i zakačku" + +#. module: email_template +#: help:email.template,null_value:0 +#: help:email_template.preview,null_value:0 +msgid "Optional value to use if the target field is empty" +msgstr "Opciona vrijednost koja će se koristiti ako je ciljano polje prazno" + +#. module: email_template +#: view:email.template:0 +msgid "Model" +msgstr "Model" + +#. module: email_template +#: model:ir.model,name:email_template.model_mail_compose_message +msgid "Email composition wizard" +msgstr "Čarobnjak sastavljanja email-a" + +#. module: email_template +#: view:email.template:0 +msgid "Add context action" +msgstr "Dodaj kontekstualnu akciju" + +#. module: email_template +#: help:email.template,model_id:0 +#: help:email_template.preview,model_id:0 +msgid "The kind of document with with this template can be used" +msgstr "Vrsta dokumenta koja se može koristiti sa ovi predloškom" + +#. module: email_template +#: field:email.template,email_recipients:0 +#: field:email_template.preview,email_recipients:0 +msgid "To (Partners)" +msgstr "Za (Partneri)" + +#. module: email_template +#: field:email.template,auto_delete:0 +#: field:email_template.preview,auto_delete:0 +msgid "Auto Delete" +msgstr "Auto brisanje" + +#. module: email_template +#: help:email.template,copyvalue:0 +#: help:email_template.preview,copyvalue:0 +msgid "" +"Final placeholder expression, to be copy-pasted in the desired template " +"field." +msgstr "" +"Krajnji izraz držača mjesta, koji će biti kopiran-zalijepljen na željenom " +"polju predloška." + +#. module: email_template +#: field:email.template,model:0 +#: field:email_template.preview,model:0 +msgid "Related Document Model" +msgstr "Povezani model dokumenta" + +#. module: email_template +#: view:email.template:0 +msgid "Addressing" +msgstr "Adresiranje" + +#. module: email_template +#: help:email.template,email_recipients:0 +#: help:email_template.preview,email_recipients:0 +msgid "" +"Comma-separated ids of recipient partners (placeholders may be used here)" +msgstr "" +"IDovi zarezom odvojeni partnera primatelja(mogu se koristiti držači mjesta)" + +#. module: email_template +#: field:email.template,attachment_ids:0 +#: field:email_template.preview,attachment_ids:0 +msgid "Attachments" +msgstr "Zakačke" + +#. module: email_template +#: code:addons/email_template/email_template.py:234 +#, python-format +msgid "Deletion of the action record failed." +msgstr "Brisanje zapisa akcije polja." + +#. module: email_template +#: field:email.template,email_cc:0 +#: field:email_template.preview,email_cc:0 +msgid "Cc" +msgstr "Cc" + +#. module: email_template +#: field:email.template,model_id:0 +#: field:email_template.preview,model_id:0 +msgid "Applies to" +msgstr "Odnosi se na" + +#. module: email_template +#: field:email.template,sub_model_object_field:0 +#: field:email_template.preview,sub_model_object_field:0 +msgid "Sub-field" +msgstr "Podpolje" + +#. module: email_template +#: view:email.template:0 +msgid "Email Details" +msgstr "Detalji e-maila" + +#. module: email_template +#: code:addons/email_template/email_template.py:199 +#, python-format +msgid "Send Mail (%s)" +msgstr "Pošalji e-mail (%s)" + +#. module: email_template +#: help:res.partner,opt_out:0 +msgid "" +"If checked, this partner will not receive any automated email notifications, " +"such as the availability of invoices." +msgstr "" + +#. module: email_template +#: help:email.template,auto_delete:0 +#: help:email_template.preview,auto_delete:0 +msgid "Permanently delete this email after sending it, to save space" +msgstr "Trajno obriši ovaj e-mail nakon slanja, radi uštede prostora" + +#. module: email_template +#: view:email.template:0 +msgid "Group by..." +msgstr "Grupiši po..." + +#. module: email_template +#: help:email.template,sub_model_object_field:0 +#: help:email_template.preview,sub_model_object_field:0 +msgid "" +"When a relationship field is selected as first field, this field lets you " +"select the target field within the destination document model (sub-model)." +msgstr "" +"Kada je relaciono polje izabrano kao prvo polje, ovo polje Vam dozvoljava da " +"odaberete ciljno polje u sklopu odredišnok dokumentnog modela (podmodela)" + +#. module: email_template +#: code:addons/email_template/email_template.py:234 +#, python-format +msgid "Warning" +msgstr "Upozorenje" + +#. module: email_template +#: field:email.template,user_signature:0 +#: field:email_template.preview,user_signature:0 +msgid "Add Signature" +msgstr "Dodaj potpis" + +#. module: email_template +#: model:ir.model,name:email_template.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: email_template +#: field:email.template,null_value:0 +#: field:email_template.preview,null_value:0 +msgid "Default Value" +msgstr "Podrazumijevana vrijednost" + +#. module: email_template +#: help:email.template,attachment_ids:0 +#: help:email_template.preview,attachment_ids:0 +msgid "" +"You may attach files to this template, to be added to all emails created " +"from this template" +msgstr "" +"Možete priložiti datoteke ovom predlošku, one će biti dodate svim e-" +"mailovima kreiranim iz ovog predloška" + +#. module: email_template +#: help:email.template,body_html:0 +#: help:email_template.preview,body_html:0 +msgid "Rich-text/HTML version of the message (placeholders may be used here)" +msgstr "Rich-text/HTML verzija poruke" + +#. module: email_template +#: view:email.template:0 +msgid "Contents" +msgstr "Sadržaj" + +#. module: email_template +#: field:email.template,subject:0 +#: field:email_template.preview,subject:0 +msgid "Subject" +msgstr "Tema" diff --git a/addons/gamification_sale_crm/sale_crm_goals_demo.xml b/addons/gamification_sale_crm/sale_crm_goals_demo.xml index fd69c36162f..d8e26551c32 100644 --- a/addons/gamification_sale_crm/sale_crm_goals_demo.xml +++ b/addons/gamification_sale_crm/sale_crm_goals_demo.xml @@ -14,7 +14,7 @@ - + 2000 inprogress diff --git a/addons/point_of_sale/i18n/th.po b/addons/point_of_sale/i18n/th.po new file mode 100644 index 00000000000..8714c7d17d9 --- /dev/null +++ b/addons/point_of_sale/i18n/th.po @@ -0,0 +1,3990 @@ +# Thai translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-21 17:04+0000\n" +"PO-Revision-Date: 2014-01-31 06:12+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Thai \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-02-01 06:02+0000\n" +"X-Generator: Launchpad (build 16916)\n" + +#. module: point_of_sale +#: field:report.transaction.pos,product_nb:0 +msgid "Product Nb." +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today +msgid "Sales by day" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,help:point_of_sale.pos_category_action +msgid "" +"

\n" +" Click to define a new category.\n" +"

\n" +" Categories are used to browse your products through the\n" +" touchscreen interface.\n" +"

\n" +" If you put a photo on the category, the layout of the\n" +" touchscreen interface will automatically. We suggest not to " +"put\n" +" a photo on categories for small (1024x768) screens.\n" +"

\n" +" " +msgstr "" + +#. module: point_of_sale +#: view:pos.receipt:0 +msgid "Print the Receipt of the Sale" +msgstr "" + +#. module: point_of_sale +#: field:pos.session,cash_register_balance_end:0 +msgid "Computed Balance" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +#: view:report.pos.order:0 +msgid "Today" +msgstr "" + +#. module: point_of_sale +#: field:pos.config,iface_electronic_scale:0 +msgid "Electronic Scale Interface" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.plain_water +msgid "Plain Water" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.poire_conference_product_template +msgid "Conference pears" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:398 +#, python-format +msgid "ã" +msgstr "" + +#. module: point_of_sale +#: field:pos.config,journal_id:0 +#: field:pos.order,sale_journal:0 +msgid "Sale Journal" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.spa_2l_product_template +msgid "Spa Reine 2L" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "Details of Sales" +msgstr "" + +#. module: point_of_sale +#: constraint:pos.config:0 +msgid "You cannot have two cash controls in one Point Of Sale !" +msgstr "" + +#. module: point_of_sale +#: field:pos.payment.report.user,user_id:0 +#: field:pos.sale.user,user_id:0 +#: field:pos.sales.user.today,user_id:0 +#: view:report.pos.order:0 +#: field:report.pos.order,user_id:0 +msgid "Salesperson" +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +#: field:report.pos.order,day:0 +msgid "Day" +msgstr "" + +#. module: point_of_sale +#: field:report.sales.by.margin.pos,product_name:0 +#: field:report.sales.by.margin.pos.month,product_name:0 +msgid "Product Name" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.pamplemousse_rouge_pamplemousse_product_template +msgid "Red grapefruit" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:1373 +#, python-format +msgid "Assign a Custom EAN" +msgstr "" + +#. module: point_of_sale +#: view:pos.session.opening:0 +msgid "" +"You may have to control your cash amount in your cash register, before\n" +" being able to start selling through the " +"touchscreen interface." +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: field:pos.box.entries,amount:0 +#: report:pos.invoice:0 +#: field:pos.make.payment,amount:0 +#: report:pos.user.product:0 +#: field:report.transaction.pos,amount:0 +msgid "Amount" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_pos_box_out +#: view:pos.session:0 +msgid "Take Money Out" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:105 +#, python-format +msgid "not used" +msgstr "" + +#. module: point_of_sale +#: field:pos.config,iface_vkeyboard:0 +msgid "Virtual KeyBoard Interface" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:96 +#, python-format +msgid "+/-" +msgstr "" + +#. module: point_of_sale +#: field:pos.ean_wizard,ean13_pattern:0 +msgid "Reference" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:1066 +#: code:addons/point_of_sale/point_of_sale.py:1083 +#: report:pos.invoice:0 +#: report:pos.lines:0 +#, python-format +msgid "Tax" +msgstr "" + +#. module: point_of_sale +#: report:pos.user.product:0 +msgid "Starting Date" +msgstr "" + +#. module: point_of_sale +#: constraint:pos.session:0 +msgid "You cannot create two active sessions with the same responsible!" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:473 +#, python-format +msgid "Weighting" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.fenouil_fenouil_product_template +msgid "Fennel" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:472 +#, python-format +msgid "Help needed" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:760 +#, python-format +msgid "Configuration Error!" +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: model:ir.model,name:point_of_sale.model_res_partner +#: field:report.pos.order,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "Closing Cash Control" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "Total of the day" +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +#: field:report.pos.order,average_price:0 +msgid "Average Price" +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +msgid "Accounting Information" +msgstr "" + +#. module: point_of_sale +#: field:pos.session.opening,show_config:0 +msgid "Show Config" +msgstr "" + +#. module: point_of_sale +#: report:pos.lines:0 +msgid "Disc. (%)" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "Total discount" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:441 +#, python-format +msgid "Debug Window" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:241 +#: code:addons/point_of_sale/static/src/xml/pos.xml:613 +#, python-format +msgid "Change:" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_regular_2l_product_template +msgid "Coca-Cola Regular 2L" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month +msgid "Sales by month" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.soda_orange +msgid "Orange" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today +#: view:report.sales.by.user.pos:0 +#: view:report.sales.by.user.pos.month:0 +msgid "Sales by User" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "Disc.(%)" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:1031 +#, python-format +msgid "Please define income account for this product: \"%s\" (id:%d)." +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +#: field:report.pos.order,price_total:0 +msgid "Total Price" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template +msgid "Leffe Brune 33cl" +msgstr "" + +#. module: point_of_sale +#: help:pos.config,iface_self_checkout:0 +msgid "" +"Check this if this point of sale should open by default in a self checkout " +"mode. If unchecked, OpenERP uses the normal cashier mode by default." +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user +#: report:pos.sales.user:0 +msgid "Sales Report" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.beverage +msgid "Beverages" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_pos_session_opening +#: model:ir.ui.menu,name:point_of_sale.menu_pos_session_opening +msgid "Your Session" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.stella_50cl_product_template +msgid "Stella Artois 50cl" +msgstr "" + +#. module: point_of_sale +#: view:pos.details:0 +msgid "Dates" +msgstr "" + +#. module: point_of_sale +#: field:pos.category,parent_id:0 +msgid "Parent Category" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:482 +#, python-format +msgid "Open Cashbox" +msgstr "" + +#. module: point_of_sale +#: view:pos.session.opening:0 +msgid "Select your Point of Sale" +msgstr "" + +#. module: point_of_sale +#: field:report.sales.by.margin.pos,total:0 +#: field:report.sales.by.margin.pos.month,total:0 +msgid "Margin" +msgstr "" + +#. module: point_of_sale +#: field:pos.discount,discount:0 +#: field:pos.order.line,discount:0 +msgid "Discount (%)" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.oetker_speciale_product_template +msgid "Dr. Oetker Ristorante Speciale" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:480 +#, python-format +msgid "Payment Request" +msgstr "" + +#. module: point_of_sale +#: field:product.product,to_weight:0 +msgid "To Weight" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:476 +#, python-format +msgid "Hardware Events" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:301 +#, python-format +msgid "You should assign a Point of Sale to your session." +msgstr "" + +#. module: point_of_sale +#: view:pos.order.line:0 +msgid "Total qty" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template +msgid "Fanta Orange 33cl" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:423 +#, python-format +msgid "" +"Please set your profit and loss accounts on your payment method '%s'. This " +"will allow OpenERP to post the difference of %.2f in your ending balance. To " +"close this session, you can update the 'Closing Cash Control' to avoid any " +"difference." +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:315 +#: code:addons/point_of_sale/point_of_sale.py:514 +#, python-format +msgid "error!" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month +msgid "Sales by User Monthly" +msgstr "" + +#. module: point_of_sale +#: help:pos.session,cash_register_difference:0 +msgid "" +"Difference between the counted cash control at the closing and the computed " +"balance." +msgstr "" + +#. module: point_of_sale +#: view:pos.session.opening:0 +msgid ") is \"" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.Onions_product_template +msgid "Onions" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "Validate & Open Session" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:99 +#: selection:pos.session,state:0 +#: selection:pos.session.opening,pos_state:0 +#, python-format +msgid "In Progress" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +#: field:pos.session,opening_details_ids:0 +msgid "Opening Cash Control" +msgstr "" + +#. module: point_of_sale +#: help:res.users,ean13:0 +msgid "BarCode" +msgstr "" + +#. module: point_of_sale +#: help:pos.category,image_medium:0 +msgid "" +"Medium-sized image of the category. It is automatically resized as a " +"128x128px image, with aspect ratio preserved. Use this field in form views " +"or some kanban views." +msgstr "" + +#. module: point_of_sale +#: view:pos.session.opening:0 +msgid "Open Session" +msgstr "" + +#. module: point_of_sale +#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale +msgid "Daily Operations" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:42 +#, python-format +msgid "Google Chrome" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.sparkling_water +msgid "Sparkling Water" +msgstr "" + +#. module: point_of_sale +#: view:account.bank.statement:0 +msgid "Search Cash Statements" +msgstr "" + +#. module: point_of_sale +#: view:account.bank.statement:0 +#: field:pos.config,state:0 +#: view:pos.order:0 +#: field:pos.order,state:0 +#: report:pos.sales.user:0 +#: report:pos.sales.user.today:0 +#: field:pos.session,state:0 +#: field:pos.session.opening,pos_state_str:0 +#: field:report.pos.order,state:0 +msgid "Status" +msgstr "" + +#. module: point_of_sale +#: selection:report.pos.order,month:0 +msgid "August" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.pepsi_max_lemon_33cl_product_template +msgid "Pepsi Max Cool Lemon 33cl" +msgstr "" + +#. module: point_of_sale +#: selection:report.pos.order,month:0 +msgid "June" +msgstr "" + +#. module: point_of_sale +#: view:pos.order.line:0 +msgid "POS Order line" +msgstr "" + +#. module: point_of_sale +#: view:pos.config:0 +msgid "Point of Sale Configuration" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:359 +#, python-format +msgid "Your order has to be validated by a cashier." +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template +msgid "Fanta Orange 50cl" +msgstr "" + +#. module: point_of_sale +#: field:pos.category,child_id:0 +msgid "Children Categories" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,help:point_of_sale.action_pos_session +msgid "" +"

\n" +" Click to start a new session.\n" +"

\n" +" A session is a period of time, usually one day, during " +"which\n" +" you sell through the point of sale. The user has to check " +"the\n" +" currencies in your cash registers at the beginning and the " +"end\n" +" of each session.\n" +"

\n" +" Note that you should better to use the menu Your " +"Session\n" +" to quickly open a new session.\n" +"

\n" +" " +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:888 +#, python-format +msgid "Customer Invoice" +msgstr "" + +#. module: point_of_sale +#: view:pos.session.opening:0 +msgid "" +"You can continue sales from the touchscreen interface by clicking on \"Start " +"Selling\" or close the cash register session." +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: report:all.closed.cashbox.of.the.day:0 +#: field:pos.session,stop_at:0 +msgid "Closing Date" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "Opening Cashbox Lines" +msgstr "" + +#. module: point_of_sale +#: selection:report.pos.order,month:0 +msgid "October" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_light_1l_product_template +msgid "Coca-Cola Light 1L" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "Summary" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.lays_naturel_45g_product_template +msgid "Lays Natural 45g" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template +msgid "Chaudfontaine 50cl" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +#: report:pos.lines:0 +#: field:pos.order.line,qty:0 +#: field:report.sales.by.user.pos,qty:0 +#: field:report.sales.by.user.pos.month,qty:0 +msgid "Quantity" +msgstr "" + +#. module: point_of_sale +#: field:pos.order.line,name:0 +msgid "Line No" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:453 +#, python-format +msgid "Set Weight" +msgstr "" + +#. module: point_of_sale +#: view:account.bank.statement:0 +msgid "Period" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "Net Total:" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.client,name:point_of_sale.action_client_pos_menu +msgid "Open POS Menu" +msgstr "" + +#. module: point_of_sale +#: report:pos.details_summary:0 +msgid "Mode of Payment" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_confirm +msgid "Post POS Journal Entries" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:457 +#, python-format +msgid "Barcode Scanner" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.pomme_granny_smith_product_template +msgid "Granny Smith apples" +msgstr "" + +#. module: point_of_sale +#: help:product.product,expense_pdt:0 +msgid "" +"Check if, this is a product you can use to take cash from a statement for " +"the point of sale backend, example: money lost, transfer to bank, etc." +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +#: field:report.pos.order,total_discount:0 +msgid "Total Discount" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:39 +#, python-format +msgid "" +"The Point of Sale is not supported by Microsoft Internet Explorer. Please " +"use\n" +" a modern browser like" +msgstr "" + +#. module: point_of_sale +#: view:pos.session.opening:0 +msgid "Click to start a session." +msgstr "" + +#. module: point_of_sale +#: view:pos.details:0 +#: view:pos.payment.report:0 +#: view:pos.payment.report.user:0 +#: view:pos.sale.user:0 +msgid "Print Report" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.oetker_bolognese_product_template +msgid "Dr. Oetker Ristorante Bolognese" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.pizza +msgid "Pizza" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "= Theoretical Balance" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/wizard/pos_return.py:85 +#: code:addons/point_of_sale/wizard/pos_return.py:240 +#, python-format +msgid "Add Product" +msgstr "" + +#. module: point_of_sale +#: field:pos.config,name:0 +msgid "Point of Sale Name" +msgstr "" + +#. module: point_of_sale +#: field:report.transaction.pos,invoice_am:0 +msgid "Invoice Amount" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.coke +msgid "Coke" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "Tel. :" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:254 +#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt +#, python-format +msgid "Receipt" +msgstr "" + +#. module: point_of_sale +#: field:report.sales.by.margin.pos,net_margin_per_qty:0 +#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0 +msgid "Net margin per Qty" +msgstr "" + +#. module: point_of_sale +#: view:pos.confirm:0 +msgid "Post All Orders" +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: report:all.closed.cashbox.of.the.day:0 +#: field:pos.session,cash_register_balance_end_real:0 +msgid "Ending Balance" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/wizard/pos_box_out.py:89 +#, python-format +msgid "please check that account is set to %s." +msgstr "" + +#. module: point_of_sale +#: help:pos.category,image:0 +msgid "" +"This field holds the image used as image for the cateogry, limited to " +"1024x1024px." +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template +msgid "Pepsi Max 50cl" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template +msgid "San Pellegrino 1L" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/wizard/pos_open_statement.py:49 +#, python-format +msgid "" +"You have to define which payment method must be available in the point of " +"sale by reusing existing bank and cash through \"Accounting / Configuration " +"/ Journals / Journals\". Select a journal and check the field \"PoS Payment " +"Method\" from the \"Point of Sale\" tab. You can also create new payment " +"methods directly from menu \"PoS Backend / Configuration / Payment Methods\"." +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.rouges_noyau_fruits +msgid "Berries" +msgstr "" + +#. module: point_of_sale +#: view:pos.ean_wizard:0 +msgid "Ean13 Generator" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.spa_1l_product_template +msgid "Spa Reine 1L" +msgstr "" + +#. module: point_of_sale +#: constraint:res.partner:0 +#: constraint:res.users:0 +msgid "Error: Invalid ean code" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.legumes_racine +msgid "Root vegetables" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement +#: model:ir.model,name:point_of_sale.model_pos_open_statement +#: view:pos.open.statement:0 +msgid "Open Statements" +msgstr "" + +#. module: point_of_sale +#: field:pos.details,date_end:0 +#: field:pos.sale.user,date_end:0 +msgid "Date End" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.pomme_jonagold_product_template +msgid "Jonagold apples" +msgstr "" + +#. module: point_of_sale +#: view:account.bank.statement:0 +#: report:account.statement:0 +#: report:all.closed.cashbox.of.the.day:0 +#: model:ir.model,name:point_of_sale.model_account_journal +#: field:report.pos.order,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "Statements" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +msgid "Sales total(Revenue)" +msgstr "" + +#. module: point_of_sale +#: help:pos.config,group_by:0 +msgid "" +"Check this if you want to group the Journal Items by Product while closing a " +"Session" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "Total paid" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_session_opening +msgid "pos.session.opening" +msgstr "" + +#. module: point_of_sale +#: view:res.users:0 +msgid "Edit EAN" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/wizard/pos_open_statement.py:80 +#, python-format +msgid "List of Cash Registers" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.maes_50cl_product_template +msgid "Maes 50cl" +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +msgid "Not Invoiced" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template +msgid "250g Lays Pickels" +msgstr "" + +#. module: point_of_sale +#: field:pos.session.opening,pos_session_id:0 +msgid "PoS Session" +msgstr "" + +#. module: point_of_sale +#: selection:report.pos.order,month:0 +msgid "March" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re +#: report:pos.user.product:0 +msgid "User's Product" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:1173 +#, python-format +msgid "" +"You have to select a pricelist in the sale form !\n" +"Please set one before choosing a product." +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.fanta_orange_2l_product_template +msgid "Fanta Orange 2L" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.perrier_1l_product_template +msgid "Perrier 1L" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.spa_33cl_product_template +msgid "Spa Reine 33cl" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_discount +msgid "Add a Global Discount" +msgstr "" + +#. module: point_of_sale +#: view:pos.config:0 +msgid "Journals" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.oetker_prosciutto_product_template +msgid "Dr. Oetker Ristorante Prosciutto" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template +#: model:product.template,name:point_of_sale.lays_paprika_170g_product_template +msgid "Lays Light Paprika 170g" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_light_lemon_50cl_product_template +msgid "Coca-Cola Light Lemon 50cl" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/point_of_sale.py:520 +#: code:addons/point_of_sale/static/src/xml/pos.xml:689 +#: code:addons/point_of_sale/static/src/xml/pos.xml:744 +#, python-format +msgid "return" +msgstr "" + +#. module: point_of_sale +#: view:product.product:0 +msgid "Set a Custom EAN" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:235 +#, python-format +msgid "Remaining:" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.legumes +msgid "Fresh vegetables" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "tab of the" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:478 +#, python-format +msgid "Scan Item Success" +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: report:all.closed.cashbox.of.the.day:0 +#: field:pos.session,cash_register_balance_start:0 +msgid "Starting Balance" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template +msgid "Oven Baked Lays Natural 150g" +msgstr "" + +#. module: point_of_sale +#: sql_constraint:pos.session:0 +msgid "The name of this POS Session must be unique !" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "Opening Subtotal" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "payment method." +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +msgid "Re-Print" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template +msgid "Chimay Bleu 75cl" +msgstr "" + +#. module: point_of_sale +#: report:pos.payment.report.user:0 +msgid "Payment By User" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:215 +#: code:addons/point_of_sale/static/src/xml/pos.xml:285 +#: code:addons/point_of_sale/wizard/pos_payment.py:79 +#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment +#: report:pos.details:0 +#: view:pos.order:0 +#, python-format +msgid "Payment" +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +#: field:report.pos.order,nbr:0 +msgid "# of Lines" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:89 +#, python-format +msgid "Disc" +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +msgid "(update)" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template +msgid "IJsboerke Vanilla 2.5L" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details +#: model:ir.ui.menu,name:point_of_sale.menu_pos_details +msgid "Sale Details" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.evian_2l_product_template +msgid "2L Evian" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:373 +#: code:addons/point_of_sale/point_of_sale.py:474 +#: code:addons/point_of_sale/wizard/pos_session_opening.py:33 +#, python-format +msgid "Start Point Of Sale" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.pils +msgid "Pils" +msgstr "" + +#. module: point_of_sale +#: help:pos.session,cash_register_balance_end_real:0 +msgid "Computed using the cash control lines" +msgstr "" + +#. module: point_of_sale +#: report:all.closed.cashbox.of.the.day:0 +msgid "St.Name" +msgstr "" + +#. module: point_of_sale +#: report:pos.details_summary:0 +msgid "Sales total" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:741 +#, python-format +msgid "ABC" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template +msgid "IJsboerke 2.5L White Lady" +msgstr "" + +#. module: point_of_sale +#: field:pos.order,lines:0 +msgid "Order Lines" +msgstr "" + +#. module: point_of_sale +#: view:report.transaction.pos:0 +msgid "Total Transaction" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template +msgid "Chaudfontaine Petillante 50cl" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:485 +#, python-format +msgid "Read Weighting Scale" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:426 +#, python-format +msgid "0.00 €" +msgstr "" + +#. module: point_of_sale +#: field:pos.order.line,create_date:0 +msgid "Creation Date" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today +msgid "Today's Sales" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:264 +#: code:addons/point_of_sale/static/src/xml/pos.xml:324 +#, python-format +msgid "Welcome" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/wizard/pos_box_entries.py:46 +#, python-format +msgid "" +"You do not have any open cash register. You must create a payment method or " +"open a cash register." +msgstr "" + +#. module: point_of_sale +#: view:report.sales.by.margin.pos:0 +#: view:report.sales.by.margin.pos.month:0 +#: view:report.sales.by.user.pos:0 +#: view:report.sales.by.user.pos.month:0 +#: view:report.transaction.pos:0 +msgid "POS " +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: report:pos.user.product:0 +msgid "Total :" +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +msgid "My Sales" +msgstr "" + +#. module: point_of_sale +#: view:pos.config:0 +msgid "Set to Deprecated" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.limon_product_template +msgid "Stringers" +msgstr "" + +#. module: point_of_sale +#: field:pos.order,pricelist_id:0 +msgid "Pricelist" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "Total invoiced" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_category +#: field:product.product,pos_categ_id:0 +msgid "Point of Sale Category" +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +#: field:report.pos.order,product_qty:0 +msgid "# of Qty" +msgstr "" + +#. module: point_of_sale +#: help:pos.config,sequence_id:0 +msgid "" +"This sequence is automatically created by OpenERP but you can change it to " +"customize the reference numbers of your orders." +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:324 +#, python-format +msgid "Choose your type of receipt:" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month +msgid "Sales by margin monthly" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.poivron_jaunes_product_template +msgid "Yellow Peppers" +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +#: field:pos.order,date_order:0 +#: field:report.sales.by.margin.pos,date_order:0 +#: field:report.sales.by.margin.pos.month,date_order:0 +#: field:report.sales.by.user.pos,date_order:0 +#: field:report.sales.by.user.pos.month,date_order:0 +msgid "Order Date" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.stella_33cl_product_template +msgid "Stella Artois 33cl" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template +msgid "Lays Natural XXL 300g" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:479 +#, python-format +msgid "Scan Item Unrecognized" +msgstr "" + +#. module: point_of_sale +#: report:all.closed.cashbox.of.the.day:0 +msgid "Today's Closed Cashbox" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:920 +#, python-format +msgid "Selected orders do not have the same session!" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "Draft Invoice" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template +msgid "Oven Baked Lays Paprika 150g" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "Fiscal Position Remark :" +msgstr "" + +#. module: point_of_sale +#: selection:report.pos.order,month:0 +msgid "September" +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: report:all.closed.cashbox.of.the.day:0 +#: field:pos.session,start_at:0 +msgid "Opening Date" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_pos_session +#: model:ir.ui.menu,name:point_of_sale.menu_pos_session_all +msgid "All Sessions" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:663 +#, python-format +msgid "tab" +msgstr "" + +#. module: point_of_sale +#: report:pos.lines:0 +msgid "Taxes :" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:271 +#, python-format +msgid "Thank you for shopping with us." +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_light_2l_product_template +msgid "Coca-Cola Light 2L" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.oetker_funghi_product_template +msgid "Dr. Oetker Ristorante Funghi" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.pos_category_action +#: model:ir.ui.menu,name:point_of_sale.menu_pos_category +msgid "Product Categories" +msgstr "" + +#. module: point_of_sale +#: help:pos.config,journal_id:0 +msgid "Accounting journal used to post sales entries." +msgstr "" + +#. module: point_of_sale +#: field:report.transaction.pos,disc:0 +msgid "Disc." +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:467 +#, python-format +msgid "Invalid Ean" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template +msgid "Lindemans Kriek 37.5cl" +msgstr "" + +#. module: point_of_sale +#: view:pos.config:0 +msgid "Point of Sale Config" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_zero_33cl_product_template +msgid "Coca-Cola Zero 33cl" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:405 +#, python-format +msgid "ä" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "VAT :" +msgstr "" + +#. module: point_of_sale +#: view:pos.order.line:0 +msgid "POS Order lines" +msgstr "" + +#. module: point_of_sale +#: view:pos.receipt:0 +msgid "Receipt :" +msgstr "" + +#. module: point_of_sale +#: field:account.bank.statement,pos_session_id:0 +#: field:account.bank.statement.line,pos_statement_id:0 +#: field:pos.order,amount_return:0 +#: field:pos.session.opening,pos_session_name:0 +#: field:pos.session.opening,pos_session_username:0 +msgid "unknown" +msgstr "" + +#. module: point_of_sale +#: field:product.product,income_pdt:0 +msgid "Point of Sale Cash In" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:590 +#, python-format +msgid "Tax:" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "+ Transactions" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount +#: view:pos.discount:0 +msgid "Apply Discount" +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: report:all.closed.cashbox.of.the.day:0 +#: field:pos.box.entries,user_id:0 +#: report:pos.sales.user:0 +#: report:pos.sales.user.today:0 +#: view:pos.session:0 +#: report:pos.user.product:0 +#: field:report.sales.by.margin.pos,user_id:0 +#: field:report.sales.by.margin.pos.month,user_id:0 +#: field:report.sales.by.user.pos,user_id:0 +#: field:report.sales.by.user.pos.month,user_id:0 +#: field:report.transaction.pos,user_id:0 +#: model:res.groups,name:point_of_sale.group_pos_user +msgid "User" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:194 +#, python-format +msgid "Kg" +msgstr "" + +#. module: point_of_sale +#: field:product.product,available_in_pos:0 +msgid "Available in the Point of Sale" +msgstr "" + +#. module: point_of_sale +#: selection:pos.config,state:0 +msgid "Deprecated" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template +msgid "Coca-Cola Light 33cl Decaf" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:338 +#, python-format +msgid "The scanned product was not recognized" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_report_transaction_pos +msgid "transaction for the pos" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: field:report.transaction.pos,date_create:0 +msgid "Date" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_box_entries +msgid "Pos Box Entries" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template +msgid "Boon Framboise 37.5cl" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_config +msgid "pos.config" +msgstr "" + +#. module: point_of_sale +#: view:pos.ean_wizard:0 +msgid "" +"Enter a reference, it will be converted\n" +" automatically to a valid EAN number." +msgstr "" + +#. module: point_of_sale +#: field:product.product,expense_pdt:0 +msgid "Point of Sale Cash Out" +msgstr "" + +#. module: point_of_sale +#: selection:report.pos.order,month:0 +msgid "November" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:267 +#, python-format +msgid "Please scan an item or your member card" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.poivron_verts_product_template +msgid "Green Peppers" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template +msgid "Timmermans Faro 37.5cl" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:410 +#, python-format +msgid "" +"Your ending balance is too different from the theorical cash closing (%.2f), " +"the maximum allowed is: %.2f. You can contact your manager to force it." +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "Validate Closing & Post Entries" +msgstr "" + +#. module: point_of_sale +#: field:report.transaction.pos,no_trans:0 +msgid "Number of Transaction" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:759 +#, python-format +msgid "" +"There is no receivable account defined to make payment for the partner: " +"\"%s\" (id:%d)." +msgstr "" + +#. module: point_of_sale +#: view:pos.config:0 +#: selection:pos.config,state:0 +msgid "Inactive" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:313 +#: view:pos.confirm:0 +#: view:pos.details:0 +#: view:pos.discount:0 +#: view:pos.ean_wizard:0 +#: view:pos.make.payment:0 +#: view:pos.open.statement:0 +#: view:pos.payment.report:0 +#: view:pos.payment.report.user:0 +#: view:pos.receipt:0 +#: view:pos.sale.user:0 +#, python-format +msgid "Cancel" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:296 +#, python-format +msgid "Please put your product on the scale" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary +msgid "Sales (summary)" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.nectarine_product_template +msgid "Peach" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template +msgid "Timmermans Kriek 37.5cl" +msgstr "" + +#. module: point_of_sale +#: field:pos.config,sequence_id:0 +msgid "Order IDs Sequence" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +#: report:pos.lines:0 +#: field:pos.order.line,price_unit:0 +#: report:pos.payment.report.user:0 +msgid "Unit Price" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:190 +#, python-format +msgid "Product Weighting" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:704 +#: code:addons/point_of_sale/static/src/xml/pos.xml:746 +#, python-format +msgid "close" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.report.xml,name:point_of_sale.report_user_label +msgid "User Labels" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_order_line +msgid "Lines of Point of Sale" +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +#: view:report.transaction.pos:0 +msgid "Amount total" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "End of Session" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree +#: view:pos.session:0 +msgid "Cash Registers" +msgstr "" + +#. module: point_of_sale +#: help:pos.session,cash_register_balance_end:0 +msgid "Computed with the initial cash control and the sum of all payments." +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:474 +#, python-format +msgid "In Transaction" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.food +msgid "Food" +msgstr "" + +#. module: point_of_sale +#: field:pos.box.entries,ref:0 +msgid "Ref" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:94 +#: report:pos.details:0 +#: report:pos.invoice:0 +#: report:pos.lines:0 +#, python-format +msgid "Price" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_light_33cl_product_template +msgid "Coca-Cola Light 33cl" +msgstr "" + +#. module: point_of_sale +#: view:report.sales.by.margin.pos:0 +#: view:report.sales.by.margin.pos.month:0 +#: view:report.sales.by.user.pos:0 +#: view:report.sales.by.user.pos.month:0 +#: view:report.transaction.pos:0 +msgid "POS" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_regular_33cl_product_template +msgid "Coca-Cola Regular 33cl" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:325 +#, python-format +msgid "Ticket" +msgstr "" + +#. module: point_of_sale +#: field:pos.session,cash_register_difference:0 +msgid "Difference" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:549 +#, python-format +msgid "Unable to Delete !" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.autres_agrumes +msgid "Other Citrus" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "Start Period" +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: field:pos.category,complete_name:0 +#: field:pos.category,name:0 +#: report:pos.sales.user:0 +#: report:pos.sales.user.today:0 +msgid "Name" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template +msgid "Spa Barisart 33cl" +msgstr "" + +#. module: point_of_sale +#: view:pos.confirm:0 +msgid "" +"Generate all sale journal entries for non invoiced orders linked to a closed " +"cash register or statement." +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.unreferenced_product_product_template +msgid "Unreferenced Products" +msgstr "" + +#. module: point_of_sale +#: view:pos.ean_wizard:0 +msgid "Apply" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:288 +#, python-format +msgid "" +"Please insert your card in the reader and follow the instructions to " +"complete\n" +" your purchase" +msgstr "" + +#. module: point_of_sale +#: help:product.product,income_pdt:0 +msgid "" +"Check if, this is a product you can use to put cash into a statement for the " +"point of sale backend." +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template +msgid "IJsboerke Mocha 2.5L" +msgstr "" + +#. module: point_of_sale +#: field:pos.session,cash_control:0 +msgid "Has Cash Control" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all +#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all +msgid "Orders Analysis" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:563 +#, python-format +msgid "User:" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:316 +#, python-format +msgid "" +"Unable to open the session. You have to assign a sale journal to your point " +"of sale." +msgstr "" + +#. module: point_of_sale +#: view:report.pos.order:0 +msgid "POS ordered created during current year" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.peche_product_template +msgid "Fishing" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +#: report:pos.lines:0 +#: report:pos.payment.report.user:0 +#: report:pos.sales.user:0 +#: report:pos.sales.user.today:0 +#: report:pos.user.product:0 +msgid "Print Date" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.poireaux_poireaux_product_template +msgid "Leeks" +msgstr "" + +#. module: point_of_sale +#: help:pos.category,sequence:0 +msgid "" +"Gives the sequence order when displaying a list of product categories." +msgstr "" + +#. module: point_of_sale +#: view:account.bank.statement:0 +#: view:pos.order:0 +#: view:pos.session:0 +#: view:report.pos.order:0 +msgid "Group By..." +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:564 +#, python-format +msgid "Shop:" +msgstr "" + +#. module: point_of_sale +#: field:account.journal,self_checkout_payment_method:0 +msgid "Self Checkout Payment Method" +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +msgid "POS Orders" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day +msgid "All Closed CashBox" +msgstr "" + +#. module: point_of_sale +#: field:pos.details,user_ids:0 +msgid "Salespeople" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:777 +#: code:addons/point_of_sale/wizard/pos_box_entries.py:118 +#: code:addons/point_of_sale/wizard/pos_box_out.py:91 +#, python-format +msgid "You have to open at least one cashbox." +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:1172 +#, python-format +msgid "No Pricelist !" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.poivron_rouges_product_template +msgid "Red Pepper" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:677 +#, python-format +msgid "caps lock" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template +msgid "Grisette Cherry 25cl" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "Base" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:702 +#: code:addons/point_of_sale/static/src/xml/pos.xml:742 +#, python-format +msgid " " +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.categ_others +msgid "Others" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.autres_legumes_frais +msgid "Other fresh vegetables" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/wizard/pos_open_statement.py:49 +#, python-format +msgid "No Cash Register Defined !" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:515 +#, python-format +msgid "" +"No cash statement found for this session. Unable to record returned cash." +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.oignons_ail_echalotes +msgid "Onions / Garlic / Shallots" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.evian_50cl_product_template +msgid "Evian 50cl" +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +msgid "Notes" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template +msgid "Coca-Cola Light Lemon 2L" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.invoice:0 +#: field:pos.order,amount_tax:0 +msgid "Taxes" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line +#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day +#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form +msgid "Sale line" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:741 +#, python-format +msgid "123" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.product_normal_action +#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product +#: model:ir.ui.menu,name:point_of_sale.menu_pos_products +#: view:pos.order:0 +msgid "Products" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.oetker_4formaggi_product_template +msgid "Dr. Oetker Ristorante Quattro Formaggi" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template +msgid "Croky Natural 45g" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.tomate_en_grappe_product_template +msgid "In Cluster Tomatoes" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.client,name:point_of_sale.action_pos_pos +msgid "Start Point of Sale" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:84 +#: report:pos.details:0 +#: report:pos.payment.report.user:0 +#: report:pos.user.product:0 +#: field:report.sales.by.margin.pos,qty:0 +#: field:report.sales.by.margin.pos.month,qty:0 +#, python-format +msgid "Qty" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_zero_1l_product_template +msgid "Coca-Cola Zero 1L" +msgstr "" + +#. module: point_of_sale +#: report:pos.sales.user:0 +#: report:pos.sales.user.today:0 +#: field:report.pos.order,date:0 +msgid "Date Order" +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +msgid "Point of Sale Orders" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template +msgid "Spa Fruit and Orange 50cl" +msgstr "" + +#. module: point_of_sale +#: view:pos.config:0 +#: field:pos.config,journal_ids:0 +#: field:pos.session,journal_ids:0 +msgid "Available Payment Methods" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,help:point_of_sale.product_normal_action +msgid "" +"

\n" +" Click to add a new product.\n" +"

\n" +" You must define a product for everything you sell through\n" +" the point of sale interface.\n" +"

\n" +" Do not forget to set the price and the point of sale " +"category\n" +" in which it should appear. If a product has no point of " +"sale\n" +" category, you can not sell it through the point of sale\n" +" interface.\n" +"

\n" +" " +msgstr "" + +#. module: point_of_sale +#: view:pos.order:0 +msgid "Extra Info" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "Fax :" +msgstr "" + +#. module: point_of_sale +#: view:pos.session:0 +msgid "Point of Sale Session" +msgstr "" + +#. module: point_of_sale +#: report:account.statement:0 +#: model:ir.actions.report.xml,name:point_of_sale.account_statement +msgid "Statement" +msgstr "" + +#. module: point_of_sale +#: report:pos.invoice:0 +msgid "Source" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:461 +#, python-format +msgid "Admin Badge" +msgstr "" + +#. module: point_of_sale +#: field:pos.make.payment,journal_id:0 +msgid "Payment Mode" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.lays_paprika_45g_product_template +msgid "Lays Paprika 45g" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_account_bank_statement +#: field:pos.session,statement_ids:0 +msgid "Bank Statement" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:101 +#: selection:pos.session,state:0 +#: selection:pos.session.opening,pos_state:0 +#, python-format +msgid "Closed & Posted" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user +#: model:ir.model,name:point_of_sale.model_pos_sale_user +#: view:pos.payment.report.user:0 +msgid "Sale by User" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:562 +#, python-format +msgid "Phone:" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.evian_1l_product_template +msgid "Evian 1L" +msgstr "" + +#. module: point_of_sale +#: model:pos.category,name:point_of_sale.water +msgid "Water" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_ean_wizard +msgid "pos.ean_wizard" +msgstr "" + +#. module: point_of_sale +#: selection:report.pos.order,month:0 +msgid "July" +msgstr "" + +#. module: point_of_sale +#: model:ir.actions.act_window,name:point_of_sale.action_pos_config_pos +#: model:ir.ui.menu,name:point_of_sale.menu_pos_config_pos +#: view:pos.session:0 +msgid "Point of Sales" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "Qty of product" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.pomme_golden_perlim_product_template +msgid "Golden Apples Perlim" +msgstr "" + +#. module: point_of_sale +#: code:addons/point_of_sale/point_of_sale.py:100 +#: selection:pos.session,state:0 +#: selection:pos.session.opening,pos_state:0 +#, python-format +msgid "Closing Control" +msgstr "" + +#. module: point_of_sale +#: field:report.pos.order,delay_validation:0 +msgid "Delay Validation" +msgstr "" + +#. module: point_of_sale +#: field:pos.order,nb_print:0 +msgid "Number of Print" +msgstr "" + +#. module: point_of_sale +#: model:ir.model,name:point_of_sale.model_pos_make_payment +msgid "Point of Sale Payment" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_light_50cl_product_template +msgid "Coca-Cola Light 50cl" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:466 +#, python-format +msgid "Unknown Product" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:36 +#, python-format +msgid "" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.jupiler_50cl_product_template +msgid "Jupiler 50cl" +msgstr "" + +#. module: point_of_sale +#: report:pos.details:0 +#: report:pos.details_summary:0 +msgid "End Period" +msgstr "" + +#. module: point_of_sale +#: model:product.template,name:point_of_sale.coca_light_lemon_33cl_product_template +msgid "Coca-Cola Light Lemon 33cl" +msgstr "" + +#. module: point_of_sale +#. openerp-web +#: code:addons/point_of_sale/static/src/xml/pos.xml:33 +#, python-format +msgid " - - \ No newline at end of file diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml index 4cb38966614..ac4bb470fd5 100644 --- a/addons/survey/security/survey_security.xml +++ b/addons/survey/security/survey_security.xml @@ -50,7 +50,7 @@ Public access to user_input - [('create_uid', '=', 'uid')] + [('create_uid', '=', user.id)] @@ -61,7 +61,7 @@ Access to user_input for regular users - [('create_uid', '=', 'uid')] + [('create_uid', '=', user.id)] diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 483b3376c21..27e0b2eb7df 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -384,14 +384,14 @@ class survey_question(osv.Model): 'page_id': fields.many2one('survey.page', 'Survey page', ondelete='cascade'), 'survey_id': fields.related('page_id', 'survey_id', type='many2one', - relation='survey.survey', string='Survey', store=True), + relation='survey.survey', string='Survey'), 'parent_id': fields.many2one('survey.question', 'Parent question', ondelete='cascade'), 'sequence': fields.integer(string='Sequence'), # Question 'question': fields.char('Question', required=1, translate=True), - 'description': fields.char('Description', help="Use this field to add \ + 'description': fields.html('Description', help="Use this field to add \ additional explanations about your question", translate=True, oldname='descriptive_text'), @@ -839,10 +839,17 @@ class survey_user_input_line(osv.Model): 'date_create': fields.datetime.now() } + def create(self, cr, uid, vals, context=None): + value_suggested = vals.get('value_suggested') + if value_suggested: + mark = self.pool.get('survey.label').browse(cr, uid, int(value_suggested), context=context).quizz_mark + vals.update({'quizz_mark': mark}) + return super(survey_user_input_line, self).create(cr, uid, vals, context=context) + def write(self, cr, uid, ids, vals, context=None): value_suggested = vals.get('value_suggested') if value_suggested: - mark = self.pool.get('survey.label').browse(cr, uid, value_suggested, context=context).quizz_mark + mark = self.pool.get('survey.label').browse(cr, uid, int(value_suggested), context=context).quizz_mark vals.update({'quizz_mark': mark}) return super(survey_user_input_line, self).write(cr, uid, ids, vals, context=context) diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml index bf1a123856e..0430969bbd3 100644 --- a/addons/survey/views/survey_templates.xml +++ b/addons/survey/views/survey_templates.xml @@ -30,6 +30,7 @@

Thank you!

+
You scored points.
If you wish, you can print your answers.
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml index 2ac001c7211..16ff981382e 100644 --- a/addons/survey/views/survey_views.xml +++ b/addons/survey/views/survey_views.xml @@ -49,6 +49,7 @@ + @@ -58,6 +59,7 @@ + @@ -77,6 +79,7 @@ + @@ -497,8 +500,8 @@ - - + @@ -511,7 +514,8 @@ tree,form - {'search_default_group_by_survey': True, 'search_default_group_by_page': True} + {'search_default_group_by_page': True} @@ -524,6 +528,7 @@ + @@ -560,6 +565,7 @@ + @@ -585,6 +591,7 @@ + diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index 50f2d8e381e..4eff1b8a60d 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -59,7 +59,7 @@ Website With Tutorial - /?tutorial.banner=true + /#tutorial.banner=true self diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js index 2c26ae34e98..c46efcabce8 100644 --- a/addons/website/static/src/js/website.tour.banner.js +++ b/addons/website/static/src/js/website.tour.banner.js @@ -13,7 +13,7 @@ website.BannerTour = website.Tour.extend({ id: 'banner', name: "Insert a banner", - path: '/page/website.homepage', + path: '/', init: function (editor) { var self = this; self.steps = [ @@ -48,13 +48,12 @@ { waitFor: '.oe_overlay_options .oe_options:visible', element: '#wrap [data-snippet-id=carousel]:first .carousel-caption', - sampleText: 'My Title', placement: 'top', title: "Customize banner's text", content: "Click in the text and start editing it. Click continue once it's done.", + template: self.popover({ next: "Continue" }), }, { - waitNot: '#wrap [data-snippet-id=carousel]:first .carousel-caption:contains("Your Banner Title")', element: '.oe_overlay_options .oe_options', placement: 'left', title: "Customize the banner", diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 39eaa5b7279..1db813e4cd4 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -7,10 +7,6 @@ website.add_template_file('/website/static/src/xml/website.tour.xml'); website.EditorBar.include({ tours: [], start: function () { - // $('.tour-backdrop').click(function (e) { - // e.stopImmediatePropagation(); - // e.preventDefault(); - // }); var self = this; var menu = $('#help-menu'); _.each(this.tours, function (tour) { @@ -113,11 +109,13 @@ website.Tour = openerp.Class.extend({ this.localStorage.setItem("tour-"+this.id+"-test-automatic", true); } - // redirect to begin of the tour if (this.path) { - var path = this.path.split('?'); - window.location.href = path[0] + "?tutorial."+this.id+"=true" + path.slice(1, path.length).join("?"); - return; + // redirect to begin of the tour in function of the language + if (!this.testUrl(this.path+"(#.*)?$")) { + var path = this.path.split('#'); + window.location.href = "/"+this.getLang()+path[0] + "#tutorial."+this.id+"=true&" + path.slice(1, path.length).join("#"); + return; + } } var self = this; @@ -125,12 +123,12 @@ website.Tour = openerp.Class.extend({ website.Tour.waitReady.call(this, function () {self._running();}); }, running: function () { - if (+this.localStorage.getItem("tour-"+this.id+"-test") >= this.steps.length) { + if (+this.localStorage.getItem("tour-"+this.id+"-test") >= this.steps.length-1) { this.endTour(); return; } - if (website.Tour.is_busy() || !this.testUrl()) return; + if (website.Tour.is_busy() || !this.testPathUrl()) return; // launch tour with url this.checkRunningUrl(); @@ -143,7 +141,6 @@ website.Tour = openerp.Class.extend({ var self = this; website.Tour.waitReady.call(this, function () {self._running();}); }, - _running: function () { var stepId = this.localStorage.getItem("tour-"+this.id+"-test"); var automatic = !!this.localStorage.getItem("tour-"+this.id+"-test-automatic"); @@ -174,13 +171,19 @@ website.Tour = openerp.Class.extend({ $('.popover.tour').remove(); }, - testUrl: function () { - return !this.testPath || this.testPath.test(window.location.href); + getLang: function () { + return $("html").attr("lang").replace(/-/, '_'); + }, + testUrl: function (url) { + return new RegExp("(/"+this.getLang()+")?"+url, "i").test(window.location.href); + }, + testPathUrl: function () { + if (!this.testPath || this.testUrl(this.testPath)) return true; }, checkRunningUrl: function () { - if (window.location.search.indexOf("tutorial."+this.id+"=true") > -1) { + if (window.location.hash.indexOf("tutorial."+this.id+"=true") > -1) { this.localStorage.setItem("tour-"+this.id+"-test", 0); - window.location.href = window.location.href.replace(/tutorial.+=true&?/, ''); + window.location.hash = window.location.hash.replace(/tutorial.+=true&?/, ''); } }, @@ -315,7 +318,11 @@ website.Tour = openerp.Class.extend({ } }, endTour: function () { - console.log('{ "event": "success" }'); + if (parseInt(this.localStorage.getItem("tour-"+this.id+"-test"),10) >= this.steps.length-1) { + console.log('{ "event": "success" }'); + } else { + console.log('{ "event": "canceled" }'); + } this.reset(); }, autoNextStep: function () { diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml index 4eb70186d52..a5a3aa3d8c9 100644 --- a/addons/website_blog/data/website_blog_data.xml +++ b/addons/website_blog/data/website_blog_data.xml @@ -20,7 +20,7 @@ Website Blogs self - + diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js index 1bd9f22fa31..ffbd6e7ecc8 100644 --- a/addons/website_blog/static/src/js/website.tour.blog.js +++ b/addons/website_blog/static/src/js/website.tour.blog.js @@ -13,7 +13,7 @@ website.BlogTour = website.Tour.extend({ id: 'blog', name: "Create a blog post", - testPath: /\/(blog|blogpost)\/[0-9]+\//, + testPath: '/(blog|blogpost)', init: function (editor) { var self = this; self.steps = [ diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index 17a666cf2e3..fbfb1908a14 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/addons/website_crm_partner_assign/controllers/main.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- +import werkzeug + import openerp from openerp import SUPERUSER_ID from openerp.addons.web import http from openerp.tools.translate import _ from openerp.addons.web.http import request from openerp.addons.website_partner.controllers import main as website_partner -import werkzeug.urls class WebsiteCrmPartnerAssign(http.Controller): _references_per_page = 20 @@ -14,16 +15,25 @@ class WebsiteCrmPartnerAssign(http.Controller): @http.route([ '/partners/', '/partners/page//', + + '/partners/grade/', + '/partners/grade//page//', + '/partners/country/', '/partners/country/-', '/partners/country//page//', '/partners/country/-/page//', + + '/partners/grade//country//', + '/partners/grade//country/-', + '/partners/grade//country//page//', + '/partners/grade//country/-/page//', + ], type='http', auth="public", website=True, multilang=True) - def partners(self, country_id=0, page=0, **post): + def partners(self, country_id=0, grade_id=0, page=0, **post): country_obj = request.registry['res.country'] partner_obj = request.registry['res.partner'] post_name = post.get('search', '') - grade_id = post.get('grade', '') country = None # format displayed membership lines domain @@ -83,7 +93,7 @@ class WebsiteCrmPartnerAssign(http.Controller): context=request.context, count=True) grades.insert(0, { 'grade_id_count': grades_partners, - 'grade_id': ("all", _("All Levels")) + 'grade_id': (0, _("All Categories")) }) values = { diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml index cd06e515a3e..cd2e3cb58bd 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml @@ -35,13 +35,27 @@ Contact a reseller +
-

Resellers by Country

+ + + +
+
@@ -60,17 +76,7 @@
-
- -
+
@@ -103,7 +109,7 @@