Commit Graph
620 Commits
Author SHA1 Message Date
tianshujie98 dd2381a1f6 * Fix product linked bugs. 2020-12-09 14:13:06 +08:00
tianshujie98 f4fb2b919a * Fix the bug search problem linked with the plan. 2020-12-08 14:42:44 +08:00
Yagami 90446d239a * Merge code and finish task #8475. 2020-11-25 10:36:44 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
Yagami 877bab9140 * Fix program acl. 2020-11-19 17:29:06 +08:00
leiyong b919cc45b2 * Adjust getProductPairsByProject to getProductByProject. 2020-11-19 09:07:31 +08:00
Yagami 460947ebce * Change toString to zui function. 2020-11-18 15:33:23 +08:00
holan20180123 d1bb42ad3a * Finish task #8376. 2020-11-18 11:34:41 +08:00
holan20180123 4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123 bb34dfe79b * Finish task #8378. 2020-11-17 14:04:50 +08:00
holan20180123 97770dd00f * Finish task #8379. 2020-11-17 13:17:15 +08:00
holan20180123 a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123 2d0ffc2b4a * Finish task #8194. 2020-11-11 15:40:26 +08:00
holan20180123 8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00
holan20180123 dca05f8be2 * Finish task #8226. 2020-11-09 09:53:18 +08:00
holan20180123 09d6f83f85 * Finish task #8194. 2020-11-06 14:01:01 +08:00
leiyong 98f37169e1 * Adjust code. 2020-11-05 13:45:48 +08:00
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
tianshujie98 593aab8967 * Adjust code style. 2020-10-28 11:30:20 +08:00
holan20180123 7f49f1f614 * Finish task #8085. 2020-10-12 15:49:46 +08:00
tianshujie98 11d81b4ef1 * Edit comment. 2020-10-12 11:24:06 +08:00
holan20180123 b849999023 Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x 2020-10-10 16:57:05 +08:00
holan20180123 02eb03583d * Finish task #8085. 2020-10-10 16:56:36 +08:00
hufangzhou 1ebc3a9e3f * Finish task#8073: Assign the value to the manage products. 2020-10-10 08:33:20 +08:00
tianshujie98 d09fd16754 * Finish task #8077. 2020-09-30 15:53:25 +08:00
tianshujie98 1ef4203498 * Finish task #8077. 2020-09-30 15:43:56 +08:00
leiyong b60e13adff * Finish task#8076. 2020-09-30 14:16:17 +08:00
z f802c93bde * finish task #12675. 2020-09-29 08:54:28 +08:00
holan20180123 fd6f9f5ac9 * Finish task #7951. 2020-09-28 10:46:14 +08:00
holan20180123 ed523a1442 * Finish task #7951. Fix bug 3369. 2020-09-28 08:54:14 +08:00
Yagami 1b9c6b0e98 * Merge code. 2020-09-23 14:54:16 +08:00
Yagami a95a72b579 * Fix product lang. 2020-09-23 10:27:49 +08:00
tianshujie98 80dfeda677 * Adjust code style. 2020-09-16 15:01:20 +08:00
tianshujie98 7f4f1626db * Finish task #7994. 2020-09-16 14:59:11 +08:00
tianshujie98 a9013adc4e * Finish task #7994. 2020-09-16 14:55:30 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
holan20180123 dcd63631a4 * Adjust button for productplan. 2020-09-08 13:29:26 +08:00
z 40dbb5b53a * code for task #12372. 2020-09-03 16:32:39 +08:00
leiyong 77d8f2255f * Finish task#7736. 2020-08-31 16:52:09 +08:00
z a9df6f3b9c * merge after 12.4.1 changes. 2020-08-31 15:31:55 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
holan20180123 1062033526 * Finish Task #7711. 2020-08-27 13:42:16 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
tianshujie98 595e3e35c4 * Fix bug #2573. 2020-08-13 09:38:57 +08:00
holan20180123 a890c24077 * Finish task #7614. 2020-08-07 17:31:38 +08:00
Catouse dc04c92b2c * task #7563, bug #2481, refresh table statistic information after unlink bug or story in plan page. 2020-08-06 16:13:08 +08:00
z b753e06149 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-06 15:32:27 +08:00
z 6aca289707 * finish task #7585. 2020-08-06 15:28:46 +08:00