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
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
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
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
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
Frédéric van der Essen
7ab7cf2149
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140109101313-cle2m2axh6vjj8yy
2014-01-09 11:13:13 +01:00
Thibault Delavallée
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Frédéric van der Essen
0fd4888e84
[hw_scanner] implementation of the server side component of the barcode scanner proxy
...
bzr revid: fva@openerp.com-20140102141519-jaqi8mcqff282c6n
2014-01-02 15:15:19 +01:00
Thibault Delavallée
0bcd78116f
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131227153517-j278y3hrjj2nzw79
2013-12-27 16:35:17 +01:00
Frédéric van der Essen
173ffb995f
[WIP] point_of_sale: making the standalone pos launchable from the pos backend
...
bzr revid: fva@openerp.com-20131207170014-9pctopzgx5ahtb21
2013-12-07 18:00:14 +01:00
Christophe Matthieu
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
Frédéric van der Essen
28c074dcb2
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131126142328-26gdibac45v17djm
2013-11-26 15:23:28 +01:00
Olivier Dony
44664076da
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
...
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Olivier Dony
f08f16cb30
[FIX] point_of_sale: `update` button in POS order form was calling a non-existing method
...
This dummy button is only meant to save the
order and refresh the view, which is easily
accomplished by sending an non-existing
workflow signal. Setting the button type
to the default `workflow` type (or simply
removing the wrong type) fixes the problem.
bzr revid: odo@openerp.com-20131107110256-zfok0mwkbesrkf81
2013-11-07 12:02:56 +01:00
Frédéric van der Essen
7f0e721cc1
[IMP] point_of_sale: more css adaptations for iPad / android + a few bug correction along the way
...
bzr revid: fva@openerp.com-20131106161723-vus7amgc6cfw3bzr
2013-11-06 17:17:23 +01:00
Paramjit Singh Sahota
dd18cff878
[IMP] Added attrs for closing balance in pos.
...
bzr revid: psa@tinyerp.com-20131015073857-b3izcxgn51q25jd0
2013-10-15 13:08:57 +05:30
Thibault Delavallée
607de396ba
[MERGE] Sync with trunk, until revision 8927
...
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
Paramjit Singh Sahota
daa7594cbb
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130913112155-jll3rlzcgsjrtzv4
2013-09-13 16:51:55 +05:30
Thibault Delavallée
a8201c6891
[MERGE] [IMP] point_of_sale
...
Removed default POS category
Removed 'other' category from data
Fixed pos payment methods not all listed when creating a pos
bzr revid: tde@openerp.com-20130905103952-kbew55mqxltjdoey
2013-09-05 12:39:52 +02:00
Thibault Delavallée
8b48cc9520
[MERGE] addons: added groups when quick creating user in various addons.
...
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Thibault Delavallée
ed0a829cb3
[MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
...
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Randhir Mayatra (OpenERP)
606431f0ee
[MERGE]merge with parent
...
bzr revid: rma@tinyerp.com-20130830053621-briu78l6scvuleu4
2013-08-30 11:06:21 +05:30
Christophe Matthieu
2fab26a2d2
[IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
...
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
Atul Patel (OpenERP)
2e20b9a45a
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130813135410-7w9yfc6zl3hxcnwd
2013-08-13 19:24:10 +05:30
Paramjit Singh Sahota
edf9d5ef8e
[IMP] Improved code for following
...
1/. Onchange on Cash Control was not working in POS
2/. Added new css for cash control
3/. Fixed the issue for the space between the Real Closing Balance and Differences.
bzr revid: psa@tinyerp.com-20130711105900-zzxnzky2nr6ms4c9
2013-07-11 16:29:00 +05:30
Thibault Delavallée
d6c74a369c
[MERGE] Forward-ported lp:~openerp-dev/openobject-addons/7.0-pos-improvements-fva (using -r 8946..8955).
...
This branch holds several improvements for the point of sale. However it cannot
be merged into 7.0 because a new column is added. As this branch has proven to
be correct, it is forward-ported into trunk.
bzr revid: tde@openerp.com-20130711084547-wl5q22g8z1aha126
2013-07-11 10:45:47 +02:00
Harry (OpenERP)
98d388bcf1
[FIX] pos: remove outer div tag of statusbar
...
bzr revid: hmo@tinyerp.com-20130710101216-23633pfhokwl9bag
2013-07-10 15:42:16 +05:30
Atul Patel (OpenERP)
4b98b1c689
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130620054125-ai4ozl8pd1hv84sr
2013-06-20 11:11:25 +05:30
Foram Katharotiya (OpenERP)
ae664b1a86
[IMP] add currency_id because i had removed currency_id in merge conflict
...
bzr revid: fka@tinyerp.com-20130617071413-mie2x70lz4tzs48i
2013-06-17 12:44:13 +05:30
Foram Katharotiya (OpenERP)
5a761f9752
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130617065636-t6kjnfe6vyz6m8av
2013-06-17 12:26:36 +05:30
ggh-openerp
735a20f320
[REM] Remove the onchange pos available method
...
bzr revid: ggh@tinyerp.com-20130417052737-4t5ejcwzkkkgfqdj
2013-04-17 10:57:37 +05:30
Tejas Tank
6e63c47c64
[FIX] pos,cash-register: corrected word theoritical to theoretical changes.
...
bzr revid: tta@openerp.com-20130412093807-9bazw36l9khrjm0l
2013-04-12 15:08:07 +05:30
Frédéric van der Essen
ef81f0bd43
[IMP] point_of_sale: add a configuration option to enable invoicing from the Point of Sale (enabled by default)
...
bzr revid: fva@openerp.com-20130411122250-aju5cl91wduj2bj0
2013-04-11 14:22:50 +02:00
ggh-openerp
e582096959
[IMP] Improved code in Pos
...
bzr revid: ggh@tinyerp.com-20130411102949-lfeakwxskka8hzyy
2013-04-11 15:59:49 +05:30
ggh-openerp
43a9fa81fd
[IMP] Name of method changed
...
bzr revid: ggh@tinyerp.com-20130411051350-0esvxad9a189x8iz
2013-04-11 10:43:50 +05:30
ggh-openerp
07db55efa3
[IMP] POS:Available in pos checkbox not click pos_categ no need to display
...
bzr revid: ggh@tinyerp.com-20130409132314-2o0uvomvd5afy624
2013-04-09 18:53:14 +05:30
ggh-openerp
054465b3ed
[IMP] POS:Change the data code into demo code
...
bzr revid: ggh@tinyerp.com-20130409100917-pvwkamgwh0trtu4m
2013-04-09 15:39:17 +05:30
ggh-openerp
d4a1f8b434
[IMP] POS: All pos payment method show, domain based on Available in the point of sales
...
bzr revid: ggh@tinyerp.com-20130409051836-g8u2f6ebbc4rlkyn
2013-04-09 10:48:36 +05:30
Tejas Tank
b062573df4
[IMP] pos,cash-register: Corrected tooltips and layout.
...
bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
2013-04-09 10:17:24 +05:30
Tejas Tank
76b7a08275
[IMP] pos session and cash register, Improved tooltip and layout.
...
bzr revid: tta@openerp.com-20130405092419-jpa89isevfq6jw49
2013-04-05 14:54:19 +05:30
Ajay Chauhan (OpenERP)
cbc2fc05c8
[IMP] POS: made changes to have POS total well aligned
...
bzr revid: cha@tinyerp.com-20130318095952-wynm8qf0nmuq7uc5
2013-03-18 15:29:52 +05:30
Ajay Chauhan (OpenERP)
3c9a40ff84
[IMP] POS: made currency_id field invisible
...
bzr revid: cha@tinyerp.com-20130318090747-4413l0il1pk7slww
2013-03-18 14:37:47 +05:30
Ajay Chauhan (OpenERP)
d3b14e953a
[IMP] POS: added field currency_id to have currency symbol at pos total
...
bzr revid: cha@tinyerp.com-20130318084547-42fwyv84jqqfi03h
2013-03-18 14:15:47 +05:30
Ajay Chauhan (OpenERP)
0a7683d39f
[IMP] account, pos: added string 'Closing Balance' to fields 'balance_end_real' & 'cash_register_balance_end_real'
...
bzr revid: cha@tinyerp.com-20130315095454-ljh2bjd1brds80m5
2013-03-15 15:24:54 +05:30