Compare commits

...

222 Commits

Author SHA1 Message Date
马广威
debcca8b07 Accept Merge Request #242: (feature/修改字段 -> develop)
Merge Request: 修改关联关系的字段

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/242?initial=true
2023-07-14 12:00:13 +08:00
mgw
741c2b34bf 修改关联关系的字段 2023-07-14 11:58:56 +08:00
龚启豪
3b8ea6874b Accept Merge Request #241: (feature/订单计划 -> develop)
Merge Request: 更换数据库

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/241?initial=true
2023-07-14 10:45:39 +08:00
qihao.gong@jikimo.com
381505bd9d 更换数据库 2023-07-14 10:45:02 +08:00
许何哲
28b6f854cb Accept Merge Request #240: (feature/主题logo添加中文 -> develop)
Merge Request: 添加中文logo

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/240?initial=true
2023-07-14 10:38:18 +08:00
WEB许何哲\xuhez
cb4dc2a057 Merge branch 'develop' into feature/主题logo添加中文 2023-07-14 10:35:07 +08:00
WEB许何哲\xuhez
412083e2aa 主题logo添加中文 2023-07-14 10:33:11 +08:00
杨金灵
ad565d0096 Accept Merge Request #239: (feature/设备模块文件解决冲突 -> develop)
Merge Request: 设备模块文件解决冲突

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/239?initial=true
2023-07-14 10:16:51 +08:00
jinling.yang
31d335af48 设备模块文件解决冲突 2023-07-14 10:16:22 +08:00
jinling.yang
48cb394b3f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-07-14 10:07:46 +08:00
jinling.yang
c709c046c7 Merge branch 'feature/优化夹具产品模板' into develop 2023-07-14 10:06:37 +08:00
杨金灵
a0744e6713 Accept Merge Request #238: (feature/优化夹具产品模板 -> develop)
Merge Request: 优化夹具产品模板

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/238?initial=true
2023-07-14 10:06:20 +08:00
jinling.yang
98d3e61d66 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化夹具产品模板
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/__manifest__.py
2023-07-14 10:05:01 +08:00
许何哲
7b4d4a0d9a Accept Merge Request #237: (feature/修改看板样式 -> develop)
Merge Request: 主题

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/237?initial=true
2023-07-14 09:23:51 +08:00
WEB许何哲\xuhez
a48c8b2baa 上传修改后的主题 2023-07-14 09:21:21 +08:00
WEB许何哲\xuhez
1c022711a1 注释测试字段 2023-07-14 09:11:57 +08:00
WEB许何哲\xuhez
0291ed9a56 Merge branch 'develop' into feature/修改看板样式
# Conflicts:
#	sf_warehouse/views/view.xml
2023-07-14 09:10:37 +08:00
龚启豪
08e0eeee3d Accept Merge Request #236: (feature/订单计划 -> develop)
Merge Request: 密码约束模块

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/236?initial=true
2023-07-14 09:05:59 +08:00
qihao.gong@jikimo.com
8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml
2023-07-14 09:02:48 +08:00
马广威
2161f4c140 Accept Merge Request #235: (feature/工作日历及其设置 -> develop)
Merge Request: 工作日历及其设置的bug已解决,优化已完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/235?initial=true
2023-07-13 19:21:13 +08:00
mgw
b544e10b0d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历及其设置 2023-07-13 19:20:05 +08:00
mgw
9073880aac 工作日历及其设置bug已解决,优化已完成 2023-07-13 19:19:40 +08:00
WEB许何哲\xuhez
b48a835808 修改看板樣式 2023-07-13 17:31:54 +08:00
qihao.gong@jikimo.com
5e8e380a8e 密码模块修改 2023-07-13 17:31:16 +08:00
杨金灵
d7732fe2ff Accept Merge Request #234: (feature/新增工件装夹 -> develop)
Merge Request: 装夹工单优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/234?initial=true
2023-07-13 17:21:26 +08:00
jinling.yang
36bb77ccb0 工单的完成按钮代码还原 2023-07-13 17:17:48 +08:00
jinling.yang
7a690abe1a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹
# Conflicts:
#	sf_maintenance/__manifest__.py
2023-07-13 16:58:49 +08:00
jinling.yang
5beb7b3417 优化装夹工单,新增工件装夹page,名字为组件的page名称改为物料,去掉单独的工件装夹功能 2023-07-13 16:57:48 +08:00
马广威
d9adfc30d5 Accept Merge Request #233: (feature/修改库存模块的部分逻辑 -> develop)
Merge Request: 库存模块部分逻辑已修改完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/233?initial=true
2023-07-13 16:11:36 +08:00
mgw
3643c5ecb7 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改库存模块的部分逻辑 2023-07-13 16:10:11 +08:00
mgw
f9c63b69a1 库存模块逻辑修改已完成 2023-07-13 16:09:28 +08:00
禹翔辉
701ae26eb4 Accept Merge Request #232: (feature/工作日历设置-工作日历表 -> develop)
Merge Request: 生产线模型搬移至制造模块,新增工作日历模块,新增工作日历设置相关功能

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/232?initial=true
2023-07-13 16:07:20 +08:00
yuxianghui
81842dc5ec 将生产线模型从设备模块搬移到了制造模块,新增工作日历设置修改休息日字段则工作日历创建新记录 2023-07-13 16:05:38 +08:00
yuxianghui
571e32925e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工作日历设置-工作日历表 2023-07-11 17:40:46 +08:00
yuxianghui
ef7d9c22d4 新增根据工作日历设置的工作日字段创建工作日历的记录 2023-07-11 17:40:14 +08:00
WEB许何哲\xuhez
b6de9d5e64 Merge branch 'develop' into feature/修改看板样式
# Conflicts:
#	sf_warehouse/__manifest__.py
#	sf_warehouse/static/src/kanban_color_change.scss
#	sf_warehouse/views/view.xml
2023-07-11 16:05:53 +08:00
WEB许何哲\xuhez
a3760a7d9d 0711提交 2023-07-11 16:00:21 +08:00
马广威
58b9ea404b Accept Merge Request #231: (feature/增加js_class类对看板视图布局进行修改 -> develop)
Merge Request: 增加js_class类对看板视图进行布局修改

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/231?initial=true
2023-07-11 15:49:53 +08:00
mgw
feb15e4db2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/增加js_class类对看板视图布局进行修改 2023-07-11 15:48:44 +08:00
mgw
acd37b6c8c 修改sf_warehouse模块目录结构 2023-07-11 15:48:11 +08:00
mgw
94ffec20db 增加js_class类对看板视图进行布局修改 2023-07-11 15:43:03 +08:00
jinling.yang
7743c9658c 工单菜单优化 2023-07-10 17:33:17 +08:00
qihao.gong@jikimo.com
3544c6a957 密码策略模块测试 2023-07-10 17:33:06 +08:00
yuxianghui
6dfced8541 新增班次对象,新增工作日对象,修改了工作日历设置的班次、工作日字段类型;新增工作日历表对象 2023-07-10 17:26:43 +08:00
qihao.gong@jikimo.com
1502336286 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 2023-07-10 10:04:18 +08:00
qihao.gong@jikimo.com
78fd5a7ac3 修改工作中心与设备关联关系 2023-07-10 10:03:02 +08:00
jinling.yang
94856b0c55 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-07 17:39:44 +08:00
jinling.yang
a0570cb999 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-07 17:38:04 +08:00
禹翔辉
1d970712e3 Accept Merge Request #230: (feature/计划管理-基础设置 -> develop)
Merge Request: 优化了产线设备资源设置模型

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/230?initial=true
2023-07-07 17:37:19 +08:00
yuxianghui
9a03235cfa Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 2023-07-07 17:36:59 +08:00
yuxianghui
e711ff0ab3 优化了产线设备资源设置,新增根据选取的工作中心自动带出设备的数据,新增根据选择的工作日历自动带出班次的数据,新增搜索视图 2023-07-07 17:36:42 +08:00
jinling.yang
3fdf9130e8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-07 14:39:05 +08:00
禹翔辉
e7075a83ca Accept Merge Request #229: (feature/计划管理-基础设置 -> develop)
Merge Request: 新增生产线模型,优化了计划管理-基础设置模块

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/229?initial=true
2023-07-07 14:38:15 +08:00
yuxianghui
e78a60b6ef Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 2023-07-07 14:37:08 +08:00
yuxianghui
5b5d41559c 优化了工作日历时间输入,新增工作日历设置自动计算时长功能,修改了生产线模型的位置(移至sf_maintenance模块下),优化了部分的产线设备资源设置模型 2023-07-07 14:36:27 +08:00
yuxianghui
123adcfc76 在sf_base下新增生产线模型,优化了计划管理-工作日历设置的手动输入时间和手动输入班次的格式 2023-07-06 17:38:08 +08:00
jinling.yang
1a0fa3fdb0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-06 17:33:47 +08:00
马广威
621b75d437 Accept Merge Request #228: (feature/优化库存模块功能 -> develop)
Merge Request: 优化货位状态,以及产品显隐逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/228?initial=true
2023-07-06 15:05:38 +08:00
mgw
b72c3ce08a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化库存模块功能 2023-07-06 15:04:11 +08:00
mgw
20c6a67f34 优化货位状态,以及产品显隐逻辑 2023-07-06 15:03:35 +08:00
WEB许何哲\xuhez
c440afa435 Merge branch 'develop' into feature/修改看板样式
解决冲突

# Conflicts:
#	sf_warehouse/__manifest__.py
#	sf_warehouse/static/src/change.scss
2023-07-06 14:41:17 +08:00
许何哲
8dfcd943f0 Accept Merge Request #227: (feature/前端分支 -> develop)
Merge Request: 修改导航栏

Created By: @许何哲
Accepted By: @许何哲
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/227?initial=true
2023-07-06 14:29:10 +08:00
WEB许何哲\xuhez
26319beaa4 样式修改 2023-07-06 14:22:34 +08:00
马广威
c0b7e3679b Accept Merge Request #226: (feature/为看板设置颜色 -> develop)
Merge Request: 在看板xml中增加判断逻辑选择不同的class属性值,以匹配对应的css颜色

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/226?initial=true
2023-07-06 12:28:00 +08:00
mgw
bc7f516d2d 在看板xml中增加判断逻辑选择不同的class属性值,以匹配对应的css颜色 2023-07-06 12:26:35 +08:00
马广威
f31becc215 Accept Merge Request #225: (feature/改造原生库存模块 -> develop)
Merge Request: 原生库存模块初步升级已完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/225?initial=true
2023-07-06 09:44:08 +08:00
mgw
3943b0994e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/改造原生库存模块 2023-07-06 09:41:42 +08:00
mgw
3a653a9485 优化货位看板显示字段 2023-07-06 09:38:57 +08:00
mgw
b754534b5b 完善库存模块新增功能及编码规则,已实现据货架分别展示下属货位的看板,待优化 2023-07-05 23:02:22 +08:00
jinling.yang
66cd682f7d 优化工件装夹 2023-07-05 17:34:43 +08:00
禹翔辉
52674a6747 Accept Merge Request #224: (feature/计划管理-基础设置 -> develop)
Merge Request: 新增计划管理模块,新增计划管理-工作日志设置模型(未完成),新增计划管理-工序设备资源设置模型(未完成)

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/224?initial=true
2023-07-05 14:51:21 +08:00
yuxianghui
a962af0f57 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/计划管理-基础设置 2023-07-05 14:48:03 +08:00
yuxianghui
caf367b10d 新增工序设备资源设置模型 2023-07-05 14:47:29 +08:00
龚启豪
afa630682c Accept Merge Request #222: (feature/设备模块优化,自动生成维保计划 -> develop)
Merge Request: 设备模块优化

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/222?initial=true
2023-07-05 14:34:13 +08:00
qihao.gong@jikimo.com
3e6130da15 维保计划新增确认维保计划和标记已完成按钮,处理自动生成维保计划的方法报错的bug 2023-07-05 14:32:22 +08:00
mgw
0d7c269c3b 继承原生库存模块,为位置模型增加库区库位等字段 2023-07-04 20:05:59 +08:00
yuxianghui
f685c9a3d4 新增计划管理模块,新增工作日历设置模块(已完成,手动输入时间部分需优化) 2023-07-04 17:37:20 +08:00
jinling.yang
e693bd97f3 新增工件组装,工件出库,组装工件功能 2023-07-04 17:32:14 +08:00
qihao.gong@jikimo.com
e6060b9bab 修改维保标准维保项目参数为One2many对象 并与设备,维保计划关联,修改原生维保计划方法 根据保养和检修生成不同的维保计划单 2023-07-04 17:30:50 +08:00
jinling.yang
3743c65da9 优化夹具产品模板 2023-06-30 17:35:20 +08:00
马广威
4199a86264 Accept Merge Request #221: (feature/刀具管理同步优化,增加字段 -> develop)
Merge Request: 修改依赖关系,解决依赖冲突

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/221?initial=true
2023-06-30 15:17:49 +08:00
mgw
e0315bafc7 修改依赖关系,解决依赖冲突 2023-06-30 15:17:10 +08:00
马广威
1a937a7476 Accept Merge Request #220: (feature/刀具管理同步优化,增加字段 -> develop)
Merge Request: 解决代码冲突


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/220?initial=true
2023-06-29 20:00:14 +08:00
mgw
576d2d7758 解决代码冲突 2023-06-29 19:59:39 +08:00
杨金灵
1f61cf7b5a Accept Merge Request #219: (feature/释放模型转换格式代码 -> develop)
Merge Request: 刀具产品模板根据型号展示不同字段和值


Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/219?initial=true
2023-06-29 18:55:52 +08:00
jinling.yang
05227b9022 刀具产品模板根据型号展示不同字段和值 2023-06-29 18:53:11 +08:00
马广威
4212340519 Accept Merge Request #218: (feature/刀具管理同步优化,增加字段 -> develop)
Merge Request: 解决代码冲突问题


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/218?initial=true
2023-06-29 17:43:44 +08:00
mgw
dbb3ea8a35 解决代码冲突问题 2023-06-29 17:43:16 +08:00
jinling.yang
36fe0cab18 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-29 17:17:05 +08:00
jinling.yang
8f841314b5 Merge branch 'feature/新增夹具功能' into develop 2023-06-29 17:16:51 +08:00
杨金灵
5bcd1e579d Accept Merge Request #217: (feature/新增夹具功能 -> develop)
Merge Request: 新增夹具功能

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/217?initial=true
2023-06-29 17:16:35 +08:00
jinling.yang
2c71439a96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:15:33 +08:00
jinling.yang
0f7f67aade Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能 2023-06-29 17:14:48 +08:00
禹翔辉
0c515cd563 Accept Merge Request #216: (feature/sf刀具功能分支 -> develop)
Merge Request: 优化了功能刀具自动申请装刀功能的数据显示问题


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/216?initial=true
2023-06-29 16:54:10 +08:00
yuxianghui
80a88b8afb 优化了功能刀具自动申请装刀功能的数据显示问题 2023-06-29 16:54:18 +08:00
yuxianghui
69cb1adc3e 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示,新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成 2023-06-29 15:56:08 +08:00
禹翔辉
7795cfef29 Accept Merge Request #215: (feature/sf刀具功能分支 -> develop)
Merge Request: 优化了功能刀具组装的出库弹窗里的确定、取消按键的显示,新增CAM装刀来源的任务出库后修改CAM用刀计划的状态改变为已完成


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/215?initial=true
2023-06-29 15:55:58 +08:00
马广威
e77eb4d20d Accept Merge Request #214: (feature/刀具管理同步优化,增加字段 -> develop)
Merge Request: 刀具物料查询功能本地测试完成,推至线上测试


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/214?initial=true
2023-06-29 14:23:53 +08:00
mgw
8664c196f0 刀具物料查询功能本地测试完成,推至线上测试 2023-06-29 14:23:10 +08:00
yuxianghui
d5938bf407 优化了申请换刀功能的数据, 2023-06-29 14:16:10 +08:00
禹翔辉
b32722ca54 Accept Merge Request #213: (feature/sf刀具功能分支 -> develop)
Merge Request: 优化了申请换刀功能的数据

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/213?initial=true
2023-06-29 14:15:57 +08:00
jinling.yang
3907901dc3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-29 11:18:13 +08:00
jinling.yang
6ad7a1e613 Merge branch 'feature/刀具产品模板优化' into develop 2023-06-29 11:17:49 +08:00
杨金灵
89475f46a3 Accept Merge Request #212: (feature/刀具产品模板优化 -> develop)
Merge Request: 刀具产品模板优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/212?initial=true
2023-06-29 11:17:30 +08:00
jinling.yang
37b834b3cf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
2023-06-29 11:15:40 +08:00
马广威
78c13acbab Accept Merge Request #211: (feature/刀具管理同步优化,增加字段 -> develop)
Merge Request: 刀具管理同步优化基本完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/211?initial=true
2023-06-29 09:57:55 +08:00
mgw
2aae162f73 优化sf字段形式 2023-06-29 09:56:31 +08:00
禹翔辉
79dfa10d4e Accept Merge Request #210: (feature/sf刀具功能分支 -> develop)
Merge Request: 新增批量出库功能(功能已完成,按键未增加),新增自动组装方法(todo),新增出库按键弹窗样式修改


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/210?initial=true
2023-06-29 09:37:09 +08:00
yuxianghui
ec95e09553 新增批量出库功能(功能已完成,按键未增加),新增自动组装方法(todo),新增出库按键弹窗样式修改 2023-06-29 09:36:54 +08:00
mgw
7689701ab1 刀具同步优化完成,字段已添加 2023-06-28 20:49:16 +08:00
jinling.yang
b02cb16dc9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化
# Conflicts:
#	sf_tool_management/__manifest__.py
#	sf_tool_management/views/tool_base_views.xml
2023-06-28 18:34:39 +08:00
jinling.yang
eab6f0ceee 刀具产品页面刀具物料及型号字段修改 2023-06-28 18:32:45 +08:00
龚启豪
05e69d21fa Accept Merge Request #209: (feature/设备维保 -> develop)
Merge Request: 设备维保模块

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/209
2023-06-28 10:39:28 +08:00
龚启豪
ec0da8cf76 Merge branch refs/heads/develop into refs/heads/feature/设备维保 2023-06-28 10:39:23 +08:00
马广威
6dc167fae1 Accept Merge Request #208: (feature/sf刀具基础信息管理 -> develop)
Merge Request: 优化search筛选框界面显示异常


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/208?initial=true
2023-06-28 10:17:45 +08:00
禹翔辉
cb56a3ed83 Accept Merge Request #207: (feature/sf刀具功能分支 -> develop)
Merge Request: 新增功能刀具计划模型(已完成),新增功能刀具组装(未完成),优化了功能刀具管理和功能刀具有关的代码

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/207?initial=true
2023-06-28 10:07:21 +08:00
mgw
59ae98a21c 优化search筛选框界面显示异常 2023-06-28 10:03:24 +08:00
yuxianghui
5dba31576a 优化了功能刀具管理的代码 2023-06-28 10:02:59 +08:00
yuxianghui
c94c661506 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf刀具功能分支
# Conflicts:
#	sf_tool_management/views/tool_base_views.xml
2023-06-28 09:15:55 +08:00
qihao.gong@jikimo.com
1eea2bb1c3 处理设备与设备维保标准的关联关系方法,新增设备故障报警日志页面 2023-06-27 17:32:24 +08:00
yuxianghui
d6f749fff5 新增功能刀具组装的组装弹窗按键功能(功能已完成)、取消组装功能按键(功能已完成)、出库弹窗按键(已完成视图) 2023-06-27 17:31:49 +08:00
jinling.yang
aea68f5239 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能
# Conflicts:
#	sf_base/__manifest__.py
#	sf_base/models/__init__.py
#	sf_mrs_connect/data/ir_cron_data.xml
#	sf_mrs_connect/models/sync_common.py
2023-06-27 16:40:58 +08:00
jinling.yang
d18b1808d9 新增同步夹具相关的定时器 2023-06-27 16:35:30 +08:00
马广威
8b94696dc3 Accept Merge Request #205: (feature/sf刀具基础信息管理 -> develop)
Merge Request: sf刀具重构完成,同步方法测试完成


Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/205?initial=true
2023-06-27 16:27:32 +08:00
yuxianghui
e880b020c6 增加了机台换刀申请和CAM程序用刀计划的搜索视图,增加了机台换刀申请的自动换刀功能,增加了CAM程序用刀计划的自动换刀申请功能(待完善) 2023-06-27 10:20:31 +08:00
yuxianghui
1348712c83 新增了功能刀具组装界面,新增了功能刀具计划的按键功能,以及按键的显示功能 2023-06-26 18:10:37 +08:00
jinling.yang
87e3f6d04e 新增夹具和功能夹具,及同步mrs的夹具和功能夹具 2023-06-26 18:07:44 +08:00
WEB许何哲\xuhez
65ec935a9f 0626提交 2023-06-26 17:35:55 +08:00
qihao.gong@jikimo.com
cf91ef5604 设备维保计划 2023-06-26 17:32:56 +08:00
qihao.gong@jikimo.com
8b227d9ac9 设备维保 2023-06-25 17:37:55 +08:00
yuxianghui
c37166397e 完成了机台换刀申请的换刀申请按键弹窗数据同步回机台换刀申请界面以及转移按键界面、CAM工单程序用刀计划的申请装刀界面 2023-06-25 17:36:33 +08:00
mgw
65c8d4a4e9 sf刀具重构完成,同步方法测试完成 2023-06-25 16:44:10 +08:00
yuxianghui
f135f0a5e7 完成了弹窗换刀需求信息的视图和默认数据的同步 2023-06-21 17:21:58 +08:00
yuxianghui
6caae0325a 功能刀具计划(换刀申请和CAM工单程序用刀计划)视图已完成 2023-06-20 16:51:06 +08:00
杨金灵
15304d6eb5 Accept Merge Request #204: (feature/采购刀具产品优化序列号生成规则 -> develop)
Merge Request: 采购刀具产品入库优化序列号生成规则

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/204?initial=true
2023-06-16 17:13:09 +08:00
jinling.yang
6dc2935741 采购入库若选择的产品是刀具,则优化序列号生成规则 2023-06-16 17:10:31 +08:00
禹翔辉
8c9a211295 Accept Merge Request #203: (feature/sf刀具功能分支 -> develop)
Merge Request: 智能工厂类型备注样式调整

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/203?initial=true
2023-06-16 11:13:21 +08:00
龚启豪
7d6bd9119b Accept Merge Request #202: (feature/功能刀具页面 -> develop)
Merge Request: 处理bug

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/202?initial=true
2023-06-16 11:02:15 +08:00
yuxianghui
062b50d34c 智能工厂类型备注样式调整 2023-06-16 11:01:24 +08:00
qihao.gong@jikimo.com
23aba08c87 处理bug 2023-06-16 10:56:25 +08:00
yuxianghui
b835103cef 功能刀具管理根据所选功能刀具类型自动填充功能刀具数据(该功能已注释) 2023-06-16 10:07:35 +08:00
qihao.gong@jikimo.com
018fecfc59 处理冲突 2023-06-16 10:02:33 +08:00
qihao.gong@jikimo.com
e9ad452c43 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/功能刀具页面
# Conflicts:
#	sf_tool_management/__init__.py
#	sf_tool_management/__manifest__.py
#	sf_tool_management/models/__init__.py
#	sf_tool_management/models/base.py
#	sf_tool_management/security/ir.model.access.csv
#	sf_tool_management/views/menu_view.xml
#	sf_tool_management/views/tool_base_views.xml
2023-06-16 10:01:23 +08:00
禹翔辉
376731fbd9 Accept Merge Request #201: (feature/sf刀具功能分支 -> develop)
Merge Request: 优化了功能刀具实时分布和出入库记录的视图显示效果

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/201?initial=true
2023-06-15 17:05:26 +08:00
yuxianghui
4f7489f471 优化了功能刀具实时分布和出入库记录的视图显示效果 2023-06-15 17:04:40 +08:00
jinling.yang
ff904c2c02 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-15 16:19:05 +08:00
WEB许何哲\xuhez
c81730d7ba 0615t提交 2023-06-15 16:18:34 +08:00
jinling.yang
f455f1e7b4 Merge branch 'feature/刀具基础信息生成产品模板' into develop 2023-06-15 16:18:27 +08:00
杨金灵
0259270ece Accept Merge Request #200: (feature/刀具基础信息生成产品模板 -> develop)
Merge Request: 刀具基础信息生成产品模板

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/200?initial=true
2023-06-15 16:18:04 +08:00
jinling.yang
8a0d89161b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板 2023-06-15 16:15:28 +08:00
jinling.yang
c7ec8be141 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具基础信息生成产品模板 2023-06-15 16:14:50 +08:00
马广威
95870699d5 Accept Merge Request #199: (feature/sf刀具基础信息管理 -> develop)
Merge Request: 修复同步bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/199?initial=true
2023-06-15 15:41:41 +08:00
mgw
ba93adfb7b 修复同步bug(刀片类型字段无值) 2023-06-15 15:40:23 +08:00
马广威
a219a17165 Accept Merge Request #198: (feature/sf刀具基础信息管理 -> develop)
Merge Request: 型号对象增加搜索视图

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/198?initial=true
2023-06-15 12:21:00 +08:00
mgw
b1da7a8fda 型号对象增加搜索视图 2023-06-15 12:20:26 +08:00
禹翔辉
8b549a19a8 Accept Merge Request #197: (feature/sf刀具功能分支 -> develop)
Merge Request: 关联了功能刀具和功能刀具管理俩个对象

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/197
2023-06-15 10:00:20 +08:00
yuxianghui
fc6b756aaf 关联了功能刀具和功能刀具管理俩个对象 2023-06-15 09:57:14 +08:00
禹翔辉
1eeafeddb9 Accept Merge Request #196: (feature/sf刀具功能分支 -> develop)
Merge Request: 增加了功能刀具实时分布和出入库记录功能模型

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/196?initial=true
2023-06-15 09:08:56 +08:00
jinling.yang
34cc5bf125 新增刀具及刀具型号联动展示相关字段并显示对应信息,不同刀具的页面布局 2023-06-14 19:22:52 +08:00
马广威
a205220acd Accept Merge Request #195: (feature/sf刀具基础信息管理 -> develop)
Merge Request: 删除测试模型及其界面

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/195
2023-06-14 17:38:14 +08:00
mgw
f6651ffffb 删除测试模型 2023-06-14 17:36:39 +08:00
qihao.gong@jikimo.com
b8dc06a7c7 sf功能刀具管理页面 2023-06-14 17:18:03 +08:00
马广威
08f8d7f03a Accept Merge Request #194: (feature/sf刀具基础信息管理 -> develop)
Merge Request: 增加物料刀具同步功能,修复一些问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/194?initial=true
2023-06-14 16:35:54 +08:00
mgw
93c5bcebe1 增加刀具物料同步功能 2023-06-14 16:33:53 +08:00
yuxianghui
24fd92fa3b 对功能刀具预警、实时分布和出入库记录的代码进行了合并优化 2023-06-14 16:27:16 +08:00
qihao.gong@jikimo.com
c919dac8cb 刀具管理 2023-06-13 17:33:38 +08:00
WEB许何哲\xuhez
414f485c17 0613修改侧边栏 2023-06-13 17:32:21 +08:00
jinling.yang
6068a55b79 新增sf的刀具模板的相关刀具物料字段 2023-06-13 17:30:35 +08:00
yuxianghui
3236d477c0 sf的功能刀具实时分布和功能刀具出入库记录视图界面已建立 2023-06-13 17:13:15 +08:00
mgw
3d1d5e6ef3 智能工厂刀具物料模型、关联关系及其界面已建立 2023-06-13 14:13:15 +08:00
禹翔辉
6886354fc5 Accept Merge Request #191: (feature/sf刀具功能分支 -> develop)
Merge Request: 夹具基础数据模块和redis夹具数据同步到sf夹具基础数据

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/191?initial=true
2023-06-13 11:22:02 +08:00
yuxianghui
3a8c65c8d1 解决sf代码冲突问题 2023-06-13 11:19:06 +08:00
qihao.gong@jikimo.com
2eadcbe31a 新建刀具管理模块 及菜单 2023-06-13 10:40:58 +08:00
龚启豪
c76c01d78f Accept Merge Request #189: (feature/sf机床同步 -> develop)
Merge Request: 同步接口新增每日定时器

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/189
2023-06-12 16:19:42 +08:00
qihao.gong@jikimo.com
3baa438c2b 每日同步刀具定时器 2023-06-12 16:17:42 +08:00
马广威
f457890b73 Accept Merge Request #188: (feature/sf刀具基础信息管理 -> develop)
Merge Request: 修正图片同步bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/188?initial=true
2023-06-12 15:10:22 +08:00
mgw
06f907ba00 更正图片无法同步的bug 2023-06-12 15:09:30 +08:00
mgw
56580fa22a 同步方法已完成,合并 2023-06-12 14:48:06 +08:00
mgw
3d04200ca7 解决冲突 2023-06-12 14:35:14 +08:00
马广威
e9ccdd958d Accept Merge Request #187: (feature/sf刀具基础信息管理 -> develop)
Merge Request: sf刀具基础信息同步基本完成

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/187?initial=true
2023-06-12 14:24:41 +08:00
mgw
e0983d0530 解决权限冲突 2023-06-12 14:12:16 +08:00
mgw
a1678f76c2 同步方法基本完成,优化图片展示 2023-06-12 13:17:52 +08:00
jinling.yang
b53a115489 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-12 10:41:26 +08:00
jinling.yang
41cc8f1d73 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-06-12 10:39:34 +08:00
mgw
f95e04afc9 刀具同步方法(cloud >>> sf)基本完成,待测试 2023-06-12 09:24:33 +08:00
mgw
ac66e15d7a 部分cloud>sf同步接口已完成并测试 2023-06-09 18:15:12 +08:00
WEB许何哲\xuhez
8a4320c031 前端修改样式 2023-06-09 17:28:36 +08:00
龚启豪
8c23acceaf Accept Merge Request #184: (feature/sf机床同步 -> develop)
Merge Request: 修改机床类型,机床型号对象,并从redis同步到工厂

Created By: @龚启豪
Accepted By: @龚启豪
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/184
2023-06-08 15:02:44 +08:00
龚启豪
c481f5776e Merge branch refs/heads/develop into refs/heads/feature/sf机床同步 2023-06-08 15:02:03 +08:00
马广威
bc8f66c4e5 Accept Merge Request #185: (feature/sf刀具基础信息管理 -> develop)
Merge Request: sf刀具基础信息初步建立

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/185?initial=true
2023-06-08 15:00:26 +08:00
mgw
bf3c7e2b4d sf刀具基础信息已初步建立 2023-06-08 14:58:40 +08:00
qihao.gong@jikimo.com
99b89f2e15 修改同步所有数据的按钮 2023-06-08 09:36:42 +08:00
qihao.gong@jikimo.com
9d1597089b 修改机床型号同步接口以及基础数据 2023-06-07 15:26:44 +08:00
qihao.gong@jikimo.com
46c57162d7 同步机床类型对象 2023-06-07 10:49:55 +08:00
马广威
7dfab63a89 Accept Merge Request #183: (feature/企业微信审批接入 -> develop)
Merge Request: 同步模板功能接入

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/183
2023-06-02 17:07:17 +08:00
马广威
38961c5ba1 Merge branch refs/heads/develop into refs/heads/feature/企业微信审批接入 2023-06-02 17:07:01 +08:00
mgw
f973bb031d 同步模板功能基本完成 2023-06-02 17:03:03 +08:00
jinling.yang
657293bf06 Merge branch 'feature/新增审批功能' into develop 2023-06-02 16:38:40 +08:00
杨金灵
f462aec08a Accept Merge Request #182: (feature/新增审批功能 -> develop)
Merge Request: 新增sf与企业微信对接的审批模块

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/182?initial=true
2023-06-02 16:38:25 +08:00
jinling.yang
bb9c4d1c27 审批历史记录模型新增字段 2023-06-01 17:27:33 +08:00
mgw
8b19e0be38 优化create记录的字典 2023-06-01 16:31:11 +08:00
mgw
1c5d135e48 修改模板模型结构 2023-06-01 15:45:00 +08:00
mgw
48e0809bd7 同步企业微信审批模板~除”控件配置“外基本完成 2023-05-31 18:13:12 +08:00
jinling.yang
29acd4d879 新增审批模型及相关页面 2023-05-31 17:44:27 +08:00
mgw
ce532a6b63 增加审批模板配置对象,当企业微信模板有更新时,从此配置对象读取模板id列表,即可更新odoo中的审批模板 2023-05-30 14:50:18 +08:00
杨金灵
fd943df012 Accept Merge Request #181: (feature/新增企业微信模块 -> develop)
Merge Request: 新增企业微信模块

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/181?initial=true
2023-05-30 11:27:56 +08:00
jinling.yang
9ae2ff1a2b 新增企业微信模块 2023-05-30 11:26:03 +08:00
马广威
c913973936 Accept Merge Request #180: (feature/优化代码结构 -> develop)
Merge Request: 修复进度反馈问题与时区问题,优化界面问题(下发记录等只显示在cnc加工工单处)与opcua超时时长

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/180?initial=true
2023-05-23 10:46:37 +08:00
mgw
92cbdfd4f5 修复进度不更新到bfm的问题,在sf的设置处增加bfm环境选择(正式、测试、开发) 2023-05-23 10:41:10 +08:00
jinling.yang
0a2454507b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2023-05-17 14:22:52 +08:00
杨金灵
6ea98623fb Accept Merge Request #179: (feature/表面工艺外协优化项 -> develop)
Merge Request: 出入库单新增验证及单个外协表面工艺Bug修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/179?initial=true
2023-05-17 14:21:02 +08:00
jinling.yang
f2218f7afb 出入库单新增验证及单个外协表面工艺Bug修复 2023-05-17 14:18:23 +08:00
杨金灵
d04e98a5fd Accept Merge Request #178: (feature/表面工艺外协优化项 -> develop)
Merge Request: 出入库单状态修复

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/178?initial=true
2023-05-16 17:35:16 +08:00
jinling.yang
4e81243adc 出入库单状态修复 2023-05-16 17:32:23 +08:00
杨金灵
774d688929 Accept Merge Request #176: (feature/销售订单行新增模型展示 -> develop)
Merge Request: 销售订单行新增模型展示

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/176?initial=true
2023-05-15 17:08:25 +08:00
jinling.yang
9415599b53 Merge branch 'feature/销售订单行新增模型展示' into develop 2023-05-15 17:08:14 +08:00
jinling.yang
e1a8f68eea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示 2023-05-15 17:02:01 +08:00
杨金灵
7ec8feec2c Accept Merge Request #175: (feature/表面工艺外协优化项 -> develop)
Merge Request: 表面工艺外协优化

Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/175?initial=true
2023-05-12 17:41:23 +08:00
jinling.yang
cdb5493461 新增出库单验证前置和后置条件,外协工单点击完成时生成询价单 2023-05-12 17:36:59 +08:00
mgw
19531bba04 修复下发时的时区问题 2023-05-06 10:48:26 +08:00
mgw
af5b319d0c 优化界面展示,优化opcua超时时长 2023-05-05 21:08:06 +08:00
jinling.yang
b942696c69 1.销售模块的销售页面的订单行展示模型
2.表面工艺及类别菜单的排序
2023-04-24 17:09:16 +08:00
779 changed files with 66278 additions and 8714 deletions

8
.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,8 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

1
.idea/.name generated Normal file
View File

@@ -0,0 +1 @@
__manifest__.py

19
.idea/jikimo_sf.iml generated Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.9" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PyDocumentationSettings">
<option name="format" value="PLAIN" />
<option name="myDocStringFormat" value="Plain" />
</component>
<component name="TemplatesService">
<option name="TEMPLATE_FOLDERS">
<list>
<option value="$MODULE_DIR$/yizuo_login_background_and_styles/templates" />
</list>
</option>
</component>
</module>

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/jikimo_sf.iml" filepath="$PROJECT_DIR$/.idea/jikimo_sf.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

8
code_backend_theme/.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/code_backend_theme.iml" filepath="$PROJECT_DIR$/.idea/code_backend_theme.iml" />
</modules>
</component>
</project>

View File

@@ -0,0 +1,40 @@
Code Backend Theme
==================
* Code Backend Theme module for Odoo 16 community editions
Installation
============
- www.odoo.com/documentation/16.0/setup/install.html
- Install our custom addon
License
-------
General Public License, Version 3 (LGPL v3).
(https://www.odoo.com/documentation/user/14.0/legal/licenses/licenses.html)
Company
-------
* 'Cybrosys Techno Solutions <https://cybrosys.com/>'__
Credits
-------
* 'Cybrosys Techno Solutions <https://cybrosys.com/>'__
Contacts
--------
* Mail Contact : odoo@cybrosys.com
Bug Tracker
-----------
Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported.
Maintainer
==========
This module is maintained by Cybrosys Technologies.
For support and more information, please visit https://www.cybrosys.com
Further information
===================
HTML Description: `<static/description/index.html>`__

View File

@@ -0,0 +1,22 @@
# -*- coding: utf-8 -*-
#############################################################################
#
# Cybrosys Technologies Pvt. Ltd.
#
# Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
# Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
#
# You can modify it under the terms of the GNU LESSER
# GENERAL PUBLIC LICENSE (LGPL v3), Version 3.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details.
#
# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE
# (LGPL v3) along with this program.
# If not, see <http://www.gnu.org/licenses/>.
#
#############################################################################
from .hooks import test_pre_init_hook, test_post_init_hook

View File

@@ -0,0 +1,72 @@
# -*- coding: utf-8 -*-
#############################################################################
#
# Cybrosys Technologies Pvt. Ltd.
#
# Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
# Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
#
# You can modify it under the terms of the GNU LESSER
# GENERAL PUBLIC LICENSE (LGPL v3), Version 3.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details.
#
# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE
# (LGPL v3) along with this program.
# If not, see <http://www.gnu.org/licenses/>.
#
#############################################################################
{
"name": "Code Backend Theme V16",
"description": """Minimalist and elegant backend theme for Odoo 16, Backend Theme, Theme""",
"summary": "Code Backend Theme V16 is an attractive theme for backend",
"category": "Themes/Backend",
"version": "16.0.1.0.2",
'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
"depends": ['base', 'web', 'mail'],
"data": [
'views/layout.xml',
'views/icons.xml',
# 'views/navbar.xml'
],
'assets': {
'web.assets_backend': [
'code_backend_theme/static/src/js/chrome/myDropdown.js',
'code_backend_theme/static/src/xml/styles.xml',
'code_backend_theme/static/src/xml/top_bar.xml',
# 'code_backend_theme/static/src/xml/dropdown.xml',
'code_backend_theme/static/src/xml/navbar.xml',
'code_backend_theme/static/src/scss/theme_accent.scss',
'code_backend_theme/static/src/scss/navigation_bar.scss',
'code_backend_theme/static/src/scss/datetimepicker.scss',
'code_backend_theme/static/src/scss/theme.scss',
'code_backend_theme/static/src/scss/change.scss',
'code_backend_theme/static/src/scss/sidebar.scss',
'code_backend_theme/static/src/js/chrome/sidebar_menu.js',
'code_backend_theme/static/src/js/chrome/test.js',
'code_backend_theme/static/src/js/fields/colors.js',
],
'web.assets_frontend': [
'code_backend_theme/static/src/scss/login.scss',
],
},
'images': [
'static/description/banner.png',
'static/description/theme_screenshot.png',
],
'license': 'LGPL-3',
'pre_init_hook': 'test_pre_init_hook',
'post_init_hook': 'test_post_init_hook',
'installable': True,
'application': False,
'auto_install': False,
}

View File

@@ -0,0 +1,6 @@
## Module <code_backend_theme>
#### 17.10.2022
#### Version 16.0.1.0.0
#### ADD
Initial Commit

292
code_backend_theme/hooks.py Normal file
View File

@@ -0,0 +1,292 @@
"""Hooks for Changing Menu Web_icon"""
# -*- coding: utf-8 -*-
#############################################################################
#
# Cybrosys Technologies Pvt. Ltd.
#
# Copyright (C) 2021-TODAY Cybrosys Technologies(<https://www.cybrosys.com>)
# Author: Cybrosys Techno Solutions(<https://www.cybrosys.com>)
#
# You can modify it under the terms of the GNU LESSER
# GENERAL PUBLIC LICENSE (LGPL v3), Version 3.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU LESSER GENERAL PUBLIC LICENSE (LGPL v3) for more details.
#
# You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENSE
# (LGPL v3) along with this program.
# If not, see <http://www.gnu.org/licenses/>.
#
#############################################################################
import base64
from odoo import api, SUPERUSER_ID
from odoo.modules import get_module_resource
def test_pre_init_hook(cr):
"""pre init hook"""
env = api.Environment(cr, SUPERUSER_ID, {})
menu_item = env['ir.ui.menu'].search([('parent_id', '=', False)])
for menu in menu_item:
if menu.name == 'Contacts':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Contacts.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Link Tracker':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Link Tracker.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Dashboards':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Dashboards.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Sales':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Sales.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Invoicing':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Invoicing.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Inventory':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Inventory.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Purchase':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Purchase.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Calendar':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Calendar.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'CRM':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'CRM.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Note' or menu.name == 'Notes':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Note.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Website':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Website.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Point of Sale':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Point of Sale.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Manufacturing':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Manufacturing.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Repairs':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Repairs.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Email Marketing':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Email Marketing.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'SMS Marketing':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'SMS Marketing.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Project':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Project.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Surveys':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Surveys.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Employees':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Employees.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Recruitment':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Recruitment.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Attendances':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Attendances.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Time Off':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Time Off.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Expenses':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Expenses.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Maintenance':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Maintenance.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Live Chat':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Live Chat.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Lunch':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Lunch.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Fleet':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Fleet.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Timesheets':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Timesheets.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Events':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Events.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'eLearning':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'eLearning.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Members':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Members.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
def test_post_init_hook(cr, registry):
"""post init hook"""
env = api.Environment(cr, SUPERUSER_ID, {})
menu_item = env['ir.ui.menu'].search([('parent_id', '=', False)])
for menu in menu_item:
if menu.name == 'Contacts':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Contacts.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Link Tracker':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Link Tracker.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Dashboards':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Dashboards.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Sales':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Sales.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Invoicing' or menu.name == 'Accounting':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Invoicing.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Inventory':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Inventory.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Purchase':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Purchase.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Calendar':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Calendar.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'CRM':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'CRM.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Note':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Note.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Website':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Website.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Point of Sale':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Point of Sale.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Manufacturing':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Manufacturing.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Repairs':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Repairs.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Email Marketing':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Email Marketing.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'SMS Marketing':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'SMS Marketing.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Project':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Project.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Surveys':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Surveys.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Employees':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Employees.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Recruitment':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Recruitment.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Attendances':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Attendances.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Time Off':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Time Off.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Expenses':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Expenses.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Maintenance':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Maintenance.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Live Chat':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Live Chat.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Lunch':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Lunch.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Fleet':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Fleet.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Timesheets':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Timesheets.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Events':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Events.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'eLearning':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'eLearning.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})
if menu.name == 'Members':
img_path = get_module_resource(
'code_backend_theme', 'static', 'src', 'img', 'icons', 'Members.png')
menu.write({'web_icon_data': base64.b64encode(open(img_path, "rb").read())})

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 911 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 878 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 653 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 839 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 427 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 988 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 967 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 722 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 522 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 606 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 334 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 378 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 295 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 368 KiB

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!--! Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2023 Fonticons, Inc. --><path d="M137.4 374.6c12.5 12.5 32.8 12.5 45.3 0l128-128c9.2-9.2 11.9-22.9 6.9-34.9s-16.6-19.8-29.6-19.8L32 192c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l128 128z"/></svg>

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 446 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 653 B

Some files were not shown because too many files have changed in this diff Show More