Commit Graph

703 Commits

Author SHA1 Message Date
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
projectsodoo 41d6dc8b72 Start and end time remove in py file 2021-03-09 13:49:35 +05:30
prakash.jain 9cca08af47 Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!147
2021-03-08 23:26:39 -08:00
projectsodoo 5da9e8b6e9 Date field hide in search 2021-03-09 12:49:18 +05:30
pawan.sharma f61761ef1f Merge branch 'pawan_branch' into 'development'
add subproject in calendar form view

See merge request prakash.jain/cor-odoo!146
2021-03-08 22:43:15 -08:00
Pawan Kumar 916923915a add subproject in calendar form view 2021-03-09 12:12:42 +05:30
pawan.sharma f7e73c2b16 Merge branch 'pawan_branch' into 'development'
add filter in timesheet project

See merge request prakash.jain/cor-odoo!145
2021-03-08 22:36:34 -08:00
Pawan Kumar 343a70922c add filter in timesheet project 2021-03-09 12:06:07 +05:30
pawan.sharma c92b75c546 Merge branch 'pawan_branch' into 'development'
remove conflict

See merge request prakash.jain/cor-odoo!144
2021-03-08 22:05:29 -08:00
Pawan Kumar cc70afeb4b remove conflict 2021-03-09 11:34:55 +05:30
pawan.sharma 6410ece7fa Merge branch 'pawan_branch' into 'development'
Pawan branch

See merge request prakash.jain/cor-odoo!142
2021-03-08 11:35:40 -08:00
Pawan Kumar 5b21582bb0 remove conflict 2021-03-09 01:04:56 +05:30
Pawan Kumar 79df1fb760 add code for project to sub-project 2021-03-09 01:02:02 +05:30
projectsodoo 0964d5378c Date to start date added timehseet 2021-03-08 22:34:01 +05:30
Pawan Kumar 1616e3654e add method for subproject 2021-03-08 20:55:30 +05:30
projectsodoo 8703ed37f2 UNCOMMENT code xml file 2021-03-08 20:03:43 +05:30
projectsodoo b97e11cdd2 UNCOMMENT error code xml file 2021-03-08 20:01:45 +05:30
projectsodoo ae75220b88 Start and end time removed in xml file 2021-03-08 19:45:15 +05:30
projectsodoo a4813e9e31 Start and end time removed 2021-03-08 19:23:38 +05:30
projectsodoo f5827617f6 Export Data Group by issue fixed 2021-03-08 17:31:49 +05:30
pawan.sharma 85ac48c7ab Merge branch 'pawan_branch' into 'development'
code for hide fields from export

See merge request prakash.jain/cor-odoo!140
2021-03-08 02:09:58 -08:00
Pawan Kumar 75c6b71c71 code for hide fields from export 2021-03-08 15:39:11 +05:30
prakash.jain fe08ace94f Merge branch 'development' into 'master'
Development

See merge request prakash.jain/cor-odoo!139
2021-03-07 21:15:21 -08:00
projectsodoo 88b94fa797 report list view order changed 2021-03-05 11:20:06 +05:30
projectsodoo 3096aad0c8 Timesheet export method improved 2021-03-05 10:54:11 +05:30
projectsodoo 4a6d324fec New timesheet report added 2021-03-05 10:18:35 +05:30
projectsodoo 128ce82d23 Js label valid updated 2021-03-03 10:12:08 +05:30
projectsodoo 23405a5407 js label cond updated 2021-03-02 23:27:21 +05:30