Commit Graph

432 Commits

Author SHA1 Message Date
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
Fabien Pinckaers b1ea5e4c97 [IMP] replace footer by divs for chatter
bzr revid: fp@tinyerp.com-20120713095341-6h0ganz4zmlwv9wg
2012-07-13 11:53:41 +02:00
Quentin (OpenERP) 5a7e06c4a4 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120710124253-eu7h88iss7lbcrw6
2012-07-10 14:42:53 +02:00
Raphael Collet 788b670b20 [FIX] hr_holidays: change onchange method name
bzr revid: rco@openerp.com-20120706082416-hi7fqtdevepvzwbk
2012-07-06 10:24:16 +02:00
Atul Patel (OpenERP) 369b5d8d51 [MERGE]: Merged trunk-addons with
quantity and Uom should be on the same line in analytic account extended view.
Amount and Amount currency in separate group.
Account Currenty typo.

bzr revid: atp@tinyerp.com-20120706034553-djpszu1dzn67hpr5
2012-07-06 09:15:53 +05:30
Atul Patel (OpenERP) 1a644d3685 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120704061823-ay1uha3fi46qahqf
2012-07-04 11:48:23 +05:30
Atul Patel (OpenERP) 065e1f1cc5 [MERGE]: Merged with trunk-addons
bzr revid: atp@tinyerp.com-20120703111551-e3ldxq7n3giafhfm
2012-07-03 16:45:51 +05:30
Atul Patel (OpenERP) edc26e341a [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-project-view-improvement-bde
bzr revid: atp@tinyerp.com-20120626062015-3ouunhuvfncggyvv
2012-06-26 11:50:15 +05:30
Bharat Devnani (OpenERP) 3ed27adc6d [IMP] improved views of project module under configuration wizard
bzr revid: bde@tinyerp.com-20120622132536-3ig2s3zwm0n1x06n
2012-06-22 18:55:36 +05:30
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
Thibault Delavallée 0e5598c24f [FIX] Added widget on allocation request.
bzr revid: tde@openerp.com-20120322132135-3yyip0lh7gzf0isc
2012-03-22 14:21:35 +01:00
Jagdish Panchal (Open ERP) 8dc623fb21 [IMP] HR: change sequence of menus and apply group_no_one
bzr revid: jap@tinyerp.com-20120322123823-gpn075d2e09etchq
2012-03-22 18:08:23 +05:30
Purnendu Singh (OpenERP) fbe22f74f8 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120322055844-axelwfh9rqrbft7w
2012-03-22 11:28:44 +05:30
Thibault Delavallée 744feff959 [MERGE] Merged with main addons
bzr revid: tde@openerp.com-20120321085121-52hkn31qqk2tqx52
2012-03-21 09:51:21 +01:00
Jagdish Panchal (Open ERP) a4a2696fb3 [MERGE] branch merged with lp:openobject-addons
bzr revid: jap@tinyerp.com-20120321065621-rr4ehnehog9aq4d2
2012-03-21 12:26:21 +05:30
Amit Patel (OpenERP) 5188e3c163 [MERGE]
bzr revid: apa@tinyerp.com-20120320093417-ffu9qiy0zt2606gr
2012-03-20 15:04:17 +05:30
Sanjay Gohel (Open ERP) 62c49d4013 [IMP]:Move fields First Approval, Second Approval to Usability / Technical Features group
bzr revid: sgo@tinyerp.com-20120320092120-7mcbqv73xp1r3gqz
2012-03-20 14:51:20 +05:30
Amit Patel (OpenERP) a2178b69e7 [MERGE]:lp:~openerp-dev/openobject-addons/trunk-hr-improvements-holidays-sgo
bzr revid: apa@tinyerp.com-20120319052052-1i543wpq7hulle2u
2012-03-19 10:50:52 +05:30
Sanjay Gohel (Open ERP) 0b2d045f91 [IMP]hr_holidays: improve in hr holidays form view and list view as per suggestion and reform warning
bzr revid: sgo@tinyerp.com-20120316131111-agud3dotpourl7uy
2012-03-16 18:41:11 +05:30
Thibault Delavallée 904e18d1bf [IMP] hr.holidays: modified get_needaction_user_id -> get_needaction_user_ids to match the new API. Fixed a removed field still present on view. Fixed small sentences.
bzr revid: tde@openerp.com-20120315110042-t3tk2w0524gvn3pw
2012-03-15 12:00:42 +01:00
Olivier Dony 49459c7219 [FIX] hr_holidays: Leaves calendar view should be filtered by users, not description
bzr revid: odo@openerp.com-20120312090809-rloqoz5lb3rr7a9a
2012-03-12 10:08:09 +01:00
Thibault Delavallée db55865050 [REM] Removed mail/base_need_action, moved to server. Fixed now deleted need_action boolean field from view.
bzr revid: tde@openerp.com-20120307091018-tcpvsa5shplc23vu
2012-03-07 10:10:18 +01:00
Meera Trambadia (OpenERP) 0e20074121 [IMP] hr_*:-changed sequence for menus
bzr revid: mtr@tinyerp.com-20120305124245-xh77bpp62l4wfalm
2012-03-05 18:12:45 +05:30
Mayur Maheshwari (OpenERP) 120a4a9fd7 [IMP]hr_holidays: Set department readonly via xml and revert in py file
bzr revid: mma@tinyerp.com-20120301052738-oaj8phgg1h4p4jq7
2012-03-01 10:57:38 +05:30
Thibault Delavallée c2d045df3d [IMP] hr_holidays: updated to new need_action_user_id
bzr revid: tde@openerp.com-20120228171450-tweynl073wf34z9m
2012-02-28 18:14:50 +01:00
Mayur Maheshwari (OpenERP) ecbc6996e7 [IMP]hr_holidays: Improved button name and state and redonly in confirm and draft
bzr revid: mma@tinyerp.com-20120222130638-buhl4qhdto4gpm3j
2012-02-22 18:36:38 +05:30
Thibault Delavallée cff98a3aeb [IMP] Improved ThreadView widget display; cleaned ThreadView widget js code; added basic access rules; added message_mark_done method to clean a mail.thread of its need_action_user_id; added auto-push of notifications if user requested to perform an action is not following the object; added first draft of messaging mechanism in hr_holidays
bzr revid: tde@openerp.com-20120208152521-68i4nekjj8mnuyc8
2012-02-08 16:25:21 +01:00
Thibault Delavallée 6b0736e398 [MERGE] hr_holidays: fixed bug 908798: added filter and group_by on leaves analysis
bzr revid: tde@openerp.com-20120109153846-xue897nvu7jgapxe
2012-01-09 16:38:46 +01:00
Jagdish Panchal (Open ERP) c7c2322d52 [FIX] in all hr features remove the default search on user_id
lp bug: https://launchpad.net/bugs/909724 fixed

bzr revid: jap@tinyerp.com-20120103121938-83er0zgqvgkxs11x
2012-01-03 17:49:38 +05:30
Fabien Pinckaers c113b63b4e [FIX] holidays, mpr bom open all selected
bzr revid: fp@tinyerp.com-20111230122811-kdv25gd2at2ps33r
2011-12-30 13:28:11 +01:00
Jagdish Panchal (Open ERP) d2d20a1d4c [FIX] hr_holidays: In leaves analysis report filter buttons Year|Month|Month-1 added
lp bug: https://launchpad.net/bugs/908798 fixed

bzr revid: jap@tinyerp.com-20111229104219-fbzgrcxpv9jxyqzp
2011-12-29 16:12:19 +05:30
Antony Lesuisse d58db1299c [IMP] hr_holidays this year
bzr revid: al@openerp.com-20111228142011-h9wob65z22lf4byr
2011-12-28 15:20:11 +01:00
Raphael Collet 79c32508cd [IMP] hr_holidays: employee kanban view
bzr revid: rco@openerp.com-20111223101143-zyz4c23yb7bpqlea
2011-12-23 11:11:43 +01:00
Raphael Collet b62f6625fb [IMP] hr_holidays: add color on leave status in kanban view
bzr revid: rco@openerp.com-20111223100100-rc0z07ighrj22a0e
2011-12-23 11:01:00 +01:00
Fabien Pinckaers f87971efc6 [IMP] leaves kanban improvement
bzr revid: fp@tinyerp.com-20111223091744-ze375m6s7ho4myle
2011-12-23 10:17:44 +01:00
fp 8e66fe7f89 [IMP] employee view
bzr revid: fp@fp-laptop-20111222221031-6vcsojhlxj48yan0
2011-12-22 23:10:31 +01:00
Fabien Pinckaers 591b929f5d [IMP] employee leave status info
bzr revid: fp@tinyerp.com-20111222142402-bwxyy2xihu76d4p7
2011-12-22 15:24:02 +01:00
Fabien Pinckaers 02b1e6980e [IMP] dashboard simplification
bzr revid: fp@tinyerp.com-20111211114018-di30qn6sh3j6rw8t
2011-12-11 12:40:18 +01:00
Raphael Collet eee6ce4ba4 [MERGE] lp:893491 (hr_holidays: fix domain on menu action 'Leave Requests to Approve')
bzr revid: rco@openerp.com-20111130103814-bo0w5lr6zd47neu1
2011-11-30 11:38:14 +01:00
Raphael Collet a24573cd2d [MERGE] hr_holidays: change form labels of field holiday_type
bzr revid: rco@openerp.com-20111129160312-723y0khfj7jzunww
2011-11-29 17:03:12 +01:00
Vo Minh Thu 2e1023ddbe [IMP] domain to context:
Use explicitely default_xxx in the context instead of
relying on the domain to fill form views.

bzr revid: vmt@openerp.com-20111124121433-z5du2yeu319ea1ax
2011-11-24 13:14:33 +01:00
Divyesh Makwana (Open ERP) 993778ad2d [FIX] hr_holidays : cannot approve a leave request
lp bug: https://launchpad.net/bugs/893491 fixed

bzr revid: mdi@tinyerp.com-20111123053302-snauyvdzawjti414
2011-11-23 11:03:02 +05:30
Amit (OpenERP) c8793e98f6 [IMP]:hr_holidays:rename Allocation Type to Mode and Allocation Category to Allocation Mode.
bzr revid: apa@tinyerp.com-20111121102039-clb8zx538ttkmegr
2011-11-21 15:50:39 +05:30
Raphael Collet 90e75a3920 [MERGE] lp:872245
bzr revid: rco@openerp.com-20111109082248-7z2e459oc2zvp263
2011-11-09 09:22:48 +01:00
Fabien Pinckaers a7ccc70902 merge
bzr revid: fp@tinyerp.com-20111108202204-22z34101zmgv7w67
2011-11-08 21:22:04 +01:00
Bharat (OpenERP) c27bc7faf1 [FIX] hr : Added category_id field in tree viewof hr.holidays in hr_holidays/hr_holidays_view.xml
lp bug: https://launchpad.net/bugs/872245 fixed

bzr revid: bde@tinyerp.com-20111014054047-gp46a6fqbpadu0es
2011-10-14 11:10:47 +05:30
Amit Bhavsar (Open ERP) b1602c948b [usability2],add menu in hr holidays
bzr revid: amb@tinyerp.com-20111013092115-r3254ve09e6usziu
2011-10-13 14:51:15 +05:30
Fabien Pinckaers b24f2a190a [IMP] menutip config wizard
bzr revid: fp@tinyerp.com-20111001232501-8kv8ixcrqts3sq9u
2011-10-02 01:25:01 +02:00
Fabien Pinckaers 5dc1bc2f44 [FIX] hr_holidays
bzr revid: fp@tinyerp.com-20111001225958-0d0wi1los2870utr
2011-10-02 00:59:58 +02:00
Julien Thewys 32cdec2c72 [FIX] hr_holidays: made 2 view titles more consistent
Ported from 6.0

bzr revid: jth@openerp.com-20110930132124-0iobx63ylsz352oe
2011-09-30 15:21:24 +02:00
Antony Lesuisse 26a58b22f2 [MERGE] config rework ir.action.todo stw
bzr revid: al@openerp.com-20110924142047-rdo7gwoluoydbfz4
2011-09-24 16:20:47 +02:00
Fabien Pinckaers c3a79fbc36 merge
bzr revid: fp@tinyerp.com-20110924091037-kpy965dboeutk5y4
2011-09-24 11:10:37 +02:00
Stephane Wirtel e123082d88 [IMP] Add missing configuration wizards
bzr revid: stw@openerp.com-20110922131300-uudx3uwhkyaj3ry0
2011-09-22 15:13:00 +02:00
Rucha (Open ERP) 0e861ae34a [MERGE]: Merge with latest trunk-addons and resolved conflicts in bank statement as new state was added in statement
bzr revid: rpa@tinyerp.com-20110922061419-cvaza3f5050o0b85
2011-09-22 11:44:19 +05:30
Atik Agewan (OpenERP) 0e0438a779 [IMP] ALL:change in all statusbar_colors quotes
bzr revid: aag@tinyerp.com-20110921050948-m2iezimspmspsvjs
2011-09-21 10:39:48 +05:30
Jigar Amin - OpenERP 861ef42bbb [IMP] hr_holidays - Leave Requests :Rearranged To Confirm To Approve Validated
bzr revid: jam@tinyerp.com-20110920093418-v9wgaooul8nkhlur
2011-09-20 15:04:18 +05:30
Fabien Pinckaers 05d6d35cc8 [Merge]
bzr revid: fp@tinyerp.com-20110917110317-34apz3spz1h9azjl
2011-09-17 13:03:17 +02:00
ARA (OpenERP) a2ee569514 [merge] merge with trunk addons
bzr revid: ara@tinyerp.com-20110916060758-u23zante59rblo4m
2011-09-16 11:37:58 +05:30
Atik Agewan (OpenERP) 882392394d [IMP] ALL: Remove Space from attribute values
bzr revid: aag@tinyerp.com-20110915084914-kgbpw52ym5uz8ye0
2011-09-15 14:19:14 +05:30
Atik Agewan (OpenERP) 53be1a95ef [ADD] Hr_expense,Hr_holidays,Hr_Recrutment,,Project_issue:Add widget=statusbar in state field.
bzr revid: aag@tinyerp.com-20110915054340-i84rf83h7ctkvvu3
2011-09-15 11:13:40 +05:30
Xavier Morel 178fec5c64 [FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
Antony Lesuisse 65c43a1946 [MERGE] trunk
bzr revid: al@openerp.com-20110805211034-hc8z53m6zzwksipu
2011-08-05 23:10:34 +02:00
Raphael Collet 87f239fb33 [MERGE] remove extended filters
bzr revid: rco@openerp.com-20110804102635-2ixo1tmogsulj83u
2011-08-04 12:26:35 +02:00
Xavier Morel 09cf4d40d0 [FIX] convert ir.actions.todo fields to match model definition changes
* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done

bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
2011-07-29 16:03:24 +02:00
Xavier Morel cc13113641 [REF] reformat xml files before applying automated search&replace on them
bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
2011-07-29 15:48:10 +02:00
Tejas (OpenERP) ba62b19daf usability
bzr revid: tta@openerp.com-20110720091819-s49ianh7xgrf3eim
2011-07-20 14:48:19 +05:30
Xavier Morel a5fdb75ad6 [FIX] ir.actions.todo are now unskippable
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
Quentin (OpenERP) 664ba7bba3 [MERGE] merge with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
Quentin (OpenERP) 837f2a4a69 [MERGE] merged aag branch with hr_holidays usability improvements
bzr revid: qdp-launchpad@openerp.com-20110608144616-k80dn77ii0f3dlj5
2011-06-08 16:46:16 +02:00
aag (OpenERP) cb6e9d7e13 [IMP]hr_holidays:Assign Legal Leaves to Employees in HR Management -5 categ
bzr revid: aag@tinyerp.co.in-20110603131117-iylt0fehko6cj71w
2011-06-03 18:41:17 +05:30
aag (OpenERP) a7fe59285a [ADD]hr_holidays:Assign Legal Leaves to Employees add to Human Resource -4 seq category
bzr revid: aag@tinyerp.co.in-20110602105049-gdpdhlrth95t649g
2011-06-02 16:20:49 +05:30
ARA (OpenERP) 8d5f303693 [FIX] hr_holiday: second validation
bzr revid: ara@tinyerp.com-20110601054953-vxdw1abqpy4lcgfl
2011-06-01 11:19:53 +05:30
ARA (OpenERP) 9842299e5a [FIX] merge to main branch
bzr revid: ara@tinyerp.com-20110601054201-urr3hdbthef3xymj
2011-06-01 11:12:01 +05:30
ARA (OpenERP) 7ea9fdaa2c [FIX] hr_holiday: hr_holidays: Second validation
bzr revid: ara@tinyerp.com-20110601051941-qijpncs4kcil7ek9
2011-06-01 10:49:41 +05:30
aag (OpenERP) 9d969a1564 [IMP]hr,hr_holidays: Rename saprator "position" into "job information and inherit remaining legal leaves field to hr.employee form
bzr revid: aag@tinyerp.co.in-20110530121307-ykwl0qfjf9k5ihdj
2011-05-30 17:43:07 +05:30
aag (OpenERP) cb46f35091 [IMP]hr_holidayse: Rename column "Remaining leaves" into "remaining legal leaves"
bzr revid: aag@tinyerp.co.in-20110527113919-40be1anwsqhntfu5
2011-05-27 17:09:19 +05:30
Rucha (Open ERP) 33d9a30005 [IMP, REF]: base_setup, hr_holidays: Code improvement and refactoring in assign legal leave wizard
bzr revid: rpa@tinyerp.com-20110512123920-m82iqsnw0c2v6gqj
2011-05-12 18:09:20 +05:30
aag (OpenERP) 7483f436cf [ADD]hr_holidays:aad new config wiz -Assign Legal Leaves to Employees
bzr revid: aag@tinyerp.co.in-20110512112629-it13t2lgtupum6gk
2011-05-12 16:56:29 +05:30
Quentin (OpenERP) cfa9e170ac [MERGE] lp: 751299 (+change priority of new view)
bzr revid: qdp-launchpad@openerp.com-20110504075525-edkp4hcu3guxj3kz
2011-05-04 09:55:25 +02:00
Quentin (OpenERP) f9a1e706a8 [MERGE] lp:767238
bzr revid: qdp-launchpad@openerp.com-20110427080332-qdwytwgd97ekj35v
2011-04-27 10:03:32 +02:00
pso (OpenERP) 6812297887 [IMP] hr_holidays: Improved search, tree view of holiday and onchange method
bzr revid: pso@tinyerp.com-20110426064116-47pn4y5yuifsbjmg
2011-04-26 12:11:16 +05:30
pso (OpenERP) 428944635f [IMP] hr_holidays: Improved Indentation
bzr revid: pso@tinyerp.com-20110426060513-nxbcemw0cfbkpdga
2011-04-26 11:35:13 +05:30
pso (OpenERP) bcbccd8eb8 [FIX] hr_holidays: Wrong allocation request created when allocating holidays per category of employee
lp bug: https://launchpad.net/bugs/767238 fixed

bzr revid: pso@tinyerp.com-20110426053714-i0jpn1fh620mk1j4
2011-04-26 11:07:14 +05:30
Husen Daudi 29e05874b6 merged with trunk
bzr revid: hda@hda-laptop-20110421052650-rtn75wn5o3ue87wp
bzr revid: hda@hda-laptop-20110426053533-gn68qmvhikeefike
2011-04-26 11:05:33 +05:30
skh c6cc93fcb0 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421121226-40h4sahiuoydnjgt
2011-04-21 17:42:26 +05:30
skh 8b2d082ff9 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421072031-r6l3uxk91bewcfrk
2011-04-21 12:50:31 +05:30
skh 309493382d [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110421063936-a2k70vufxdvt3efm
2011-04-21 12:09:36 +05:30
skh 0f3d174ff2 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406095919-rsp0rzugqglp901b
2011-04-06 15:29:19 +05:30
skh a45a076aba [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406072520-vd8qj7iphmzkry3r
2011-04-06 12:55:20 +05:30
skh fd9fcd3ac7 [FIX] [PS] List view of leaves type contains different fields as the form view
lp bug: https://launchpad.net/bugs/751299 fixed

bzr revid: skh@tinyerp.com-20110406065736-944f5id53aesdf8b
2011-04-06 12:27:36 +05:30
AMP (OpenERP) 84f97f57e6 [FIX] hr_holidays : Fixes the holidays workflow issue
bzr revid: amp@tinyerp.com-20110405103134-2lu512lqup2w57o5
2011-04-05 16:01:34 +05:30
pso (OpenERP) 838d9a3e60 [FIX] hr_holidays: possible to set to draft a refused allocation request
lp bug: https://launchpad.net/bugs/746471 fixed

bzr revid: pso@tinyerp.com-20110401052532-5op996ya8rxbq0kb
2011-04-01 10:55:32 +05:30
Xavier Morel 4e6a9ea55c [REM] all @col and @colspan attributes on groups in search views: search views are not laid out by columns, therefore these attributes do not belong
bzr revid: xmo@openerp.com-20110315140859-uh9w3exdit84qz47
2011-03-15 15:08:59 +01:00
Quentin (OpenERP) 73b00ed701 [IMP] hr,hr_holidays: remove extended view on employee category (was conflicting with hr/manager group)
bzr revid: qdp-launchpad@openerp.com-20110311113204-kxmskgilat5vlk3f
2011-03-11 12:32:04 +01:00
Rucha (Open ERP) 36fe64becc [IMP]: Rename "Confirm" to "Submit to Manager"
bzr revid: rpa@tinyerp.com-20110311101016-gzi2lkvfj5029n8x
2011-03-11 15:40:16 +05:30
Rucha (Open ERP) d64d4b0d83 [MERGE]: Merge with trunk addons
bzr revid: rpa@tinyerp.com-20110311084452-hlkwjehf0tzkbdoh
2011-03-11 14:14:52 +05:30
Rucha (Open ERP) 22ab283619 [IMP]: hr_holidays: Holidays => Leaves
bzr revid: rpa@tinyerp.com-20110310132900-gl2i53oa7mgcq1sz
2011-03-10 18:59:00 +05:30
Rucha (Open ERP) 4f4f02bad2 [IMP]: hr_holidays: Leave Type => Allocation Type
bzr revid: rpa@tinyerp.com-20110310132540-3pns1pqcfiltkytp
2011-03-10 18:55:40 +05:30
Rucha (Open ERP) d6f5541202 [IMP]: hr, hr_holidays: Minor improvements
bzr revid: rpa@tinyerp.com-20110310130454-495pmz0tnkp6w0tr
2011-03-10 18:34:54 +05:30
Thibault Francois e3e979a498 [MERGE] default value in act_window
bzr revid: tfr@openerp.com-20110309130345-uraw50vl1xlzqy6t
2011-03-09 14:03:45 +01:00
Quentin (OpenERP) e4a7ae6236 [IMP] hr_holidays: set department_id as readonly instead of invisible on attrs
bzr revid: qdp-launchpad@openerp.com-20110223143637-n8nesmli4d0w9cs7
2011-02-23 15:36:37 +01:00
ARA (OpenERP) 46c1818aea [MERGE] merge from dev3
bzr revid: ara@tinyerp.com-20110217112123-wwp1i98s2zjd2kvv
2011-02-17 16:51:23 +05:30
ARA (OpenERP) 990befd610 [FIX]Holiday Request - Two different fields with same labels
lp bug: https://launchpad.net/bugs/720582 fixed

bzr revid: ara@tinyerp.com-20110217111720-nbqov0u17qqgxvjq
2011-02-17 16:47:20 +05:30
Mustufa Rangwala 59a5219269 [FIX] Holidays - Department field is not relevant if we assign holidays or allocation by Employee's Category
lp bug: https://launchpad.net/bugs/720585 fixed

bzr revid: mra@mra-laptop-20110217091754-ow18gxcbx2h2l3lg
2011-02-17 14:47:54 +05:30
ron@tinyerp.com f34b5ba2f1 [IMP]hr_holidays,hr_recruitment:improved HR module related changes and also make one wizard
bzr revid: ron@tinyerp.com-20110216120450-nvul499jx6f3wekd
2011-02-16 17:34:50 +05:30
ksa (Open ERP) 4fc5537bd8 [IMP]: hr related changes
bzr revid: ksa@tinyerp.co.in-20110216084531-xr94jx9116ns3qyh
2011-02-16 14:15:31 +05:30
Ujjvala Collins (OpenERP) 4bac6d8969 [FIX] all: Fixed incomplete behavior of act_window.
lp bug: https://launchpad.net/bugs/708467 fixed

bzr revid: uco@tinyerp.com-20110127094939-v8gugx666pakihva
2011-01-27 15:19:39 +05:30
mtr 07a63fcf71 [IMP] hr_holidays:In xml,added field 'name' on model=ir.actions.act_window
bzr revid: mtr@mtr-20110121065940-d37nys61ta3b1556
2011-01-21 12:29:40 +05:30
qdp-launchpad@tinyerp.com 2df4a68377 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak
2011-01-14 01:11:01 +01:00
ARA (OpenERP) 2e76a8328c [FIX]hr_holidays:shouldn't see employee's categories in simplify view
lp bug: https://launchpad.net/bugs/701410 fixed

bzr revid: ara@tinyerp.com-20110111122019-tozyw72p2npu3yqk
2011-01-11 17:50:19 +05:30
Mustufa Rangwala 3bdca04e28 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110103090825-h3f9ie8qu7l09ceb
2011-01-03 14:38:25 +05:30
François Degrave 6e90f9165b [IMP] buttons visibility on HR
bzr revid: fde@openerp.com-20101230155348-o7571z970z1m2uha
2010-12-30 16:53:48 +01:00
François Degrave a8a2183a77 [IMP] HR access rights
bzr revid: fde@openerp.com-20101230122428-wqsf7qcck7rasbfp
2010-12-30 13:24:28 +01:00
husen f433b959c2 merged with trunk
bzr revid: husen@husen-laptop-20101230095809-cl6dkve1odgdtqtv
2010-12-30 15:28:09 +05:30
Fabien Pinckaers e2f6d60065 fix
bzr revid: fp@tinyerp.com-20101229201026-ybz9nifb3nmwh0m3
2010-12-29 21:10:26 +01:00
Fabien Pinckaers 889038611d fix
bzr revid: fp@tinyerp.com-20101229162607-fpmdqtm0x9bo17yt
2010-12-29 17:26:07 +01:00
François Degrave 469b5a8c6e [IMP] removed contract tab in employee form view + fixed holidays shortcut
bzr revid: fde@openerp.com-20101229161029-o5cko7yu1sf3li45
2010-12-29 17:10:29 +01:00
Fabien Pinckaers 0a7c9c6ee2 [FIX] complete rewrite for clean up of hr_holidays
bzr revid: fp@tinyerp.com-20101229124123-7tt4ttk3jmkispw7
2010-12-29 13:41:23 +01:00
François Degrave e678fd472a [IMP] access rights, menus for HR
bzr revid: fde@openerp.com-20101228153417-ps9ql3h4lij87jx8
2010-12-28 16:34:17 +01:00
Els Van Vossel ab38e64d02 [IMP] changed menutips
bzr revid: openerp@evv-laptop-20101214062211-mlp6bzfhb0tw0fu6
2010-12-14 07:22:11 +01:00