odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merged with trunk-survey2-rim 

bzr revid: pga@tinyerp.com-20140206051331-vpf8p1zkrkjhw01j
This commit is contained in:
Parth Gajjar (Open ERP) 2014-02-06 10:43:31 +05:30
parent 51b1eb6fbf d1c1c0fec4
commit 0bf2635970
27 changed files with 4643 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
addons/account/i18n/cs.po
View File

@ -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 <robie@centrum.cz>\n"
"PO-Revision-Date: 2014-02-02 15:35+0000\n"
"Last-Translator: Jakub Drozd <Unknown>\n"
"Language-Team: Czech <openerp-i18n-czech@lists.launchpad.net>\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

6
addons/auth_signup/controllers/main.py
View File

@ -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

515
addons/email_template/i18n/bs.po Normal file
View File

@ -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 <EMAIL@ADDRESS>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\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 <EMAIL@ADDRESS>\n"
"Language-Team: Bosnian <bs@li.org>\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"

2
addons/gamification_sale_crm/sale_crm_goals_demo.xml
View File

@ -14,7 +14,7 @@
<field name="user_id" eval="ref('base.user_demo')" />
<field name="line_id" eval="ref('line_crm_sale1')" />
<field name="start_date" eval="time.strftime('%Y-%m-01')" />
<field name="end_date" eval="time.strftime('%Y-%m-31')" />
<field name="end_date" eval="(DateTime.today().replace(day=1)+relativedelta(months=1, days=-1)).strftime('%Y-%m-%d')" />
<field name="target_goal">2000</field>
<field name="state">inprogress</field>
</record>

3990
addons/point_of_sale/i18n/th.po Normal file
View File

File diff suppressed because it is too large Load Diff

3
addons/survey/__openerp__.py
View File

@ -50,9 +50,6 @@ sent mails with personal token for the invitation of the survey.
'data/survey_demo_recruitment.xml',
'data/survey_demo_feedback.xml',
'data/survey_demo_appraisal.xml'],
#'test': [
# 'test/survey_test.py',
#],
'installable': True,
'auto_install': False,
'application': True,

3
addons/survey/controllers/main.py
View File

@ -165,7 +165,8 @@ class WebsiteSurvey(http.Controller):
return request.website.render('survey.survey', data)
elif user_input.state == 'done': # Display success message
return request.website.render('survey.sfinished', {'survey': survey,
'token': token})
'token': token,
'user_input': user_input})
elif user_input.state == 'skip':
flag = (True if prev and prev == 'prev' else False)
page, page_nr, last = survey_obj.next_page(cr, uid, user_input, user_input.last_displayed_page_id.id, go_back=flag, context=context)

7
addons/survey/data/oe_precert_demo.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<!-- Attendre les data de pbo
+ faire un script qui les traduit en record survey/page/question/label -->
</data>
</openerp>

4
addons/survey/security/survey_security.xml
View File

@ -50,7 +50,7 @@
<record id="survey_public_access" model="ir.rule">
<field name="name">Public access to user_input</field>
<field name="model_id" ref="survey.model_survey_user_input"/>
<field name="domain_force">[('create_uid', '=', 'uid')]</field>
<field name="domain_force">[('create_uid', '=', user.id)]</field>
<field name="groups" eval="[(4, ref('base.group_public'))]"/>
<field eval="0" name="perm_unlink"/>
<field eval="1" name="perm_write"/>
@ -61,7 +61,7 @@
<record id="survey_rule" model="ir.rule">
<field name="name">Access to user_input for regular users</field>
<field name="model_id" ref="survey.model_survey_user_input"/>
<field name="domain_force">[('create_uid', '=', 'uid')]</field>
<field name="domain_force">[('create_uid', '=', user.id)]</field>
<field name="groups" eval="[(4, ref('base.group_survey_user'))]"/>
<field eval="0" name="perm_unlink"/>
<field eval="1" name="perm_write"/>

13
addons/survey/survey.py
View File

@ -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)

1
addons/survey/views/survey_templates.xml
View File

@ -30,6 +30,7 @@
<div class="jumbotron mt32">
<h1>Thank you!</h1>
<div t-field="survey.thank_you_message" />
<div t-if='survey.quizz_mode'>You scored <t t-esc="user_input.quizz_score" /> points.</div>
<div>If you wish, you can <a t-att-href="'/survey/print/%s/%s' % (survey.id, token)">print your answers</a>.</div>
</div>
</div>

13
addons/survey/views/survey_views.xml
View File

@ -49,6 +49,7 @@
<field name="partner_id"/>
<field name="email" widget="email"/>
<field name="test_entry" groups="base.group_no_one"/>
<field name="quizz_score" groups="base.group_no_one"/>
</group>
</group>
<field name="user_input_line_ids" mode="tree" attrs="{'readonly': False}">
@ -58,6 +59,7 @@
<field name="answer_type"/>
<field name="skipped"/>
<field name="date_create"/>
<field name="quizz_mark" groups="base.group_no_one"/>
</tree>
</field>
</sheet>
@ -77,6 +79,7 @@
<field name="type"/>
<field name="state"/>
<field name="test_entry" invisible="True"/>
<field name="quizz_score" groups="base.group_no_one"/>
</tree>
</field>
</record>
@ -497,8 +500,8 @@
<field name="page_id"/>
<field name="type"/>
<group expand="1" string="Group by...">
<filter name="group_by_survey" string="Survey" domain="[]" context="{'group_by':'survey_id'}"/>
<filter name="group_by_page" string="Page" domain="[]" context="{'group_by':'page_id'}"/>
<!-- <filter name="group_by_survey" string="Survey" domain="[]" context="{'group_by':'survey_id'}"/>
--> <filter name="group_by_page" string="Page" domain="[]" context="{'group_by':'page_id'}"/>
</group>
</search>
</field>
@ -511,7 +514,8 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="survey_question_tree"></field>
<field name="search_view_id" ref="survey_question_search"/>
<field name="context">{'search_default_group_by_survey': True, 'search_default_group_by_page': True}</field>
<!-- <field name="context">{'search_default_group_by_survey': True, 'search_default_group_by_page': True}</field>
--> <field name="context">{'search_default_group_by_page': True}</field>
</record>
<!-- LABELS -->
@ -524,6 +528,7 @@
<field name="question_id"/>
<field name="question_id_2"/>
<field name="value"/>
<field name="quizz_mark" groups="base.group_no_one"/>
</tree>
</field>
</record>
@ -560,6 +565,7 @@
<field name="date_create"/>
<field name="answer_type"/>
<field name="skipped" />
<field name="quizz_mark" groups="base.group_no_one"/>
</group>
<group>
<field name="value_text" colspan='2' attrs="{'invisible': [('answer_type','!=','text')]}"/>
@ -585,6 +591,7 @@
<field name="date_create"/>
<field name="answer_type"/>
<field name="skipped"/>
<field name="quizz_mark" groups="base.group_no_one"/>
</tree>
</field>
</record>

2
addons/website/data/website_data.xml
View File

@ -59,7 +59,7 @@
</record>
<record id="action_website_tutorial" model="ir.actions.act_url">
<field name="name">Website With Tutorial</field>
<field name="url">/?tutorial.banner=true</field>
<field name="url">/#tutorial.banner=true</field>
<field name="target">self</field>
</record>
<record id="action_website_homepage" model="ir.actions.act_url">

5
addons/website/static/src/js/website.tour.banner.js
View File

@ -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",

39
addons/website/static/src/js/website.tour.js
View File

@ -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 () {

2
addons/website_blog/data/website_blog_data.xml
View File

@ -20,7 +20,7 @@
<record id="action_open_website" model="ir.actions.act_url">
<field name="name">Website Blogs</field>
<field name="target">self</field>
<field name="url" eval="'/blog/'+str(ref('website_blog.blog_blog_1'))+'/?tutorial.blog=true'"/>
<field name="url" eval="'/blog/'+str(ref('website_blog.blog_blog_1'))+'/#tutorial.blog=true'"/>
</record>
<record id="base.open_menu" model="ir.actions.todo">
<field name="action_id" ref="action_open_website"/>

2
addons/website_blog/static/src/js/website.tour.blog.js
View File

@ -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 = [

18
addons/website_crm_partner_assign/controllers/main.py
View File

@ -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/<int:page>/',
'/partners/grade/<int:grade_id>',
'/partners/grade/<int:grade_id>/page/<int:page>/',
'/partners/country/<int:country_id>',
'/partners/country/<country_name>-<int:country_id>',
'/partners/country/<int:country_id>/page/<int:page>/',
'/partners/country/<country_name>-<int:country_id>/page/<int:page>/',
'/partners/grade/<int:grade_id>/country/<int:country_id>/',
'/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>',
'/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>/',
'/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int: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 = {

34
addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
View File

@ -35,13 +35,27 @@
Contact a reseller
</h2>
</div>
<div class="col-md-4 mb32" id="partner_left">
<h3>Resellers by Country</h3>
<ul class="nav nav-pills nav-stacked mt16">
<li class="nav-header"><h3>Categories</h3></li>
<t t-foreach="grades" t-as="grade">
<li t-if="grade['grade_id']" t-att-class="grade['grade_id'][0] == grade_id and 'active' or ''">
<a t-attf-href="#{ grade['grade_id'][0] and '/partners/grade/%s' % grade['grade_id'][0] or '/partners' }#{ current_country_id and ('/country/%s' % current_country_id) or '' }#{ search_path }">
<span class="badge pull-right" t-esc="grade['grade_id_count'] or ''"/>
<t t-esc="grade['grade_id'][1]"/>
</a>
</li>
</t>
</ul>
<ul id="reseller_countries" class="nav nav-pills nav-stacked mt16">
<li class="nav-header"><h3>Locations</h3></li>
<t t-foreach="countries" t-as="country_dict">
<t t-if="country_dict['country_id']">
<li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
<a t-attf-href="#{ country_dict['country_id'][0] and '/partners/country/%s' % slug(country_dict['country_id']) or '/partners/' }#{ search_path }">
<a t-attf-href="#{ country_dict['country_id'][0] and ('/partners/country/%s' % slug(country_dict['country_id'])) or '/partners/' }#{ search_path }">
<span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/>
<t t-esc="country_dict['country_id'][1]"/>
</a>
@ -49,7 +63,9 @@
</t>
</t>
</ul>
</div>
<div class="col-md-8" id="ref_content">
<div class='navbar'>
<div>
@ -60,17 +76,7 @@
<div class="form-group">
<input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
</div>
<div class="form-group">
<select class="search-query col-md-2 mt4 form-control" name="grade" t-if="len(grades) > 1" onchange="submit()">
<t t-foreach="grades">
<t t-if="grade_id">
<option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
<t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
</option>
</t>
</t>
</select>
</div>
</form>
</div>
</div>
@ -103,7 +109,7 @@
</template>
<template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
<xpath expr="//div[@id='partner_left']//ul" position="after">
<xpath expr="//ul[@id='reseller_countries']" position="after">
<h3>World Map</h3>
<ul class="nav">
<iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"

2
addons/website_event/static/src/js/website.tour.event.js
View File

@ -13,7 +13,7 @@
website.EventTour = website.Tour.extend({
id: 'event',
name: "Create an event",
testPath: /\/event\/[0-9]+\/register/,
testPath: '/event(/[0-9]+/register)?',
init: function (editor) {
var self = this;
self.steps = [

2
addons/website_event/tests/ui_suite/event_test.js
View File

@ -11,7 +11,7 @@ testRunner.run(function eventTest (page, timeout) {
});
}, function executeTest () {
page.evaluate(function () {
window.openerp.website.Tour.run_test('event');
window.openerp.website.Tour.get('event').run(true);
});
}, timeout);
});

2
addons/website_sale/data/website_sale_data.xml
View File

@ -16,7 +16,7 @@
<record id="action_open_website" model="ir.actions.act_url">
<field name="name">Website Shop</field>
<field name="target">self</field>
<field name="url">/shop?tutorial.shop=true</field>
<field name="url">/shop#tutorial.shop=true</field>
</record>
<record id="base.open_menu" model="ir.actions.todo">
<field name="action_id" ref="action_open_website"/>

4
addons/website_sale/static/description/index.html
View File

@ -27,7 +27,7 @@
<section class="oe_container oe_dark">
<div class="oe_row">
<h2 class="oe_slogan">Create Awsome Product Pages</h2>
<h2 class="oe_slogan">Create Awesome Product Pages</h2>
<h3 class="oe_slogan">Get rid of old WYSIWYG editors</h3>
<div class="oe_span6">
<p class='oe_mt32'>
@ -295,7 +295,7 @@
<section class="oe_container">
<div class="oe_row">
<h2 class="oe_slogan">Fully Integrated With Others Apps</h2>
<h2 class="oe_slogan">Fully Integrated With Other Apps</h2>
<h3 class="oe_slogan">Get hundreds of open source apps for free</h3>
<div class="oe_span4">
<a href="/apps/website">

10
addons/website_sale/static/src/js/website.tour.shop.js
View File

@ -14,7 +14,7 @@
website.EditorShopTour = website.Tour.extend({
id: 'shop',
name: "Create a product",
testPath: /\/shop\/.*/,
testPath: '/shop',
init: function (editor) {
var self = this;
self.steps = [
@ -145,7 +145,7 @@
id: 'shop_buy_product',
name: "Try to buy products",
path: '/shop',
testPath: /\/shop/,
testPath: '/shop',
init: function (editor) {
var self = this;
self.steps = [
@ -216,11 +216,7 @@
},
},
{
title: "select acquirer",
element: 'input[name="acquirer"]',
},
{
title: "confirm",
title: "Pay Now",
element: 'button:contains("Pay Now")',
},
{

7
addons/website_sale/static/src/js/website_sale.js
View File

@ -26,11 +26,12 @@ $(document).ready(function () {
if (isNaN(value)) value = 0;
openerp.jsonRpc("/shop/set_cart_json/", 'call', {'order_line_id': $input.data('id'), 'set_number': value})
.then(function (data) {
if (!data) {
location.reload();
return;
}
set_my_cart_quantity(data[1]);
$input.val(data[0]);
if (!data[0]) {
location.reload();
}
});
});

2
addons/website_sale/tests/test_ui.py
View File

@ -2,7 +2,7 @@ import openerp.addons.website.tests.test_ui as test_ui
def load_tests(loader, base, _):
base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
{'redirect': '/page/website.homepage'}))
{'redirect': '/page/website.homepage'}, 120))
base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test-2.js'),
{'redirect': '/page/website.homepage'}))
return base

4
addons/website_sale/views/website_sale.xml
View File

@ -530,7 +530,7 @@
<a t-if="website_sale_order and website_sale_order.website_order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
<div class="oe_structure"/>
</div>
<div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
<div class="col-lg-3 col-lg-offset-1 col-sm-3 col-md-3 text-muted" id="right_column">
<h4>Policies</h4>
<ul class="list-unstyled mb32">
<li>&#9745; 30-days money-back guarantee</li>
@ -828,7 +828,7 @@
</div>
<button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
</div>
<div class="col-lg-offset-1 col-lg-3 text-muted">
<div class="col-lg-offset-1 col-lg-3 col-md-3 text-muted">
<h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
<div class="row">
<div class="col-sm-6 text-right">Subtotal:</div>