Commit Graph
857 Commits
Author SHA1 Message Date
Quentin (OpenERP) e6ef77b047 [MERGE] hr review of form views
bzr revid: qdp-launchpad@openerp.com-20120705092921-0edv4n7z0392ia83
2012-07-05 11:29:21 +02:00
Sanjay Gohel (Open ERP) 900081de80 [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120704125902-wf202qb5p14iew7n
2012-07-04 18:29:02 +05:30
Quentin (OpenERP) 66922c7199 [IMP] code review
bzr revid: qdp-launchpad@openerp.com-20120703155843-awb230fppn22wbs1
2012-07-03 17:58:43 +02:00
Kuldeep Joshi (OpenERP) 36b05a7194 [MERGE] lp:openobject-addons
bzr revid: kjo@tinyerp.com-20120702091329-mur9imoo2v6tb4hc
2012-07-02 14:43:29 +05:30
Amit Patel (OpenERP) 5260efe702 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120629124820-aec88wzcrvm6xps4
2012-06-29 18:18:20 +05:30
Quentin (OpenERP) 6fe94bd4bc [MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00
Kuldeep Joshi (OpenERP) 8407f04694 [IMP] Reporting menu change
bzr revid: kjo@tinyerp.com-20120629104326-1x1ojw0xfegodhm4
2012-06-29 16:13:26 +05:30
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
2012-06-28 12:10:05 +05:30
Pinakin Nayi (OpenERP) e65b5db25a [IMP]reporting-checker-wizards-menus
bzr revid: pna@tinyerp.com-20120627115613-e6q3wh7428b217e6
2012-06-27 17:26:13 +05:30
Jigar Amin - OpenERP 7c645856fe [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120627114052-094g4yequ34sr59d
2012-06-27 17:10:52 +05:30
Amit Patel (OpenERP) 6dad1c7e3e [MERGE]
bzr revid: apa@tinyerp.com-20120627050643-zdfu7r9kfrasx5z4
2012-06-27 10:36:43 +05:30
Amit Patel (OpenERP) 9175b5008e [IMP]:hr_expense:improved expense line view
bzr revid: apa@tinyerp.com-20120625085527-g33k4hwd94gs1dy9
2012-06-25 14:25:27 +05:30
Amit Patel (OpenERP) 3c7cd469e6 [MERGE]
bzr revid: apa@tinyerp.com-20120622090553-lkvmsz12ooao1lug
bzr revid: apa@tinyerp.com-20120625050407-vfjnqgnqexrfvr8d
2012-06-25 10:34:07 +05:30
Amit Patel (OpenERP) 5e12f8dbf6 [MERGE]
bzr revid: apa@tinyerp.com-20120625045019-86qrhmewdodwbbis
2012-06-25 10:20:19 +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
Purnendu Singh (OpenERP) 55633a22a2 [REF] search views: removed filterr_domain if only one element was inside
bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
2012-06-22 16:42:51 +05:30
Amit Patel (OpenERP) bbdbb9dd6b [MERGE]
bzr revid: apa@tinyerp.com-20120622060031-pp85k3ezxboev0it
2012-06-22 11:30:31 +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
Sanjay Gohel (Open ERP) 252ad631ad [MERGE]merge with addons trunk
bzr revid: sgo@tinyerp.com-20120621113637-d66sg08zyjlb3lgr
2012-06-21 17:06:37 +05:30
Raphael Collet d17d438405 [MERGE] trunk-review-dashboards (reorganize dashboards in menu Reporting)
bzr revid: rco@openerp.com-20120621101007-g8bvaxwfh86t47ng
2012-06-21 12:10:07 +02:00
Sanjay Gohel (Open ERP) 5b6c2985f7 [IMP]improve and clean hr_expense
bzr revid: sgo@tinyerp.com-20120621090602-m72nm166odf8h05k
2012-06-21 14:36:02 +05:30
Jigar Amin - OpenERP 501721883d [USB] removed useless class defination
bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
2012-06-21 12:39:59 +05:30
Launchpad Translations on behalf of openerp 6e30c1323d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120621052527-r3t1oxcolviiii4x
2012-06-21 05:25:27 +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
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
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) 4395463c57 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120618070239-h6zjmw4hvn3oq543
2012-06-18 12:32:39 +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
Quentin (OpenERP) 32a02b3565 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120615103015-fnwuprhnc47ujq4d
2012-06-15 12:30:15 +02:00
Turkesh Patel (Open ERP) 3e3d7726bb [IMP] hr_expense: improved color of button based on business flow
bzr revid: tpa@tinyerp.com-20120615065551-gm5pe0zzsvfepyra
2012-06-15 12:25:51 +05:30
Turkesh Patel (Open ERP) 65c5d7afa0 [IMP] hr_expanse: improved color of button based on business flow
bzr revid: tpa@tinyerp.com-20120614060302-jeqf15pkqmh3r89u
2012-06-14 11:33:02 +05:30
Ajay Chauhan (OpenERP) 6db119b7d8 [IMP]hr_* : improve search code in xml
bzr revid: cha@tinyerp.com-20120613124157-z5zpn42aao3w3cf2
2012-06-13 18:11:57 +05:30
Sbh (Openerp) 234084df87 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120612105345-d10lp54bywb7y7oz
2012-06-12 16:23:45 +05:30
Amit Patel (OpenERP) deec2bda0d [MERGE]:resolved conflicts and merged with trunk
bzr revid: apa@tinyerp.com-20120612063539-japenzf86hh59541
2012-06-12 12:05:39 +05:30
Jigar Amin - OpenERP c6d029b263 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120612050628-2la1082qfg9sb0g5
2012-06-12 10:36:28 +05:30
Quentin (OpenERP) 204ce4380a [MERGE] merged with the trunk
bzr revid: qdp-launchpad@openerp.com-20120611124211-kf741tkd3gdsp3ep
2012-06-11 14:42:11 +02:00
Fabien Pinckaers 3c8643ce4c [IMP] better form views, new guidelines
bzr revid: fp@tinyerp.com-20120609143904-ydwqfyb54atbcpvw
2012-06-09 16:39:04 +02:00
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
Purnendu Singh (OpenERP) cfce82898b [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120605122830-r3o25y55lzo0o73n
bzr revid: psi@tinyerp.com-20120606103845-w2jftpw5jw706pgo
2012-06-06 16:08:45 +05:30
Amit Patel (OpenERP) 317a25b34e [MERGE]
bzr revid: apa@tinyerp.com-20120606095311-7px6hn7fcdeblkc9
2012-06-06 15:23:11 +05:30
Turkesh Patel (Open ERP) 830ca22dca [IMP] hr_expanse:remove unnecessary code
bzr revid: tpa@tinyerp.com-20120606084417-rxit2qq4nw3x3vx3
2012-06-06 14:14:17 +05:30
ara@tinyerp.com b71c7c244d [MERGE] merge with parent brnach
bzr revid: ara@tinyerp.com-20120605072734-eqg19sd93rj5yftg
2012-06-05 12:57:34 +05:30
Fabien Pinckaers 48f8823bad [IMP] replaced all oe_form_topbar with the new <header> style
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
Fabien Pinckaers 623fd428bd [IMP] xml of topbars, removed oe_right, oe_clear
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Amit Patel (OpenERP) a5604d2cfa [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120604085217-ntsulc7zrujp6efc
2012-06-04 14:22:17 +05:30
Divyesh Makwana (Open ERP) e98eb11510 [Merge] Merge with main branch.
bzr revid: mdi@tinyerp.com-20120601094937-575f84vxwljlgkpv
bzr revid: mdi@tinyerp.com-20120601123900-0ozu8nlq02upa8xb
bzr revid: mdi@tinyerp.com-20120601124121-oz0cr3gv4acejs7b
2012-06-01 18:11:21 +05:30
Sanjay Gohel (Open ERP) 929cf6d2a6 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120531073324-y93wiwdrxsq7bhm7
2012-05-31 13:03:24 +05:30
Launchpad Translations on behalf of openerp 35962e14c7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120530052141-q5f1v0sy78otub9z
bzr revid: launchpad_translations_on_behalf_of_openerp-20120531045446-04uliakw3b3goo8z
bzr revid: launchpad_translations_on_behalf_of_openerp-20120601053333-oz6dl9s9bsla52ld
2012-06-01 05:33:33 +00:00
Ajay Chauhan (OpenERP) bdeb623399 [IMP]: resolved all conflicts
bzr revid: cha@tinyerp.com-20120530133024-ex0xf9142j8cn34o
2012-05-30 19:00:24 +05:30
Sanjay Gohel (Open ERP) 11bf57f1bf [IMP]add expense line and add depend expense of hr in contract for calculation
bzr revid: sgo@tinyerp.com-20120530125641-w27mjp97b981yrpd
2012-05-30 18:26:41 +05:30