P. Christeas [Tue, 12 Oct 2010 10:39:37 +0000 (13:39 +0300)]
doc ftp: unlink the YAML testing directories, too
bzr revid: p_christ@hol.gr-
20101012103937-dtgq5tzthu9pdldz
P. Christeas [Tue, 12 Oct 2010 10:39:37 +0000 (13:39 +0300)]
Doc ftp: Cleanup after yaml tests
bzr revid: p_christ@hol.gr-
20101012103937-2jdkd7gkr1u86p48
P. Christeas [Tue, 12 Oct 2010 10:39:36 +0000 (13:39 +0300)]
Doc: make sure folders are deleted after YAML tests
This will also enable the tests to run multiple times on the same db.
bzr revid: p_christ@hol.gr-
20101012103936-d0e7o1b5ppu7kri5
P. Christeas [Tue, 12 Oct 2010 10:39:00 +0000 (13:39 +0300)]
Doc webdav: expand tabs at __openerp__.py
bzr revid: p_christ@hol.gr-
20101012103900-9jt6wn6gmy224yrj
P. Christeas [Tue, 12 Oct 2010 10:38:59 +0000 (13:38 +0300)]
Doc Webdav: implement model for DAV properties (at dirs)
In normative setups of WebDAV, we need to place some extra properties
on selected directories.
bzr revid: p_christ@hol.gr-
20101012103859-dcwsrzylxwpzbpq1
P. Christeas [Tue, 12 Oct 2010 10:38:59 +0000 (13:38 +0300)]
Caldav: put some logging around skipped data, fix tzinfo var.
bzr revid: p_christ@hol.gr-
20101012103859-0pae3clyllabjs0y
P. Christeas [Tue, 12 Oct 2010 10:38:58 +0000 (13:38 +0300)]
doc webdav: initial override of nodes.py
bzr revid: p_christ@hol.gr-
20101012103858-hykw2g2ezbwaobmn
P. Christeas [Tue, 12 Oct 2010 10:38:56 +0000 (13:38 +0300)]
Document: make node classes pluggable (part 1)
Refactor and put hooks in document/nodes so that addons can override
the classes and enhance the node behaviour, per database.
bzr revid: p_christ@hol.gr-
20101012103856-j115po98jqff6j02
P. Christeas [Tue, 12 Oct 2010 10:38:31 +0000 (13:38 +0300)]
Doc Webdav: when scanning children, protect the cursor against exceptions.
bzr revid: p_christ@hol.gr-
20101012103831-36qutrtz7avzb2ny
P. Christeas [Tue, 12 Oct 2010 10:38:30 +0000 (13:38 +0300)]
crm_caldav: fix for empty 'date_deadline'
bzr revid: p_christ@hol.gr-
20101012103830-5439bl3x0gnza141
P. Christeas [Tue, 12 Oct 2010 10:38:30 +0000 (13:38 +0300)]
doc webdav: fix namespaces, properties
bzr revid: p_christ@hol.gr-
20101012103830-0mfo4ecuu4lu78ia
P. Christeas [Tue, 12 Oct 2010 10:37:23 +0000 (13:37 +0300)]
base_calendar, caldav: revise SQL calls.
bzr revid: p_christ@hol.gr-
20101012103723-alnh7rkf1g8tthlo
rpa (Open ERP) [Tue, 12 Oct 2010 05:58:58 +0000 (11:28 +0530)]
[MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-
20101012055858-ntxw0lwc5pvwb8cu
apa-tiny [Tue, 12 Oct 2010 05:47:10 +0000 (11:17 +0530)]
[IMP]:account:improved centerlized general
bzr revid: apa@tinyerp.com-
20101012054710-dke2gfnhb5nzag86
Launchpad Translations on behalf of openerp [Tue, 12 Oct 2010 04:51:43 +0000 (04:51 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20101012045143-dafaof1g5r27tu29
Olivier Dony [Mon, 11 Oct 2010 19:16:13 +0000 (21:16 +0200)]
[FIX] stock: correct destination location for order point + autovalidate chained moves for procurements
bzr revid: odo@openerp.com-
20101011191613-aw9753wodzb57wq2
Olivier Dony [Mon, 11 Oct 2010 17:59:58 +0000 (19:59 +0200)]
[IMP] stock_location: improved demo data for min stock rules
bzr revid: odo@openerp.com-
20101011175958-g4vnek9v99i1klsl
Olivier Dony [Mon, 11 Oct 2010 17:58:02 +0000 (19:58 +0200)]
[MERGE:IMP] merge addons-stock branch with latest improvement to Warehouse Management
bzr revid: odo@openerp.com-
20101011175802-n705sldw70bp4xpx
Olivier Dony [Mon, 11 Oct 2010 17:18:05 +0000 (19:18 +0200)]
[IMP] stock_location: improved demo data for push/pull flows
bzr revid: odo@openerp.com-
20101011171805-2bfar259c3bic9w8
Olivier Dony [Mon, 11 Oct 2010 17:17:40 +0000 (19:17 +0200)]
[FIX] procurement: corrected check in check_move_cancel
bzr revid: odo@openerp.com-
20101011171740-1d47qzv071lzvtdz
Vir (Open ERP) [Mon, 11 Oct 2010 12:47:38 +0000 (18:17 +0530)]
[MOD] account : set widget=selection in account chart configuration
bzr revid: vir@tinyerp.com-
20101011124738-l7st79yqwa25w21c
Olivier Dony [Mon, 11 Oct 2010 12:37:49 +0000 (14:37 +0200)]
[REF] hr_timesheet_invoice: moved sample invoicing rate to regular data for usability purposes
bzr revid: odo@openerp.com-
20101011123749-5infnnimvg196vax
qdp-launchpad@tinyerp.com [Mon, 11 Oct 2010 12:35:45 +0000 (14:35 +0200)]
[MERGE] merged team 1 branch
bzr revid: qdp-launchpad@tinyerp.com-
20101011123545-gg4wrk09f7a1ha42
qdp-launchpad@tinyerp.com [Mon, 11 Oct 2010 12:25:53 +0000 (14:25 +0200)]
[MERGE] merged report branch
bzr revid: qdp-launchpad@tinyerp.com-
20101011122553-smrljdmdc7o4t0yw
Vir (Open ERP) [Mon, 11 Oct 2010 11:43:11 +0000 (17:13 +0530)]
[IMP] sale : The button Create Invoice open the invoice form
bzr revid: vir@tinyerp.com-
20101011114311-6bhy7mv4lpgwgson
Harry (OpenERP) [Mon, 11 Oct 2010 11:24:37 +0000 (16:54 +0530)]
[MERGE] merged with openobject-addons
bzr revid: hmo@tinyerp.com-
20101011112437-dsmle4t51mhl0vz9
Harry (OpenERP) [Mon, 11 Oct 2010 10:53:11 +0000 (16:23 +0530)]
[MERGE] clean message_id problem in outlook plugin and opendocument button
bzr revid: hmo@tinyerp.com-
20101011105311-u32doqfdc6sqejke
Jigar Amin [Mon, 11 Oct 2010 10:41:04 +0000 (16:11 +0530)]
[IMP] Outlook Installer : Installtion instruction
bzr revid: jam@tinyerp.com-
20101011104104-37b3ew1ay7b155vy
Jni (Open ERP) [Mon, 11 Oct 2010 10:38:56 +0000 (16:08 +0530)]
Removed the conflict
bzr revid: jni@tinyerp.com-
20101011103856-dvfjcx75kpntp591
Harry (OpenERP) [Mon, 11 Oct 2010 10:17:26 +0000 (15:47 +0530)]
[FIX] wiki: put readonly create_uid, create_date and write_date fields
bzr revid: hmo@tinyerp.com-
20101011101726-w4phuj9aaj7p606e
Jigar Amin [Mon, 11 Oct 2010 10:14:56 +0000 (15:44 +0530)]
[IMP] Solved the Message-Id bug, Added Open Document Button, No mail or Attchment are stored to system all sotred to %temp% reducing the use chilkat and added new dependices mscdo1.21
bzr revid: jam@tinyerp.com-
20101011101456-6pop9x3e4nnk21px
apa-tiny [Mon, 11 Oct 2010 10:06:17 +0000 (15:36 +0530)]
remove conflicts
bzr revid: apa@tinyerp.com-
20101011100617-noz4sgp9xfpevzgv
apa-tiny [Mon, 11 Oct 2010 10:04:19 +0000 (15:34 +0530)]
remove conflicts
bzr revid: apa@tinyerp.com-
20101011100419-jzburzmpos92am48
sbh (Open ERP) [Mon, 11 Oct 2010 09:52:55 +0000 (15:22 +0530)]
[Fix] stock: Stock move set readonly if state is done
bzr revid: sbh@tinyerp.com-
20101011095255-c6qyw1t8rt2050h8
uco (OpenERP) [Mon, 11 Oct 2010 09:45:20 +0000 (15:15 +0530)]
[FIX] purchase: Fixed yaml issues due to workflow changes.
bzr revid: uco@tinyerp.com-
20101011094520-2z1fjpu315t82dam
apa-tiny [Mon, 11 Oct 2010 09:40:34 +0000 (15:10 +0530)]
merged from trunk
bzr revid: apa@tinyerp.com-
20101011094034-3gqu5rsswp784gr0
rpa (Open ERP) [Mon, 11 Oct 2010 09:29:30 +0000 (14:59 +0530)]
[REM]: crm: Removed unused fields in phonecall report
bzr revid: rpa@tinyerp.com-
20101011092930-82qqybna4tdjm3p9
uco (OpenERP) [Mon, 11 Oct 2010 09:24:33 +0000 (14:54 +0530)]
[MERGE]
bzr revid: uco@tinyerp.com-
20101011092433-os3w2ln2fff2k2zk
uco (OpenERP) [Mon, 11 Oct 2010 09:08:47 +0000 (14:38 +0530)]
[REM, IMP] point_of_sale: Removed unused report. Improved report name for Invoice.
bzr revid: uco@tinyerp.com-
20101011090847-62gmt7jhcidzolhj
apa-tiny [Mon, 11 Oct 2010 07:08:19 +0000 (12:38 +0530)]
improve
bzr revid: apa@tinyerp.com-
20101011070819-co8p6lneh3nbosvn
uco (OpenERP) [Mon, 11 Oct 2010 06:48:45 +0000 (12:18 +0530)]
[IMP] mrp: Improved yaml.
bzr revid: uco@tinyerp.com-
20101011064845-n5rrra6venmkpvpm
uco (OpenERP) [Mon, 11 Oct 2010 06:35:10 +0000 (12:05 +0530)]
[REF] : Corrected errors suggested by buildbot.
bzr revid: uco@tinyerp.com-
20101011063510-n73y74z5oulrnkkk
JMA(OpenERP) [Mon, 11 Oct 2010 06:31:23 +0000 (12:01 +0530)]
[FIX] Account_accountant : Field name corrected in xml reference
lp bug: https://launchpad.net/bugs/658100 fixed
bzr revid: jvo@tinyerp.com-
20101011063123-37yebgjma0885ku0
DBR(Open ERP) [Mon, 11 Oct 2010 06:28:44 +0000 (11:58 +0530)]
[MOD] crm : partner icons are changed in view
bzr revid: vir@tinyerp.com-
20101011062844-x1k673b53oqjznvu
apa-tiny [Mon, 11 Oct 2010 06:25:03 +0000 (11:55 +0530)]
improve
bzr revid: apa@tinyerp.com-
20101011062503-u099hf39z69vogjr
AMP(Open ERP) [Mon, 11 Oct 2010 06:18:14 +0000 (11:48 +0530)]
[MOD] crm_meeting : change in calendar view and added shortcut for meeting. product : shortcut added
bzr revid: vir@tinyerp.com-
20101011061814-5hb940uka624jeph
uco (OpenERP) [Mon, 11 Oct 2010 06:07:30 +0000 (11:37 +0530)]
[IMP] mrp: Improved yaml.
bzr revid: uco@tinyerp.com-
20101011060730-drfj7fdcvvzdj6x1
rpa (Open ERP) [Mon, 11 Oct 2010 06:02:13 +0000 (11:32 +0530)]
[FIX]: crm, sale_crm: Fixed pylint warnings
bzr revid: rpa@tinyerp.com-
20101011060213-yd9g5nfzg4wg0i4o
sbh (Open ERP) [Mon, 11 Oct 2010 05:55:09 +0000 (11:25 +0530)]
[Fix]account_accountant : Fix the warining of pylint
bzr revid: sbh@tinyerp.com-
20101011055509-j8bzy46nvuksp6p8
rpa (Open ERP) [Mon, 11 Oct 2010 05:46:51 +0000 (11:16 +0530)]
[FIX]: sale_crm: Fixed security .csv
bzr revid: rpa@tinyerp.com-
20101011054651-ct7vgcseh7ins7t0
Jay (OpenERP) [Mon, 11 Oct 2010 05:45:00 +0000 (11:15 +0530)]
[FIx] Hr_payroll_account : Typo fix
lp bug: https://launchpad.net/bugs/657629 fixed
bzr revid: jvo@tinyerp.com-
20101011054500-r6aw3313kxubxkn1
Jay (OpenERP) [Mon, 11 Oct 2010 05:41:24 +0000 (11:11 +0530)]
[FIX] Account : Typo fix
lp bug: https://launchpad.net/bugs/657619 fixed
bzr revid: jvo@tinyerp.com-
20101011054124-5rh9fyid8dq7jq13
sbh (Open ERP) [Mon, 11 Oct 2010 05:15:26 +0000 (10:45 +0530)]
[MERGE] Merge lp:openobject-addons
bzr revid: sbh@tinyerp.com-
20101011051526-rn7qauj3zkaqgopm
rpa (Open ERP) [Mon, 11 Oct 2010 05:13:27 +0000 (10:43 +0530)]
[MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-
20101011051327-28nxc8ok6ofxxn19
apa-tiny [Mon, 11 Oct 2010 05:01:15 +0000 (10:31 +0530)]
merge
bzr revid: apa@tinyerp.com-
20101011050115-rm1b16mg6ngk6e5c
Launchpad Translations on behalf of openerp [Mon, 11 Oct 2010 04:45:33 +0000 (04:45 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20101011044533-mu3e6rmywz6ilyi7
Jigar Amin [Mon, 11 Oct 2010 04:42:36 +0000 (10:12 +0530)]
[MERGE]
bzr revid: jam@tinyerp.com-
20101011044236-6vg31dkigcknuym2
uco (OpenERP) [Mon, 11 Oct 2010 04:40:11 +0000 (10:10 +0530)]
[MERGE]
bzr revid: uco@tinyerp.com-
20101011044011-g4z4wzuhrjgmi7r3
fp [Sun, 10 Oct 2010 20:04:38 +0000 (22:04 +0200)]
fix
bzr revid: fp@fp-laptop-
20101010200438-rvs58uh9wvpio978
fp [Sun, 10 Oct 2010 19:48:41 +0000 (21:48 +0200)]
fix
bzr revid: fp@fp-laptop-
20101010194841-wcmfw8c955iqu6ng
fp [Sun, 10 Oct 2010 19:36:30 +0000 (21:36 +0200)]
rmeoved_print
bzr revid: fp@fp-laptop-
20101010193630-vowjm74h9f55ixel
fp [Sun, 10 Oct 2010 19:30:31 +0000 (21:30 +0200)]
fix
bzr revid: fp@fp-laptop-
20101010193031-rdigl91djqkdiy9w
fp [Sun, 10 Oct 2010 19:15:53 +0000 (21:15 +0200)]
add
bzr revid: fp@fp-laptop-
20101010191553-0qrlrxx367mmsytt
fp [Sun, 10 Oct 2010 19:09:36 +0000 (21:09 +0200)]
[IMP] useability improvements
bzr revid: fp@fp-laptop-
20101010190936-wa3gafy2f8pt59ok
fp [Sun, 10 Oct 2010 17:32:39 +0000 (19:32 +0200)]
[IMP] useability improvmeents misc
bzr revid: fp@fp-laptop-
20101010173239-4563xgh24q2jt0lt
Launchpad Translations on behalf of openerp [Sun, 10 Oct 2010 04:56:04 +0000 (04:56 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20101010045604-7muwhvxees9ja5ed
Fabien Pinckaers [Sat, 9 Oct 2010 16:01:43 +0000 (18:01 +0200)]
[IMP] better useability
bzr revid: fp@tinyerp.com-
20101009160143-rrcfgoyudey22zv4
saz-OpenERP [Sat, 9 Oct 2010 11:46:34 +0000 (17:16 +0530)]
[IMP]Improves all reports of point of sale module
bzr revid: azaz.201186@gmail.com-
20101009114634-4ruovxonxa1bny4d
Fabien Pinckaers [Sat, 9 Oct 2010 09:36:34 +0000 (11:36 +0200)]
[imp] remoed gtk contact form
bzr revid: fp@tinyerp.com-
20101009093634-isv2b1fe36zpw2lu
Launchpad Translations on behalf of openerp [Sat, 9 Oct 2010 12:13:48 +0000 (12:13 +0000)]
Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-
20101009121348-auo95q0gwebhlzzn
Jigar Amin [Sat, 9 Oct 2010 05:23:40 +0000 (10:53 +0530)]
[MERGE]
bzr revid: jam@tinyerp.com-
20101009052340-x96spf5w3lx5sj5v
uco (OpenERP) [Sat, 9 Oct 2010 04:54:03 +0000 (10:24 +0530)]
[MERGE]
bzr revid: uco@tinyerp.com-
20101009045403-yiktfi8ewcunxzvn
qdp-launchpad@tinyerp.com [Fri, 8 Oct 2010 22:13:39 +0000 (00:13 +0200)]
[IMP] sale: security enhancements
bzr revid: qdp-launchpad@tinyerp.com-
20101008221339-j6v45x5zwhdoihfi
qdp-launchpad@tinyerp.com [Fri, 8 Oct 2010 21:51:15 +0000 (23:51 +0200)]
[IMP] sale: security enhancements
bzr revid: qdp-launchpad@tinyerp.com-
20101008215115-0hkup3a9op358k14
qdp-launchpad@tinyerp.com [Fri, 8 Oct 2010 21:32:05 +0000 (23:32 +0200)]
[IMP] sale: security enhancements
bzr revid: qdp-launchpad@tinyerp.com-
20101008213205-37h0e6q3i1h0bq5o
Jay (OpenERP) [Fri, 8 Oct 2010 21:19:53 +0000 (02:49 +0530)]
[REF] project_timesheet
bzr revid: jvo@tinyerp.com-
20101008211953-90137gcozrk0wk3s
Jay (OpenERP) [Fri, 8 Oct 2010 21:17:00 +0000 (02:47 +0530)]
[FIX] Regression : changes from mx to datetime caused trouble for tasks by month
bzr revid: jvo@tinyerp.com-
20101008211700-oa4037dd8mlmw37i
Jay (OpenERP) [Fri, 8 Oct 2010 21:12:28 +0000 (02:42 +0530)]
[REF] project_timesheet
bzr revid: jvo@tinyerp.com-
20101008211228-19r3vi8uar5py31f
Fabien Pinckaers [Fri, 8 Oct 2010 17:38:51 +0000 (19:38 +0200)]
modifs
bzr revid: fp@tinyerp.com-
20101008173851-dduwvd1mt668u6hz
Fabien Pinckaers [Fri, 8 Oct 2010 17:37:50 +0000 (19:37 +0200)]
[IMP] removing based on for tax statement
bzr revid: fp@tinyerp.com-
20101008173750-q0c5bqdx88pgvu2j
Anup (OpenERP) [Sat, 9 Oct 2010 06:43:46 +0000 (12:13 +0530)]
[FIX] account : Missing variable reference Corrected
bzr revid: ach@tinyerp.com-
20101009064346-2rt41ect2lci0tr0
qdp-launchpad@tinyerp.com [Fri, 8 Oct 2010 17:18:37 +0000 (19:18 +0200)]
[IMP] hr_*: usability improvements
bzr revid: qdp-launchpad@tinyerp.com-
20101008171837-iog32jb6x61fisv0
Fabien Pinckaers [Fri, 8 Oct 2010 16:19:31 +0000 (18:19 +0200)]
[IMP] sale useability
bzr revid: fp@tinyerp.com-
20101008161931-4s088229ob3s5t93
Fabien Pinckaers [Fri, 8 Oct 2010 16:06:44 +0000 (18:06 +0200)]
removed
bzr revid: fp@tinyerp.com-
20101008160644-kfl5wuol619jcksz
qdp-launchpad@tinyerp.com [Fri, 8 Oct 2010 16:06:35 +0000 (18:06 +0200)]
[MERGE] merged with main addons branch
bzr revid: qdp-launchpad@tinyerp.com-
20101008160635-ucfw3c7uwudt4csb
qdp-launchpad@tinyerp.com [Fri, 8 Oct 2010 16:01:55 +0000 (18:01 +0200)]
[FIX] hr, hr_contract, hr_payroll: moved back the field bank_account on the hr.employee object into the HR module: even if it's used only in payroll it may be interssting to record that info before. besides, the view of hr_contract module was crashing
bzr revid: qdp-launchpad@tinyerp.com-
20101008160155-nwpaxwqyltc6d663
Fabien Pinckaers [Fri, 8 Oct 2010 14:47:43 +0000 (16:47 +0200)]
merge
bzr revid: fp@tinyerp.com-
20101008144743-fwyqh4ct8t1iartk
Fabien Pinckaers [Fri, 8 Oct 2010 14:44:54 +0000 (16:44 +0200)]
[IMP] useability misc icons and buttons
bzr revid: fp@tinyerp.com-
20101008144454-y9hksj2qrxictk65
Fabien Pinckaers [Fri, 8 Oct 2010 14:42:33 +0000 (16:42 +0200)]
imp
bzr revid: fp@tinyerp.com-
20101008144233-uhv4bq5kny3q5q8r
Fabien Pinckaers [Fri, 8 Oct 2010 14:40:49 +0000 (16:40 +0200)]
[IMP] misc useability improvements
bzr revid: fp@tinyerp.com-
20101008144049-2deun7vlgd6ek1be
Mantavya Gajjar [Fri, 8 Oct 2010 14:11:43 +0000 (19:41 +0530)]
[IMP]: improve the usability for the payslip line
bzr revid: mga@tinyerp.com-
20101008141143-k2l0txnqr3y7j44g
apa-tiny [Fri, 8 Oct 2010 13:58:28 +0000 (19:28 +0530)]
merged from lp:~openerp-dev/openobject-addons/report_dev
bzr revid: apa@tinyerp.com-
20101008135828-cxkk3y3rtd7cdtgl
vra [Fri, 8 Oct 2010 13:53:53 +0000 (19:23 +0530)]
[IMP] hr_payroll: improved the reports.
bzr revid: vra@tinyerp.com-
20101008135353-cbe6jt2pzdy9ch7m
apa-tiny [Fri, 8 Oct 2010 13:43:58 +0000 (19:13 +0530)]
improve pos reports
bzr revid: apa@tinyerp.com-
20101008134358-ig890g59dbxri3eo
Jay (OpenERP) [Fri, 8 Oct 2010 13:38:25 +0000 (19:08 +0530)]
[FIX] project_timsheet : added missing employee_id ref to sheet in yml
bzr revid: jvo@tinyerp.com-
20101008133825-gnr16ihx9dhk6pcj
Vir (Open ERP) [Fri, 8 Oct 2010 13:22:47 +0000 (18:52 +0530)]
[MOD] hr_* : applied changes from usability branch
bzr revid: vir@tinyerp.com-
20101008132247-3m1ff2ngm3im61pn
Mantavya Gajjar [Fri, 8 Oct 2010 13:18:45 +0000 (18:48 +0530)]
[IMP]: improve the usability
bzr revid: mga@tinyerp.com-
20101008131845-alqqlb6d97y3s3d5
Vir (Open ERP) [Fri, 8 Oct 2010 12:48:15 +0000 (18:18 +0530)]
[MOD] hr_payroll : Improvements in access rights
bzr revid: vir@tinyerp.com-
20101008124815-k6ti98b1a12pb74n
vth [Fri, 8 Oct 2010 12:49:22 +0000 (18:19 +0530)]
[REF] account
bzr revid: vth@tinyerp.com-
20101008124922-h3rxefxmldl4300l
Mustufa Rangwala [Fri, 8 Oct 2010 12:17:08 +0000 (17:47 +0530)]
[MERGE] Merge from trunk addons
bzr revid: mra@mra-laptop-
20101008121708-eaco7kqb1zoaeaoe