Commit Graph

342 Commits

Author SHA1 Message Date
Jigar Amin - OpenERP d145817fb8 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +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
Stephane Wirtel f2fba32b56 [REF] Change the CSS classes
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
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
Divyesh Makwana (Open ERP) 1fce603c66 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120613094849-yzcf7073kgiq93rh
bzr revid: mdi@tinyerp.com-20120615050845-dp6wxcvs8xx8g3d3
2012-06-15 10:38:45 +05:30
Raphael Collet 818db0ef6c [MERGE] from trunk
bzr revid: rco@openerp.com-20120614143107-rtnb6tzd6a5hlwm8
2012-06-14 16:31:07 +02:00
Turkesh Patel (Open ERP) 8f92b3629e [IMP] hr_holidays: improved color of button based on business flow
bzr revid: tpa@tinyerp.com-20120614061721-zv77j4c9poykkmvr
2012-06-14 11:47:21 +05:30
Jigar Amin - OpenERP 1168d166ac [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120613041317-kk00huj7sfos32co
bzr revid: jam@tinyerp.com-20120614034836-va36i3mwbe3gpud4
2012-06-14 09:18:36 +05:30
Raphael Collet faad7a978a [IMP] hr_holidays: improve English, and fix a few views
bzr revid: rco@openerp.com-20120613142605-vbw88dogd8n83ru7
2012-06-13 16:26:05 +02:00
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
Raphael Collet 15e2795879 [IMP] hr, hr_holiday: put last_login and leave_type together in employee kanban
bzr revid: rco@openerp.com-20120612142808-bkm8hbgnw44cwh15
2012-06-12 16:28:08 +02:00
Raphael Collet 357db69ff8 [IMP] hr_holiday: remove hidden fields from form view
bzr revid: rco@openerp.com-20120612141736-wh9bjxjzs2ep6obr
2012-06-12 16:17:36 +02:00
Raphael Collet f9b3e87ddf [FIX] hr_holiday: fix current leave element in kanban view of employee
bzr revid: rco@openerp.com-20120612141026-ygrcbfy6yfy19iw9
2012-06-12 16:10:26 +02:00
Sbh (Openerp) 234084df87 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120612105345-d10lp54bywb7y7oz
2012-06-12 16:23:45 +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
Mayur Maheshwari (OpenERP) a1cdf8f67c [MERGE] merge with main addons
bzr revid: mma@tinyerp.com-20120611124531-k0nkhqn0513ndmej
2012-06-11 18:15:31 +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 9a7573dd7f [IMP] removing layout="manual"
bzr revid: fp@tinyerp.com-20120611090701-57jr0v6oxnbuocwc
2012-06-11 11:07:01 +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
Sbh (Openerp) ba02676837 [MERGE]
bzr revid: sbh@tinyerp.com-20120608081300-yg4stmqa2af7275h
2012-06-08 13:43:00 +05:30
Kuldeep Joshi (OpenERP) 8a670326ab [IMP]hr_holidays: link meeting to leave request
bzr revid: kjo@tinyerp.com-20120608063755-vviuq755hjl52c8n
2012-06-08 12:07:55 +05:30
Fabien Pinckaers 001d2e84c9 [IMP] form views
bzr revid: fp@tinyerp.com-20120607173007-1kihroun2dbacq1c
2012-06-07 19:30:07 +02:00
Kuldeep Joshi (OpenERP) 6fc261d231 [IMP]hr:change report name and Leave instead of Holiday
bzr revid: kjo@tinyerp.com-20120607132146-gs9m2famzymlsq1f
2012-06-07 18:51:46 +05:30
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
Turkesh Patel (Open ERP) 05337fa8e7 [IMP] hr_holidays:remove unnecessary code
bzr revid: tpa@tinyerp.com-20120606085825-mam2fm5lxbzm4lba
2012-06-06 14:28:25 +05:30
Mayur Maheshwari (OpenERP) 892ed6691a [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120606061239-gmgiybdoja72rb4j
2012-06-06 11:42:39 +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
Divyesh Makwana (Open ERP) dff4b2f2a0 [Merge] Merge with main branch.
bzr revid: mdi@tinyerp.com-20120604063834-jbfyvot5fjvc4pz7
2012-06-04 12:08:34 +05:30
Thibault Delavallée 2a2ab5fd4d [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120601135532-dz42z4bfnp83kh6s
2012-06-01 15:55:32 +02:00
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
Thibault Delavallée cd19f68eb9 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120601113625-c9w0kmnw1dzvjswx
2012-06-01 13:36:25 +02:00
Ajay Chauhan (OpenERP) bdeb623399 [IMP]: resolved all conflicts
bzr revid: cha@tinyerp.com-20120530133024-ex0xf9142j8cn34o
2012-05-30 19:00:24 +05:30
Purnendu Singh (OpenERP) b68e86b89c [IMP] hr_holidays: small improvemnt in kanban or employee
bzr revid: psi@tinyerp.com-20120530122912-vqzv3q39yvdxj7qm
2012-05-30 17:59:12 +05:30
Divyesh Makwana (Open ERP) 7a7661fa79 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120530052856-dk8mfa6h6i5shs95
2012-05-30 10:58:56 +05:30
Mayur Maheshwari (OpenERP) 136e453e1d [MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120529125227-gdu1kao0kjcxviv8
2012-05-29 18:22:27 +05:30
Mayur Maheshwari (OpenERP) 3be6d4ef09 [IMP]hr: Improve employee view kanban and leaves management
bzr revid: mma@tinyerp.com-20120529124748-l4nqh230k9zat6yq
2012-05-29 18:17:48 +05:30
Divyesh Makwana (Open ERP) d18cb96c97 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120528062205-ukjcxs41f917dsk2
2012-05-28 11:52:05 +05:30
Ajay Chauhan (OpenERP) 47cc03c954 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20120523111541-o1o60ncctasc5t41
2012-05-23 16:45:41 +05:30
Ajay Chauhan (OpenERP) 7418558d1d [IMP] : removed button from tree
bzr revid: cha@tinyerp.com-20120523110047-3403esloff9i98ki
2012-05-23 16:30:47 +05:30
Divyesh Makwana (Open ERP) a61bdccb23 [IMP] hr_holidays : Rename 'Approved' into 'Validate'.
bzr revid: mdi@tinyerp.com-20120523092828-vmigxxqv71zqhx4l
2012-05-23 14:58:28 +05:30
Divyesh Makwana (Open ERP) bd9a28164e [IMP] hr_holidays : Rename 'Approved' into 'Validate'.
bzr revid: mdi@tinyerp.com-20120523092601-9zvf1ly3ndjh9n8f
2012-05-23 14:56:01 +05:30
Purnendu Singh (OpenERP) 99110a63e0 [MERGE] merge with main addong
bzr revid: psi@tinyerp.com-20120523065342-zqted3y2ke5kq7fo
2012-05-23 12:23:42 +05:30
Sbh (Openerp) 1bc1b8817e [MERGE] Merge with lp:openobject-adddons
bzr revid: sbh@tinyerp.com-20120523045707-rxt3uirdycmb3bxj
2012-05-23 10:27:07 +05:30
Fabien Pinckaers 5c791531aa [IMP] improved typos
bzr revid: fp@tinyerp.com-20120522161055-6013qr1s4p773hoj
2012-05-22 18:10:55 +02:00
Fabien Pinckaers 84d7f79b97 [IMP] view hr
bzr revid: fp@tinyerp.com-20120522145654-su2hud7tjoglo0bl
2012-05-22 16:56:54 +02:00
Fabien Pinckaers 2bce6d97d7 [IMP] removed dashboards, order of menus, count buttons on partner, products
bzr revid: fp@tinyerp.com-20120522143759-lnd5eescth6yxdvu
2012-05-22 16:37:59 +02:00
DBR (OpenERP) 289cc2d9d2 [Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20120522125704-5fh2rvqb56qp9vci
2012-05-22 18:27:04 +05:30
Purnendu Singh (OpenERP) 1631dd2831 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120522110600-xk507cocya0xj13s
2012-05-22 16:36:00 +05:30
Sbh (Openerp) f4ef4460c2 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120522103754-qvz1rqmzfpywc6yq
2012-05-22 16:07:54 +05:30
Fabien Pinckaers b3fa4ccf5c [IMP] removed icons from topbar
bzr revid: fp@tinyerp.com-20120522091445-mpiknieg2v8sd31f
2012-05-22 11:14:45 +02:00
Purnendu Singh (OpenERP) bfd9bb3227 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120522090313-fjfefxm84qq682aj
2012-05-22 14:33:13 +05:30
Fabien Pinckaers ee566d388c [IMP] merged topbar status widgets
bzr revid: fp@tinyerp.com-20120522085037-oktkq3td2hg9lvzr
2012-05-22 10:50:37 +02:00
Divyesh Makwana (Open ERP) a6309fd120 [IMP] hr_holidays : Removed all filters related to a date field and added the related date field in the search view.
bzr revid: mdi@tinyerp.com-20120522070824-rzi5go9rxcoq0u73
2012-05-22 12:38:24 +05:30
Fabien Pinckaers c31a54334c [FIX] fixing default_context
bzr revid: fp@tinyerp.com-20120521160745-4bir71koyn0vqgww
2012-05-21 18:07:45 +02:00
Divyesh Makwana (Open ERP) 3d3810ce52 [IMP] hr_holidays : added missing filter string in search view.
bzr revid: mdi@tinyerp.com-20120521110723-60b2zyu784pwxdp0
2012-05-21 16:37:23 +05:30
DBR (OpenERP) 38d3044665 [IMP]hr_holidays:Improve leave tooltip for date
bzr revid: dbr@tinyerp.com-20120518114550-bo8dh6hbsh53wxii
2012-05-18 17:15:50 +05:30
DBR (OpenERP) 1b09de07e8 [FIX]hr_holidays: Iprove the search for get perfect days
bzr revid: dbr@tinyerp.com-20120517105902-9wxxvlxd9csy80pb
2012-05-17 16:29:02 +05:30
Turkesh Patel (Open ERP) 1110db0e15 [IMP] crm,project_issue,hr_holiday: set chatter widget out of sheet.
bzr revid: tpa@tinyerp.com-20120516051329-w1o4es2e8v02impw
2012-05-16 10:43:29 +05:30
Sbh (Openerp) 3a5b1451b7 [MERGE] Merge lp:~openerp-dev/openobject-addons/trunk-social-mail-tpa
bzr revid: sbh@tinyerp.com-20120514112710-1xnsgtcqmdwhtqxv
2012-05-14 16:57:10 +05:30
DBR (OpenERP) f08d7c254b [IMP]hr_holidays:remove record rules
bzr revid: dbr@tinyerp.com-20120509101248-yu48ybdqsuu8fgiz
2012-05-09 15:42:48 +05:30
DBR (OpenERP) 341e8845d5 [IMP]crm,hr: Fix the crm opt_out field problem and set Employee group for leave_id field in kanban view
bzr revid: dbr@tinyerp.com-20120507092027-gnqcqpzaa6ese1x8
2012-05-07 14:50:27 +05:30
Saurang Suthar (OpenERP) a2a05cfc19 [IMP]:improved titles State by Status everywhere
bzr revid: ssu@tinyerp.com-20120504115748-2vd1dns7bxptg384
2012-05-04 17:27:48 +05:30
Purnendu Singh (OpenERP) 5de1e8d561 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120430122540-haxtywb5gjy16qle
2012-04-30 17:55:40 +05:30
Amit Patel (OpenERP) 5472a85b28 [MERGE]
bzr revid: apa@tinyerp.com-20120427105446-80dp19jsboes2n7c
2012-04-27 16:24:46 +05:30
Raphael Collet f80cbc8dd9 [IMP] hr_holidays: remove invisible tag on approval button
bzr revid: rco@openerp.com-20120427093122-6uq0g5x80ss2740p
2012-04-27 11:31:22 +02:00
Raphael Collet 41057fed10 [MERGE] from trunk
bzr revid: rco@openerp.com-20120426143728-5n5b9wo6unnbeb5x
2012-04-26 16:37:28 +02:00
Turkesh Patel (Open ERP) 603085bc7e [MRG] merge with lp:~openerp-dev/openobject-addons/trunk-form-add-topbar-apa
bzr revid: tpa@tinyerp.com-20120426063457-bthoapv1xt1ll7yp
2012-04-26 12:04:57 +05:30
Turkesh Patel (Open ERP) 01a55597b3 [IMP] Improved view of allocation request
bzr revid: tpa@tinyerp.com-20120426050223-1e22zbue2es6qfka
2012-04-26 10:32:23 +05:30
Turkesh Patel (Open ERP) f2801c6071 [IMP] Improved view of leave request
bzr revid: tpa@tinyerp.com-20120426044951-5qfdb1itenm2afux
2012-04-26 10:19:51 +05:30
Raphael Collet e4efcb808d [IMP] hr*: remove group_extended
bzr revid: rco@openerp.com-20120425141135-9jgai7os8mxj80go
2012-04-25 16:11:35 +02:00
Turkesh Patel (Open ERP) 4e1ee61eec [IMP] rename field message_ids_social to message_ids.
bzr revid: tpa@tinyerp.com-20120420112605-cctm0yw34vedqco8
2012-04-20 16:56:05 +05:30
Kuldeep Joshi (OpenERP) b657cdb967 [IMP]hr_recruitment, hr_holidays: add treeview fonts bold
bzr revid: kjo@tinyerp.com-20120419100855-7tomt33drutwkpvy
2012-04-19 15:38:55 +05:30
Purnendu Singh (OpenERP) 2a6a022d03 [IMP] remove conflicts
bzr revid: psi@tinyerp.com-20120419090708-ezvbeb00093ojkrt
2012-04-19 14:37:08 +05:30
Purnendu Singh (OpenERP) 735c6d5946 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120419063305-w5oj03h687trdik2
2012-04-19 12:03:05 +05:30
Amit Patel (OpenERP) 20a9b3aa09 [MERGE]
bzr revid: apa@tinyerp.com-20120411045840-tnkzyyfrm9d36xgj
2012-04-11 10:28:40 +05:30
Raphael Collet 0d2ba40cf8 [IMP] hr.config.settings: simplify form, remove all buttons
bzr revid: rco@openerp.com-20120410140955-a8m0oxigpy7rb1bu
2012-04-10 16:09:55 +02:00
Raphael Collet 98b91589cf [IMP] hr.config.settings: improve form layout
bzr revid: rco@openerp.com-20120410122234-m5n9it4hy07knte2
2012-04-10 14:22:34 +02:00
Raphael Collet 3feee280ec [IMP] hr*: remove deprecated ir.actions.todo
bzr revid: rco@openerp.com-20120410121239-0p6z87d34yqqkdk3
2012-04-10 14:12:39 +02:00
Raphael Collet 068619bf8f [IMP] hr.config.settings: improve code and form layout
bzr revid: rco@openerp.com-20120410115219-78ydkfe521am7g5n
2012-04-10 13:52:19 +02:00
Raphael Collet 63673df964 [IMP] hr*: rename model of config wizard to hr.config.settings
bzr revid: rco@openerp.com-20120410105632-n0bvdklu1ttlxcsa
2012-04-10 12:56:32 +02:00
Raphael Collet b91d41bce7 [MERGE] from trunk
bzr revid: rco@openerp.com-20120410104839-pv9kmiizwv0w8e8f
2012-04-10 12:48:39 +02:00
Jagdish Panchal (Open ERP) 8eb0e42abe [MERGE] branch merge with lp:~openerp-dev/openobject-addons/trunk-v62_config
bzr revid: jap@tinyerp.com-20120405050839-97ifqjla5bz48duc
2012-04-05 10:38:39 +05:30
Thibault Delavallée d99ff2ceef [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120404124507-yaslk5omv61vm761
2012-04-04 14:45:07 +02:00
Quentin (OpenERP) 10085b7c9a [MERGE] merged a branch with usability improvements in hr_holidays
bzr revid: qdp-launchpad@openerp.com-20120403115519-emon7p70bfsjv81w
2012-04-03 13:55:19 +02:00
Jagdish Panchal (Open ERP) 37465c6ea5 [IMP] HR: add the configuration wizard(new added file >> hr/res_config.py, hr/res_config_view.xml,hr_recruitment/res_config.py, hr_recruitment/res_config_view.xml, hr_timesheet_sheet/res_config.py, hr_timesheet_sheet/res_config_view.xml)
bzr revid: jap@tinyerp.com-20120402054418-596gzjhyne7o6148
2012-04-02 11:14:18 +05:30
Amit Patel (OpenERP) 8b65da991a [MERGE]
bzr revid: apa@tinyerp.com-20120329082210-0z0qer1589wp8ez0
2012-03-29 13:52:10 +05:30
Purnendu Singh (OpenERP) 6291473b71 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120328071919-bfi6x05lvg9bt8py
2012-03-28 12:49:19 +05:30
Purnendu Singh (OpenERP) 5da8966b21 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120327092417-jrydzrz9biecyn06
2012-03-27 14:54:17 +05:30
Thibault Delavallée 42ae5ba9fb [MERGE] Merged fix from trunk about hr_holidays
bzr revid: tde@openerp.com-20120327091539-lo75wcj3pt5obwib
2012-03-27 11:15:39 +02:00
Thibault Delavallée 7d9c9efef5 [FIX] hr_holidays: added a missing ']' in the domain of 'year' filter.
bzr revid: tde@openerp.com-20120327084535-igmpl852p0k8wq0t
2012-03-27 10:45:35 +02:00
Thibault Delavallée a1c17bb77c [MERGE] Merged with main addons
bzr revid: tde@openerp.com-20120327073509-emcfvmse26kks999
2012-03-27 09:35:09 +02:00
Purnendu Singh (OpenERP) 87f4fdbcb3 [IMP] hr_holidays: small change in xml
bzr revid: psi@tinyerp.com-20120327051804-71hopmvwyx41q6ym
2012-03-27 10:48:04 +05:30
Quentin (OpenERP) 397cdef40f [IMP] hr_holidays: improved 'this year' button on search view of holidays.
bzr revid: qdp-launchpad@openerp.com-20120326132557-nuyevng79oe5oham
2012-03-26 15:25:57 +02:00
Meera Trambadia (OpenERP) 0e8ccd774d [MERGE] branch merged with openobject-addons
bzr revid: mtr@tinyerp.com-20120326114847-6yju1vy8h7a33iwv
2012-03-26 17:18:47 +05:30
Divyesh Makwana (Open ERP) 0097bfef95 [IMP] hr_holidays : Improved the field defination, button is properly aligned with state, improve the calendar view and remove the filter.
bzr revid: mdi@tinyerp.com-20120326114629-o5yrzqqa93qzuszt
2012-03-26 17:16:29 +05:30
Thibault Delavallée ac24b11e82 [MERGE] Merged with main addons
bzr revid: tde@openerp.com-20120326092417-9cpagvskhf8u30yq
2012-03-26 11:24:17 +02:00
Thibault Delavallée 99fc46c5e5 [MERGE] Merged hr_holidays
bzr revid: tde@openerp.com-20120322163549-re9k1lkaoiayszvs
2012-03-22 17:35:49 +01:00