odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
71,958 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

437 Commits

Author SHA1 Message Date
Frédéric van der Essen 760939d83f [IMP] point_of_sale: IndexedDB: the LocalStorage DB is working now 
bzr revid: fva@openerp.com-20120810135832-7xb3yq0r1p829nv1
 2012-08-10 15:58:32 +02:00
Fabien Pinckaers 9dd3e6476f [IMP] PoS backend 
bzr revid: fp@tinyerp.com-20120809212311-q2b86eww9ppvdv8s
 2012-08-09 23:23:11 +02:00
Frédéric van der Essen 78d8b5d394 [WIP] point_of_sale: indexeddb : products and categories are no longer in memory 
bzr revid: fva@openerp.com-20120809195555-oluxe7xe8k2ugcoi
 2012-08-09 21:55:55 +02:00
Frédéric van der Essen 03b79a9832 [WIP] point_of_sale: much progress on the indexeddb backend 
bzr revid: fva@openerp.com-20120809172113-ex3o5vyt4ckv4au6
 2012-08-09 19:21:13 +02:00
Frédéric van der Essen dc8f543d17 [WIP] point_of_sale: indexeddb : compatible localstorage backend. + anthony's modifications to the views... 
bzr revid: fva@openerp.com-20120807161844-hd7ioxipnc6794jf
 2012-08-07 18:18:44 +02:00
Frédéric van der Essen 996183acf7 [WIP] point_of_sale: indexedDB backend 
bzr revid: fva@openerp.com-20120806154054-1yubgy8o8wwlc5b8
 2012-08-06 17:40:54 +02:00
Frédéric van der Essen 03a3533dc5 [WIP] point_of_sale: IndexedDB Backend 
bzr revid: fva@openerp.com-20120802141801-hpjqwkwlooqdaddu
 2012-08-02 16:18:01 +02:00
Frédéric van der Essen 7dabfe49ea [FIX] point_of_sale: removing useless console.log 
bzr revid: fva@openerp.com-20120730154228-5vabk5qyvjez9dgk
 2012-07-30 17:42:28 +02:00
Frédéric van der Essen ccf07028cf [IMP] point_of_sale: various fixes and improvements 
bzr revid: fva@openerp.com-20120730154143-kz57aldzo1yalfx9
 2012-07-30 17:41:43 +02:00
Thibault Delavallée 7b8c68b4a0 [IMP] point of sale: added css to fix the image width/height. 
bzr revid: tde@openerp.com-20120730103519-fn4rgqr6gcs7luwz
 2012-07-30 12:35:19 +02:00
Thibault Delavallée 97d48ebf51 [REF] pos.category: propagated change of category_image. 
bzr revid: tde@openerp.com-20120730103451-bce6bqone6e9f690
 2012-07-30 12:34:51 +02:00
Thibault Delavallée b9d62abd9a [FIX] point of sale: removed forgotten tree/merge, probably due to a forgotten conflict to resolve. 
bzr revid: tde@openerp.com-20120730091946-3ml79eb6u4flzina
 2012-07-30 11:19:46 +02:00
Thibault Delavallée 9e3844d666 [REM] Removed file added during merge. 
bzr revid: tde@openerp.com-20120730091907-y1tnw3fytfmz1qwq
 2012-07-30 11:19:07 +02:00
Thibault Delavallée 238598c041 [MERGE] Merged with addons/trunk. 
bzr revid: tde@openerp.com-20120730081600-y92rgh002zhpp4tw
 2012-07-30 10:16:00 +02:00
Frédéric van der Essen 68c2802fd9 [WIP] point_of_sale: adding untracked files before bisect galore 
bzr revid: fva@openerp.com-20120727140552-a5b1j344aa60cemp
 2012-07-27 16:05:52 +02:00
Frédéric van der Essen e3c2ae9681 [WIP] point_of_sale: variable length ean prefixes 
bzr revid: fva@openerp.com-20120727130010-82ddtyeva3r6l64c
 2012-07-27 15:00:10 +02:00
Frédéric van der Essen 6df84daaee [IMP] point_of_sale: removed action bar 
bzr revid: fva@openerp.com-20120719152519-l6gbweu58fk54ga3
 2012-07-19 17:25:19 +02:00
Frédéric van der Essen c941045865 [IMP] point_of_sale: very very subtle css improvement 
bzr revid: fva@openerp.com-20120718092954-ww84yaxh1p2cyf1b
 2012-07-18 11:29:54 +02:00
Frédéric van der Essen 1e00d4e9ec [IMP] point_of_sale: made it easier to change the flux between screens 
bzr revid: fva@openerp.com-20120717162517-pjsq3x81zfw38siy
 2012-07-17 18:25:17 +02:00
Frédéric van der Essen 3982e3524a [FIX] point_of_sale: various css fixes 
bzr revid: fva@openerp.com-20120717142923-tk4nkp4mdbegcndi
 2012-07-17 16:29:23 +02:00
Frédéric van der Essen cb22fd24d9 [MERGE+IMP] point_of_sale: merge from trunk aaaand (my bad) smaller category buttons when no icon 
bzr revid: fva@openerp.com-20120717132048-dlezdn2late82ix1
 2012-07-17 15:20:48 +02:00
Frédéric van der Essen 6cee026b81 [FIX] point_of_sale: missing file: bg.png 
bzr revid: fva@openerp.com-20120716120004-lui21pt4jmk31vnx
 2012-07-16 14:00:04 +02:00
Frédéric van der Essen 562d105a70 [FIX] point_of_sale: missing file: backbone-0.9.2.js 
bzr revid: fva@openerp.com-20120716115424-kn3br23t3c6uidms
 2012-07-16 13:54:24 +02:00
Frédéric van der Essen 54a3fd7fcc [FIX] packaging fix 
bzr revid: fva@openerp.com-20120713165845-i9eceb3vuqlqp08e
 2012-07-13 18:58:45 +02:00
Frédéric van der Essen db172f2531 [FIX] point_of_sale: close button doesn't crash anymore 
bzr revid: fva@openerp.com-20120713153719-256zclhnwzvq52qf
 2012-07-13 17:37:19 +02:00
Frédéric van der Essen 7fa6ccb47e [FIX] point_of_sale: missing default images 
bzr revid: fva@openerp.com-20120713143647-ys3jrymkb58ukygl
 2012-07-13 16:36:47 +02:00
Frédéric van der Essen 6587e7fe99 [FIX] point_of_sale: various fixes for the client mode on the pos 
bzr revid: fva@openerp.com-20120712170013-ea6u23wunncmslgz
 2012-07-12 19:00:13 +02:00
Frédéric van der Essen 35b08fb1fc [FIX] point_of_sale: css fixes for firefox 
bzr revid: fva@openerp.com-20120712113806-b3lh0h90jr6713hq
 2012-07-12 13:38:06 +02:00
Frédéric van der Essen f5e0ad32f2 [MERGE] trunk into point_of_sale, WIP 
bzr revid: fva@openerp.com-20120711160325-vmzhxwl74j2u7v8g
 2012-07-11 18:03:25 +02:00
Frédéric van der Essen f8d32d3304 [MERGE] point_of_sale 
bzr revid: fva@openerp.com-20120710142447-s0z5ca89bofh0n2c
 2012-07-10 16:24:47 +02:00
Frédéric van der Essen dd2384325b [IMP] point_of_sale: removing comments, console.logs, and debug globals 
bzr revid: fva@openerp.com-20120710101515-0jla27j85xcg87nm
 2012-07-10 12:15:15 +02:00
Frédéric van der Essen 841a25b231 [IMP] point_of_sale: removed commented-out code 
bzr revid: fva@openerp.com-20120709155642-ibnh03xfei6wey7d
 2012-07-09 17:56:42 +02:00
Frédéric van der Essen 0a2c340f92 [IMP] point_of_sale: new weighting workflow 
bzr revid: fva@openerp.com-20120709155351-u8cgp4ft14ytwfdw
 2012-07-09 17:53:51 +02:00
Frédéric van der Essen 5eec5822cd [FIX] point_of_sale: various fixes for the payment screen 
bzr revid: fva@openerp.com-20120703165039-xu538hp9e6mnnepv
 2012-07-03 18:50:39 +02:00
Frédéric van der Essen 116c671d17 [IMP] point_of_sale: printing via proxy 
bzr revid: fva@openerp.com-20120703140315-xnvioeiner7tz88i
 2012-07-03 16:03:15 +02:00
Frédéric van der Essen 0e255c2b90 [IMP] point_of_sale: refactored Orderline and Paymentline, new OrderWidget design 
bzr revid: fva@openerp.com-20120703114741-3xixto34i2wqfy0v
 2012-07-03 13:47:41 +02:00
Frédéric van der Essen f69643a4a1 [IMP] point_of_sale: order widget is now complete 
bzr revid: fva@openerp.com-20120628123825-hrat3tlhtyz8yv1i
 2012-06-28 14:38:25 +02:00
Thibault Delavallée 9e7f29ccd9 [IMP] point of sale: updated used iamge size to image_medium in point of sale. 
bzr revid: tde@openerp.com-20120628102735-lkidztrueu5emax0
 2012-06-28 12:27:35 +02:00
Thibault Delavallée bd42290522 [MERGE] Merged with trunk addons. 
bzr revid: tde@openerp.com-20120628090158-v3epmjb72eotwp3l
 2012-06-28 11:01:58 +02:00
Thibault Delavallée 3650c035f5 [IMP] product: images modified accordign to new spec. Propagated changes to stock/product and point of sale, and also to demo data. 
bzr revid: tde@openerp.com-20120628090133-zmdbmjeiajhtmo3m
 2012-06-28 11:01:33 +02:00
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them 
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
 2012-06-28 12:10:05 +05:30
Fabien Meghazi cd4c3b6c91 [CHG] Ashes to ashes, dashes to underscores. 
bzr revid: fme@openerp.com-20120627141352-7a6d23iebv03rcv3
 2012-06-27 16:13:52 +02:00
Frédéric van der Essen 1f0d6e4cb0 [IMP] point_of_sale: merged start() with renderElement() where possible 
bzr revid: fva@openerp.com-20120625100155-3ec0rk2bq61oy0lo
 2012-06-25 12:01:55 +02:00
Frédéric van der Essen 40405d11eb [IMP] point_of_sale: new order widget 
bzr revid: fva@openerp.com-20120622165355-jmex9f0vupidambm
 2012-06-22 18:53:55 +02:00
Frédéric van der Essen f68c7f936f [IMP] point_of_sale: scrollbar 
bzr revid: fva@openerp.com-20120621162352-v8msrulvti2hxjem
 2012-06-21 18:23:52 +02:00
Frédéric van der Essen 53d870aea0 [IMP] point_of_sale: some code simplifications 
bzr revid: fva@openerp.com-20120611152929-t7jsnqfeg5y63knl
 2012-06-11 17:29:29 +02:00
Frédéric van der Essen 0fcaa4edc7 [IMP] point_of_sale: screens refactor continued 
bzr revid: fva@openerp.com-20120611152022-26a91puoehxealqi
 2012-06-11 17:20:22 +02:00
Frédéric van der Essen d8d9b8349d [IMP] point_of_sale: refactoring screens to make it more extensible 
bzr revid: fva@openerp.com-20120611140441-13tksy80lrr9ndgh
 2012-06-11 16:04:41 +02:00
Frédéric van der Essen 7c5324ead0 [IMP] point_of_sale: shut down button and correct cashregister in selfCheckout 
bzr revid: fva@openerp.com-20120605094503-mh5wi096w704le5k
 2012-06-05 11:45:03 +02:00
Frédéric van der Essen ac91821836 [MERGE] point_of_sale: from stw, also draft of client payment integration 
bzr revid: fva@openerp.com-20120604162607-hvk3kmjwzhbfwo11
 2012-06-04 18:26:07 +02:00
Frédéric van der Essen 616bb7430e [WIP] point_of_sale: debug log tbrl 
bzr revid: fva@openerp.com-20120604152555-o175256oxe2ywl3x
 2012-06-04 17:25:55 +02:00
Frédéric van der Essen 54ecdba716 [FIX] point_of_sale: scale button removed when no scale, range check on discount & prices, skip receipt if printer 
bzr revid: fva@openerp.com-20120604150459-96z5e1h0kv02d4uo
 2012-06-04 17:04:59 +02:00
Frédéric van der Essen 123365d569 [IMP] point_of_sale: weighted categories, removed scan button, reinstated debug_devices 
bzr revid: fva@openerp.com-20120604115244-mbhybtte8y2md4nh
 2012-06-04 13:52:44 +02:00
Frédéric van der Essen f4b585bf71 [FIX] point_of_sale: missing file : loader.gif 
bzr revid: fva@openerp.com-20120601051419-9sp6j1vos6kqa5bn
 2012-06-01 07:14:19 +02:00
Frédéric van der Essen fd2d1a940b [WIP] point_of_sale: emergency merge 
bzr revid: fva@openerp.com-20120530110624-4caalfhlfmj9rpo4
 2012-05-30 13:06:24 +02:00
Frédéric van der Essen a81a9177f1 [IMP] point_of_sale: new category system 
bzr revid: fva@openerp.com-20120529163944-crk8dblg7t6b2ove
 2012-05-29 18:39:44 +02:00
Frédéric van der Essen 33c4a6177e [FIX] point_of_sale: related bankstatements are correctly associated, Also wip category system 
bzr revid: fva@openerp.com-20120529140008-w5ofj50a20e5251d
 2012-05-29 16:00:08 +02:00
Frédéric van der Essen df65b651e5 [FIX] point_of_sale: crash when adding product. Also draft of new categories system 
bzr revid: fva@openerp.com-20120529133141-wz1op0ep6a1l18e0
 2012-05-29 15:31:41 +02:00
Frédéric van der Essen 00b7fefcc4 [IMP] point_of_sale: adding a session opening popup if no session 
bzr revid: fva@openerp.com-20120525121539-qaywet30fcst1lvv
 2012-05-25 14:15:39 +02:00
Frédéric van der Essen d82f9f6c9d [FIX] point_of_sale: only show weightable products in scale screens 
bzr revid: fva@openerp.com-20120524153315-wa67qcyldrui8nrf
 2012-05-24 17:33:15 +02:00
Frédéric van der Essen f5679b7b8d [IMP] point_of_sale: put the receipt screen buttons in the action bar 
bzr revid: fva@openerp.com-20120524141408-10ru52eqcjbew2rw
 2012-05-24 16:14:08 +02:00
Frédéric van der Essen 68a5af5711 [IMP] point_of_sale: put the payment screen controls in the action bar 
bzr revid: fva@openerp.com-20120524133930-z3pwpinc6rdj86l3
 2012-05-24 15:39:30 +02:00
Frédéric van der Essen 8ef967a392 [FIX] point_of_sale: paypad buttons now show the journal name 
bzr revid: fva@openerp.com-20120524102257-wek9mozgvk9ww3p3
 2012-05-24 12:22:57 +02:00
Frédéric van der Essen c12dddf7a7 [FIX] point_of_sale: removed debug_devices. now uses real devices 
bzr revid: fva@openerp.com-20120523160255-fkoosqnpvcms3ro2
 2012-05-23 18:02:55 +02:00
Frédéric van der Essen dbba492cb9 [FIX] point_of_sale: payment_screen remained visible after first order 
bzr revid: fva@openerp.com-20120523152535-o89hee21ztrn7e55
 2012-05-23 17:25:35 +02:00
Frédéric van der Essen a4b9500758 [IMP] point_of_sale: draft of open_cashbox() and print_receipt() proxy calls 
bzr revid: fva@openerp.com-20120523140153-gkf998rszs7t0ddr
 2012-05-23 16:01:53 +02:00
Frédéric van der Essen c316dad6d6 [IMP] proxy upgraded to new JsonRPC API 
bzr revid: fva@openerp.com-20120523130011-mhso33xqk9aau5kc
 2012-05-23 15:00:11 +02:00
Frédéric van der Essen 7bd09320ce [IMP] point_of_sale: orderlines are correctly merged 
bzr revid: fva@openerp.com-20120523124754-lxzbqmzx2r9tn11p
 2012-05-23 14:47:54 +02:00
Frédéric van der Essen c4861d05ad [IMP] point_of_sale: orderlines are correctly merged 
bzr revid: fva@openerp.com-20120522145956-t0d3xnzx8f8mz15s
 2012-05-22 16:59:56 +02:00
Frédéric van der Essen 5ee1007bf2 [FIX] point_of_sale: retrieve bank_statements associated to current session only 
bzr revid: fva@openerp.com-20120522125332-t6epspfeqxknjypo
 2012-05-22 14:53:32 +02:00
Frédéric van der Essen a06edf236d [FIX] point_of_sale: payment screen widget now works ok 
bzr revid: fva@openerp.com-20120522103225-n4r03smsocyv0rrn
 2012-05-22 12:32:25 +02:00
Frédéric van der Essen 95112359b4 [IMP] point_of_sale: cleaned paypad, put pos_widget in all PosWidget childrens 
bzr revid: fva@openerp.com-20120521165721-vi81vnj0fpu30rrj
 2012-05-21 18:57:21 +02:00
Frédéric van der Essen ef2c6d95f8 [IMP] point_of_sale: some cleaning in pos_models.js 
bzr revid: fva@openerp.com-20120521140901-q5ofbhar04qqnrsq
 2012-05-21 16:09:01 +02:00
Frédéric van der Essen 959c3a82ac [FIX] point_of_sale: starting to revert cashregister removal 
bzr revid: fva@openerp.com-20120521091442-m7nizf0dv60ehy9k
 2012-05-21 11:14:42 +02:00
Frédéric van der Essen 313496382a [FIX] Forgot to add pos_basewidget.js 
bzr revid: fva@openerp.com-20120516130142-5u23uerr5s8y7ydq
 2012-05-16 15:01:42 +02:00
Frédéric van der Essen bce82f1800 [REF] point_of_sale: removing obsolete file 'pos2.js' 
bzr revid: fva@openerp.com-20120514154103-9mn4313q2kuylzvv
 2012-05-14 17:41:03 +02:00
Frédéric van der Essen 3a52dbb43a [IMP] point_of_sale: Added a Session Error popup 
bzr revid: fva@openerp.com-20120514143121-m5tmqhwanf8tube9
 2012-05-14 16:31:21 +02:00
Frédéric van der Essen e4b1260ace [MERGE] point_of_sale: merging pos backend updates from fp 
bzr revid: fva@openerp.com-20120514140751-mqmhjf9oejyub3x5
 2012-05-14 16:07:51 +02:00
Frédéric van der Essen c48ae3cf5b Removed qweb_template and OldWidget 
bzr revid: fva@openerp.com-20120514140340-5cjkget2wjfsnuva
 2012-05-14 16:03:40 +02:00
Frédéric van der Essen aff86833ff Starting to completely remove template_fct and OldWidget 
bzr revid: fva@openerp.com-20120511160223-uplh5mohr19skv02
 2012-05-11 18:02:23 +02:00
Stephane Wirtel 1050ef628c [IMP] point_of_sale: Show a popup when there is no pos session 
bzr revid: stw@openerp.com-20120509095555-sw6h3acxl9pn1537
 2012-05-09 11:55:55 +02:00
Frédéric van der Essen 8a09bcf83e removed debug logs, fixed product barcode scanning 
bzr revid: fva@openerp.com-20120509094438-0vibc269r3ayb6ta
 2012-05-09 11:44:38 +02:00
Stephane Wirtel 8f4c7e161d [FIX] point_of_sale: Check if there is at least one record 
bzr revid: stw@openerp.com-20120508164226-1vn2ub22ioo5gtly
 2012-05-08 18:42:26 +02:00
Stephane Wirtel b00b7a6434 [FIX] point_of_sale: Add the ean13 field in the frontend 
bzr revid: stw@openerp.com-20120508154942-sou5eycvhxd8st5w
 2012-05-08 17:49:42 +02:00
Frédéric van der Essen d70107e5d4 Merge backend integration from stw 
bzr revid: fva@openerp.com-20120508154217-2n31oip0fb9i654z
 2012-05-08 17:42:17 +02:00
Frédéric van der Essen 7e38590ac3 Forgot to add pictures, handling of codebar scanning in popups, client mode payment fixes 
bzr revid: fva@openerp.com-20120508154030-f62eahx7c801lxnz
 2012-05-08 17:40:30 +02:00
Stephane Wirtel 72c89a2028 [FIX] point_of_sale: Begin the connection between the frontend and the backend 
bzr revid: stw@openerp.com-20120508152805-874rbq1jv8mpvwo6
 2012-05-08 17:28:05 +02:00
Frédéric van der Essen d4cbce0ce7 barcode scanning fixes 
bzr revid: fva@openerp.com-20120508123701-pb641zlrwd183pf1
 2012-05-08 14:37:01 +02:00
Frédéric van der Essen 2227cfc68d debug logs 
bzr revid: fva@openerp.com-20120507141857-1t3fv90kw9v4b7bn
 2012-05-07 16:18:57 +02:00
Frédéric van der Essen 5516784233 barcode reader simulation 
bzr revid: fva@openerp.com-20120507131414-svwk1fbvc25rztza
 2012-05-07 15:14:14 +02:00
Frédéric van der Essen b0e1d063f7 merge fix from antony 
bzr revid: fva@openerp.com-20120507124110-5t71dhfyulak5k9e
 2012-05-07 14:41:10 +02:00
Frédéric van der Essen 2c6acfab41 More Popups, total is updated 
bzr revid: fva@openerp.com-20120507123932-mm38346wbz3ynt3k
 2012-05-07 14:39:32 +02:00
Frédéric van der Essen b8427b9a85 Further progress : Help Popup, Weighting 
bzr revid: fva@openerp.com-20120506213439-0met6jzt93r5thry
 2012-05-06 23:34:39 +02:00
Antony Lesuisse d9948b6bad [FIX] point_of_sale typo only load pos enabled products 
bzr revid: al@openerp.com-20120505161252-ozwb5ekestuthee4
 2012-05-05 18:12:52 +02:00
Stephane Wirtel d7b5e5a6ef [IMP] point_of_sale: create a session if there is not session for the connected user 
bzr revid: stw@openerp.com-20120504152720-nqfhr5aclihpfiis
 2012-05-04 17:27:20 +02:00
Stephane Wirtel 0f8529cb36 [MERGE] lp:~openerp-dev/openobject-addons/trunk-pos-fva 
bzr revid: stw@openerp.com-20120504131853-rip17dks4fjxzwbp
 2012-05-04 15:18:53 +02:00
Frédéric van der Essen e56de26bcc removed custom help buttons 
bzr revid: fva@openerp.com-20120504123033-mffgt1x9swahq5oe
 2012-05-04 14:30:33 +02:00
Frédéric van der Essen 5fafeb4c89 New action bar draft 
bzr revid: fva@openerp.com-20120504122448-bhs06j1lgoauss58
 2012-05-04 14:24:48 +02:00
Frédéric van der Essen bf9fc9b13c Showing and hiding widgets in different screens and modes 
bzr revid: fva@openerp.com-20120504102737-gfi4kggapocpnxrk
 2012-05-04 12:27:37 +02:00
Frédéric van der Essen 22c0ae2d8b Client and cashier mode 
bzr revid: fva@openerp.com-20120504094825-fb0ku12w3kq1ubcf
 2012-05-04 11:48:25 +02:00
Frédéric van der Essen fa4b14487d Forgot to add pos_screens.js 
bzr revid: fva@openerp.com-20120503171523-rmew4wbblrw3hpyk
 2012-05-03 19:15:23 +02:00
Frédéric van der Essen 850ed87082 Draft of the product scale screen 
bzr revid: fva@openerp.com-20120503164032-zoe5rini8lj7kw1i
 2012-05-03 18:40:32 +02:00
Frédéric van der Essen 05535cf4e9 Added a few more screens 
bzr revid: fva@openerp.com-20120503162746-lo7m3qno48jcanyz
 2012-05-03 18:27:46 +02:00
Frédéric van der Essen 54152c805d Proxy Interface, Made barcode scanner generic 
bzr revid: fva@openerp.com-20120503121441-wrmku0twt2414kho
 2012-05-03 14:14:41 +02:00
Frédéric van der Essen a7d742082b Refactored Steps into Screens, with a different widget for each screen 
bzr revid: fva@openerp.com-20120502153000-5hnh3zv122xdav47
 2012-05-02 17:30:00 +02:00
Stephane Wirtel afa3cf71e8 [REF] Remove unused file 
bzr revid: stw@openerp.com-20120430092719-st813fyhkkqstbcf
 2012-04-30 11:27:19 +02:00
Stephane Wirtel 1070cda369 [MERGE] lp:~openerp-dev/openobject-addons/trunk-pos-fva 
bzr revid: stw@openerp.com-20120430092650-3oozjjx9pgbqh73j
 2012-04-30 11:26:50 +02:00
Frédéric van der Essen a2a24f2cd4 Draft of Screen API for Screen widgets 
bzr revid: fva@openerp.com-20120426144701-s392ynlxdetnwtvk
 2012-04-26 16:47:01 +02:00
Frédéric van der Essen 67341a8cef Add test button 
bzr revid: fva@openerp.com-20120426112655-s6j7qt098ptecwwf
 2012-04-26 13:26:55 +02:00
Frédéric van der Essen 2416f64ca2 Merged POSWidget and ShopWidget 
bzr revid: fva@openerp.com-20120426100548-chrc9sdozi8hhjq6
 2012-04-26 12:05:48 +02:00
Frédéric van der Essen 4a488a32bb Merged App and POSWidget 
bzr revid: fva@openerp.com-20120425145555-hk48b24efi6f3nti
 2012-04-25 16:55:55 +02:00
Stephane Wirtel 0f5be3184d [MERGE] 
bzr revid: stw@openerp.com-20120425142459-48afvhj8obflfive
 2012-04-25 16:24:59 +02:00
Frédéric van der Essen 2ae6854f17 extracted the Barcode reader into a new submodule 
bzr revid: fva@openerp.com-20120425113802-3o5qty2auy50ne8r
 2012-04-25 13:38:02 +02:00
Frédéric van der Essen e8e7304723 [PoS] Merged the PosModel and Shop classes 
bzr revid: fva@openerp.com-20120424172047-1wz31qi2hih3decs
 2012-04-24 19:20:47 +02:00
Frédéric van der Essen bbbf338436 [PoS] Removed old pos.js file 
bzr revid: fva@openerp.com-20120424162802-o2diexi57p02fjr8
 2012-04-24 18:28:02 +02:00
Frédéric van der Essen 4efe726fdf [POS] Split the pos code into files 
bzr revid: fva@openerp.com-20120424162546-3w604gxmfb0ezt47
 2012-04-24 18:25:46 +02:00
Frédéric van der Essen 8a9ce7b98e [PoS] Removed pos global variable 
bzr revid: fva@openerp.com-20120424140257-jn0fadimt6o62qhc
 2012-04-24 16:02:57 +02:00
Frédéric van der Essen 82ce9a94d3 [AARGH] First deglobalization of the pos variable, renamed to posmodel 
bzr revid: fva@openerp.com-20120420144611-5v0yod3bxo7odwaf
 2012-04-20 16:46:11 +02:00
Frédéric van der Essen dd42fc4a03 [IMP] Images for the action bar 
bzr revid: fva@openerp.com-20120418155314-s9i15jzid5xuv9j1
 2012-04-18 17:53:14 +02:00
Frédéric van der Essen 3a10debd1f [IMP] action bar 
bzr revid: fva@openerp.com-20120418141144-g2653zv5vn33xfm5
 2012-04-18 16:11:44 +02:00
niv-openerp b12d4bce8d [imp] implemented dao interface 
bzr revid: nicolas.vanhoren@openerp.com-20120417091836-ej2g238h7x7firnp
 2012-04-17 11:18:36 +02:00
niv-openerp 43358fe249 [imp] renammed products to product_list for lisibility 
bzr revid: nicolas.vanhoren@openerp.com-20120416171042-304swvgac38mrmkm
 2012-04-16 19:10:42 +02:00
niv-openerp 2b2a203a04 [imp] completely removed store class 
bzr revid: nicolas.vanhoren@openerp.com-20120416170721-swgsf8pyeg7y8uf8
 2012-04-16 19:07:21 +02:00
niv-openerp 88eeba0864 [imp] removed all references to model names 
bzr revid: nicolas.vanhoren@openerp.com-20120416170407-l1jv5i6j06rh6dus
 2012-04-16 19:04:07 +02:00
niv-openerp 5f69244e75 wip 
bzr revid: nicolas.vanhoren@openerp.com-20120416165630-sk808rmb31ztjqsf
 2012-04-16 18:56:30 +02:00
niv-openerp 81148c0b09 [imp] extracted fetch to make it less generic 
bzr revid: nicolas.vanhoren@openerp.com-20120416162049-9mjgz6ul0zq1lzag
 2012-04-16 18:20:49 +02:00
Frédéric van der Essen e81d9fd69e Dummy asynchronous storage as a preparation for a proper db 
bzr revid: fva@openerp.com-20120416161203-3dd0oc9ywe5pvard
 2012-04-16 18:12:03 +02:00
Frédéric van der Essen c9a57f0921 [MERGE] from trunk 
bzr revid: fva@openerp.com-20120416142215-vz4d1cthpplh1hk8
 2012-04-16 16:22:15 +02:00
Frédéric van der Essen e90e598dff Renamed db to session, draft of the SqlStore 
bzr revid: fva@openerp.com-20120416104144-ijzqhul3m7r0b62g
 2012-04-16 12:41:44 +02:00
Stephane Wirtel 24687ac6bc [FIX] point_of_sale: Add some basic elements for new features 
bzr revid: stw@openerp.com-20120416090122-52h5qt0tyga70p3r
 2012-04-16 11:01:22 +02:00
Stephane Wirtel 71f6177e3c [MERGE] Upstream 
bzr revid: stw@openerp.com-20120416090011-bnijlgpndgb5wiyq
 2012-04-16 11:00:11 +02:00
Roberto López López (OpenERP) 0d3cd92c1b [fix] substitute this by self, this.shop is out of scope 
bzr revid: rlo@openerp.com-20120413140421-w2ff0cryr96l5djk
 2012-04-13 16:04:21 +02:00
Stephane Wirtel f7dbac942a [IMP] point_of_sale: Add the proxy skeleton 
bzr revid: stw@openerp.com-20120413041759-kkizmoau2ns6xi82
 2012-04-13 06:17:59 +02:00
Frédéric van der Essen a6526301f9 [IMP] some refactoring of the pos 
bzr revid: fva@openerp.com-20120410104247-bfk6031bn861091v
 2012-04-10 12:42:47 +02:00
Frédéric van der Essen 7a54f94ac0 [IMP] First working draft of the OnScreen Keyboard 
bzr revid: fva@openerp.com-20120405125843-axg3m7h10g5sg6mx
 2012-04-05 14:58:43 +02:00
Frédéric van der Essen ef10d28de9 [FIX] Comment in the wrong place 
bzr revid: fva@openerp.com-20120403084658-j19s285vjd307ag7
 2012-04-03 10:46:58 +02:00
Roberto López López (OpenERP) 34610c1e61 [fix] modify according to review: split functionalities into different functions 
bzr revid: rlo@openerp.com-20120403082803-hvvd65cl64qmzvms
 2012-04-03 10:28:03 +02:00
Frédéric van der Essen a7bdd4e172 [FIX] Remove debug console.log 
bzr revid: fva@openerp.com-20120402161754-dmhty19ag58aow2q
 2012-04-02 18:17:54 +02:00
Frédéric van der Essen d7d7500588 [IMP]Cleaned more syntax, added comments, removed __extends() 
bzr revid: fva@openerp.com-20120402155005-6rpin43aho26h1yz
 2012-04-02 17:50:05 +02:00
Frédéric van der Essen c407affde9 [IMP]Cleaned syntax of the Backbone models 
bzr revid: fva@openerp.com-20120402142513-funzsxkit810c3q2
 2012-04-02 16:25:13 +02:00
Roberto López López (OpenERP) c053aab30e [fix] remove unused code 
bzr revid: rlo@openerp.com-20120402091343-8dltnmyld7yk2yo2
 2012-04-02 11:13:43 +02:00
Roberto López López (OpenERP) e3a0621112 [fix] fix search field 'clear' button 
bzr revid: rlo@openerp.com-20120330124207-5c4lb61al2c1q8s2
 2012-03-30 14:42:07 +02:00
Roberto López López (OpenERP) caba6de06e [imp] working weight barcodes 
bzr revid: rlo@openerp.com-20120330114225-iouhxmyv3hb3xbcd
 2012-03-30 13:42:25 +02:00
Roberto López López (OpenERP) de6a900972 [imp] working price barcodes 
bzr revid: rlo@openerp.com-20120330111617-fnc85bpk26eevicc
 2012-03-30 13:16:17 +02:00
Roberto López López (OpenERP) 09506d254a [imp] partially working price/weight barcodes 
bzr revid: rlo@openerp.com-20120330100221-tjzbpqfp1wzv9n6w
 2012-03-30 12:02:21 +02:00
Roberto López López (OpenERP) 0a77d53dea [imp] currency conversion (partial) 
bzr revid: rlo@openerp.com-20120329121223-gb0d9sbpdjijaf0t
 2012-03-29 14:12:23 +02:00
Roberto López López (OpenERP) 646e0334c8 [fix] fix 'in' expression when reading a price or weight barcode 
bzr revid: rlo@openerp.com-20120329102548-gnffz8am3m755agq
 2012-03-29 12:25:48 +02:00
Roberto López López (OpenERP) c67aea4ed7 [imp] improved dc check 
bzr revid: rlo@openerp.com-20120329100427-r5pk59e5dnne99ou
 2012-03-29 12:04:27 +02:00
Roberto López López (OpenERP) 6178afe4be [imp] unit barcode 
bzr revid: rlo@openerp.com-20120328134656-zxxdpa861q2qk3r5
 2012-03-28 15:46:56 +02:00
Roberto López López (OpenERP) ce55e113ed [imp] control digit check + more demo data 
bzr revid: rlo@openerp.com-20120328100337-aypdlk8o9revqpm6
 2012-03-28 12:03:37 +02:00
Roberto López López (OpenERP) e515089023 [imp] currency conversion - yet incomplete 
bzr revid: rlo@openerp.com-20120327141422-9grv8dw70q89ayx5
 2012-03-27 16:14:22 +02:00
Roberto López López (OpenERP) b6fa154cbc [imp] add control digit 
bzr revid: rlo@openerp.com-20120327082545-y3fzc2rysefx0k2q
 2012-03-27 10:25:45 +02:00
Roberto López López (OpenERP) e70087c874 [imp] add control digit 
bzr revid: rlo@openerp.com-20120327065322-a7gegbmtrtjexn41
 2012-03-27 08:53:22 +02:00
Roberto López López (OpenERP) d849defd2a [imp] dialog height 
bzr revid: rlo@openerp.com-20120326143900-qb6g01z9wsdzuyac
 2012-03-26 16:39:00 +02:00
Roberto López López (OpenERP) 08e30b83bf [imp] warning product not recognized 
bzr revid: rlo@openerp.com-20120326122743-3m6c24j0dnb9c1yq
 2012-03-26 14:27:43 +02:00
Roberto López López (OpenERP) e398d3aa12 [fix] correct js syntax 
bzr revid: rlo@openerp.com-20120326093605-72k4ewcnw4xzmnid
 2012-03-26 11:36:05 +02:00
Roberto López López (OpenERP) 7fc89ff1d8 [imp] modified code after Stéphane instructions 
bzr revid: rlo@openerp.com-20120323143136-0qhzjnttnxei7xpi
 2012-03-23 15:31:36 +01:00
Roberto López López (OpenERP) 337fe0c8ee [fix] 
bzr revid: rlo@openerp.com-20120322140814-mvo7e1qh4svom3tw
 2012-03-22 15:08:14 +01:00
Roberto López López (OpenERP) 36e5619bf3 [fix] clean debug output and improve digits detection 
bzr revid: rlo@openerp.com-20120322130519-0zxr8wif2sl3nr47
 2012-03-22 14:05:19 +01:00
Roberto López López (OpenERP) 315a75679b [imp] working integration barcode reader - point of sale order 
bzr revid: rlo@openerp.com-20120322102724-nfakdy4ug5pnm6he
 2012-03-22 11:27:24 +01:00
Roberto López López (OpenERP) 3b81d145b4 [imp] get the barcode of each product during the init method of the point of sale. Thus, the product can be detected using its barcode. Insertion into the current order still pending 
bzr revid: rlo@openerp.com-20120322092558-sw7pll78qim6v51q
 2012-03-22 10:25:58 +01:00
Roberto López López (OpenERP) 1677026b0b [imp] unbind barcode reader events when closing point of sale 
bzr revid: rlo@openerp.com-20120321100414-h5qsu1qumbil8uks
 2012-03-21 11:04:14 +01:00
Roberto López López (OpenERP) 2f0d87381b [imp] barcode reader events are successfully delegated 
bzr revid: rlo@openerp.com-20120321094311-bb12qnp46ch29pt1
 2012-03-21 10:43:11 +01:00
Roberto López López (OpenERP) 0f0ecfd90f [imp] 
bzr revid: rlo@openerp.com-20120320154620-c5f5o2og5dmai7je
 2012-03-20 16:46:20 +01:00
Roberto López López (OpenERP) d122787e45 [fix] move jquery.barcodelistener 
bzr revid: rlo@openerp.com-20120320085111-s9i0l92u9vkushrh
 2012-03-20 09:51:11 +01:00
Roberto López López (OpenERP) b66aa99a85 [fix] move jquery.barcodelistener 
bzr revid: rlo@openerp.com-20120320084729-x2zo7n01jamsfkt5
 2012-03-20 09:47:29 +01:00
Roberto López López (OpenERP) 42a97a3a9d [fix] move jquery.barcodelistener 
bzr revid: rlo@openerp.com-20120320084705-2s7lewxb8x2hkg0z
 2012-03-20 09:47:05 +01:00
Roberto López López (OpenERP) befafc71d5 [imp] add required jquery plugin 
bzr revid: rlo@openerp.com-20120319112015-788gds4aioshyvco
 2012-03-19 12:20:15 +01:00
niv-openerp df1cfd1e8f [imp] changed the way the point of sale switch to fullscreen 
bzr revid: nicolas.vanhoren@openerp.com-20120307150549-rzkjz0j79l6mpjqs
 2012-03-07 16:05:49 +01:00
niv-openerp e543b9a8fb [imp] adaptation to .js due to changes in web 
bzr revid: nicolas.vanhoren@openerp.com-20120229123450-mn8zpku48uqlryeh
 2012-02-29 13:34:50 +01:00
Olivier Dony 318d99d029 [MERGE] Latest bugfixes from 6.1 
bzr revid: odo@openerp.com-20120229094502-sp0xrg4yf5uvq5k9
 2012-02-29 10:45:02 +01:00
Christophe Simonis f37ea622cb [FIX] point_of_sale: works when used in embed mode 
bzr revid: chs@openerp.com-20120224144939-550wsvj448fk3yfb
 2012-02-24 15:49:39 +01:00
niv-openerp 2ecdb960d0 [imp] refactoring of ParentedMixin 
bzr revid: nicolas.vanhoren@openerp.com-20120221164536-zajw6gixwu4n4xgh
 2012-02-21 17:45:36 +01:00
vishmita 487f04bc21 [FIX]Update Sales Totals. 
bzr revid: vja@vja-desktop-20120210073243-m6x0hf0h99rodu9f
 2012-02-10 13:02:43 +05:30
Fabien Pinckaers 264fd84294 [FIX] scale product images for POS frontend 
bzr revid: fp@tinyerp.com-20120209142355-5sbet2x1zjdow3z5
 2012-02-09 15:23:55 +01:00
Raphael Collet d6b9c4bbbe [MERGE] lp:927579 (point_of_sale: fix css typos) 
bzr revid: rco@openerp.com-20120208091820-z8pgzygwiosol31i
 2012-02-08 10:18:20 +01:00
niv-openerp 118131c772 [fix] removed auto-next after print in pos 
bzr revid: nicolas.vanhoren@openerp.com-20120206134351-8apoozde3egw5dbi
 2012-02-06 14:43:51 +01:00
Stefan Rijnhart 29d30aea27 [FIX] Typo 'rigth' <-> 'right' 
lp bug: https://launchpad.net/bugs/927579 fixed

bzr revid: stefan@therp.nl-20120206115020-3kk6fzj9fndf6wry
 2012-02-06 12:50:20 +01:00
niv-openerp 846c19bf88 [imp] refactoring in Widget in Web client 
bzr revid: nicolas.vanhoren@openerp.com-20120124145900-8a8gu19gfl2vrgw6
 2012-01-24 15:59:00 +01:00
niv-openerp b693864e01 [imp] removed steps status bar 
bzr revid: nicolas.vanhoren@openerp.com-20120109164517-ej1zfz5xjq0nuyez
 2012-01-09 17:45:17 +01:00
niv-openerp c86f880aa0 [imp] added possibility to go back to products screen 
bzr revid: nicolas.vanhoren@openerp.com-20120109162126-zq5qphas06jeuf83
 2012-01-09 17:21:26 +01:00
niv-openerp 8d598e49e3 [imp] switched to correct tax calculation 
bzr revid: nicolas.vanhoren@openerp.com-20120105143530-8rhlec72g9gt0q80
 2012-01-05 15:35:30 +01:00
niv-openerp afba9ceb71 [imp] added algorithm from fp to calculate taxes 
bzr revid: nicolas.vanhoren@openerp.com-20120105141817-whw7hhlb5ggdeas4
 2012-01-05 15:18:17 +01:00
niv-openerp 3598bddb7c [imp] copied order creation login to the server 
bzr revid: nicolas.vanhoren@openerp.com-20120105131319-9pnr25ms12szttx7
 2012-01-05 14:13:19 +01:00
niv-openerp cc554cab23 [merge] 
bzr revid: nicolas.vanhoren@openerp.com-20120105130649-peftu9zzz6698wvl
 2012-01-05 14:06:49 +01:00
niv-openerp b1b2401034 [imp] improved design of order saving functions 
bzr revid: nicolas.vanhoren@openerp.com-20120105130624-28ry8w1eo6qnvn5u
 2012-01-05 14:06:24 +01:00
vishmita 4cd7dc6e3b [FIX]In POS qty,disc,price buttons are not working. 
lp bug: https://launchpad.net/bugs/911100 fixed

bzr revid: vja@vja-desktop-20120104094535-raogxsj4df6bt05d
 2012-01-04 15:15:35 +05:30
Raphael Collet 82ff85e770 [MERGE] lp:908750 (pos: remove redundant field 'img', and use 'product_image' instead) 
bzr revid: rco@openerp.com-20120105085658-1epi60v4s3742vqv
 2012-01-05 09:56:58 +01:00
niv-openerp 0e3809d8cc [fix] problem when too much order 
bzr revid: nicolas.vanhoren@openerp.com-20120104133329-5c2x0cp2pzwwt3hj
 2012-01-04 14:33:29 +01:00
niv-openerp 3186c54f28 [imp] closes when the print is done 
bzr revid: nicolas.vanhoren@openerp.com-20120103103716-wslae4t6cofdq0hy
 2012-01-03 11:37:16 +01:00
niv-openerp 221dcfc074 [imp] improvements of order tabs 
bzr revid: nicolas.vanhoren@openerp.com-20120103100753-pvyxqxectytez73y
 2012-01-03 11:07:53 +01:00
niv-openerp 7e8ef0546e [imp] cosmetic improvement 
bzr revid: nicolas.vanhoren@openerp.com-20120102113053-e321qxvolxzxzz8b
 2012-01-02 12:30:53 +01:00
Bharat Devnani (OpenERP) d49337abb0 [FIX] pos : After installing pos product has two fields img and product_image 
lp bug: https://launchpad.net/bugs/908750 fixed

bzr revid: bde@tinyerp.com-20111230100931-k9ub0nqq4ae0ivrv
 2011-12-30 15:39:31 +05:30
niv-openerp ca9b8158aa [fix] small problem with scrollbar in order lines in pos 
bzr revid: nicolas.vanhoren@openerp.com-20111223161502-qtva9qrk3ifn9q25
 2011-12-23 17:15:02 +01:00
niv-openerp 60436dedf9 [fix] small css problem 
lp bug: https://launchpad.net/bugs/905021 fixed

bzr revid: nicolas.vanhoren@openerp.com-20111223113239-a1vi53x3zlwpsgrt
 2011-12-23 12:32:39 +01:00
niv-openerp fe56720ee9 [fix] small problem with payment button 
bzr revid: nicolas.vanhoren@openerp.com-20111222134350-utrh2qqexeh103bh
 2011-12-22 14:43:50 +01:00
Minh Tran 52ead43457 Changed module icons 
bzr revid: mit@openerp.com-20111221173739-pl26y182tgjb1s2j
 2011-12-21 18:37:39 +01:00
niv-openerp 49823622de [merge] improvements to pos 
bzr revid: nicolas.vanhoren@openerp.com-20111219132705-loei0ppbvxns3z39
 2011-12-19 14:27:05 +01:00
niv-openerp 7619349d9a [fix] problem when changing amount of payment line 
bzr revid: nicolas.vanhoren@openerp.com-20111219132244-719sqadq7hb0t2sp
 2011-12-19 14:22:44 +01:00
niv-openerp e9350239b0 [imp] added delete payment line 
bzr revid: nicolas.vanhoren@openerp.com-20111219131750-ts70x8ng44grf63g
 2011-12-19 14:17:50 +01:00