Skip to content

Commit

Permalink
Merge branch '11.0' into 11.0-42288143e4765d33a21e8e4c12fe55c3bdf41d78
Browse files Browse the repository at this point in the history
  • Loading branch information
KolushovAlexandr authored Nov 20, 2018
2 parents 0d4943b + 29a803e commit 813df9b
Show file tree
Hide file tree
Showing 58 changed files with 359 additions and 740 deletions.
14 changes: 14 additions & 0 deletions hw_printer_network/doc/index.rst
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
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: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>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions pos_barcode_sync/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_cashbox/static/description/index.html
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:it@it-projects.info">it@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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_cashier_select/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_category_multi/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion pos_debt_notebook/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


def pre_uninstall(cr, registry):
env = api.Environment({})
env = api.Environment(cr, SUPERUSER_ID, {})
if env['pos.session'].search([('state', '=', 'opened')]):
raise UserError(_('You have open session of Point of Sale. Please close them first.'))

Expand Down
1 change: 0 additions & 1 deletion pos_debt_notebook/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
'live_test_url': 'http://apps.it-projects.info/shop/product/pos-debt-notebook?version=10.0',
"images": ['images/debt_notebook.png'],
'version': '11.0.5.1.0',

'author': 'IT-Projects LLC, Ivan Yelizariev',
"support": "pos@it-projects.info",
'website': 'https://it-projects.info',
Expand Down
3 changes: 2 additions & 1 deletion pos_debt_notebook/doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
- **FIX:** Error related to paying with not discount credit journals in POS
- **FIX:** Invoices paid with credit journals now counts in partner debts

`5.0.3`
`5.0.5`
-------

- **FIX:** Error on module deleting
- **FIX:** Error related to invoices created in the "Generate POS Credit Invoices" wizard. Invoices were created with wrong type.

`5.0.4`
Expand Down
2 changes: 2 additions & 0 deletions pos_debt_notebook/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_debt_notebook_sync/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_disable_payment/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Maintainers
Thank you for understanding!

`IT-Projects Team <https://www.it-projects.info/team>`__

* The module is not maintained since Odoo 12.0. All changes of the module have been migrated to `Point of Sale - Extra Access Right <https://github.com/OCA/pos/tree/12.0/pos_access_right/>`__ module. Read more `here. <https://github.com/OCA/pos/issues/232>`__

Further information
===================
Expand Down
2 changes: 2 additions & 0 deletions pos_disable_payment/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions pos_discount_base/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
</div>
Expand Down
53 changes: 53 additions & 0 deletions pos_discount_total/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,56 @@ <h3 class="oe_slogan">Simple way to apply discount for all order items</h3>
</div>
</section>

<section class="oe_container">
<div class="oe_row oe_spaced">
<div class="oe_span8">
<h2>Need our service?</h2>
<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: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>
</ul>
</div>
<div class="oe_span4">
<div class="stamp" style="width:200px;">
<div style="margin-top: 15px;
position: relative;
font-family:'Vollkorn', serif;
font-size: 16px;
line-height: 25px;
text-transform: uppercase;
font-weight: bold;
color: #75526b;
border: 3px dashed #75526b;
float: left;
padding: 4px 12px;
-webkit-transform: rotate(2deg);
-o-transform: rotate(2deg);
-moz-transform: rotate(2deg);
-ms-transform: rotate(2deg);">
Tested on Odoo<br/>11.0 community
</div>
<!--<div style="margin-top: 15px;
position: relative;
font-family:'Vollkorn', serif;
font-size: 16px;
line-height: 25px;
text-transform: uppercase;
font-weight: bold;
color: #75526b;
border: 3px dashed #75526b;
float: left;
padding: 4px 12px;
-webkit-transform: rotate(-10deg);
-o-transform: rotate(-10deg);
-moz-transform: rotate(-10deg);
-ms-transform: rotate(-10deg);">
Tested on Odoo<br/>11.0 enterprise
</div>-->
</div>
</div>
</div>
</section>

2 changes: 2 additions & 0 deletions pos_invoice_pay/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:it@it-projects.info">it@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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_logout/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
4 changes: 2 additions & 2 deletions pos_longpolling/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Longpolling

Check following resources about activating longpolling:

* Official doc: https://www.odoo.com/documentation/8.0/setup/deploy.html#builtin-server
* Official doc: https://www.odoo.com/documentation/11.0/setup/deploy.html#builtin-server
* Non-official doc: https://odoo-development.readthedocs.io/en/latest/admin/longpolling.html

In short, you need to start server with non-zero ``workers`` parameter:::
Expand All @@ -26,7 +26,7 @@ and configure nginx: ::
Database connections limit
==========================

It's highly recommended to `check odoo and postgresql setttings about connections limits <https://odoo-development.readthedocs.io/en/latest/admin/db_maxconn.html>`__. In short, it must satisfy following condition::
It's highly recommended to `check odoo and postgresql settings about connections limits <https://odoo-development.readthedocs.io/en/latest/admin/db_maxconn.html>`__. In short, it must satisfy following condition::

(1 + workers + max_cron_threads) * db_maxconn < max_connections

Expand Down
2 changes: 2 additions & 0 deletions pos_mobile/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_mobile_restaurant/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_multi_session/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ <h2>Need our service?</h2>
<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>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions pos_multi_session_restaurant/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions pos_multi_session_sync/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ <h2>Need our service?</h2>
<ul>
<li><a href="mailto:it@it-projects.info">it@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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_order_cancel/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions pos_order_cancel_restaurant/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions pos_order_note/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions pos_order_printer_product/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 2 additions & 0 deletions pos_orderline_absolute_discount/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ <h2>Need our service?</h2>
<ul>
<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>
</ul>
</div>
<div class="oe_span4">
Expand Down
2 changes: 1 addition & 1 deletion pos_orders_history/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"category": "Point of Sale",
"live_test_url": "http://apps.it-projects.info/shop/product/pos-orders-history?version=11.0",
"images": ['images/pos_orders_history_main.png'],
"version": "11.0.1.0.1",
"version": "11.0.1.1.0",
"application": False,

"author": "IT-Projects LLC, Dinar Gabbasov",
Expand Down
10 changes: 10 additions & 0 deletions pos_orders_history/doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
Updates
=======

`1.1.0`
-------

- **NEW:** Update order list button

`1.0.2`
-------
- **FIX:** displaying posted orders after open new POS session
- **FIX:** error determining the current cashier

`1.0.1`
-------
- **FIX:** self.pos.db is undefined
Expand Down
Loading

0 comments on commit 813df9b

Please sign in to comment.