Commit Graph
38085 Commits
Author SHA1 Message Date
Christophe Simonis 2ea47dc3b2 merge upstream
bzr revid: chs@openerp.com-20111108163644-8mlg48lua376lzgg
2011-11-08 17:36:44 +01:00
Antony Lesuisse 61823d98e9 [MERGE] qweb xml loading (chs)
bzr revid: al@openerp.com-20111108160942-lawx5l2brjq2hut8
2011-11-08 17:09:42 +01:00
Raphael Collet fe742469cd [MERGE] lp:872680
bzr revid: rco@openerp.com-20111108160017-dxy7ff113j0teunh
2011-11-08 17:00:17 +01:00
Raphael Collet 60b7b6e10c [MERGE] lp:868224
bzr revid: rco@openerp.com-20111108155818-fx5yeq0fq2ihslr8
2011-11-08 16:58:18 +01:00
Christophe Simonis 5290ada81f [FIX] correct criss-cross merge
bzr revid: chs@openerp.com-20111108155633-8lymglmg46sfv0ko
2011-11-08 16:56:33 +01:00
Christophe Simonis 6e735ccbbe merge upstream
bzr revid: chs@openerp.com-20111103111333-93bu8xdgs30ry5ig
bzr revid: chs@openerp.com-20111108154541-dsz5sjnf7xwihg06
2011-11-08 16:45:41 +01:00
Fabien Pinckaers 1492aeaea4 [IMP] log a call/schedule a call
bzr revid: fp@tinyerp.com-20111108153223-ovef7iy5ofi911pi
2011-11-08 16:32:23 +01:00
Olivier Dony 41c9661d19 [MERGE] base_module_record: fix bug 696176, courtesy of Stefan Rijnhart (Therp)
bzr revid: odo@openerp.com-20111108152739-1fat83woor24hveo
2011-11-08 16:27:39 +01:00
Antony Lesuisse 91f050054f [MERGE] rename Session into connection define a Connection singleton (chs)
bzr revid: al@openerp.com-20111108152723-2w6zpksjw4e1yx7q
2011-11-08 16:27:23 +01:00
Fabien Pinckaers 9e70e67ae5 [IMP] feedback from PS
bzr revid: fp@tinyerp.com-20111108152142-6b0dqdnk6ntxm8ja
2011-11-08 16:21:42 +01:00
Antony Lesuisse b467d6eda2 [MERGE] concat css chs
bzr revid: al@openerp.com-20111108145443-96xc6xvfv9nqh37s
2011-11-08 15:54:43 +01:00
Christophe Simonis 2ae078e58c [FIX] mergecss: allow spaces after (
bzr revid: chs@openerp.com-20111108145214-ahdaiyk0f616zq74
2011-11-08 15:52:14 +01:00
Fabien Meghazi 30359afc90 [ADD] Added kanban_state for project.task
bzr revid: fme@openerp.com-20111108143714-z6w1ptcsdrzo9vf0
2011-11-08 15:37:14 +01:00
Raphael Collet 627a478183 [MERGE] project_mrp: task created with project corresponding to sale order's analytic account
bzr revid: rco@openerp.com-20111108133005-25dnhui5r0r7yq92
2011-11-08 14:30:05 +01:00
Fabien Meghazi 88513942df [REM] Removed 'ready' state from project.task
bzr revid: fme@openerp.com-20111108131208-uoteau267plyum9m
2011-11-08 14:12:08 +01:00
Fabien Pinckaers c3cc9bdf5d [IMP] Improved design for sale and sale_layout
bzr revid: fp@tinyerp.com-20111108111102-u49mm19xv16ze39r
2011-11-08 12:11:02 +01:00
Quentin (OpenERP) 2684803fad [MERGE] merged the branch of Serpent Consulting fixing bug 883160.
bzr revid: qdp-launchpad@openerp.com-20111108102918-97my5wahc8ztjlka
2011-11-08 11:29:18 +01:00
Fabien Pinckaers 4f4bbab98f [IMP] better data for project_long_term
bzr revid: fp@tinyerp.com-20111108101911-l7jiql4nbomy9535
2011-11-08 11:19:11 +01:00
Fabien Pinckaers 434b796e04 [IMP] Improved __openerp__ for project_gtd
bzr revid: fp@tinyerp.com-20111108101545-7o5nkn0x69oap9bz
2011-11-08 11:15:45 +01:00
Launchpad Translations on behalf of openerp 2393cbcaab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111108054936-o85vdc79709844pf
bzr revid: launchpad_translations_on_behalf_of_openerp-20111108061220-ayp19sctv6uvxl1u
2011-11-08 06:12:20 +00:00
Fabien Pinckaers 9fd3158961 [IMP] Project TODO, CRM TODO
bzr revid: fp@tinyerp.com-20111107221337-if1e6us8r95jdfel
2011-11-07 23:13:37 +01:00
Fabien Meghazi cda361dc52 [ADD] Added green color for kanban view
bzr revid: fme@openerp.com-20111107174033-l39lqav6tt7zkuw6
2011-11-07 18:40:33 +01:00
Fabien Meghazi 1bfc64477b [IMP] Improved project task kanban view. Changed icon for 'done' state (with al)
bzr revid: fme@openerp.com-20111107173653-2bcsu7w145v5orw6
2011-11-07 18:36:53 +01:00
Quentin (OpenERP) 8d0fbb32be [MERGE] merged the branch from c2c with fix and enhancements of l10n_ch
bzr revid: qdp-launchpad@openerp.com-20111107152256-f3kl3a07delhv1yp
2011-11-07 16:22:56 +01:00
Fabien Meghazi c4a13f1b3e [REM] Removed unused code
bzr revid: fme@openerp.com-20111107144435-k693w21gnmsd0dt5
2011-11-07 15:44:35 +01:00
Fabien Meghazi 6389731d37 [IMP] Refactored form view's buttons
Yuck

bzr revid: fme@openerp.com-20111107134539-ndykhew56v66i218
2011-11-07 14:45:39 +01:00
Quentin (OpenERP) a3d158bc75 [IMP] account: defined a new method to prepare the name to use at the time of journal creation from a res.partner.bank object, in order to increase the possibility of overriding/inheritancy.
bzr revid: qdp-launchpad@openerp.com-20111107124337-x09b8wz6gcxxzer7
2011-11-07 13:43:37 +01:00
Olivier Dony cd18a31aa9 [FIX] project_long_term: another fix in test: today can be a full day of work for the current phase
bzr revid: odo@openerp.com-20111107121536-b21su3ytqu1zfzq0
2011-11-07 13:15:36 +01:00
Quentin (OpenERP) 503a5e8e7f [MERGE] merged a branch containing bad english fixes. Contribution from philu.
bzr revid: qdp-launchpad@openerp.com-20111107113447-jhqvata3fb689c1m
2011-11-07 12:34:47 +01:00
Fabien Meghazi 35a595b272 [MERGE] Kanban refactoring
lp bug: https://launchpad.net/bugs/883552 fixed

bzr revid: fme@openerp.com-20111107104420-gj1zgoxasun8rk19
2011-11-07 11:44:20 +01:00
Fabien Meghazi 36cab85bb7 [IMP] Undefined title groups goes first
lp bug: https://launchpad.net/bugs/883552 fixed

bzr revid: fme@openerp.com-20111107103428-4rvnx25y5oaprya8
2011-11-07 11:34:28 +01:00
Fabien Meghazi 4c9f6991fe [FIX] Avoid concurrent write. Will need multiple rcp calls or multiple write calls
bzr revid: fme@openerp.com-20111107095134-13o9ps3mst790wey
2011-11-07 10:51:34 +01:00
Fabien Meghazi c1c464274f [IMP] Cleaning up
bzr revid: fme@openerp.com-20111107094859-jjosn5djwwg0fe9j
2011-11-07 10:48:59 +01:00
Fabien Meghazi a78137068d [IMP] Improved project tasks kanban view by adding 'sequence' field
bzr revid: fme@openerp.com-20111107093029-c224waaa9toj4yds
2011-11-07 10:30:29 +01:00
Launchpad Translations on behalf of openerp 8af1fb554a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111106052412-g035gs0ux047skr1
2011-11-06 05:24:12 +00:00
Launchpad Translations on behalf of openerp b6defa5269 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105044721-cpdly6yxpvqw3sue
bzr revid: launchpad_translations_on_behalf_of_openerp-20111106052344-2lwwowp57hoag22p
2011-11-06 05:23:44 +00:00
Olivier Dony ea30b379bb [FIX] project_long_term: fix case1 test so it works during week-ends too
bzr revid: odo@openerp.com-20111105164754-yi4mo2pf6yy50ud6
2011-11-05 17:47:54 +01:00
Launchpad Translations on behalf of openerp 6f77ce98c7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105055805-1lmgpe8dot0mqkd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105060437-gd0ilsg6cdytkvq2
2011-11-05 06:04:37 +00:00
Fabien Meghazi 5db3d4e095 [FIX] Fixed folding + state management
bzr revid: fme@openerp.com-20111104212036-yet6hw89633qm7kq
2011-11-04 22:20:36 +01:00
Fabien Meghazi ae080837bf [IMP] Stylize 'Undefined' groups
bzr revid: fme@openerp.com-20111104182619-x7j835y6rxy3o033
2011-11-04 19:26:19 +01:00
Fabien Meghazi fd5416ed0b [ADD] Add drag&drop + resequencing
bzr revid: fme@openerp.com-20111104180512-0awz3mvbsy3pxuai
2011-11-04 19:05:12 +01:00
Quentin (OpenERP) 068b350b02 [MERGE] lp:885299
bzr revid: qdp-launchpad@openerp.com-20111104170023-m15zkt1b4kxtr78v
2011-11-04 18:00:23 +01:00
Olivier Dony ce558209ab [MERGE] Fix for bug 885299: properly manage XML chars escaping in reports in all cases
bzr revid: odo@openerp.com-20111104164222-315uq7my7oa42v8d
2011-11-04 17:42:22 +01:00
Yannick Vaucher 04993a88b0 [MRG] from c2c l10n_ch
bzr revid: yannick.vaucher@camptocamp.com-20111104162624-66v2v28gp0ytnpe8
2011-11-04 17:26:24 +01:00
Quentin (OpenERP) 1097bbeaca [FIX] rml2pdf: _process_text escaping char for xml
lp bug: https://launchpad.net/bugs/885299 fixed

bzr revid: qdp-launchpad@openerp.com-20111104155759-e0tme9o3g1ef00tq
2011-11-04 16:57:59 +01:00
Olivier Dony 44475831b9 [IMP] release: add structured version_info tuple, properly comparable
The semantics were inspired by Python's own sys.version_info

bzr revid: odo@openerp.com-20111104144112-jab9uyt9wnqlziri
2011-11-04 15:41:12 +01:00
niv-openerp de8306897b [fix] synch with lib client to correct some bug
bzr revid: nicolas.vanhoren@openerp.com-20111104113232-jwagh7ptou0mfz8e
2011-11-04 12:32:32 +01:00
niv-openerp 6086fef6b7 [imp] synch with client library
bzr revid: nicolas.vanhoren@openerp.com-20111104105220-c0ftlyr2cq3jhq7g
2011-11-04 11:52:20 +01:00
Launchpad Translations on behalf of openerp 616950dce1 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111104045519-32vjnqdqwo2ekurm
2011-11-04 04:55:19 +00:00
Fabien Meghazi 6be9e5f995 [FIX] Fixed folding
bzr revid: fme@openerp.com-20111103151746-kydjchphdlseuplj
2011-11-03 16:17:46 +01:00