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

commit | commitdiff | tree

tfr@openerp.com [Fri, 24 Jun 2011 16:11:17 +0000 (18:11 +0200)]

[IMP] review of contact import

bzr revid: tfr@openerp.com-20110624161117-6n2qzn3u2iix1pvb

commit | commitdiff | tree

Bhumika (OpenERP) [Fri, 24 Jun 2011 13:20:23 +0000 (18:50 +0530)]

[MERGE] Fix the pickle problem

bzr revid: sbh@tinyerp.com-20110624132023-o40rozn41apmkhk9

commit | commitdiff | tree

Jigar Amin [Fri, 24 Jun 2011 12:06:07 +0000 (17:36 +0530)]

[FIX] pickle bug

bzr revid: jam@tinyerp.com-20110624120607-rce5msvoiprj7c6j

commit | commitdiff | tree

Jigar Amin [Thu, 23 Jun 2011 13:07:23 +0000 (18:37 +0530)]

[FIX] Removed the timezone object from context to avoid pickle problem

bzr revid: jam@tinyerp.com-20110623130723-jrxbt9jizmes55mb

commit | commitdiff | tree

Bhumika (OpenERP) [Thu, 23 Jun 2011 09:30:22 +0000 (15:00 +0530)]

[MERGE] Merge the backlog correction

bzr revid: sbh@tinyerp.com-20110623093022-g0u79flq5snseftn

commit | commitdiff | tree

Jigar Amin [Wed, 22 Jun 2011 11:31:57 +0000 (17:01 +0530)]

[IMP] import_google : refectroing for maintaining the partner and contact

bzr revid: jam@tinyerp.com-20110622113157-mlm4cx4xza43wjtw

commit | commitdiff | tree

DBR (OpenERP) [Tue, 21 Jun 2011 09:22:55 +0000 (14:52 +0530)]

[IMP]import_google : Improvement in get_data()

bzr revid: dbr@tinyerp.com-20110621092255-opxr9s421w1ezfo8

commit | commitdiff | tree

DBR (OpenERP) [Tue, 21 Jun 2011 09:14:52 +0000 (14:44 +0530)]

[IMP]import_google : Improvement in _get_tinydates()

bzr revid: dbr@tinyerp.com-20110621091452-wlxkizgjicmgzb4d

commit | commitdiff | tree

Bhumika (OpenERP) [Mon, 20 Jun 2011 04:55:33 +0000 (10:25 +0530)]

import_google: Put yml in commented

bzr revid: sbh@tinyerp.com-20110620045533-i5u0ewxglsfia6yh

commit | commitdiff | tree

Bhumika (OpenERP) [Mon, 20 Jun 2011 04:40:36 +0000 (10:10 +0530)]

[MERGE] Merge improvement of google contact lp:~openerp-dev/openobject-addons/trunk-import_google-merge-dbr

bzr revid: sbh@tinyerp.com-20110620044036-usdonlyyp7uygx8n

commit | commitdiff | tree

DBR (OpenERP) [Thu, 16 Jun 2011 10:45:35 +0000 (16:15 +0530)]

[IMP]import_google : Improve the .csv file

bzr revid: dbr@tinyerp.com-20110616104535-xtjx9ca0zsvecmfs

commit | commitdiff | tree

DBR (OpenERP) [Thu, 16 Jun 2011 10:21:05 +0000 (15:51 +0530)]

[IMP]import_google : Improve the code for message box

bzr revid: dbr@tinyerp.com-20110616102105-y401kwlng6nl068g

commit | commitdiff | tree

DBR (OpenERP) [Thu, 16 Jun 2011 05:03:29 +0000 (10:33 +0530)]

[IMP]import_google:Improve Gmail id and return value

bzr revid: dbr@tinyerp.com-20110616050329-vp5t4u2hj2s6ek9f

commit | commitdiff | tree

DBR (OpenERP) [Wed, 15 Jun 2011 12:48:26 +0000 (18:18 +0530)]

[IMP]import_google: Changes in Description

bzr revid: dbr@tinyerp.com-20110615124826-r9hxbhlie1gxy6as

commit | commitdiff | tree

DBR (OpenERP) [Wed, 15 Jun 2011 12:31:48 +0000 (18:01 +0530)]

[IMP]import_google: Changes in yml file of partner

bzr revid: dbr@tinyerp.com-20110615123148-hr7xr276yzhkdjm5

commit | commitdiff | tree

DBR (OpenERP) [Wed, 15 Jun 2011 11:51:46 +0000 (17:21 +0530)]

[ADD]import_google: Changes in yml file of contact and calander

bzr revid: dbr@tinyerp.com-20110615115146-su4fj3kwwu7kl0q3

commit | commitdiff | tree

DBR (OpenERP) [Tue, 14 Jun 2011 09:34:01 +0000 (15:04 +0530)]

[IMP]import_google : Improve the yml

bzr revid: dbr@tinyerp.com-20110614093401-yud04mjo08exwvne

commit | commitdiff | tree

DBR (OpenERP) [Tue, 14 Jun 2011 07:04:35 +0000 (12:34 +0530)]

[IMP]import_google : Improve the .yml files

bzr revid: dbr@tinyerp.com-20110614070435-g6alpi63ibnsjj0b

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 13:34:53 +0000 (19:04 +0530)]

[IMP]:Improve code for selected events

bzr revid: dbr@tinyerp.com-20110613133453-n2348lrgfb8939vz

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 13:06:34 +0000 (18:36 +0530)]

[REF]:Remove extra authentication

bzr revid: dbr@tinyerp.com-20110613130634-x5ky8g5vaopy5bw2

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 12:52:21 +0000 (18:22 +0530)]

[IMP]:Remove the extra class and merge the code

bzr revid: dbr@tinyerp.com-20110613125221-f7we3vi67hnw38sm

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 09:41:49 +0000 (15:11 +0530)]

[IMP]import_google : propar authentication

bzr revid: dbr@tinyerp.com-20110613094149-8jfqf64vylfnrflc

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 09:18:50 +0000 (14:48 +0530)]

[IMP]import_google : Change in message wizard view

bzr revid: dbr@tinyerp.com-20110613091850-lcakq2i19g4mm95e

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 07:10:42 +0000 (12:40 +0530)]

[ADD]import_google: Add two files

bzr revid: dbr@tinyerp.com-20110613071042-b1zp3enejqip7z5p

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 06:47:58 +0000 (12:17 +0530)]

[IMP]import_google

bzr revid: dbr@tinyerp.com-20110613064758-bezxriw47gujgen5

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 06:38:39 +0000 (12:08 +0530)]

[REF]import_google: rename the file

bzr revid: dbr@tinyerp.com-20110613063839-zy27ck9t21j6sjdh

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 06:16:48 +0000 (11:46 +0530)]

[REMOVE]import_google: remove the file and merge the code

bzr revid: dbr@tinyerp.com-20110613061648-oo35e030m88skywj

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 06:09:00 +0000 (11:39 +0530)]

[REF]import_google: rename the file

bzr revid: dbr@tinyerp.com-20110613060900-v7h2gzp14ao36j7a

commit | commitdiff | tree

DBR (OpenERP) [Mon, 13 Jun 2011 06:02:15 +0000 (11:32 +0530)]

Import_google:[IMP] remove unused code and merge the action code

bzr revid: dbr@tinyerp.com-20110613060215-kih9rmzu9de0letu

commit | commitdiff | tree

Bhumika (OpenERP) [Fri, 10 Jun 2011 09:05:00 +0000 (14:35 +0530)]

[MERGE] Merge lp:~openerp-dev/openobject-addons/trunk-import_google-backlog2_import_meeting-jam

bzr revid: sbh@tinyerp.com-20110610090500-46rg1cngffaq3ea0

commit | commitdiff | tree

DBR (OpenERP) [Fri, 10 Jun 2011 08:54:48 +0000 (14:24 +0530)]

[IMP]: Remove extra function

bzr revid: dbr@tinyerp.com-20110610085448-zrz4k56lhd94qsxb

commit | commitdiff | tree

DBR (OpenERP) [Fri, 10 Jun 2011 07:49:30 +0000 (13:19 +0530)]

[IMP]: Imp for company details

bzr revid: dbr@tinyerp.com-20110610074930-gxmiaqtzpt8evjph

commit | commitdiff | tree

DBR (OpenERP) [Thu, 9 Jun 2011 10:55:57 +0000 (16:25 +0530)]

[IMP]:change in google_contact

bzr revid: dbr@tinyerp.com-20110609105557-y4dkp2avrzl9zodt

commit | commitdiff | tree

DBR (OpenERP) [Wed, 8 Jun 2011 13:31:39 +0000 (19:01 +0530)]

[IMP]:Change in get_data

bzr revid: dbr@tinyerp.com-20110608133139-g5n8uy1z58nda07c

commit | commitdiff | tree

DBR (OpenERP) [Wed, 8 Jun 2011 13:01:17 +0000 (18:31 +0530)]

[MERGE]:change the class name

bzr revid: dbr@tinyerp.com-20110608130117-at23f0wvvrt7ugml

commit | commitdiff | tree

DBR (OpenERP) [Wed, 8 Jun 2011 12:50:29 +0000 (18:20 +0530)]

[MERGE]:Merging the google_contact

bzr revid: dbr@tinyerp.com-20110608125029-gbv6z7869r3duxnv

commit | commitdiff | tree

Bhumika (OpenERP) [Wed, 8 Jun 2011 11:11:10 +0000 (16:41 +0530)]

[Merge] lp:~openerp-dev/openobject-addons/trunk-import_google-backlog2_import_meeting-jam

bzr revid: sbh@tinyerp.com-20110608111110-69kazvbrpstov1bj

commit | commitdiff | tree

Jigar Amin [Wed, 8 Jun 2011 05:35:26 +0000 (11:05 +0530)]

[USA] View usabality imporved

bzr revid: jam@tinyerp.com-20110608053526-wbzpkpof3kordys5

commit | commitdiff | tree

Jigar Amin [Wed, 8 Jun 2011 05:32:50 +0000 (11:02 +0530)]

[IMP] import_google : refectored code to use google_base_login

bzr revid: jam@tinyerp.com-20110608053250-z0cbv8bcobs5q10i

commit | commitdiff | tree

Jigar Amin [Wed, 8 Jun 2011 04:44:47 +0000 (10:14 +0530)]

[FIX] Code refector

bzr revid: jam@tinyerp.com-20110608044447-hkg95ex70kqbr3hg

commit | commitdiff | tree

Jigar Amin [Tue, 7 Jun 2011 13:05:28 +0000 (18:35 +0530)]

[RMV] removed old sync_google_calendar module

bzr revid: jam@tinyerp.com-20110607130528-w196rk2r1r4h235j

commit | commitdiff | tree

Jigar Amin [Tue, 7 Jun 2011 13:03:30 +0000 (18:33 +0530)]

[IMP] base_calendar_chnages and import_google_changes

bzr revid: jam@tinyerp.com-20110607130330-abahqwzjmg95p2ro

commit | commitdiff | tree

Jigar Amin [Tue, 7 Jun 2011 12:32:28 +0000 (18:02 +0530)]

[IMP] import_ggole : imprt calendar ebent

bzr revid: jam@tinyerp.com-20110607123228-d2mbz2klb5a48u08

commit | commitdiff | tree

Jigar Amin [Tue, 7 Jun 2011 07:23:20 +0000 (12:53 +0530)]

[IMP] Rnemed the module and merge contact and calendar modules

bzr revid: jam@tinyerp.com-20110607072320-wkkw9q94vsd7mrlh

commit | commitdiff | tree

Jigar Amin [Tue, 7 Jun 2011 05:40:13 +0000 (11:10 +0530)]

[MERGE] with lp:~openerp-dev/openobject-addons/trunk-import_google-Backlog_2_ref-dbr

bzr revid: jam@tinyerp.com-20110607054013-1ujhyky4wsy0eiw5

commit | commitdiff | tree

DBR (OpenERP) [Tue, 7 Jun 2011 05:31:45 +0000 (11:01 +0530)]

[ADD] Add new file import_google

bzr revid: dbr@tinyerp.com-20110607053145-dtyiyktq6bxrxsbc

commit | commitdiff | tree

DBR (OpenERP) [Mon, 6 Jun 2011 07:10:10 +0000 (12:40 +0530)]

MERGE:lp:~openerp-dev/openobject-addons/trunk-import_google-Backlog_2_ref-dbr

bzr revid: dbr@tinyerp.com-20110606071010-mf063vww9oivtwtl

commit | commitdiff | tree

DBR (OpenERP) [Thu, 2 Jun 2011 10:26:59 +0000 (15:56 +0530)]

[MERGE] Merge with lp:~openerp-dev/openobject-addons/trunk-import_google

bzr revid: dbr@tinyerp.com-20110602102659-5by0ugh5pd66nsie

commit | commitdiff | tree

Bhumika (OpenERP) [Thu, 2 Jun 2011 06:26:01 +0000 (11:56 +0530)]

[Fix] base_calendar: Add the remove function during the merge

bzr revid: sbh@tinyerp.com-20110602062601-gulg4g3rjkgmd0fz

commit | commitdiff | tree

Bhumika (OpenERP) [Thu, 2 Jun 2011 05:48:49 +0000 (11:18 +0530)]

[Fix] google_base_account: Fix the gdata for contact and calander import

bzr revid: sbh@tinyerp.com-20110602054849-2qi8mgcwtfjl7ljd

commit | commitdiff | tree

Bhumika (OpenERP) [Wed, 1 Jun 2011 13:14:58 +0000 (18:44 +0530)]

[FIX] google_base_account: remove unused code

bzr revid: sbh@tinyerp.com-20110601131458-3kkhkh39jtpdkv0j

commit | commitdiff | tree

Bhumika (OpenERP) [Wed, 1 Jun 2011 12:00:47 +0000 (17:30 +0530)]

[Fix] crm: correct the indeation

bzr revid: sbh@tinyerp.com-20110601120047-knq61e9m0sotf5b0

commit | commitdiff | tree

Bhumika (OpenERP) [Wed, 1 Jun 2011 11:11:19 +0000 (16:41 +0530)]

[MERGE] Merge with lp:~openerp-dev/openobject-addons/trunk-calendar

bzr revid: sbh@tinyerp.com-20110601111119-7nggxba11p0bp5wb

commit | commitdiff | tree

Bhumika (OpenERP) [Wed, 1 Jun 2011 10:39:49 +0000 (16:09 +0530)]

[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110601103949-lhzpnstpexkxca91

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 1 Jun 2011 10:20:21 +0000 (12:20 +0200)]

[IMP] account, analytic accounting: added group by state on analytic accounts

bzr revid: qdp-launchpad@openerp.com-20110601102021-pe3ixdhuwd410g0j

commit | commitdiff | tree

Bhumika (OpenERP) [Wed, 1 Jun 2011 09:32:27 +0000 (15:02 +0530)]

[MERGE ] Merge lp:~openerp-dev/openobject-addons/trunk-contact-google-sync

bzr revid: sbh@tinyerp.com-20110601093227-8eex1ulr086pmctm

commit | commitdiff | tree

Bhumika (OpenERP) [Wed, 1 Jun 2011 09:28:08 +0000 (14:58 +0530)]

[MERGE] Merge import framework

bzr revid: sbh@tinyerp.com-20110601092808-wkrbrh7b5rffxrme

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 1 Jun 2011 09:11:16 +0000 (11:11 +0200)]

[IMP] account: added access rights for model_account_treasury_report

bzr revid: qdp-launchpad@openerp.com-20110601091116-iysfehqoj7r2hlue

commit | commitdiff | tree

Vo Minh Thu [Wed, 1 Jun 2011 07:44:00 +0000 (09:44 +0200)]

[FIX] tools/config: properly cast config file values.

bzr revid: vmt@openerp.com-20110601074400-hv1jrgoqw2ji0yah

commit | commitdiff | tree

Quentin (OpenERP) [Wed, 1 Jun 2011 06:55:56 +0000 (08:55 +0200)]

[MERGE] merged xrg branch with fix of mexican vat verification

bzr revid: qdp-launchpad@openerp.com-20110601065556-ymu9i6fz07t0f82u

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110601043809-ocpn3eaostvtf4mx

commit | commitdiff | tree

Fabien Meghazi [Tue, 31 May 2011 22:28:38 +0000 (00:28 +0200)]

[IMP] Dashboard cleanup

bzr revid: fme@openerp.com-20110531222838-t2a9ksc7l2sthghn

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 31 May 2011 22:09:51 +0000 (00:09 +0200)]

[MERGE] lp:768430

bzr revid: qdp-launchpad@openerp.com-20110531220951-6mtceil9xsbmnktp

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 31 May 2011 21:55:34 +0000 (23:55 +0200)]

[MERGE] lp:717198

bzr revid: qdp-launchpad@openerp.com-20110531215534-6rj4n9hlzw6w25w1

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 31 May 2011 21:23:20 +0000 (23:23 +0200)]

[MERGE] merge of rpa's branch: we shouldn't be able to see orderpoint and procurement of parent companies (reverted other rules for pricelist from proposed branch)

bzr revid: qdp-launchpad@openerp.com-20110531212320-gizw4iaz2t0wdw4b

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 31 May 2011 20:51:28 +0000 (22:51 +0200)]

[IMP] account: treasury report compliancy with multi company + fixed warning of account/report/account_treasury_report.py (unused ref_dict variable)

bzr revid: qdp-launchpad@openerp.com-20110531205128-i1noccss0p3x8a1p

commit | commitdiff | tree

Fabien Meghazi [Tue, 31 May 2011 19:52:02 +0000 (21:52 +0200)]

[FIX] Fixed load() in action controller. Was not calling clean_action()

bzr revid: fme@openerp.com-20110531195202-6z6veclumppp1mlr

commit | commitdiff | tree

Fabien Meghazi [Tue, 31 May 2011 15:49:33 +0000 (17:49 +0200)]

[FIX] Removed _.sprintf

bzr revid: fme@openerp.com-20110531154933-5rf6kiyqo4my7bb4

commit | commitdiff | tree

Fabien Meghazi [Tue, 31 May 2011 15:43:38 +0000 (17:43 +0200)]

[IMP] Do not link to openerp.screen when unecessary

bzr revid: fme@openerp.com-20110531154338-d0ill7s23oqz79pq

commit | commitdiff | tree

Vo Minh Thu [Tue, 31 May 2011 15:27:11 +0000 (17:27 +0200)]

[REF] openerp/report/render/render.py: removed silly main() method, rewrote french comment in english.

bzr revid: vmt@openerp.com-20110531152711-49kyo4xhtak3r874

commit | commitdiff | tree

Vo Minh Thu [Tue, 31 May 2011 15:16:15 +0000 (17:16 +0200)]

[MERGE] fix in tools/config.

bzr revid: vmt@openerp.com-20110531151615-3byoonhhcxpfdwl9

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 31 May 2011 15:12:31 +0000 (17:12 +0200)]

[IMP] account: added treasury report

bzr revid: qdp-launchpad@openerp.com-20110531151231-pg36qumj491j8fsx

commit | commitdiff | tree

tfr@openerp.com [Tue, 31 May 2011 14:25:45 +0000 (16:25 +0200)]

[FIX] import table with no data inside made crash resolve dependencies

bzr revid: tfr@openerp.com-20110531142545-l130b9b6xffdrcew

commit | commitdiff | tree

Quentin (OpenERP) [Tue, 31 May 2011 14:02:58 +0000 (16:02 +0200)]

[FIX] hr: display the expected number of employees and number of employees when grouping

bzr revid: qdp-launchpad@openerp.com-20110531140258-p30r6fq5wuyl8j7h

commit | commitdiff | tree

tfr@openerp.com [Tue, 31 May 2011 13:32:32 +0000 (15:32 +0200)]

[FIX] duplicate and edit all bug + refactor crm_case crm_base meeting phonecall

bzr revid: tfr@openerp.com-20110531133232-aiclel28l79p25bj

commit | commitdiff | tree

niv-openerp [Tue, 31 May 2011 13:15:10 +0000 (15:15 +0200)]

[fix] many fixes to o2m & m2m

bzr revid: nicolas.vanhoren@openerp.com-20110531131510-5zq9rfezkvfq5me8

commit | commitdiff | tree

niv-openerp [Tue, 31 May 2011 13:14:14 +0000 (15:14 +0200)]

[fix] small typo in m2m

bzr revid: nicolas.vanhoren@openerp.com-20110531131414-em4fcrbwfiqcq6g1

commit | commitdiff | tree

niv-openerp [Tue, 31 May 2011 13:01:54 +0000 (15:01 +0200)]

Import old branch.

bzr revid: nicolas.vanhoren@openerp.com-20110531130154-45t27asxk5pcr7sd

commit | commitdiff | tree

Vo Minh Thu [Tue, 31 May 2011 12:53:22 +0000 (14:53 +0200)]

[FIX] tools/config: default values always override the config files:
- this bug was introduced by commit 3417.6.4 vmt@openerp.com-20110419134016-og6ye1hjrb0j52cl.

bzr revid: vmt@openerp.com-20110531125322-myptetqusymunily

commit | commitdiff | tree

tfr@openerp.com [Tue, 31 May 2011 11:59:29 +0000 (13:59 +0200)]

[FIX] rm print from sbh

bzr revid: tfr@openerp.com-20110531115929-k7xbz4j3bj86uygi

commit | commitdiff | tree

Xavier Morel [Tue, 31 May 2011 10:15:18 +0000 (12:15 +0200)]

[IMP] @editable on forms and fields is nonsense, on trees it should only be able to take the values 'top' and 'bottom'

bzr revid: xmo@openerp.com-20110531101518-1ycw1fjy5vczcf8g

commit | commitdiff | tree

Xavier Morel [Tue, 31 May 2011 09:14:56 +0000 (11:14 +0200)]

[REM] @editable on fields and forms, makes no sense

bzr revid: xmo@openerp.com-20110531091456-kuyg11u9vtvxn8uv

commit | commitdiff | tree

tfr@openerp.com [Tue, 31 May 2011 08:54:54 +0000 (10:54 +0200)]

[MERGE] Correction from dbr

bzr revid: tfr@openerp.com-20110531085454-bsfcu5mfbwtyowxa

commit | commitdiff | tree

Xavier Morel [Tue, 31 May 2011 08:39:19 +0000 (10:39 +0200)]

[FIX] tree/@editable value is top or bottom, 1 is not acceptable

bzr revid: xmo@openerp.com-20110531083919-xx0chei0bm0ynq3x

commit | commitdiff | tree

Xavier Morel [Tue, 31 May 2011 06:33:13 +0000 (08:33 +0200)]

[FIX] group cleanup issue during apoptosis: remove all children from storage otherwise risk of zombie children

bzr revid: xmo@openerp.com-20110531063313-gv7z5vhwnrt5x6pg

commit | commitdiff | tree

Xavier Morel [Tue, 31 May 2011 06:13:26 +0000 (08:13 +0200)]

[IMP] re-add lost base.controllers.__init__

bzr revid: xmo@openerp.com-20110531061326-gskit8sefxv56go2

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110531044750-6p5w7mfp6bow8hl6

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20110531044735-dhu40as3jjdi6qwe

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 16:58:04 +0000 (18:58 +0200)]

[MERGE] bugfix for assert error: Human Resources/Configuration/Human Resources/Employees/Categories of Employee/Categories structure

while open the employee view form above menu and try to filter results, i am getting this assertion error.

bzr revid: qdp-launchpad@openerp.com-20110530165804-h46rxi92qxzljr8w

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 16:31:58 +0000 (18:31 +0200)]

[MERGE] lp:777803

bzr revid: qdp-launchpad@openerp.com-20110530163158-0tnmt1b96omcjbft

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 16:27:49 +0000 (18:27 +0200)]

[MERGE] lp:773128

bzr revid: qdp-launchpad@openerp.com-20110530162749-mgix0v37qag65q06

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 16:21:43 +0000 (18:21 +0200)]

[MERGE] lp:777121

bzr revid: qdp-launchpad@openerp.com-20110530162143-0jkl2zvcmnaw63av

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 15:06:55 +0000 (17:06 +0200)]

[MERGE] lp:778473

bzr revid: qdp-launchpad@openerp.com-20110530150655-pv24ogkrchnooib1

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 15:01:02 +0000 (17:01 +0200)]

[MERGE] lp:780668

bzr revid: qdp-launchpad@openerp.com-20110530150102-5dpu652vgz4by2dc

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 14:55:26 +0000 (16:55 +0200)]

[MERGE] lp:764855

bzr revid: qdp-launchpad@openerp.com-20110530145526-t22u7m93fdse1zp6

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 14:45:37 +0000 (16:45 +0200)]

[MERGE] lp:767039

bzr revid: qdp-launchpad@openerp.com-20110530144537-7l7l518a0hzhzlwr

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 14:42:36 +0000 (16:42 +0200)]

[MERGE] lp:689547

bzr revid: qdp-launchpad@openerp.com-20110530144236-06kd5exja9ltn72s

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 14:34:32 +0000 (16:34 +0200)]

[MERGE] lp:781656

bzr revid: qdp-launchpad@openerp.com-20110530143432-2mxbtxlpg0zy6vbc

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 14:24:21 +0000 (16:24 +0200)]

[MERGE] lp:782163

bzr revid: qdp-launchpad@openerp.com-20110530142421-94oxsuut60kw206g

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 30 May 2011 14:21:56 +0000 (16:21 +0200)]

[MERGE] lp:782196

bzr revid: qdp-launchpad@openerp.com-20110530142156-vg6jsp9eo103k3nh

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom