Commit graph

772 commits

Author SHA1 Message Date
shawn
50ff512cd4 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-13 15:07:58 +08:00
shawn
d34e265612 1月13号修改
1月13号修改
2020-01-13 15:07:44 +08:00
tczjx58520
070f18c562 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-13 14:11:05 +08:00
tczjx58520
8eb16a6b83 1.13
修改bug
2020-01-13 14:10:47 +08:00
shawn
847cb05fa4 退货单完成
退货单完成
2020-01-12 13:09:23 +08:00
shawn
bbb5c08271 1月11号提交
1月11号提交
2020-01-11 19:34:28 +08:00
shawn
ff8783000c Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-10 16:53:37 +08:00
shawn
0ca48b37d7 1月10号提交
1月10号提交
2020-01-10 16:53:26 +08:00
tczjx58520
82a439c3b2 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-10 14:11:22 +08:00
tczjx58520
472fe92d28 1.10
修改bug
2020-01-10 14:11:11 +08:00
shawn
605cc552df 销售出库单本次收款问题
销售出库单本次收款问题
2020-01-08 17:04:39 +08:00
beyond
26bcafa6db Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-08 16:05:44 +08:00
shawn
6f09475c63 销售出库单修改本次收款金额
销售出库单修改本次收款金额
2020-01-08 16:05:48 +08:00
beyond
edbf313351 beyond 1.8.3 2020-01-08 16:05:04 +08:00
beyond
aa00a94538 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-08 11:00:12 +08:00
beyond
b12f390be4 beyond 1.8 2020-01-08 11:00:04 +08:00
shawn
4f0b787ee4 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-08 11:00:03 +08:00
shawn
6a4439d606 样式修改
样式修改
2020-01-08 10:59:48 +08:00
beyond
06ad8fe259 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 20:15:12 +08:00
shawn
a919cd17b6 代码
代码
2020-01-07 20:15:01 +08:00
beyond
4176011039 beyond 1.7.4 2020-01-07 20:14:43 +08:00
beyond
e9a890acf1 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 18:40:47 +08:00
beyond
ec4dbf3d08 beyond 1.7.3 2020-01-07 18:40:38 +08:00
shawn
846a68a6c1 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 18:40:14 +08:00
shawn
880c30563e 1月7号合并代码(下午6点半)
1月7号合并代码(下午6点半)
2020-01-07 18:39:54 +08:00
beyond
e37c2d08ed 1.7beyond 2 2020-01-07 18:35:19 +08:00
beyond
c49775e90f Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 10:00:10 +08:00
beyond
abde2d0dd9 beyond1.7 2020-01-07 10:00:02 +08:00
shawn
6cbfe50d00 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 09:59:14 +08:00
shawn
4a66283972 修改物品分类1月7号
修改物品分类1月7号
2020-01-07 09:58:53 +08:00
tczjx58520
87e452f10e Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-06 18:44:01 +08:00
tczjx58520
002bf53214 commit
1.6
2020-01-06 18:43:44 +08:00
shawn
552f364091 更新换货单问题
更新换货单问题
2020-01-06 10:19:47 +08:00
shawn
b645656c14 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-06 09:20:35 +08:00
shawn
50d5fa4841 报表提交1月6号
报表提交1月6号
2020-01-06 09:20:26 +08:00
beyond
42c2d38fa1 beyond 1.5.2 2020-01-05 18:20:12 +08:00
beyond
1cc8f4b795 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-05 11:45:55 +08:00
shawn
b72f3744e9 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-05 11:45:54 +08:00
shawn
f93e1fbaec 修改价格1月5号
修改价格1月5号
2020-01-05 11:45:46 +08:00
beyond
da31bfc5d5 beyond 1.5 2020-01-05 11:45:36 +08:00
beyond
f6838f47e4 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-04 14:46:27 +08:00
beyond
60b63bcc3a beyond 1.4.2 2020-01-04 14:46:08 +08:00
shawn
c5203538ae 修改调拨问题
修改调拨问题
2020-01-04 14:45:05 +08:00
beyond
746c6dfa8e Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-04 09:53:29 +08:00
shawn
d170cbed74 修改凭证1月4号
修改凭证1月4号
2020-01-04 09:53:29 +08:00
beyond
db0bec6c44 beyond 1.4 2020-01-04 09:52:44 +08:00
beyond
4dfab1bf88 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-03 18:33:35 +08:00
beyond
2c5e4d9fca beyond 1.3 2020-01-03 18:33:23 +08:00
shawn
0e1e85c975 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-03 18:33:23 +08:00
shawn
e117fb4239 1月3号
1月3号
2020-01-03 18:33:04 +08:00