Commit Graph

896 Commits

Author SHA1 Message Date
pawan.sharma 897afff164 Merge branch 'sub_project_timesheet' into 'master'
remove check box condition from subproject compute method

See merge request prakash.jain/cor-odoo!272
2022-11-07 14:43:00 +05:30
sunarctech d8dac35632 remove check box condition from subproject compute method 2022-11-07 14:37:23 +05:30
pawan.sharma 3c11078cfa Merge branch 'sub_project_timesheet' into 'master'
remove timesheet sup-project issue

See merge request prakash.jain/cor-odoo!271
2022-11-07 13:48:22 +05:30
sunarctech 242790bfa4 remove timesheet sup-project issue 2022-11-07 13:28:33 +05:30
prakash.jain 82b5c5b549 Merge branch 'duplicate_resource' into 'master'
Duplicate resource

See merge request prakash.jain/cor-odoo!270
2022-10-31 20:24:02 +05:30
root 060551f72e client reported issue reported 2022-10-31 20:10:10 +05:30
pawan.sharma a2418f282d modify write method call method directly 2022-10-31 18:51:01 +05:30
pawan.sharma 7e966296c6 change in create method related method for add resource 2022-10-31 18:32:53 +05:30
pawan.sharma 786b78d015 remove conflict 2022-10-31 18:28:17 +05:30
pawan.sharma 7ef00b3ec7 Added resource add condition in write method 2022-10-31 18:26:16 +05:30
prakash.jain 1d546d045b Merge branch 'duplicate_resource' into 'master'
create and write revert

See merge request prakash.jain/cor-odoo!269
2022-10-31 14:58:50 +05:30
root 0f55764a79 create and write revert 2022-10-31 14:58:13 +05:30
prakash.jain 802f1f4a5b Merge branch 'duplicate_resource' into 'master'
Duplicate resource

See merge request prakash.jain/cor-odoo!268
2022-10-31 14:38:13 +05:30
pawan.sharma 6e6bf91d10 Added Create method for add default resource 2022-10-31 14:28:36 +05:30
pawan.sharma 1b88f819ea Added Create method for add default resource 2022-10-31 13:51:56 +05:30
pawan.sharma 0fce9bedd9 Added Create and write method for add default resource 2022-10-31 13:38:10 +05:30
prakash.jain f9976e1d5e Merge branch 'cor_cr' into 'master'
End date removed

See merge request prakash.jain/cor-odoo!267
2022-10-21 18:21:36 +05:30
root 7315ddca3d End date removed 2022-10-21 18:13:14 +05:30
prakash.jain ab479520e1 Merge branch 'cor_cr' into 'master'
End date filter removed in filter/groupby

See merge request prakash.jain/cor-odoo!265
2022-10-21 15:33:04 +05:30
root 0e104978c3 End date filter removed in filter/groupby 2022-10-21 15:29:28 +05:30
prakash.jain aa41d29a36 Merge branch 'cor_cr' into 'master'
report bud hrs and rev display updated

See merge request prakash.jain/cor-odoo!264
2022-10-21 14:51:39 +05:30
root dfc9116dd2 report bud hrs and rev display updated 2022-10-21 14:49:14 +05:30
prakash.jain 642c93f04c Merge branch 'cor_cr' into 'master'
Cor cr

See merge request prakash.jain/cor-odoo!263
2022-10-21 14:14:50 +05:30
root 0a82aa75a3 date to null added for bud, hrs, rev and exp amt 2022-10-21 13:28:04 +05:30
root f8863a95e9 Revert unique constraints 2022-10-21 11:50:14 +05:30
root 802b029e15 Report budgeted qty and amt updated not based on date 2022-10-21 11:19:49 +05:30
prakash.jain e84ec53306 Merge branch 'cor_cr' into 'master'
report budgeted hours filter added

See merge request prakash.jain/cor-odoo!262
2022-10-16 22:30:50 +05:30
root 01370f96e5 report budgeted hours filter added 2022-10-16 22:29:06 +05:30
prakash.jain eff2ee2592 Merge branch 'cor_cr' into 'master'
project report zero entry removed based on client feedback

See merge request prakash.jain/cor-odoo!261
2022-10-12 17:12:13 +05:30
root c0df72ed82 project report zero entry removed based on client feedback 2022-10-12 17:11:29 +05:30
prakash.jain 63a244b9ed Merge branch 'cor_cr' into 'master'
subproject condition updated

See merge request prakash.jain/cor-odoo!260
2022-10-11 15:01:46 +05:30
root 41e921419f subproject condition updated 2022-10-11 14:58:21 +05:30
pawan.sharma 1a778e84c6 Merge branch 'cor_cr' into 'master'
Cor cr

See merge request prakash.jain/cor-odoo!259
2022-10-10 11:37:30 +05:30
pawan.sharma 726f3ca169 add internaluser condition in project user secruity group 2022-10-07 18:24:12 +05:30
pawan.sharma 342041ab85 customize onchange method for show projects in timesheet 2022-10-07 18:18:21 +05:30
pawan.sharma a867e52859 add sub_project condition in timesheet project filter 2022-10-07 17:06:16 +05:30
prakash.jain af78ed38c0 Merge branch 'cor_cr' into 'master'
report sub updated

See merge request prakash.jain/cor-odoo!258
2022-10-04 07:45:52 +05:30
root fd648e0b17 report sub updated 2022-10-04 07:43:52 +05:30
prakash.jain 2712b05634 Merge branch 'cor_cr' into 'master'
report and pro validation if stat updated

See merge request prakash.jain/cor-odoo!257
2022-10-03 22:39:54 +05:30
root 88656c33e8 report and pro validation if stat updated 2022-10-03 22:39:06 +05:30
prakash.jain 868a008eb3 Merge branch 'cor_cr' into 'master'
Report profit amt if cond updated

See merge request prakash.jain/cor-odoo!256
2022-10-03 10:46:19 +05:30
root 51024ef211 Report profit amt if cond updated 2022-10-03 10:44:01 +05:30
prakash.jain 50c34c2c72 Merge branch 'cor_cr' into 'master'
Cor cr

See merge request prakash.jain/cor-odoo!255
2022-09-30 20:05:30 +05:30
root 86c8c0428d print stat uncomment 2022-09-30 20:04:48 +05:30
root 14847875e8 project sub project related issue fixed 2022-09-30 19:52:34 +05:30
root 54da864d9d Parent sub project wrong field issue fixed 2022-09-30 15:52:02 +05:30
pawan.sharma 77216be798 Merge branch 'cor_cr' of https://gitlab.sunarctechnologies.com/prakash.jain/cor-odoo into cor_cr 2022-09-29 18:53:19 +05:30
pawan.sharma 9e320b7c5c calculate timesheet hours for sub_project 2022-09-29 18:25:02 +05:30
prakash.jain a109b3d8b2 Merge branch 'cor_cr' into 'master'
report revert

See merge request prakash.jain/cor-odoo!254
2022-09-29 16:43:24 +05:30
root 7e8a61eab4 report revert 2022-09-29 16:42:40 +05:30