Skip to content

upgrade all fork #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
9c68c22
支持django 2, python 3
007gzs May 15, 2018
c8f10c2
python 3 object.__str__
007gzs May 15, 2018
86ef82c
没有__unicode__函数默认调__str__
007gzs May 15, 2018
abfe105
继承顺序
007gzs May 15, 2018
d96122c
修改相关配置,并添加快速开始的文档步骤
Jun 13, 2020
5bdf70d
Added .flake8
Jun 13, 2020
7f405d8
修复库存管理模块的bug
Jun 13, 2020
6beff73
修复工作流模块相关的bug
Jun 13, 2020
ce4b73d
Merge branch 'master' of https://github.com/007gzs/Django-ERP into py…
Jun 15, 2020
0d7b08f
修复bug,支持Python3 Django2
Jun 15, 2020
eab4024
升级为Python3 Django3
Jun 15, 2020
05657df
格式化各个模块的代码
Jun 15, 2020
058a9bc
Updated settings
Jun 15, 2020
f40efa3
添加注释
Jun 15, 2020
2d0ba7c
修复数据导入模块中的导入部门岗位员工数据的bug
Jun 15, 2020
02204f7
Updated .gitignore
Jun 15, 2020
196cd3b
添加注释
Jun 15, 2020
12de9ac
代码格式化
Jun 15, 2020
8521865
添加注释
Jun 15, 2020
3ca186b
删除之前修补bug产生的语句,现在不需要了
Jun 15, 2020
1cf7547
添加注释
Jun 15, 2020
c90a3cd
添加注释
Jun 15, 2020
07a570a
添加注释
Jun 15, 2020
8061b85
添加注释
Jun 16, 2020
33207f1
添加和修改注释
Jun 16, 2020
9d2eb59
添加注释
Jun 16, 2020
35b7733
添加注释
Jun 16, 2020
e1ead31
添加注释
Jun 16, 2020
b39be1c
添加注释
Jun 16, 2020
e240960
给模板添加注释
Jun 16, 2020
409e444
更新笔记
Jun 16, 2020
8722e3b
添加注释
Jun 16, 2020
c83c529
更新笔记
Jun 16, 2020
e0ad7e5
添加注释
Jun 16, 2020
0395431
格式化代码
Jun 16, 2020
20580f1
格式化代码
Jun 16, 2020
04312c2
添加注释
Jun 16, 2020
dee4026
给工作流模型的 content_type 字段添加 采购管理 模块
Jun 16, 2020
6d5ca19
fixed: 调整采购单状态值
Jun 16, 2020
2fdb943
添加注释
Jun 16, 2020
cda629b
添加注释
Jun 16, 2020
d771c85
添加注释
Jun 17, 2020
d5a0d5c
代码格式化
Jun 17, 2020
8f9a630
添加注释
Jun 17, 2020
54e7c93
添加注释
Jun 17, 2020
a3f4967
添加注释
Jun 17, 2020
cb42798
添加注释
Jun 17, 2020
cf43027
添加注释
Jun 17, 2020
72d9eb4
给模板添加注释
Jun 17, 2020
604ce5b
添加注释
Jun 17, 2020
6630c89
更新笔记
Jun 17, 2020
f5be5cf
添加注释
Jun 17, 2020
6f38f82
添加注释
Jun 19, 2020
c1eb60c
添加注释
Jun 19, 2020
28ce50a
更新笔记
Jun 19, 2020
794d129
代码格式化
Jun 19, 2020
bc2987b
添加注释
Jun 22, 2020
1848ae4
更新笔记
Jun 22, 2020
0621c52
添加注释
Jun 24, 2020
bf55d8c
添加注释
Jun 24, 2020
ad6b1cb
添加注释
Jun 28, 2020
183ae08
添加注释
Jun 28, 2020
92cf835
添加注释
Jul 20, 2020
b35fca9
添加注释
Jul 21, 2020
d89ae9a
添加注释
Aug 13, 2020
26f38d2
Merge pull request #1 from ydf/py3-dj3
ydf Dec 8, 2021
1949a4c
修正数据同步
Dec 8, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[flake8]
exclude = .git,*migrations,*venv*
max-line-length = 128

# ignore module level import not at top of file
ignore = E402
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
*.sqlite3
.vscode/
.venv/
upload/
settings.py

.DS_Store
__pycache__
.idea
7 changes: 3 additions & 4 deletions Install/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Django=1.10.6
PyMySQL=0.7.9
xlwt=1.0.0
xlrd=1.2.0
Django
xlwt
xlrd
17 changes: 17 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
autopep8 = "*"

[packages]
django = ">=3.0,<4.0"
xlwt = "*"
xlrd = "*"
pymysql = "*"
mysqlclient = "*"

[requires]
python_version = "3.6"
106 changes: 106 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Django-ERP
Django-ERP是一款基于Django开发的ERP管理软件,包含常用的销售管理、采购管理、库存管理、组织管理等,支持按项目归集费用,支持工作流审批,支持采购单、报价单的批量导入。

Forked from <a href="https://github.com/zhuinfo/Django-ERP">zhuinfo Django-ERP</a> 感谢他的付出。
Forked from <a href="https://github.com/zhuinfo/Django-ERP">zhuinfo Django-ERP</a> 感谢他的付出, 和其他网友的辛勤付出

# 安装指南

> 我的开发、测试环境是Python2.7的,所以这个文档大多数情况我默认会使用这个条件,有个别测试不到位的可能还需要慢慢完善。
> 我的开发、测试环境是Python3的,所以这个文档大多数情况我默认会使用这个条件,有个别测试不到位的可能还需要慢慢完善。

请先确保您已安装了Python 2.7,并已配置好了数据库,本文档会略过这部分内容(理论上Django是可以支持MYSql、PGSQL、SQLite、Oracle等主流数据库的,但是建议不要嘬,用自己熟悉的数据库,因为数据是无价的。)
请先确保您已安装了Python3,并已配置好了数据库,本文档会略过这部分内容(理论上Django是可以支持MYSql、PGSQL、SQLite、Oracle等主流数据库的,但是建议不要嘬,用自己熟悉的数据库,因为数据是无价的。)
验证方法请通过python --version查看版本,以及数据库 确认用户名和密码是否登录正常

后续我争取不上requirements.txt,远期目标我个人是希望能做个dock镜像,并让它能慢慢顺着Python3和新版本的django平滑过渡上去。
Expand All @@ -33,8 +33,10 @@ DATABASES = {
## 克隆代码
> git clone https://github.com/bg4hkq/Django-ERP.git


## 创建数据库
create database `mis` DEFAULT CHARACTER SET utf8mb4;
## 导入数据库

> mysql -uroot -proot mis < Install/mis.sql

## 运行测试服务器
Expand Down
Loading