b2bb3eafbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
2012-12-18 05:08:32 +00:00
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
a7ddf7c689
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217044754-0kl222skaeva43lx
bzr revid: launchpad_translations_on_behalf_of_openerp-20121216050743-iza21869j5keaqi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20121217045834-1f6wbi5gkmzotgsl
2012-12-17 04:58:34 +00:00
cc69fe1b25
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211044948-8q9vf1f9ftrzq4wm
bzr revid: launchpad_translations_on_behalf_of_openerp-20121211050318-3noic2ymt0j497rw
2012-12-11 05:03:18 +00:00
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
f3fc080ef7
[MERGE] module desc + stock
...
bzr revid: fp@tinyerp.com-20121209105527-4ot27zsv5vqr38ls
2012-12-09 11:55:27 +01:00
dbe6afcb65
[MERGE] stock improvement in views + misc typo
...
bzr revid: fp@tinyerp.com-20121208162031-l29o82hcd3bw1fb5
2012-12-08 17:20:31 +01:00
e7b30b164e
[MERGE] Another batch of Bugfixes from 6.1
...
Up to 6.1 revision 6800 olt@tinyerp.com-20120516065727-ghvzjttnncj8ryj0
bzr revid: odo@openerp.com-20121207183024-adx8vnq9cytxi2lu
2012-12-07 19:30:24 +01:00
5db87bea9c
[MERGE] Bugfixes from 6.1 until revision 6800
...
bzr revid: odo@openerp.com-20121206153856-9y9v8ok6yxo6l5f0
2012-12-06 16:38:56 +01:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
aec7ff5024
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121205052048-tvbqvj40zdyoxtf0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121205054308-gayp86s3a2we62y7
2012-12-05 05:43:08 +00:00
243172e1dd
[MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1080127-pja
...
lp bug: https://launchpad.net/bugs/1080127 fixed
bzr revid: vta@openerp.com-20121204132327-n73nl0s0xalxvjmt
2012-12-04 14:23:27 +01:00
683f31e51b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055506-fin73s7n3o52fmuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20121204055956-fsd4tp3felpk8pm5
2012-12-04 05:59:56 +00:00
308e4f1073
[I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
...
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
5483897ad0
[I18N] Update translation templates for latest changes
...
bzr revid: odo@openerp.com-20121203155934-zmut8afc7hh82b02
2012-12-03 16:59:34 +01:00
6ac004d619
[merge]latest trunk
...
bzr revid: dle@openerp.com-20121129110331-nk9jz99s2jiug5hl
2012-11-29 12:03:31 +01:00
4b464deeee
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129051532-an3wp6f216pkzxiz
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129052158-2gjacp96ppgmvr5t
2012-11-29 05:21:58 +00:00
514952bdd3
[MERGE]Latest trunk
...
bzr revid: dle@openerp.com-20121128164105-m3hgq38xw6ikewa5
2012-11-28 17:41:05 +01:00
fbb4e61d71
[FIX]fix problem of POS Receipt missing space
...
bzr revid: pja@tinyerp.com-20121128121401-99mszzxiio5ewd3q
2012-11-28 17:44:01 +05:30
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
c87ab693a3
[MERGE] merge with parent
...
bzr revid: rma@tinyerp.com-20121127051533-kpy6m65bna2e1ncg
2012-11-27 10:45:33 +05:30
90e268d14c
[MERGE] staging branch
...
bzr revid: qdp-launchpad@openerp.com-20121126162933-a3c1agw0z72auw0e
2012-11-26 17:29:33 +01:00
846b6a0477
[FIX] delivery, warning, point_of_sale: onchange_partner_id now takes context as argument
...
bzr revid: qdp-launchpad@openerp.com-20121126142142-1i7tm04z85aeozqk
2012-11-26 15:21:42 +01:00
9c66d7d2f9
[IMP] PoS Useability
...
bzr revid: fp@tinyerp.com-20121126121350-1n3v1nqsrjf8b5qf
2012-11-26 13:13:50 +01:00
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
061f894aa1
[MERGE] merge with parent
...
bzr revid: rma@tinyerp.com-20121126084100-gagk2faf833cir4f
2012-11-26 14:11:00 +05:30
828cce9be0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
117bf937b9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
771b216118
[I18N] Update translation templates in preparation for 7.0 release
...
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
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
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
5e83cce0ca
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121123141458-h3vo5blt3h9eh9iz
2012-11-23 15:14:58 +01:00
0d915a11c4
[IMP] Change the string of the button in pos
...
bzr revid: rma@tinyerp.com-20121123111706-serad30xiaznzgvo
2012-11-23 16:47:06 +05:30
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
a880787a84
[MERGE]latest trunk
...
bzr revid: dle@openerp.com-20121122135357-n1jg2asgx06v88xe
2012-11-22 14:53:57 +01:00
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
7e1ffaf613
[REM]Remove all account.journal.view and account.journal.column references
...
bzr revid: dle@openerp.com-20121122104504-ezgj2666zkhgybpj
2012-11-22 11:45:04 +01:00
5183083743
[IMP] change sequence number for top menu items
...
bzr revid: api@openerp.com-20121122082312-1002q16yus0gs4q8
2012-11-22 09:23:12 +01:00
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
1d335a7cdb
[IMP] Re-set the sequence number for main menus
...
bzr revid: api@openerp.com-20121121162753-3mi0si4kf3rei42n
2012-11-21 17:27:53 +01:00
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
e06378bca3
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121120054609-xf0lxp1kts2mzifh
2012-11-20 11:16:09 +05:30
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
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
fa8463f804
[FIX] use session.url()
...
bzr revid: chs@openerp.com-20121114174258-ly0dniub0k383045
2012-11-14 18:42:58 +01:00
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
107e579ecd
[IMP] point_of_sale: auto focus on paymentlines
...
bzr revid: fva@openerp.com-20121114165043-vbfj1r93ww3es9qt
2012-11-14 17:50:43 +01:00
58ec91eb79
[FIX] point_of_sale: bad indentation
...
bzr revid: fva@openerp.com-20121114155540-dvkat6on42koims3
2012-11-14 16:55:40 +01:00
25fb4bcbca
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121114141751-8l6meschr2ay4o6c
2012-11-14 15:17:51 +01:00
64277d04c3
[IMP] Addons: messages when installing key apps is not of comment subtype, meaning they are effectively pushed.
...
bzr revid: tde@openerp.com-20121114115504-tvh0j9ks0jde12ed
2012-11-14 12:55:04 +01:00
eef0d61bb9
[MERGE] fix partial payment wizard
...
bzr revid: fp@tinyerp.com-20121113073428-aa2g1vnensxfcgn4
2012-11-13 08:34:28 +01:00
abb680ec29
[MERGE] fix po translation
...
bzr revid: fp@tinyerp.com-20121112084105-9ovbr3tpv4uitboh
2012-11-12 09:41:05 +01:00
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
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
bf07a0daa1
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121109063407-tebmex7hfpur96xw
2012-11-09 12:04:07 +05:30
185b32d7d5
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121107091958-f3rqu7nc585umjwq
2012-11-07 10:19:58 +01:00
35d3d481f7
[IMP]change typo
...
bzr revid: sgo@tinyerp.com-20121106071724-jwd7c75rk382yuzf
2012-11-06 12:47:24 +05:30
bfb7746b6b
[IMP]stock picking name set on create picking
...
bzr revid: sgo@tinyerp.com-20121106071116-nki3vftl249l2hes
2012-11-06 12:41:16 +05:30
0be8f4b72d
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121106065724-5bp6du6cqo3sun88
2012-11-06 12:27:24 +05:30
b74fe87f94
[IMP]ser pricelist of pos on pos order
...
bzr revid: sgo@tinyerp.com-20121106061302-m00bezd0bt0line7
2012-11-06 11:43:02 +05:30
8f83c2194b
[IMP]pos tab in user will show edit button only in edit form and change string of form and help
...
bzr revid: sgo@tinyerp.com-20121105131121-umf8viq2gy1mf3p9
2012-11-05 18:41:21 +05:30
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
22ad7a70f7
[MERGE] trunk
...
bzr revid: fme@openerp.com-20121105084838-gwc7xb19f7131vbi
2012-11-05 09:48:38 +01:00
5c3e56267e
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121105063300-ylbdx03epxui6v2v
2012-11-05 12:03:00 +05:30
974ca267cf
[MERGE] fix multi-company for pos
...
bzr revid: fp@openerp.com-20121103172128-rx5lvo5xzmsj9ay1
2012-11-03 18:21:28 +01:00
74476c8e22
[FIX] POS close session without cash register
...
bzr revid: fp@openerp.com-20121103171225-nlp53s0aenamdhcg
2012-11-03 18:12:25 +01:00
ce874db95a
[FIX] POS
...
bzr revid: fp@openerp.com-20121103152504-f3o6ce0e833hdibj
2012-11-03 16:25:04 +01:00
f3a92c9633
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121103050437-hjtar0inhj4gqyfi
2012-11-03 05:04:37 +00:00
cd68364301
[MERGE] English typos
...
bzr revid: fp@openerp.com-20121102173407-umicel4287htim14
2012-11-02 18:34:07 +01:00
376cfc937a
[MERGE] addosn 17
...
bzr revid: fp@tinyerp.com-20121102082707-wpv96avu8l5incs8
2012-11-02 09:27:07 +01:00
321754dfe0
[FIX]point_of_sale:fixed the issue of point of sale order receipt fields translation problem
...
lp bug: https://launchpad.net/bugs/1073199 fixed
bzr revid: ssu@tinyerp.com-20121101062613-dplo6xr4e3q6c42y
2012-11-01 11:56:13 +05:30
b006809773
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121101043649-5rzrir0djswt67t6
2012-11-01 04:36:49 +00:00
a7874fc421
[MERGE] point_of_sale: Fix some bugs
...
bzr revid: stw@openerp.com-20121031145708-g7ddb6xsrx2ag8c4
2012-10-31 15:57:08 +01:00
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
1fc8b2e611
[IMP]Improve tool tip.
...
bzr revid: vba@tinyerp.com-20121031072758-niyxbgdzih79mln1
2012-10-31 12:57:58 +05:30
510be6595c
Improve tooltip.
...
bzr revid: vba@tinyerp.com-20121030131401-hf7oonmt0nkwfi1y
2012-10-30 18:44:01 +05:30
87d3caa50f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
72072ccee2
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121029060408-l6o9b7fejdo9uqv0
2012-10-29 11:34:08 +05:30
de55e6d736
[MERGE]merge with trunk-terminology_batch2.
...
bzr revid: vba@tinyerp.com-20121029055922-pmwrqgxq8yo3qb20
2012-10-29 11:29:22 +05:30
0bf0b95d67
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121029051732-hcgpnra148041ews
2012-10-29 10:47:32 +05:30
a7368145ca
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
7850a91339
[IMP]Improve a tooltip.
...
bzr revid: vba@tinyerp.com-20121023130242-pu2o7e9x7lpr7g36
2012-10-23 18:32:42 +05:30
1204262d46
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121023091417-5noy0gguxd12pduk
2012-10-23 14:44:17 +05:30
a53941b165
[FIX] Fixed CallbackEnabled issues in POS.
...
bzr revid: vta@openerp.com-20121023075035-wx3awh0sdeeqa7t3
2012-10-23 09:50:35 +02:00
4694363d62
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121023065055-uapr3ywmqngewjb2
2012-10-23 12:20:55 +05:30
ae95cab533
[FIX] point_of_sale: Add a context on launch_payment() method.
...
bzr revid: vba@tinyerp.com-20121023052715-78d4sykmrrpzult0
2012-10-23 10:57:15 +05:30
b2de4d421c
[MERGE] merged a branch with several fixes, related to the new patch applied on server fo 1) osv/orm: call the fct_inv for functional fields that are stored=True 2) tools/yamp_import: on record creation, do not consider fields that wouldn't be returned by the client because readonly in the view
...
bzr revid: qdp-launchpad@openerp.com-20121022130156-ki47is4opjex9d79
2012-10-22 15:01:56 +02:00
50e0b17662
[FIX] pos closing
...
bzr revid: al@openerp.com-20121022104529-9wq22t76fj6zqxu6
2012-10-22 12:45:29 +02:00
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
d1131c4a8d
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121018052756-65fv51x0qrmz7zj6
bzr revid: mma@tinyerp.com-20121019050930-mcht3lslqjk38q22
2012-10-19 10:39:30 +05:30
e5ea70b4c2
[FIX] point_of_sale: typo in report
...
bzr revid: qdp-launchpad@openerp.com-20121018135949-b08zihsoo7s0km05
2012-10-18 15:59:49 +02:00
f30d1585e5
[IMP]set pos company in statment create
...
bzr revid: sgo@tinyerp.com-20121018125506-lrdsyklk0oap2u5z
2012-10-18 18:25:06 +05:30
5469854d17
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121018081536-r0xfo12gttw0loab
2012-10-18 10:15:36 +02:00
df2750f9fd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121018044110-cqlg7hbfgy4m2bba
2012-10-18 04:41:10 +00:00
cbdb0ccf9c
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121017140509-67yq1gjzrs871hb6
2012-10-17 16:05:09 +02:00
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
8a38ee944e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20121017043613-kd7vkw5ixd4djrpm
2012-10-17 04:36:13 +00:00
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
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
8346293d72
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
59ddf58bb4
[MERGE] callback2deffered rpc
...
bzr revid: al@openerp.com-20121015133334-4fmbsa14r23laljs
2012-10-15 15:33:34 +02:00
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
cdd1b7c45e
[FIX] typo PoS
...
bzr revid: fp@tinyerp.com-20121013103756-0h1uw6wd7py809rc
2012-10-13 12:37:56 +02:00
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
00f3dfc6d8
[MERGE] use of formatLAng(amount, currency_obj=...) and use of display_address() in reports
...
bzr revid: qdp-launchpad@openerp.com-20121012071640-sxhy9xnat65r8158
2012-10-12 09:16:40 +02:00
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
2762e94eb3
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011052218-dx74aeg04h6azdmz
bzr revid: apa@tinyerp.com-20121012050113-w3b9fijrbxfyndxj
2012-10-12 10:31:13 +05:30
bc44da05a1
[IMP] reports: use of FormatLang(amount, currency_obj=...) instead of printing currency.symbol directly in the report
...
bzr revid: qdp-launchpad@openerp.com-20121011094002-7unxi6bi2hh2u6k5
2012-10-11 11:40:02 +02:00
914498d2ff
[MERGE] trunk
...
bzr revid: fp@tinyerp.com-20121011081908-fu1don49seb3loro
2012-10-11 10:19:08 +02:00
ce440f16d3
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121011075658-bf5ax000j74vi6ro
2012-10-11 09:56:58 +02:00
faa9b72150
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011055111-o9jrrunnlx56ce1o
2012-10-11 11:21:11 +05:30
aca92d1c4c
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011055023-0huqe4kr4e6s3her
2012-10-11 11:20:23 +05:30
84a7523a63
[IMP] remove standalone web client, fix imports
...
bzr revid: al@openerp.com-20121010204617-ah29rz616xo7i2dr
2012-10-10 22:46:17 +02:00
dd5f5eca9b
[MERGE]
...
bzr revid: fp@openerp.com-20121010203818-32otffomve5ifm16
2012-10-10 22:38:18 +02:00
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
57011e3ef5
[MERGE/FIX]:
...
- If you manually create a session by clicking on "All Sessions" then "Create" and enter a pos, the pos field will dissapear..
- Should not be possible to select view accounts for profit/losss acount on cash registers tab of payment method
bzr revid: apa@tinyerp.com-20121010104043-gcj3ytsjhua7k8p7
2012-10-10 16:10:43 +05:30
0e26c16d0f
[IMP] appear the pos fields when create a session
...
bzr revid: fka@tinyerp.com-20121010070940-vyjatobj08nmpoir
2012-10-10 12:39:40 +05:30
d48856e81a
[FIX]:point_of_sale: In the same way the %age of discount was wrong in the reporting > point of sale > Sale details, there's a problem of conversion from %age to amount in the other report (reporting > point of sale > ORDER ANALYSIS), where the Total discount is the sum of %ages converted in €. So two times 50% discount = 100€ even though the item cost 1 bazillion, which is not correct.
...
bzr revid: apa@tinyerp.com-20121010052920-7d2zl85war0bn8jr
2012-10-10 10:59:20 +05:30
6f0d95e1db
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121009091112-deph5zzpnxcft9ct
2012-10-09 14:41:12 +05:30
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
8944588931
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121004050405-de1o2nl772ow12yf
bzr revid: atp@tinyerp.com-20121008051226-6fz3lau22ylb02oc
bzr revid: atp@tinyerp.com-20121008113735-ubbudyuqotrsg5fo
2012-10-08 17:07:35 +05:30
ddb869f180
[FIX] fixing css errors as reported by firefox
...
bzr revid: fva@openerp.com-20121005140616-w5tulvk6v6hesjmn
2012-10-05 16:06:16 +02:00
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
062a78f8da
[IMP]improve pos reprint wizard
...
bzr revid: sgo@tinyerp.com-20121005112633-a7er5yxbykgij52s
2012-10-05 16:56:33 +05:30
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
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
540cd63740
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121004055521-yadslxbizyevvfrh
2012-10-04 11:25:21 +05:30
7050ee5abb
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121004053709-mzo4257vg798d0a0
2012-10-04 11:07:09 +05:30
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
fbd443a66e
[MERGE] merge with addons
...
bzr revid: rma@tinyerp.com-20121003103503-5rdpwbp2cecfmna0
2012-10-03 16:05:03 +05:30
2d3d478784
[MERGE] Fix some bugs of the point of sale
...
bzr revid: stw@openerp.com-20121003080934-7viber8ldyrjgaqg
2012-10-03 10:09:34 +02:00
f715525300
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121003064028-49llvt047893tx2n
2012-10-03 12:10:28 +05:30
b0cdfa4eda
[FIX]point_of_sale:string improved in user view.
...
bzr revid: kbh@tinyerp.com-20121003055428-oc6r5t4fpmdb29tj
2012-10-03 11:24:28 +05:30
257d03f403
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20121003052447-99gpby70gy2fbhih
2012-10-03 10:54:47 +05:30
bdae7c2850
[IMP]: ADD currency symbol with amount
...
bzr revid: atp@tinyerp.com-20121002164001-s8r2ivug8ghi36af
2012-10-02 22:10:01 +05:30
1653332080
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
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
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
082f70cb6f
[MERGE]: Merged display_address() field
...
bzr revid: atp@tinyerp.com-20121002065832-7wick5qjfbbhy5jv
2012-10-02 12:28:32 +05:30
a9676cfd8c
[IMP] amout with currency.
...
bzr revid: nco@tinyerp.com-20121001110802-r3l169i2ka73t2rh
2012-10-01 16:38:02 +05:30
3bd0b43e81
[FIX] point_of_sale: We use a callback for the 'Validate & Open
...
Session' button, because we want to open the PoS UI.
[FIX] point_of_sale: Hide/Show the opening/closing cash control
bzr revid: stw@openerp.com-20121001095254-bcteq9amp0eurn3g
2012-10-01 11:52:54 +02:00
e7512fd22f
[IMP] point_of_sale: globally improved css design
...
bzr revid: fva@openerp.com-20120928152041-mo5oqca8zd0aaohu
2012-09-28 17:20:41 +02:00
a634a1a91f
expense.sxw pos_lines.sxw and pos_lines.rml
...
bzr revid: nco@tinyerp.com-20120928124057-26jmpyivpgs536cp
2012-09-28 18:10:57 +05:30
7f3455cdc8
[IMP] point_of_sale , pos_lines.rml
...
bzr revid: nco@tinyerp.com-20120928121313-r2iicypzvjlyrzjt
2012-09-28 17:43:13 +05:30
b3dde42f5b
[IMP] imporve amount with curruncy in point_of_sale , pos_lines.rml
...
bzr revid: nco@tinyerp.com-20120928114743-we0dvo10wv7d3its
2012-09-28 17:17:43 +05:30
155bdaf57b
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120927142055-p5yc406vkufi6rg9
2012-09-27 16:20:55 +02:00
ff211c375a
[FIX] point_of_sale: return the session id in the context for the call of the pos.ui
...
bzr revid: stw@openerp.com-20120927122022-fy2gx1z1xtkk14xt
2012-09-27 14:20:22 +02:00
4f74d0aee1
[FIX] point_of_sale: show the cash_register_balance when we are in closing_control
...
bzr revid: stw@openerp.com-20120927121954-1safkpgurh4nu9kc
2012-09-27 14:19:54 +02:00
8c42299413
[REMOVE] remove create button form all posgress report.
...
bzr revid: nco@tinyerp.com-20120927083839-ruhpxzwgdyasodfe
2012-09-27 14:08:39 +05:30
7146bf55aa
[IMP] correct the string mistake in point of sale module
...
bzr revid: rma@tinyerp.com-20120926132702-einbzxd11utfn6qf
2012-09-26 18:57:02 +05:30
1149fffd9a
[MERGE] point_of_sale: Show the opening & closing control
...
bzr revid: stw@openerp.com-20120926094502-d6qe9mkarfvr8rha
2012-09-26 11:45:02 +02:00
e3003f56b2
[IMP] point of sale, 10 firsts clicks cleaned
...
bzr revid: fp@tinyerp.com-20120925075645-9ydq1dh6usmwyknx
2012-09-25 09:56:45 +02:00
24a4e57171
[FIX] point_of_sale: show the opening cash control
...
bzr revid: stw@openerp.com-20120924115320-nkbfhfnyab4bhxrc
2012-09-24 13:53:20 +02:00
f0a883e6d6
[FIX] point_of_sale: Show the opening_control & closing_control
...
bzr revid: stw@openerp.com-20120924102613-twii7ba34wctx6c6
2012-09-24 12:26:13 +02:00
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
85b16184f8
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20120918131350-xx40khn6xsb5j16f
2012-09-18 15:13:50 +02:00
69d83db1e5
[MERGE] point_of_sale: select the cash journals and hide some elements on the form view.
...
bzr revid: stw@openerp.com-20120917153714-kelopzdwaysht3pd
2012-09-17 17:37:14 +02:00
2a4aaeba31
[FIX] point_of_sale: Show/Hide some groups in function of the state and the cash_control flag
...
bzr revid: stw@openerp.com-20120917140138-sjsnjxv27nd8rnao
2012-09-17 16:01:38 +02:00
06852d994b
[FIX] point_of_sale: Take the 'cash' journals if there is no specific cash journal for the Point Of Sale
...
bzr revid: stw@openerp.com-20120917120926-h3bzu2k9ds5lnjjr
2012-09-17 14:09:26 +02:00
ccb15e76f6
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx
2012-09-17 13:44:55 +02:00
b4d415ff9b
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120917050738-i5730n5sbqvnfsnh
2012-09-17 10:37:38 +05:30
b9fa71cc59
[MERGE] merge rpa's imprvoements of modules description
...
bzr revid: fp@openerp.com-20120916212615-jfoghzsady0ektp1
2012-09-16 23:26:15 +02:00
ab4b7da49f
[IMP] cleaned ir.actions.todo to launch newly installed application
...
bzr revid: fp@openerp.com-20120916114249-5px8shvbm3tzhidh
2012-09-16 13:42:49 +02:00
59c03591df
[MERGE] improvements on module descriptions
...
bzr revid: gim@openerp.com-20120914140950-drka4c0tnbnkw3fg
2012-09-14 16:09:50 +02:00
30839863e8
[IMP] improve module descriptions
...
bzr revid: gim@openerp.com-20120914122827-dhao39ur269mmin8
2012-09-14 14:28:27 +02:00
2e65d4319f
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120912051440-raj6egoom3qyfsmm
bzr revid: atp@tinyerp.com-20120913034436-i09g3lujgvy81gr6
bzr revid: atp@tinyerp.com-20120914051314-m5g13izj55f4sxqi
2012-09-14 10:43:14 +05:30
d7dfc3dc1c
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
8920abbb65
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120913151434-y30kfigwj20w3y58
2012-09-13 17:14:34 +02:00
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
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
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
10c5a5c02a
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120913053058-unlfdj92o69rnjam
2012-09-13 11:00:58 +05:30
a5f52bc3e5
[IMP] touchscreen pos, usability improvements
...
bzr revid: fp@tinyerp.com-20120912182126-7lgskacso9pfh7er
2012-09-12 20:21:26 +02:00
168e3244f3
[IMP] start session directly if possible with POS
...
bzr revid: fp@tinyerp.com-20120912181814-4t3rlicu5s9wqap8
2012-09-12 20:18:14 +02:00
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
a5bed8994c
[IMP] point_of_sale: debug window
...
bzr revid: fva@openerp.com-20120912161229-4lgcgt4xt2cdzceo
2012-09-12 18:12:29 +02:00
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
9899e87dd0
[IMP]: point_of_sale: Improved module description for point_of_sale
...
bzr revid: rpa@tinyerp.com-20120911100941-3r0a3q3ojry8si4h
2012-09-11 15:39:41 +05:30
431fae4da5
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120911045411-mivfwqle7pidfr68
2012-09-11 10:24:11 +05:30
f711f7d9a6
[MERGE] muti-currency group
...
bzr revid: fp@openerp.com-20120910201408-paf7q0cj22i72k2n
2012-09-10 22:14:08 +02:00
d71e5b45b6
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120910154950-rg1phce0w33gsq8b
2012-09-10 17:49:50 +02:00
83fc106eaa
[FIX] point_of_sale: coherent image url handling
...
bzr revid: fva@openerp.com-20120910154828-4k699hi3lu8lgxvu
2012-09-10 17:48:28 +02:00
7c9b5c8e5b
[IMP] point_of_sale: If there is no journals for the pos.config, select the cash journals
...
bzr revid: stw@openerp.com-20120910091618-nzv26m258xx64na5
2012-09-10 11:16:18 +02:00
f1cf4c04b9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
2012-09-09 16:32:14 +05:30
3982e5ba7a
[IMP] mail_group, point of sale, hr: updated image fields help, as small and medium sizes are now 64x64 ans 128x128, to match more closely OpenERP image sizes. product: image_medium are not up-sized when resizing them. This means that images smaller than 128x128 won't be resized in image_medium. The purpose is to avoid having unwanted blank frame around images in POS.
...
bzr revid: tde@openerp.com-20120907095155-i5hlmidnkq7r2r7b
2012-09-07 11:51:55 +02:00
b086b8a584
[CLEAN] mail_group, product, point_of_sale, hr: cleaned help of image, because it was too technical-related. Added a comment in code instead about PIL and base64. By the way, small cleaning of the white spaces.
...
bzr revid: tde@openerp.com-20120907092333-9f745210yr3p22ay
2012-09-07 11:23:33 +02:00
ac75763855
[MRG] merge with lp:openobjec-addons.
...
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30
aac17b11a4
[FIX] remove semantic part1
...
bzr revid: al@openerp.com-20120906101723-eeieyzhj4racxq14
2012-09-06 12:17:23 +02:00
b2cb4b841d
[FIX] point_of_sale: unrecognized_items error handling
...
bzr revid: fva@openerp.com-20120905210751-7lbzkypzefy6zb3f
2012-09-05 23:07:51 +02:00
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
63df74b8dc
[FIX] keyboard layout and numpad input
...
bzr revid: fva@openerp.com-20120905202058-o5r2ckzhwdkv2xhq
2012-09-05 22:20:58 +02:00
bff5b81db3
[FIX] fixing some regressions
...
bzr revid: fva@openerp.com-20120905164221-hcigfd0kxdckgz94
2012-09-05 18:42:21 +02:00
41e16c6592
[MERGE] sync with trunk
...
bzr revid: odo@openerp.com-20120905163135-9f6q0ghri1kq6z75
2012-09-05 18:31:35 +02:00
97de9d6d3f
[FIX] point_of_sale: Set the right account for the internal account.
...
[REF] point_of_sale: Review the code for the Take Money Out and Push Money In.
[FIX] point_of_sale: Can post a session with an order in the invoiced state.
bzr revid: stw@openerp.com-20120905150538-v9ex7wehyebft7tu
2012-09-05 17:05:38 +02:00
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
eb53669cb1
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120905094101-j20tm78k7sq6dnxd
2012-09-05 11:41:01 +02:00
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
bc586f2efe
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20120905081314-uu3khdpohgz23j6q
2012-09-05 10:13:14 +02:00
2160072508
[MERGE] sync with trunk
...
bzr revid: odo@openerp.com-20120905073134-v1j98vzvmwe6a72i
2012-09-05 09:31:34 +02:00
709331f682
[MERGE] remove unneeded demo users
...
bzr revid: al@openerp.com-20120905001533-fz1htj832djequ6p
2012-09-05 02:15:33 +02:00
5126f6ff6e
wip
...
bzr revid: nicolas.vanhoren@openerp.com-20120904163725-ptsij09rve8j3txs
2012-09-04 18:37:25 +02:00
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
5930fd069f
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20120904102700-8f94o2dvdt0f33bv
2012-09-04 15:57:00 +05:30
42ae38116a
[MERGE] point_of_sale: Improve the layout of the pos.session.opening wizard.
...
bzr revid: stw@openerp.com-20120904100711-rp4ca0u9hs0t7vm4
2012-09-04 12:07:11 +02:00
48c081f271
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
74e4fe0f53
[MERGE] USablity improvements: product form/kanban/search, membership, projects
...
bzr revid: fp@tinyerp.com-20120903175638-lq221k6yjyams8kn
2012-09-03 19:56:38 +02:00
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
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
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
b832115057
[FIX] point_of_sale: Return the state of the session in the wizard
...
bzr revid: stw@openerp.com-20120903134533-lqyay7rv7jkusde8
2012-09-03 15:45:33 +02:00
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
d5459171bd
[FIX] point_of_sale: Show the Opening and Closing balance only if the session is closed
...
bzr revid: stw@openerp.com-20120903125740-xxl4x298imiyo0y9
2012-09-03 14:57:40 +02:00
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
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
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
f39f799897
Fix: Account configuration : removed currency group.
...
bzr revid: tta@openerp.com-20120903095908-tswt6gi2zl5w89s2
2012-09-03 15:29:08 +05:30
a77587e064
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120903094840-vd63m4i8vkqxjij2
2012-09-03 11:48:40 +02:00
6fa349a4eb
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
dfb82b2081
[MERGE] Merge from trunk.
...
bzr revid: jra@tinyerp.com-20120903065444-bcadcpsnadx0vhpx
2012-09-03 12:24:44 +05:30
e3f1c26e6a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
2012-09-03 05:21:17 +00:00
7ebf462e07
[IMP] product view
...
bzr revid: fp@tinyerp.com-20120831174746-7bfitkd45m73r6oz
2012-08-31 19:47:46 +02:00
4785fc109e
[FIX] Point of Sales Users Demo
...
bzr revid: cto@openerp.com-20120831170747-iyptvo6iy96d12w4
2012-08-31 19:07:47 +02:00
33897328bc
[IMP] product view
...
bzr revid: fp@tinyerp.com-20120831164018-b8m7xhxi2na5eraj
2012-08-31 18:40:18 +02:00
349c24a1cd
[IMP] usability
...
bzr revid: fp@tinyerp.com-20120831163517-vqatk8mzl7u2vuym
2012-08-31 18:35:17 +02:00
6eb0b6af71
fix
...
bzr revid: fp@tinyerp.com-20120831162831-qn2ai0258pki7fxp
2012-08-31 18:28:31 +02:00
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
b3ec8d7647
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120831143222-j86sa4w0vuy24z7j
2012-08-31 16:32:22 +02:00
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
bf513b5919
[IMP] point_of_sale: Add a description when the session is in progress
...
bzr revid: stw@openerp.com-20120831102509-yv3bc68gii0sexfk
2012-08-31 12:25:09 +02:00
2e664de4f8
[IMP] Improved code to remove warning(server log) for deprecated type.
...
bzr revid: jra@tinyerp.com-20120831101659-voh9g3kwmhji2bf1
2012-08-31 15:46:59 +05:30
c14a11482c
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
1dce0b1dc4
[FIX] all mail dependencies: replace message_post call by normal record + review misc wording
...
bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
2012-08-30 16:18:52 +02:00
54237bc2a2
[MERGE] point_of_sale: Add some improvements and bug fixes
...
bzr revid: stw@openerp.com-20120830132642-o9ish51w0s7aigzn
2012-08-30 15:26:42 +02:00
7d120eb1d1
[FIX] point_of_sale: Set the right balance end for a bank statement
...
[FIX] point_of_sale: Show/Hide some tabs
bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
2012-08-29 17:46:34 +02:00
93395ac1ec
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120829125759-mjulntnmsyjzs0xq
2012-08-29 14:57:59 +02:00
1eedcaedad
[IMP] point_of_sale: TODO changes
...
bzr revid: fva@openerp.com-20120829125640-5bml13zupja3w30b
2012-08-29 14:56:40 +02:00
6aded504b3
[FIX] point_of_sale: redefine the copy function for the pos.config to avoid a copy of the sequence.
...
[IMP] point_of_sale: Associate a default category for the existing products.
bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
2012-08-29 14:25:01 +02:00
0e14e8dc20
[MERGE]Merged with latest trunk
...
bzr revid: dhr@tinyerp.com-20120829102402-3sdf5i8rfgq9dxca
2012-08-29 15:54:02 +05:30
d3bb4f5ae5
merge
...
bzr revid: fp@tinyerp.com-20120829094828-b8pxz76tfnigfffw
2012-08-29 11:48:28 +02:00
4b614305d4
[IMP] add context on the call of the method refund
...
bzr revid: benoit.guillot@akretion.com.br-20120829084032-9ow83wx3kcmrvep7
2012-08-29 10:40:32 +02:00
8b910c1f1d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
6086951935
[MERGE]Merged with trunk
...
bzr revid: dhr@tinyerp.com-20120829061429-yko2f9xgqsyynvig
2012-08-29 11:44:29 +05:30
768d9cdb7e
[IMP] account: Merge the opening_control and closing_control flags in cash_control
...
[IMP] account: In the case where the bank statement is a cash register, we can get the coins of the last register.
[IMP] account: Hide the 'Available Coins' if the journal hasn't the cash_control flag.
[FIX] account: Use some default values for the profit/loss and internal account.
[IMP] point_of_sale: Avoid to have two payment methods with the cash_control in a pos.config object.
[REF] point_of_sale: Refactor the computation code of the cash_journal, cash_register and cash_control flags.
[IMP] point_of_sale: Store the difference in the right account if the journal of the statement is a cash_control or nota.
[FIX] point_of_sale: Use the session name instead of the order name for the account.bank.statement.line .
[IMP] point_of_sale: [DEMO] Define the default payment_methods for the pos.config.
bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
2012-08-28 13:21:16 +02:00
3733972565
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120828092928-da2a6k1f2e7g9i42
2012-08-28 14:59:28 +05:30
4e31d1be93
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
c2a8adb976
[IMP]pos,product(pricelist) and hr_expense_report : applying multi_currency group to currency field
...
bzr revid: dhr@tinyerp.com-20120828070841-l318wc2b4jkm99dz
2012-08-28 12:38:41 +05:30
4b0d1be1c0
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
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
45cf233538
[FIX] point_of_sale: Hide the has_XXX_control fields in the session
...
bzr revid: stw@openerp.com-20120824130730-8dqrjjqr7z1stwl5
2012-08-24 15:07:30 +02:00
ec6bd9c649
[FIX] point_of_sale: Review the buttons for the pos.session object
...
bzr revid: stw@openerp.com-20120824114300-jdax2175w9mbcb2n
2012-08-24 13:43:00 +02:00
Launchpad Translations on behalf of openerp
Cecile Tonglet
Vo Minh Thu
Fabien Pinckaers
Olivier Dony
Jalpesh Patel (OpenERP)
Vishmita
Randhir Mayatra (OpenERP)
Quentin (OpenERP)
Frédéric van der Essen
Arnaud Pineux
Amit Patel
Christophe Simonis
Thibault Delavallée
Sanjay Gohel (Open ERP)
Fabien Meghazi
Fabien Pinckaers
Stephane Wirtel
Vijaykumar Baladaniya
Antony Lesuisse
Mayur Maheshwari (OpenERP)
Foram Katharotiya (OpenERP)
Atul Patel (OpenERP)
ggh-openerp
Khushboo Bhatt (Open ERP)
Antonin Bourguignon
Nimesh (Open ERP)
Gilles Major
Jigar Amin - OpenERP
Rucha (Open ERP)
Turkesh Patel (Open ERP)
niv-openerp
Jiten (OpenERP)
Tejas Tank
Dharti Ratani (OpenERP)
Benoit Guillot