Denis Ledoux
20be322c45
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9684 rev-id: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
...
bzr revid: chs@openerp.com-20131202105848-33gcz1715w370rve
bzr revid: dle@openerp.com-20131204150643-is3y0b9n8enh3yql
bzr revid: chs@openerp.com-20131206152726-pirikn7v8pev90ic
bzr revid: dle@openerp.com-20131206162437-b9niay99mirk44qm
bzr revid: tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v
bzr revid: dle@openerp.com-20131209155721-589zihxx8jmvlpvp
2013-12-09 16:57:21 +01:00
Denis Ledoux
3be327c0ae
[FIX] point_of_sale: ignore TOTAlY returns
...
Returns were partially ignored when typing keystrokes, thanks to a return; when event which equaled 13, but the default behaviour (press on the focused input/button) was not prevented. This is now the case thanks to preventDefault. For instance, just after a discount set, the focused input was pressed and the associated value was added when scanning a new product with the scanner. Therefore, if we entered a discount of 30%, scanning a new product added '0', the last pushed button, to the discount, and then added the product.
bzr revid: dle@openerp.com-20131209145652-3g9rgnfz1w8k0whw
2013-12-09 15:56:52 +01:00
Frédéric van der Essen
86bb946087
[IMP] point_of_sale: adding lato font
...
bzr revid: fva@openerp.com-20131207170616-je7r27nb6n2wsrq0
2013-12-07 18:06:16 +01:00
Frédéric van der Essen
019938f2c8
[WIP] point_of_sale: finished css optimisations
...
bzr revid: fva@openerp.com-20131205175325-8v81lfj69020x0qe
2013-12-05 18:53:25 +01:00
Frédéric van der Essen
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
Frédéric van der Essen
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
Antony Lesuisse
57ef91409a
[MERGE] bootstrap3
...
bzr revid: al@openerp.com-20131202132445-oux9j63auh4om284
2013-12-02 14:24:45 +01:00
Frédéric van der Essen
14e995b452
[WIP] point_of_sale: improving performance on mobile devices
...
bzr revid: fva@openerp.com-20131127191750-ob13h0s99b9amsa5
2013-11-27 20:17:50 +01:00
Frédéric van der Essen
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
Frédéric van der Essen
28c074dcb2
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131126142328-26gdibac45v17djm
2013-11-26 15:23:28 +01:00
Frédéric van der Essen
1a96fe1402
[WIP] point_of_sale: mobile ui optimisations
...
bzr revid: fva@openerp.com-20131125172726-xp81rn938rtfwlbs
2013-11-25 18:27:26 +01:00
Christophe Simonis
bb1e256f5b
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
...
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Frédéric van der Essen
3fe26a6bb7
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131125103655-2w83i8oy6ebtruin
2013-11-25 11:36:55 +01:00
Kunal Chavda (Open ERP)
e22d25ecdc
[MERGE]with latest.
...
bzr revid: kch@tinyerp.com-20131121061028-t0mu64yq94yn1drv
2013-11-21 11:40:28 +05:30
Frédéric van der Essen
b261aad229
[IMP] point_of_sale: allow up to 8 payment methods to be displayed simultaneously
...
bzr revid: fva@openerp.com-20131118172620-tp3viaggc12wvjtl
2013-11-18 18:26:20 +01:00
Frédéric van der Essen
1fba5804fc
[IMP] point_of_sale: allow up to 8 simultaneous payment methods to be displayed at once
...
bzr revid: fva@openerp.com-20131118172301-c71ic2xazlkjhr4d
2013-11-18 18:23:01 +01:00
ima-openerp
926ff04ed8
[IMP]improved css for pos screen header.
...
bzr revid: ima@tinyerp.com-20131118053359-ccc5w6zrunagx2v6
2013-11-18 11:03:59 +05:30
Frédéric van der Essen
03676cd07e
[FIX] point_of_sale: missing commits from last backport from trunk
...
bzr revid: fva@openerp.com-20131118093920-pz96e91clsfy6exd
2013-11-18 10:39:20 +01:00
Frédéric van der Essen
ddf6ec224f
[IMP] point_of_sale: improve the reactivity of the searchbox by timeouting on the search instead on searching after each character change
...
bzr revid: fva@openerp.com-20131112160534-004d8df6ede1b4yt
2013-11-12 17:05:34 +01:00
Frédéric van der Essen
2c5632271f
[IMP] point_of_sale: only open cashbox when paying with cash + add manual override
...
bzr revid: fva@openerp.com-20131112151041-3betwjahh9ph9vx5
2013-11-12 16:10:41 +01:00
Frédéric van der Essen
7c6292f91e
[FIX] point_of_sale: make the web printed receipt fit on 80mm paper
...
bzr revid: fva@openerp.com-20131112140457-sfmbu0ujz8lwfiil
2013-11-12 15:04:57 +01:00
Frédéric van der Essen
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
Frédéric van der Essen
6582780d3b
[IMP] point_of_sale: restructured the main widget to use a generic scrollable subwindow system
...
bzr revid: fva@openerp.com-20131106103255-3ym4kh9wom5t1vra
2013-11-06 11:32:55 +01:00
Frédéric van der Essen
fcbe2e3a97
[IMP] point_of_sale: renamed point-of-sale class + new subwindow layouting system
...
bzr revid: fva@openerp.com-20131105151548-vpsg2npnp0bx7pwd
2013-11-05 16:15:48 +01:00
Frédéric van der Essen
b0c8e312d8
[IMP] point_of_sale: use placeholder + remove obsolete css rules
...
bzr revid: fva@openerp.com-20131105145844-69o6j8ynkn90fz23
2013-11-05 15:58:44 +01:00
Frédéric van der Essen
29b0755b84
[IMP] point_of_sale: remove global calls to jquery
...
bzr revid: fva@openerp.com-20131105143128-hl73k961kgzyomw9
2013-11-05 15:31:28 +01:00
Frédéric van der Essen
d4e8041601
[IMP] point_of_sale: removed all ids from templates and css
...
bzr revid: fva@openerp.com-20131105141903-3n8iq4geiwhq4nav
2013-11-05 15:19:03 +01:00
Frédéric van der Essen
d6ae4209e4
[IMP] point_of_sale: hardware acceleration for scrolling
...
bzr revid: fva@openerp.com-20131014163414-x3mub8q5ajsqvsdl
2013-10-14 18:34:14 +02:00
Frédéric van der Essen
06aaa06d9f
[WIP] point_of_sale: don't auto bottom scroll if not at bottom + saner css
...
bzr revid: fva@openerp.com-20131009145717-n42jt76nig0poc2n
2013-10-09 16:57:17 +02:00
Frédéric van der Essen
613a3a78df
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131009133316-5zodruf4nk4kxmva
2013-10-09 15:33:16 +02:00
Frédéric van der Essen
7976d4aa89
[FIX] point_of_sale: fix orderline selection
...
bzr revid: fva@openerp.com-20131009132944-x8st6n2etzcammig
2013-10-09 15:29:44 +02:00
Frédéric van der Essen
f2aae63c61
[WIP] point_of_sale: automatically scroll to bottom
...
bzr revid: fva@openerp.com-20131009125128-yydt3l8vi8z2ik8p
2013-10-09 14:51:28 +02:00
Frédéric van der Essen
ca28f214e4
[WIP] point_of_sale: used one jquery event handler for all products in product list in order to accelerate rerendering
...
bzr revid: fva@openerp.com-20131009101325-d71q3ppxb7hstzvd
2013-10-09 12:13:25 +02:00
Frédéric van der Essen
9329c3ba9d
[WIP] point_of_sale: add fastclick.js to remove tab delay on mobile devices
...
bzr revid: fva@openerp.com-20131008151940-67uky6vmn52vxyun
2013-10-08 17:19:40 +02:00
Frédéric van der Essen
96d57510af
[WIP] point_of_sale: removed js scrollbars
...
bzr revid: fva@openerp.com-20131008143639-qacekusrhy6uoues
2013-10-08 16:36:39 +02:00
Frédéric van der Essen
e73a22ccb9
[WIP] point_of_sale: trying to remove all css fx to see if it's really faster
...
bzr revid: fva@openerp.com-20131008142309-4a1hgsg8ikw8dvzw
2013-10-08 16:23:09 +02:00
Christophe Simonis
38a2ca7f3f
[MERGE] back port of branch trunk up to revid 8924 fva@openerp.com-20130924094515-j605mg8lozzli3u2
...
bzr revid: chs@openerp.com-20130924110701-a5h94knbm279d1m0
2013-09-24 13:07:01 +02:00
Frédéric van der Essen
b4e57aa481
[FIX] point_of_sale: make sure that internal reference barcodes don't conflict with ean barcodes
...
bzr revid: fva@openerp.com-20130924093410-c1yh72t4jd9667ia
2013-09-24 11:34:10 +02:00
Frédéric van der Essen
68c23991d7
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20130923151432-rba58178m69ldzgb
2013-09-23 17:14:32 +02:00
Frédéric van der Essen
4b90d41e47
[FIX] point_of_sale: order close confirmation was put on all header buttons instead of just the close button
...
bzr revid: fva@openerp.com-20130923150431-pgri8o2gqup37dpk
2013-09-23 17:04:31 +02:00
Frédéric van der Essen
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
Frédéric van der Essen
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
Frédéric van der Essen
885bd7ff7a
[FIX] point_of_sale: barcode scanner was not working in firefox due to usage of event.keyCode instead of event.which
...
bzr revid: fva@openerp.com-20130920094837-nks57e8qk3rgfksc
2013-09-20 11:48:37 +02:00
Frédéric van der Essen
60b17e760c
[IMP] point_of_sale: when the product search returns only one product, order it on 'enter' keypress
...
bzr revid: fva@openerp.com-20130920094734-mvte0wkdw151691n
2013-09-20 11:47:34 +02:00
Frédéric van der Essen
b32d7a7351
[FIX] point_of_sale: replaced utf8 special characters by image as those glyphs were not supported on enough systems
...
bzr revid: fva@openerp.com-20130919145133-5glux5wmidwddq6u
2013-09-19 16:51:33 +02:00
Frédéric van der Essen
91763dbd57
[IMP] point_of_sale: confirmation message on session close when there are unposted orders
...
bzr revid: fva@openerp.com-20130919131228-hhrp3guno8ddt5m2
2013-09-19 15:12:28 +02:00
Frédéric van der Essen
316d079b59
[IMP] point_of_sale: remove empty payment lines when going back to product screen
...
bzr revid: fva@openerp.com-20130919131012-ylnqrab48a9746l6
2013-09-19 15:10:12 +02:00
Frédéric van der Essen
6fb8cb4756
[FIX] point_of_sale: barcode scanner was not working in firefox due to usage of event.keyCode instead of event.which
...
bzr revid: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
2013-09-18 17:33:47 +02:00
Frédéric van der Essen
d30f5e8be6
[IMP] point_of_sale: when the product search returns only one product, order it on 'enter' keypress
...
bzr revid: fva@openerp.com-20130918134208-t9g50q8whdft4xzq
2013-09-18 15:42:08 +02:00
Frédéric van der Essen
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
Frédéric van der Essen
0d826f64ca
[FIX] point_of_sale: missing renamings from the JobQueue refactor
...
bzr revid: fva@openerp.com-20130917124615-kqtix2atp1xguszw
2013-09-17 14:46:15 +02:00
Frédéric van der Essen
ad6bbe490a
[FIX] point_of_sale: scaled product weren't ordered with the correct weight
...
bzr revid: fva@openerp.com-20130917123446-671ijt70i93p0w67
2013-09-17 14:34:46 +02:00
Frédéric van der Essen
674054c97e
[IMP] point_of_sale: removed ProductWidget for faster product list updates
...
bzr revid: fva@openerp.com-20130917122929-8pybdbvgrv8kbgru
2013-09-17 14:29:29 +02:00
Frédéric van der Essen
c33fd59465
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130917101910-4h2g2njs2e9toc36
2013-09-17 12:19:10 +02:00
Frédéric van der Essen
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
Thibault Delavallée
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
Frédéric van der Essen
4080a18ac3
[FIX] point_of_sale: fixed text overflow issues due to long product names
...
bzr revid: fva@openerp.com-20130912155409-nh2j4a3ereqwt3nn
2013-09-12 17:54:09 +02:00
Frédéric van der Essen
00d1183947
[FIX] point_of_sale: onscreen keyboard would stop working when category changed + make it disappear outside product screen
...
bzr revid: fva@openerp.com-20130912151334-c3kc4c4137amrl9f
2013-09-12 17:13:34 +02:00
Frédéric van der Essen
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
Frédéric van der Essen
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
Frédéric van der Essen
2f86c5ab5a
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20130911155650-uqrn4213urt98f43
2013-09-11 17:56:50 +02:00
Frédéric van der Essen
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
Christophe Simonis
3fa90321e1
[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113-171osvcukxffxcry
...
bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf
2013-09-10 14:48:03 +02:00
Christophe Simonis
0ab7f36534
[FIX] point_of_sale: ensure proxy connection have a session_id (opw 596899)
...
bzr revid: chs@openerp.com-20130909160310-iz978t1ofxeusvcl
2013-09-09 18:03:10 +02:00
Frédéric van der Essen
2356864eb4
[FIX] point_of_sale: Some azerty barcode reader setups would press 'shift' for each number, and those shift would end the barcode recognition. keypress ignores shifts and fixes the problem
...
bzr revid: fva@openerp.com-20130909154740-bjlp553wt11l1u18
2013-09-09 17:47:40 +02:00
Anael Closson
a49dc25f95
[FIX] OPW 596899 : no session_id when using pos proxy
...
bzr revid: acl@openerp.com-20130909145630-i0oy0yifdkbfj7wm
2013-09-09 16:56:30 +02:00
Frédéric van der Essen
44967200e4
[IMP] point_of_sale: removed the ScaleInvite Screen in cashier mode, + only update the weight value in ScaleScreen
...
bzr revid: fva@openerp.com-20130906153448-daev4x2ea3rf4pug
2013-09-06 17:34:48 +02:00
Frédéric van der Essen
74a550dae8
[IMP] point_of_sale: this line doesn't make any sense and should never have been committed
...
bzr revid: fva@openerp.com-20130905134217-2ij45szmu4tzsqiw
2013-09-05 15:42:17 +02:00
Frédéric van der Essen
3443f6cd9e
[IMP] point_of_sale: forgot a few changes related to previous commit
...
bzr revid: fva@openerp.com-20130905133831-5nwuy2njplvekd2y
2013-09-05 15:38:31 +02:00
Frédéric van der Essen
84cd290018
[IMP] point_of_sale: remove hover effects, and change button colors when pressed instead (use :active) + tooltip removal was not always effective
...
bzr revid: fva@openerp.com-20130905133159-8pu2kd8ex5tdbirl
2013-09-05 15:31:59 +02:00
Frédéric van der Essen
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
Martin Trigaux
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
Frédéric van der Essen
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
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
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
db4f0a54de
[FIX] point_of_sale: removed console.log
...
bzr revid: fva@openerp.com-20130115172653-hxq1ce1w9owvor9i
2013-01-15 18:26:53 +01:00
Frédéric van der Essen
70cdcc70cf
[FIX] point_of_sale: missing 'this.'
...
bzr revid: fva@openerp.com-20130115172525-jr5ruv0l2eiylkmh
2013-01-15 18:25:25 +01:00
Frédéric van der Essen
483d57e878
[IMP] point_of_sale: faster product list redraw
...
bzr revid: fva@openerp.com-20130115171453-ycech3edreltdq1u
2013-01-15 18:14:53 +01:00
Frédéric van der Essen
1fc1174f23
[IMP] point_of_sale: products and categories are no longer stored on disk, increasing performance
...
bzr revid: fva@openerp.com-20130115165137-h07m9hrkhvs46e06
2013-01-15 17:51:37 +01:00
Frédéric van der Essen
984b904f2c
[FIX] point_of_sale: the pos synchronisation indicator was changing the cursor indicating that an action was possible, but there's nothing to do when it's already synchronized.
...
lp bug: https://launchpad.net/bugs/1099402 fixed
bzr revid: fva@openerp.com-20130114164216-53yix6tmlix316zl
2013-01-14 17:42:16 +01:00
Frédéric van der Essen
df9ba1d0a4
[FIX] point_of_sale: removed some memory leaks.
...
bzr revid: fva@openerp.com-20130114152533-3s1ynd7q1927514a
2013-01-14 16:25:33 +01:00
Frédéric van der Essen
a480cff6f5
[FIX] point_of_sale: removed console.logs
...
bzr revid: fva@openerp.com-20130111144255-cgs85ue7hsp5ces7
2013-01-11 15:42:55 +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
Frédéric van der Essen
81ffada41c
[IMP] point_of_sale: added some comments about the localstorage db implementation and performance
...
bzr revid: fva@openerp.com-20130111144108-5u4ie3p9ueoj6ulm
2013-01-11 15:41:08 +01:00
Phil Frost
5ff3ae2034
kill the executable bit on things that are clearly not executables or scripts
...
bzr revid: pfrost@openerpdev-20130103231005-56pglti6uss0jsm5
2013-01-03 18:10:05 -05:00
Frédéric van der Essen
5472b929e4
[FIX] point_of_sale: clicking on the connection status should force sync
...
bzr revid: fva@openerp.com-20130327104551-484p011pjqrmbtm8
2013-03-27 11:45:51 +01:00
Vidhin Mehta (OpenERP)
ef72f482fb
[IMP]Make validation on payable amount field.In that user can enter only number and a single dot in input box.
...
bzr revid: vme@tinyerp.com-20121213120657-yez2wi7j05lgtziw
2012-12-13 17:36:57 +05:30
Jalpesh Patel (OpenERP)
fbb4e61d71
[FIX]fix problem of POS Receipt missing space
...
bzr revid: pja@tinyerp.com-20121128121401-99mszzxiio5ewd3q
2012-11-28 17:44:01 +05:30
Vishmita
f2c8f6d970
[FIX]when there is no product into the POS category it gives an error.
...
bzr revid: vja@tinyerp.com-20121128062926-qjweapwl8o3l94op
2012-11-28 11:59:26 +05:30
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
dea69ebeed
[IMP] point_of_sale: imrpoved look of the IE error message
...
bzr revid: fva@openerp.com-20121123162639-tmlk3hx7gqgydeye
2012-11-23 17:26:39 +01:00
Frédéric van der Essen
3c443840fc
[IMP] point_of_sale: pretty error message when trying to access the point_of_sale with IE
...
bzr revid: fva@openerp.com-20121123154917-u720g4woq4xga1uo
2012-11-23 16:49:17 +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
e586141984
[FIX] point_of_sale: the electronic scale is now always deactivated
...
bzr revid: fva@openerp.com-20121122132248-qfxbs04z9tunoi8l
2012-11-22 14:22:48 +01:00
Frédéric van der Essen
b5ce5ee91b
[IMP] point_of_sale: forgot views and decls for partner's ean13. Demo data where at the wrong place also
...
bzr revid: fva@openerp.com-20121121165823-awkqy7wp0mq4zkhm
2012-11-21 17:58:23 +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
Frédéric van der Essen
1af48858a5
[IMP] prompt for cashier intervention when negative or zero price in self-checkout
...
bzr revid: fva@openerp.com-20121119160900-ks6a0bfuswlipyvu
2012-11-19 17:09:00 +01:00
Frédéric van der Essen
d4a50fd516
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121115131103-wgcu54wupokqybof
bzr revid: fva@openerp.com-20121119151531-q4scgl87ctjphocx
2012-11-19 16:15:31 +01:00
Christophe Simonis
fa8463f804
[FIX] use session.url()
...
bzr revid: chs@openerp.com-20121114174258-ly0dniub0k383045
2012-11-14 18:42:58 +01:00
Frédéric van der Essen
8c820330a5
[FIX] point_of_sale: removed the gif loader, replaced it by niv's js one
...
bzr revid: fva@openerp.com-20121114170006-gkx6ezikiw86po7u
2012-11-14 18:00:06 +01:00
Frédéric van der Essen
107e579ecd
[IMP] point_of_sale: auto focus on paymentlines
...
bzr revid: fva@openerp.com-20121114165043-vbfj1r93ww3es9qt
2012-11-14 17:50:43 +01:00
Frédéric van der Essen
58ec91eb79
[FIX] point_of_sale: bad indentation
...
bzr revid: fva@openerp.com-20121114155540-dvkat6on42koims3
2012-11-14 16:55:40 +01:00
Frédéric van der Essen
25fb4bcbca
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121114141751-8l6meschr2ay4o6c
2012-11-14 15:17:51 +01:00
vta vta@openerp.com
0a7d680313
[FIX] Issue with result.result in POS.
...
lp bug: https://launchpad.net/bugs/1066288 fixed
bzr revid: vta@openerp.com-20121109133045-z7w5i49eikobyskw
2012-11-09 14:30:45 +01:00
vta vta@openerp.com
c5961309c4
[FIX] Fixed POS delete_payment_line triggering and processing.
...
bzr revid: vta@openerp.com-20121109124854-qray80vx77vlli4r
2012-11-09 13:48:54 +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
Amit Patel
0bf0b95d67
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121029051732-hcgpnra148041ews
2012-10-29 10:47:32 +05:30
Amit Patel
1204262d46
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121023091417-5noy0gguxd12pduk
2012-10-23 14:44:17 +05:30
vta vta@openerp.com
a53941b165
[FIX] Fixed CallbackEnabled issues in POS.
...
bzr revid: vta@openerp.com-20121023075035-wx3awh0sdeeqa7t3
2012-10-23 09:50:35 +02:00
Amit Patel
4694363d62
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121023065055-uapr3ywmqngewjb2
2012-10-23 12:20:55 +05:30
Antony Lesuisse
50e0b17662
[FIX] pos closing
...
bzr revid: al@openerp.com-20121022104529-9wq22t76fj6zqxu6
2012-10-22 12:45:29 +02:00
Amit Patel
6696825b5e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121017070937-52t28h5twjkj5rlr
bzr revid: apa@tinyerp.com-20121019062157-qxy9gw1b5d9siipp
bzr revid: apa@tinyerp.com-20121022051523-v89anrokk46jxmqb
2012-10-22 10:45:23 +05:30
Frédéric van der Essen
cbdb0ccf9c
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121017140509-67yq1gjzrs871hb6
2012-10-17 16:05:09 +02:00
Amit Patel
56a478d1cc
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121016125359-p5g1zp3kuy1bv8k6
bzr revid: apa@tinyerp.com-20121017071028-sf28vvwcyvb6s76r
2012-10-17 12:40:28 +05:30
Amit Patel
fa206b6c42
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121015055335-jdu7jcul5wfq8ptp
bzr revid: apa@tinyerp.com-20121016090046-uo8i442o80kga8yw
2012-10-16 14:30:46 +05:30
Vishmita
91c3785691
[FIX]7.0 Problem with Point of Sale - Can't Close Uncaught TypeError
...
lp bug: https://launchpad.net/bugs/1066288 fixed
bzr revid: vja@tinyerp.com-20121016071616-kzjifxm9eala1fjx
2012-10-16 12:46:16 +05:30
Antony Lesuisse
59ddf58bb4
[MERGE] callback2deffered rpc
...
bzr revid: al@openerp.com-20121015133334-4fmbsa14r23laljs
2012-10-15 15:33:34 +02: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
Amit Patel
7b585d3e1f
[FIX]:Uncaught TypeError: Cannot read property 'context' of undefined
...
bzr revid: apa@tinyerp.com-20121010113556-p79hzujiunibwsix
2012-10-10 17:05:56 +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
Frédéric van der Essen
ddb869f180
[FIX] fixing css errors as reported by firefox
...
bzr revid: fva@openerp.com-20121005140616-w5tulvk6v6hesjmn
2012-10-05 16:06:16 +02:00
Sanjay Gohel (Open ERP)
a014d89ab6
[IMP]add receipt ref for receipt in pos and pos order
...
bzr revid: sgo@tinyerp.com-20121005133315-qjwl6nx360em8u43
2012-10-05 19:03:15 +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
Sanjay Gohel (Open ERP)
b461dd366f
[IMP]discount shown on ticket. if pos have no order lines it can not validate for ticket print. and improve report of sale detail
...
bzr revid: sgo@tinyerp.com-20121005070033-o51n2w72j7322zg5
2012-10-05 12:30:33 +05:30
ggh-openerp
1fe81f3a96
[IMP] In rpc method remove callback and modify related code
...
bzr revid: ggh@tinyerp.com-20121003123412-22o4t380ipsmns2e
2012-10-03 18:04:12 +05:30
Frédéric van der Essen
0fa7da3168
[WIP FIX] point_of_sale: investigating a bug with codebar scanning in subcategories
...
bzr revid: fva@openerp.com-20121002101353-imjbqe1vxtdjbqu7
2012-10-02 12:13:53 +02:00
Frédéric van der Essen
c850875ca3
[FIX] point_of_sale: Number.isNaN is not supported on older but supported browsers
...
bzr revid: fva@openerp.com-20121002100420-pcvbn7qqxyp62bzw
2012-10-02 12:04:20 +02:00
Frédéric van der Essen
e7512fd22f
[IMP] point_of_sale: globally improved css design
...
bzr revid: fva@openerp.com-20120928152041-mo5oqca8zd0aaohu
2012-09-28 17:20:41 +02:00
Frédéric van der Essen
968325cb39
[WIP] point_of_sale: first test of new TPE API
...
bzr revid: fva@openerp.com-20120918133732-q7za0r3dcggem8mw
2012-09-18 15:37:32 +02:00
Frédéric van der Essen
703cc35a4d
[FIX] point_of_sale: demo data ean match the debug window defaults
...
bzr revid: fva@openerp.com-20120913150913-bq96hvr3cmbgijjg
2012-09-13 17:09:13 +02:00
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
b7d56a0b04
[IMP] point_of_sale: some improvements to the debug window
...
bzr revid: fva@openerp.com-20120913104621-zryga82o3d4vq174
2012-09-13 12:46:21 +02:00
Frédéric van der Essen
9dfca35b19
[IMP] point_of_sale: put debug window code in the right place
...
bzr revid: fva@openerp.com-20120912162653-fnbvqwg4l51lveal
2012-09-12 18:26:53 +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
d71e5b45b6
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120910154950-rg1phce0w33gsq8b
2012-09-10 17:49:50 +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
Antony Lesuisse
aac17b11a4
[FIX] remove semantic part1
...
bzr revid: al@openerp.com-20120906101723-eeieyzhj4racxq14
2012-09-06 12:17:23 +02:00
Frédéric van der Essen
b2cb4b841d
[FIX] point_of_sale: unrecognized_items error handling
...
bzr revid: fva@openerp.com-20120905210751-7lbzkypzefy6zb3f
2012-09-05 23:07:51 +02:00
Frédéric van der Essen
998134d464
[FIX] point_of_sale: help popup on welcome screen
...
bzr revid: fva@openerp.com-20120905203317-34hkv0ouawdp8gxw
2012-09-05 22:33:17 +02:00
Frédéric van der Essen
63df74b8dc
[FIX] keyboard layout and numpad input
...
bzr revid: fva@openerp.com-20120905202058-o5r2ckzhwdkv2xhq
2012-09-05 22:20:58 +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
49b1605b98
[FIX] point_of_sale: css fixes related to ul/li semantic css changes
...
bzr revid: fva@openerp.com-20120905115000-dx2exlr3cnn2iszy
2012-09-05 13:50:00 +02:00
Frédéric van der Essen
eb53669cb1
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120905094101-j20tm78k7sq6dnxd
2012-09-05 11:41:01 +02:00
Frédéric van der Essen
f24667b1f9
[FIX] point_of_sale: ean argument was wrongly passed to the proxy
...
bzr revid: fva@openerp.com-20120905092053-9hj9sbscqrjbg0h0
2012-09-05 11:20:53 +02:00
niv-openerp
5126f6ff6e
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20120904163725-ptsij09rve8j3txs
2012-09-04 18:37:25 +02:00
Frédéric van der Essen
ee07aa224c
[IMP] point_of_sale: added console ean input in debug mode
...
bzr revid: fva@openerp.com-20120904154603-khymfg996jdgn9xr
2012-09-04 17:46:03 +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
6040787bb0
[FIX] point_of_sale: forgot to add the nohover css file
...
bzr revid: fva@openerp.com-20120903124838-gmn4wsjrbqnhbi9m
2012-09-03 14:48:38 +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
716651c27d
[IMP] point_of_sale: alternative css without hover effects for resistive screens
...
bzr revid: fva@openerp.com-20120903115954-t26j8qx54a6o9pta
2012-09-03 13:59:54 +02:00
Frédéric van der Essen
9cfe5665a5
[DONE] point_of_sale: disable validation button when order not fully paid
...
bzr revid: fva@openerp.com-20120831145606-nrk44gs60lab4k3l
2012-08-31 16:56:06 +02:00
Frédéric van der Essen
846ec67adc
[WIP] point_of_sale: disable validation button when order not fully paid
...
bzr revid: fva@openerp.com-20120831143159-a64527c3a1a8chk0
2012-08-31 16:31:59 +02:00
Frédéric van der Essen
93395ac1ec
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120829125759-mjulntnmsyjzs0xq
2012-08-29 14:57:59 +02:00
Frédéric van der Essen
1eedcaedad
[IMP] point_of_sale: TODO changes
...
bzr revid: fva@openerp.com-20120829125640-5bml13zupja3w30b
2012-08-29 14:56:40 +02:00
niv-openerp
65f532e001
[IMP] made a whole-application replace of $element by $el
...
bzr revid: nicolas.vanhoren@openerp.com-20120824182743-1d9cii7kigc7exer
2012-08-24 20:27:43 +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
Frédéric van der Essen
8d052c96bc
[FIX] point_of_sale: added contact_address to print info, empty order styling
...
bzr revid: fva@openerp.com-20120820135957-o5exttxak611e624
2012-08-20 15:59:57 +02:00
Frédéric van der Essen
c447533f7d
[FIX] point_of_sale: fix css for receipt printing
...
bzr revid: fva@openerp.com-20120820124007-fg36abyblxpboiyi
2012-08-20 14:40:07 +02:00
Frédéric van der Essen
b29c4a6113
[IMP] point_of_sale: improved receipt screen
...
bzr revid: fva@openerp.com-20120820102401-t5zkmh2hoamba719
2012-08-20 12:24:01 +02:00
Frédéric van der Essen
d0f762ab1f
[IMP] point_of_sale: more todos
...
bzr revid: fva@openerp.com-20120820093010-a2ymlgaa6z5ku53o
2012-08-20 11:30:10 +02:00
Frédéric van der Essen
185c82348c
[IMP] point_of_sale: todos
...
bzr revid: fva@openerp.com-20120820071327-wfbd7g5wbh5zrnaa
2012-08-20 09:13:27 +02:00
Frédéric van der Essen
e47792d9bf
[IMP] point_of_sale: category pictures are back and cached
...
bzr revid: fva@openerp.com-20120817142415-3k9cdc1mc68n8shk
2012-08-17 16:24:15 +02:00
Frédéric van der Essen
adc76215ef
[FIX] point_of_sale: connection is now session. Removed console.log
...
bzr revid: fva@openerp.com-20120816163251-6nds8dmlcz8mz30v
2012-08-16 18:32:51 +02:00
Frédéric van der Essen
36b8744644
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
Frédéric van der Essen
15261610fb
[IMP] point_of_sale: removed websql option from client
...
bzr revid: fva@openerp.com-20120816160120-v27xcczg3be31pnz
2012-08-16 18:01:20 +02:00
Frédéric van der Essen
b3bcd4eabc
[FIX] point_of_sale: fixed some bugs with the scanner
...
bzr revid: fva@openerp.com-20120816155801-oexzurmsgfiv2xt9
2012-08-16 17:58:01 +02:00
Frédéric van der Essen
daba4e4fc2
[IMP] point_of_sale: ImageCache and RegExp search
...
bzr revid: fva@openerp.com-20120816150213-mdctwsjxiyjh4lxi
2012-08-16 17:02:13 +02:00
Frédéric van der Essen
0e31e74b40
[FIX] point_of_sale: forgot to remove a ref to the DAO
...
bzr revid: fva@openerp.com-20120814153905-zlxpitgrhizt68zt
2012-08-14 17:39:05 +02:00
Christophe Simonis
c5dc5cef00
[IMP] sed -i '' -e 's/connection/session/g'
...
bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
2012-08-14 17:30:53 +02:00
Frédéric van der Essen
5a3dc89e7c
[IMP] point_of_sale: DAO removed, db used for orders instead. Don't stop sending orders on single failure
...
bzr revid: fva@openerp.com-20120814152112-vmitvbajx3r2mdeh
2012-08-14 17:21:12 +02:00
Frédéric van der Essen
36ea689ad9
[MERGE] html5 amnifest
...
bzr revid: fva@openerp.com-20120814120052-s9avcsbsxl06zewr
2012-08-14 14:00:52 +02:00
Frédéric van der Essen
7559c2e771
[WIP] point_of_sale: moving DAO to db
...
bzr revid: fva@openerp.com-20120814115630-23cv9s71zh79xcve
2012-08-14 13:56:30 +02:00
Antony Lesuisse
643b6cfc36
[FIX] image urls and NETWORK section
...
bzr revid: al@openerp.com-20120813223032-t6nouzthq43xr841
2012-08-14 00:30:32 +02:00
Antony Lesuisse
8d97d9830d
[FIX] remove unused or duplicate files
...
bzr revid: al@openerp.com-20120813221645-s8n8du7fy2sqhl0g
2012-08-14 00:16:45 +02:00
Frédéric van der Essen
48062d4cf1
[IMP] point_of_sale: removed IndexeDB and asynchronous backend
...
bzr revid: fva@openerp.com-20120813160026-04w28p3pojzvdlkj
2012-08-13 18:00:26 +02:00
Frédéric van der Essen
b6c254942a
[FIX] point_of_sale: images are working now
...
bzr revid: fva@openerp.com-20120813144355-vgojt7llli8u9vye
2012-08-13 16:43:55 +02:00
Frédéric van der Essen
4c3e048d40
[MERGE WIP] merging from trunk. Still some issues with the thumbnails
...
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
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