Commit Graph
3266 Commits
Author SHA1 Message Date
Antony Lesuisse 03f7eb10f4 [FIX] remove semantic part2
bzr revid: al@openerp.com-20120906104624-sq3cd652vevmij6c
2012-09-06 12:46:24 +02:00
Amit Patel (OpenERP) 1334eb7a0d [MERGE]:trunk-mail-cleaning-fp
bzr revid: apa@tinyerp.com-20120906061835-gb317yvqnd5vaiei
2012-09-06 11:48:35 +05:30
Jigar Amin - OpenERP fe4a5505a7 Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120906044435-d33sozj9654dcm8m
2012-09-06 10:14:35 +05:30
Olivier Dony 41e16c6592 [MERGE] sync with trunk
bzr revid: odo@openerp.com-20120905163135-9f6q0ghri1kq6z75
2012-09-05 18:31:35 +02:00
Raphael Collet 3e9e129dd0 [MERGE] trunk-access-ui-jam (do not display some Edit/Delete buttons when user has no corresponding access rights)
bzr revid: rco@openerp.com-20120905093505-8gyb5qwta0icssko
2012-09-05 11:35:05 +02:00
Sanjay Gohel (Open ERP) 9d871c5036 [MERGE][IMP]merge with mail-cleaning-fp and improve code
bzr revid: sgo@tinyerp.com-20120905093255-gs4vbp3gxav6iutt
2012-09-05 15:02:55 +05:30
Ajay Chauhan (OpenERP) 29b4e07e09 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120905092925-w14dvgxgunzefvz1
2012-09-05 14:59:25 +05:30
Ajay Chauhan (OpenERP) 8a28d99783 [IMP] removed groups from fields which we made invisible
bzr revid: cha@tinyerp.com-20120905091856-a9i3yns577p871hv
2012-09-05 14:48:56 +05:30
niv-openerp bc586f2efe merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20120905081314-uu3khdpohgz23j6q
2012-09-05 10:13:14 +02:00
Olivier Dony 2160072508 [MERGE] sync with trunk
bzr revid: odo@openerp.com-20120905073134-v1j98vzvmwe6a72i
2012-09-05 09:31:34 +02:00
Sanjay Gohel (Open ERP) 7044dd54fe [MERGE][IMP]made changes and mmerged lp:~openerp-dev/openobject-addons/trunk-message-sub-type-apa-demo_project-rma
bzr revid: sgo@tinyerp.com-20120905061645-znnsnsr0fziosj41
2012-09-05 11:46:45 +05:30
Ajay Chauhan (OpenERP) b2485b147e [IMP] revert the changes in domain with one change
bzr revid: cha@tinyerp.com-20120905055627-3r4ivpcqv4zxc2r3
2012-09-05 11:26:27 +05:30
Jigar Amin - OpenERP 8c0c5b9e4a Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120905043513-ibrc4hoe2uptpfr5
2012-09-05 10:05:13 +05:30
Antony Lesuisse 709331f682 [MERGE] remove unneeded demo users
bzr revid: al@openerp.com-20120905001533-fz1htj832djequ6p
2012-09-05 02:15:33 +02:00
Fabien Pinckaers 84d1bd4351 [iMP] task form
bzr revid: fp@openerp.com-20120904215742-gdw8dcuc73qgb2id
2012-09-04 23:57:42 +02:00
niv-openerp 76031179e4 fix
bzr revid: nicolas.vanhoren@openerp.com-20120904164153-iu7grb5rvv2f6gxv
2012-09-04 18:41:53 +02:00
niv-openerp 5126f6ff6e wip
bzr revid: nicolas.vanhoren@openerp.com-20120904163725-ptsij09rve8j3txs
2012-09-04 18:37:25 +02:00
Raphael Collet 570f76fa9a [IMP] rename method _is_action_enabled to is_action_enabled
bzr revid: rco@openerp.com-20120904141204-oqykdxnwb9yf3itc
2012-09-04 16:12:04 +02:00
Ajay Chauhan (OpenERP) 4dc1a363f0 [IMP] project: made state field invisible in form & tree view & deleted from search view
bzr revid: cha@tinyerp.com-20120904125233-lq4wh9epkteom0z3
2012-09-04 18:22:33 +05:30
Jigar Amin - OpenERP bc8b0d88d3 Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120904123028-qskoxfxm1708rivr
2012-09-04 18:00:28 +05:30
Amit Patel (OpenERP) 0a5ebb52e1 [MERGE]:trunk-mail-cleaning-fp
bzr revid: apa@tinyerp.com-20120904104409-w9zl98qjpem10pan
2012-09-04 16:14:09 +05:30
Ajay Chauhan (OpenERP) cccbe77b77 [IMP] hr_recruitment, project, project_issue: made some little changes in domain for field 'stage_id'
bzr revid: cha@tinyerp.com-20120904102212-ccxp2ik0r5kp3vc3
2012-09-04 15:52:12 +05:30
Thibault Delavallée fdfaa0f5cf [REF] project_mailgate: moved content of project_mailgate (basically message_new and message_update overrides, and a now dead message_thread_followers) into project. Removed project_mailgate module.
bzr revid: tde@openerp.com-20120904092938-fmesjk7cwzxa3s0h
2012-09-04 11:29:38 +02:00
Randhir Mayatra (OpenERP) 61118d7847 [IMP] add subtype data into project and project_issue module
bzr revid: rma@tinyerp.com-20120904085626-klbtc8hrrksi4gy9
2012-09-04 14:26:26 +05:30
Thibault Delavallée 48c081f271 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
Divyesh Makwana (Open ERP) 28d0d2a887 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120903130743-2en32n3zo73n19dj
2012-09-03 18:37:43 +05:30
Fabien Pinckaers 2a980a13f6 [IMP] grey background for projects
bzr revid: fp@tinyerp.com-20120903121016-4d4fm4q976c3ha9d
2012-09-03 14:10:16 +02:00
Amit Patel (OpenERP) 13659d0590 [MERGE]:trunk-mail-cleaning-fp
bzr revid: apa@tinyerp.com-20120903100634-qxrkrpnpon10s44i
2012-09-03 15:36:34 +05:30
Tejas Tank f39f799897 Fix: Account configuration : removed currency group.
bzr revid: tta@openerp.com-20120903095908-tswt6gi2zl5w89s2
2012-09-03 15:29:08 +05:30
Ajay Chauhan (OpenERP) c895c53341 [IMP] crm, project, hr_recruitment: made stages accute on view according to state
bzr revid: cha@tinyerp.com-20120903093127-vao5eoi61is1pqfx
2012-09-03 15:01:27 +05:30
Thibault Delavallée 6fa349a4eb [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
Jigar Amin - OpenERP 9fb0a6d190 Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120903050501-0j9qk8rxs6gat7gr
2012-09-03 10:35:01 +05:30
Cecile Tonglet 7fc09a8298 .
bzr revid: cto@openerp.com-20120831172538-2lp2sv2g6g5lh9n0
2012-08-31 19:25:38 +02:00
Cecile Tonglet 4da6c7b2bc [FIX] make tests works
bzr revid: cto@openerp.com-20120831165521-6h5q0r2abgt0nlpt
2012-08-31 18:55:21 +02:00
Cecile Tonglet 67da3486c7 [IMP] Remove demo users
bzr revid: cto@openerp.com-20120831163350-gfi23hw34ltw7v5o
2012-08-31 18:33:50 +02:00
Raphael Collet 52103c8535 [MERGE] from trunk
bzr revid: rco@openerp.com-20120831144835-4jrg3uu04ysgzuqf
2012-08-31 16:48:35 +02:00
Stephane Wirtel 1eac0fbe52 [REF] Replace the user id 1 by openerp.SUPERUSER_ID
bzr revid: stw@openerp.com-20120831135136-8k2wjeiixqt6tnkr
2012-08-31 15:51:36 +02:00
Sanjay Gohel (Open ERP) f99095ecd0 [MERGE]merge with mail-cleaning-fp n resolve conflicts
bzr revid: sgo@tinyerp.com-20120831090308-2k6uj5iy3tds1wm5
2012-08-31 14:33:08 +05:30
Thibault Delavallée c14a11482c [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
Ajay Chauhan (OpenERP) 5af24918fd [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120831051739-95um0c4jj4ir96nt
2012-08-31 10:47:39 +05:30
Sanjay Gohel (Open ERP) 18d606a794 [MERGE]merge mail-cleaning-fp and change in mail message
bzr revid: sgo@tinyerp.com-20120831050230-opnug0owd3o1ucaf
2012-08-31 10:32:30 +05:30
Jigar Amin - OpenERP 613bc06d2f Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120831043558-wmrb39pm7khdcx9a
2012-08-31 10:05:58 +05:30
Olivier Dony 1dce0b1dc4 [FIX] all mail dependencies: replace message_post call by normal record + review misc wording
bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
2012-08-30 16:18:52 +02:00
Jigar Amin - OpenERP 990951b01c Merge lp:~openerp-dev/openobject-addons/trunk-addons7-mrp-tch
bzr revid: jam@tinyerp.com-20120830124912-ub9nwl4ukklcnfqi
2012-08-30 18:19:12 +05:30
Twinkle Christian (OpenERP) 69af96255b [IMP]In stage object replace state to status
bzr revid: tch@tinyerp.com-20120830124359-yidn3iwmcq2ubnal
2012-08-30 18:13:59 +05:30
Twinkle Christian (OpenERP) 7c632f13c5 [IMP]In stage object replace state to status
bzr revid: tch@tinyerp.com-20120830121804-xcem0nccdmz50f3c
2012-08-30 17:48:04 +05:30
Twinkle Christian (OpenERP) e6136314ee [IMP]Replace category to tag
bzr revid: tch@tinyerp.com-20120830121256-kpgxk6spojucj96e
2012-08-30 17:42:56 +05:30
Sanjay Gohel (Open ERP) 91c022497b [MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-mail-cleaning-fp and done changes as needed
bzr revid: sgo@tinyerp.com-20120830112426-15b9jere67yyoa3q
2012-08-30 16:54:26 +05:30
Fabien Pinckaers 1c7213ab41 imp
bzr revid: fp@tinyerp.com-20120830075118-39gdhfw1zhnc6lqk
2012-08-30 09:51:18 +02:00
Fabien Pinckaers 8b0f2cfd71 [IMP] cleaning project/contracts and removing unused code
bzr revid: fp@tinyerp.com-20120830074903-m8yiovofd2891p7i
2012-08-30 09:49:03 +02:00