Skip to content
Permalink
Browse files

Merge branch '11.0' into 11.0-pos_cashbox-port

  • Loading branch information...
fedoranvar committed Jul 29, 2019
2 parents 3500cbb + 06d3843 commit 48b57c717d20b59e80d3fa3a376d8d004c73c6a1
Showing 650 changed files with 20,691 additions and 2,321 deletions.
@@ -7,25 +7,23 @@ sudo: false
cache: pip

addons:
postgresql: "9.5"
apt:
packages:
- expect-dev # provides unbuffer utility
- python-lxml # because pip installation is slow

env:
global:
- VERSION="11.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" UNIT_TEST="0"
- VERSION="11.0" TESTS="0" LINT_CHECK="0" UNIT_TEST="0"
- EXCLUDE="hw_printer_network,hw_twitter_printing"
- PYLINT_ODOO_JSLINTRC="/home/travis/maintainer-quality-tools/travis/cfg/.jslintrc"
- TRANSIFEX_USER='i18n-bot@it-projects.info'
- secure: "LALUDmASaCYKLpDE97zycd1tnui7ozddyjrfCLAowKUyMxx5xjrCSeFzebZfYVpf+PeBunYOrRpspgRi81NpWeFUjb92TrGSdFmkcPQKQJa1zFRhblRexR48dxv1+/Ubi/ZNIvt6uxztPvynCDk78j7jwiSj3bKD6t5P7oI22jwo4DkhlY9gmb9Ook3pxKm1enohyUpSgfAUyoINvOdaLXMmCg0lxwVmzNw4jgWWIQDgmycrCjQioRFeiPOsvvNC0RklVaKbtnzsA9PmfMUL40F2Lu67EnBXk3IVfqnQJQjVYVO5IUbAtpw76+CTheFXBrDIJ2gk5y/tpOk215N8DekFaX0BRLOlTkF+PLUO9RHLWHfrVTwYqBggKcTj2Oz+nsGuj5sTRSTVLU03vKGMb2KKmH4QldgLgcRG26qTKVhRw6LCaCsLgdZptF93c8QoyI7bgQspOBVb9asQIJ/wbS+SluPBLAw4WTWrqI0BY+y4YjaSSZO9QNLUgthhg1AuSJw2Kb5265AI1ha7HQUEsYYDP4l8K68RK22TnuPvgBcbCpiEmU28D1o08Va2Q6W2BFu+zhbNF1CP6endtbk2kjdLtyu06XaJkY8Ac8TexaYb9wvvfDNfdpQGhIMRpdQDhjLMdLT3VfkNBmOU1w2214zl6YzqxTh0OXrsZC64IPM="


matrix:
- LINT_CHECK="1"
- TESTS="1" ODOO_REPO="odoo/odoo"
- TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1"
- TESTS="1" ODOO_REPO="OCA/OCB""
- TRANSIFEX="1"


install:
@@ -42,3 +40,7 @@ after_success:

notifications:
email: false
webhooks:
on_failure: change
urls:
- "https://ci.it-projects.info/travis/on_failure/change"
@@ -1,3 +1,6 @@

[![Build Status](https://travis-ci.com/it-projects-llc/pos-addons.svg?branch=11.0)](https://travis-ci.com/it-projects-llc/pos-addons)

Odoo POS addons
===============

@@ -11,7 +11,7 @@
"application": False,

"author": "IT-Projects LLC, Dinar Gabbasov",
"support": "apps@it-projects.info",
"support": "pos@it-projects.info",
"website": "https://twitter.com/gabbasov_dinar",
"license": "LGPL-3",
"price": 59.00,
@@ -35,9 +35,9 @@ <h3 class="oe_slogan">You will get free support and assistance in case of any is
<div class="oe_row oe_spaced" style="transition-delay: 0ms;">
<div class="oe_span12">
<h2>Need our service?</h2>
<p class="oe_mt32">Contact us by <a href="mailto:apps@it-projects.info">email</a> or fill out <a href="https://www.it-projects.info/page/website.contactus " target="_blank">request form</a></p>
<p class="oe_mt32">Contact us by <a href="mailto:pos@it-projects.info">email</a> or fill out <a href="https://www.it-projects.info/page/website.contactus " target="_blank">request form</a></p>
<ul>
<li><a href="mailto:apps@it-projects.info">apps@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="mailto:pos@it-projects.info">pos@it-projects.info <i class="fa fa-envelope-o"></i></a></li>
<li><a href="https://www.it-projects.info/page/website.contactus " target="_blank">https://www.it-projects.info/page/website.contactus <i class="fa fa-list-alt"></i></a></li>
<li><a href="https://m.me/itprojectsllc" target="_blank">https://m.me/itprojectsllc <i class="fa fa-facebook-square"></i></a></li>
<li>skype@it-projects.info <i class="fa fa-skype"></i></li>
@@ -4,11 +4,11 @@
"category": "Point of Sale",
# "live_test_URL": "",
"images": [],
"version": "1.0.0",
"version": "11.0.1.0.0",
"application": False,

"author": "IT-Projects LLC, Dinar Gabbasov",
"support": "apps@it-projects.info",
"support": "pos@it-projects.info",
"website": "https://it-projects.info/team/GabbasovDinar",
"license": "LGPL-3",
# "price": 0.00,

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

@@ -10,7 +10,7 @@
"application": False,

"author": "IT-Projects LLC, Dinar Gabbasov",
"support": "apps@it-projects.info",
"support": "pos@it-projects.info",
"website": "https://it-projects.info/team/GabbasovDinar",
"license": "LGPL-3",
"price": 49.00,
@@ -3,11 +3,11 @@
"summary": """Forced choose a cashier before switching to payment screen""",
"category": "Point of Sale",
"images": ['images/pos_cashier_select.png'],
"version": "11.0.1.0.0",
"version": "11.0.1.0.1",
"application": False,

"author": "IT-Projects LLC, Artyom Losev",
"support": "apps@it-projects.info",
"support": "pos@it-projects.info",
"website": "https://it-projects.info",
"license": "LGPL-3",
"price": 39.00,
@@ -1,5 +1,10 @@
`1.0.1`
-------

**Fix:** Incompatibility with pos_product_category_discount module

`1.0.0`
-------

- Init version
**Init version**

@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * pos_cashier_select
#
#
# Translators:
# Ermin Trevisan <trevi@twanda.com>, 2017
msgid ""
@@ -11,11 +11,12 @@ msgstr ""
"POT-Creation-Date: 2017-10-14 10:51+0000\n"
"PO-Revision-Date: 2017-10-14 10:51+0000\n"
"Last-Translator: Ermin Trevisan <trevi@twanda.com>, 2017\n"
"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/de/)\n"
"Language-Team: German (https://www.transifex.com/it-projects-llc/teams/76080/"
"de/)\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: pos_cashier_select
@@ -48,7 +49,7 @@ msgstr "Eines oder mehrere Produkte verlangen eine Serien- oder Losnummer"

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:181
#: code:addons/pos_cashier_select/static/src/js/main.js:179
#, python-format
msgid "Select User"
msgstr "Benutzer wählen"
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * pos_cashier_select
#
#
# Translators:
# Gustavo Valverde <g.valverde02@gmail.com>, 2017
msgid ""
@@ -11,11 +11,12 @@ msgstr ""
"POT-Creation-Date: 2017-09-30 15:22+0000\n"
"PO-Revision-Date: 2017-09-30 15:22+0000\n"
"Last-Translator: Gustavo Valverde <g.valverde02@gmail.com>, 2017\n"
"Language-Team: Spanish (https://www.transifex.com/it-projects-llc/teams/76080/es/)\n"
"Language-Team: Spanish (https://www.transifex.com/it-projects-llc/"
"teams/76080/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: pos_cashier_select
@@ -48,7 +49,7 @@ msgstr "Uno o más producto(s) requieren número de serie/lote."

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:181
#: code:addons/pos_cashier_select/static/src/js/main.js:179
#, python-format
msgid "Select User"
msgstr "Seleccionar Usuario"
@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * pos_cashier_select
#
#
# Translators:
# Sergio Zanchetta <primes2h@gmail.com>, 2018
msgid ""
@@ -11,11 +11,12 @@ msgstr ""
"POT-Creation-Date: 2018-04-27 23:55+0000\n"
"PO-Revision-Date: 2018-04-27 23:55+0000\n"
"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>, 2018\n"
"Language-Team: Italian (https://www.transifex.com/it-projects-llc/teams/76080/it/)\n"
"Language-Team: Italian (https://www.transifex.com/it-projects-llc/"
"teams/76080/it/)\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. module: pos_cashier_select
@@ -48,7 +49,7 @@ msgstr "Uno o più prodotti richiedono un numero di serie/lotto."

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:181
#: code:addons/pos_cashier_select/static/src/js/main.js:179
#, python-format
msgid "Select User"
msgstr "Selezionare utente"
@@ -0,0 +1,50 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * pos_cashier_select
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/xml/pos.xml:17
#, python-format
msgid "Cancel"
msgstr ""

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:107
#, python-format
msgid "Change Cashier"
msgstr ""

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:92
#, python-format
msgid "Empty Serial/Lot Number"
msgstr ""

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:93
#, python-format
msgid "One or more product(s) required serial/lot number."
msgstr ""

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:179
#, python-format
msgid "Select User"
msgstr ""

@@ -1,7 +1,7 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * pos_cashier_select
#
#
# Translators:
# Translation Bot <i18n-bot@it-projects.info>, 2017
msgid ""
@@ -11,12 +11,15 @@ msgstr ""
"POT-Creation-Date: 2018-04-21 00:08+0000\n"
"PO-Revision-Date: 2018-04-21 00:08+0000\n"
"Last-Translator: Translation Bot <i18n-bot@it-projects.info>, 2017\n"
"Language-Team: Russian (https://www.transifex.com/it-projects-llc/teams/76080/ru/)\n"
"Language-Team: Russian (https://www.transifex.com/it-projects-llc/"
"teams/76080/ru/)\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
"%100>=11 && n%100<=14)? 2 : 3);\n"

#. module: pos_cashier_select
#. openerp-web
@@ -48,7 +51,7 @@ msgstr ""

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:181
#: code:addons/pos_cashier_select/static/src/js/main.js:179
#, python-format
msgid "Select User"
msgstr "Выберите пользователя"

0 comments on commit 48b57c7

Please sign in to comment.
You can’t perform that action at this time.