Commit Graph

2991 Commits

Author SHA1 Message Date
Denis Ledoux e261c44a10 [FIX] point_of_sale: ACLs for pos users
POS users should not be able to create nor modify payment methods (account.journal)
POS users should not be able to create nor modify point of sales (pos.config)

At first opened session, if no payment methods was set, this is possible that the pos user should temporary have accesses granted to mark a payment method as pos payment method. This is done by the openerp.SUPERUSER_ID added by this rev.

opw-625489
2015-01-13 18:15:30 +01:00
Alexis de Lattre a9907aac8a [FIX] point_of_sale: do not group move lines with different analytic account
When generating account.move.line from pos.order, orders with different analytic
account should not be groupped in generated lines (possible if inherit
_prepare_analytic_account).
Add the analytic_account_id in the key to avoid this grouping.
Fixes #4602
2015-01-09 12:14:45 +01:00
Olivier Dony d0cd92bb9f [I18N] Sync updated 7.0 translations from Launchpad 2015-01-07 17:57:28 +01:00
Denis Ledoux 6916acdb1d [FIX] point_of_sale: controller pos/web redirects to session opening if no opened session 2015-01-06 17:49:11 +01:00
Aaron Bohy ba37ae3cf3 [DEL] Cleaning: key 'images' removed from all __openerp__.py 2015-01-06 14:20:38 +01:00
Frédéric van der Essen aab3d9f4b4 [FIX] point_of_sale: use the same rounding sequence as the backend
Conflicts:
	addons/point_of_sale/static/src/js/models.js
2014-12-26 17:52:06 +01:00
Frédéric van der Essen 4647f896a4 [FIX] point_of_sale: prevent negative bank payments 2014-12-26 17:50:07 +01:00
Frédéric Van der Essen 681c33aa11 Merge pull request #4027 from akretion/8.0-fix-4026-discount-barcode
[FIX] Fixes #4026 on discount barcode in POS
2014-12-24 16:33:58 +01:00
Denis Ledoux a175ed6b2f [MERGE] forward port of branch saas-3 up to 30674c3 2014-12-23 14:03:38 +01:00
Denis Ledoux 30674c3ed6 [MERGE] forward port of branch 7.0 up to e151e8f 2014-12-23 13:50:25 +01:00
Denis Ledoux e151e8f871 [FIX] point_of_sale: pos details report company taxes and payments
If the sales details only fetches the pos sales details of his own company, it should be the case for the pos payments and taxes as well.
2014-12-23 13:17:54 +01:00
Frédéric van der Essen c8000df710 [IMP] point_of_sale: add support for taxes included in base amount. 2014-12-18 14:59:18 +01:00
Frédéric van der Essen 34b539494e [IMP] point_of_sale: access taxes via id for performance reasons
[IMP] point_of_sale: do not recompute taxes_by_id every time
2014-12-18 14:58:57 +01:00
Josse Colpaert 45afd64de1 [FIX] Warehouse should be False on PoS and dropship picking types 2014-12-17 17:10:40 +01:00
Frédéric van der Essen 71ebd81229 [FIX] point_of_sale: (do not forward-port!) allow horizontal scrolling of the order list 2014-12-17 15:19:31 +01:00
Martin Trigaux 7a13e9d744 [FIX] point_of_sale: account selection for payments
Registered payment uses the partner receivable account. As this field is
a property field, it will select different accounts based on the user that
registers the payment (in multicompany).
Should use the company of selected journal instead of the one of the user.
2014-12-16 10:53:30 +01:00
Frédéric van der Essen bb913d0a8f [FIX] point_of_sale: the search in product or partners could crash if there were a number followed by a colon 2014-12-11 15:42:51 +01:00
Fabrice Henrion a9b8aa3a1c [FIX] point_of_sale: typo
closes #4077
2014-12-08 09:32:44 +01:00
Alexis de Lattre 80d4be0af9 [FIX] Fixes #4026 on discount barcode in POS 2014-12-03 22:14:18 +01:00
Frédéric van der Essen d700c78c56 [FIX] point_of_sale: correctly handle various xmlrpc errors that appear in offline mode 2014-12-01 15:46:29 +01:00
Mario Arias Badila d349723271 [point_of_sale] Domain functions to literals
Replaced domain functions with literals where there are only constants
2014-11-26 08:32:33 -06:00
Mario Arias Badila 9db0face13 POS is loading all partners, not only customers
Hi,

Adding domain to res.partner model, so POS only loads "customers"
2014-11-21 09:20:45 -06:00
Olivier Dony a6d24db305 [I18N] Update translations from Launchpad 8.0 branches 2014-11-19 17:49:12 +01:00
Denis Ledoux 6c13c8d966 [MERGE] forward port of branch 7.0 up to 529e920 2014-11-19 14:06:48 +01:00
Martin Trigaux 0afa4c7f52 [IMP] point_of_sale: make the sequence field configurable 2014-11-18 18:52:46 +01:00
Frederic van der Essen bb7a9dea8b [FIX] point_of_sale: fix point of sale sequence declaration, github issue #3218 2014-11-18 18:04:30 +01:00
Frederic van der Essen 60faccdcc3 [FIX] point_of_sale: remove a confusing partial implementation of UoS 2014-11-18 15:38:18 +01:00
Denis Ledoux d9e48bae42 [MERGE] forward port of branch saas-3 up to 7ab4137 2014-11-14 16:58:24 +01:00
Denis Ledoux 7ab413724a [MERGE] forward port of branch 7.0 up to da15c9d 2014-11-14 15:59:33 +01:00
Denis Ledoux 3613b74df3 [FIX] point_of_sale: missing multi-company rule 2014-11-14 14:15:21 +01:00
Frederic van der Essen d30103c29e [FIX] point_of_sale: rounding error in discount computing + removing duplicated code 2014-11-13 16:07:52 +01:00
Frederic van der Essen 5d2ea60157 [FIX] point_of_sale: I see a chrome receipt and I want it painted black ;) 2014-11-13 12:03:32 +01:00
Frédéric Van der Essen 16900c8ac4 Merge pull request #3220 from odoo-dev/7.0-opw-615322-rgo
[FIX] point_of_sale: fixed rounding issue for pos order when discount ad...
2014-11-12 17:58:07 +01:00
Frederic van der Essen 95e79c9f6f [FIX] point_of_sale: use 'Product Price' decimal precision for product prices 2014-11-11 19:32:52 +01:00
Frederic van der Essen d1fb79ad14 [FIX] point_of_sale: some pos order fields were missing the proper decimal precision 2014-11-11 18:00:24 +01:00
Frederic van der Essen fade5ab2c2 [FIX] point_of_sale: decimal precision was hardcoded to 2 in various places 2014-11-11 17:41:20 +01:00
Frederic van der Essen a2313b6311 [FIX] point_of_sale: correctly handle the rounding when the unit's rounding is set to zero 2014-11-11 16:18:27 +01:00
Frederic van der Essen ccba67ed53 [FIX] point_of_sale: when loading models with a specified id, use read instead of search_read, to prevent inactive records from being skipped 2014-11-10 11:48:18 +01:00
Frederic van der Essen 1c1e069f7e [IMP] point_of_sale: add a zero default margin when printing a receipt from the browser. 2014-11-06 16:03:37 +01:00
Frederic van der Essen 0ffa605e37 [IMP] point_of_sale: add product description and product sale description to the search engine 2014-11-05 21:20:17 +01:00
Frederic van der Essen 8b69395561 [FIX] point_of_sale: the order should not be displayed in the print screen, and the order should not reprint itself automatically after the first time we go on the print screen 2014-11-05 20:02:49 +01:00
Frederic van der Essen b55cd571f5 [IMP] point_of_sale: show traceback when there is a posbox error 2014-11-04 23:11:07 +01:00
Frédéric Van der Essen c3f355b860 Merge pull request #3332 from akretion/8.0-prepare-analytic-pos
point_of_sale: Add _prepare_analytic_account method
2014-11-04 11:39:03 +01:00
Simon Lejeune 8138db8e0f [FIX] point_of_sale: details of sales report: include discount when computing taxes
Also, fixed a typo in the report's view.
2014-11-03 12:25:18 +01:00
Alexis de Lattre 6dcb8232eb point_of_sale: Add _prepare_analytic_account method to easily set analytic account from custom module 2014-10-27 23:52:43 +01:00
Christophe Simonis 262eb662de [MERGE] forward port of branch 8.0 up to d80376a 2014-10-21 14:33:36 +02:00
Christophe Simonis 22c390285f [MERGE] forward port of branch 7.0 up to 78a29b3 2014-10-21 13:06:27 +02:00
Denis Ledoux 78a29b3738 [FIX] point_of_sale: no need to specify numeric digits
In the report pos order, average_price was set as a numeric(16,2), therefore, if the amount was too big, it led to a psql crash:
A field with precision 16, scale 2 must round to an absolute value less than 10^14.
2014-10-21 10:13:44 +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
Martin Trigaux a6343387d7 [IMP] point_of_sale: add constraint on company
Using a payment method belonging to another company will raise errors when closing the session.
To avoid being stuck at session closing, forbid to create a POS using a journal of another company.
2014-10-17 17:21:30 +02:00
Ravi Gohil 16a23041b2 [FIX] point_of_sale: fixed rounding issue for pos order when discount added(maintenance: 615322). 2014-10-17 19:00:49 +05:30
Frédéric Van der Essen e10b07e955 Merge pull request #3001 from Bubbles-IT/8.0-fix-pos-tax-label
[FIX] point_of_sale: printing of tax name on hardware was missing name
2014-10-14 15:52:46 +02:00
Christophe Simonis db759948ff [MERGE] forward port of branch 7.0 up to 75d3ea6 2014-10-14 14:36:45 +02:00
David Monjoie 75d3ea6208 [FIX] point_of_sale: fixed display of untaxed amount in sales lines report 2014-10-14 14:11:53 +02:00
David Monjoie eb6bf4dd86 [FIX] point_of_sale: fixed display of untaxed amount in sales lines report 2014-10-14 14:10:06 +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
Olivier Dony 7439421ad2 [I18N] Update translations from Launchpad 8.0 branches 2014-10-08 17:52:25 +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
Josse Colpaert fc65efbb9b [FIX] Fix inheritance in point_of_sale views + ean visible on creation + landed costs views
[IMP] Set custom EAN not visible when multiple variants

[IMP] Change landed costs views + make ean visible upon creation
2014-10-06 09:14:20 +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
Olivier Dony b74d830eb2 [I18N] Update translation templates with latest term changes 2014-09-23 19:13:50 +02:00
Olivier Dony 1c5b5e4290 [I18N] Update translations from Launchpad 8.0 branches
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
2014-09-23 13:42:05 +02:00
Olivier Dony 53aa92d3c9 [I18N] Update translations from Launchpad branches 2014-09-18 11:47:16 +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
Olivier Dony e5bff82aff [MERGE] Forward-port saas-5 up to f9bcd67 2014-09-17 16:39:06 +02:00
Olivier Dony c926b54a49 [MERGE] Forward-port saas-3 up to 09ab2d4 2014-09-17 15:16:30 +02:00
Denis Ledoux 60a82133cc [MERGE] forward port of branch 7.0 up to f5f7609 2014-09-17 13:39:13 +02:00
Denis Ledoux ce84d6107f [FIX] point_of_sale: set journal as pos payment method on setting journal in the payment methods of a pos config when none is set. 2014-09-16 17:57:03 +02:00
Christophe Simonis 56f2b7ae0f [MERGE] forward port of branch saas-3 up to fdc6271 2014-09-12 18:53:48 +02:00
Martin Trigaux e948253b3a [IMP] point_of_sale: field company_id on pos.config view
Move invisible field on bottom to avoid blank space in view if display journal, group or sequence field
2014-09-11 09:32:59 +02:00
Olivier Dony 57829ce3ec [FIX] product,purchase,point_of_sale: force empty values for dropped fields
At 96f038a product-related fields were removed due
to an important product.template/product.product
refactoring. As the field values were simply
dropped, they may not be nullified when upgrading an
existing database. Forcing them to False will take
care of it.
2014-09-10 14:58:45 +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
Olivier Dony fac96241df [I18N] Update 8.0 translations with latest changes from Launchpad 2014-09-08 19:04:25 +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
Olivier Dony d32d120a0a [MERGE] Forward-port of saas-5 up to 9ce08b7 2014-09-08 16:54:10 +02:00
Denis Ledoux fc5c53ca47 [FIX] point_of_sale: field type on bank statement line no longer exists 2014-09-05 15:59:43 +02:00
Simon Lejeune d9b739e8f6 [REF] Renamed files whose names contained whitespaces 2014-09-02 14:13:00 +02:00
Denis Ledoux 18d365ce05 "[REVERT][FIX] point_of_sale: field date of report.pos.order should be a datetime"
This reverts commit 97d097a2af.

As explained in the commit comments (on Github), this patch leads to an infinite loop in 7.0, the filter of the pos orders report using the '=' operator in its domain, which is not available for datetime fields, but is for date fields.

This should not be forward ported to newer release (saas-3)
2014-08-29 20:40:31 +02:00
Christophe Simonis 8046b7367d [MERGE] forward port of branch saas-5 up to 7e117b1 2014-08-28 16:51:11 +02:00
Christophe Simonis 7e117b18a0 [MERGE] forward port of branch saas-3 up to ada9724 2014-08-28 16:21:27 +02:00
Christophe Simonis ada9724655 [MERGE] forward port of branch 7.0 up to 3509e15 2014-08-28 16:12:55 +02:00
Fabien Pinckaers 8aca457e34 [IMP] Updated website urls on modules and info page 2014-08-26 21:40:18 +02:00
Martin Trigaux 69cd13a084 [FIX] point_of_sale: incorrect sequences for orders
A new ir.sequence is generated at pos.config creation for the orders. However it was not used as the type was not set. The fallback was done on the general sequence.
In addition to the sequences being shared, it was not possible to create a pos.order in multicompany (no sequence found for user company, name was null).
Same issue for the pos.order.line.
This patch generates correctly pos.order and pos.order.line sequences at pos.config creation.

Instead of using the pos.config sequence to generate session number (not what this field was intended to), use the existing sequence for pos.session.
Remove company_id value on default pos.session sequence to make sure it's shared between companies and correctly set the prefix.
2014-08-26 16:33:58 +02:00
Martin Trigaux f6dceb2ef6 [IMP] point_of_sale: prevent multicompany configuration issues
If the pos.config is not properly configured for multicompany (e.g. using location belonging to another company), launching a session with this config may fail (access rights).
This prevents to configure an incorrect point of sale in the first place.
2014-08-26 16:15:22 +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