Commit Graph

113 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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
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 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
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
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
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
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
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 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
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 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 e9350239b0 [imp] added delete payment line
bzr revid: nicolas.vanhoren@openerp.com-20111219131750-ts70x8ng44grf63g
2011-12-19 14:17:50 +01:00
niv-openerp 8d2f664100 [imp] added print button
bzr revid: nicolas.vanhoren@openerp.com-20111219124547-1vjs6oftrp3zv3ry
2011-12-19 13:45:47 +01:00
niv-openerp 7fe7189365 [imp] improved numpad
bzr revid: nicolas.vanhoren@openerp.com-20111216160858-f9ruclwhdmebjoqc
2011-12-16 17:08:58 +01:00
niv-openerp fe721330c3 [imp] added stuff
bzr revid: nicolas.vanhoren@openerp.com-20111216124419-hviz2o5f0ujyl5bu
2011-12-16 13:44:19 +01:00
niv-openerp 64496f511e [imp] improved the marvelous ticket
bzr revid: nicolas.vanhoren@openerp.com-20111215164912-cokw45ity9wm9b2s
2011-12-15 17:49:12 +01:00
niv-openerp c3c6ae8771 [imp] improved ticket
bzr revid: nicolas.vanhoren@openerp.com-20111215154404-jnbeoswdwjkr3tk2
2011-12-15 16:44:04 +01:00
niv-openerp 7e241a1e4a [imp] refactored ticket
bzr revid: nicolas.vanhoren@openerp.com-20111215151442-qwej1sb8kiokbfov
2011-12-15 16:14:42 +01:00
niv-openerp 9e74b94e5c [imp] soft coded the €
bzr revid: nicolas.vanhoren@openerp.com-20111214145426-brfbdzyaq15y7brv
2011-12-14 15:54:26 +01:00
niv-openerp b5d844d2e6 [imp] added warning when we try to exit the pos with pending changes
bzr revid: nicolas.vanhoren@openerp.com-20111213140732-kfu92k7wb6rcp9ie
2011-12-13 15:07:32 +01:00
niv-openerp 0941028b44 [imp] added notifications when there is pending operations
bzr revid: nicolas.vanhoren@openerp.com-20111213134534-xiyd0h096pei1k70
2011-12-13 14:45:34 +01:00
niv-openerp 6bbc8b1e31 [imp] renammed "Back" into "Close"
bzr revid: nicolas.vanhoren@openerp.com-20111212161218-9dfsm336yg25qsxw
2011-12-12 17:12:18 +01:00
niv-openerp 99e9fa2815 [imp] nivified receipt view
bzr revid: nicolas.vanhoren@openerp.com-20111121141428-tv18n8itxjo20tvk
2011-11-21 19:44:28 +05:30
niv-openerp 263ff95a19 [imp] nivified product list
bzr revid: nicolas.vanhoren@openerp.com-20111121113617-75h2d5ka302rnf3c
2011-11-21 17:06:17 +05:30
niv-openerp db36bc97b4 [fix] categories were broken
bzr revid: nicolas.vanhoren@openerp.com-20111107141323-zmariwqu0qns3bcm
2011-11-07 15:13:23 +01:00
niv-openerp 085f90d989 [imp] added back button + removed backbone history
bzr revid: nicolas.vanhoren@openerp.com-20111104154312-uolo3j36lg1zwfxh
2011-11-04 16:43:12 +01:00
niv-openerp 27bcb90696 [imp] some css for the ticket de caisse (^^)
bzr revid: nicolas.vanhoren@openerp.com-20111006150950-nhj0ccg8hlrdz2pw
2011-10-06 17:09:50 +02:00
niv-openerp f76f558c57 [imp] removed loggin stuff
bzr revid: nicolas.vanhoren@openerp.com-20111006150447-4k6kpzh0mvs2oxd4
2011-10-06 17:04:47 +02:00
niv-openerp bd70ddcb83 [imp] mostly css improvements
bzr revid: nicolas.vanhoren@openerp.com-20111006150231-y8ybpunzis21za0d
2011-10-06 17:02:31 +02:00
niv-openerp 84dc81adfc [imp] some design improvements in payment
bzr revid: nicolas.vanhoren@openerp.com-20111005150651-beakw4xaeh2yngv4
2011-10-05 17:06:51 +02:00
niv-openerp b16e0f0100 [imp] refactored to not depend on html and body any more
bzr revid: nicolas.vanhoren@openerp.com-20111004152832-xl4l3nitlba7vfac
2011-10-04 17:28:32 +02:00
niv-openerp dbfdefd5b7 [imp] completely converted all underscore templates to qweb templates
bzr revid: nicolas.vanhoren@openerp.com-20111004115555-6qx8483eorn6cpv5
2011-10-04 13:55:55 +02:00
niv-openerp 1d0e74cc9d [imp] converted html in .html file to qweb
bzr revid: nicolas.vanhoren@openerp.com-20111004113932-m06ug2lscp8pubh6
2011-10-04 13:39:32 +02:00