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 develop

Browse Source 
# Conflicts:
#	sf_base/security/ir.model.access.csv
#	sf_base/views/mrs_common_view.xml
#	sf_route_workcenter/models/workcenter.py
This commit is contained in:
gqh
2022-11-07 11:00:14 +08:00
parent a49a24e9e6 a33b16cf78
commit 84cf25f39d
7 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_route_workcenter/models/workcenter.py
View File

@@ -8,8 +8,14 @@ import qrcode
from io import BytesIO
from odoo import api, fields, models
<<<<<<< HEAD
from pystrich.code128 import Code128Encoder
=======
import barcode
# from barcode.writer import ImageWriter
# from pystrich.code128 import Code128Encoder
>>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
from odoo.exceptions import UserError
_logger = logging.getLogger(__name__)