Merge pull request #378 from expsa/purchase_req_chgs
fix product send mail
This commit is contained in:
commit
7d3f3973e2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -327,7 +327,7 @@ class PurchaseOrderCustom(models.Model):
|
||||||
def action_skip_budget(self):
|
def action_skip_budget(self):
|
||||||
""" Skip purchase budget"""
|
""" Skip purchase budget"""
|
||||||
for po_id in self:
|
for po_id in self:
|
||||||
if po_id.state == 'wait_for_send':
|
if po_id.state == 'wait_for_send' or po_id.request_id:
|
||||||
# Deal with double validation process
|
# Deal with double validation process
|
||||||
valid_amount = self.env.user.company_id.currency_id.compute(
|
valid_amount = self.env.user.company_id.currency_id.compute(
|
||||||
po_id.company_id.po_double_validation_amount, po_id.currency_id)
|
po_id.company_id.po_double_validation_amount, po_id.currency_id)
|
||||||
|
|
@ -678,7 +678,8 @@ class ProductCustom(models.Model):
|
||||||
@api.model
|
@api.model
|
||||||
def create(self, vals):
|
def create(self, vals):
|
||||||
res = super(ProductCustom, self).create(vals)
|
res = super(ProductCustom, self).create(vals)
|
||||||
self.action_notify_new_product(res)
|
if 'import_file' not in self.env.context:
|
||||||
|
self.action_notify_new_product(res)
|
||||||
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,4 +31,5 @@ model_convert_po_contract_wizard_user,model_convert_po_contract_wizard,purchase_
|
||||||
purchase_request_create_purchase_request_stock,stock move create_purchase_request,stock.model_stock_move,purchase_requisition_custom.create_purchase_request,1,0,0,0
|
purchase_request_create_purchase_request_stock,stock move create_purchase_request,stock.model_stock_move,purchase_requisition_custom.create_purchase_request,1,0,0,0
|
||||||
|
|
||||||
committe_group_direct_manger,committe_group_direct_manger,model_committe_member,purchase_requisition_custom.group_direct_manger,1,1,1,1
|
committe_group_direct_manger,committe_group_direct_manger,model_committe_member,purchase_requisition_custom.group_direct_manger,1,1,1,1
|
||||||
|
budget_purchase_user,budget.purchase.user,account_budget_custom.model_account_budget_post,purchase.group_purchase_user,1,1,0,0
|
||||||
|
|
||||||
|
|
|
||||||
|
Loading…
Reference in New Issue