Commit Graph

728 Commits

Author SHA1 Message Date
Christophe Simonis 262eb662de [MERGE] forward port of branch 8.0 up to d80376a 2014-10-21 14:33:36 +02:00
Christophe Simonis edc4b0b9bb [FIX] {web,point_of_sale}: allow cross-origin access to company logo 2014-10-20 20:14:36 +02:00
Niels Huylebroeck f0f5a29606 [FIX] point_of_sale: printing of tax name on hardware was missing data 'name', also made the regular print use the same value for consistency. 2014-10-09 18:38:46 +02:00
Frederic van der Essen 717895be1a [FIX] point_of_sale: prevent empty order creation as they are not accepted by the backend 2014-10-07 18:18:59 +02:00
Martin Trigaux 8843974d04 Forward port of branch saas-3 up to fc9fc3e 2014-10-06 15:52:23 +02:00
Denis Ledoux cd6dba5257 [MERGE] forward port of branch 7.0 up to 9066da3 2014-10-03 12:13:07 +02:00
Denis Ledoux 9066da3369 [FIX] point_of_sale: do not display False as currency if symbol is not set 2014-10-03 12:10:16 +02:00
dhr-odoo 60699cd714 [FIX] point_of_sale: invoice not created in backend
Missing arguments that lead to the invoice not created in the backend (opw 609470).
2014-09-24 15:13:51 +02:00
Frederic van der Essen 31215c9bce [IMP] point_of_sale: opening the cashbox only if paying with cash was problematic as you sometimes need to use the cashbox with bank payment methods such as ticket meals 2014-09-17 16:57:34 +02:00
Frederic van der Essen 5377a9e2d6 [IMP] point_of_sale: partner edition ! -> create partners, edit partners, assign them barcodes, take pictures, etc. 2014-09-17 16:57:34 +02:00
Frederic van der Essen ac4f7a14b9 [WIP] point_of_sale: qweb template for partner edition 2014-09-17 16:57:34 +02:00
Frederic van der Essen c3c8276b0f [FIX] point_of_sale: chrome was dropping the cookie when loading the company logo, resulting in an incorrect logo in multi-db setups. 2014-09-10 14:56:24 +02:00
Frederic van der Essen 3f5f76f246 [FIX] point_of_sale: fix some image chaching issues with the receipt logo. Using a random url at each fetch ensures that we don't get cached results 2014-09-10 14:56:24 +02:00
Frederic van der Essen 67ffbe00a4 [FIX] point_of_sale: chrome was dropping the cookie when loading the company logo, resulting in an incorrect logo in multi-db setups. 2014-09-10 14:34:58 +02:00
Frederic van der Essen 13bd2eaa3e [FIX] point_of_sale: prevent the company logo from being cached by the browser by accessing it via a random URL 2014-09-10 13:52:04 +02:00
Frederic van der Essen 7cf5f0a8a8 [FIX] point_of_sale: display an error when trying to print a receipt on an outdated posbox 2014-09-09 16:17:26 +02:00
Frederic van der Essen 89e179971a [FIX] point_of_sale: flush orders before closing the pos. This will help prevent users from closing the session with unflushed orders 2014-09-08 18:06:51 +02:00
Frederic van der Essen a11b530b9b [FIX] point_of_sale: activate on screen keyboard for user search 2014-09-08 18:06:51 +02:00
Frederic van der Essen bde444c09d [FIX] point_of_sale: prevent inexact payements when there is no cash payment method available as it will crash the backend 2014-09-08 18:06:51 +02:00
Frederic van der Essen 2a10394880 [FIX] point_of_sale: the self_checkout related fields are obsolete and should be removed, but we are too late in the release schedule to do so. Marking them as FIXME, to be removed for next major version 2014-09-08 18:06:51 +02:00
Frederic van der Essen 53cde4f7f4 [WIP] point_of_sale: checking for consistency between the user and the session's company 2014-09-08 18:06:51 +02:00
Frederic van der Essen dc8e18ac04 [WIP] point_of_sale: refactor error popups in preparation of a multicompany-screwup prevention error popup 2014-09-08 18:06:51 +02:00
Simon Lejeune d9b739e8f6 [REF] Renamed files whose names contained whitespaces 2014-09-02 14:13:00 +02:00
Frederic van der Essen 73fc6419a9 [FIX] point_of_sale: the order reference used the session sequence number wich was not unique accross sessions on different point_of_sales.
Now we are using the session id which is unique, but is less understandable
2014-08-26 12:38:35 +02:00
Frederic van der Essen f1d4d8d86c [IMP] point_of_sale: automatically update partners data when they are modified 2014-08-26 12:21:04 +02:00
Frederic van der Essen 8b4c7d7655 [FIX] point_of_sale: the category list now uses less space when the categories don't have pictures, freeing some screen space on tablets 2014-08-25 14:31:44 +02:00
Frederic van der Essen 2fd16b5552 [IMP] point_of_sale: add missing functionality necessary for the loyalty module 2014-08-21 12:19:04 +02:00
Antony Lesuisse d421f9a365 [IMP] point_of_sale: track session logins
the pos session now keeps track of the session logins, and that number is
included in in the order reference. This prevents orders generated in parallely
created sessions from having the same reference, and also helps reduce fraud.
2014-08-20 15:13:46 +02:00
Frederic van der Essen 3071af9b11 [FIX] point_of_sale: prevent changing the customer after printing the receipt 2014-08-19 17:55:46 +02:00
Frederic van der Essen 986f0e9d46 [FIX] point_of_sale: the receipt would not print correctly on first try 2014-08-19 17:15:14 +02:00
Frederic van der Essen 24df6dc8b2 [FIX] product, point_of_sale: add a display_default_code context option that can remove the internal reference (default code) from the displayed product name. Used in the point of sale to unclutter the receipt & GUI 2014-08-18 14:51:15 +02:00
Frederic van der Essen 57fe94b34e [FIX] point_of_sale: the order uid were generated via timestamp, which were not sequencial or easy to understand, they are now generated with the order id and order sequence number which are sequencial 2014-08-18 12:19:56 +02:00
Frederic van der Essen 5d1d77e6e2 [FIX] point_of_sale: the product name field changed to display_name to include variants information, this should be reflected in searches as well. 2014-08-18 11:35:24 +02:00
Olivier Dony e11eddf753 [MERGE] Forward-port of saas-5 up to 20cc18d 2014-08-13 20:46:47 +02:00
Denis Ledoux fe83c11301 [MERGE] forward port of branch saas-4 up to b49755b
The forward port of the fix 3609ba10f2 will be done separately, as the mrp scheduler has been completely refactored from saas-5.

Conflicts:
	addons/l10n_be_coda/wizard/account_coda_import.py
	addons/point_of_sale/static/src/xml/pos.xml
	addons/procurement/schedulers.py
2014-08-13 10:45:36 +02:00
Denis Ledoux b49755b545 [MERGE] forward port of branch saas-3 up to 591326c 2014-08-13 10:29:14 +02:00
Denis Ledoux 591326c54e [FIX] pos: the widget.pos.cashier is not always defined 2014-08-13 10:20:03 +02:00
Grover Menacho 1cb4495422 [FIX] point_of_sale: DOM Cache Error 2014-08-11 11:58:15 -04:00
Frederic van der Essen c40c9734f1 [FIX] point_of_sale: support for variants in the pos, one simply needed to use the display_name which contains the product variant info.
Conflicts:
	addons/point_of_sale/static/src/js/models.js
2014-08-11 17:17:12 +02:00
Frederic van der Essen 37a2f10127 [IMP] point_of_sale: make the confirm action color less frightening & longer delay 2014-08-11 17:17:12 +02:00
Frederic van der Essen 4f55c9d68d [FIX] point_of_sale: it was too easy to accidentally hit the close button on ipads, made it double click only 2014-08-11 17:17:12 +02:00
Frederic van der Essen 8d32f80fe3 [FIX] point_of_sale: order sequence number should take into account offline generated orders 2014-08-11 17:17:12 +02:00
Frederic van der Essen 7e18563bdb [FIX] point_of_sale: partners should be searchable by phone or mobile number 2014-08-11 17:17:12 +02:00
Frederic van der Essen 4ae6babb29 [FIX] point_of_sale: order buttons were too big to be used on tablets 2014-08-11 17:17:12 +02:00
Denis Ledoux ae65be2b2a [MERGE] forward port of branch saas-5 up to 0739bc4 2014-08-11 15:58:02 +02:00
Denis Ledoux 7c647ec876 [MERGE] forward port of branch saas-4 up to 0a1e4a0 2014-08-08 17:27:29 +02:00
Denis Ledoux 0a1e4a05b2 [MERGE] forward port of branch saas-3 up to 81a902a 2014-08-08 17:06:39 +02:00
Denis Ledoux 81a902a07d [MERGE] forward port of branch 7.0 up to 5f696ba 2014-08-08 16:18:35 +02:00
Denis Ledoux 5f696ba86c [FIX] pos: display cashier name on receipt, not the user 2014-08-08 16:05:32 +02:00
Frederic van der Essen 7f82caa1a4 [FIX] point_of_sale: show_popup('name','comment') should display the comment in the popup 2014-08-08 13:48:33 +02:00
Frederic van der Essen dbc2d309b4 [FIX] point_of_sale: partner list rendering was not refreshing correctly. + limited display to 1000 partners for performance reasons 2014-08-05 14:10:59 +02:00
Frederic van der Essen bfd66f351b [FIX] point_of_sale: removed useless console.log() 2014-08-05 14:09:21 +02:00
Frederic van der Essen a27d1a7134 [IMP] point_of_sale: allow an order to remember what screen it was on, instead
of switching back to default screen.

This is used by the soon to be merged restaurant addon to create new orders
and display them at a particular screen.  However, this behaviour is more
confusing in the other cases, so I'll think of a better way to solve this.
2014-08-05 14:09:07 +02:00
Frederic van der Essen 28de2183ea [IMP] point_of_sale: report errors when loading the point of sale with a traceback and a nice popup 2014-08-05 14:08:38 +02:00
Frederic van der Essen eacd5329e3 [IMP] point_of_sale: made the server data loading more modular for easier development of point_of_sale extensions 2014-08-05 14:08:24 +02:00
Frederic van der Essen 59396b45f5 [IMP] point_of_sale: forgot changes in this file in the previous commit that introduced unit tests 2014-08-05 14:07:58 +02:00
Frederic van der Essen a70b286144 [IMP] point_of_sale: add a basic UI unit test based on the new 'Tour' module 2014-08-05 14:07:41 +02:00
Frederic van der Essen ad0f710fe7 [IMP] point_of_sale: add a debug option to delete all unsent orders 2014-08-05 14:07:23 +02:00
Frederic van der Essen 584a78a82b [IMP] point_of_sale: add debug popup that displays unsent order data, for when localStorage is hard to inspect
Conflicts:
	addons/point_of_sale/static/src/js/widgets.js
2014-08-05 14:07:14 +02:00
Frederic van der Essen 85d697670c [IMP] point_of_sale: show traceback popup when there is a server error when posting orders (which should NEVER happen !) 2014-08-05 14:04:50 +02:00
Frederic van der Essen 4f0d454217 [FIX] point_of_sale: order invoicing was broken 2014-08-05 14:04:17 +02:00
Frederic van der Essen ac47f95bad [IMP] point_of_sale: improved rendering speed of the partner list 2014-08-05 14:03:59 +02:00
Frederic van der Essen 2c3fa1c48b [IMP] point_of_sale: add an error sound to the error popups 2014-08-05 14:03:21 +02:00
rlu-odoo 8b67a7202d [REF] OpenERP --> Odoo in various UI texts
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
2014-07-18 13:45:41 +02:00
Frederic van der Essen 9007aeb5a6 [FIX] point_of_sale: typo in the template field blocked the point of sale launch 2014-07-02 15:04:18 +02:00
Frederic van der Essen cab5fdf4f3 [FIX] point_of_sale: finally made the webclient instanciate the pos 2014-07-01 16:47:37 +02:00
Frederic van der Essen 371ba83206 [FIX] point_of_sale: do not use local jquery replace inside widget 2014-07-01 15:01:28 +02:00
Frederic van der Essen c4049bc356 [WIP] removing incomplete fidelity points feature for the v8.0 release 2014-07-01 13:02:02 +02:00
Dimitri del Marmol b021330f0e [MERGE] Bzr branch lp:~openerp-usertesting/openobject-addons/trunk-restaurant-wip-fva 2014-06-13 16:19:05 +02:00
Christophe Matthieu 36cdac48b7 [IMP] product: move product packaging field from product.product to product.template 2014-06-03 11:53:41 +02:00
Christophe Matthieu 6e6b5ea15b [FIX] point_of_sale: public category became pos category 2014-05-27 10:36:08 +02:00
Christophe Matthieu 43977deb71 [IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison. 2014-05-27 09:42:52 +02:00
Sylvain LE GAL 5d8927e2b1 [FIX] Issues #167. Remove obsolete shop reference 2014-05-22 22:55:50 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Denis Ledoux cab190b136 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9460 revid:dle@openerp.com-20140519103942-do7uem4in0jfqzo2 2014-05-19 12:46:33 +02:00
Denis Ledoux 87a8e5dc9c [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10054 revid:dle@openerp.com-20140519103020-bcqz4rssbqsvn9m7 2014-05-19 12:39:42 +02:00
Martin Trigaux 0fb14cbe0a [FIX] point_of_sale: add product variant in the displayed name (opw 607456) 2014-05-16 14:06:17 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Frédéric van der Essen 10046d854c [IMP] point_of_sale: use the product unit's precision for rounding the weight
bzr revid: fva@openerp.com-20140428153326-klgddc93ud9t0uqr
2014-04-28 17:33:26 +02:00
Frédéric van der Essen 3f0a8e8931 [IMP] point_of_sale, hw_scale: various small fixes and improvements for the scale module
bzr revid: fva@openerp.com-20140425122220-q7rw1dve8bgs25as
2014-04-25 14:22:20 +02:00
Frédéric van der Essen f3da22c067 [IMP] point_of_sale, hw_scale: first commit for the hw_scale module, which handles scale connections for the POS
bzr revid: fva@openerp.com-20140424171259-hi9ma6w0fkdfrqnv
2014-04-24 19:12:59 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Anael Closson e3ecf7f4d4 [FIX] en_US typos - opw 606919
bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
2014-04-22 10:58:37 +02:00
Cedric Snauwaert d86cc2063e [FIX]tooltip: remove old and not necessary tooltip line from pos start widget
bzr revid: csn@openerp.com-20140417122946-n8pq7ln66yg0n49m
2014-04-17 14:29:46 +02:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
Quentin (OpenERP) 9989113946 [MERGE] merge branch that fixes point of sale accordingly to changes made in stock
bzr revid: qdp-launchpad@openerp.com-20140328145710-ibzo59dv1p06jbg3
2014-03-28 15:57:10 +01:00
Frédéric van der Essen 4745099706 [FIX] hw_escops, point_of_sale: backporting fixes from the pos-restaurant branch
bzr revid: fva@openerp.com-20140328134401-ao85rr8b29nqg626
2014-03-28 14:44:01 +01:00
Josse Colpaert d4eda78813 [IMP] Put company_id on pos config + remove pos config name
bzr revid: jco@openerp.com-20140324120747-v3mt7pwgqylekshg
2014-03-24 13:07:47 +01:00
Frédéric van der Essen a4afb910e9 [IMP] hw_escpos / point_of_sale: print receipt with an xml template
bzr revid: fva@openerp.com-20140320164530-odpeuf1igh7wkrms
2014-03-20 17:45:30 +01:00
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Frédéric van der Essen 3d4f063e51 [FIX] point_of_sale: accept ean13 barcodes with a stripped leading zero
bzr revid: fva@openerp.com-20140224160118-44bnm5kxs53n6siy
2014-02-24 17:01:18 +01:00
Frédéric van der Essen 95f2c5537d [IMP] point_of_sale: make the order flush timeout dependant on the number of orders to be flushed
bzr revid: fva@openerp.com-20140224144143-4fhlswjk2y4skd6j
2014-02-24 15:41:43 +01:00
ddm@openerp.com 3ea931c486 [IMP] save all orders at once (client)
bzr revid: ddm@openerp.com-20140214144930-5zpn3miys1hwrdoa
2014-02-14 15:49:30 +01:00
Frédéric van der Essen bcc6a6aeda [IMP] point_of_sale: allow negative product quantities, and negatives totals
bzr revid: fva@openerp.com-20140211164541-nt2xu5rhdv0tm7pk
2014-02-11 17:45:41 +01:00
Frédéric van der Essen 356010c357 [FIX] point_of_sale: totals were not rendrered on firefox due to use of nonstandard innerText dom property
bzr revid: fva@openerp.com-20140207161647-rgeymwt4ksei2cod
2014-02-07 17:16:47 +01:00
Frédéric van der Essen 008e3c1ab0 [FIX] point_of_sale: receipt header & footer could overflow outside of ticket
bzr revid: fva@openerp.com-20140206143648-z1bsknelzznf0jqj
2014-02-06 15:36:48 +01:00
Frédéric van der Essen ec4dd7389b [IMP] point_of_sale: try harder to connect to proxy when the ip is already known
bzr revid: fva@openerp.com-20140206140645-uo82x3tf60wlhytj
2014-02-06 15:06:45 +01:00
Christophe Simonis 1e4d99eede [MERGE] backport trunk revisions
* 9094 fva@openerp.com-20140203144847-21cv7pt7lnlxdsve
 * 9095 fva@openerp.com-20140203153233-zj12w2o1uxyz5hoq

bzr revid: chs@openerp.com-20140206132039-y1whtc8qqqs8ey92
2014-02-06 14:20:39 +01:00