Test commit with new GPG key
This commit is contained in:
parent
356650b86d
commit
c68a1aa339
|
|
@ -15,7 +15,8 @@ class PurchaseRequest(models.Model):
|
||||||
picking_id=fields.Many2one("stock.picking",copy=False)
|
picking_id=fields.Many2one("stock.picking",copy=False)
|
||||||
edit_locations=fields.Boolean(string="Edit Locations",compute='compute_edit_locations',copy=False)
|
edit_locations=fields.Boolean(string="Edit Locations",compute='compute_edit_locations',copy=False)
|
||||||
state = fields.Selection(
|
state = fields.Selection(
|
||||||
[('draft', 'Draft'), ('direct_manager', 'Direct Manager'),('warehouse', 'Warehouses Department'),
|
[('draft', 'Draft'), ('direct_manager', 'Direct Manager'),('warehouse', 'Warehouses Department'),('wait_for_send', 'Wait For Sent'),
|
||||||
|
('initial', 'Initial Engagement'),
|
||||||
('waiting', 'In Purchase'),('employee', 'Employee Delivery'),('done', 'Done'), ('cancel', 'Cancel'), ('refuse', 'Refuse')], default="draft",
|
('waiting', 'In Purchase'),('employee', 'Employee Delivery'),('done', 'Done'), ('cancel', 'Cancel'), ('refuse', 'Refuse')], default="draft",
|
||||||
tracking=True,copy=False )
|
tracking=True,copy=False )
|
||||||
show_emp_button=fields.Boolean(compute='show_employee_button',copy=False)
|
show_emp_button=fields.Boolean(compute='show_employee_button',copy=False)
|
||||||
|
|
@ -47,6 +48,8 @@ class PurchaseRequest(models.Model):
|
||||||
rec.edit_locations = False
|
rec.edit_locations = False
|
||||||
|
|
||||||
def action_confirm(self):
|
def action_confirm(self):
|
||||||
|
init_active = self.env['ir.module.module'].search([('name', '=', 'initial_engagement_budget'), ('state', '=', 'installed')], limit=1)
|
||||||
|
init_budget = True if init_active else False
|
||||||
if len(self.line_ids) == 0:
|
if len(self.line_ids) == 0:
|
||||||
raise ValidationError(_("Can't Confirm Request With No Item!"))
|
raise ValidationError(_("Can't Confirm Request With No Item!"))
|
||||||
if not self.department_id:
|
if not self.department_id:
|
||||||
|
|
@ -59,7 +62,7 @@ class PurchaseRequest(models.Model):
|
||||||
else:
|
else:
|
||||||
for rec in self.line_ids:
|
for rec in self.line_ids:
|
||||||
rec.write({"qty_purchased":rec.qty})
|
rec.write({"qty_purchased":rec.qty})
|
||||||
self.write({'state': 'waiting'})
|
self.write({'state': 'wait_for_send' if init_budget else 'waiting'})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -68,9 +68,12 @@ class PurcahseRefues(models.TransientModel):
|
||||||
picking_vals.update({'move_lines': move_vals})
|
picking_vals.update({'move_lines': move_vals})
|
||||||
picking_id = self.env['stock.picking'].create(picking_vals)
|
picking_id = self.env['stock.picking'].create(picking_vals)
|
||||||
self.request_id.picking_id = picking_id.id
|
self.request_id.picking_id = picking_id.id
|
||||||
|
init_active = self.env['ir.module.module'].search(
|
||||||
|
[('name', '=', 'initial_engagement_budget'), ('state', '=', 'installed')], limit=1)
|
||||||
|
init_budget = True if init_active else False
|
||||||
for line in self.request_line_ids.filtered(lambda line: line.product_id.type != 'product'):
|
for line in self.request_line_ids.filtered(lambda line: line.product_id.type != 'product'):
|
||||||
line.qty_purchased=line.qty
|
line.qty_purchased=line.qty
|
||||||
self.request_id.write({'state': 'waiting'})
|
self.request_id.write({'state': 'wait_for_send' if init_budget else 'waiting'})
|
||||||
def convert_purchase(self):
|
def convert_purchase(self):
|
||||||
picking_id = self.env.ref('purchase_custom_stock.stock_picking_type_stock')
|
picking_id = self.env.ref('purchase_custom_stock.stock_picking_type_stock')
|
||||||
picking_vals = {
|
picking_vals = {
|
||||||
|
|
@ -91,9 +94,12 @@ class PurcahseRefues(models.TransientModel):
|
||||||
picking_vals.update({'move_lines': move_vals})
|
picking_vals.update({'move_lines': move_vals})
|
||||||
picking_id = self.env['stock.picking'].create(picking_vals)
|
picking_id = self.env['stock.picking'].create(picking_vals)
|
||||||
self.request_id.picking_id = picking_id.id
|
self.request_id.picking_id = picking_id.id
|
||||||
|
init_active = self.env['ir.module.module'].search(
|
||||||
|
[('name', '=', 'initial_engagement_budget'), ('state', '=', 'installed')], limit=1)
|
||||||
|
init_budget = True if init_active else False
|
||||||
for line in self.request_line_ids:
|
for line in self.request_line_ids:
|
||||||
line.qty_purchased=line.qty
|
line.qty_purchased=line.qty
|
||||||
self.request_id.write({'state': 'waiting'})
|
self.request_id.write({'state': 'wait_for_send' if init_budget else 'waiting'})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -175,7 +175,7 @@ class PurchaseRequest(models.Model):
|
||||||
if not self.department_id:
|
if not self.department_id:
|
||||||
raise ValidationError(_("Please Select department for employee"))
|
raise ValidationError(_("Please Select department for employee"))
|
||||||
|
|
||||||
self.write({'state': 'waiting'})
|
self.write({'state': 'wait_for_send'})
|
||||||
|
|
||||||
# def action_select(self):
|
# def action_select(self):
|
||||||
# for member in self.committe_members:
|
# for member in self.committe_members:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue