Commit Graph
1231 Commits
Author SHA1 Message Date
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
Antony Lesuisse f8daa47a0a [MERGE] portal, group_user on fields, contact form, default portal menu
bzr revid: al@openerp.com-20120628102942-ja0qtr1eho4z3749
2012-06-28 12:29:42 +02:00
Launchpad Translations on behalf of openerp 997fe404b3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120628044101-cehvpv9yfm3xfsr3
2012-06-28 04:41:01 +00:00
Antonin Bourguignon d8a570a9d7 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120627150256-rc8c78zwhzf4cfhx
2012-06-27 17:02:56 +02:00
Jigar Amin - OpenERP 90094ff19b [FIX] setting cancel link
bzr revid: jam@tinyerp.com-20120627145049-hu0h8x0ui3d74sz0
2012-06-27 20:20:49 +05:30
Antony Lesuisse f17b0eea00 [MERGE] Use Email everywhere
bzr revid: al@openerp.com-20120627131528-u97jw0m7cq2825ll
2012-06-27 15:15:28 +02:00
Jigar Amin - OpenERP 7c645856fe [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120627114052-094g4yequ34sr59d
2012-06-27 17:10:52 +05:30
Antony Lesuisse 5c8eec43bd [MERGE] trunk
bzr revid: al@openerp.com-20120626202324-g3q9tc9uee49lg28
2012-06-26 22:23:24 +02:00
Antonin Bourguignon 48c18a60f3 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120626143915-907g4k2d91iwszld
2012-06-26 16:39:15 +02:00
Jigar Amin - OpenERP 28074752f6 [MERGE] trunk
bzr revid: jam@tinyerp.com-20120626091537-yzqhiwa7fc3rhqnd
2012-06-26 14:45:37 +05:30
Raphael Collet 5e764699c3 [MERGE] trunk-application_setting_cleanup-atp (fix for cancel button on config wizards)
bzr revid: rco@openerp.com-20120626075208-y10gd5kb8qre8hzt
2012-06-26 09:52:08 +02:00
Raphael Collet 0806d443e8 [IMP] config wizards: add an action on button 'Cancel' to get the expected behavior
bzr revid: rco@openerp.com-20120626074946-a1tzebh85ta6v75l
2012-06-26 09:49:46 +02:00
Jigar Amin - OpenERP c2918cf099 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120626040843-do8qlugwmdayqp2z
2012-06-26 09:38:43 +05:30
Raphael Collet 6787048b80 [MERGE] trunk-application_setting_cleanup-atp (clean up config wizards, and adapt forms to new style)
bzr revid: rco@openerp.com-20120625142342-59tc4d9ycozzxalg
2012-06-25 16:23:42 +02:00
Raphael Collet 12ae053fba [IMP] in all config wizards, add class 'oe_highlight_on_dirty' on button 'Apply'
bzr revid: rco@openerp.com-20120625135504-0f03j2j6p7d1pp7l
2012-06-25 15:55:04 +02:00
Jigar Amin - OpenERP d9db3c44df [REN] renamed e-mail, E-mail, E-Mail to email, Email
bzr revid: jam@tinyerp.com-20120625134253-sebauihl53zctcu0
2012-06-25 19:12:53 +05:30
Jigar Amin - OpenERP a973485bc9 [MERGE] lp:~openerp-dev/openobject-addons/trunk-wizard-remove-cancel-editable-tch
bzr revid: jam@tinyerp.com-20120625111519-j8rpvnhb804tl1o1
2012-06-25 16:45:19 +05:30
Twinkle (OpenERP) 0e97cefe9e [IMP]Improve wizard button
bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
2012-06-25 15:39:01 +05:30
Raphael Collet dbafe29d94 [IMP] hr config settings: simplify code
bzr revid: rco@openerp.com-20120625094120-rt7hbkmtlvyhunq1
2012-06-25 11:41:20 +02:00
Sbh (Openerp) 9eb877fee5 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120622084051-mu5wvb8ubinul6gb
bzr revid: sbh@tinyerp.com-20120625090342-b149ncajdnl4a3i6
2012-06-25 14:33:42 +05:30
Raphael Collet d62297df78 [IMP] hr, hr_payroll, hr_recruitment, hr_timesheet_sheet: improve config wizard form
bzr revid: rco@openerp.com-20120625075632-rycdswuz3widi6wb
2012-06-25 09:56:32 +02:00
Jigar Amin - OpenERP 622abf69b3 [MERGE] remove wizard cancel button and make action button red
bzr revid: jam@tinyerp.com-20120625051048-y6mydqljdpysabn1
2012-06-25 10:40:48 +05:30
Jigar Amin - OpenERP 43a50a651b [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041934-v1twcjzbjupl369n
2012-06-25 09:49:34 +05:30
Jigar Amin - OpenERP dfdbf8cf17 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041316-rwtc4zf2pska9t5c
2012-06-25 09:43:16 +05:30
Antonin Bourguignon 3c4c6aaf77 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120622130939-bt6d9nfolgza513t
2012-06-22 15:09:39 +02:00
Quentin (OpenERP) c9ef276770 [REF] search views: removed filter_domain if only one element was inside + made some small usability changes
bzr revid: qdp-launchpad@openerp.com-20120622102959-fhc1oe2w8in8y6v2
2012-06-22 12:29:59 +02:00
Raphael Collet fdca6f9078 [MERGE] from trunk
bzr revid: rco@openerp.com-20120622094140-b9ixp1d85lrxqfwp
2012-06-22 11:41:40 +02:00
Sbh (Openerp) cb0f82149a [MERGE] Merge logger changes
bzr revid: sbh@tinyerp.com-20120622082023-e6ha3w9gadml4uqo
2012-06-22 13:50:23 +05:30
Kuldeep Joshi (OpenERP) 3c50eb017a [IMP] set logging.getLogger(__name__)
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
Purnendu Singh (OpenERP) 1c35eb1049 [MERGE] Mearge with main addons
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
Sbh (Openerp) 434d2ca820 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120622052105-1ucbczumubnd1k4a
2012-06-22 10:51:05 +05:30
Launchpad Translations on behalf of openerp eea8d59604 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120622044730-v8e5fvfsa039ahbf
2012-06-22 04:47:30 +00:00
Jigar Amin - OpenERP a2db2cc18f [MERGE] lp:opebobject-addons
bzr revid: jam@tinyerp.com-20120621050852-ob0sd5c97821gpso
2012-06-21 10:38:52 +05:30
Jigar Amin - OpenERP f7db2ab215 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621044348-3r8ur7izhjriing4
2012-06-21 10:13:48 +05:30
Jigar Amin - OpenERP d145817fb8 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +05:30
Twinkle (OpenERP) 660cc67256 [IMP]Added highlight button on wizard
bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
2012-06-20 16:19:23 +05:30
Randhir Mayatra (OpenERP) e80980330b [USA] replaced red button class oe_form_button_active_flow to oe_highlight
bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
2012-06-20 15:42:05 +05:30
Sbh (Openerp) 2f78f37e17 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120620065331-oprjf5vc24j7gd0o
2012-06-20 12:23:31 +05:30
Jigar Amin - OpenERP 21650f9790 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120619093157-ay1hdzmp8yh8bfgz
2012-06-19 15:01:57 +05:30
Stephane Wirtel f2fba32b56 [REF] Change the CSS classes
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
Sbh (Openerp) 92f7d7eeb6 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120619083005-o5l1jjta610uka2p
2012-06-19 14:00:05 +05:30
Jigar Amin - OpenERP 7fc1b0b25e [MERGE] lp:openpbject-addons
bzr revid: jam@tinyerp.com-20120619061856-eok4a7xmyodeapku
2012-06-19 11:48:56 +05:30
Purnendu Singh (OpenERP) 2e3728db21 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120619050100-26hsypt5z491kbje
2012-06-19 10:31:00 +05:30
Stephane Wirtel 9ed4ca5dca [MERGE] lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp
bzr revid: stw@openerp.com-20120618085532-coxsmpot2dz0er1m
2012-06-18 10:55:32 +02:00
Purnendu Singh (OpenERP) 4395463c57 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120618070239-h6zjmw4hvn3oq543
2012-06-18 12:32:39 +05:30
Launchpad Translations on behalf of openerp 10291e4673 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120616050526-srd8lul8rylb2k80
bzr revid: launchpad_translations_on_behalf_of_openerp-20120617044416-mxknrkegpytqjux4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120616045845-74cddydmo6bilpef
bzr revid: launchpad_translations_on_behalf_of_openerp-20120617043537-yuizdga4lqp4zvl5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120618052727-0zp1kvye3gwpzepo
2012-06-18 05:27:27 +00:00
Sbh (Openerp) cc70376580 [MERGE] Merge with lp:opeobject-addons
bzr revid: sbh@tinyerp.com-20120618044413-deizlis8ln3t3gu0
2012-06-18 10:14:13 +05:30
Turkesh Patel (Open ERP) 8fe6f3c7f0 [IMP] hr: remove cancel button from wizard.
bzr revid: tpa@tinyerp.com-20120615131854-qp6utdyxpockpyf2
2012-06-15 18:48:54 +05:30
Purnendu Singh (OpenERP) 2663cbca6e [MERGE] hr_*: make some improvements and Merge cha branch
bzr revid: psi@tinyerp.com-20120615125750-7yanak6d4282nk4u
2012-06-15 18:27:50 +05:30
Atul Patel (OpenERP) 1b81db66d5 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120615112708-yhfb1eyonr883a6j
2012-06-15 16:57:08 +05:30