Commit graph

797 commits

Author SHA1 Message Date
beyond
22b839866c beyond 2.25 修改 2020-02-25 19:31:18 +08:00
tczjx58520
18c0d76f46 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-17 20:05:32 +08:00
tczjx58520
26f4625842 2.17
销售计划修改
2020-02-17 19:32:37 +08:00
shawn
cca2c29da5 tag页问题
tag页问题
2020-02-17 18:22:23 +08:00
beyond
64f13b6ccb Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-17 12:11:08 +08:00
beyond
cea21fbed6 beyond 2.17 2020-02-17 12:10:53 +08:00
shawn
ebc0540386 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-17 12:04:44 +08:00
shawn
ae5f16f8e9 修改
修改
2020-02-17 12:04:38 +08:00
beyond
30ec520aaf Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-17 11:13:03 +08:00
beyond
4a15a47e9c beyond 2.17 页面切换修改 2020-02-17 11:11:46 +08:00
shawn
f79951e394 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-17 10:45:15 +08:00
shawn
25ca9ce766 报表的开发
repositoryName
2020-02-17 10:45:02 +08:00
beyond
b4dd442edf beyond 2.16修改2 2020-02-16 14:22:50 +08:00
beyond
6ad763a71b Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-16 13:09:10 +08:00
shawn
17950a76cc 销售明细数据
销售明细数据
2020-02-16 13:09:01 +08:00
beyond
2107d13db6 beyond 2.16 修改 2020-02-16 13:08:56 +08:00
beyond
d0ecf8957a beyond 2.15 2 2020-02-15 18:10:26 +08:00
beyond
1dff7c3d92 beyond 2.15 2020-02-15 18:00:13 +08:00
beyond
7b9173e4e2 beyond 2.15修改 2020-02-15 17:56:22 +08:00
shawn
026823b86c Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-15 16:18:56 +08:00
shawn
84308a195a 语言问题
语言问题
2020-02-15 16:17:00 +08:00
beyond
e200666371 beyond 2.15修改 2020-02-15 10:25:50 +08:00
shawn
9637d37852 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-15 10:24:14 +08:00
shawn
af0c78a83d 翻译问题
修改昨天的问题
2020-02-15 10:23:37 +08:00
beyond
e3df13cb61 beyond 小修改 2020-02-14 19:03:15 +08:00
beyond
9a789078f7 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-14 18:53:49 +08:00
beyond
d2038108b2 beyond 2.14 页面切换修改 2020-02-14 18:51:47 +08:00
tczjx58520
856c894cd2 2.14
删除清空name和id值
2020-02-14 17:20:17 +08:00
beyond
51223e6765 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-14 16:26:20 +08:00
beyond
2117e42a95 beyond 2020-02-14 16:25:38 +08:00
tczjx58520
60ecbf3ec3 修改bug
分期订单,线下任务,
2020-02-14 16:21:19 +08:00
beyond
1517fe48ce beyond 2.14 菲律宾问题修改 2020-02-14 16:20:29 +08:00
tczjx58520
23f2b0743f Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-14 15:09:04 +08:00
tczjx58520
8dca4d12b4 commit 2.14
bug提交
2020-02-14 15:08:50 +08:00
shawn
f4f5236b60 销售出库单更新
销售出库单更新
2020-02-14 13:28:31 +08:00
shawn
d39ceb4fe3 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-14 09:44:49 +08:00
shawn
689a08bf06 修改问题的合并
修改问题的合并
2020-02-14 09:15:51 +08:00
beyond
f591090263 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-13 19:16:54 +08:00
beyond
c8a1056cc9 beyond 2.13修改 2020-02-13 18:58:25 +08:00
shawn
1973d0d009 提交代码
提交代码
2020-02-13 10:40:51 +08:00
shawn
9b6952eb56 修复中英文表字段对应, 修复期初库存修改时改变审核状态和单据状态问题,货位添加了删除功能
修复中英文表字段对应, 修复期初库存修改时改变审核状态和单据状态问题,货位添加了删除功能
2020-02-12 12:37:46 +08:00
shawn
6926a1e015 代码更新
代码更新
2020-02-12 07:31:29 +08:00
shawn
9e1205ca02 修改界面
修改界面
2020-02-11 09:42:56 +08:00
shawn
5b4ab23168 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-10 17:56:54 +08:00
shawn
5f94846615 修改合并
修改合并
2020-02-10 17:56:44 +08:00
beyond
2fb9b8ff3b Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-10 12:46:51 +08:00
beyond
e590781ee9 beyond 2.10修改 2020-02-10 12:46:38 +08:00
shawn
c5dcdf1fea Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-10 12:46:04 +08:00
shawn
d345edd027 财务修改
财务修改
2020-02-10 12:45:57 +08:00
beyond
e0648bd289 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-10 12:20:14 +08:00