5bb4fa2b43
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
2013-10-28 17:33:21 +01:00
e5ad3700cb
[IMP] convert controllers to the new route api
...
bzr revid: al@openerp.com-20131027174813-ghwl3p6w7ebr20s9
2013-10-27 18:48:13 +01:00
3d8b7984be
import cleanups part1
...
bzr revid: al@openerp.com-20131022170659-kg9err029ha22evh
2013-10-22 19:06:59 +02:00
7f8f78cc4f
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131021055621-l0dw112tf8535j7q
2013-10-21 11:26:21 +05:30
f2e561afec
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 8960 rev-id: dle@openerp.com-20131018125818-1k168nlo2ferj25w
...
bzr revid: dle@openerp.com-20131018131007-etdut0wpjqhnexz2
2013-10-18 15:10:07 +02:00
a7e05f1af4
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8793 rev-id: dle@openerp.com-20131018124037-v3501acvv4fh1077
...
bzr revid: dle@openerp.com-20131018125818-1k168nlo2ferj25w
2013-10-18 14:58:18 +02:00
1a555475cc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp.com-20131018120428-2vdmdm2th8rz57zr
...
bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp
2013-10-18 14:12:36 +02:00
dd18cff878
[IMP] Added attrs for closing balance in pos.
...
bzr revid: psa@tinyerp.com-20131015073857-b3izcxgn51q25jd0
2013-10-15 13:08:57 +05:30
8874046c39
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053740-rinm5yfv4pp3toj2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015051750-ss2jdlo4w12420rv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131015051826-9alld47gks4izhjq
2013-10-15 05:18:26 +00:00
d6ae4209e4
[IMP] point_of_sale: hardware acceleration for scrolling
...
bzr revid: fva@openerp.com-20131014163414-x3mub8q5ajsqvsdl
2013-10-14 18:34:14 +02:00
bb47a9b3bc
[FIX] pos: check constraint on session instead of uid (eg: runbot import demo data with uid=1 but other user_id
...
bzr revid: mat@openerp.com-20131014121959-fp4gs26xh8cdte1w
2013-10-14 14:19:59 +02:00
8ce6495216
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131011124642-zjw0e4qljksvcda8
2013-10-11 18:16:42 +05:30
5c7e3be8ab
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131011093703-y3jdkox2xjkgorsu
2013-10-11 11:37:03 +02:00
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
613a3a78df
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131009133316-5zodruf4nk4kxmva
2013-10-09 15:33:16 +02:00
7976d4aa89
[FIX] point_of_sale: fix orderline selection
...
bzr revid: fva@openerp.com-20131009132944-x8st6n2etzcammig
2013-10-09 15:29:44 +02:00
f2aae63c61
[WIP] point_of_sale: automatically scroll to bottom
...
bzr revid: fva@openerp.com-20131009125128-yydt3l8vi8z2ik8p
2013-10-09 14:51:28 +02:00
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
2779496635
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131009054822-v57c9imyteomp381
bzr revid: launchpad_translations_on_behalf_of_openerp-20131009054909-1nmq8z3sk3ao5j0m
2013-10-09 05:49:09 +00:00
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
f564973ce0
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20131008144807-dka0effsf6i30pem
2013-10-08 16:48:07 +02:00
96d57510af
[WIP] point_of_sale: removed js scrollbars
...
bzr revid: fva@openerp.com-20131008143639-qacekusrhy6uoues
2013-10-08 16:36:39 +02:00
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
ba2657303d
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20131007054548-w2yucsn99aty90wm
2013-10-07 11:15:48 +05:30
94887c5cb8
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131004085039-is2mi6jlh9avo79k
2013-10-04 10:50:39 +02:00
9e85aa3e72
[FORWARD] Forward port of saas-2 branch until revision 8931 tde@openerp.com-20131003140458-ztnd9taih2rcq8ty
...
bzr revid: tde@openerp.com-20131004081915-4i2rn3fsj8qzov63
2013-10-04 10:19:15 +02:00
6ad09a8b40
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131004054526-wrer2m4h9u0lpvmm
2013-10-04 05:45:26 +00:00
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
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
b53d5c32ac
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131003055550-0r0oqctbd69hv6ud
2013-10-03 05:55:50 +00:00
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
607de396ba
[MERGE] Sync with trunk, until revision 8927
...
bzr revid: tde@openerp.com-20131002135442-g8l2vpkq7h0roqdt
2013-10-02 15:54:42 +02:00
e441ba637f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131002053724-elxvqw0n42c4lr9m
2013-10-02 05:37:24 +00:00
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
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
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
1b0ad68d7a
[MERGE] Merged lp:openobject-addons
...
bzr revid: psa@tinyerp.com-20130925082318-253ageephv3s49ut
2013-09-25 13:53:18 +05:30
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
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
68c23991d7
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20130923151432-rba58178m69ldzgb
2013-09-23 17:14:32 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e00111a061
[IMP] Improved code.
...
bzr revid: psa@tinyerp.com-20130918111959-1dzkuxv4acjys8kl
2013-09-18 16:49:59 +05:30
6aa1cc0c71
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130918091235-0qtu3s3i0gmabgjr
2013-09-18 14:42:35 +05:30
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
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
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
c33fd59465
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130917101910-4h2g2njs2e9toc36
2013-09-17 12:19:10 +02:00
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
daa7594cbb
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130913112155-jll3rlzcgsjrtzv4
2013-09-13 16:51:55 +05:30
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
4cb9834833
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130913060838-a2k0hfitlgdrqj0h
2013-09-13 06:08:38 +00:00
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
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
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
ffe677a736
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20130912135705-301tadhx1fuqk2gl
2013-09-12 15:57:05 +02:00
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
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
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
9dba69ba48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
2f86c5ab5a
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20130911155650-uqrn4213urt98f43
2013-09-11 17:56:50 +02:00
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
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
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
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
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
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
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
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
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
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
a8201c6891
[MERGE] [IMP] point_of_sale
...
Removed default POS category
Removed 'other' category from data
Fixed pos payment methods not all listed when creating a pos
bzr revid: tde@openerp.com-20130905103952-kbew55mqxltjdoey
2013-09-05 12:39:52 +02:00
8b48cc9520
[MERGE] addons: added groups when quick creating user in various addons.
...
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
ed0a829cb3
[MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
...
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
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
cb8f9c5a0d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
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
606431f0ee
[MERGE]merge with parent
...
bzr revid: rma@tinyerp.com-20130830053621-briu78l6scvuleu4
2013-08-30 11:06:21 +05:30
ed35895126
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130828163937-japdo58t20hhqfoz
2013-08-28 18:39:37 +02:00
2fab26a2d2
[IMP] point_of_sale, product: change model 'pos.category' of the pos into product.public.category in product. product.public.category is used for eg by pos and website_sale. Add some demo data for this category. Add a domain in pos 'model.js' to select non empty categories
...
bzr revid: chm@openerp.com-20130828151658-3isgyl93c3hwp1pc
2013-08-28 17:16:58 +02:00
3b549486e9
[FIX] pos: correctly link refund order to a current session and set to today's date (opw 589810)
...
lp bug: https://launchpad.net/bugs/1123575 fixed
bzr revid: mat@openerp.com-20130828123940-ik9gvx7flywia0oe
2013-08-28 14:39:40 +02:00
3b88ba87c1
[FIX] pos: avoid a user to use another user's session (opw 595033)
...
bzr revid: mat@openerp.com-20130828073030-mmgcd0atfm7qjq1b
2013-08-28 09:30:30 +02:00
8c5c877948
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130828053808-8isassv2181er8jt
2013-08-28 05:38:08 +00:00
5343c48c5f
[MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
...
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
58868227f9
[MERGE] forward port of branch 7.0 up to revid 9382 chs@openerp.com-20130823131214-ipouwtnz8r16mlvv
...
bzr revid: chs@openerp.com-20130823143114-83tdjhbsdes0kydr
2013-08-23 16:31:14 +02:00
32143e8935
[MERGE] merge with addons
...
bzr revid: voraamitr@gmail.com-20130822124057-rv6oqd0n22mf53c8
2013-08-22 18:10:57 +05:30
68711bb1c5
[IMP] remove unused space
...
bzr revid: voraamitr@gmail.com-20130822123156-dv80muri4r9ivx5a
2013-08-22 18:01:56 +05:30
4d0ad501b7
[IMP] remove _default_payment_methods from point_of_sale.py file
...
bzr revid: voraamitr@gmail.com-20130822121849-hns960rom7p22920
2013-08-22 17:48:49 +05:30
50975a1159
[FIX] point_of_sale: avoid traceback if deleted property
...
bzr revid: mat@openerp.com-20130821125429-uzaqw4yx2ve63wja
2013-08-21 14:54:29 +02:00
5f5610b7d1
[MERGE] [IMP] crm_phonecall, membership, point_of_sale, purchase, purchase_requisitions: minor usability improvements: improved some help tooltips
...
bzr revid: tde@openerp.com-20130821122501-7hemnjrbm1oob7v3
2013-08-21 14:25:01 +02:00
0671ecff9f
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130821051503-hmhnoeelta1jc15p
2013-08-21 10:45:03 +05:30
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
788eb29237
[MERGE] Forward-port of 7.0 bugfixes up to rev.9369 rev-id: launchpad_translations_on_behalf_of_openerp-20130820051502-deoiql3lru7goosd
...
bzr revid: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
2013-08-20 17:26:07 +02:00
0e74fd31a4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130815055122-qjjh1oa8122npkdt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130816060311-osd5epg0pjqggizo
bzr revid: launchpad_translations_on_behalf_of_openerp-20130817061650-b596lee67z2gon1h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130818050503-e1c1ferew0px4k1y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130819045737-ef63g3nwk154ezyw
2013-08-19 04:57:37 +00:00
d2834c42c3
[IMP]: IMprove typo
...
bzr revid: atp@tinyerp.com-20130813135816-05uz8ys2932a63at
2013-08-13 19:28:16 +05:30
2e20b9a45a
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130813135410-7w9yfc6zl3hxcnwd
2013-08-13 19:24:10 +05:30
41ca4aa350
[FIX] point_of_sale: ok this one should be good
...
bzr revid: mat@openerp.com-20130814140240-f0qqsks6tcc423s8
2013-08-14 16:02:40 +02:00
9f5c0f54ec
[FIX] point_of_sale: oups, needs an id
...
bzr revid: mat@openerp.com-20130814135346-6zpzl6tc0efowquj
2013-08-14 15:53:46 +02:00
38f2806579
[FIX] point_of_sale: better default sale journal for new pos.config, use company of current user
...
done to fix test in 01_order_to_payment.yml when creating pos.order
default config can have journal of different company, will get exception if done with a journal of main company
bzr revid: mat@openerp.com-20130814134511-c0f3z27f9p2gflt6
2013-08-14 15:45:11 +02:00
ade561e1cc
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130803055522-fcjgcnhlfmzbpk1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130806044754-4d3d8qgnfyuu1v8e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130807044648-mspjcf73m77dwwb3
2013-08-07 04:46:48 +00:00
7828e44ea5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130727050216-3lqngtzz3y4eal03
bzr revid: launchpad_translations_on_behalf_of_openerp-20130728055452-udjnnr7f174dwx7s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130729052557-z3cyhulfa50uou01
bzr revid: launchpad_translations_on_behalf_of_openerp-20130731051700-toxlygnbrq3rfi75
bzr revid: launchpad_translations_on_behalf_of_openerp-20130802053852-k0z9t3xzddxkqibc
2013-08-02 05:38:52 +00:00
08bf51a608
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130719063647-ajybj58frejzmzi1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130720062338-fgevfrm113ns9ohh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130722055949-auzq29nv6b2f3o10
2013-07-22 05:59:49 +00:00
bf29a2ebc7
[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
...
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
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
d1a4e0aef0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
2013-07-15 05:14:00 +00:00
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
a8ea08cf28
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130712100516-mk14z6zqebdje3ud
2013-07-12 12:05:16 +02:00
d697f759c2
[IMP] point_of_sale: ported the proxy to the new routing api
...
bzr revid: fva@openerp.com-20130712095455-e4hndk977nigtnx7
2013-07-12 11:54:55 +02:00
12f58092f2
[IMP] some refactoring due to changes in the web client
...
bzr revid: nicolas.vanhoren@openerp.com-20130711160702-qs6pfyqsxmzd7cgy
2013-07-11 18:07:02 +02:00
034a5d5dcf
[FIX] point_of_sale: LocalService -> signal_ validation
...
bzr revid: tde@openerp.com-20130711125155-hmf0u0p0o45iac66
2013-07-11 14:51:55 +02:00
edf9d5ef8e
[IMP] Improved code for following
...
1/. Onchange on Cash Control was not working in POS
2/. Added new css for cash control
3/. Fixed the issue for the space between the Real Closing Balance and Differences.
bzr revid: psa@tinyerp.com-20130711105900-zzxnzky2nr6ms4c9
2013-07-11 16:29:00 +05:30
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
98d388bcf1
[FIX] pos: remove outer div tag of statusbar
...
bzr revid: hmo@tinyerp.com-20130710101216-23633pfhokwl9bag
2013-07-10 15:42:16 +05:30
dbddcbaf2d
[MERGE] upstream
...
bzr revid: hmo@tinyerp.com-20130710080735-k1164irzdrbahy4k
2013-07-10 13:37:35 +05:30
d2d72d8416
[MERGE] forward port of saas-1 up to revision 8749 (mat@openerp.com-20130702135856-kmg7d8anw17nkbd8)
...
bzr revid: mat@openerp.com-20130702144646-y1wqs5mz4rzoh50g
2013-07-02 16:46:46 +02:00
e92a18ee0b
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20130701085739-94uxqowz623wudp4
2013-07-01 14:27:39 +05:30
fc70550ca2
[IMP] move html module description and icon
...
bzr revid: al@openerp.com-20130628100441-swpanf2jwcojygh4
2013-06-28 12:04:41 +02:00
4b98b1c689
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20130620054125-ai4ozl8pd1hv84sr
2013-06-20 11:11:25 +05:30
e5e2945ca0
[FIX] point_of_sale: fixing bad translation in demo data
...
bzr revid: fva@openerp.com-20130708145832-54dbakqun110kllo
2013-07-08 16:58:32 +02:00
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
3c7ec1fa87
[MERGE] from upstream
...
bzr revid: fva@openerp.com-20130708133731-wiqisp3xptij3in5
2013-07-08 15:37:31 +02:00
004163733b
[IMP] point_of_sale: removing console.logs
...
bzr revid: fva@openerp.com-20130708125644-rdno41mmtwrao3z2
2013-07-08 14:56:44 +02:00
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
c0119a87c1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130706061750-b7mm65zaln6pacmc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130707055412-bb9fnxig7ss4pugc
2013-07-07 05:54:12 +00:00
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
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
60f945182a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130628063230-vimvbe89j2208dpl
2013-06-28 06:32:30 +00:00
4910b5e654
[FIX] point_of_sale: don't group move lines if debit and credit
...
lp bug: https://launchpad.net/bugs/1127114 fixed
bzr revid: mat@openerp.com-20130626093412-or5k3eznjsxbvgu3
2013-06-26 11:34:12 +02:00
89bc6e5e73
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130622062505-fobx7ncp6bkpouyt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623055452-s77jlu7z6kvjbdlz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624052557-hsaix5c3fu6opbva
2013-06-24 05:25:57 +00:00
4cb1127306
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130621060722-3y4nu7t4kzg3zjua
2013-06-21 06:07:22 +00:00
10f170d975
[MERGE] [FIX] pos: prevent two users opening the same session
...
lp bug: https://launchpad.net/bugs/1098226 fixed
bzr revid: mat@openerp.com-20130620154608-7u8pci09muxedvje
2013-06-20 17:46:08 +02:00
3e269d1572
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130614070428-by6oo1fc0hvfoqc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615061319-hikvcj42kmv0fwla
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053220-l2jj1f2bfhr8s95f
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062045-ydm23y8oyqt85r6d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065045-8n040l4nl7inbsho
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061621-p7u5tapogm5ao1o2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063408-j244y20qpy61d6dn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130615062054-6zhgccaoectf2c0d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130616053235-3eimstk0anu72x9m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130617062114-7wts3fyy6vgqzt8v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130618065127-8w5xbiwnnza5vlo1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130619061719-63jsadfrb1yoqtgz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130620063509-1xk30ymo1f7nn4h0
2013-06-20 06:35:09 +00:00
ae664b1a86
[IMP] add currency_id because i had removed currency_id in merge conflict
...
bzr revid: fka@tinyerp.com-20130617071413-mie2x70lz4tzs48i
2013-06-17 12:44:13 +05:30
5a761f9752
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130617065636-t6kjnfe6vyz6m8av
2013-06-17 12:26:36 +05:30
1a51e9b88d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130614141720-7qjo6fpkm83jhpm2
2013-06-14 16:17:20 +02:00
bc58a5a224
[CLEAN] Misc cleaning before merging.
...
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +02:00
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
6a9adbca62
[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
...
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
5ee65de025
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130613084838-twjsl8cdi5ajjp4c
2013-06-13 14:18:38 +05:30
b83f1fbf83
[MERGE]: Merge with addons
...
bzr revid: chandni.machchhar3@gmail.com-20130612110354-h8nxz02l0yeqkqx9
2013-06-12 16:33:54 +05:30
223b77fd30
[MERGE]merged with main addons
...
bzr revid: darshankalola@gmail.com-20130611102711-e1wtfum2fyg6ca8b
2013-06-11 15:57:11 +05:30
75595cc55b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063100-w95zvev0e2wme31v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063242-nvli6wf9xoxol1i9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611063247-ed0nk3aer2b28d41
2013-06-11 06:32:47 +00:00
70f16ce73b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608055225-r7ywbpq3uy3jesvh
bzr revid: launchpad_translations_on_behalf_of_openerp-20130611054057-l97gta47ob4sj5ir
2013-06-11 05:40:57 +00:00
3a296f5386
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
b4976938d2
[MERGE] [I18N] Many translation bugfixes + resync of translation templates with latest source
...
lp bug: https://launchpad.net/bugs/1165321 fixed
bzr revid: odo@openerp.com-20130607194733-27oiskc6q4fnp476
2013-06-07 21:47:33 +02:00
8c33eb76e1
[I18N] Synchronize translation templates with latest source code
...
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
ae1354509c
[MERGE] merged with main addons
...
bzr revid: darshankalola@gmail.com-20130607131308-9ovklg1q347w8f2o
2013-06-07 18:43:08 +05:30
00029958b3
[IMP] improve Help
...
bzr revid: darshankalola@gmail.com-20130607130240-e5indzh1nzfmy4wk
2013-06-07 18:32:40 +05:30
9d9e3d2ef8
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
2bda4f7b3c
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130607113500-jzhet9cr98c0ss4s
2013-06-07 17:05:00 +05:30
8c6ff33bef
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
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
8f07cb2046
[IMP] Improved Help
...
bzr revid: darshankalola@gmail.com-20130605070425-ykw13dlv28aq4akh
2013-06-05 12:34:25 +05:30
bdeaa2c722
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130604053815-g0iohxg8vtgapt7p
2013-06-04 11:08:15 +05:30
d86f6f24c0
[IMP] suppress button oe_demo_play
...
bzr revid: chm@openerp.com-20130603154158-7k9tvdwmn6ukp5x3
2013-06-03 17:41:58 +02:00
45d760773e
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130603131453-t3m0b9emuyp2tmsx
2013-06-03 18:44:53 +05:30
24848a8dcc
[MERGE] merge with latest trunk
...
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
2013-05-28 14:49:41 +05:30
5660048c29
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130528061900-3374j4pan7aq0yu3
2013-05-28 11:49:00 +05:30
5fa8cdd305
bzr revid: vme@tinyerp.com-20130523071814-o5suitn0hcy12mie
2013-05-23 12:48:14 +05:30
82657c43a8
[IMP]Make indentation as it is.
...
bzr revid: vme@tinyerp.com-20130523070624-8q2d2zj2zjnn8l31
2013-05-23 12:36:24 +05:30
2f15045af4
[FIX]Fixes on, need fixing issues by MAT.
...
bzr revid: vme@tinyerp.com-20130523060223-hupizjpulghv8gsy
2013-05-23 11:32:23 +05:30
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
3c0b65f5d1
[MERGE] application descriptions
...
bzr revid: fme@openerp.com-20130522140734-j6gw2u68zuu0suyf
2013-05-22 16:07:34 +02:00
0d01d958fa
[MERGE] [FORWARD] Forward port of saas-1 branch until revision 8711 (that includes forward-port of 7.0 until 9143)
...
Revision ID: tde@openerp.com-20130521152657-v48pj2m0692rw9b5
bzr revid: tde@openerp.com-20130522102605-bbc5vrfhfro4ab90
2013-05-22 12:26:05 +02:00
435f022970
[REM] Remove point of sale testimonials
...
bzr revid: fme@openerp.com-20130522095027-61xih9viyrdadjxi
2013-05-22 11:50:27 +02:00
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
3d4c0a795a
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130522063035-nype13o1f6oneq4h
2013-05-22 12:00:35 +05:30
c04dfafe0b
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130522062700-rcbg30jfinv0o392
2013-05-22 11:57:00 +05:30
a05b0bebbe
[FORWARD] Forward port of 7.0 branch until revision 9143.
...
bzr revid: tde@openerp.com-20130521122359-b5vii7gv8arluz06
2013-05-21 14:23:59 +02:00
0ce5edad43
[ADD] Application descriptions
...
bzr revid: fme@openerp.com-20130521094005-yt8h4w79182vvk8d
2013-05-21 11:40:05 +02:00
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
afd7d79966
[IMP] medium images in pos
...
bzr revid: fp@tinyerp.com-20130517071738-uw130g0sxbu14yrq
2013-05-17 09:17:38 +02:00
23b50c8da1
[MERGE] sync with latest trunk
...
bzr revid: mat@openerp.com-20130515111755-af33z1frq6jc6hpo
2013-05-15 13:17:55 +02:00
c8c298c83c
[IMP] clean permissions and shebang in files
...
bzr revid: mat@openerp.com-20130514103113-8idhvhokt0e8jzea
2013-05-14 12:31:13 +02:00
0934155fa6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130509061134-n0s13s5mudwpofan
bzr revid: launchpad_translations_on_behalf_of_openerp-20130510065122-6968relnf5rj67w4
2013-05-10 06:51:22 +00:00
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
35811ae629
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130508061808-15l9uv7xeeaar0cc
2013-05-08 06:18:08 +00:00
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
7841bac687
[IMP] Improved typo in Warning
...
bzr revid: ggh@tinyerp.com-20130429053851-ipatcoxtjwrwfijk
2013-04-29 11:08:51 +05:30
d1d74460ea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130425052035-xdq90ai4jlru7s3r
2013-04-25 05:20:35 +00:00
6b04a532b8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423060902-2j8xouki50aemi14
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061017-5os2p9ztugb6jjph
bzr revid: launchpad_translations_on_behalf_of_openerp-20130423061019-n2660taj1o9os75c
2013-04-23 06:10:19 +00:00
3d0b5aa747
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130423053031-g501q3w9akfiro2d
2013-04-23 11:00:31 +05:30
dc42de0f39
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20130419070448-brwasgl89cp71o7y
2013-04-19 12:34:48 +05:30
26f2b57190
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130419052438-gk34w78d47iwehp0
2013-04-19 05:24:38 +00:00
d187245d70
[IMP]improve code
...
bzr revid: sgo@tinyerp.com-20130417065614-tobshhmomx82zkaa
2013-04-17 12:26:14 +05:30
9ea1b238bf
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130417062640-0b8at1f087grtiu3
2013-04-17 11:56:40 +05:30
d1e17fbde0
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
f19775e627
[Merge] with trunk
...
bzr revid: ggh@tinyerp.com-20130417060803-krp406lxyh3l2hp0
2013-04-17 11:38:03 +05:30
735a20f320
[REM] Remove the onchange pos available method
...
bzr revid: ggh@tinyerp.com-20130417052737-4t5ejcwzkkkgfqdj
2013-04-17 10:57:37 +05:30
6a2da1c2f7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053215-jdbdrur8vk4zu5tc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130420064852-b6bt9syb79h1x16m
bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053233-g4dbsfidsqrs301v
bzr revid: launchpad_translations_on_behalf_of_openerp-20130421053237-8jhzy2qe55bb766x
2013-04-21 05:32:37 +00:00
c46929268d
[FIX] account* modules: added 'account_period_prefer_normal':True in context when trying to find the period related to a date.
...
This patch will be forward ported in trunk by changing the behaviour of account_period.find() in order to fetch the normal periods by default (account_period_prefer_normal will be True by default) because there are no business case i could think of where you'd like to get the opening period (except in the closure but it's held in a different way there). On the other hand, it's pretty easy to forget to put that key in the context and introduce a new bug that will select the opening period instead of the wanted one
bzr revid: qdp-launchpad@openerp.com-20130418102433-t52uj23trkpr8vnb
2013-04-18 12:24:33 +02:00
efceba5b8b
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130416073641-pcelb6zsq8dg56wb
2013-04-16 09:36:41 +02:00
812c852fd0
[FORWARD] Merged 7.0 addons revisions until 9021
...
bzr revid: tde@openerp.com-20130415084302-hx7zxtpl5u6yphfg
bzr revid: tde@openerp.com-20130415153732-v4ols3t56rku92oz
2013-04-15 17:37:32 +02:00
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
794455418c
[Merge] with trunk
...
bzr revid: ggh@tinyerp.com-20130412130406-1a4glbnb0rvg5k63
2013-04-12 18:34:06 +05:30
cd0d874f02
[IMP] Improve code for default payment method in pos
...
bzr revid: ggh@tinyerp.com-20130412105954-2lxok63u799s31sa
2013-04-12 16:29:54 +05:30
6e63c47c64
[FIX] pos,cash-register: corrected word theoritical to theoretical changes.
...
bzr revid: tta@openerp.com-20130412093807-9bazw36l9khrjm0l
2013-04-12 15:08:07 +05:30
a3b5ce64a4
[IMP] Remove others category in demo data
...
bzr revid: ggh@tinyerp.com-20130412073655-rwscgrno71a3fzlo
2013-04-12 13:06:55 +05:30
354ac328c8
[FIX] point_of_sale fix tax rouding, this time tested, tnx fva
...
bzr revid: al@openerp.com-20130411224306-eei87tz4xp3d0o7n
2013-04-12 00:43:06 +02:00
0dded37377
[MERGE] point_of_sale fix tax rouding
...
lp bug: https://launchpad.net/bugs/1157761 fixed
bzr revid: al@openerp.com-20130411221119-cng0p4mct4pdf5tv
2013-04-12 00:11:19 +02:00
4da68cbc22
[FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
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
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
e582096959
[IMP] Improved code in Pos
...
bzr revid: ggh@tinyerp.com-20130411102949-lfeakwxskka8hzyy
2013-04-11 15:59:49 +05:30
894eeef8e0
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130411073708-gaxl2332umtedmg6
2013-04-11 09:37:08 +02:00
43a9fa81fd
[IMP] Name of method changed
...
bzr revid: ggh@tinyerp.com-20130411051350-0esvxad9a189x8iz
2013-04-11 10:43:50 +05:30
6ca422445c
[IMP] POS: Remove Default Category, when pos created
...
bzr revid: ggh@tinyerp.com-20130410105743-5i04atwsawpb8c6u
2013-04-10 16:27:43 +05:30
a0a9ae61e7
[IMP] point_of_sale: added barcodes in demo data for a few commonly found products
...
bzr revid: fva@openerp.com-20130410103238-igbolt8hst05xvi1
2013-04-10 12:32:38 +02:00
5aae7d0ec0
[IMP] Improve the code
...
bzr revid: ggh@tinyerp.com-20130410093456-rhjlutpqrqxshy2p
2013-04-10 15:04:56 +05:30
12b4e84f7b
[IMP] POS:product is not available_in_pos so category not show
...
bzr revid: ggh@tinyerp.com-20130410071724-wn0rlfbxk3jxsv3j
2013-04-10 12:47:24 +05:30
75997ddc1c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130410055452-4saqwvwv6cgtil6s
2013-04-10 05:54:52 +00:00
b2a872846c
[FIX] point_of_sale: use the correct rounding method for computing taxes
...
bzr revid: fva@openerp.com-20130409160021-707f3vrxcrqytsl6
2013-04-09 18:00:21 +02:00
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
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
07db55efa3
[IMP] POS:Available in pos checkbox not click pos_categ no need to display
...
bzr revid: ggh@tinyerp.com-20130409132314-2o0uvomvd5afy624
2013-04-09 18:53:14 +05:30
0d34beaf27
[IMP] POS: Without demo db, default Others pos category removed
...
bzr revid: ggh@tinyerp.com-20130409110851-krcl059eprf63sas
2013-04-09 16:38:51 +05:30
054465b3ed
[IMP] POS:Change the data code into demo code
...
bzr revid: ggh@tinyerp.com-20130409100917-pvwkamgwh0trtu4m
2013-04-09 15:39:17 +05:30
6fe10fc8e5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130409055857-v475gufg9pm5zbqy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130409055920-gtfw1ljrgaej1u0u
bzr revid: launchpad_translations_on_behalf_of_openerp-20130406063645-b7q6s71zvtm9orxm
bzr revid: launchpad_translations_on_behalf_of_openerp-20130407060119-7ojh5lykuwm3ydbn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130409055924-46ylmw1wqri80wgs
2013-04-09 05:59:24 +00:00
d4a1f8b434
[IMP] POS: All pos payment method show, domain based on Available in the point of sales
...
bzr revid: ggh@tinyerp.com-20130409051836-g8u2f6ebbc4rlkyn
2013-04-09 10:48:36 +05:30
b062573df4
[IMP] pos,cash-register: Corrected tooltips and layout.
...
bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
2013-04-09 10:17:24 +05:30
9f25ba0d78
[MERGE] point_of_sale: prohibit the use of bank journal that aren't of type 'bank' or 'cash' as payment method in the pos
...
bzr revid: qdp-launchpad@openerp.com-20130408142449-w0wemrmds3ikc46v
2013-04-08 16:24:49 +02:00
eb3ffc52ed
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130406063640-151b9f95w2tgiifb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130407060111-hobhqctome9qtz6c
bzr revid: launchpad_translations_on_behalf_of_openerp-20130408062055-hzgkrbw8lvkfphxe
2013-04-08 06:20:55 +00:00
4bb06462d7
[FIX] Check that payment method journal is of type cash or bank
...
bzr revid: jco@openerp.com-20130405134438-86l1ph7192owwrol
2013-04-05 15:44:38 +02:00
76b7a08275
[IMP] pos session and cash register, Improved tooltip and layout.
...
bzr revid: tta@openerp.com-20130405092419-jpa89isevfq6jw49
2013-04-05 14:54:19 +05:30
8e0f1cd1b9
[MERGE] lp:~openerp-dev/openobject-addons/trunk-cashcontrol--cha.
...
bzr revid: tta@openerp.com-20130404131017-phib24vytdx5fqmj
2013-04-04 18:40:17 +05:30
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
c5cde2a6a3
[MERGE] fixes in POS: optimizing the code when closing a session to have acceptable delays, used the right partner, changing the partner on the pos order also change it on the payment linked...
...
bzr revid: qdp-launchpad@openerp.com-20130404151428-yr2jhgjkolyjrcyf
2013-04-04 17:14:28 +02:00
252bcc802f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060824-pc5f2pj14gj0ak27
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055726-frtzw3gc9ut4wx4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053127-tolr13p1b3bhjny1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054749-t3x0zc7qk3n4man2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060920-k0cnlpk0rxcli841
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055741-loojniiz6du9upat
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053211-yvt1h32v41rs6jje
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054814-fwg742kzhsupr6kc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329051100-3ul1k4qwwm2f49gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060923-wch1f8ndmb15nu6x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055759-aj1nc93t9420lov0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053215-kqqgqefzp95fa1tk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054817-k33rri349nc2ioiz
2013-04-02 05:48:17 +00:00
14e4841c83
[IMP] pos.session:Corrected tooltip for cash_register_difference field.
...
bzr revid: tta@openerp.com-20130401103929-tdpsfl7w8akhh4d8
2013-04-01 16:09:29 +05:30
96ad608854
[IMP] general: use registry[X] instead registry.get(X) when X is dynamic
...
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
2013-03-29 15:37:20 +01:00
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
7a8d71be6d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329050903-yuxb08q83hlvg6ok
2013-03-29 05:09:03 +00:00
78e9418717
[FIX] Write all lines at once to the move instead of creating move lines separately
...
bzr revid: jco@openerp.com-20130328155549-pdqg0fgk1timzgfb
2013-03-28 16:55:49 +01:00
96a74ae6ad
[IMP] point_of_sale: ...
...
bzr revid: fva@openerp.com-20130328153537-ohdc3243lcu3dgbj
2013-03-28 16:35:37 +01:00
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
c0b4f5b714
[FIX] taxes should have partner too
...
bzr revid: jco@openerp.com-20130328121615-eyoplrrrofrosuay
2013-03-28 13:16:15 +01:00
5639a52431
[MERGE] use new report API.
...
bzr revid: vmt@openerp.com-20130328121009-r3n63gmhfkv0dnby
2013-03-28 13:10:09 +01:00
Thibault Delavallée
Antony Lesuisse
Paramjit Singh Sahota
Denis Ledoux
Launchpad Translations on behalf of openerp
Frédéric van der Essen
Martin Trigaux
Olivier Dony
Hardik Ansodariya
Christophe Simonis
Anael Closson
Randhir Mayatra (OpenERP)
Christophe Matthieu
Amit Vora (OpenERP Trainee)
Atul Patel (OpenERP)
niv-openerp
Harry (OpenERP)
Bharat R. Devnani (OpenERP)
Xavier Morel
Foram Katharotiya (OpenERP)
Chandni Machchhar (OpenERP Trainee)
Darshan Kalola (OpenERP Trainee)
Amit Bhavsar (Open ERP)
Vidhin Mehta
Fabien Meghazi
Turkesh Patel (Open ERP)
Fabien Pinckaers
ggh-openerp
Quentin (OpenERP)
Vo Minh Thu
Tejas Tank
Raphael Collet
Josse Colpaert