Skip to content
Permalink
Browse files

⬆️1️⃣1️⃣ in pos_config_view.xml corrected reference to 'point_of_sale…

….pos_config_view_form';deleted unusable variables in 'merge.js';
  • Loading branch information...
fedoranvar committed Jul 19, 2019
1 parent 9e12d72 commit cf03e80f92b218a86f8f5c002b8bbfde1e682a4b
@@ -11,6 +11,7 @@ Contributors
------------
* `Dinar Gabbasov <https://it-projects.info/team/GabbasovDinar>`__
* `Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>`__
* `Kildebekov Anvar <https://it-projects.info/team/kildebekov>`__

Sponsors
--------
@@ -20,7 +21,7 @@ Maintainers
-----------
* `IT-Projects LLC <https://it-projects.info>`__

To get a guaranteed support you are kindly requested to purchase the module at `odoo apps store <https://apps.odoo.com/apps/modules/10.0/pos_order_merge/>`__.
To get a guaranteed support you are kindly requested to purchase the module at `odoo apps store <https://apps.odoo.com/apps/modules/11.0/pos_order_merge/>`__.

Thank you for understanding!

@@ -29,12 +30,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_order_merge/
HTML Description: https://apps.odoo.com/apps/modules/11.0/pos_order_merge/

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

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

Tested on Odoo 10.0 5548b2ff7abdf808c81f963d691cc8d6ec58e0fc
Tested on Odoo 11.0 4b647056a39fe4411d90bac6742344bc486c5927
@@ -1,2 +1 @@
# -*- coding: utf-8 -*-
from . import models
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-
{
"name": """Merge POS Orders""",
"summary": """Merge POS orders into a single order""",
"category": "Point of Sale",
"images": ["images/pos_order_merge_main.jpg"],
"version": "10.0.1.0.0",
"version": "11.0.1.0.0",
"application": False,

"author": "IT-Projects LLC, Dinar Gabbasov, Alexandr Kolushov",
@@ -34,5 +33,5 @@
"uninstall_hook": None,

"auto_install": False,
"installable": False,
"installable": True,
}
@@ -1,2 +1 @@
# -*- coding: utf-8 -*-
from . import pos_config
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

from odoo import fields, models


@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
import odoo.tests
from odoo.api import Environment

@@ -4,7 +4,7 @@
<record id="view_pos_config_form" model="ir.ui.view">
<field name="name">pos.config.form.view.inherit</field>
<field name="model">pos.config</field>
<field name="inherit_id" ref="point_of_sale.view_pos_config_form"></field>
<field name="inherit_id" ref="point_of_sale.pos_config_view_form"></field>
<field name="arch" type="xml">
<xpath expr="//field[@name='iface_orderline_notes']" position="after">
<field name="iface_order_merge" />

0 comments on commit cf03e80

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