Commit Graph

580 Commits

Author SHA1 Message Date
pawan.sharma 894160e02c comment custom code 2021-07-09 15:04:24 +05:30
pawan.sharma 8c76d01d5f Merge branch 'development' of https://gitlab.sunarctechnologies.com/prakash.jain/cor-odoo into leave_manage 2021-07-08 17:45:20 +05:30
pawan.sharma b2f6d2bb2e update pluggin 2021-07-08 17:43:50 +05:30
pawan.sharma 2fe7ebe0aa Merge branch 'leave_manage' into 'development'
Leave manage

See merge request prakash.jain/cor-odoo!183
2021-07-07 07:15:00 +00:00
pawan.sharma 633a2bbb66 add public holiday paid pluggin 2021-07-07 12:44:04 +05:30
pawan.sharma bffade6c6e add validation for overlap two timesheet entries 2021-07-06 11:00:08 +05:30
Pawan Kumar 90f690f3eb show leave entry in timesheet with start and end datetime 2021-06-09 12:20:07 +05:30
prakash.jain 190f47b93b Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!182
2021-05-13 00:00:16 -07:00
pawan.sharma eb5d9a7788 Merge branch 'pawan_branch' into 'development'
create consultant when project type consultant rate

See merge request prakash.jain/cor-odoo!180
2021-05-12 23:58:26 -07:00
Pawan Kumar 46661a689e create consultant when project type consultant rate 2021-05-13 12:27:47 +05:30
prakash.jain 845b3f3b76 Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!179
2021-05-12 23:23:23 -07:00
pawan.sharma 1bf1087316 Merge branch 'pawan_branch' into 'development'
comment project display name

See merge request prakash.jain/cor-odoo!175
2021-05-12 23:11:16 -07:00
Pawan Kumar 499f6c97a6 comment project display name 2021-05-13 11:39:30 +05:30
prakash.jain 065a918c23 Merge branch 'development' into 'master'
Report active field added

See merge request prakash.jain/cor-odoo!174
2021-04-22 00:00:20 -07:00
projectsodoo 66df5d1806 Report active field added 2021-04-22 12:29:17 +05:30
prakash.jain 7417fd4d9c Merge branch 'development' into 'master'
remove console.log

See merge request prakash.jain/cor-odoo!173
2021-04-07 02:00:29 -07:00
projectsodoo cc9fee570c remove console.log 2021-04-07 14:29:25 +05:30
prakash.jain e28b2b38a4 Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!172
2021-04-07 01:43:52 -07:00
projectsodoo 3a7625a6aa Report project inactive hidden 2021-04-07 14:12:18 +05:30
pawan.sharma 30400d73bd Merge branch 'pawan_branch' into 'development'
change desc to asc

See merge request prakash.jain/cor-odoo!171
2021-04-06 23:40:37 -07:00
Pawan Kumar 92980f8473 change desc to asc 2021-04-07 12:09:52 +05:30
pawan.sharma 38b24543aa Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!169
2021-04-06 23:21:01 -07:00
Pawan Kumar fc09e07f35 update date from datetime 2021-04-07 11:50:32 +05:30
Pawan Kumar ee6e83a30b update date from datetime 2021-04-07 11:50:23 +05:30
pawan.sharma a07d2052fe Merge branch 'pawan_branch' into 'development'
sort hours within date

See merge request prakash.jain/cor-odoo!168
2021-04-06 22:24:15 -07:00
Pawan Kumar 1167fc1673 sort hours within date 2021-04-07 10:53:46 +05:30
pawan.sharma 0f03e1d76d Merge branch 'pawan_branch' into 'development'
sort hours within date

See merge request prakash.jain/cor-odoo!167
2021-04-06 22:04:03 -07:00
Pawan Kumar dca23eed46 sort hours within date 2021-04-07 10:32:47 +05:30
prakash.jain ef5b5191f9 Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!166
2021-04-05 07:37:52 -07:00
projectsodoo 9dd2bcdb23 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into development 2021-04-05 20:06:21 +05:30
projectsodoo 40e3dbd642 Report timezone utc to jersalem updated 2021-04-05 20:05:56 +05:30
prakash.jain 25b11d864b Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!165
2021-03-31 03:00:57 -07:00
pawan.sharma f97393f2e4 Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!164
2021-03-31 00:14:38 -07:00
Pawan Kumar 978f54e19e add project name in email template for task 2021-03-31 12:41:15 +05:30
Pawan Kumar a4cb1beb80 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-03-30 17:03:46 +05:30
prakash.jain 5dee9cbce6 Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!163
2021-03-24 23:36:04 -07:00
pawan.sharma 0141551d9c Merge branch 'pawan_branch' into 'development'
changre progress to % quoted hour

See merge request prakash.jain/cor-odoo!161
2021-03-24 23:04:52 -07:00
Pawan Kumar 2d6b4c4731 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-03-25 11:32:26 +05:30
Pawan Kumar 6c955e9d16 changre progress to % quoted hour 2021-03-25 11:31:53 +05:30
prakash.jain 700d9f2843 Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!160
2021-03-23 04:54:55 -07:00
pawan.sharma 8f7fb53acb Merge branch 'pawan_branch' into 'development'
add name_get method for show project in calendar screen

See merge request prakash.jain/cor-odoo!156
2021-03-23 04:37:33 -07:00
Pawan Kumar 6b6c615a69 add name_get method for show project in calendar screen 2021-03-23 11:32:15 +05:30
prakash.jain a716e7bdc2 Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!155
2021-03-09 22:44:44 -08:00
pawan.sharma f683b91994 Merge branch 'pawan_branch' into 'development'
remove subproject from onchange method

See merge request prakash.jain/cor-odoo!152
2021-03-09 22:23:40 -08:00
Pawan Kumar 6890a77af0 remove subproject from onchange method 2021-03-10 11:53:10 +05:30
prakash.jain d9a1a8166e Merge branch 'development' into 'master'
Report subproject updated based on new timesheet field

See merge request prakash.jain/cor-odoo!151
2021-03-09 05:33:32 -08:00
projectsodoo 91a58b73c8 Report subproject updated based on new timesheet field 2021-03-09 19:02:36 +05:30
prakash.jain 0560941a73 Merge branch 'development' into 'master'
Updated Timesheet report filter

See merge request prakash.jain/cor-odoo!150
2021-03-09 04:49:25 -08:00
projectsodoo 9647e89cc7 Updated Timesheet report filter 2021-03-09 18:18:40 +05:30
prakash.jain 9d74237ed0 Merge branch 'development' into 'master'
Start and end time remove in py file

See merge request prakash.jain/cor-odoo!149
2021-03-09 00:20:26 -08:00