Skip to content

Commit

Permalink
Merge branch '11.0' of github.com:it-projects-llc/pos-addons into 11.…
Browse files Browse the repository at this point in the history 
…0-f31070c4c98055663bf83cdab4d75dbb8117a5f0
  • Loading branch information
@KolushovAlexandr
KolushovAlexandr committed Oct 17, 2019
2 parents f31070c + bc7a37a commit 6c44844
Show file tree
Hide file tree
Showing 753 changed files with 20,173 additions and 3,329 deletions.
1 change: 1 addition & 0 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*/static/lib/**
1 change: 1 addition & 0 deletions .javascript_ignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*/static/lib/**
6 changes: 2 additions & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: python

python:
- "2.7"
- "3.5"

sudo: false
cache: pip
Expand All @@ -15,7 +15,7 @@ addons:

env:
global:
- VERSION="10.0" TESTS="0" LINT_CHECK="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"

Expand All @@ -27,8 +27,6 @@ env:
- MAKEPOT="1"
- TESTS="1" ODOO_REPO="OCA/OCB""

virtualenv:
system_site_packages: true

install:
- pip install anybox.testing.openerp
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[![Build Status](https://travis-ci.com/it-projects-llc/pos-addons.svg?branch=10.0)](https://travis-ci.com/it-projects-llc/pos-addons)

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

Odoo (OpenERP) POS addons
Odoo POS addons

List of repositories:
---------------------

* https://github.com/it-projects-llc/misc-addons
* https://github.com/it-projects-llc/pos-addons
* https://github.com/it-projects-llc/mail-addons
* https://github.com/it-projects-llc/rental-addons
* https://github.com/it-projects-llc/access-addons
* https://github.com/it-projects-llc/website-addons
* https://github.com/it-projects-llc/l10n-addons
Expand Down
1 change: 0 additions & 1 deletion hw_printer_network/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).

def post_load():
Expand Down
3 changes: 1 addition & 2 deletions hw_printer_network/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
# Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
Expand All @@ -8,7 +7,7 @@
"summary": """Hardware Driver for Network Printers""",
"category": "Point of Sale",
"images": [],
"version": "10.0.2.0.1",
"version": "11.0.2.0.1",
"application": False,

"author": "IT-Projects LLC, Dinar Gabbasov",
Expand Down
1 change: 0 additions & 1 deletion hw_printer_network/controllers/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).

from . import hw_printer_network_controller
1 change: 0 additions & 1 deletion hw_printer_network/controllers/hw_printer_network_controller.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2017-2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
# Copyright 2018 Tom Blauwendraat <[email protected]>
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
Expand Down
14 changes: 14 additions & 0 deletions hw_printer_network/doc/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@ In PosBox

* add ``hw_printer_network`` module to *server wide modules*. Detailed instruction is here: https://odoo-development.readthedocs.io/en/latest/admin/posbox/administrate-posbox.html#how-to-update-odoo-command-line-options

* If you use posbox version 17.0 and newer:
* In PosBox implement the next command::

sudo su
mount -o rw,remount /
PRINTER_PY=/home/pi/odoo/addons/hw_escpos/escpos/printer.py
sed -i "s;\
self\.device\.send(msg);\
if type(msg) is str:\n\
msg = msg.encode(\"utf-8\")\n\
self\.device\.send(msg);" \
$PRINTER_PY


Usage
=====

Expand Down
2 changes: 2 additions & 0 deletions hw_printer_network/static/description/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:[email protected]">[email protected] <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>[email protected] <i class="fa fa-skype"></i></li>
</ul>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion hw_twitter_printing/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
import logging
import threading
from odoo.tools import config
Expand Down
5 changes: 2 additions & 3 deletions hw_twitter_printing/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
{
"name": """Print tweets with PosBox""",
"summary": """Print tweets with specific hashtags""",
"category": "Point of Sale",
# "live_test_URL": "",
"images": [],
"version": "10.0.1.0.0",
"version": "11.0.1.0.0",
"application": False,

"author": "IT-Projects LLC, Dinar Gabbasov",
Expand All @@ -30,5 +29,5 @@
"post_init_hook": 'post_init',

"auto_install": False,
"installable": True,
"installable": False,
}
1 change: 0 additions & 1 deletion hw_twitter_printing/escpos_encoding.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
import copy

try:
Expand Down
1 change: 0 additions & 1 deletion pos_cashbox/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# -*- coding: utf-8 -*-
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
from . import models
3 changes: 1 addition & 2 deletions pos_cashbox/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
{
Expand Down Expand Up @@ -36,7 +35,7 @@
"uninstall_hook": None,

"auto_install": False,
"installable": True,
"installable": False,

"demo_title": "Open CashBox from Backend",
"demo_addons": [
Expand Down
1 change: 0 additions & 1 deletion pos_cashbox/models/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# -*- coding: utf-8 -*-
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
from . import pos_cashbox_model
1 change: 0 additions & 1 deletion pos_cashbox/models/pos_cashbox_model.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
from odoo import api, fields, models
Expand Down
2 changes: 2 additions & 0 deletions pos_cashbox/static/description/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:[email protected]">[email protected] <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>[email protected] <i class="fa fa-skype"></i></li>
</ul>
</div>
<div class="oe_span4">
Expand Down
6 changes: 3 additions & 3 deletions pos_cashier_select/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ Maintainers
Further information
===================

Demo: http://runbot.it-projects.info/demo/pos-addons/10.0
Demo: http://runbot.it-projects.info/demo/pos-addons/11.0

HTML Description: https://apps.odoo.com/apps/modules/10.0/pos_cashier_select/
HTML Description: https://apps.odoo.com/apps/modules/11.0/pos_cashier_select/

Usage instructions: `<doc/index.rst>`__

Changelog: `<doc/changelog.rst>`__

Tested on Odoo 10.0 ffba5c688ff74a0630f9f70be1d7760a43a7deba
Tested on Odoo 11.0 ffba5c688ff74a0630f9f70be1d7760a43a7deba
2 changes: 0 additions & 2 deletions pos_cashier_select/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
# -*- coding: utf-8 -*-
# License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html).
3 changes: 1 addition & 2 deletions pos_cashier_select/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Copyright 2017 Ilmir Karamov <https://it-projects.info/team/ilmir-k>
# Copyright 2018 Ruslan Ronzhin <https://it-projects.info/team/rusllan/>
# Copyright 2019 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
Expand All @@ -9,7 +8,7 @@
"summary": """Forced choose a cashier before switching to payment screen""",
"category": "Point of Sale",
"images": ['images/pos_cashier_select.png'],
"version": "10.0.1.0.2",
"version": "11.0.1.0.2",
"application": False,

"author": "IT-Projects LLC, Artyom Losev",
Expand Down
10 changes: 5 additions & 5 deletions pos_cashier_select/i18n/de.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@ msgstr ""

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

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

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

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:92
#: code:addons/pos_cashier_select/static/src/js/main.js:93
#, python-format
msgid "One or more product(s) required serial/lot number."
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:178
#: code:addons/pos_cashier_select/static/src/js/main.js:179
#, python-format
msgid "Select User"
msgstr "Benutzer wählen"
10 changes: 5 additions & 5 deletions pos_cashier_select/i18n/es.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@ msgstr ""

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

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

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:91
#: code:addons/pos_cashier_select/static/src/js/main.js:92
#, python-format
msgid "Empty Serial/Lot Number"
msgstr "Número de Lote/Serial Vacío"

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/js/main.js:92
#: code:addons/pos_cashier_select/static/src/js/main.js:93
#, python-format
msgid "One or more product(s) required serial/lot number."
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:178
#: code:addons/pos_cashier_select/static/src/js/main.js:179
#, python-format
msgid "Select User"
msgstr "Seleccionar Usuario"
55 changes: 55 additions & 0 deletions pos_cashier_select/i18n/it.po
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * pos_cashier_select
#
# Translators:
# Sergio Zanchetta <[email protected]>, 2018
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-04-27 23:55+0000\n"
"PO-Revision-Date: 2018-04-27 23:55+0000\n"
"Last-Translator: Sergio Zanchetta <[email protected]>, 2018\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"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

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

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

#. 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 "Numero di serie/lotto mancante"

#. 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 "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:179
#, python-format
msgid "Select User"
msgstr "Selezionare utente"
12 changes: 6 additions & 6 deletions pos_cashier_select/i18n/pos_cashier_select.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Project-Id-Version: Odoo Server 11.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: <>\n"
"Language-Team: \n"
Expand All @@ -15,35 +15,35 @@ msgstr ""

#. module: pos_cashier_select
#. openerp-web
#: code:addons/pos_cashier_select/static/src/xml/pos.xml:19
#: 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:106
#: 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:91
#: 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:92
#: 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:178
#: code:addons/pos_cashier_select/static/src/js/main.js:179
#, python-format
msgid "Select User"
msgstr ""
Expand Down
Loading

0 comments on commit 6c44844

Please sign in to comment.