lp:~openerp-dev/openobject-addons/7.0-pos-backport-from-trunk
- Get this branch:
- bzr branch lp:~openerp-dev/openobject-addons/7.0-pos-backport-from-trunk
Branch merges
- OpenERP Core Team: Pending requested
-
Diff: 1892 lines (+694/-323)13 files modifiedpoint_of_sale/__openerp__.py (+1/-0)
point_of_sale/controllers/main.py (+12/-0)
point_of_sale/static/src/css/pos.css (+32/-13)
point_of_sale/static/src/js/db.js (+22/-3)
point_of_sale/static/src/js/devices.js (+135/-31)
point_of_sale/static/src/js/main.js (+3/-1)
point_of_sale/static/src/js/models.js (+126/-49)
point_of_sale/static/src/js/screens.js (+109/-92)
point_of_sale/static/src/js/tests.js (+92/-0)
point_of_sale/static/src/js/widget_base.js (+2/-2)
point_of_sale/static/src/js/widget_scrollbar.js (+9/-13)
point_of_sale/static/src/js/widgets.js (+106/-102)
point_of_sale/static/src/xml/pos.xml (+45/-17)
Branch information
Recent revisions
- 9463. By van der Essen Frédéric (OpenERP)
-
[MERGE] point_of_sale: fix for the closing confirmation dialog in self checkout mode
- 9462. By van der Essen Frédéric (OpenERP)
-
[BACKPORT] point_of_sale: backporting the point of sale client from trunk. Invoicing support has not been included
- 9459. By van der Essen Frédéric (OpenERP)
-
[FIX] point_of_sale: barcode scanner was not working in firefox due to usage of event.keyCode instead of event.which
- 9458. By Martin Trigaux (OpenERP)
-
[IMP] account: performance improvement on the creation of new account.move (opw #597719)
- 9457. By van der Essen Frédéric (OpenERP)
-
[IMP] point_of_sale: when the product search returns only one product, order it on 'enter' keypress
- 9456. By van der Essen Frédéric (OpenERP)
-
[FIX] point_of_sale: currency should be fetched from the pricelist instead of the company
- 9455. By Martin Trigaux (OpenERP)
-
[FIX] sale_crm: move code reverted at revision 9452 to the sale_crm module instead of project_mrp
- 9454. By Olivier Dony (Odoo)
-
[MERGE] project_mrp: correct reference to process.node from sales process
The project_mrp process extends the sales process at
the procurement phase, however that part of the sales
process has now been moved to the `sale_stock` module,
which is not a dependency of `project_mrp` anymore.
There is however little reason to duplicate that
process node, so as a temporary hack, we can copy
its external ID, even though there is no direct
dependency between the two.For next version we should fix this hack by moving
the node to a common dependency between sale_stock
and project_mrp, such as `sale`.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openobject-addons