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
Frédéric van der Essen
004163733b
[IMP] point_of_sale: removing console.logs
...
bzr revid: fva@openerp.com-20130708125644-rdno41mmtwrao3z2
2013-07-08 14:56:44 +02:00
Frédéric van der Essen
b8fd0fef08
[FIX] point_of_sale: new order was broken when multiple orders already present
...
bzr revid: fva@openerp.com-20130702204048-018r4xr34mw7y2m5
2013-07-02 22:40:48 +02:00
sgo@tinyerp.com
c04dfafe0b
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130522062700-rcbg30jfinv0o392
2013-05-22 11:57:00 +05:30
Fabien Pinckaers
afd7d79966
[IMP] medium images in pos
...
bzr revid: fp@tinyerp.com-20130517071738-uw130g0sxbu14yrq
2013-05-17 09:17:38 +02:00
sgo@tinyerp.com
d1e17fbde0
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +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
Frédéric van der Essen
3aa6f4add5
[IMP] point_of_sale: the invoicing should now work reliably and validate the orders
...
bzr revid: fva@openerp.com-20130411120719-colzjq4l8eaiotdf
2013-04-11 14:07:19 +02:00
Frédéric van der Essen
c176e1e7ca
[IMP] point_of_sale: renamed round_digits to round_decimals
...
bzr revid: fva@openerp.com-20130409144208-2wq4cozxstbdgld5
2013-04-09 16:42:08 +02:00
Frédéric van der Essen
35d3a3480a
[FIX] point_of_sale: use correct rounding algorithm
...
lp bug: https://launchpad.net/bugs/1157761 fixed
bzr revid: fva@openerp.com-20130409143536-hgs38n0sqx8td607
2013-04-09 16:35:36 +02:00
Frédéric van der Essen
cae96ed454
[FIX] point_of_sale: correctly set the customer on the order
...
bzr revid: fva@openerp.com-20130329110048-1cx2sr4hp98cue0f
2013-03-29 12:00:48 +01:00
Frédéric van der Essen
96a74ae6ad
[IMP] point_of_sale: ...
...
bzr revid: fva@openerp.com-20130328153537-ohdc3243lcu3dgbj
2013-03-28 16:35:37 +01:00
Frédéric van der Essen
0fdf9066dd
[FIX] point_of_sale: fixing potential timeout issues when sending orders over bad connection
...
bzr revid: fva@openerp.com-20130328150718-zj91ljrlkvv59tkj
2013-03-28 16:07:18 +01:00
Frédéric van der Essen
72dbae9ddf
[FIX] point_of_sale: prevent from spinner to appear when we have a rpc timeout, and try to flush saved orders after loading
...
bzr revid: fva@openerp.com-20130327125541-pbqkn764h6fngf33
2013-03-27 13:55:41 +01:00
sgo@tinyerp.com
d0e2c54663
[IMP]set config pricelist on pos frontend
...
bzr revid: sgo@tinyerp.com-20130206125913-ibn73y41aw19gkmw
2013-02-06 18:29:13 +05:30
sgo@tinyerp.com
1150aac0fe
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130206124101-vuf5dkdtsr6bfe08
2013-02-06 18:11:01 +05:30
Frédéric van der Essen
e9c6fd0dea
[FIX] point_of_sale: correct currency rounding
...
bzr revid: fva@openerp.com-20130128171800-wobu3q7l5d16qhyq
2013-01-28 18:18:00 +01:00
Frédéric van der Essen
86d8c56dce
[FIX] point_of_sale: removed obsolete console.log
...
bzr revid: fva@openerp.com-20130125153405-4n49h8nbmwx2ji3k
2013-01-25 16:34:05 +01:00
sgo@tinyerp.com
3508126c15
[IMP]set default pricelist as sale pricelist
...
bzr revid: sgo@tinyerp.com-20130125070758-cgug11ik4bxcelnf
2013-01-25 12:37:58 +05:30
Frédéric van der Essen
4c1016415c
[FIX] point_of_sale: add subtotal to printed ticket
...
bzr revid: fva@openerp.com-20130124162225-wv0vgody2xtx2hog
2013-01-24 17:22:25 +01:00
Frédéric van der Essen
8ca77e464b
[FIX] point_of_sale: editing values with the numpad works as best as possible for now
...
bzr revid: fva@openerp.com-20130124140631-oqii3gq402nx14xf
2013-01-24 15:06:31 +01:00
Frédéric van der Essen
2616386e3f
[WIP] point_of_sale: in progress of solving bugs in taxes and order editing, part 2
...
bzr revid: fva@openerp.com-20130123183205-7krkee3ihqg1hhmo
2013-01-23 19:32:05 +01:00
sgo@tinyerp.com
e4250d1558
[IMP]remove sale.shop from pos and improve code
...
bzr revid: sgo@tinyerp.com-20130123113306-n7enol5as84sv0g2
2013-01-23 17:03:06 +05:30
Frédéric van der Essen
5883f32718
[WIP] point_of_sale: in progress of solving ]bugs in taxes and order editing
...
bzr revid: fva@openerp.com-20130122131801-46dyysig5e2owifa
2013-01-22 14:18:01 +01:00
Frédéric van der Essen
60dbad5bd5
[FIX] point_of_sale: removed console.logs
...
bzr revid: fva@openerp.com-20130111144219-eg0xr5kzwewq5ygf
2013-01-11 15:42:19 +01:00
Quentin (OpenERP)
4554f152f5
[MERGE] pos: price field used instead of list_price
...
bzr revid: qdp-launchpad@openerp.com-20121126093611-1l2ujhh4tsryo416
2012-11-26 10:36:11 +01:00
Frédéric van der Essen
4d90fdd32e
[IMP] point_of_sale: you must now use available_in_pos to make product available in pos ... Products without categories will appear at the root category
...
bzr revid: fva@openerp.com-20121122175254-ippyf1rstggvvwh7
2012-11-22 18:52:54 +01:00
Frédéric van der Essen
87550820ac
changed the clients to be partners instead of users, fixed receipt print css
...
bzr revid: fva@openerp.com-20121121112644-xqj6n0yvy0sahwev
2012-11-21 12:26:44 +01:00
Amit Patel
e06378bca3
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121120054609-xf0lxp1kts2mzifh
2012-11-20 11:16:09 +05:30
Christophe Simonis
fa8463f804
[FIX] use session.url()
...
bzr revid: chs@openerp.com-20121114174258-ly0dniub0k383045
2012-11-14 18:42:58 +01:00
Fabien Meghazi
185b32d7d5
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121107091958-f3rqu7nc585umjwq
2012-11-07 10:19:58 +01:00
Sanjay Gohel (Open ERP)
00a28c4b3d
[IMP]pos does not calculate tax and touch screen does not gives actually quantity
...
bzr revid: sgo@tinyerp.com-20121105104357-6r59u4g20ojg0hlw
2012-11-05 16:13:57 +05:30
Fabien Meghazi
22ad7a70f7
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121105084838-gwc7xb19f7131vbi
2012-11-05 09:48:38 +01:00
Amit Patel
5c3e56267e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121105063300-ylbdx03epxui6v2v
2012-11-05 12:03:00 +05:30
Fabien Pinckaers
376cfc937a
[MERGE] addosn 17
...
bzr revid: fp@tinyerp.com-20121102082707-wpv96avu8l5incs8
2012-11-02 09:27:07 +01:00
Fabien Meghazi
a2715888c1
[IMP] jQuery deferred API changes refactoring. Changed 'then's in 'done'/'fail' and 'pipe's in 'then'
...
bzr revid: fme@openerp.com-20121031103148-r1slfpl2kcnajjd3
2012-10-31 11:31:48 +01:00
Sanjay Gohel (Open ERP)
7ef13b6e8f
[IMP][MERGE]remove list price and added price instead. merge with parent
...
bzr revid: sgo@tinyerp.com-20121015071901-a003w3ynul571eto
2012-10-15 12:49:01 +05:30
Amit Patel
e226a070e1
[FIX]:Uncaught Error: QWeb2 - template['PaypadButtonWidget']: Runtime Error: TypeError: Cannot read property 'name' of undefined
...
bzr revid: apa@tinyerp.com-20121012070145-8iu2yudx0yjzroj4
2012-10-12 12:31:45 +05:30
Sanjay Gohel (Open ERP)
8f8e6967d1
[IMP]pos product can not consider pricelist price it only consider list price of product. make it work on price of product of given pricelist
...
bzr revid: sgo@tinyerp.com-20121008125709-rxfptf69lyaj0p3a
2012-10-08 18:27:09 +05:30
Sanjay Gohel (Open ERP)
5b48e0894e
[IMP]discount shows grey and small font under product and total discount amt shows after tax
...
bzr revid: sgo@tinyerp.com-20121005110504-63l1uzxi0fomn4ic
2012-10-05 16:35:04 +05:30
Frédéric van der Essen
200d33229a
[IMP] point_of_sale: scan and search in products packagings
...
bzr revid: fva@openerp.com-20120913140310-4z9bxo1d0r13ep76
2012-09-13 16:03:10 +02:00
Frédéric van der Essen
a5bed8994c
[IMP] point_of_sale: debug window
...
bzr revid: fva@openerp.com-20120912161229-4lgcgt4xt2cdzceo
2012-09-12 18:12:29 +02:00
Frédéric van der Essen
4db2bc0c43
[FIX] point_of_sale: help wasn't always cancelled when popup closed
...
bzr revid: fva@openerp.com-20120911101830-dvxi9sg5oan5r5nc
2012-09-11 12:18:30 +02:00
Frédéric van der Essen
83fc106eaa
[FIX] point_of_sale: coherent image url handling
...
bzr revid: fva@openerp.com-20120910154828-4k699hi3lu8lgxvu
2012-09-10 17:48:28 +02:00
Frédéric van der Essen
bff5b81db3
[FIX] fixing some regressions
...
bzr revid: fva@openerp.com-20120905164221-hcigfd0kxdckgz94
2012-09-05 18:42:21 +02:00
Frédéric van der Essen
d66519fda2
[FIX] point_of_sale: I should have tested this more
...
bzr revid: fva@openerp.com-20120903145958-c7i93lp8q8w8ilop
2012-09-03 16:59:58 +02:00
Frédéric van der Essen
e0d5b6ac8b
[IMP] point_of_sale: fetch is now a method
...
bzr revid: fva@openerp.com-20120903144354-8563uwq7x0cvqvrp
2012-09-03 16:43:54 +02:00
Frédéric van der Essen
f8212984f3
[IMP] point_of_sale: moved data loading to it's own method for easier extension dev
...
bzr revid: fva@openerp.com-20120903142527-iv0d97a0tzbjyo6o
2012-09-03 16:25:27 +02:00
Frédéric van der Essen
2c3b3a0bd1
[IMP] point_of_sale: adding a description field to the products
...
bzr revid: fva@openerp.com-20120903133239-hai1o87yrpxvbaic
2012-09-03 15:32:39 +02:00
Frédéric van der Essen
81115666a1
[IMP] point_of_sale: only sell products that can be sold ...
...
bzr revid: fva@openerp.com-20120903122649-etypfgvdjo3s8p0s
2012-09-03 14:26:49 +02:00
Frédéric van der Essen
2e4d656dcb
[IMP] point_of_sale: removed useless settings, Wubbit Twarks
...
bzr revid: fva@openerp.com-20120821104814-wuxk1qptj7xqr1i9
2012-08-21 12:48:14 +02:00
Frédéric van der Essen
23de15d82b
[IMP] point_of_sale: simpler way to load models
...
bzr revid: fva@openerp.com-20120821100452-zop43cmqyxq0del0
2012-08-21 12:04:52 +02:00
Frédéric van der Essen
b3cecb2162
[IMP] point_of_sale: renamed the js files
...
bzr revid: fva@openerp.com-20120821075434-dy4oqwuok39i4eyj
2012-08-21 09:54:34 +02:00