Commit Graph

2397 Commits

Author SHA1 Message Date
Olivier Dony 5cba82e2c9 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8788 dle@openerp.com-20131003094541-ro29hhkas03rdvw8
bzr revid: odo@openerp.com-20131003111222-upt1ytb92db50zay
2013-10-03 13:12:22 +02:00
Denis Ledoux 3acc213554 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9493 rev-id: launchpad_translations_on_behalf_of_openerp-20131003055550-0r0oqctbd69hv6ud
bzr revid: dle@openerp.com-20131003094541-ro29hhkas03rdvw8
2013-10-03 11:45:41 +02:00
Launchpad Translations on behalf of openerp b53d5c32ac Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131003055550-0r0oqctbd69hv6ud
2013-10-03 05:55:50 +00:00
Martin Trigaux be6cb7fc2a [FIX] point_of_sale: remove useless or condition in tax computation
bzr revid: mat@openerp.com-20131002143734-b51sl1taumajaaus
2013-10-02 16:37:34 +02:00
Launchpad Translations on behalf of openerp e441ba637f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131002053724-elxvqw0n42c4lr9m
2013-10-02 05:37:24 +00:00
Denis Ledoux a9158e5993 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9487 rev-id: dle@openerp.com-20130930141202-ghnujem348kydd2m
bzr revid: dle@openerp.com-20130930150804-b4j080uy06t4n7f1
2013-09-30 17:08:04 +02:00
Martin Trigaux 08d7b4136d [FIX] point_of_sale: return empty list instead of False for report computation (opw 598437)
bzr revid: mat@openerp.com-20130927111118-bis9odhacjqaqmyp
2013-09-27 13:11:18 +02:00
Hardik Ansodariya e66ae2e671 [FIXED] pos: Fixed the issue of pos detail report when trying to pring report having order without TAX were throwing error(Maintenance case: 598437)
bzr revid: han@tinyerp.com-20130927103543-jppq53ugkj1gk2cl
2013-09-27 16:05:43 +05:30
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
Launchpad Translations on behalf of openerp 5d89ca5f6d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045555-o80w0vjyl4g3d2qn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060115-eauj5wlxmkpyxwys
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053444-ai66yjl1419gee8h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053502-xuqx6gazdvsak6e5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130921055928-8y21w291t5w0k13o
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053456-pcgrwl35kk8b7ff8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053531-3twd4g12gj4iqmv3
2013-09-23 05:35:31 +00: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
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
2013-09-20 06:01:45 +00: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 6700ef32bd [IMP] point_of_sale: rename Start Selling to Resume Session when appropriate
bzr revid: fva@openerp.com-20130919135413-6hwj3b7vxstf8wq1
2013-09-19 15:54:13 +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
Denis Ledoux 546a191f0a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9459 rev-id: fva@openerp.com-20130918153347-fy4nuvbm82ngfb8x
bzr revid: mat@openerp.com-20130826135110-f9q4p65ds2aholcw
bzr revid: dle@openerp.com-20130828141129-ecxl2vlpb8vw0o9f
bzr revid: dle@openerp.com-20130828162659-n8a0ku9o3h01qaov
bzr revid: dle@openerp.com-20130830094205-q3itwd7x0246d9n6
bzr revid: dle@openerp.com-20130830133604-mfnfbscn5wdk4vi4
bzr revid: dle@openerp.com-20130902131244-v9uh0s8rg4889i7j
bzr revid: mat@openerp.com-20130903134105-68ziuaccreu6rs61
bzr revid: chs@openerp.com-20130906171851-jtfsf4au1k30wwlr
bzr revid: dle@openerp.com-20130909103120-k5oefxgebhyslac3
bzr revid: dle@openerp.com-20130909170047-pbzw4ernvcpivbhh
bzr revid: chs@openerp.com-20130910122113-171osvcukxffxcry
bzr revid: tde@openerp.com-20130912121059-k840pi4rwdzpez8g
bzr revid: dle@openerp.com-20130913085251-p906ci2divy82jur
bzr revid: tde@openerp.com-20130913092546-kzshg1a7sls566l8
bzr revid: mat@openerp.com-20130917122102-drf8fj9lrjj0fvju
bzr revid: mat@openerp.com-20130917161614-w8u2c1ayeb5kxm30
bzr revid: dle@openerp.com-20130918161305-7ep1642nxzyy3vhd
2013-09-18 18:13:05 +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
Launchpad Translations on behalf of openerp 4cb9834833 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00: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 ffe677a736 [MERGE] from trunk
bzr revid: fva@openerp.com-20130912135705-301tadhx1fuqk2gl
2013-09-12 15:57:05 +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
Martin Trigaux b17fd217bd [FIX] point_of_sale: correct _get_tax_amount to see several taxes in reports
bzr revid: mat@openerp.com-20130912130747-g3mj44w341v8ao2z
2013-09-12 15:07:47 +02:00
Launchpad Translations on behalf of openerp a71caa14d6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130911051954-5q0wh820h5himluq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912071731-lxe3j09ejij11oty
2013-09-12 07:17:31 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00: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