Commit Graph
43431 Commits
Author SHA1 Message Date
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
Quentin (OpenERP) 9fbbfbb995 [MERGE] merged with main addons trunk + few small changes
bzr revid: qdp-launchpad@openerp.com-20111108165534-xr6vp1yk2rm2wxi8
2011-11-08 17:55:34 +01:00
niv-openerp 75b5fb12bf [imp] nivified NumpadView
bzr revid: nicolas.vanhoren@openerp.com-20111108163824-scthlsj4ej2z5pp2
2011-11-08 17:38:24 +01:00
Christophe Simonis 2ea47dc3b2 merge upstream
bzr revid: chs@openerp.com-20111108163644-8mlg48lua376lzgg
2011-11-08 17:36:44 +01:00
niv-openerp b742a2fbef [merge]
bzr revid: nicolas.vanhoren@openerp.com-20111108162244-1x4yappursemha5k
2011-11-08 17:22:44 +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
DBR (OpenERP) ebc3652060 [IMP] sale: improve code for invoice
bzr revid: dbr@tinyerp.com-20111108133024-5oqu0pikmcj4b6ko
2011-11-08 19:00:24 +05:30
Vidhin Mehta (OpenERP) aa76238916 [imp]inheritance view with qweb and removed extra objects of dataset class.
bzr revid: vme@tinyerp.com-20111108133014-4iejcy699w1jy5zu
2011-11-08 19:00:14 +05:30
Ujjvala Collins (OpenERP) 216d028ad6 [IMP] crm_profiling: Converted Open Questionnaire wizard to osv_memory wizard.
bzr revid: uco@tinyerp.com-20111108133012-wjqhjrif02h18oxh
2011-11-08 19:00:12 +05:30
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
Yogesh (OpenERP) bd210bf9d0 [IMP] vieweditor:- code refactor.
bzr revid: ysa@tinyerp.com-20111108132943-0wcjjnjfrsx5l0of
2011-11-08 18:59:43 +05:30
Hardik Ansodariy (OpenERP) 3153e32474 [imp] improved demo data of hr department
bzr revid: han@tinyerp.com-20111108132750-ah8u6b9th2gx5wb7
2011-11-08 18:57:50 +05:30
Bharat (OpenERP) e188f9bd72 [FIX] account : invoice - incoherence between base amount and untaxed amount
lp bug: https://launchpad.net/bugs/887367 fixed

bzr revid: bde@tinyerp.com-20111108132648-lunqaa408axj1gau
2011-11-08 18:56:48 +05:30
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
Yogesh (OpenERP) d7213de315 [IMP] Vieweditor:- improve xml of edit node view editor and init method of widget class
bzr revid: ysa@tinyerp.com-20111108130327-iozuye9ll7tgb2pq
2011-11-08 18:33:27 +05:30
Tejas (OpenERP) 4db6a98df4 search_default_current remove from hr recruitement action
bzr revid: tta@openerp.com-20111108124004-c97qpz0h23kcksqo
2011-11-08 18:10:04 +05:30
Amit Bhavsar (Open ERP) b82cca5d13 [hr_holidays],Rename the menu Holidays into Leaves
bzr revid: amb@tinyerp.com-20111108123436-9h2end17gu55m8pf
2011-11-08 18:04:36 +05:30
Yogesh (OpenERP) 0cc4dd945b [MERGE] vieweditor :- implement edit node functionality.
bzr revid: ysa@tinyerp.com-20111108122322-ng34rzh1ckliyy6q
2011-11-08 17:53:22 +05:30
Kirti Savalia (OpenERP) 0824fe1a73 [IMP]:add the conetext
bzr revid: ksa@tinyerp.com-20111108121017-aa1papmlhb8hz97c
2011-11-08 17:40:17 +05:30
ron@tinyerp.com cf3c4d24cc [IMP] marketing_campaign_crm_demo: Improved demo data of Campaing on active mode
bzr revid: ron@tinyerp.com-20111108120826-niki9oul07sdnl8q
2011-11-08 17:38:26 +05:30
Olivier Dony dc844d92b6 [IMP] edi: cleanup comments, copyright years, etc.
bzr revid: odo@openerp.com-20111108120754-vzhmszqy02a4ovkt
2011-11-08 13:07:54 +01:00
Tejas (OpenERP) 2c181e1a1f [hr-timesheet-sheet]add no_leaf for the group_by
bzr revid: tta@openerp.com-20111108115436-bmakqjd8cpd1v185
2011-11-08 17:24:36 +05:30