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

1.新增每日同步切削速度和每齿走刀量及切削宽度和深度的接口

Browse Source 
2.优化产品模版
This commit is contained in:
jinling.yang
2024-01-05 17:30:13 +08:00
parent da8cbe4cce
commit edf4699e9e
9 changed files with 433 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sf_sale/models/sale_order.py
View File

@@ -150,10 +150,10 @@ class ResPartnerToSale(models.Model):
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'):
customer = self.env['res.partner'].search(
[('supplier_rank', '>', 0), ('user_id', '=', self.env.user.id)])
if customer:
ids = [t.id for t in customer]
supplier = self.env['res.partner'].search(
[('supplier_rank', '>', 0), ('purchase_user_id', '=', self.env.user.id)])
if supplier:
ids = [t.id for t in supplier]
domain = [('id', 'in', ids)]
else:
domain = [('id', '=', False)]
@@ -191,12 +191,9 @@ class ResUserToSale(models.Model):
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'):
supplier = self.env['res.partner'].search(
[('supplier_rank', '>', 0), ('purchase_user_id', '=', self.env.user.id)])
if supplier:
ids = [t.id for t in supplier]
domain = [('id', 'in', ids)]
if self.id != self.env.user.id:
domain = [('id', '=', self.id)]
else:
domain = [('id', '=', False)]
domain = [('id', '=', self.env.user.id)]
return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
return super()._name_search(name, args, operator, limit, name_get_uid)

10
sf_sale/views/res_partner_view.xml
View File

@@ -6,8 +6,8 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<form position="attributes">
<attribute name="delete">false</attribute>
<form position="attributes">
<attribute name="delete">false</attribute>
</form>
<field name="vat" position="after">
<field name="customer_rank" invisible="1"/>
@@ -45,7 +45,7 @@
</field>
<xpath expr="//group[@name='sale']/field[@name='user_id']" position="replace">
<field name="user_id" widget="many2one_avatar_user" context="{'is_sale': True }"
attrs="{'required' : [('customer_rank','>', 0)]}"/>
attrs="{'required' : [('customer_rank','>', 0)],'readonly': [('supplier_rank','>', 0)]}"/>
</xpath>
<field name="category_id" position="attributes">
<attribute name="required">1</attribute>
@@ -67,13 +67,13 @@
</field>
</record>
<record model="ir.ui.view" id="view_partner_property_form_inherit_sf">
<record model="ir.ui.view" id="view_partner_tree_inherit_sf">
<field name="name">res.partner.property.form.inherit.sf</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_tree"/>
<field name="arch" type="xml">
<tree position="attributes">
<attribute name="delete">false</attribute>
<attribute name="delete">false</attribute>
</tree>
<field name="function" position="before">
<field name="customer_rank" invisible="1"/>