Commit Graph

333 Commits

Author SHA1 Message Date
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
Pawan Kumar 17a9451266 update hourly rate and budgeted hour per week 2021-01-19 15:15:04 +05:30
pawan.sharma 3977a4a261 Merge branch 'pawan_branch' into 'development'
add comment field in project screen

See merge request prakash.jain/cor-odoo!84
2021-01-19 00:19:06 -08:00
Pawan Kumar a6c0817b11 add comment field in project screen 2021-01-19 13:47:21 +05:30
projectsodoo 1ebcea9b16 Updated project hours vali 2021-01-19 12:38:25 +05:30
projectsodoo 4f2601e9fb Added file 2021-01-19 10:13:33 +05:30
projectsodoo 105261a6bb Bar chart updated 2021-01-18 23:01:38 +05:30
projectsodoo bec7b95d0b Report updated based on consultant allocated 2021-01-18 22:56:10 +05:30
projectsodoo e5b3900d63 Added file 2021-01-18 22:48:33 +05:30
projectsodoo 02847d5215 Consultant hours budgeted and actual project 2021-01-18 22:47:15 +05:30
pawan.sharma 3598e23e74 Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!83
2021-01-17 21:46:53 -08:00
Pawan Kumar 41dc6d8064 hide timesheet table and expense for fixed price project 2021-01-18 11:15:59 +05:30
Pawan Kumar 9bc6ad5daa add task menu as main menu 2021-01-18 10:32:21 +05:30
pawan.sharma f95da5542f Merge branch 'pawan_branch' into 'development'
hide service field

See merge request prakash.jain/cor-odoo!82
2021-01-14 00:15:21 -08:00
Pawan Kumar 42a9064056 hide service field 2021-01-14 13:44:45 +05:30
pawan.sharma 574b8a4ddf Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!81
2021-01-13 06:32:43 -08:00
Pawan Kumar 8d89942717 readonly timesheet table in project for fixed type project 2021-01-13 20:02:20 +05:30