Commit Graph

615 Commits

Author SHA1 Message Date
Turkesh Patel (Open ERP) f1cbf6fbea [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130906060022-szjnxob72894dl41
2013-09-06 11:30:22 +05:30
Turkesh Patel (Open ERP) 191e7513c0 [IMP] improved kanban and form views lp:~openerp-dev/openobject-addons/trunk-job-positions-improve-cod
bzr revid: tpa@tinyerp.com-20130906055234-r7l7uc34o4o64icc
2013-09-06 11:22:34 +05:30
Darshan Kalola (OpenERP) 691cb9cb25 [MERGE]merged with main addons
bzr revid: dka@tinyerp.com-20130906052126-j147w420snwytrn3
2013-09-06 10:51:26 +05:30
Chirag Dodiya (OpenERP Trainee) c1ecfedfef [IMP] Improved kanban view of Job Position
bzr revid: chiragdd7@gmail.com-20130905123334-lim1brk1av4lydqu
2013-09-05 18:03:34 +05:30
Chirag Dodiya (OpenERP Trainee) 1f2f2c9e3d [IMP] Improved kanban view of Job Position
bzr revid: chiragdd7@gmail.com-20130905113013-53tzmzoyu66ri3mw
2013-09-05 17:00:13 +05:30
Thibault Delavallée 8b48cc9520 [MERGE] addons: added groups when quick creating user in various addons.
bzr revid: tde@openerp.com-20130904141122-uaxlnu7qxzri4q3a
2013-09-04 16:11:22 +02:00
Thibault Delavallée ed0a829cb3 [MERGE] [IMP] addons: improved name and tooltips of groupby date in various addons.
bzr revid: tde@openerp.com-20130904141053-yustqiuzynbettq8
2013-09-04 16:10:53 +02:00
Chirag Dodiya (OpenERP Trainee) dca6a4575e [IMP] Improved form view of Job Position as per suggestion
bzr revid: chiragdd7@gmail.com-20130904132808-clg5cbx6r5g5mv3u
2013-09-04 18:58:08 +05:30
Turkesh Patel (Open ERP) ed4d5b0bc6 [IMP] improved typo in help
bzr revid: tpa@tinyerp.com-20130826131536-1gpbr9xwbs3vkh8c
2013-08-26 18:45:36 +05:30
Turkesh Patel (Open ERP) 155d152b90 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130826053724-dzymzruugarkfv34
2013-08-26 11:07:24 +05:30
Chirag Dodiya (OpenERP Trainee) f5bdd59310 [IMP] Improved view of Job Position and Applications
bzr revid: chiragdd7@gmail.com-20130823132428-os79zm92txk26r97
2013-08-23 18:54:28 +05:30
Amit Bhavsar (Open ERP) 073bf7d937 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130822112419-vz74jafyh2kavq76
2013-08-22 16:54:19 +05:30
bth-openerp 2e4397868d [MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130822094920-uye48grby8tj0guc
2013-08-22 15:19:20 +05:30
bth-openerp ef21f58651 [IMP]Improved write method and previous_stage_id to last_stage_id.
bzr revid: bth@tinyerp.com-20130819093136-52igwbmi3bx30b6i
2013-08-19 15:01:36 +05:30
bth-openerp 10b0c0e12c [REM]Removed refused filter.
bzr revid: bth@tinyerp.com-20130813120447-aq9971a1ln2vwuq8
2013-08-13 17:34:47 +05:30
Amit Bhavsar (Open ERP) 028d62c391 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130812121219-4opfk262kgmakvsb
2013-08-12 17:42:19 +05:30
Sunil Sharma (OpenERP Trainee) 647db81c56 [IMP]:truck-hr_recruitment-job_positions:
bzr revid: sunilsharma.sharma07@gmail.com-20130731132535-f83r0hvva9zjmkt1
2013-07-31 18:55:35 +05:30
Turkesh Patel (Open ERP) b210c4de66 [MRG] merge with lp:openobject-addons, changes of stage state task merged in this changes
bzr revid: tpa@tinyerp.com-20130726124542-dl3f1g0jgmb8gjan
2013-07-26 18:15:42 +05:30
Turkesh Patel (Open ERP) 2973e67036 [IMP] added sub type of apllicant assigned and improved code for others,improved code for alias error,added unread message box
bzr revid: tpa@tinyerp.com-20130726120553-pkksdzihs8a3fq7d
2013-07-26 17:35:53 +05:30
bth-openerp 9a49a6c2dc [MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130717053307-qtsb5djddkc41rpc
2013-07-17 11:03:07 +05:30
Jignesh Rathod (OpenERP) 81ff01a16f Merge With Latest code.
bzr revid: jir@tinyerp.com-20130715102004-yf1m53zllc1ruvuc
2013-07-15 15:50:04 +05:30
Jignesh Rathod (OpenERP) 84bb3d0fd5 [IMP] Remove Dependancy document_ftp.
bzr revid: jir@tinyerp.com-20130715101035-3kure8xsc7rs9b3j
2013-07-15 15:40:35 +05:30
Thibault Delavallée f5c09b4002 [FIX] hr_recruitment: fixed onchange_department causing the stage to be resetted
bzr revid: tde@openerp.com-20130708131040-72tke0a25mes9wwp
2013-07-08 15:10:40 +02:00
Thibault Delavallée 7f2795fe16 [IMP] hr_recruitment: added date_last_stage_update and stage_id in search
bzr revid: tde@openerp.com-20130708125658-3igmpfx39ug67iwg
2013-07-08 14:56:58 +02:00
Thibault Delavallée 05359f0909 [IMP] hr_recruitment: added date_last_stage_update field, holding date of last stage modification; removed hired.employee wizard that does not seem to be used anywhere, nor to be useful.
bzr revid: tde@openerp.com-20130708091156-3l6fcl6drd4b6w2y
2013-07-08 11:11:56 +02:00
Thibault Delavallée 8ae77f33cc [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130708082630-s26q27e5jw0a2592
2013-07-08 10:26:30 +02:00
Turkesh Patel (Open ERP) e4fd9bb105 [IMP] improved view and code to show default alias for job
bzr revid: tpa@tinyerp.com-20130704083631-e0cyn2fxpqfhg5hb
2013-07-04 14:06:31 +05:30
Turkesh Patel (Open ERP) fb58f9ad8f [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130703105303-6kp687pgf34lwrms
2013-07-03 16:23:03 +05:30
Martin Trigaux d2d72d8416 [MERGE] forward port of saas-1 up to revision 8749 (mat@openerp.com-20130702135856-kmg7d8anw17nkbd8)
bzr revid: mat@openerp.com-20130702144646-y1wqs5mz4rzoh50g
2013-07-02 16:46:46 +02:00
Christophe Simonis bf29a2ebc7 [MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Turkesh Patel (Open ERP) 8dc25ac0b4 [IMP] improved code
bzr revid: tpa@tinyerp.com-20130702072739-6axuh3cdqfimmgvq
2013-07-02 12:57:39 +05:30
Turkesh Patel (Open ERP) c3e7429343 [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130701091520-tdkxicwr7psc6ig4
2013-07-01 14:45:20 +05:30
Thibault Delavallée 589826e187 [IMP] hr_recruitment: button 'create employee' now a link next to the emp_id field.
bzr revid: tde@openerp.com-20130627154505-oe8wb62brm927knr
2013-06-27 17:45:05 +02:00
Turkesh Patel (Open ERP) 62a5ecfca3 [IMP] improved view(put image of one line in right side corner),remove no of unread messgaes box
bzr revid: tpa@tinyerp.com-20130627101345-3rz418crnh0122vr
2013-06-27 15:43:45 +05:30
Thibault Delavallée 9dfa8563ef [REF] hr_recruitment: removed base_stage inheritance, state field. Updated views / reports. Still not updated subtypes.
bzr revid: tde@openerp.com-20130627094807-8vg21s2w0lqblrza
2013-06-27 11:48:07 +02:00
Amit Bhavsar (Open ERP) 34f15e56d9 [HR] Improve view,title,tooltip and code.
bzr revid: amb@tinyerp.com-20130626121617-17i92ua5yty8htwu
2013-06-26 17:46:17 +05:30
Purnendu Singh (OpenERP) 254dc5b8a9 [MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20130626100756-56td56rp3ido6cpx
2013-06-26 15:37:56 +05:30
Jignesh Rathod (OpenERP) 2e0f80d5a0 Merge with latest addons.
bzr revid: jir@tinyerp.com-20130625131004-rr8p0qc55w5k8owr
2013-06-25 18:40:04 +05:30
Thibault Delavallée 27ae6e25a2 [FIX] hr_recruitment: fixed view preventing from creating a new job
bzr revid: tde@openerp.com-20130625084621-smra6kdy7fj42o5d
2013-06-25 10:46:21 +02:00
Thibault Delavallée f9bc6be1ac [CLEAN] Before merging: removed an added file not used; cleaned some debugging data; improved user form view to better separate email/login and messaging alias.
bzr revid: tde@openerp.com-20130621110344-zx2kxan47uctctka
2013-06-21 13:03:44 +02:00
Turkesh Patel (Open ERP) 7f97b9339f [ADD] show no of unread messages in kanban box,improved code to post messge when new applicant created.
bzr revid: tpa@tinyerp.com-20130620054909-dduypa8vdl0y8407
2013-06-20 11:19:09 +05:30
Turkesh Patel (Open ERP) 128f012c9b [IMP] add sub-type to follow in progress phase,improved form view,improved kanban view, improved css
bzr revid: tpa@tinyerp.com-20130619093203-oxkl3awv6kr65v01
2013-06-19 15:02:03 +05:30
Thibault Delavallée 9005541f99 [FIX] crm, project.task, project.issue, hr_recruitment: fixed quick create in kanban, simplified a bit the code in the various create overrides.
bzr revid: tde@openerp.com-20130619114633-pb0rtz0kivlrabcx
2013-06-19 13:46:33 +02:00
Jignesh Rathod (OpenERP) dd383ba2ad Change resume position in search view.
bzr revid: jir@tinyerp.com-20130617091455-ylva2e097hos1hbx
2013-06-17 14:44:55 +05:30
bth-openerp c85ee0e63c [IMP]Use Relational field instead of char.
bzr revid: bth@tinyerp.com-20130614061331-cwvbtvnc4eik4asu
2013-06-14 11:43:31 +05:30
bth-openerp 1afc1b4b6e [IMP]Add tooltip pn previous_stage Group by and add that field in Recruitment analysis too.
bzr revid: bth@tinyerp.com-20130613054038-dql0vus9j2ti9mqf
2013-06-13 11:10:38 +05:30
Thibault Delavallée fc44f25d3a [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130612123429-a4mp0wiicdhlvk0m
2013-06-12 14:34:29 +02:00
bth-openerp 927f4db0e0 [IMP]prev_stage to previous_stage,Refused stage to refused applicants and previous stage is moved near stage in group by.
bzr revid: bth@tinyerp.com-20130612070008-9lfr2nxnvm5k6epu
2013-06-12 12:30:08 +05:30
Jignesh Rathod (OpenERP) 0a44c54786 Improve code.
bzr revid: jir@tinyerp.com-20130611133141-v9jm2gjst33bdf4c
2013-06-11 19:01:41 +05:30
Jignesh Rathod (OpenERP) 0653e597f6 Changes Code.
bzr revid: jir@tinyerp.com-20130611051801-3eycn095439p5od2
2013-06-11 10:48:01 +05:30
Turkesh Patel (Open ERP) 59b445c4df [IMP] improved code and view.
bzr revid: tpa@tinyerp.com-20130610090938-ovrrngwaswzung7v
2013-06-10 14:39:38 +05:30
bth-openerp 53e8ddb3df [MERGE]Merge lp:openobject-addons.
bzr revid: bth@tinyerp.com-20130610052927-b496hrq36mlrs5xi
2013-06-10 10:59:27 +05:30
Jignesh Rathod (OpenERP) c46526a9dc Improve Code.
bzr revid: jir@tinyerp.com-20130607131646-kkeo1nuue6klbikj
2013-06-07 18:46:46 +05:30
Turkesh Patel (Open ERP) a46089317d [RMV] revert applications link from job form view
bzr revid: tpa@tinyerp.com-20130607100336-yi2ds37f0i6gm5yj
2013-06-07 15:33:36 +05:30
Turkesh Patel (Open ERP) 1ef52b7fd4 [IMP] remove message posted on job when create applicant,add link for applicants on job form,improved view and typo.
bzr revid: tpa@tinyerp.com-20130606105411-28rc8wdi1uz9q335
2013-06-06 16:24:11 +05:30
Nimesh Contractor (OpenERP) 3160f39b17 [MERGE] with trunk
bzr revid: nco@tinyerp.com-20130603132631-o8dvw3v5x1wi3im6
2013-06-03 18:56:31 +05:30
Turkesh Patel (Open ERP) 928efd19b5 [IMP] Improved css for edit button.
bzr revid: tpa@tinyerp.com-20130531105333-kg2ktcdawjfddzlv
2013-05-31 16:23:33 +05:30
Turkesh Patel (Open ERP) 4b2395f95e [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20130530123622-xxuk2yhii7gs9s24
2013-05-30 18:06:22 +05:30
Martin Trigaux 3b63e58960 [MERGE] hr_recruitment: Improve the kanban view to make it look like opportunity view
bzr revid: mat@openerp.com-20130530100852-xfb4vag9yyem4tcd
2013-05-30 12:08:52 +02:00
Turkesh Patel (Open ERP) f230267de1 [IMP] improved css
bzr revid: tpa@tinyerp.com-20130529090450-59f61vfyf1zaxw4f
2013-05-29 14:34:50 +05:30
Turkesh Patel (Open ERP) c2e75a7a65 [IMP] remove expected new employee from kanban and improved view
bzr revid: tpa@tinyerp.com-20130529061858-3ncrwczio8uwmzvq
2013-05-29 11:48:58 +05:30
Turkesh Patel (Open ERP) 4d74d76ff2 [IMP] add default job alias for .jobs
bzr revid: tpa@tinyerp.com-20130528133143-q21h2ld6ehhgo975
2013-05-28 19:01:43 +05:30
Turkesh Patel (Open ERP) fc295aad77 [RMV] revert the changes of making uniqe alias for all jobs
bzr revid: tpa@tinyerp.com-20130528090638-jh8u0l8od0zdixe8
2013-05-28 14:36:38 +05:30
Turkesh Patel (Open ERP) bb5d789032 [IMP] improved view
bzr revid: tpa@tinyerp.com-20130528061659-x3dwmhmu8db60uyq
2013-05-28 11:46:59 +05:30
Turkesh Patel (Open ERP) 0365283243 [IMP] Add one alias for all jobs in the hr config view and related changes
bzr revid: tpa@tinyerp.com-20130527133237-s1s1ifi8cg3l1a07
2013-05-27 19:02:37 +05:30
Turkesh Patel (Open ERP) da476860dd [IMP] Iproved view and css
bzr revid: tpa@tinyerp.com-20130524125739-2h9etthwlb80qeub
2013-05-24 18:27:39 +05:30
Turkesh Patel (Open ERP) 3ca63cc9b1 [IMP] Improve and remove unnecessary code
bzr revid: tpa@tinyerp.com-20130524101611-r6lr1ifjcs92xyes
2013-05-24 15:46:11 +05:30
Turkesh Patel (Open ERP) 348a88c44b [IMP] remove inline css and improve view
bzr revid: tpa@tinyerp.com-20130524095200-vgd6829vk1znn9na
2013-05-24 15:22:00 +05:30
Turkesh Patel (Open ERP) 572c8ddfc6 [IMP] use related field insted of function field to get manager_id of reated department
bzr revid: tpa@tinyerp.com-20130523132211-b9uf21w007i6adtb
2013-05-23 18:52:11 +05:30
Turkesh Patel (Open ERP) f990ad3b36 [IMP] improved conditions in kanban
bzr revid: tpa@tinyerp.com-20130523130232-31bshcp04dntraxd
2013-05-23 18:32:32 +05:30
Turkesh Patel (Open ERP) 874a27a9c0 [IMP] improve code and add field in hr configuration to add default alias prefix for the job.
bzr revid: tpa@tinyerp.com-20130523120819-o2p3ziex4ioaatil
2013-05-23 17:38:19 +05:30
Vishmita Jadeja (openerp) 3369744ac0 [IMP]Add JustGage library in job position kanban
bzr revid: vja@tinyerp.com-20130517134341-e8kvjxv5lrc36gde
2013-05-17 19:13:41 +05:30
Paramjit Singh Sahota 1d9a315be4 [Revert] Reverted some code of last commits which was removed by mistake.
bzr revid: psa@tinyerp.com-20130517065710-zktm4zm955w0wlgf
2013-05-17 12:27:10 +05:30
Paramjit Singh Sahota 9f6c2f7534 [MERGE] Merged main branch lp:~openerp-dev/openobject-addons/trunk-job-positions and removed CONFLICTS.
bzr revid: psa@tinyerp.com-20130517063510-5oqrwb9yx973z5mi
2013-05-17 12:05:10 +05:30
Vishmita Jadeja (openerp) a231356ba3 [IMP]usability improvements
bzr revid: vja@tinyerp.com-20130517060757-kispsuailcf7qx6h
2013-05-17 11:37:57 +05:30
Vishmita Jadeja (openerp) 9bd2299a69 [REV]Revert last commmit
bzr revid: vja@tinyerp.com-20130517054403-kv361vjdn620egns
2013-05-17 11:14:03 +05:30
Paramjit Singh Sahota 90585320ee [IMP] Added Recruitment Done button in kanban.
bzr revid: psa@tinyerp.com-20130516113330-e43v2aqwh7r1pk3o
2013-05-16 17:03:30 +05:30
Paramjit Singh Sahota 1a0daca6b2 [IMP] Added 'state' field in kanban view to get the kanban header with the state name.
bzr revid: psa@tinyerp.com-20130516095052-hhoan2uzybtgbqkb
2013-05-16 15:20:52 +05:30
Paramjit Singh Sahota 0c62543724 [IMP] Improved string 'recruitement' => 'recruitment'.
bzr revid: psa@tinyerp.com-20130515132625-r7t7ittv2zqno1rc
2013-05-15 18:56:25 +05:30
Paramjit Singh Sahota 9d3faec1b7 [IMP] Added Launch Recruitment and Print Interview in kanban card in Job positions.
bzr revid: psa@tinyerp.com-20130515125253-o7vg2vmmxb9hf9vy
2013-05-15 18:22:53 +05:30
Thibault Delavallée 6d06f75efc [IMP] project, hr, crm: improved form views about email aliases... another iteration of improvement.
bzr revid: tde@openerp.com-20130510102147-fq98n6qf88a45ti0
2013-05-10 12:21:47 +02:00
Vishmita Jadeja (openerp) 50082c1160 [IMP]Improve code for interview link and add field no_of_application in job position form
bzr revid: vja@tinyerp.com-20130509092252-e26nsd25vwugrtrw
2013-05-09 14:52:52 +05:30
bth-openerp 6850809fab [IMP]Add filter on Refused stage and group by on previous stage.
bzr revid: bth@tinyerp.com-20130509061412-v4mo1ipaedcm56rk
2013-05-09 11:44:12 +05:30
Thibault Delavallée 93a112e9f2 [IMP] hr, res_users, project, mail_group: improved form view about aliases, following new specs.
bzr revid: tde@openerp.com-20130507122223-scy54ukfdndtj2d8
2013-05-07 14:22:23 +02:00
Vishmita Jadeja (openerp) 866c2b4236 [IMP]Improve code for job position
bzr revid: vja@tinyerp.com-20130507071909-ses82n9qvqxdt4gn
2013-05-07 12:49:09 +05:30
Vishmita Jadeja (openerp) 0d86132696 [Merge]Merge with trunk
bzr revid: vja@tinyerp.com-20130502133951-dcahyemvqxpqrqq0
2013-05-02 19:09:51 +05:30
Dharti Ratani (Open ERP) 117f13e1bd [MERGE]Merged with trunk
bzr revid: dhr@tinyerp.com-20130417065100-k0398suq8yvaulfl
2013-04-17 12:21:00 +05:30
Thibault Delavallée a91274c18c [IMP] project, mail_group, hr_job, sales team: added alias_contact parameter in form view. Also fixed a typo in project form view about visilibity -> privacy_visibility.
bzr revid: tde@openerp.com-20130416142901-c6wbc82yp2kwj1dt
2013-04-16 16:29:01 +02:00
Thibault Delavallée 3c79c0be17 [MERGE] Sync with trunk, especially about project and portal project security rules that were backported into 7.0
bzr revid: tde@openerp.com-20130416081736-ictzkj9feu46wm6y
2013-04-16 10:17:36 +02:00
Thibault Delavallée 812c852fd0 [FORWARD] Merged 7.0 addons revisions until 9021
bzr revid: tde@openerp.com-20130415084302-hx7zxtpl5u6yphfg
bzr revid: tde@openerp.com-20130415153732-v4ols3t56rku92oz
2013-04-15 17:37:32 +02:00
Cedric Snauwaert d6d2f4edbf [FIX]hr_recruitment: remove group on field create_date
bzr revid: csn@openerp.com-20130412134400-87dzu83x8vewayuo
2013-04-12 15:44:00 +02:00
Vishmita Jadeja (openerp) ce4064a34f [IMP]improve code
bzr revid: vja@tinyerp.com-20130410072731-571veon8fh877yuc
2013-04-10 12:57:31 +05:30
Thibault Delavallée a3de5c872f [REF] [IMP] mail_alias improvement
alias_name is not required anymore
crm, hr_job, project, mail_group, res_users: alias creation is now different
and done more like other inherits, except an alias_model_name that is given
to the context to find the alias alias_model_id.
crm, jr_job, project, mail_group, res_users: updated form views using
aliases
mail_alias: added a filter on 'inactive' aliases (alias_name False) and
added a button to redirect to the related document if any

bzr revid: tde@openerp.com-20130409111158-bv04n5o01z9l3c17
2013-04-09 13:11:58 +02:00
Vishmita Jadeja (openerp) 245dc70854 [IMP]Minor change
bzr revid: vja@tinyerp.com-20130409052856-lekkyllythvpcrrx
2013-04-09 10:58:56 +05:30
Vishmita Jadeja (openerp) 8aedb65d2a [IMP]put message counter in menu
bzr revid: vja@tinyerp.com-20130405132243-b333jiqthz6mcaf9
2013-04-05 18:52:43 +05:30
Thibault Delavallée 034d244be6 [REF] crm, hr, project: refactored kanban/form html/css to be cleaner and remove custom CSS. kanban specific css for aliases has been moved into web_kanban.
bzr revid: tde@openerp.com-20130405110737-xhdgxodrffqtfrzp
2013-04-05 13:07:37 +02:00
Vishmita Jadeja (openerp) df4e9cfe55 [IMP]text-decoration on hover
bzr revid: vja@tinyerp.com-20130405072739-iidgnfu5kjd6xswn
2013-04-05 12:57:39 +05:30
Vishmita Jadeja (openerp) 0e9937f975 [IMP]css
bzr revid: vja@tinyerp.com-20130405064933-9a73250m7ptklyke
2013-04-05 12:19:33 +05:30
Vishmita Jadeja (openerp) 91b707601c [IMP]Improve code for message
bzr revid: vja@tinyerp.com-20130404132327-plhkcvcen1419po7
2013-04-04 18:53:27 +05:30
Vishmita Jadeja (openerp) 9c0103c56b [IMP]Improve Code
bzr revid: vja@tinyerp.com-20130404122640-nib2nd3dszy1vwju
2013-04-04 17:56:40 +05:30