Commit Graph

246 Commits

Author SHA1 Message Date
mso fcaeab33ca [Merge]:Merged with parent branch
bzr revid: mso@mso-20100312071916-zat2nj2rvz5fc10t
2010-03-12 12:49:16 +05:30
Stephane Wirtel 795cf7129e [FIX] hr_timesheet_sheet: Add a new button in the search view, only
show the confirmed sheets

bzr revid: stephane@openerp.com-20100311133905-0kbhuy9yy02a4uqe
2010-03-11 14:39:05 +01:00
Stephane Wirtel 1629f7cc75 [FIX] hr_timesheet_sheet: Remove the editable attribute on the tree view, we will use the default form to create a new timesheet sheet
bzr revid: stephane@openerp.com-20100311133258-hl1g5jg4fjlywb5i
2010-03-11 14:32:58 +01:00
Stephane Wirtel a41b35fa7f [FIX] hr_attendance,hr_timesheet_sheet: Remove the action description in the search view and tree view
bzr revid: stephane@openerp.com-20100311132921-80582428vofug1nu
2010-03-11 14:29:21 +01:00
mso e50c9fa922 Merged with Master Branch
bzr revid: mso@mso-20100311070235-7c7vt03horm3bnjc
2010-03-11 12:32:35 +05:30
Launchpad Code Hosting 1c2abb3388 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100311050546-f8c8w09auz4m064f
2010-03-11 05:05:46 +00:00
Launchpad Code Hosting 38544141cc Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100310051152-olke65fg5ytdk4d5
2010-03-10 05:11:52 +00:00
Stephane Wirtel 68f85a1ee2 [REF] hr_timesheet_sheet: Remove an unused view
[IMP] hr_timesheet_sheet: Add the sheet_id field in the tree view of
hr.attendance

bzr revid: stephane@openerp.com-20100309170542-5zy2imvitdxk8506
2010-03-09 18:05:42 +01:00
Stephane Wirtel 5dd9dd4e47 [IMP] hr_attendance: Define a specific search view for the hr.attendance object
[IMP] hr_timesheet_sheet: Override the search_view of hr.attendance to
add the sheet field

bzr revid: stephane@openerp.com-20100309165926-qg5r4ve4ne9sbt19
2010-03-09 17:59:26 +01:00
mra (Open ERP) 46838596d4 [IMP] hr_timesheet_sheet: Add group by on timesheet (Departement and user)
bzr revid: mra@tinyerp.com-20100309101124-c75o9ay48gel1bma
2010-03-09 15:41:24 +05:30
mra (Open ERP) 1e86221189 [FIX] hr_timesheet_sheet: to link attendaces with timesheet (employee now attchaed with resource so change the query)
bzr revid: mra@tinyerp.com-20100309063603-3sxf2efirreqoneq
2010-03-09 12:06:03 +05:30
Stephane Wirtel c8a24fd862 [REF] hr_timesheet_sheet: Rewrite the domain
bzr revid: stephane@openerp.com-20100308165648-24jocdsyc8ctncpe
2010-03-08 17:56:48 +01:00
Stephane Wirtel 04ef9b7795 [REF] Use the right indentation in the xml file
bzr revid: stephane@openerp.com-20100308164906-ids4171vwn3i1v90
2010-03-08 17:49:06 +01:00
Harry (Open ERP) 713ee22c90 [MERGE] HR Improvement
bzr revid: hmo@tinyerp.com-20100219104719-5e2pb5mweuqcuie6
2010-02-19 16:17:19 +05:30
Vir (Open ERP) 130c06ad31 [IMP,REM] Search view improved, unused files are removed from resource module
bzr revid: vir@tinyerp.com-20100218134112-4585a9dzyy7tjlpi
2010-02-18 19:11:12 +05:30
Vir (Open ERP) ddfcd40423 [IMP] department_id added in expense,timesheet,applicant,holidays. Department view put in comment in resource and set in hr
bzr revid: vir@tinyerp.com-20100217084938-wb9ixv8ey4ah6j9i
2010-02-17 14:19:38 +05:30
Launchpad Code Hosting c4eb6939d2 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100217045454-khoxol7nwp9481bx
bzr revid: codehost@crowberry-20100217045700-n98jpo3k13wuor6b
2010-02-17 04:57:00 +00:00
Launchpad Code Hosting af003ddfa0 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100213045823-qdci4lesy2tcbnhe
bzr revid: codehost@crowberry-20100214050039-6qf8txq3a10fzoh6
bzr revid: codehost@crowberry-20100215044857-73ar6224y5uvmorb
2010-02-15 04:48:57 +00:00
Vir (Open ERP) d802ed107b [IMP] Set sequence for Financial Management menu and Project Management menu
bzr revid: vir@tinyerp.com-20100205123321-73a02663xixrt8rc
2010-02-05 18:03:21 +05:30
RCH(Open ERP) a1d8c313f8 [Fix] : Removed unused dependecy from hr_timesheet_sheet,project_timesheet,report_timesheet modules
bzr revid: vir@tinyerp.com-20100204060951-e2pauqeltidz9vng
2010-02-04 11:39:51 +05:30
RCH(Open ERP) d6cdc061be [Fix] : Removed unwanted dependency from Project module
bzr revid: vir@tinyerp.com-20100203114421-9hpcy38sn13w8un1
2010-02-03 17:14:21 +05:30
RCH(Open ERP) 2044339a0d [MOD] hr_expense,hr_timesheet_sheet,hr_holiday : Modificatin realted to board_hr module
bzr revid: vir@tinyerp.com-20100201110948-p6xl1x6tvma8mcld
2010-02-01 16:39:48 +05:30
HDA (OpenERP) 93bd614c8e merged to remove sql injection
bzr revid: hda@tinyerp.com-20100201082939-fj0u5f0pvlgq7j3k
2010-02-01 13:59:39 +05:30
HDA (OpenERP) 404bf5ca1a [FIX] module:hr_timesheet_sheet postgres view
bzr revid: hda@tinyerp.com-20100129064057-jc3piy42kusbr716
2010-01-29 12:10:57 +05:30
HDA (OpenERP) 0b2bb31992 Merge from stable
bzr revid: hda@tinyerp.com-20100121151350-58pcefq2tdw2ge2l
2010-01-21 20:43:50 +05:30
HDA (OpenERP) 92ae38eb0a Project management improvements
bzr revid: hda@tinyerp.com-20100119073547-dqn2c0i9ycx6kp3a
2010-01-19 13:05:47 +05:30
Harry (Open ERP) 9e2b2cf239 [MERGE] new menu structure
bzr revid: hmo@tinyerp.com-20100117055734-gyzsham0dpza2dck
2010-01-17 11:27:34 +05:30
Stephane Wirtel fb3ef7a2f4 [FIX] Change the year of the copyright
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
RCH(Open ERP) 86644fee8b New Menu Structure for HR and Knowledge Management
bzr revid: vir@tinyerp.com-20100111114835-f05x3w6wl9bb47pa
2010-01-11 17:18:35 +05:30
Fabien Pinckaers 344dd181f3 [IMP] new menus
bzr revid: fp@tinyerp.com-20100109143002-32gkcy67d18v2gd7
2010-01-09 15:30:02 +01:00
Jay (Open ERP) a23b83db01 [FIX] Functional fields should have context as an argument when we use fnct_searc method
lp bug: https://launchpad.net/bugs/504670 fixed

bzr revid: jvo@tinyerp.com-20100108113858-dp3e8pm5px4uspum
2010-01-08 17:08:58 +05:30
Launchpad Code Hosting 9d84f92c17 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100106043634-zgy19efans01l0fu
2010-01-06 04:36:34 +00:00
Launchpad Code Hosting 4b560a5f40 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091230044751-64u7xrq53ujjdbhe
2009-12-30 04:47:51 +00:00
Harry (Open ERP) b16b33b9fb [MERGE] merge from lp:~openerp-commiter/openobject-addons/ergonomy-search-views
bzr revid: hmo@tinyerp.com-20091224110142-drqpn9il4e25v377
2009-12-24 16:31:42 +05:30
Vir (Open ERP) ec58eefc89 [IMP] Help added on timesheet state field.Changed caption from 'Status' to 'State'
bzr revid: vir@tinyerp.com-20091224070523-rlhk6rcijp5cujy2
2009-12-24 12:35:23 +05:30
Fabien Pinckaers c032072ca1 merge
bzr revid: fp@tinyerp.com-20091223171752-zunj0g08eknomv0l
2009-12-23 18:17:52 +01:00
Fabien Pinckaers cbd41d602b [FIX] multi company_default
bzr revid: fp@tinyerp.com-20091223171639-hgvyetizdgyh0itv
2009-12-23 18:16:39 +01:00
apa-tiny 3d4bf1423f [IMP,MOD]:Set colors in tree view.
bzr revid: apa@tinyerp.com-20091223114311-uabb85obq7prgqe4
2009-12-23 17:13:11 +05:30
Jay (Open ERP) f5a36da0c1 [FIX] HR_Timesheet_sheet : timesheet cannot be deleted which have attendance entries encoded
lp bug: https://launchpad.net/bugs/496991 fixed

bzr revid: jvo@tinyerp.com-20091221130004-75pxba8k30an2qpj
2009-12-21 18:30:04 +05:30
RGA(OpenERP) 1e1c996161 [REF] HR_attendance : Code optimized for sign in and out
bzr revid: jvo@tinyerp.com-20091221110305-jvrdec4s2cfu69qt
2009-12-21 16:33:05 +05:30
Launchpad Code Hosting a9c86247e9 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091216052733-5xwug0h8x6g89bqt
2009-12-16 05:27:33 +00:00
Launchpad Code Hosting 436709e71d Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091212044324-cijmtvsyi4a4s45o
bzr revid: codehost@crowberry-20091213043736-z24gvovoapw9qp00
bzr revid: codehost@crowberry-20091214043619-objwljpa4vzg82dl
2009-12-14 04:36:19 +00:00
uco (OpenERP) cc7eeb9dac [REF]: Changed remaining views. Small changes done.
bzr revid: uco@tinyerp.co.in-20091212134306-k7slmzg85xxjqlkm
2009-12-12 19:13:06 +05:30
olt@tinyerp.com 91191edeee [IMP] Launchpad export translation files
bzr revid: olt@tinyerp.com-20091209131947-pxqt2nbuci12i0m9
2009-12-09 14:19:47 +01:00
uco (OpenERP) f2bb57289c [IMP]: Deleted the menu items and actions from remaining views.
bzr revid: uco@tinyerp.co.in-20091209053207-fgtzp1bzm9rb9vyi
2009-12-09 11:02:07 +05:30
uco (OpenERP) e2800161ee [Merge]: Merge with parent
bzr revid: uco@tinyerp.co.in-20091208130823-7ot135wtk2jt311q
2009-12-08 18:38:23 +05:30
Launchpad Code Hosting 4bf94392bf Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091205044307-6qhjd3nbo6gwtys7
bzr revid: codehost@crowberry-20091206044413-l2j8irzc2l9932vf
2009-12-06 04:44:13 +00:00
uco (OpenERP) 2a061d8e2c [REF]: Removed menus, actions and filters from remaining views
bzr revid: uco@tinyerp.co.in-20091202112925-hwyahuonhpl8qd6u
2009-12-02 16:59:25 +05:30
Harry (Open ERP) ec0abc8968 [MERGE] merge from lp:~openerp/openobject-addons/5.0/
bzr revid: hmo@tinyerp.com-20091202085041-v3ae7tu3krbr2heh
2009-12-02 14:20:41 +05:30
Launchpad Code Hosting 86adea2e37 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091202045538-6pollv1f7anby8vo
2009-12-02 04:55:38 +00:00