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:
mgw
2024-01-18 09:14:25 +08:00
parent eefabbd5b3 cb14bb4ea8
commit cffda26ed0
28 changed files with 262 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_sale/models/sale_order.py
View File

@@ -166,20 +166,20 @@ class ResPartnerToSale(models.Model):
@api.constrains('name')
def _check_name(self):
obj = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id)])
obj = self.sudo().search([('name', '=', self.name), ('id', '!=', self.id), ('active', '=', True)])
if obj:
raise UserError('该名称已存在,请重新输入')
@api.constrains('vat')
def _check_vat(self):
obj = self.sudo().search([('vat', '=', self.vat), ('id', '!=', self.id)])
obj = self.sudo().search([('vat', '=', self.vat), ('id', '!=', self.id), ('active', '=', True)])
if obj:
raise UserError('该税ID已存在,请重新输入')
@api.constrains('email')
def _check_email(self):
if self.customer_rank > 0:
obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id)])
obj = self.sudo().search([('email', '=', self.email), ('id', '!=', self.id), ('active', '=', True)])
if obj:
raise UserError('该邮箱已存在,请重新输入')
@@ -197,7 +197,7 @@ class ResPartnerToSale(models.Model):
else:
domain = [('id', '=', False)]
return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
elif self._context.get('is_supplier'):
elif self._context.get('is_supplier') or self.env.user.has_group('sf_base.group_purchase_director'):
if self.env.user.has_group('sf_base.group_purchase_director'):
domain = [('supplier_rank', '>', 0)]
elif self.env.user.has_group('sf_base.group_purchase'):
@@ -240,7 +240,7 @@ class ResUserToSale(models.Model):
return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
elif self._context.get('supplier_rank'):
if self.env.user.has_group('sf_base.group_purchase_director'):
domain = [('supplier_rank', '>', 0)]
domain = []
elif self.env.user.has_group('sf_base.group_purchase'):
if self.id != self.env.user.id:
domain = [('id', '=', self.id)]

12
sf_sale/security/ir.model.access.csv
View File

@@ -37,16 +37,16 @@ access_stock_move_group_purchase,stock_move_group_purchase,stock.model_stock_mov
access_stock_move_group_purchase_director,stock_move_group_purchase_director,stock.model_stock_move,sf_base.group_purchase_director,1,0,0,0
access_stock_warehouse_orderpoint_group_sale_salemanager,stock_warehouse_orderpoint_group_sale_salemanager,stock.model_stock_warehouse_orderpoint,sf_base.group_sale_salemanager,1,0,0,0
access_stock_warehouse_orderpoint_group_sale_director,stock_warehouse_orderpoint_group_sale_director,stock.model_stock_warehouse_orderpoint,sf_base.group_sale_director,1,0,0,0
access_stock_warehouse_orderpoint_group_purchase,stock_warehouse_orderpoint_group_purchase,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase,1,0,0,0
access_stock_warehouse_orderpoint_group_purchase_director,stock_warehouse_orderpoint_group_purchase_director,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase_director,1,0,0,0
access_stock_warehouse_orderpoint_group_purchase,stock_warehouse_orderpoint_group_purchase,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase,1,1,0,0
access_stock_warehouse_orderpoint_group_purchase_director,stock_warehouse_orderpoint_group_purchase_director,stock.model_stock_warehouse_orderpoint,sf_base.group_purchase_director,1,1,0,0
access_uom_uom_group_sale_salemanager,uom_uom_group_sale_salemanager,uom.model_uom_uom,sf_base.group_sale_salemanager,1,0,0,0
access_uom_uom_group_sale_director,uom_uom_group_sale_director,uom.model_uom_uom,sf_base.group_sale_director,1,1,1,0
access_uom_uom_group_purchase,uom_uom_group_purchase,uom.model_uom_uom,sf_base.group_purchase,1,0,0,0
access_uom_uom_group_purchase_director,uom_uom_group_purchase_director,uom.model_uom_uom,sf_base.group_purchase_director,1,0,0,0
access_uom_uom_group_purchase_director,uom_uom_group_purchase_director,uom.model_uom_uom,sf_base.group_purchase_director,1,1,1,0
access_uom_category_group_sale_salemanager,uom_category_group_sale_salemanager,uom.model_uom_category,sf_base.group_sale_salemanager,1,0,0,0
access_uom_category_group_sale_director,uom_category_group_sale_director,uom.model_uom_category,sf_base.group_sale_director,1,1,1,0
access_uom_category_group_purchase,uom_category_group_purchase,uom.model_uom_category,sf_base.group_purchase,1,0,0,0
access_uom_category_group_purchase_director,uom_category_group_purchase_director,uom.model_uom_category,sf_base.group_purchase_director,1,0,0,0
access_uom_category_group_purchase_director,uom_category_group_purchase_director,uom.model_uom_category,sf_base.group_purchase_director,1,1,1,0
access_sale_order_check_wizard_group_sale_salemanager,sale_order_check_wizard_group_sale_salemanager,model_sale_order_check_wizard,sf_base.group_sale_salemanager,1,1,1,0
access_sale_order_check_wizard_group_sale_director,sale_order_check_wizard_group_sale_director,model_sale_order_check_wizard,sf_base.group_sale_director,1,1,1,0
access_account_move_line_group_sale_salemanager,account_move_line_group_sale_salemanager,account.model_account_move_line,sf_base.group_sale_salemanager,1,1,1,0
@@ -81,5 +81,9 @@ access_sale_advance_payment_inv_group_sale_salemanager,sale_advance_payment_inv_
access_sale_advance_payment_inv_group_sale_director,sale_advance_payment_inv_group_sale_director,sale.model_sale_advance_payment_inv,sf_base.group_sale_director,1,1,1,0
access_sale_report_group_sale_salemanager,sale_report_group_sale_salemanager,sale.model_sale_report,sf_base.group_sale_salemanager,1,0,1,0
access_sale_report_group_sale_director,sale_report_group_sale_director,sale.model_sale_report,sf_base.group_sale_director,1,0,1,0
access_product_supplierinfo_group_purchase_director,product.supplierinfo group_purchase_director,product.model_product_supplierinfo,sf_base.group_purchase_director,1,1,1,0
access_product_category_group_purchase_director,product.category group_purchase_director,product.model_product_category,sf_base.group_purchase_director,1,1,1,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
37 access_stock_move_group_purchase_director stock_move_group_purchase_director stock.model_stock_move sf_base.group_purchase_director 1 0 0 0
38 access_stock_warehouse_orderpoint_group_sale_salemanager stock_warehouse_orderpoint_group_sale_salemanager stock.model_stock_warehouse_orderpoint sf_base.group_sale_salemanager 1 0 0 0
39 access_stock_warehouse_orderpoint_group_sale_director stock_warehouse_orderpoint_group_sale_director stock.model_stock_warehouse_orderpoint sf_base.group_sale_director 1 0 0 0
40 access_stock_warehouse_orderpoint_group_purchase stock_warehouse_orderpoint_group_purchase stock.model_stock_warehouse_orderpoint sf_base.group_purchase 1 0 1 0 0
41 access_stock_warehouse_orderpoint_group_purchase_director stock_warehouse_orderpoint_group_purchase_director stock.model_stock_warehouse_orderpoint sf_base.group_purchase_director 1 0 1 0 0
42 access_uom_uom_group_sale_salemanager uom_uom_group_sale_salemanager uom.model_uom_uom sf_base.group_sale_salemanager 1 0 0 0
43 access_uom_uom_group_sale_director uom_uom_group_sale_director uom.model_uom_uom sf_base.group_sale_director 1 1 1 0
44 access_uom_uom_group_purchase uom_uom_group_purchase uom.model_uom_uom sf_base.group_purchase 1 0 0 0
45 access_uom_uom_group_purchase_director uom_uom_group_purchase_director uom.model_uom_uom sf_base.group_purchase_director 1 0 1 0 1 0
46 access_uom_category_group_sale_salemanager uom_category_group_sale_salemanager uom.model_uom_category sf_base.group_sale_salemanager 1 0 0 0
47 access_uom_category_group_sale_director uom_category_group_sale_director uom.model_uom_category sf_base.group_sale_director 1 1 1 0
48 access_uom_category_group_purchase uom_category_group_purchase uom.model_uom_category sf_base.group_purchase 1 0 0 0
49 access_uom_category_group_purchase_director uom_category_group_purchase_director uom.model_uom_category sf_base.group_purchase_director 1 0 1 0 1 0
50 access_sale_order_check_wizard_group_sale_salemanager sale_order_check_wizard_group_sale_salemanager model_sale_order_check_wizard sf_base.group_sale_salemanager 1 1 1 0
51 access_sale_order_check_wizard_group_sale_director sale_order_check_wizard_group_sale_director model_sale_order_check_wizard sf_base.group_sale_director 1 1 1 0
52 access_account_move_line_group_sale_salemanager account_move_line_group_sale_salemanager account.model_account_move_line sf_base.group_sale_salemanager 1 1 1 0
81 access_sale_report_group_sale_salemanager sale_report_group_sale_salemanager sale.model_sale_report sf_base.group_sale_salemanager 1 0 1 0
82 access_sale_report_group_sale_director sale_report_group_sale_director sale.model_sale_report sf_base.group_sale_director 1 0 1 0
83 access_product_supplierinfo_group_purchase_director product.supplierinfo group_purchase_director product.model_product_supplierinfo sf_base.group_purchase_director 1 1 1 0
84 access_product_category_group_purchase_director product.category group_purchase_director product.model_product_category sf_base.group_purchase_director 1 1 1 0
85
86
87
88
89

6
sf_sale/views/sale_order_view.xml
View File

@@ -54,6 +54,9 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='user_id']" position="replace">
<field name="user_id" widget="many2one_avatar_user" context="{'is_sale': True }"/>
</xpath>
<xpath expr="//form/header/button[@name='action_quotation_send'][1]" position="replace">
<button name="action_quotation_send" string="通过EMAIL发送" type="object"
class="btn-primary" data-hotkey="g" context="{'validate_analytic': True}"
@@ -106,8 +109,7 @@
<field name="deadline_of_delivery" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
<field name="payments_way" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
<field name="pay_way" attrs="{'readonly': [('state', 'in', ('sale','cancel'))]}"/>
<field name="schedule_status" readonly="1"
attrs="{'invisible': [('state', 'in', ('sale','cancel'))]}"/>
<field name="schedule_status" readonly="1"/>
</field>
<xpath expr="//field[@name='order_line']/tree/field[@name='name']" position="before">
<field name="model_glb_file" widget="Viewer3D" optional="show"