Commit Graph
780 Commits
Author SHA1 Message Date
wumo f94e93a593 * Add the entry to manage product lines. 2018-03-29 15:52:43 +08:00
wumo 4d59bf7f42 * Add the entry to manage product lines. 2018-03-29 15:43:30 +08:00
wumo 8145e5d9ee * Modify the prompt of pruduct code when create product. 2018-03-28 11:15:55 +08:00
wumo c59b3290fc * Add product line when batch edit products. 2018-03-23 00:18:42 +08:00
wumo 402861a88e * Filter the invalid key in custom module.
* Change function called to picture when edit product.
2018-03-22 16:49:51 +08:00
Catouse 44a6a843e0 Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8 2018-03-20 17:58:59 +08:00
Catouse 29b3502d03 * improve style of elements witch has long text inside. 2018-03-20 17:58:39 +08:00
wangyidong dfe9ca2e60 * finish task #3748. 2018-03-20 17:07:07 +08:00
wangyidong 1523479350 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-20 10:11:25 +08:00
wangyidong 1c2db4e95b * finish task #3740. 2018-03-20 10:10:23 +08:00
wumo a87465f453 Merge branch 'zentaopms_9.8' of github.com:easysoft/zentaopms into zentaopms_9.8 2018-03-19 18:39:15 +08:00
wumo 498a02e142 * Fix the bug of key column empty. 2018-03-19 18:36:19 +08:00
daitingting 4b938be75f Merge branch 'zentaopms_9.8' into origin/zentaopms_9.8 2018-03-19 18:33:51 +08:00
wumo 90a2fa2f4a * Add the product line in batchedit page. 2018-03-19 16:57:25 +08:00
wumo 2ff47d30fb * Add the product line in batchedit page. 2018-03-19 16:23:17 +08:00
wangyidong 809c8d5eb2 * finish task #3727. 2018-03-16 15:51:14 +08:00
daitingting dac814d5e2 * Get cases that are not deleted. 2018-03-15 16:18:05 +08:00
wumo 22afb60591 * Show pictures when edit product. 2018-03-15 15:44:26 +08:00
wumo 4ea0e404e1 * Display empty when delete product line
* Default assigned to the task creator when completed
2018-03-14 16:17:23 +08:00
wangyidong d35e51a15a * merge new change. 2018-03-13 12:26:20 +08:00
wangyidong 8d64b4c9eb * change for 9.8.1 version. 2018-03-13 11:29:28 +08:00
dajiao007 2a8146f6fb modify translations of admin module 2018-01-17 16:01:59 +08:00
dajiao007 fa00dc9d9c modify the translate 2018-01-10 19:39:51 +08:00
滔哥 cbf08b828a * Task#3561 2017-12-28 18:03:48 +08:00
wangyidong 2bea6f457a * fix bug #1356. 2017-12-27 16:21:59 +08:00
wangyidong 1eeb0ca399 * change for zh-tw. 2017-12-22 10:08:54 +08:00
wangyidong 60ebe9fa2e * fix for upgrade. 2017-12-22 09:05:34 +08:00
滔哥 20e63398a3 * Fix bug#1335 2017-12-19 17:18:47 +08:00
wangyidong 020acf5f43 Merge branch 'master' of github.com:easysoft/zentaopms 2017-12-18 10:02:39 +08:00
wangyidong a68fe9adcd * finish task 3463. 2017-12-18 10:01:08 +08:00
滔哥 1de783bf74 * Fix bug 2017-12-15 15:15:08 +08:00
wangyidong a069ceb654 * change for task #3435. 2017-12-14 13:49:43 +08:00
wangyidong 54afa9bce1 * fix bug. 2017-12-11 14:37:00 +08:00
滔哥 0f70d62399 * Task #3485 2017-12-08 16:18:43 +08:00
tengfei 81ba2b914a product info 2017-12-07 17:04:31 +08:00
滔哥 acf1410e59 * Change style 2017-12-06 16:32:11 +08:00
滔哥 fcb87dc1a1 * Task #3434 2017-12-06 13:21:16 +08:00
tengfei ee44254608 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-05 11:26:51 +08:00
tengfei 232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
滔哥 619608946d Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:57:09 +08:00
Catouse 1bd227029a Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-04 15:14:52 +08:00
Catouse 5a76b904b3 * fix bug #1294. 2017-12-04 15:14:45 +08:00
滔哥 aa391ba138 * Fix bug 1278 2017-12-04 14:49:54 +08:00
wangyidong e2070d56b1 * fix bug #1279. 2017-12-04 13:37:43 +08:00
wangyidong 18cb10cfa3 * fix bug #1306. 2017-12-01 13:48:33 +08:00
wangyidong 8be716b8a5 * fix bug #1309. 2017-12-01 13:17:16 +08:00
wangyidong 97725f46b1 * adjust code for pro. 2017-11-30 17:30:42 +08:00
wangyidong ec88c8c85a * fix bug #1287,1288. 2017-11-17 13:18:11 +08:00
liugang 16e6097773 * Adjust codes. 2017-11-13 08:35:59 +08:00
wangyidong c2e05057f5 * finish task #3341. 2017-11-09 15:11:08 +08:00