Commit Graph

38162 Commits

Author SHA1 Message Date
Divyesh Makwana (Open ERP) dde556db2e [FIX] hr_attendance : timesheet - sign in - out : must not allow overlaps
bzr revid: mdi@tinyerp.com-20111114122823-7ehd1axt0l0b2euz
2011-11-14 17:58:23 +05:30
Raphael Collet 7cc8e12c10 [MERGE] lp:871684
bzr revid: rco@openerp.com-20111109090129-wb22moftduygcz9i
2011-11-09 10:01:29 +01:00
Raphael Collet 90e75a3920 [MERGE] lp:872245
bzr revid: rco@openerp.com-20111109082248-7z2e459oc2zvp263
2011-11-09 09:22:48 +01:00
Launchpad Translations on behalf of openerp bc1e0a51de Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111109050947-pt1734w6fs8zrq6z
2011-11-09 05:09:47 +00:00
Antony Lesuisse 80257ecb89 [FIX] project demo data
bzr revid: al@openerp.com-20111109014338-5w86vhjpcsz59dre
2011-11-09 02:43:38 +01:00
Antony Lesuisse 35c1459e2e [FIX] procurement product uom prefix
bzr revid: al@openerp.com-20111108232206-kvf2wgh44cltgpo1
2011-11-09 00:22:06 +01:00
Antony Lesuisse 2e2042c510 [IMP] hr hierarchy view, rename payslip run into batches
bzr revid: al@openerp.com-20111108230027-uj9bgwyhtil6ve7u
2011-11-09 00:00:27 +01:00
Antony Lesuisse a206306d23 [MERGE] polish1 (stw)
bzr revid: al@openerp.com-20111108225914-4ivtczbmyqk96na7
2011-11-08 23:59:14 +01:00
Fabien Pinckaers 3d9b149dcc [imp] merge + cleaning: contract managemeent, not perfect yet, but good enough -> to replace static email one day
bzr revid: fp@tinyerp.com-20111108225337-5muyehnvgqasv44i
2011-11-08 23:53:37 +01:00
Antony Lesuisse 59ca0770d4 [MERGE] polish1 (stw)
bzr revid: al@openerp.com-20111108223621-nla01e2csohbbggb
2011-11-08 23:36:21 +01:00
Antony Lesuisse e199c8fc9d [IMP] add target inline add usage tooltip
bzr revid: al@openerp.com-20111108215555-8ub8bo01lbw7e2e2
2011-11-08 22:55:55 +01:00
Fabien Pinckaers 12c3743fb8 fix
bzr revid: fp@tinyerp.com-20111108213314-fhpcr940alkilsad
2011-11-08 22:33:14 +01:00
Fabien Pinckaers 4fb8b80dec [IMP] remove unused and not clean wizard -> implemented by sale invoicing
bzr revid: fp@tinyerp.com-20111108212642-4ttsq20rmijj5ocq
2011-11-08 22:26:42 +01:00
Fabien Pinckaers 5785600c82 [FIX] config wizard fetchmail default values and tips
bzr revid: fp@tinyerp.com-20111108211320-j5lad04sy8e8djyj
2011-11-08 22:13:20 +01:00
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