jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #735: (feature/修改数据库 -> develop)

Browse Source 
Merge Request: 修改数据库

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/735?initial=true
This commit is contained in:
杨金灵
2023-12-25 17:32:45 +08:00
committed by Coding
parent b132cb8713 db8ad0f425
commit 1e2c80c38f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
odoo.conf
View File

@@ -4,14 +4,14 @@ csv_internal_sep = ,
data_dir = /var/lib/odoo data_dir = /var/lib/odoo
db_host = 172.17.0.2 db_host = 172.17.0.2
db_maxconn = 64 db_maxconn = 64
db_name = sf_t2cs_010 db_name = sf_t2cs_003
db_password = sf db_password = sf
db_port = 5432 db_port = 5432
db_sslmode = prefer db_sslmode = prefer
db_template = template0 db_template = template0
db_user = sf db_user = sf
dbfilter = dbfilter =
demo = {} without_demo = all
email_from = False email_from = False
from_filter = False from_filter = False
geoip_database = /usr/share/GeoIP/GeoLite2-City.mmdb geoip_database = /usr/share/GeoIP/GeoLite2-City.mmdb

2
sf_manufacturing/models/mrp_production.py
View File

@@ -366,7 +366,7 @@ class MrpProduction(models.Model):
current_sequence += 1 current_sequence += 1
if work.name == '获取CNC加工程序': if work.name == '获取CNC加工程序':
work.button_start() work.button_start()
# work.fetchCNC() work.fetchCNC()
# 创建工单并进行排序 # 创建工单并进行排序
def _create_workorder(self): def _create_workorder(self):