Commit Graph

558 Commits

Author SHA1 Message Date
wangyidong
8dfe360c5c * adjust for computeHours4Multiple when update task. 2019-09-25 08:51:01 +08:00
wangyidong
c3cd2b7af7 * fix bug #2722. 2019-09-24 10:07:45 +08:00
wangyidong
0a0ce92796 * fix bug. 2019-09-23 16:26:54 +08:00
wangyidong
c16eeefa33 * replace ne() function to notIN(). 2019-09-05 16:00:04 +08:00
wangyidong
e161871c4f * code for task #6289. 2019-09-02 15:38:05 +08:00
Yagami
d206d13913 * Finish task #6316. 2019-09-02 10:49:43 +08:00
wangyidong
162887854f * finish task #6233. 2019-08-22 11:14:56 +08:00
wangyidong
253e0ab3a8 * finish task #6231. 2019-08-21 15:32:29 +08:00
wangyidong
97fc947913 * computeWorkingHours has in updateParentStatus method. 2019-08-14 15:34:43 +08:00
jinianlan
968390978c Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-12 08:25:42 +08:00
jinianlan
c6cba5483e * finish task #6173,#6174,#6175,#6183,#6186,#6187. 2019-08-12 08:23:00 +08:00
wangyidong
7964ce412f * finish task #6190. 2019-08-07 15:27:39 +08:00
jinianlan
fc2eda8fa6 * fix Bug 2671 2019-08-01 17:38:49 +08:00
liugang
1cc1daa794 * Use the function processStatus to get status of a record. 2019-07-30 15:41:13 +08:00
wyd621
f858660ceb Merge branch 'master' into zentaopms_workflow 2019-07-24 09:14:23 +08:00
jinianlan
77d1853878 * fix task #2651,#2642 2019-07-23 16:00:11 +08:00
jinianlan
fbf7a7f073 * finish task #2651,#2642 2019-07-23 09:46:54 +08:00
wyd621
9143f4e38f Merge branch 'master' into 11.5 2019-07-12 15:55:04 +08:00
Yagami
c5a1c58168 * Finish task #8290. 2019-07-11 14:43:06 +08:00
wangyidong
47e23892c0 * finish task #5957. 2019-07-10 14:42:54 +08:00
Yagami
f7d4f5ff71 * Code for task #5892. 2019-07-01 14:37:50 +08:00
Yagami
368775a796 * Finish task #5892. 2019-07-01 14:18:23 +08:00
Yagami
4296bd1291 * Finish task #5892. 2019-06-28 15:16:41 +08:00
Yagami
910ea1e96f * Fix details before release. 2019-06-25 09:33:56 +08:00
Yagami
7e805210d2 * Finish task #5817. 2019-06-20 10:44:56 +08:00
wangyidong
dcac58b007 * revert dynamicAction lang. 2019-06-13 14:11:56 +08:00
wangyidong
a62b8fffcb * fix bug for get product and project. 2019-05-31 16:54:18 +08:00
wangyidong
58701fb54a * adjust for update last edit time. 2019-05-07 08:50:25 +08:00
yfl
6db8a4e7b2 Merge branch 'master' of https://github.com/easysoft/zentaopms
* Task #5423
2019-05-06 16:33:10 +08:00
yfl
e4952b3eb2 * Task #5423 2019-05-05 18:40:51 +08:00
wangyidong
0936df0edc * adjust for change parent status. 2019-05-05 17:52:54 +08:00
wangyidong
140984502c * code for task #5428,5379. 2019-05-05 16:40:22 +08:00
yfl
94aa0ca8a6 * Finish task #5443,#5442,#5441 2019-05-05 08:38:23 +08:00
yfl
d35eb8dfaf * Finsish task #5379,#5385,#5389,#5393,#5403,5409 2019-04-24 15:59:56 +08:00
Yagami
31f688c2c7 * Fix code style. 2019-04-23 14:49:53 +08:00
Yagami
c534d4602c * Code for task #7805. 2019-04-15 10:50:21 +08:00
yfl
550c5168c1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-04-11 13:13:55 +08:00
yfl
14eb93ef75 * Task # 7894 2019-04-11 13:13:19 +08:00
Yagami
8bd5e075d1 * Fix parent task button. 2019-04-11 10:49:00 +08:00
wangyidong
bf97231962 * adjust for task getProjectTaskPairs method. 2019-03-28 10:28:26 +08:00
wangyidong
9f42f0b0d4 * fix bug. 2019-03-27 09:21:30 +08:00
Yagami
0e0f0af555 * Finish child task. 2019-03-22 11:19:44 +08:00
wangyidong
3cd2f30ad8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-18 16:56:38 +08:00
wangyidong
e925ae51e9 * finish task #5325. 2019-03-18 16:55:58 +08:00
Yagami
7004af89d9 * Finish task #5327. 2019-03-18 15:48:30 +08:00
Yagami
62249b0782 * Finish task #5316. 2019-03-18 11:17:57 +08:00
Yagami
e05ed035f6 * Fix lastEditDate bug. 2019-03-11 17:17:11 +08:00
Yagami
dcc120573d * Fix get user data method. 2019-02-27 17:00:49 +08:00
Yagami
efe734f04a * Code for task #5284. 2019-02-26 14:28:26 +08:00
Yagami
1d1d64f600 * Finish task #5296. 2019-02-22 13:20:24 +08:00