Commit Graph

2654 Commits

Author SHA1 Message Date
Christophe Simonis c339fcc603 [MERGE] forward port of branch 7.0 up to d5c7234 2015-01-22 18:42:26 +01:00
Denis Ledoux d5c7234474 [FIX] point_of_sale: share is not a dependence of point_of_sale
This reverts commit d970cc40f8.

point_of_sale does not depends on share. This domain can therefore not be applied.
It works for new databases as the module share is auto installed.
But as soon as the module share is uninstalled, this domain will lead to a crash
There is no way to "solve" this issue, other than by a view customization
if the issue is critical for the customer.

I did not pay enough attention when I reviewed the PR.
2015-01-22 15:32:29 +01:00
Denis Ledoux c5775e56d3 [MERGE] forward port of branch 7.0 up to 25f5329 2015-01-22 14:43:06 +01:00
Goffin Simon d970cc40f8 [FIX] point_of_sale: exclude share users from sale details wizard
opw-621749
2015-01-21 15:39:31 +01:00
Denis Ledoux a692c6e934 [MERGE] forward port of branch 7.0 up to f406847 2015-01-15 11:49:28 +01:00
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
Olivier Dony d0cd92bb9f [I18N] Sync updated 7.0 translations from Launchpad 2015-01-07 17:57:28 +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
Denis Ledoux 6c13c8d966 [MERGE] forward port of branch 7.0 up to 529e920 2014-11-19 14:06:48 +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
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
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
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
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
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
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
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
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
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 ada9724655 [MERGE] forward port of branch 7.0 up to 3509e15 2014-08-28 16:12:55 +02:00
Martin Trigaux 73546f70ca [FIX] point_of_sale: generate bank statement with commerical partner
When a pos session is closed & confirmed, the account.move were generated with the commercial partner except for the bank statement which prevented automatic reconciliation.
This patch uses the commercial partner also for bank statement.
Fixes #1558, #1764
2014-08-22 15:29:23 +02:00
Martin Trigaux 7bcefaf232 Forward port of branch 7.0 up to 0ab88f5 2014-08-21 17:57:57 +02:00
Denis Ledoux 99ce17cfca [FIX] point_of_sale: report, product_id of line is product_product
product_id column of pos_order_line is a product_product
the left join of l.product_id was done on product_template, instead of product_product

It worked as long as the ids product_product were the same as product_template. Meaning that, if you used variants, this report view was screwed.
2014-08-21 11:20:09 +02:00
Christophe Simonis 8f13e8320e [MERGE] forward port of branch 7.0 up to d0a0b7d 2014-08-20 17:45:05 +02:00
Denis Ledoux 97d097a2af [FIX] point_of_sale: field date of report.pos.order should be a datetime
The date_order field of the pos.order is a datetime, not a date
As, in report.pos.order, the date field is related to date_order of the pos.order

We usually do not commit fixes altering the model fields structure in 7.0, but this one is retro-compatible, as the database structure won't change
2014-08-14 18:01:37 +02:00
Olivier Dony 85d2b45aaa [I18N] Update 7.0 translations with latest changes on Launchpad
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
2014-08-14 03:38:58 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
Denis Ledoux 591326c54e [FIX] pos: the widget.pos.cashier is not always defined 2014-08-13 10:20:03 +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
Denis Ledoux 978fd47261 [MERGE] forward port of branch 7.0 up to 095be21 2014-08-06 13:06:20 +02:00
Paulius Sladkevičius 3bb6136055 [FIX] point_of_sale: clear tag in pos order sheet layout
Without clear tag total amounts breaks sheet layout.
2014-08-06 11:58:38 +02:00
Christophe Simonis 4601d85944 [MERGE] forward port of branch 7.0 up to 6fdb783 2014-06-10 11:49:14 +02:00
Martin Trigaux 25292ef0a5 [FIX] point_of_sale: correct call to default value
The default value should be called with a lambda otherwise the payment_date is set to the date the server was started (opw 606715)
2014-06-04 15:19:57 +02:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Denis Ledoux 44dca825e0 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10056 revid:dle@openerp.com-20140519133339-uxb01aik1z8wu1sy 2014-05-19 15:36:48 +02:00
Denis Ledoux a8a085eabb [FIX] point_of_sale: opw-607551, mark the pos order as paid before trying to create the picking, so in case the picking could not be created for one reason or another, the pos order workflow process continue.
This commit partially reverts rev. 6036 revid:fp@tinyerp.com-20111219220053-tn5gc1lmc13fjpyf, the second part of this commit already has been revert in a previous revision.
2014-05-19 15:33:39 +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
Denis Ledoux 7f0a167cf7 [REVERT] revid:jke@openerp.com-20140507120144-m177kqxa3fbfl37r: create_picking checks if the order is in state draft before doing anything. Writing the state 'paid' just before calling this method is then not a good idea 2014-05-18 13:25:23 +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