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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局

Browse Source
This commit is contained in:
jinling.yang
2023-08-21 11:50:36 +08:00
parent f6841e5e9f 2cb84c5f55
commit 3ab0fcb337
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_mrs_connect/models/sync_common.py
View File

@@ -540,7 +540,6 @@ class MachineBrand(models.Model):
brand.name = item['name'],
brand.code = item['code'],
brand.image_brand = '' if not item['image_brand'] else base64.b64encode(item.image_brand),
brand.manufacturer_model_number = item['manufacturer_model_number'],
brand.active = item['active'],
brand.remark = item['remark'],
else:
@@ -549,7 +548,6 @@ class MachineBrand(models.Model):
"name": item['name'],
"code": item['code'],
"image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
"manufacturer_model_number": item['manufacturer_model_number'],
"active": item['active'],
"remark": item['remark'],
@@ -579,7 +577,6 @@ class MachineBrand(models.Model):
"name": item['name'],
"code": item['code'],
"remark": item['remark'],
"manufacturer_model_number": item['manufacturer_model_number'],
"image_brand": '' if not item['image_brand'] else base64.b64encode(item.image_brand),
"tag_ids": self.env['sf.machine.brand.tags'].search(
[("name", 'in', item['tag_ids'])]).ids