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 
# Conflicts:
#	sf_manufacturing/models/stock.py
#	sf_wxwork_approval/models/model.py
This commit is contained in:
jinling.yang
2023-11-20 15:11:43 +08:00
parent 04e63dcc59 b093b11ec2
commit 6912160232
24 changed files with 142 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_manufacturing/models/stock.py
View File

@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-
from datetime import datetime
import requests
import logging
import base64
from collections import defaultdict, namedtuple
import logging
from re import findall as regex_findall
from datetime import datetime
from re import split as regex_split
from odoo.addons.stock.models.stock_rule import ProcurementException
from odoo.addons.sf_base.commons.common import Common
import requests
from odoo import SUPERUSER_ID, _, api, fields, models
from odoo.tools import float_compare
from collections import defaultdict, namedtuple
from odoo.addons.stock.models.stock_rule import ProcurementException
from odoo.addons.sf_base.commons.common import Common
from odoo.exceptions import UserError