git.inspyration.org Git - odoo/odoo.git/log

commit | commitdiff | tree

Fabien Pinckaers [Thu, 30 Dec 2010 07:33:32 +0000 (08:33 +0100)]

[FIX] moved access rights

bzr revid: fp@tinyerp.com-20101230073332-phm2azxxk52fc8ba

commit | commitdiff | tree

Fabien Pinckaers [Thu, 30 Dec 2010 07:31:46 +0000 (08:31 +0100)]

[IMP] removed some lint warnings

bzr revid: fp@tinyerp.com-20101230073146-ptxjoi5szxpfhzub

commit | commitdiff | tree

Fabien Pinckaers [Thu, 30 Dec 2010 07:24:55 +0000 (08:24 +0100)]

merge

bzr revid: fp@tinyerp.com-20101230072455-kbt0pel1uqxnss1s

commit | commitdiff | tree

Fabien Pinckaers [Thu, 30 Dec 2010 07:21:25 +0000 (08:21 +0100)]

[IMP] removed unused objects/reports

bzr revid: fp@tinyerp.com-20101230072125-3md9f6t8t5c3h8iv

commit | commitdiff | tree

Olivier Dony [Thu, 30 Dec 2010 04:18:32 +0000 (05:18 +0100)]

[FIX] res_company,res_user: corrected context for filtering user companies

lp bug: https://launchpad.net/bugs/683643 fixed

bzr revid: odo@openerp.com-20101230041832-i231u1lkzvas3bzp

commit | commitdiff | tree

Olivier Dony [Thu, 30 Dec 2010 03:20:17 +0000 (04:20 +0100)]

[FIX] ir.translation: coerce source terms into unicode, to avoid transmitting invalid UTF-8 bytes

This may happen when trying to translate already translated terms, such as the locale-dependen values provided by strftime

lp bug: https://launchpad.net/bugs/610883 fixed

bzr revid: odo@openerp.com-20101230032017-g2r9xx1mu1u5w94g

commit | commitdiff | tree

Olivier Dony [Thu, 30 Dec 2010 01:48:31 +0000 (02:48 +0100)]

[FIX] tools,addons: increased support for installation paths containing non-ascii characters

lp bug: https://launchpad.net/bugs/563029 fixed

bzr revid: odo@openerp.com-20101230014831-jefjtmgy0a10a4mk

commit | commitdiff | tree

Olivier Dony [Thu, 30 Dec 2010 01:40:14 +0000 (02:40 +0100)]

[FIX] tools.config: avoid saving load_language config parameter, only meant for one-shot

bzr revid: odo@openerp.com-20101230014014-zcu2xy0gmwqvy5tn

commit | commitdiff | tree

YSA (OpenERP) [Wed, 29 Dec 2010 20:12:50 +0000 (21:12 +0100)]

[MERGE] base, report: several bugfixes (see bug links)

bzr revid: odo@openerp.com-20101229201250-q7le63xa3rbsce6o

commit | commitdiff | tree

Yogesh Sakhreliya [Thu, 29 Dec 2011 12:34:13 +0000 (18:04 +0530)]

[FIX-695338] fix assert tag in currency rate.

bzr revid: ysa@tinyerp.com-20111229123413-vba5v6etaf1vrh74

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 20:10:26 +0000 (21:10 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229201026-ybz9nifb3nmwh0m3

commit | commitdiff | tree

Stephane Wirtel [Wed, 29 Dec 2010 19:48:30 +0000 (20:48 +0100)]

[FIX] Add new parameters in the setup.nsi

bzr revid: stephane@openerp.com-20101229194830-ll3uekl1f1s3t4ks

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 19:34:15 +0000 (20:34 +0100)]

[IMP] l10n_ca

bzr revid: fp@tinyerp.com-20101229193415-bkec8e98d50rvqfd

commit | commitdiff | tree

Olivier Dony [Wed, 29 Dec 2010 19:03:47 +0000 (20:03 +0100)]

[I18N] base: updated POT after latest changes and improvements in translation engine

bzr revid: odo@openerp.com-20101229190347-2qt6f6pok9h7bbx7

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:58:33 +0000 (19:58 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229185833-ujdxwg5zyg2i3zf2

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:43:43 +0000 (19:43 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229184343-0svcjyn4iwo6aa4r

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:30:43 +0000 (19:30 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229183043-d31jqx557h9fzx00

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:30:07 +0000 (19:30 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229183007-mlroj1fky2b7opxr

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:25:09 +0000 (19:25 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229182509-jvoanufnklz1jbk2

commit | commitdiff | tree

P. Christeas [Wed, 29 Dec 2010 18:20:28 +0000 (19:20 +0100)]

[MERGE] translations: source line numbers added in PO, ORM terms exported in base, XML comments ignored

bzr revid: odo@openerp.com-20101229182028-astrsxry7v3lz1eg

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:17:39 +0000 (19:17 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229181739-dt7vdh4ke2vjmt6h

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:15:37 +0000 (19:15 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229181537-tnhdat4oltusreso

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:14:59 +0000 (19:14 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229181459-creb8lbfqb29at53

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:13:19 +0000 (19:13 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229181319-xb5no9jq3eze42o7

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 18:06:26 +0000 (19:06 +0100)]

merge

bzr revid: fp@tinyerp.com-20101229180626-yuev2gw6erbsdkjs

commit | commitdiff | tree

Olivier Dony [Wed, 29 Dec 2010 17:48:51 +0000 (18:48 +0100)]

[FIX] addons: make sure base demo and tests are reloaded as well upon update

bzr revid: odo@openerp.com-20101229174851-zcflitp2ht2xl52o

commit | commitdiff | tree

P. Christeas [Wed, 29 Dec 2010 17:42:23 +0000 (18:42 +0100)]

[MERGE] orm,expression: fixed m2o handling of empty lists in domains + tests

lp bug: https://launchpad.net/bugs/598454 fixed

bzr revid: odo@openerp.com-20101229174223-xjljjvwqoiwgpci1

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 17:07:59 +0000 (18:07 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229170759-1xpngqs623mttj3r

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 17:01:08 +0000 (18:01 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229170108-x74slosrspmyul4g

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 16:58:24 +0000 (17:58 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229165824-d4xn579hw7lzdbiy

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 16:51:30 +0000 (17:51 +0100)]

[FIX] Cleaning hr holidays reporting and dashbaords

bzr revid: fp@tinyerp.com-20101229165130-jfr2h23jo7mrjqzu

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 16:41:18 +0000 (17:41 +0100)]

[IMP] removed salary structure from employee view

bzr revid: fde@openerp.com-20101229164118-5louilqm23my95ip

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 16:26:07 +0000 (17:26 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229162607-fpmdqtm0x9bo17yt

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 14:18:21 +0000 (15:18 +0100)]

LP Merge proposal 34736 on duty of Daniel Watkins (credativ)

bzr revid: fp@tinyerp.com-20101229141821-2yyuop9hovwnulyc

commit | commitdiff | tree

Olivier Dony [Wed, 29 Dec 2010 16:17:12 +0000 (17:17 +0100)]

[FIX] orm: fixed RST indentation in docstring of browse()

bzr revid: odo@openerp.com-20101229161712-u62qwgshmjlybsv6

commit | commitdiff | tree

Vo Minh Thu [Wed, 29 Dec 2010 16:13:22 +0000 (17:13 +0100)]

[FIX] document_ftp: use the login as a password in the tests.

This is done instead of querying the password and using it because when
base_crypt is installed, the password will be hashed.

bzr revid: vmt@openerp.com-20101229161322-at8c3zh3mnzchj94

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 16:10:29 +0000 (17:10 +0100)]

[IMP] removed contract tab in employee form view + fixed holidays shortcut

bzr revid: fde@openerp.com-20101229161029-o5cko7yu1sf3li45

commit | commitdiff | tree

Tony Gu (openerp-chinese-team) [Wed, 29 Dec 2010 15:51:33 +0000 (16:51 +0100)]

[MERGE] reports: register custom fonts only once to improve the report creation performance

bzr revid: odo@openerp.com-20101229155133-xiivbynvjwlvma8f

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 14:38:49 +0000 (15:38 +0100)]

[IMP] HR employee dashboard in webclient

bzr revid: fde@openerp.com-20101229143849-03lpmdpu5fkc6e86

commit | commitdiff | tree

niv-openerp [Wed, 29 Dec 2010 15:07:46 +0000 (16:07 +0100)]

[FIX] Fixed small problem whith on_change method in account voucher.

bzr revid: nicolas.vanhoren@openerp.com-20101229150746-9w1853e1j0u40oej

commit | commitdiff | tree

Vo Minh Thu [Wed, 29 Dec 2010 14:53:13 +0000 (15:53 +0100)]

[MERGE] tools.translate, module: load generic PO files before specific ones (e.g fr.po before fr_BE.po)

bzr revid: odo@openerp.com-20101229145313-7v7rv3ntmqehzdyi

commit | commitdiff | tree

qdp-launchpad@tinyerp.com [Wed, 29 Dec 2010 14:53:10 +0000 (15:53 +0100)]

[MERGE] merged the apa branch related to yaml tests and reports

bzr revid: qdp-launchpad@tinyerp.com-20101229145310-mx1a9myrfzs3sqf8

commit | commitdiff | tree

Vo Minh Thu [Wed, 29 Dec 2010 14:16:04 +0000 (15:16 +0100)]

[IMP] project_long_term: added date_end and duration to the phase list view.

bzr revid: vmt@openerp.com-20101229141604-wq8ank7n8fl61ytx

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 14:11:22 +0000 (15:11 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229141122-y4s7qqp0u3qraoef

commit | commitdiff | tree

Olivier Dony [Wed, 29 Dec 2010 14:12:07 +0000 (15:12 +0100)]

[I18N] all: removed useless fr_BE.po files, ignored by Rosetta anyway

bzr revid: odo@openerp.com-20101229141207-46rywofon2y95emx

commit | commitdiff | tree

Fabien Meghazi [Wed, 29 Dec 2010 14:01:52 +0000 (15:01 +0100)]

[REM] chart of accounts wizard's view: removed height in group. Heights cause problems in web client.

bzr revid: fme@openerp.com-20101229140152-r2d9x20w0vq7ao12

commit | commitdiff | tree

Fabien Meghazi [Wed, 29 Dec 2010 13:51:02 +0000 (14:51 +0100)]

[FIX] Fixed inherited base config views for web client.

bzr revid: fme@openerp.com-20101229135102-nvw5t6smu8x2nooe

commit | commitdiff | tree

apa-tiny [Wed, 29 Dec 2010 13:43:55 +0000 (19:13 +0530)]

[IMP/MERGE]:improved and merged from trunk

bzr revid: apa@tinyerp.com-20101229134355-y9yzo1n0chgxr5ft

commit | commitdiff | tree

Vo Minh Thu [Wed, 29 Dec 2010 13:38:35 +0000 (14:38 +0100)]

[MERGE] improved and reviewed base_crypt for v6 (promoted from extra-addons)

bzr revid: odo@openerp.com-20101229133835-9ysqp1vyp60af50t

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 13:18:49 +0000 (14:18 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229131849-za2823k78jh252ki

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 13:01:10 +0000 (14:01 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229130110-615iotfn9ed093q1

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 13:07:58 +0000 (14:07 +0100)]

[IMP] HR access rights

bzr revid: fde@openerp.com-20101229130758-hs1xxnj8zm45fl6c

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 12:46:53 +0000 (13:46 +0100)]

[IMP] demo data of SO001

bzr revid: fp@tinyerp.com-20101229124653-k407tnmleb8ub11a

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 12:44:27 +0000 (13:44 +0100)]

[IMP] better error message on access rights

bzr revid: fp@tinyerp.com-20101229124427-a0yr0pfaimnplz22

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 12:42:58 +0000 (13:42 +0100)]

fix

bzr revid: fp@tinyerp.com-20101229124258-arba3ek3stihvspp

commit | commitdiff | tree

Fabien Pinckaers [Wed, 29 Dec 2010 12:41:23 +0000 (13:41 +0100)]

[FIX] complete rewrite for clean up of hr_holidays

bzr revid: fp@tinyerp.com-20101229124123-7tt4ttk3jmkispw7

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 12:39:00 +0000 (13:39 +0100)]

[FIX] HR sign in/sign out

bzr revid: fde@openerp.com-20101229123900-mxl4umxn1tqjjpar

commit | commitdiff | tree

Olivier Dony [Wed, 29 Dec 2010 12:09:26 +0000 (13:09 +0100)]

[FIX] orm: corrected RST for docstring of import_data()

bzr revid: odo@openerp.com-20101229120926-0czisx49e30fjijh

commit | commitdiff | tree

Harry (OpenERP) [Wed, 29 Dec 2010 12:05:59 +0000 (17:35 +0530)]

[FIX] mrp,sale_mrp,stock_location: security

bzr revid: hmo@tinyerp.com-20101229120559-z1wxdm5r2nakfivg

commit | commitdiff | tree

Fabien Meghazi [Wed, 29 Dec 2010 11:54:14 +0000 (12:54 +0100)]

[IMP] pad: changed button style

bzr revid: fme@openerp.com-20101229115414-okrqk9n4j54zeglk

commit | commitdiff | tree

Stephane Wirtel [Wed, 29 Dec 2010 11:52:42 +0000 (12:52 +0100)]

[REF] Detect if there is an installation of PostgreSQL and propose a
screen for the configuration

bzr revid: stephane@openerp.com-20101229115242-uwj3z0z01lz5o3vs

commit | commitdiff | tree

Stephane Wirtel [Wed, 29 Dec 2010 11:52:33 +0000 (12:52 +0100)]

[REF] Add the uuid library in the dependencies and remove the commented code

bzr revid: stephane@openerp.com-20101229115233-rhr4ika4611kikue

commit | commitdiff | tree

Stephane Wirtel [Wed, 29 Dec 2010 11:51:44 +0000 (12:51 +0100)]

[FIX] Change the name of the NT Service

bzr revid: stephane@openerp.com-20101229115144-xj2mhe2d8wy1m4iv

commit | commitdiff | tree

P. Christeas [Wed, 29 Dec 2010 11:40:25 +0000 (13:40 +0200)]

tools/translate: import skipped xml types from tools.misc, after recent patch

bzr revid: p_christ@hol.gr-20101229114025-p1aj5tfuf5pwxxw2

commit | commitdiff | tree

P. Christeas [Wed, 29 Dec 2010 11:33:34 +0000 (13:33 +0200)]

tools/translate: don't export comments and PI nodes for translation

We are not going to display them to user, so let the teams skip those
strings.

bzr revid: p_christ@hol.gr-20101229113334-71fe2bnw1dra167q

commit | commitdiff | tree

P. Christeas [Wed, 29 Dec 2010 11:33:06 +0000 (13:33 +0200)]

translate: implement a counter to export the code line number

Before this, all code sources were like "#: code:foo/bar.py:0", now
they will have line no like "#: code:foo/bar.py:123".

Note that the gettext() wouldn't be affected, since it doesn't consult
the file name or line so far.

bzr revid: p_christ@hol.gr-20101229113306-vo3gflwunq2f75qm

commit | commitdiff | tree

P. Christeas [Wed, 29 Dec 2010 11:31:34 +0000 (13:31 +0200)]

tools/translate: fix couple of errors caught by the lint check.

bzr revid: p_christ@hol.gr-20101229113134-6cz48hjh2hcc186e

commit | commitdiff | tree

P. Christeas [Wed, 29 Dec 2010 11:28:50 +0000 (13:28 +0200)]

translate: export the orm and report code translations

bzr revid: p_christ@hol.gr-20101229112850-cqe0wxxtewyfdjsk

commit | commitdiff | tree

Harry (OpenERP) [Wed, 29 Dec 2010 11:16:31 +0000 (16:46 +0530)]

[FIX] hr_payroll_account: if journal_id or bank_journal_id are not specified in pay slip, call super method which are declared in hr_payroll module. it fixed due to solve yml issue

bzr revid: hmo@tinyerp.com-20101229111631-zam0fzc3iu11vsr5

commit | commitdiff | tree

Olivier Dony [Wed, 29 Dec 2010 10:50:04 +0000 (11:50 +0100)]

[FIX] osv,tools: break some circular dependencies

bzr revid: odo@openerp.com-20101229105004-ay1e69aujci1l32i

commit | commitdiff | tree

Harry (OpenERP) [Wed, 29 Dec 2010 10:48:16 +0000 (16:18 +0530)]

[FIX] sale, purchase: yml issue

bzr revid: hmo@tinyerp.com-20101229104816-lv51d1nm4gu4mjhn

commit | commitdiff | tree

Harry (OpenERP) [Wed, 29 Dec 2010 10:16:28 +0000 (15:46 +0530)]

[FIX] knowledge: security

bzr revid: hmo@tinyerp.com-20101229101628-1vzbn5dytou46dlw

commit | commitdiff | tree

Olivier Dony [Wed, 29 Dec 2010 09:47:54 +0000 (10:47 +0100)]

[FIX] ir.ui.menu: typos introduced recently

bzr revid: odo@openerp.com-20101229094754-c9od7rd0xlvk9h08

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 09:30:25 +0000 (10:30 +0100)]

[FIX] report_intrastat access rights

bzr revid: fde@openerp.com-20101229093025-n4gjwyr0a9zjz74i

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 09:25:06 +0000 (10:25 +0100)]

[FIX] product_manufacturer access rights

bzr revid: fde@openerp.com-20101229092506-j8anb9cxtzoj4n4c

commit | commitdiff | tree

Harry (OpenERP) [Wed, 29 Dec 2010 09:09:24 +0000 (14:39 +0530)]

[FIX] product_manufacturer: security

bzr revid: hmo@tinyerp.com-20101229090924-wzavbi0r8srtdlh5

commit | commitdiff | tree

Harry (OpenERP) [Wed, 29 Dec 2010 08:57:16 +0000 (14:27 +0530)]

[FIX] account: security

bzr revid: hmo@tinyerp.com-20101229085716-y13ctpn3ptenrfl0

commit | commitdiff | tree

apa-tiny [Wed, 29 Dec 2010 08:53:52 +0000 (14:23 +0530)]

[MERGE]:merged from trunk

bzr revid: apa@tinyerp.com-20101229085352-c3ui6wb0or9smsjr

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 08:18:04 +0000 (09:18 +0100)]

[IMP+FIX] HR access rights, product margin

bzr revid: fde@openerp.com-20101229081804-ci2v2t9fhtmc1d3d

commit | commitdiff | tree

Yogesh Sakhreliya [Wed, 29 Dec 2010 07:49:51 +0000 (13:19 +0530)]

[FIX] fix height of configuration wizard.

bzr revid: ysa@tinyerp.com-20101229074951-s3yhn5regplzei5l

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 07:47:26 +0000 (08:47 +0100)]

[IMP] HR access rights

bzr revid: fde@openerp.com-20101229074726-3iucy5o1886n9y9e

commit | commitdiff | tree

Yogesh Sakhreliya [Wed, 29 Dec 2010 07:43:50 +0000 (13:13 +0530)]

Merge with trunk-server

bzr revid: ysa@tinyerp.com-20101229074350-vk1xbgjqgsj71y8y

commit | commitdiff | tree

François Degrave [Wed, 29 Dec 2010 07:39:56 +0000 (08:39 +0100)]

[IMP+FIX] HR access rights, menus

bzr revid: fde@openerp.com-20101229073956-oze90c0gwlkk4s9t

commit | commitdiff | tree

Jay (OpenERP) [Wed, 29 Dec 2010 06:00:11 +0000 (11:30 +0530)]

[FIX] Correction on currency rate

bzr revid: jvo@tinyerp.com-20101229060011-299fhz8iu8jdjk6p

commit | commitdiff | tree

Vo Minh Thu [Tue, 28 Dec 2010 15:56:40 +0000 (16:56 +0100)]

[ADD] clean-po.py: script to clean .po files.

bzr revid: vmt@openerp.com-20101228155640-hift2uqfcmif1s9r

commit | commitdiff | tree

François Degrave [Tue, 28 Dec 2010 15:34:17 +0000 (16:34 +0100)]

[IMP] access rights, menus for HR

bzr revid: fde@openerp.com-20101228153417-ps9ql3h4lij87jx8

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101229044038-xv05sco0rtuoe3cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20101229045841-67lol5w1iaobouap

commit | commitdiff | tree

Jay (OpenERP) [Tue, 28 Dec 2010 18:18:33 +0000 (23:48 +0530)]

[FIX] typo fixes

bzr revid: jvo@tinyerp.com-20101228181833-995xi924bqwav2nh

commit | commitdiff | tree

Fabien Pinckaers [Tue, 28 Dec 2010 17:17:06 +0000 (18:17 +0100)]

fix

bzr revid: fp@tinyerp.com-20101228171706-yxthy7o0u5vs21q8

commit | commitdiff | tree

qdp-launchpad@tinyerp.com [Tue, 28 Dec 2010 17:07:18 +0000 (18:07 +0100)]

[MERGE] merged the numerigraphe branch related to common typo mistake 'childs' instead of children. Thanks for the contribution

bzr revid: qdp-launchpad@tinyerp.com-20101228170718-3r55jyvpb6m5h05u

commit | commitdiff | tree

Fabien Pinckaers [Tue, 28 Dec 2010 16:07:28 +0000 (17:07 +0100)]

fix lp692891

bzr revid: fp@tinyerp.com-20101228160728-tfaia9pcqs0j4uef

commit | commitdiff | tree

Fabien Pinckaers [Tue, 28 Dec 2010 16:00:39 +0000 (17:00 +0100)]

fix lp #690032

bzr revid: fp@tinyerp.com-20101228160039-27wi6goxi6e8mv3z

commit | commitdiff | tree

Fabien Pinckaers [Tue, 28 Dec 2010 15:58:25 +0000 (16:58 +0100)]

merge

bzr revid: fp@tinyerp.com-20101228155825-nstqujh3gheg7e0k

commit | commitdiff | tree

Fabien Pinckaers [Tue, 28 Dec 2010 15:53:47 +0000 (16:53 +0100)]

[FIX] from cedk lp #677377

bzr revid: fp@tinyerp.com-20101228155347-eue161xp4fxeh8lc