Skip to content

Commit d51e120

Browse files
committed
Merge remote-tracking branch 'origin/11.0' into 11.0-42288143e4765d33a21e8e4c12fe55c3bdf41d78
2 parents 4228814 + 3a3b9f7 commit d51e120

File tree

540 files changed

+17403
-1825
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

540 files changed

+17403
-1825
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*/static/lib/**

.javascript_ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*/static/lib/**

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: python
22

33
python:
4-
- "2.7"
4+
- "3.5"
55

66
sudo: false
77
cache: pip
@@ -14,7 +14,7 @@ addons:
1414

1515
env:
1616
global:
17-
- VERSION="10.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" UNIT_TEST="0"
17+
- VERSION="11.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" UNIT_TEST="0"
1818
- EXCLUDE="hw_printer_network,hw_twitter_printing"
1919
- PYLINT_ODOO_JSLINTRC="/home/travis/maintainer-quality-tools/travis/cfg/.jslintrc"
2020
- TRANSIFEX_USER='i18n-bot@it-projects.info'
@@ -27,8 +27,6 @@ env:
2727
- TESTS="1" ODOO_REPO="OCA/OCB""
2828
- TRANSIFEX="1"
2929

30-
virtualenv:
31-
system_site_packages: true
3230

3331
install:
3432
- pip install anybox.testing.openerp

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
Odoo POS addons
22
===============
33

4-
Odoo (OpenERP) POS addons
4+
Odoo POS addons
55

66
List of repositories:
77
---------------------
88

99
* https://github.com/it-projects-llc/misc-addons
1010
* https://github.com/it-projects-llc/pos-addons
1111
* https://github.com/it-projects-llc/mail-addons
12-
* https://github.com/it-projects-llc/rental-addons
1312
* https://github.com/it-projects-llc/access-addons
1413
* https://github.com/it-projects-llc/website-addons
1514
* https://github.com/it-projects-llc/l10n-addons

hw_printer_network/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
32

43
def post_load():

hw_printer_network/__openerp__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# Copyright 2017-2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
32
# Copyright 2018 Ivan Yelizariev <https://it-projects.info/team/yelizariev>
43
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
@@ -8,7 +7,7 @@
87
"summary": """Hardware Driver for Network Printers""",
98
"category": "Point of Sale",
109
"images": [],
11-
"version": "10.0.2.0.1",
10+
"version": "11.0.2.0.1",
1211
"application": False,
1312

1413
"author": "IT-Projects LLC, Dinar Gabbasov",
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).
32

43
from . import hw_printer_network_controller

hw_printer_network/controllers/hw_printer_network_controller.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# Copyright 2017-2018 Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>
32
# Copyright 2018 Tom Blauwendraat <tom@sunflowerweb.nl>
43
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html).

hw_twitter_printing/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
import logging
32
import threading
43
from odoo.tools import config

hw_twitter_printing/__manifest__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
{
32
"name": """Print tweets with PosBox""",
43
"summary": """Print tweets with specific hashtags""",
@@ -30,5 +29,5 @@
3029
"post_init_hook": 'post_init',
3130

3231
"auto_install": False,
33-
"installable": True,
32+
"installable": False,
3433
}

0 commit comments

Comments
 (0)