Commit Graph

327 Commits

Author SHA1 Message Date
Denis Ledoux cf4d14ce39 [MERGE] forward port of branch saas-3 up to 09b277c 2015-04-27 14:02:52 +02:00
Denis Ledoux d6ae7fb7db [MERGE] forward port of branch 7.0 up to 3e7d3c7 2015-04-27 12:19:43 +02:00
Nicolas Lempereur 81a3f56651 [FIX] stock,event,pos: fix "today" filter with regard to timezones
The previous filters didn't take timezones into account, and
returned stringified naive datetime values in local browser
time. Those would then be interpreted by the server-side as
UTC date, and depending on the current timezone offset vs UTC,
yield partially incorrect results.

By returning directly a datetime.datetime object instead of
a stringified version (see previous commit 76881fb),
we can get the expected result regarless of the timezone.

Fixes #2972
Closes #6229

opw-621282
2015-04-23 14:11:24 +02:00
Christophe Simonis 4af53de399 [MERGE] forward port of branch saas-3 up to 9abcb0c 2015-02-03 18:41:50 +01:00
Christophe Simonis 9abcb0cf2b [MERGE] forward port of branch 7.0 up to 9769279 2015-02-03 18:39:16 +01:00
Sylvain LE GAL 94b429394a [REF] remove useless quotes 2015-02-03 18:14:55 +01:00
Sylvain LE GAL bfdf3f8744 [FIX] 'point_of_sale' add customer domain on partner field of pos_order; 2015-02-03 18:14:55 +01:00
Antoine Huvelle c2344ad8eb [FIX] point_of_sale: pos.config journal selection
Adding a new context as, when creating a new journal from the pos.config,
that journal should automatically be defined as a POS payment journal.
2015-01-15 18:07:19 +01:00
Fabrice Henrion a9b8aa3a1c [FIX] point_of_sale: typo
closes #4077
2014-12-08 09:32:44 +01:00
Martin Trigaux 0afa4c7f52 [IMP] point_of_sale: make the sequence field configurable 2014-11-18 18:52:46 +01: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
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
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 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 75a6bcaee4 [IMP] point_of_sale: a little explaination of how the barcode pattern system works 2014-08-05 14:03:38 +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
Frederic van der Essen c4049bc356 [WIP] removing incomplete fidelity points feature for the v8.0 release 2014-07-01 13:02:02 +02:00
Christophe Simonis 8cabd5eac9 merge upstream 2014-06-25 19:08:49 +02: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 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 8202561511 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-10 11:43:17 +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 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 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
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
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
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
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
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
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 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
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
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
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Frédéric van der Essen 5585a38ecc [MERGE] from trunk, need point_of_sale updates
bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt
2014-01-27 17:09:46 +01:00
Quentin (OpenERP) fc93025818 [MERGE] merged trunk
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
Frédéric van der Essen b0abc338d2 [IMP] point_of_sale: better feedback on network and proxy connectivity + removed pos settings for obsolete features + improved proxy settings
bzr revid: fva@openerp.com-20140117175830-himux7xmaopw9yia
2014-01-17 18:58:30 +01:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Frédéric van der Essen a97a587fad [IMP] point_of_sale: posbox automatic discovery
bzr revid: fva@openerp.com-20140110171746-286285ds696d5kby
2014-01-10 18:17:46 +01:00