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

1.采购订单Tree列表新增审核状态

Browse Source
This commit is contained in:
jinling.yang
2023-12-29 11:24:48 +08:00
parent f3ec784383
commit fbf86a69e3
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_dlm_management/__manifest__.py
View File

@@ -11,7 +11,7 @@
'website': 'https://www.sf.jikimo.com', 'website': 'https://www.sf.jikimo.com',
'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing'], 'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing'],
'data': [ 'data': [
'data/stock_data.xml', # 'data/stock_data.xml',
'views/product_template_management_view.xml', 'views/product_template_management_view.xml',
], ],
'demo': [ 'demo': [

4
sf_manufacturing/models/product_template.py
View File

@@ -6,8 +6,8 @@ import os
from odoo import models, fields, api, _ from odoo import models, fields, api, _
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
from odoo.modules import get_resource_path from odoo.modules import get_resource_path
from OCC.Extend.DataExchange import read_step_file # from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file # from OCC.Extend.DataExchange import write_stl_file
class ResProductMo(models.Model): class ResProductMo(models.Model):

2
sf_sale/models/auto_quatotion_common.py
View File

@@ -2,7 +2,7 @@
import logging import logging
from odoo.modules import get_resource_path from odoo.modules import get_resource_path
from odoo import fields, models, api from odoo import fields, models, api
from quatotion import readSql, feature_recognize, auto_quatotion # from quatotion import readSql, feature_recognize, auto_quatotion
__author__ = 'jinling.yang' __author__ = 'jinling.yang'
_logger = logging.getLogger(__name__) _logger = logging.getLogger(__name__)

6
sf_sale/models/quick_easy_order.py
View File

@@ -4,9 +4,9 @@ import hashlib
import os import os
import json import json
from datetime import datetime from datetime import datetime
import requests # import requests
from OCC.Extend.DataExchange import read_step_file # from OCC.Extend.DataExchange import read_step_file
from OCC.Extend.DataExchange import write_stl_file # from OCC.Extend.DataExchange import write_stl_file
from odoo import models, fields, api from odoo import models, fields, api
from odoo.modules import get_resource_path from odoo.modules import get_resource_path
from odoo.exceptions import ValidationError, UserError from odoo.exceptions import ValidationError, UserError

3
sf_sale/models/sale_order.py
View File

@@ -103,7 +103,8 @@ class RePurchaseOrder(models.Model):
def button_confirm(self): def button_confirm(self):
self.check_status = 'pending' self.check_status = 'pending'
return super().button_confirm() res = super().button_confirm()
return res
class ResPartnerToSale(models.Model): class ResPartnerToSale(models.Model):

6
sf_sale/views/purchase_order_view.xml
View File

@@ -126,12 +126,12 @@
</field> </field>
</record> </record>
<record id="view_purchase_order_kpis_tree_inherit_sf" model="ir.ui.view"> <record id="purchase_order_view_tree_inherit_sf" model="ir.ui.view">
<field name="name">purchase.order.tree.inherit.sf</field> <field name="name">purchase.order.tree.inherit.sf</field>
<field name="model">purchase.order</field> <field name="model">purchase.order</field>
<field name="inherit_id" ref="purchase.purchase_order_kpis_tree"/> <field name="inherit_id" ref="purchase.purchase_order_view_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="state" position="after"> <field name="invoice_status" position="after">
<field name="check_status" widget="badge" <field name="check_status" widget="badge"
decoration-success="check_status == 'approved'" decoration-success="check_status == 'approved'"
decoration-warning="check_status == 'pending'" decoration-warning="check_status == 'pending'"