Meera Trambadia (OpenERP) [Wed, 28 Sep 2011 05:23:43 +0000 (10:53 +0530)]
[IMP] account:checked methods of account.move and account.tax.code in yaml
bzr revid: mtr@tinyerp.com-
20110928052343-v9p013w0m29s3auw
Fabien Pinckaers [Mon, 26 Sep 2011 07:38:46 +0000 (09:38 +0200)]
[IMP] payment, reference not required
bzr revid: fp@tinyerp.com-
20110926073846-wzaetyo8pmvuwhp4
Antony Lesuisse [Mon, 26 Sep 2011 00:54:44 +0000 (02:54 +0200)]
[IMP] directory cleanups, moved historical cruft into history
bzr revid: al@openerp.com-
20110926005444-a7vqjb05vep7xbvj
Fabien Pinckaers [Sun, 25 Sep 2011 23:20:56 +0000 (01:20 +0200)]
[FIX] receive and manually create a new one
bzr revid: fp@tinyerp.com-
20110925232056-9t1lz4wf6t3ufjyz
Fabien Pinckaers [Sun, 25 Sep 2011 22:53:32 +0000 (00:53 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110925225332-bdrdq48tvu8wpj9a
Fabien Pinckaers [Sun, 25 Sep 2011 22:49:50 +0000 (00:49 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110925224950-1l4oxm6tz12z623d
Fabien Pinckaers [Sun, 25 Sep 2011 22:44:29 +0000 (00:44 +0200)]
[FIX] is price not in pricelist for a PO
bzr revid: fp@tinyerp.com-
20110925224429-nb300pvodh02vh1y
Fabien Pinckaers [Sun, 25 Sep 2011 22:33:57 +0000 (00:33 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110925223357-3b22ga5nfwmhf3jl
Fabien Pinckaers [Sun, 25 Sep 2011 22:24:45 +0000 (00:24 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110925222445-vcji6x4ww9ve2lf0
Fabien Pinckaers [Sun, 25 Sep 2011 22:22:42 +0000 (00:22 +0200)]
merge
lp bug: https://launchpad.net/bugs/828603 fixed
bzr revid: fp@tinyerp.com-
20110925222242-9j04ly571rociz59
Fabien Pinckaers [Sun, 25 Sep 2011 22:20:14 +0000 (00:20 +0200)]
merge
lp bug: https://launchpad.net/bugs/806914 fixed
bzr revid: fp@tinyerp.com-
20110925222014-739rw6mpsurzo1cj
Fabien Pinckaers [Sun, 25 Sep 2011 22:17:06 +0000 (00:17 +0200)]
merge
lp bug: https://launchpad.net/bugs/838887 fixed
bzr revid: fp@tinyerp.com-
20110925221706-suqxfmodiwjpabsx
Fabien Pinckaers [Sun, 25 Sep 2011 22:15:43 +0000 (00:15 +0200)]
merge
lp bug: https://launchpad.net/bugs/842758 fixed
bzr revid: fp@tinyerp.com-
20110925221543-650h1jd4q57fyu0i
Fabien Pinckaers [Sun, 25 Sep 2011 21:54:57 +0000 (23:54 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110925215457-a40td30n6bedg2ug
Fabien Pinckaers [Sun, 25 Sep 2011 21:48:29 +0000 (23:48 +0200)]
[IMP] Point of Sale Useability and code cleaning
bzr revid: fp@tinyerp.com-
20110925214829-w11t4boo7wxceee9
Fabien Pinckaers [Sun, 25 Sep 2011 21:47:10 +0000 (23:47 +0200)]
[IMP] Point of Sale Useability and code cleaning
bzr revid: fp@tinyerp.com-
20110925214710-dvl6qnf3h3siders
Fabien Pinckaers [Sun, 25 Sep 2011 21:45:32 +0000 (23:45 +0200)]
[IMP] Point of Sale Useability and code cleaning
bzr revid: fp@tinyerp.com-
20110925214532-1scgzy6tk9r70091
Fabien Pinckaers [Sun, 25 Sep 2011 21:08:44 +0000 (23:08 +0200)]
[IMP] useability and code cleaning
bzr revid: fp@tinyerp.com-
20110925210844-g86ikbvnvnsjpzpk
Fabien Pinckaers [Sun, 25 Sep 2011 21:00:20 +0000 (23:00 +0200)]
[IMP] Useability and misc fixes in POS
bzr revid: fp@tinyerp.com-
20110925210020-5jvd7x38asnbzv5b
Fabien Pinckaers [Sun, 25 Sep 2011 19:02:00 +0000 (21:02 +0200)]
[IMP] some fixes
bzr revid: fp@tinyerp.com-
20110925190200-zo2elh6ntlckdqkt
Fabien Pinckaers [Sun, 25 Sep 2011 18:40:12 +0000 (20:40 +0200)]
[IMP] pos, -u point_of_sale works better
bzr revid: fp@tinyerp.com-
20110925184012-t1x14v2it65zsm0o
Fabien Pinckaers [Sun, 25 Sep 2011 17:07:13 +0000 (19:07 +0200)]
[fIX]
bzr revid: fp@tinyerp.com-
20110925170713-wuc03wqxlaenmvt2
Fabien Pinckaers [Sun, 25 Sep 2011 17:04:16 +0000 (19:04 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110925170416-9lfef6yxl8bcntre
Fabien Pinckaers [Sun, 25 Sep 2011 15:50:50 +0000 (17:50 +0200)]
[IMP] clean test YML for point_of_sale
bzr revid: fp@tinyerp.com-
20110925155050-cqkwsar8azfmis87
Vo Minh Thu [Sun, 25 Sep 2011 15:02:32 +0000 (17:02 +0200)]
[FIX] openerp.service: call wsgi.stop_server upon server shutdown.
bzr revid: vmt@openerp.com-
20110925150232-qidzjypddp22el1f
Fabien Pinckaers [Sun, 25 Sep 2011 14:09:30 +0000 (16:09 +0200)]
[IMP+FIX] Complete cleaning of point_of_sale module
- refactorisation of the code: 2000 lines of code removed
- fixed all the bugs
- support for tax included/excluded prices
- fixed rounding troubles
- don't print the ticket if partial payment
- cleaning features:
- workflow reviewed: New -> Done -> Posted / Invoiced
- generation of journal entries/invoice is now correct
- only one picking per PoS order
- wizard to apply global discount (on each lines)
- useability:
- reviewed the main point_of_sale screen
- statements are open by default
- removed non-useful features
- advances (you use a special product for this)
- contracts numbers
- refund with exchange (you just create a new sale with negatives qty)
- removed validation steps
- scan product wizard
- clean and complete YAML tests (work in progress)
bzr revid: fp@tinyerp.com-
20110925140930-s6zibvn51k3914in
Fabien Pinckaers [Sun, 25 Sep 2011 14:08:02 +0000 (16:08 +0200)]
[FIX] YAML empty records
bzr revid: fp@tinyerp.com-
20110925140802-gnyr92iepj73ceg0
Antony Lesuisse [Sun, 25 Sep 2011 12:28:22 +0000 (14:28 +0200)]
[IMP] setup.py remove python2.5 compatibility
bzr revid: al@openerp.com-
20110925122822-njsjvs8d0qlwf4l5
Antony Lesuisse [Sun, 25 Sep 2011 11:40:51 +0000 (13:40 +0200)]
[FIX] temporary web module heuristics use static/
bzr revid: al@openerp.com-
20110925114051-y3eex2xnn4guu3d0
Antony Lesuisse [Sun, 25 Sep 2011 10:42:34 +0000 (12:42 +0200)]
[FIX] local backend catch exceptions
bzr revid: al@openerp.com-
20110925104234-plzpwopgcdxgni8m
Antony Lesuisse [Sun, 25 Sep 2011 09:59:48 +0000 (11:59 +0200)]
[FIX] revert 5138 revid:fp@tinyerp.com-
20110924090407-x4e0ptu2am495rpv incorrect tests
bzr revid: al@openerp.com-
20110925095948-hgtg1djicpvcm3nc
Launchpad Translations on behalf of openerp [Sun, 25 Sep 2011 04:41:08 +0000 (04:41 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110925044050-bjkzm7pf2t39mxwn
bzr revid: launchpad_translations_on_behalf_of_openerp-
20110925044108-geoyxpt8oeooq8op
Olivier Dony [Sun, 25 Sep 2011 02:13:39 +0000 (04:13 +0200)]
[REVERT] incorrect substitution, also causing duplicate fields in form, r.5073
Revision 5073 has revid fp@tinyerp.com-
20110917153740-pbzrq432ilbi5pb5
bzr revid: odo@openerp.com-
20110925021339-l6546pvwhr65j0da
Antony Lesuisse [Sun, 25 Sep 2011 01:50:54 +0000 (03:50 +0200)]
[IMP] web.common.dispatch only load module with controllers
bzr revid: al@openerp.com-
20110925015054-1223jdthddb1wrah
Olivier Dony [Sun, 25 Sep 2011 01:42:43 +0000 (03:42 +0200)]
[FIX] rpc: honor *_interface options + log it
bzr revid: odo@openerp.com-
20110925014243-0q1o67twburpga0z
Antony Lesuisse [Sun, 25 Sep 2011 01:20:39 +0000 (03:20 +0200)]
[FIX] revert 3651 al@openerp.com-
20110925003322-yioqd1cdlffvr6uc http static is used by webdav
bzr revid: al@openerp.com-
20110925012039-4hmqj2v5aaxxtxwy
Antony Lesuisse [Sun, 25 Sep 2011 00:55:23 +0000 (02:55 +0200)]
[IMP] dbfilter option from openerp-server in embedded mode
bzr revid: al@openerp.com-
20110925005523-krlap0jdgc5ukott
Antony Lesuisse [Sun, 25 Sep 2011 00:54:37 +0000 (02:54 +0200)]
[IMP] temporary web dbfilter before metaoptions
bzr revid: al@openerp.com-
20110925005437-7jdgrzl7i4ihx44y
Antony Lesuisse [Sun, 25 Sep 2011 00:33:22 +0000 (02:33 +0200)]
[REM] http static crap (you may use web controllers or /static dir)
bzr revid: al@openerp.com-
20110925003322-yioqd1cdlffvr6uc
Antony Lesuisse [Sun, 25 Sep 2011 00:02:21 +0000 (02:02 +0200)]
[MERGE] wsgification and more, thanks to vmt
bzr revid: al@openerp.com-
20110925000221-hctc1t18njh98oal
Antony Lesuisse [Sun, 25 Sep 2011 00:01:39 +0000 (02:01 +0200)]
[MERGE] wsgification and more, thanks to vmt
bzr revid: al@openerp.com-
20110925000139-nvg1i3afklbylvx5
Antony Lesuisse [Sun, 25 Sep 2011 00:00:38 +0000 (02:00 +0200)]
[MERGE] trunk
bzr revid: al@openerp.com-
20110925000038-qwfvcrmndstygt2d
Antony Lesuisse [Sat, 24 Sep 2011 23:44:16 +0000 (01:44 +0200)]
[IMP] web runs nicely in the server, That s one small commit for a man, a giant leap for openerp
bzr revid: al@openerp.com-
20110924234416-b9pzbhpqfxi319te
Vo Minh Thu [Sat, 24 Sep 2011 17:15:07 +0000 (19:15 +0200)]
[MERGE] tests: added database creation test via XML-RPC.
bzr revid: vmt@openerp.com-
20110924171507-p6x41jshfkrquz2f
Antony Lesuisse [Sat, 24 Sep 2011 16:57:05 +0000 (18:57 +0200)]
[IMP] web.common.sesion local backend part2
bzr revid: al@openerp.com-
20110924165705-c0wd7hcup9ib74ry
Antony Lesuisse [Sat, 24 Sep 2011 16:38:28 +0000 (18:38 +0200)]
[IMP] web.common.sesion local backend part1
bzr revid: al@openerp.com-
20110924163828-gbys8t65gyz0qkcu
Vo Minh Thu [Sat, 24 Sep 2011 16:33:58 +0000 (18:33 +0200)]
[IMP] openerp.service: import at the top.
bzr revid: vmt@openerp.com-
20110924163358-svx1yjuwdybxxr6k
Antony Lesuisse [Sat, 24 Sep 2011 16:08:02 +0000 (18:08 +0200)]
[MERGE] trunk
bzr revid: al@openerp.com-
20110924160802-ebb7rawu71rykluu
Antony Lesuisse [Sat, 24 Sep 2011 15:34:18 +0000 (17:34 +0200)]
[REM] python25-compat
bzr revid: al@openerp.com-
20110924153418-kgkrqg0s2mtniofm
Antony Lesuisse [Sat, 24 Sep 2011 15:24:01 +0000 (17:24 +0200)]
[FIX] remove old-style test wsgi hook
bzr revid: al@openerp.com-
20110924152401-5ilujqvg6gnhdrbz
Antony Lesuisse [Sat, 24 Sep 2011 15:18:31 +0000 (17:18 +0200)]
[FIX] wsgi server listen to ipv4 0.0.0.0
bzr revid: al@openerp.com-
20110924151831-7nra57wpqq6oqose
Fabien Pinckaers [Sat, 24 Sep 2011 15:15:33 +0000 (17:15 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924151533-d2yiea7d28mdd5k2
Fabien Pinckaers [Sat, 24 Sep 2011 15:14:48 +0000 (17:14 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924151448-5gw2wmkcu9gudyim
Fabien Pinckaers [Sat, 24 Sep 2011 15:09:44 +0000 (17:09 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110924150944-7v00udju3cbi9m0c
Fabien Pinckaers [Sat, 24 Sep 2011 15:07:35 +0000 (17:07 +0200)]
[FIX] access rule not required in sale_margin
bzr revid: fp@tinyerp.com-
20110924150735-77kg4vw84dzqc5qx
Fabien Pinckaers [Sat, 24 Sep 2011 15:02:34 +0000 (17:02 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924150234-ffaq5wjyfkldo37t
Vo Minh Thu [Sat, 24 Sep 2011 14:54:49 +0000 (16:54 +0200)]
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-
20110924145449-1lfkhix60fdsucoy
Antony Lesuisse [Sat, 24 Sep 2011 14:52:58 +0000 (16:52 +0200)]
[MERGE] trunk
bzr revid: al@openerp.com-
20110924145258-16r9qi7hr3dip1jz
Fabien Pinckaers [Sat, 24 Sep 2011 14:46:13 +0000 (16:46 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924144613-zetogwg7qypmquh9
Fabien Pinckaers [Sat, 24 Sep 2011 14:43:46 +0000 (16:43 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924144346-kxvu883we8u5442e
Fabien Pinckaers [Sat, 24 Sep 2011 14:42:30 +0000 (16:42 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924144230-9donuywnrn483z8v
Fabien Pinckaers [Sat, 24 Sep 2011 14:40:15 +0000 (16:40 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110924144015-g9pb5jhfyt3cmbys
Antony Lesuisse [Sat, 24 Sep 2011 14:35:18 +0000 (16:35 +0200)]
[FIX] base_setup missing categories for ir.actions.todo
bzr revid: al@openerp.com-
20110924143518-yb16n6k851ajsph2
Fabien Pinckaers [Sat, 24 Sep 2011 14:34:37 +0000 (16:34 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924143437-6e30p8zk0s8grs9p
Fabien Pinckaers [Sat, 24 Sep 2011 14:33:23 +0000 (16:33 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924143323-kd88gak64gmgjr9a
Fabien Pinckaers [Sat, 24 Sep 2011 14:31:17 +0000 (16:31 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110924143117-bjg47dpyzq1igv3n
Antony Lesuisse [Sat, 24 Sep 2011 14:20:47 +0000 (16:20 +0200)]
[MERGE] config rework ir.action.todo stw
bzr revid: al@openerp.com-
20110924142047-rdo7gwoluoydbfz4
Fabien Pinckaers [Sat, 24 Sep 2011 14:20:21 +0000 (16:20 +0200)]
merge
lp bug: https://launchpad.net/bugs/844022 fixed
bzr revid: fp@tinyerp.com-
20110924142021-7fef32xzhc74tji4
Fabien Pinckaers [Sat, 24 Sep 2011 14:19:01 +0000 (16:19 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924141901-89brp0yppqomm1tz
Fabien Pinckaers [Sat, 24 Sep 2011 14:16:51 +0000 (16:16 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924141651-lzlmllxy5np7eb90
Fabien Pinckaers [Sat, 24 Sep 2011 14:14:51 +0000 (16:14 +0200)]
[IMP] removed completly false report
bzr revid: fp@tinyerp.com-
20110924141451-772qbu8ipjib4ulo
Fabien Pinckaers [Sat, 24 Sep 2011 14:07:44 +0000 (16:07 +0200)]
[FIX] translated msg for PO
lp bug: https://launchpad.net/bugs/852456 fixed
bzr revid: fp@tinyerp.com-
20110924140744-728n8oda7vw8mzum
Fabien Pinckaers [Sat, 24 Sep 2011 13:59:06 +0000 (15:59 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924135906-6qs7b29z93xg8dg2
Fabien Pinckaers [Sat, 24 Sep 2011 13:52:35 +0000 (15:52 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110924135235-ks6rclkz25lnpg18
Fabien Pinckaers [Sat, 24 Sep 2011 13:49:12 +0000 (15:49 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924134912-bwnrhlyrcrxuhs7g
Fabien Pinckaers [Sat, 24 Sep 2011 13:36:01 +0000 (15:36 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924133601-9jqvdj1auow3glg8
Fabien Pinckaers [Sat, 24 Sep 2011 13:33:31 +0000 (15:33 +0200)]
[FIX] removing not usefull feature that doed not work (partially implemented)
bzr revid: fp@tinyerp.com-
20110924133331-r5j8e4xfjdk3uoc7
Fabien Pinckaers [Sat, 24 Sep 2011 13:13:25 +0000 (15:13 +0200)]
merge
lp bug: https://launchpad.net/bugs/787052 fixed
bzr revid: fp@tinyerp.com-
20110924131325-0o0kh3cyuceu78ea
Fabien Pinckaers [Sat, 24 Sep 2011 13:11:35 +0000 (15:11 +0200)]
merge
lp bug: https://launchpad.net/bugs/796363 fixed
bzr revid: fp@tinyerp.com-
20110924131135-3op33ncldu14ghmr
Fabien Pinckaers [Sat, 24 Sep 2011 13:09:15 +0000 (15:09 +0200)]
merge
lp bug: https://launchpad.net/bugs/731035 fixed
bzr revid: fp@tinyerp.com-
20110924130915-gnjedwh616xa3w0c
Fabien Pinckaers [Sat, 24 Sep 2011 11:53:32 +0000 (13:53 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924115332-2fongn5bwx39xrv7
Fabien Pinckaers [Sat, 24 Sep 2011 11:48:06 +0000 (13:48 +0200)]
[IMP] removing unuseaful and wrong report
bzr revid: fp@tinyerp.com-
20110924114806-0mhlmckigrfnf88c
Fabien Pinckaers [Sat, 24 Sep 2011 11:38:58 +0000 (13:38 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924113858-o4w6azzu3maybtg5
Fabien Pinckaers [Sat, 24 Sep 2011 11:25:29 +0000 (13:25 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110924112529-o72j8k1lota6sm1s
Fabien Pinckaers [Sat, 24 Sep 2011 11:14:47 +0000 (13:14 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924111447-8c4a3s6ioizq1lgu
Fabien Pinckaers [Sat, 24 Sep 2011 10:47:34 +0000 (12:47 +0200)]
merge
lp bug: https://launchpad.net/bugs/814053 fixed
bzr revid: fp@tinyerp.com-
20110924104734-qkh9i3mqrk8apsqp
Fabien Pinckaers [Sat, 24 Sep 2011 10:45:26 +0000 (12:45 +0200)]
merge
lp bug: https://launchpad.net/bugs/810404 fixed
bzr revid: fp@tinyerp.com-
20110924104526-c08gf9uea5nxg9hg
Fabien Pinckaers [Sat, 24 Sep 2011 10:44:20 +0000 (12:44 +0200)]
merge
lp bug: https://launchpad.net/bugs/781642 fixed
bzr revid: fp@tinyerp.com-
20110924104420-81opl9r0xrszg6u1
Fabien Pinckaers [Sat, 24 Sep 2011 10:42:25 +0000 (12:42 +0200)]
[fix] check followup message
lp bug: https://launchpad.net/bugs/768241 fixed
bzr revid: fp@tinyerp.com-
20110924104225-0mvbgeofjm2tnj81
Fabien Pinckaers [Sat, 24 Sep 2011 10:33:29 +0000 (12:33 +0200)]
merge
lp bug: https://launchpad.net/bugs/813329 fixed
bzr revid: fp@tinyerp.com-
20110924103329-os9x9kostsrhpetv
Fabien Pinckaers [Sat, 24 Sep 2011 10:31:58 +0000 (12:31 +0200)]
merge
lp bug: https://launchpad.net/bugs/805996 fixed
bzr revid: fp@tinyerp.com-
20110924103158-gsl9ml34ix6ycy8k
Fabien Pinckaers [Sat, 24 Sep 2011 10:24:43 +0000 (12:24 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924102443-dgi352byfazu2rxq
Fabien Pinckaers [Sat, 24 Sep 2011 10:19:50 +0000 (12:19 +0200)]
merge
lp bug: https://launchpad.net/bugs/812794 fixed
bzr revid: fp@tinyerp.com-
20110924101950-40s8zkahp0i5dof8
Fabien Pinckaers [Sat, 24 Sep 2011 10:14:20 +0000 (12:14 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924101420-1v47ye9g5g0cwjqi
Fabien Pinckaers [Sat, 24 Sep 2011 09:37:19 +0000 (11:37 +0200)]
merge
lp bug: https://launchpad.net/bugs/812322 fixed
bzr revid: fp@tinyerp.com-
20110924093719-s9r6u0iir5ehfm3s
Fabien Pinckaers [Sat, 24 Sep 2011 09:30:09 +0000 (11:30 +0200)]
merge
bzr revid: fp@tinyerp.com-
20110924093009-bc2klcpkb2iin4tw
Fabien Pinckaers [Sat, 24 Sep 2011 09:27:59 +0000 (11:27 +0200)]
[IMP] useability invoice layout
bzr revid: fp@tinyerp.com-
20110924092759-ewko8ohn47p9qdp5
Fabien Pinckaers [Sat, 24 Sep 2011 09:24:08 +0000 (11:24 +0200)]
[FIX] 821287
bzr revid: fp@tinyerp.com-
20110924092408-35xnrb3yw2caqqnb
Fabien Pinckaers [Sat, 24 Sep 2011 09:17:26 +0000 (11:17 +0200)]
fix
bzr revid: fp@tinyerp.com-
20110924091726-gnqdy6oqqt7ytq64
Fabien Pinckaers [Sat, 24 Sep 2011 09:12:51 +0000 (11:12 +0200)]
merge
lp bug: https://launchpad.net/bugs/855464 fixed
bzr revid: fp@tinyerp.com-
20110924091251-4zb4pnczdplflv3l