Code

upgrade all fork #34

Code

Open

ydf wants to merge 67 commits intozhuinfo:masterzhuinfo/Django-ERP:masterfrom ydf:masterydf/Django-ERP:masterCopy head branch name to clipboard

+7,279-1,762

Commits

Commits on May 15, 2018

• 支持django 2, python 3

  007gzs

  committed
  9c68c22

  Copy full SHA for 9c68c22

• python 3 object.__str__

  007gzs

  committed
  c8f10c2

  Copy full SHA for c8f10c2

• 没有__unicode__函数默认调__str__

  007gzs

  committed
  86ef82c

  Copy full SHA for 86ef82c

• 继承顺序

  007gzs

  committed
  abfe105

  Copy full SHA for abfe105

Commits on Jun 13, 2020

• 修改相关配置，并添加快速开始的文档步骤

  

  AngelLiang

  committed
  d96122c

  Copy full SHA for d96122c

• Added .flake8

  

  AngelLiang

  committed
  5bdf70d

  Copy full SHA for 5bdf70d

• 修复库存管理模块的bug

  

  AngelLiang

  committed
  7f405d8

  Copy full SHA for 7f405d8

• 修复工作流模块相关的bug

  

  AngelLiang

  committed
  6beff73

  Copy full SHA for 6beff73

Commits on Jun 15, 2020

• Merge branch 'master' of https://github.com/007gzs/Django-ERP into py3-dj2, support Python3 Django2

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  ce4b73d

  Copy full SHA for ce4b73d

• 修复bug，支持Python3 Django2

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  0d7b08f

  Copy full SHA for 0d7b08f

• 升级为Python3 Django3

  Show description for eab4024
  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  eab4024

  Copy full SHA for eab4024

• 格式化各个模块的代码

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  05657df

  Copy full SHA for 05657df

• Updated settings

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  058a9bc

  Copy full SHA for 058a9bc

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  f40efa3

  Copy full SHA for f40efa3

• 修复数据导入模块中的导入部门岗位员工数据的bug

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  2d0ba7c

  Copy full SHA for 2d0ba7c

• Updated .gitignore

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  02204f7

  Copy full SHA for 02204f7

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  196cd3b

  Copy full SHA for 196cd3b

• 代码格式化

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  12de9ac

  Copy full SHA for 12de9ac

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  8521865

  Copy full SHA for 8521865

• 删除之前修补bug产生的语句，现在不需要了

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  3ca186b

  Copy full SHA for 3ca186b

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  1cf7547

  Copy full SHA for 1cf7547

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  c90a3cd

  Copy full SHA for c90a3cd

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  07a570a

  Copy full SHA for 07a570a

Commits on Jun 16, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  8061b85

  Copy full SHA for 8061b85

• 添加和修改注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  33207f1

  Copy full SHA for 33207f1

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  9d2eb59

  Copy full SHA for 9d2eb59

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  35b7733

  Copy full SHA for 35b7733

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  e1ead31

  Copy full SHA for e1ead31

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  b39be1c

  Copy full SHA for b39be1c

• 给模板添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  e240960

  Copy full SHA for e240960

• 更新笔记

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  409e444

  Copy full SHA for 409e444

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  8722e3b

  Copy full SHA for 8722e3b

• 更新笔记

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  c83c529

  Copy full SHA for c83c529

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  e0ad7e5

  Copy full SHA for e0ad7e5

• 格式化代码

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  0395431

  Copy full SHA for 0395431

• 格式化代码

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  20580f1

  Copy full SHA for 20580f1

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  04312c2

  Copy full SHA for 04312c2

• 给工作流模型的 content_type 字段添加 采购管理 模块

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  dee4026

  Copy full SHA for dee4026

• fixed: 调整采购单状态值

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  6d5ca19

  Copy full SHA for 6d5ca19

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  2fdb943

  Copy full SHA for 2fdb943

Commits on Jun 17, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  cda629b

  Copy full SHA for cda629b

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  d771c85

  Copy full SHA for d771c85

• 代码格式化

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  d5a0d5c

  Copy full SHA for d5a0d5c

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  8f9a630

  Copy full SHA for 8f9a630

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  54e7c93

  Copy full SHA for 54e7c93

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  a3f4967

  Copy full SHA for a3f4967

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  cb42798

  Copy full SHA for cb42798

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  cf43027

  Copy full SHA for cf43027

• 给模板添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  72d9eb4

  Copy full SHA for 72d9eb4

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  604ce5b

  Copy full SHA for 604ce5b

• 更新笔记

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  6630c89

  Copy full SHA for 6630c89

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  f5be5cf

  Copy full SHA for f5be5cf

Commits on Jun 19, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  6f38f82

  Copy full SHA for 6f38f82

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  c1eb60c

  Copy full SHA for c1eb60c

• 更新笔记

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  28ce50a

  Copy full SHA for 28ce50a

• 代码格式化

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  794d129

  Copy full SHA for 794d129

Commits on Jun 22, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  bc2987b

  Copy full SHA for bc2987b

• 更新笔记

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  1848ae4

  Copy full SHA for 1848ae4

Commits on Jun 24, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  0621c52

  Copy full SHA for 0621c52

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  bf55d8c

  Copy full SHA for bf55d8c

Commits on Jun 28, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  ad6b1cb

  Copy full SHA for ad6b1cb

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  183ae08

  Copy full SHA for 183ae08

Commits on Jul 20, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  92cf835

  Copy full SHA for 92cf835

Commits on Jul 21, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  b35fca9

  Copy full SHA for b35fca9

Commits on Aug 13, 2020

• 添加注释

  

  E7EE477C11C98D403F318118733EAA5C

  authored and

  E7EE477C11C98D403F318118733EAA5C

  committed
  d89ae9a

  Copy full SHA for d89ae9a

Commits on Dec 8, 2021

• Merge pull request #1 from ydf/py3-dj3

  Show description for 26f38d2
  ydf

  authored
  26f38d2

  Copy full SHA for 26f38d2

• 修正数据同步

  

  admin

  committed
  1949a4c

  Copy full SHA for 1949a4c