Commit Graph

399 Commits

Author SHA1 Message Date
pawan.sharma aae9c7c950 Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!95
2021-01-27 23:24:25 -08:00
Pawan Kumar 81dd401362 change parent project to sub-project in timesheet 2021-01-28 12:53:56 +05:30
Pawan Kumar 9c1f081b2d change content from parent to sub-project 2021-01-28 12:53:18 +05:30
pawan.sharma a39756f0cb Merge branch 'pawan_branch' into 'development'
make hourly rate and actual revenue changes

See merge request prakash.jain/cor-odoo!94
2021-01-27 02:35:36 -08:00
Pawan Kumar e56b387853 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-01-27 16:05:03 +05:30
Pawan Kumar 53b5f304a9 make hourly rate and actual revenue changes 2021-01-27 16:04:36 +05:30
pawan.sharma c259a58d26 Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!93
2021-01-27 01:49:05 -08:00
Pawan Kumar 2d4415f027 remove issue from allocation user table 2021-01-27 15:18:32 +05:30
Pawan Kumar 8e7b3b64b0 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-01-27 15:03:32 +05:30
projectsodoo 3e4c65b280 Horizontal bar default issue updated 2021-01-27 13:11:33 +05:30
projectsodoo 864f2d516c Horizontal bar default updated 2021-01-27 13:05:37 +05:30
projectsodoo 9795f8e56d view allocation graph view updated 2021-01-27 12:55:44 +05:30
projectsodoo acbb48375c Report updated 2021-01-27 12:40:19 +05:30
projectsodoo 2825443359 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into development 2021-01-27 12:28:21 +05:30
projectsodoo e606053a76 Report updated subproject 2021-01-27 12:27:54 +05:30
pawan.sharma 60968b66f0 Merge branch 'pawan_branch' into 'development'
add total timesheet hours

See merge request prakash.jain/cor-odoo!92
2021-01-26 22:55:50 -08:00
Pawan Kumar 30d908ef66 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-01-27 12:25:24 +05:30
Pawan Kumar 76059a1af3 add total timesheet hours 2021-01-27 12:24:46 +05:30
pawan.sharma 8eb1632e4e Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!91
2021-01-26 22:05:02 -08:00
Pawan Kumar 2405293663 add parent project in timesheet 2021-01-27 11:34:33 +05:30
Pawan Kumar 92286476c8 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-01-27 11:25:56 +05:30
Pawan Kumar 6b89e32bb1 remove conflict 2021-01-27 11:25:43 +05:30
projectsodoo d725038710 Task timesheets start and end time added 2021-01-27 10:12:10 +05:30
projectsodoo e107914625 horizontal bar tootltip updated 2021-01-27 09:48:59 +05:30
Pawan Kumar 4241b11526 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-01-25 15:38:15 +05:30
Pawan Kumar 04b319e372 make employee price editable 2021-01-25 15:37:39 +05:30
projectsodoo f84ab1ca25 New horizontal bar view click added 2021-01-25 15:01:03 +05:30
pawan.sharma be21b693fb Merge branch 'pawan_branch' into 'development'
add actual_revenue calculation

See merge request prakash.jain/cor-odoo!90
2021-01-24 22:49:35 -08:00
Pawan Kumar 43a404c0e6 add actual_revenue calculation 2021-01-25 12:17:52 +05:30
projectsodoo 9f74cc80af Updated code 2021-01-25 12:05:03 +05:30
projectsodoo 84196a7d60 Vertical dashboard report added 2021-01-25 12:03:59 +05:30
projectsodoo 5bbdf18b18 Report updated 2021-01-25 12:02:34 +05:30
projectsodoo b02030d36e Report tree and timesheet date updated 2021-01-24 19:38:34 +05:30
projectsodoo 3519bc45ed Bar chart Report updated 2021-01-24 13:48:01 +05:30
projectsodoo 3779cb8b7e Consultant period dash percentage added 2021-01-23 13:51:16 +05:30
projectsodoo 8d71b9c3f9 Fixed coflicts 2021-01-23 09:29:01 +05:30
projectsodoo a5f43f8090 Updated bar chart related reports 2021-01-23 09:20:23 +05:30
pawan.sharma bd35f44e0b Merge branch 'pawan_branch' into 'development'
add allowed project user in consultant screen

See merge request prakash.jain/cor-odoo!89
2021-01-21 04:19:50 -08:00
Pawan Kumar 12af53c558 add allowed project user in consultant screen 2021-01-21 17:49:06 +05:30
pawan.sharma e14772d179 Merge branch 'pawan_branch' into 'development'
add tag for project

See merge request prakash.jain/cor-odoo!88
2021-01-21 03:56:55 -08:00
Pawan Kumar 909e336bee add tag for project 2021-01-21 17:26:12 +05:30
pawan.sharma b14aad9f8c Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!87
2021-01-21 03:20:12 -08:00
Pawan Kumar 5709ed9d3a add method for allow timesheet user 2021-01-21 16:48:53 +05:30
Pawan Kumar f01cb35b9c Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-01-19 16:59:38 +05:30
projectsodoo 2b1f7b4443 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into development 2021-01-19 16:04:15 +05:30
projectsodoo fb1420cf5b Label, rem and compute changed 2021-01-19 16:03:43 +05:30
pawan.sharma 195735f45a Merge branch 'pawan_branch' into 'development'
make readonly false for hourly rate field

See merge request prakash.jain/cor-odoo!86
2021-01-19 02:03:44 -08:00
Pawan Kumar b0cf7b6e91 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-01-19 15:33:25 +05:30
Pawan Kumar 2b8a10b469 make readonly false for hourly rate field 2021-01-19 15:33:00 +05:30
pawan.sharma 91f36d1a1c Merge branch 'pawan_branch' into 'development'
update hourly rate and budgeted hour per week

See merge request prakash.jain/cor-odoo!85
2021-01-19 01:45:57 -08:00