Commit Graph

455 Commits

Author SHA1 Message Date
Olivier Dony 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
Christophe Simonis df8d972057 [IMP] */static/description/index.html: link to /start include app name
bzr revid: chs@openerp.com-20130715162504-9ntu1dj222rgv9ek
2013-07-15 18:25:04 +02:00
Frédéric van der Essen 3c44559811 [IMP] point_of_sale: reduced the weighting probe interval, and put a non zero default value for easier testing
bzr revid: fva@openerp.com-20130712123455-whp86jp9qbmo6p0o
2013-07-12 14:34:55 +02:00
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
Antony Lesuisse fc70550ca2 [IMP] move html module description and icon
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
Frédéric van der Essen 4f51882863 [IMP] point_of_sale: reworked the way the weighting debug mode works to make it more robust
bzr revid: fva@openerp.com-20130708145522-6r5yedizrg9h6m0r
2013-07-08 16:55:22 +02:00
Frédéric van der Essen 3c7ec1fa87 [MERGE] from upstream
bzr revid: fva@openerp.com-20130708133731-wiqisp3xptij3in5
2013-07-08 15:37:31 +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 06675241d0 [FIX] point_of_sale: weighting end signal could fail to emit in debug mode
bzr revid: fva@openerp.com-20130708124912-0t8l8v13ug3hst7m
2013-07-08 14:49:12 +02:00
Xavier Morel 8c2ff8be58 [FIX] call this.print on end of ReceiptScreenWidget.show instead of explicit window.print
print method already existed, probably to allow overriding printing, but it was not actually called

bzr revid: xmo@openerp.com-20130704141256-u5n7a4kfmqac8n9z
2013-07-04 16:12:56 +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
Thibault Delavallée 1a51e9b88d [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130614141720-7qjo6fpkm83jhpm2
2013-06-14 16:17:20 +02:00
Christophe Simonis aa133b4d29 [MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
2013-06-14 11:19:24 +02:00
Olivier Dony eba937757f [MERGE] OPW 586154: pos: some missing translation marks in POS GUI
lp bug: https://launchpad.net/bugs/1165321 fixed

bzr revid: odo@openerp.com-20130606150820-ckz8q2i9u9k71uq2
2013-06-06 17:08:20 +02:00
sgo@tinyerp.com 45d760773e [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130603131453-t3m0b9emuyp2tmsx
2013-06-03 18:44:53 +05:30
Vidhin Mehta 5fa8cdd305 bzr revid: vme@tinyerp.com-20130523071814-o5suitn0hcy12mie 2013-05-23 12:48:14 +05:30
Vidhin Mehta 82657c43a8 [IMP]Make indentation as it is.
bzr revid: vme@tinyerp.com-20130523070624-8q2d2zj2zjnn8l31
2013-05-23 12:36:24 +05:30
Vidhin Mehta 2f15045af4 [FIX]Fixes on, need fixing issues by MAT.
bzr revid: vme@tinyerp.com-20130523060223-hupizjpulghv8gsy
2013-05-23 11:32:23 +05:30
Vidhin Mehta c745a1d882 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130514120110-gi2oehiapff1n3p0
bzr revid: vme@tinyerp.com-20130523051758-70etk8qp90k8e9ou
2013-05-23 10:47:58 +05:30
Thibault Delavallée 8aa85c2523 [FORWARD] Forward port of addons until revision 8711
bzr revid: tde@openerp.com-20130521133807-5n97jep45f3lf6uq
bzr revid: tde@openerp.com-20130522083012-4yry4ht2943sjatn
2013-05-22 10:30:12 +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
Frédéric van der Essen 6d03a9be51 [FIX] point_of_sale: wrong ean field for packagings
bzr revid: fva@openerp.com-20130521090942-hvtze13ek6p7nguo
2013-05-21 11:09:42 +02:00
Fabien Pinckaers afd7d79966 [IMP] medium images in pos
bzr revid: fp@tinyerp.com-20130517071738-uw130g0sxbu14yrq
2013-05-17 09:17:38 +02:00
Martin Trigaux 182118eb8c [MERGE] kill the executable bit on things that are clearly not executables or scripts
bzr revid: mat@openerp.com-20130508144521-bkvms15maji1ykpb
2013-05-08 16:45:21 +02:00
Vidhin Mehta dc42de0f39 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130419070448-brwasgl89cp71o7y
2013-04-19 12:34:48 +05:30
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 74b3538dd1 [IMP] point_of_sale: add an invoice button (does nothing yet)
bzr revid: fva@openerp.com-20130327154054-nhfy6ak73v1gwj09
2013-03-27 16:40:54 +01:00
Frédéric van der Essen 28ed62fd7e [IMP] point_of_sale: adding visual feedback when clicking on buttons
bzr revid: fva@openerp.com-20130327151518-t4h67hqn02s80tai
2013-03-27 16:15:18 +01:00
Frédéric van der Essen 6624bf9675 [FIX] point_of_sale: add scrollbar when there are too much payment methods
bzr revid: fva@openerp.com-20130327141426-ivgfxlsxlpazehar
2013-03-27 15:14:26 +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 b8a33bc393 [MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130318071519-3pae2jh7nk2iaqpe
2013-03-18 12:45:19 +05:30
Frederic van der Essen 95f3847244 [FIX] point_of_sale: potentially improve performance when loading lots of categories
bzr revid: fred@pc-fred.localhost-20130312150638-s980pt6pezi16x2j
2013-03-12 16:06:38 +01:00
Mohammed Shekha a75891e1b6 [FIX]Fixed the issue of translation of POS action buttons.
bzr revid: msh@openerp.com-20130218055402-zaxa2g6c4o0t6cu5
2013-02-18 11:24:02 +05:30
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 b5a47b24fc [FIX] point_of_sale: css gradient fix
bzr revid: fva@openerp.com-20130129152421-sgke1e3ckh9ohppi
2013-01-29 16:24:21 +01:00
Frédéric van der Essen a06e93e218 [FIX] point_of_sale: keyboard focus for payment widget
bzr revid: fva@openerp.com-20130129140146-uz1jpmv4u3dmulus
2013-01-29 15:01:46 +01:00
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
Vidhin Mehta b45cea4ab8 [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20130128094049-oddx6ks274hrfq4c
2013-01-28 15:10:49 +05:30
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