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

Merge branch 'refs/heads/feature/tax_sync' into develop

Browse Source
This commit is contained in:
liaodanlong
2024-08-05 17:12:37 +08:00
parent 3f27ae0f35 510e8d49fb
commit e6bad80031
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sf_manufacturing/models/product_template.py
View File

@@ -640,6 +640,10 @@ class ResProductMo(models.Model):
'part_number': item.get('part_number') or '', 'part_number': item.get('part_number') or '',
'active': True, 'active': True,
} }
tax_id = self.env['account.tax'].sudo().search(
[('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')])
if tax_id:
vals.update({'taxes_id':[(6,0,[int(tax_id)])]})
copy_product_id.sudo().write(vals) copy_product_id.sudo().write(vals)
product_id.product_tmpl_id.active = False product_id.product_tmpl_id.active = False
return copy_product_id return copy_product_id
@@ -947,6 +951,7 @@ class SfMaintenanceEquipmentAndProductTemplate(models.Model):
raise ValidationError("机床基坐标获取失败") raise ValidationError("机床基坐标获取失败")
class SfMaintenanceEquipmentTool(models.Model): class SfMaintenanceEquipmentTool(models.Model):
_name = 'maintenance.equipment.tool' _name = 'maintenance.equipment.tool'
_description = '机床刀位' _description = '机床刀位'

1
sf_sale/models/quick_easy_order.py
View File

@@ -371,6 +371,7 @@ class QuickEasyOrder(models.Model):
product_bom_purchase.bom_create_line_has(purchase_embryo) product_bom_purchase.bom_create_line_has(purchase_embryo)
order_id.with_user(self.env.ref("base.user_admin")).sale_order_create_line(product, item) order_id.with_user(self.env.ref("base.user_admin")).sale_order_create_line(product, item)
except Exception as e: except Exception as e:
logging.error('工厂创建销售订单和产品失败，请联系管理员'.format(e))
# self.cr.rollback() # self.cr.rollback()
return UserError('工厂创建销售订单和产品失败，请联系管理员') return UserError('工厂创建销售订单和产品失败，请联系管理员')

14
sf_sale/models/sale_order.py
View File

@@ -55,7 +55,7 @@ class ReSaleOrder(models.Model):
deadline_of_delivery, payments_way, pay_way): deadline_of_delivery, payments_way, pay_way):
now_time = datetime.datetime.now() now_time = datetime.datetime.now()
partner = self.get_customer() partner = self.get_customer()
order_id = self.env['sale.order'].sudo().create({ data ={
'company_id': company_id.id, 'company_id': company_id.id,
'date_order': now_time, 'date_order': now_time,
'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time), 'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
@@ -66,10 +66,18 @@ class ReSaleOrder(models.Model):
'person_of_delivery': delivery_name, 'person_of_delivery': delivery_name,
'telephone_of_delivery': delivery_telephone, 'telephone_of_delivery': delivery_telephone,
'address_of_delivery': delivery_address, 'address_of_delivery': delivery_address,
'deadline_of_delivery': deadline_of_delivery,
'payments_way': payments_way, 'payments_way': payments_way,
'pay_way': pay_way, 'pay_way': pay_way,
}) }
if deadline_of_delivery:
# deadline_of_delivery字段存在为false字符串情况
if not isinstance(deadline_of_delivery, str):
data.update({'deadline_of_delivery': deadline_of_delivery})
else:
if deadline_of_delivery!="False":
data.update({'deadline_of_delivery': deadline_of_delivery})
order_id = self.env['sale.order'].sudo().create(data)
return order_id return order_id
def write(self, vals): def write(self, vals):