Commit Graph

3066 Commits

Author SHA1 Message Date
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
qdc f57787e07e [IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files) 2014-08-26 11:56:49 +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
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
Christophe Simonis 5a5f811d23 [REVERT] commit 5e5c73e
Branch 8.0 is a **stable** branch. This mean no database schema
changes.
2014-08-22 13:59:22 +02:00
qdc 5e5c73e7ba [IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files) 2014-08-22 09:49:09 +02:00
Martin Trigaux 80d8532370 Forward port of branch saas-5 up to rev 4895281e 2014-08-22 09:12:14 +02:00
Martin Trigaux 4895281e58 Forward port of branch saas-4 up to rev 15a3a2a 2014-08-21 18:17:35 +02:00
Martin Trigaux 15a3a2a63a Forward port of branch saas-3 up to 7bcefaf 2014-08-21 18:14:22 +02:00
Martin Trigaux 7bcefaf232 Forward port of branch 7.0 up to 0ab88f5 2014-08-21 17:57:57 +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
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
Fabien Pinckaers d14297ac53 [FIX] better responsibilities on objects POS 2014-08-21 10:38:21 +02:00
Frederic van der Essen 0829afadd2 [FIX] point_of_sale: continuation of the session closing fix 2014-08-20 23:08:20 +02:00
Frederic van der Essen 62a8e5b457 [FIX] point_of_sale: partial fix for unclosable sessions 2014-08-20 22:24:21 +02:00
Christophe Simonis 5dff035878 [MERGE] forward port of branch saas-5 up to 39bee35 2014-08-20 20:33:17 +02:00
Christophe Simonis 1d85c667f7 [FIX] point_of_sale: correct SyntaxError 2014-08-20 20:24:09 +02:00
Fabien Pinckaers 76a84ce2bf [FIX] partner of order 2014-08-20 19:38:41 +02:00
Christophe Simonis c3131317d7 [MERGE] forward port of branch saas-4 up to ddef2dd 2014-08-20 17:57:22 +02:00
Christophe Simonis ddef2dd10a [MERGE] forward port of branch saas-3 up to 8f13e83 2014-08-20 17:51:20 +02:00
Christophe Simonis 8f13e8320e [MERGE] forward port of branch 7.0 up to d0a0b7d 2014-08-20 17:45:05 +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 ffba505817 [FIX] point_of_sale: updated the tooltip for the to weight option to make it clearer that it is to be used with the hardware scale integration 2014-08-19 18:02:17 +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 221b746c7f [FIX] point_of_sale: invoicing in the pos printed the wrong order due to a mismatch between order ids and invoice ids 2014-08-18 14:03:14 +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
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 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +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
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
Fabien Pinckaers ef944dcd55 [IMP] Maifest for Github README.md on main apps 2014-08-12 11:33:15 +02:00
Frédéric Van der Essen 519a704cba Merge pull request #1731 from hmen89/8.0-pos-dom-cache-fix
[FIX] point_of_sale: DOM Cache Error
2014-08-11 18:12:01 +02:00
Frederic van der Essen d91263d03e [FIX] point_of_sale: #1558 The partner was not correctly identified on the bank statement line, creating open balances on the partner account 2014-08-11 18:02:28 +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
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
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 db9a06b842 [IMP] point_of_sale: tests work better when they are loaded and run by the unit test system! 2014-08-05 14:08:08 +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 8e212eb6fb [FIX] point_of_sale: it was impossible to delete a pos session 2014-08-05 14:04:38 +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 75a6bcaee4 [IMP] point_of_sale: a little explaination of how the barcode pattern system works 2014-08-05 14:03:38 +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
Denis Ledoux 1bb219907f [MERGE] forward port of branch saas-5 up to 655a5b9 2014-08-04 16:56:10 +02:00
Christophe Matthieu 7efe3bb2d8 [FIX] point_of_sale: On product form : push on button 'Set a Custom Ean' on tab information raise an exception => Use a record action and clean python files 2014-07-31 17:21:26 +02:00
Géry Debongnie 366a30db95 [FIX] correct various date issues in reporting
* remove old 'day', 'month', 'field' and replace them by the actual
date/datetime field
* remove weird cast to char when creating the view to prevent crash
when grouping on them
* remove duplicates (such as 'creation_date' and 'create_date')
* fix typing errors (field type date defined as a datetime in the
postgres view)
* fix search view definition
2014-07-30 15:11:22 +02:00
qdp-odoo 954ab3eefb Merge pull request #1268 from odoo-dev/8.0-pos-fixes-qdp
[FIX] point_of_sale: fixed errors that avoid closing a pos session + [IM...
2014-07-22 08:58:02 +02:00
qdp-odoo 5ae60d8a2d [FIX] point_of_sale: fixed errors that avoid closing a pos session + [IMP] account: added back the account_id field on statement.line obj to ease the reconciliation process when importing statements (or creating them through pos.orders). Fix #932 2014-07-18 15:43:20 +02:00
Richard Mathot 6f1b820d33 [REF] OpenERP --> Odoo in various UI texts (2)
Some things missed by commit 8b67a7202d
2014-07-18 14:59:38 +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
Raphael Collet 33eb3dffb2 [REM] models: remove the magic methods signal_XXX() 2014-07-07 11:50:30 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Fabien Meghazi 5d0ee85ac5 [FIX] The documentation stored in /dev/null states t-css|t-js 2014-07-02 15:45:28 +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 4e513fc81e [IMP] point_of_sale: load assets with templating sytem so that scripts are not minified in debug mode 2014-07-02 15:01:55 +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 1703af0f4a [WIP] point_of_sale: trying to make the web client instanciation work 2014-07-01 16:14:58 +02:00
Frederic van der Essen 25e4a10878 [FIX] point_of_sale: the webclient needs a html stub to instanciate itself 2014-07-01 15:15:19 +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 7842b62880 [MERGE] from master 2014-07-01 13:32: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
Simon Lejeune 10ce35040b [FIX] point of sale and barcode interface 'mini webclien' initialisation 2014-06-27 17:18:26 +02:00
Martin Trigaux 6db8bf3def Merge pull request #326 from hmen89/master
[ADD] point_of_sale: make the creation of orders and payment inheritable in create_from_ui method
2014-06-27 11:55:24 +02:00
Christophe Simonis 8cabd5eac9 merge upstream 2014-06-25 19:08:49 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Grover Menacho 6284fbbbf0 [ADD] FIXED create_from_ui inheritable to add more fields on order and payment 2014-06-23 17:06:55 -04:00
Christophe Matthieu 96f038a6ab [IMP] product: all left menu item became product.template's action 2014-06-16 17:16:50 +02:00
Dimitri del Marmol 49d7b107d1 Pull request feedback by chs 2014-06-13 17:27:59 +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
ged-odoo 74168c4e9d Merge pull request #272 from odoo-dev/master-inline-searchview-ged
[MERGP] Inline Searchview

This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place.  It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)

Because of this, other large changes have been made:

the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)

It is likely that some stupid bugs have been introduced.  Please don't hurt me.
2014-06-12 16:27:11 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Géry Debongnie af58bc5914 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-11 10:10:58 +02:00
Christophe Simonis ccdae747a0 [MERGE] forward port of branch saas-5 up to a7c2125 2014-06-10 13:19:55 +02:00
Christophe Simonis a7c2125735 [MERGE] forward port of branch saas-4 up to 6b8e972 2014-06-10 13:15:46 +02:00
Christophe Simonis 6b8e9727e5 [MERGE] forward port of branch saas-3 up to 4601d85 2014-06-10 12:29:47 +02:00
Christophe Simonis 4601d85944 [MERGE] forward port of branch 7.0 up to 6fdb783 2014-06-10 11:49:14 +02:00
Géry Debongnie 8202561511 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-10 11:43:17 +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
Christophe Matthieu 36cdac48b7 [IMP] product: move product packaging field from product.product to product.template 2014-06-03 11:53:41 +02:00
qdp-odoo e3491ccb71 [IMP] account: bank statement reconciliation widget (part 2) 2014-05-30 18:47:50 +02:00
Géry Debongnie 514203743d Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/mrp/mrp_view.xml
2014-05-30 10:29:30 +02:00
Christophe Matthieu 138274e30d [FIX] point_of_sale: fix product view layout 2014-05-28 20:50:20 +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
Géry Debongnie 62900fe01b Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
Conflicts:
	addons/crm/crm_case_section_view.xml
2014-05-26 10:06:31 +02:00
Sylvain LE GAL 5d8927e2b1 [FIX] Issues #167. Remove obsolete shop reference 2014-05-22 22:55:50 +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
Géry Debongnie 555677f14d [IMP] replace all 'Group By...' by 'Group By'
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters.  This change was requested by the upper management
2014-05-22 11:44:35 +02:00
Fabien Meghazi 593cdf427f Merge remote-tracking branch 'odoo/master' into master-seperate-bundle-fme 2014-05-21 10:29:04 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis bb26dea60b [MERGE] forward port of branch saas-3 up to revid 38abc8a 2014-05-20 19:00:50 +02:00
Fabien Meghazi 863edbaaf2 Seperate assets_common from other bundles 2014-05-20 17:06:25 +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 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
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
Olivier Dony 74d2f592bf [IMP] Minor spellchecking/cleanup/nitpicking while reviewing new v8 WMS
bzr revid: odo@openerp.com-20140508143940-itpazj4eatznerw7
2014-05-08 16:39:40 +02:00
Quentin (OpenERP) 168b8e1d5e [REM] removed old conflicting files badly merged (?)
bzr revid: qdp-launchpad@openerp.com-20140508143825-owheu6q219d8qbww
2014-05-08 16:38:25 +02:00
Quentin (OpenERP) 70eb74a260 [MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
Christophe Simonis 1091b24a0c [MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
Kersten Jeremy ada19d175d [FIX] POS - Write the state to Paid before the create_picking. It's allow to stay in a valid state in workflow. And let the current stock picking out to 'Ready for delivery'
bzr revid: jke@openerp.com-20140507120144-m177kqxa3fbfl37r
2014-05-07 14:01:44 +02:00
Fabien Meghazi 8dc5f240a9 [REM] Removed addons.web#html_template usage
bzr revid: fme@openerp.com-20140506163334-x94pz9bau4a0r0lb
2014-05-06 18:33:34 +02:00
Josse Colpaert 830a4af3e5 [IMP] Picking type instead of warehouse in PoS
bzr revid: jco@openerp.com-20140502145852-th5tc9tsdwm9l9z8
2014-05-02 16:58:52 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +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
Fabien Meghazi 8474a2ed6f [MERGE] Web assets moved from manifests to ir.ui.view bundles
bzr revid: fme@openerp.com-20140430151509-mme5st89o1hj4zcs
2014-04-30 17:15:09 +02:00
Fabien Meghazi ef85e3de80 [FIX] point of sale loading
bzr revid: fme@openerp.com-20140430121632-llnwhirjl3ii6m93
2014-04-30 14:16:32 +02:00
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Simon Lejeune 80f68fe4bb [MERGE] trunk
bzr revid: sle@openerp.com-20140429124215-92f645c16v9j1dyi
2014-04-29 14:42:15 +02:00
Simon Lejeune 0d2a0e8109 [FIX] point of sale: payment report bad behaviour when printing multiple documents
bzr revid: sle@openerp.com-20140429122400-s2ey704e8qfifzzj
2014-04-29 14:24:00 +02:00
Simon Lejeune ba6e63d690 [IMP] point of sale: better check before printing a potential invoice from a pos order
bzr revid: sle@openerp.com-20140429121329-lxgwpbuccdy67r4v
2014-04-29 14:13:29 +02:00
Simon Lejeune 8db594758e [REM] point_of_sale: removed closed cashbox report that is nearly the session resume report
bzr revid: sle@openerp.com-20140429114045-kaj86qq00dovj75o
2014-04-29 13:40:45 +02:00
Simon Lejeune 58233749ef [FIX] point of sale session summary report: better display, divide the tables
bzr revid: sle@openerp.com-20140429100738-t5tvsucuu7ss42v8
2014-04-29 12:07:38 +02:00
Simon Lejeune 003b3fd41e [MERGE] trunk
bzr revid: sle@openerp.com-20140428162055-9t72vke2kdkhqcwr
2014-04-28 18:20:55 +02:00
Simon Lejeune 0d6ea88e57 [FIX] pos test reports: typo
bzr revid: sle@openerp.com-20140428162032-9s1s0wwxkboqeo2z
2014-04-28 18:20:32 +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 f210babfc6 [MERGE] from trunk
bzr revid: fva@openerp.com-20140425122510-y60j039e3khbwwd5
2014-04-25 14:25:10 +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
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +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
Simon Lejeune b667f6a292 [MERGE] trunk
bzr revid: sle@openerp.com-20140422124030-gowf9zyx1d36j01g
bzr revid: sle@openerp.com-20140424124655-95ex30m25soiu4wd
2014-04-24 14:46:55 +02:00
Quentin (OpenERP) 36b0c079c9 [REF] point_of_sale: removing commented line
bzr revid: qdp-launchpad@openerp.com-20140422121639-eho65ncckm2h279s
2014-04-22 14:16:39 +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
Launchpad Translations on behalf of openerp 89fd1bede4 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
2014-04-22 08:24:59 +00:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Simon Lejeune 9f6182b311 [MERGE] trunk
bzr revid: sle@openerp.com-20140417150308-xuhxfxb8d45j3yfq
2014-04-17 17:03:08 +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
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Gery Debongnie e0d45c418a [IMP] improves the put money in/take money out stat button in point of sale form views
bzr revid: ged@openerp.com-20140415115349-360ydoz85069bgyb
2014-04-15 13:53:49 +02:00
Simon Lejeune 28fa8ebb8c [IMP] point of sale: added a session summary report
bzr revid: sle@openerp.com-20140414144427-ry3yxybx385a4pop
2014-04-14 16:44:27 +02:00
Simon Lejeune 11a0b506d0 [FIX] bad condition on report_payment qweb view resulting in empty report
bzr revid: sle@openerp.com-20140414125522-v4obm4xreljizqje
2014-04-14 14:55:22 +02:00
Simon Lejeune 57fc6c4d55 [FIX] When converting a pos order line to an invoice line, a key 'note' was passed to the 'create' but there is not a 'note' field in the model invoice line.
bzr revid: sle@openerp.com-20140414123529-7k2a0fdsz7fg01xl
2014-04-14 14:35:29 +02:00
Simon Lejeune afd490c984 [REM] removed details_summary, sales_user, sales_user_today, payment_user reports, wizards and rml
[REM] dead code:  pos_box_entries.py/xml, pos_box_out.py/xml, pos_return_view.py/xml
[ADD] lines, invoice, cashbox of the day, payment, receipt, users product reports converted to QWeb. Added YML tests for the bank statement reports.
[FIX] closed cashbox of the day sql using old fields in its queries, yml test not correctly generating an invoice from a pos order

bzr revid: sle@openerp.com-20140414104954-xj10wi640tyr3ufe
2014-04-14 12:49:54 +02:00
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +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
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Christophe Simonis dfdbf8cdc4 [MERGE] forward port of branch saas-2 up to revid 9162 chs@openerp.com-20140401184913-5hi2h11lnmadbozr
bzr revid: chs@openerp.com-20140401190308-f3f2l9br69qb33ob
2014-04-01 21:03:08 +02:00
Christophe Simonis 822ef4a621 [MERGE] forward port of branch 7.0 up to revid 9943 launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: chs@openerp.com-20140401184913-5hi2h11lnmadbozr
2014-04-01 20:49:13 +02:00
Quentin (OpenERP) 7a3da62754 [FIX] point_of_sale: removed old reference to warehouse_id in rml file + removed unused pos_return wizard
bzr revid: qdp-launchpad@openerp.com-20140401124712-uz97vqfuyi8kn1un
2014-04-01 14:47:12 +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
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
Randhir Mayatra rma-openerp 457a62dee6 [IMP] add stat button for point of sale, email template
bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
2014-03-27 17:07:20 +05:30
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Quentin (OpenERP) a73211f83f [MERGE] merged trunk up to revision 9255
bzr revid: qdp-launchpad@openerp.com-20140326154304-2yxzrmkzimzyam3p
2014-03-26 16:43:04 +01:00
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
Ravi Gohil (OpenERP) c1ce615891 [FIX] point_of_sale: Replaced the call to undefined search_read(...) with search(...) and read(...) calls. (Maintenance Case: 605684)
bzr revid: rgo@tinyerp.com-20140326112922-x6ac9j157han28kb
2014-03-26 16:59:22 +05:30
Frédéric van der Essen 2378decc04 [MERGE] from trunk
bzr revid: fva@openerp.com-20140326103307-lchlskkdweospgps
2014-03-26 11:33:07 +01:00
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Josse Colpaert 4d2eb14146 [IMP] The main pos config should use a standard picking type
bzr revid: jco@openerp.com-20140324160311-aj4zh1y9etbeszfp
2014-03-24 17:03:11 +01:00
Josse Colpaert fd6352ac06 [IMP] Change report to have location instead of warehouse
bzr revid: jco@openerp.com-20140324152211-jecefcplr9mjk0wy
2014-03-24 16:22:11 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Josse Colpaert 2655798706 [IMP] Onchange on picking type in pos.config
bzr revid: jco@openerp.com-20140324125441-eh4wb77pwzop0zon
2014-03-24 13:54:41 +01:00
Josse Colpaert 641fc49eeb [ADD] Add default location for PoS config
bzr revid: jco@openerp.com-20140324123346-r190l8e1ug5mhgyr
2014-03-24 13:33:46 +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
Launchpad Translations on behalf of openerp 6472e4155a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140322070453-bbx8zxmppthwar0s
bzr revid: launchpad_translations_on_behalf_of_openerp-20140323064412-l97e4rap18b68ab0
2014-03-23 06:44:12 +00:00
Josse Colpaert 3631cc0df6 [IMP] Give pos config picking type and stock location instead of warehouse
bzr revid: jco@openerp.com-20140321160634-zo9pke8pyy1b8byc
2014-03-21 17:06:34 +01:00
Denis Ledoux 0e4cfe0add [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9157 revid:dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: chs@openerp.com-20140320134212-9nbuc7uqla4uiyf7
bzr revid: dle@openerp.com-20140320112958-slajf0ho0jtl7u60
bzr revid: dle@openerp.com-20140320161349-olyte7xt35nfj3dg
bzr revid: dle@openerp.com-20140320181737-68q9xh9jhfjynjip
2014-03-20 19:17:37 +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
Denis Ledoux 84eeb79875 [FIX] point_of_sale: add multi-companies rules on pos.config
bzr revid: dle@openerp.com-20140320154436-ygqhvvyhe6otv70p
2014-03-20 16:44:36 +01:00
Denis Ledoux cac0c9600a [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
Christophe Simonis 99a3c45976 [MERGE] forward port of branch saas-3 up to revid 9328 chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: chs@openerp.com-20140318132741-aur3q1k7t9iympri
2014-03-18 14:27:41 +01:00
Denis Ledoux 112fe22347 [FIX] point_of_sale: prevent duplicated order posting
bzr revid: dle@openerp.com-20140317164131-eewyqmzz5niebz2a
2014-03-17 17:41:31 +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
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
Christophe Simonis d6b93c8b24 [FIX] point_of_sale: use correct method to redirect to login page
bzr revid: chs@openerp.com-20140310153838-svwzew0vuk0khlxz
2014-03-10 16:38:38 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Quentin (OpenERP) e36b32a661 [MERGE] merged with main trunk (revision 9186)
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Christophe Simonis cde82643d0 [MERGE] point of sale fixes
bzr revid: chs@openerp.com-20140224172113-gj1t8hi7a8hr60gq
2014-02-24 18:21:13 +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 8d5398d661 [FIX] point_of_sale: if an order fails to mark as PAID, leave it at NEW so that the pos client can process new orders. The error has to be manually corrected by the user before session closing
bzr revid: fva@openerp.com-20140224150830-5uddv7i1djff2aip
2014-02-24 16:08:30 +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
Thibault Delavallée ef6cdbf0f2 [MERGE] [IMP] point of sale: usability: label typos + help in menus
bzr revid: tde@openerp.com-20140218083412-k1jajrze3nc51xyh
2014-02-18 09:34:12 +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
Josse Colpaert 1277c16dd7 [MERGE] Merge from trunk
bzr revid: jco@openerp.com-20140214100157-1vbjgifkouh0h4ix
2014-02-14 11:01:57 +01:00
ddm@openerp.com e7f238615c [IMP] fetch only relevant fields when checking for dupes
bzr revid: ddm@openerp.com-20140213163849-8v485vq5v4xmeocg
2014-02-13 17:38:49 +01:00
ddm@openerp.com 44ca72e32b merge saas3
bzr revid: ddm@openerp.com-20140213152921-mas1gd10zy9s0nxy
2014-02-13 16:29:21 +01:00
ddm@openerp.com 8bbb206504 [IMP] save new orders only
bzr revid: ddm@openerp.com-20140213152449-tarl15agw9r3teqg
2014-02-13 16:24:49 +01:00
Denis Ledoux 65257c48b5 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9835 revid:launchpad_translations_on_behalf_of_openerp-20140213064742-xiotlx8wzfhexnhc
bzr revid: dle@openerp.com-20140210160759-oybxhdwgv2q4ma5a
bzr revid: odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: dle@openerp.com-20140212143044-0c94q4evxl4ltwr0
bzr revid: dle@openerp.com-20140213115951-h7c2o65lgg26aosv
2014-02-13 12:59:51 +01:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Denis Ledoux 64ead8b005 [FIX] point_of_sale: sales summary report displays actual amount of taxes, instead of displaying the amount where the taxe is applied
bzr revid: dle@openerp.com-20140212121408-4tv8ca1ukqempx1k
2014-02-12 13:14:08 +01:00
Denis Ledoux b6e708c1be [FIX]point_of_sale: Mode of payment displayed browse_record object instead of the name of the method payment
bzr revid: dle@openerp.com-20140212113004-d9eammlp5gtm2m2v
2014-02-12 12:30:04 +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
Cedric Snauwaert 9b249181e3 [MERGE]merge with latest trunk
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
2014-02-10 17:15:56 +01:00
Denis Ledoux 8092693eec [FIX] point_of_sale: distraction error from revision 9814 revid:dle@openerp.com-20140206163444-ckcmurcwk2vhi5vp, missing .id in order to compare company for taxes
bzr revid: dle@openerp.com-20140210160645-ww7af7sbkpjf6oss
2014-02-10 17:06:45 +01:00
Frédéric van der Essen 04a6074b1a [MERGE] forward porting fixes from saas-3
bzr revid: fva@openerp.com-20140210155628-75mgw7qcq9k5ncem
2014-02-10 16:56:28 +01:00