Commit Graph

469 Commits

Author SHA1 Message Date
Pawan Kumar 6131bda6c9 add subproject from parentproject 2021-02-25 11:46:02 +05:30
Pawan Kumar de18e80da6 change position of fields 2021-02-25 10:52:59 +05:30
Pawan Kumar c37ef70045 add parent project field 2021-02-25 10:36:04 +05:30
projectsodoo 4c4f5d94a6 Sub project alias changed 2021-02-25 10:30:25 +05:30
pawan.sharma d155133125 Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!130
2021-02-24 10:08:57 -08:00
Pawan Kumar d35031f50e add code for project and sub-project 2021-02-24 23:38:16 +05:30
Pawan Kumar 2e6a1e8a49 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-02-24 20:09:51 +05:30
Pawan Kumar 4f5639cb6a remove conflict 2021-02-24 20:09:09 +05:30
pawan.sharma 2313264d29 Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!129
2021-02-24 06:31:17 -08:00
Pawan Kumar 2e9fa884e8 add sub-project as seperate view 2021-02-24 20:00:31 +05:30
projectsodoo e53f681590 Label changed 2021-02-24 18:35:03 +05:30
Pawan Kumar da5c504f77 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-02-23 09:41:21 +05:30
projectsodoo 037867ac03 Updated js lib 2021-02-23 09:30:08 +05:30
projectsodoo 84237ed6d1 Updated graph lib 2021-02-23 09:06:58 +05:30
projectsodoo ef73c8f3b4 Updated report code 2021-02-23 06:58:02 +05:30
Pawan Kumar 6630f990f9 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-02-22 22:52:26 +05:30
projectsodoo efbf53ce4c updated default group month to day 2021-02-22 20:04:32 +05:30
projectsodoo c43d13135e updated default group 2021-02-22 19:48:57 +05:30
projectsodoo 5820924dbe updated default group 2021-02-22 19:32:32 +05:30
projectsodoo 97e0e6f5fc Updated hours to timeline 2021-02-22 19:16:06 +05:30
projectsodoo a45acbe64c hide x-axis value 2021-02-22 19:04:17 +05:30
projectsodoo bbbb05930a Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into development 2021-02-22 10:35:46 +05:30
projectsodoo 769f93e6f2 Report updated start and end datetime 2021-02-22 10:35:15 +05:30
pawan.sharma 4008e5d622 Merge branch 'pawan_branch' into 'development'
show done task on archive

See merge request prakash.jain/cor-odoo!128
2021-02-21 20:43:18 -08:00
Pawan Kumar c27cabec58 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-02-22 10:12:38 +05:30
Pawan Kumar 050d49d105 show done task on archive 2021-02-22 10:11:59 +05:30
projectsodoo fab3b4cac2 View allocation extra field added 2021-02-19 18:51:33 +05:30
projectsodoo cfad602d4b group updated 2021-02-19 15:54:38 +05:30
projectsodoo 7cd23e0ff4 group updated 2021-02-19 15:48:25 +05:30
projectsodoo 6ca76158c1 group updated 2021-02-19 15:25:53 +05:30
projectsodoo 8aaecc4489 removed unused file 2021-02-19 15:16:02 +05:30
projectsodoo 59912fa8ae Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into development 2021-02-19 15:10:02 +05:30
projectsodoo 9751aca18c updated view and rule 2021-02-19 15:09:11 +05:30
pawan.sharma c929f54d18 Merge branch 'pawan_branch' into 'development'
remove comment

See merge request prakash.jain/cor-odoo!127
2021-02-18 10:32:34 -08:00
Pawan Kumar 19f13ab82d remove comment 2021-02-19 00:02:06 +05:30
pawan.sharma fa4765125b Merge branch 'revert-f15e6f83' into 'development'
Revert "Merge branch 'pawan_branch' into 'development'"

See merge request prakash.jain/cor-odoo!126
2021-02-18 10:13:38 -08:00
pawan.sharma b5ba78382b Revert "Merge branch 'pawan_branch' into 'development'"
This reverts merge request !125
2021-02-18 10:13:26 -08:00
pawan.sharma f15e6f835c Merge branch 'pawan_branch' into 'development'
remove extra code

See merge request prakash.jain/cor-odoo!125
2021-02-18 10:08:29 -08:00
Pawan Kumar 1f53a2712d remove extra code 2021-02-18 23:37:36 +05:30
pawan.sharma beef044d91 Merge branch 'pawan_branch' into 'development'
manager table store true

See merge request prakash.jain/cor-odoo!124
2021-02-18 07:06:28 -08:00
Pawan Kumar 98a135d612 manager table store true 2021-02-18 20:35:42 +05:30
pawan.sharma 07e8808ab0 Merge branch 'pawan_branch' into 'development'
table changes

See merge request prakash.jain/cor-odoo!123
2021-02-18 06:57:21 -08:00
Pawan Kumar f04408b5ec table changes 2021-02-18 20:26:55 +05:30
pawan.sharma 97dbdbd64a Merge branch 'pawan_branch' into 'development'
add project manager in view allocation

See merge request prakash.jain/cor-odoo!122
2021-02-18 06:49:33 -08:00
Pawan Kumar 66bf8188a4 add project manager in view allocation 2021-02-18 20:19:08 +05:30
pawan.sharma 6c9635b6cb Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!121
2021-02-18 06:40:20 -08:00
Pawan Kumar a7e1e51496 add project manager in view allocation 2021-02-18 20:09:48 +05:30
pawan.sharma 57293d915b Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!120
2021-02-18 05:44:22 -08:00
Pawan Kumar 551cc926b5 Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch 2021-02-18 19:14:06 +05:30
Pawan Kumar d76434022e hide start and end time 2021-02-18 19:13:42 +05:30