Commit Graph

28923 Commits

Author SHA1 Message Date
Antony Lesuisse 45be4946a9 [MERGE] project data demo, remove some useless tasks, add stages
bzr revid: al@openerp.com-20111108210338-0wm9d306v17fz4qf
2011-11-08 22:03:38 +01:00
Fabien Pinckaers fa6ef2be68 merge
bzr revid: fp@tinyerp.com-20111108204442-g0r5cx76yguwj6gy
2011-11-08 21:44:42 +01:00
Antony Lesuisse 080a699226 [MERGE] mrp order add responsible
bzr revid: al@openerp.com-20111108203303-moblgn7wsv00pvo0
2011-11-08 21:33:03 +01:00
Fabien Pinckaers a7ccc70902 merge
bzr revid: fp@tinyerp.com-20111108202204-22z34101zmgv7w67
2011-11-08 21:22:04 +01:00
Fabien Pinckaers 6bae030b9d merge
bzr revid: fp@tinyerp.com-20111108201814-mxod3pcv2voze6ua
2011-11-08 21:18:14 +01:00
Fabien Pinckaers db7062280f [IMP] Asset category demo - merge
bzr revid: fp@tinyerp.com-20111108201425-mlrzb7xh2sj7hwe9
2011-11-08 21:14:25 +01:00
Fabien Pinckaers ed9b3abd9e merge
bzr revid: fp@tinyerp.com-20111108194449-jmw4u25afmg2kx9x
2011-11-08 20:44:49 +01:00
Antony Lesuisse 0fb7d6bdf1 [MERGE] partner manager only need read rights on crm lead
bzr revid: al@openerp.com-20111108194043-u9a1sqokxl69r6i6
2011-11-08 20:40:43 +01:00
Olivier Dony e6121de531 [MERGE] crm: fix for bug 877978
bzr revid: odo@openerp.com-20111108173548-9fu29ecc74o0v3eo
2011-11-08 18:35:48 +01:00
Olivier Dony cb12bf5b67 [MERGE] users_ldap: Refactoring/Cleanup towards more modularity, courtesy of Stefan Rijnhart (Therp)
bzr revid: odo@openerp.com-20111108172356-1sp85chucpykkn1u
2011-11-08 18:23:56 +01:00
Fabien Meghazi dde0c25926 [IMP] Improved project.task kanban view. Correct set_remaining_time* functions
bzr revid: fme@openerp.com-20111108170308-9r0f9e65srxq7sr7
2011-11-08 18:03:08 +01:00
Fabien Meghazi 66f71407f2 [FIX] Fixed kanban aggregates. Added kanban_states support. Added colors
bzr revid: fme@openerp.com-20111108165817-0ae7bp7ulfv3pn3d
2011-11-08 17:58:17 +01:00
niv-openerp a9c17d03d5 [imp] improvements related to pos
bzr revid: nicolas.vanhoren@openerp.com-20111108162153-1dmhodcgu1emlxs0
2011-11-08 17:21:53 +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
niv-openerp 2e0bb35d3e [fix] problem with "orders", showed multiple ones when closing and reopening pos
bzr revid: nicolas.vanhoren@openerp.com-20111107173417-6fqs4ddsnp1wn0gp
2011-11-07 18:34:17 +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
niv-openerp db36bc97b4 [fix] categories were broken
bzr revid: nicolas.vanhoren@openerp.com-20111107141323-zmariwqu0qns3bcm
2011-11-07 15:13:23 +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
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