36cdac48b7
[IMP] product: move product packaging field from product.product to product.template
2014-06-03 11:53:41 +02:00
6e6b5ea15b
[FIX] point_of_sale: public category became pos category
2014-05-27 10:36:08 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
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
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
0fb14cbe0a
[FIX] point_of_sale: add product variant in the displayed name (opw 607456)
2014-05-16 14:06:17 +02:00
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
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
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
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
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
3ea931c486
[IMP] save all orders at once (client)
...
bzr revid: ddm@openerp.com-20140214144930-5zpn3miys1hwrdoa
2014-02-14 15:49:30 +01:00
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
a45ae1384c
[IMP] point_of_sale: increased size of logo on receipt
...
bzr revid: fva@openerp.com-20140131102245-hhshe83xuanllhyt
2014-01-31 11:22:45 +01:00
4b30f1fcbd
[MERGE] trunk-website-al
...
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
2014-01-31 01:51:57 +01:00
ba2d4c9030
[IMP] point_of_sale, hw_escpos: hopefully much faster printing on the posbox by caching logo conversion
...
bzr revid: fva@openerp.com-20140130182109-11njt0khmylp0r7p
2014-01-30 19:21:09 +01:00
f31ddba8b3
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140129153718-b86vsyogxkr8lk19
2014-01-29 16:37:18 +01:00
4e73dce8d3
[FIX] point_of_sale: loading screen was not waiting until posbox connection
...
bzr revid: fva@openerp.com-20140129135710-vobqzjyq12d7io3v
2014-01-29 14:57:10 +01:00
e2f2381fc2
[FIX] point_of_sale: fixing pos incompatibilities with the model changes in trunk-website-al
...
bzr revid: fva@openerp.com-20140127161005-2tntipu1x50kuhpz
2014-01-27 17:10:05 +01:00
c9879fcd1e
[IMP] point_of_sale: refactor proxy to use event based status notifications
...
bzr revid: fva@openerp.com-20140127002203-y2qnhwf0z708gbrx
2014-01-27 01:22:03 +01:00
1e09d3b3f5
[IMP] point_of_sale: Realtime printer & scanner online status
...
bzr revid: fva@openerp.com-20140126215528-q32v2q8keh6m0ufo
2014-01-26 22:55:28 +01:00
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
1353e44bb3
[IMP] point_of_sale: less confusing synchronisation indicator
...
bzr revid: fva@openerp.com-20140116172846-7lyz50jr69crbxsn
2014-01-16 18:28:46 +01:00
a97a587fad
[IMP] point_of_sale: posbox automatic discovery
...
bzr revid: fva@openerp.com-20140110171746-286285ds696d5kby
2014-01-10 18:17:46 +01:00
643bb8566c
[IMP] point_of_sale: detailed tax report on receipt
...
bzr revid: fva@openerp.com-20140106135119-cnhopx3nie7f0r8h
2014-01-06 14:51:19 +01:00
434513e761
[hw_scanner] implementation of the client side component of the barcode scanner proxy
...
bzr revid: fva@openerp.com-20140103130930-q1shnj9172yzn0gr
2014-01-03 14:09:30 +01:00
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
bf650fa07a
[IMP] hw_escpos: basic support for japanese receipt and open cashdrawer
...
bzr revid: fva@openerp.com-20131226165620-6262zfqyxxyryxo0
2013-12-26 17:56:20 +01:00
e95ea35caa
[IMP] hw_escpos: company logo on receipt and multi-lingual receipt support
...
bzr revid: fva@openerp.com-20131224151112-3svn5wm1wyf71wim
2013-12-24 16:11:12 +01:00
293001c826
[IMP] point_of_sale: ESC/POS receipt printing
...
bzr revid: fva@openerp.com-20131220163057-9nu1u7hti0m8wo3h
2013-12-20 17:30:57 +01:00
e1c4c930a8
[FIX] point_of_sale: crash on scale screen
...
bzr revid: fva@openerp.com-20131216152113-3y2s2fva3wvguoxt
2013-12-16 16:21:13 +01:00
f8777d18db
[WIP] point_of_sale: removing useless backbone models & making browser print work again
...
bzr revid: fva@openerp.com-20131216143559-6unghp0sza9ihs4r
2013-12-16 15:35:59 +01:00
019938f2c8
[WIP] point_of_sale: finished css optimisations
...
bzr revid: fva@openerp.com-20131205175325-8v81lfj69020x0qe
2013-12-05 18:53:25 +01:00
d4e7b6eb96
[WIP] point_of_sale: more perf improvement, this time on the receipt and payment screen + lots of usability improvements and cleanups
...
bzr revid: fva@openerp.com-20131204172122-mzl4wg4uw51uzdfv
2013-12-04 18:21:22 +01:00
7d062a0b45
[WIP] point_of_sale: improved performance of the product screen & order widget + ongoing cleanup
...
bzr revid: fva@openerp.com-20131202162144-6se3s0wjwz0jdfih
2013-12-02 17:21:44 +01:00
165af24f49
[WIP] point_of_sale: more progress on ipadification: the app now is in a separate controller, with proper meta tags for standalone apps, pixel ratio, etc
...
bzr revid: fva@openerp.com-20131127144427-odf37v9dthuw4yrm
2013-11-27 15:44:27 +01:00
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
e03f3aa288
[IMP] point_of_sale: support for non ean13 barcodes using the Internal Reference field
...
bzr revid: fva@openerp.com-20130923145139-iu3ds9tcfzy1ffcf
2013-09-23 16:51:39 +02:00
5a4b68e422
[FIX] point_of_sale: currency should be fetched from the pricelist instead of the company
...
bzr revid: fva@openerp.com-20130920123018-b10rrmxmx85ludth
2013-09-20 14:30:18 +02:00
645c3ccf65
[FIX] point_of_sale: currency should be fetched from the pricelist instead of the company
...
bzr revid: fva@openerp.com-20130918122836-pqi1w41swu4rcrga
2013-09-18 14:28:36 +02:00
c33fd59465
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130917101910-4h2g2njs2e9toc36
2013-09-17 12:19:10 +02:00
65c70b85a7
[IMP + FIX] point_of_sale: plugged the memory leaks
...
- correctly call destroy on widgets
- unbind backbone events on destroy
- jquery show() hide() flooded jQuery.cache
- introduced automated ui tests
bzr revid: fva@openerp.com-20130917101420-g76gos2qjjaii3zf
2013-09-17 12:14:20 +02:00
2f9980881b
[FORWARD] Forward-port of addons saas-1 until revision 8775 (revid tde@openerp.com-20130913092546-kzshg1a7sls566l8).
...
[FIX] account: trunk version of the fix added in version 9440 of 7.0 branch
bzr revid: tde@openerp.com-20130913095612-i2f0kd3mhxdavdp6
2013-09-13 11:56:12 +02:00
c82bbdbb91
[IMP] point_of_sale: make products searchable by internal reference (default_code)
...
bzr revid: fva@openerp.com-20130912141208-8xrxaf96j5jn5z9u
2013-09-12 16:12:08 +02:00
651f76e274
[IMP] point_of_sale: log pushed orders to the backend + disable proxy rpcs when the proxy is disconnected
...
bzr revid: fva@openerp.com-20130912135044-93c6va8e8yttkir1
2013-09-12 15:50:44 +02:00
b38c271031
[IMP] point_of_sale: big reworking of the scale screens:
...
- no welcome scale in cashier mode, as it was an unnecessary delay for people who use it all day
- no more parallel calls to the proxy which could reorder or make the driver crash
- auto throttling of the proxy calls -> max 20 reads per seconds, but can go slower as well.
- faster and cleaner update of the weight in the scale screen
bzr revid: fva@openerp.com-20130911154155-rs600cixvftvkhoi
2013-09-11 17:41:55 +02:00
71ae60324b
[IMP] point_of_sale: sane multi order workflow + remove existing tooltips when we load the pos
...
bzr revid: fva@openerp.com-20130905104357-xlf51euhnclymj7x
2013-09-05 12:43:57 +02:00
d60c0be37c
[FIX] point_of_sale: pass reference of customer from pos to order
...
bzr revid: mat@openerp.com-20130904140628-4p9xnedoh3p2xgcw
2013-09-04 16:06:28 +02:00
a9f5a82986
[FIX] point_of_sale: fix regression due to session api change. + some cleanup on ressource release on quit.
...
bzr revid: fva@openerp.com-20130902155907-99qk1bnmj1o4ztpe
2013-09-02 17:59:07 +02:00
c02afb45fa
[MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
...
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
2013-08-20 18:52:58 +02:00
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
004163733b
[IMP] point_of_sale: removing console.logs
...
bzr revid: fva@openerp.com-20130708125644-rdno41mmtwrao3z2
2013-07-08 14:56:44 +02:00
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
c04dfafe0b
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130522062700-rcbg30jfinv0o392
2013-05-22 11:57:00 +05:30
afd7d79966
[IMP] medium images in pos
...
bzr revid: fp@tinyerp.com-20130517071738-uw130g0sxbu14yrq
2013-05-17 09:17:38 +02:00
d1e17fbde0
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
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
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
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
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
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
96a74ae6ad
[IMP] point_of_sale: ...
...
bzr revid: fva@openerp.com-20130328153537-ohdc3243lcu3dgbj
2013-03-28 16:35:37 +01:00
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
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
d0e2c54663
[IMP]set config pricelist on pos frontend
...
bzr revid: sgo@tinyerp.com-20130206125913-ibn73y41aw19gkmw
2013-02-06 18:29:13 +05:30
1150aac0fe
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130206124101-vuf5dkdtsr6bfe08
2013-02-06 18:11:01 +05:30
e9c6fd0dea
[FIX] point_of_sale: correct currency rounding
...
bzr revid: fva@openerp.com-20130128171800-wobu3q7l5d16qhyq
2013-01-28 18:18:00 +01:00
86d8c56dce
[FIX] point_of_sale: removed obsolete console.log
...
bzr revid: fva@openerp.com-20130125153405-4n49h8nbmwx2ji3k
2013-01-25 16:34:05 +01:00
3508126c15
[IMP]set default pricelist as sale pricelist
...
bzr revid: sgo@tinyerp.com-20130125070758-cgug11ik4bxcelnf
2013-01-25 12:37:58 +05:30
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
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
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
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
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
60dbad5bd5
[FIX] point_of_sale: removed console.logs
...
bzr revid: fva@openerp.com-20130111144219-eg0xr5kzwewq5ygf
2013-01-11 15:42:19 +01:00
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
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
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
e06378bca3
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121120054609-xf0lxp1kts2mzifh
2012-11-20 11:16:09 +05:30
fa8463f804
[FIX] use session.url()
...
bzr revid: chs@openerp.com-20121114174258-ly0dniub0k383045
2012-11-14 18:42:58 +01:00
185b32d7d5
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121107091958-f3rqu7nc585umjwq
2012-11-07 10:19:58 +01:00
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
22ad7a70f7
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121105084838-gwc7xb19f7131vbi
2012-11-05 09:48:38 +01:00
5c3e56267e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121105063300-ylbdx03epxui6v2v
2012-11-05 12:03:00 +05:30
376cfc937a
[MERGE] addosn 17
...
bzr revid: fp@tinyerp.com-20121102082707-wpv96avu8l5incs8
2012-11-02 09:27:07 +01:00
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
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
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
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
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
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
a5bed8994c
[IMP] point_of_sale: debug window
...
bzr revid: fva@openerp.com-20120912161229-4lgcgt4xt2cdzceo
2012-09-12 18:12:29 +02:00
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
83fc106eaa
[FIX] point_of_sale: coherent image url handling
...
bzr revid: fva@openerp.com-20120910154828-4k699hi3lu8lgxvu
2012-09-10 17:48:28 +02:00
bff5b81db3
[FIX] fixing some regressions
...
bzr revid: fva@openerp.com-20120905164221-hcigfd0kxdckgz94
2012-09-05 18:42:21 +02:00
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
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
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
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
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
Christophe Matthieu
Christophe Simonis
Denis Ledoux
Martin Trigaux
Quentin (OpenERP)
Josse Colpaert
Frédéric van der Essen
Christophe Simonis
ddm@openerp.com
Antony Lesuisse
Fabien Meghazi
Thibault Delavallée
Olivier Dony
Fabien Pinckaers
Amit Patel
Sanjay Gohel (Open ERP)