From 1a68a5e600e2f7f90bee44144557f6af2f35618c Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Thu, 14 Dec 2023 15:42:41 +0700 Subject: add some field in automatic purchase --- indoteknik_custom/models/automatic_purchase.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 502761e0..63eefb93 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -9,7 +9,10 @@ _logger = logging.getLogger(__name__) class AutomaticPurchase(models.Model): _name = 'automatic.purchase' _order = 'id desc' + _inherit = ['mail.thread'] + _rec_name = 'number' + number = fields.Char(string='Document No', index=True, copy=False, readonly=True) date_doc = fields.Date(string='Date', required=True, help='Isi tanggal hari ini') description = fields.Char(string='Description', help='bebas isi nya apa') purchase_lines = fields.One2many('automatic.purchase.line', 'automatic_purchase_id', string='Lines', auto_join=True) @@ -18,6 +21,16 @@ class AutomaticPurchase(models.Model): purchase_match = fields.One2many('automatic.purchase.match', 'automatic_purchase_id', string='Matches', auto_join=True) vendor_id = fields.Many2one('res.partner', string='Vendor', help='boleh kosong, jika diisi, maka hanya keluar data untuk vendor tersebut') responsible_id = fields.Many2one('res.users', string='Responsible', required=True) + apo_type = fields.Selection([ + ('regular', 'Regular Fulfill SO'), + ('reordering', 'Reordering Rule'), + ], string='Type') + + @api.model + def create(self, vals): + vals['number'] = self.env['ir.sequence'].next_by_code('automatic.purchase') or '0' + result = super(AutomaticPurchase, self).create(vals) + return result def create_po_from_automatic_purchase(self): if not self.purchase_lines: @@ -84,6 +97,7 @@ class AutomaticPurchase(models.Model): self.is_po = True def generate_automatic_purchase(self): + # for reordering rule only if self.purchase_lines: raise UserError('Sudah digenerate sebelumnya, hapus line terlebih dahulu') -- cgit v1.2.3 From 07e8a51fc023025d2cbde83ab0333e5e53e2ad12 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Thu, 14 Dec 2023 17:13:46 +0700 Subject: generate automatic purchase line from purchasing job --- indoteknik_custom/models/automatic_purchase.py | 71 ++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 63eefb93..438d365f 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -18,13 +18,14 @@ class AutomaticPurchase(models.Model): purchase_lines = fields.One2many('automatic.purchase.line', 'automatic_purchase_id', string='Lines', auto_join=True) notification = fields.Char(string='Notification') is_po = fields.Boolean(string='Is PO') - purchase_match = fields.One2many('automatic.purchase.match', 'automatic_purchase_id', string='Matches', auto_join=True) + purchase_match = fields.One2many('automatic.purchase.match', 'automatic_purchase_id', string='PO Matches', auto_join=True) vendor_id = fields.Many2one('res.partner', string='Vendor', help='boleh kosong, jika diisi, maka hanya keluar data untuk vendor tersebut') responsible_id = fields.Many2one('res.users', string='Responsible', required=True) apo_type = fields.Selection([ ('regular', 'Regular Fulfill SO'), ('reordering', 'Reordering Rule'), - ], string='Type') + ], string='Type', tracking=3) + sales_match = fields.One2many('automatic.purchase.sales.match', 'automatic_purchase_id', string='SO Matches', auto_join=True) @api.model def create(self, vals): @@ -95,9 +96,56 @@ class AutomaticPurchase(models.Model): _logger.info('Automatic Create PO Line %s' % product.product_id.name) self.notification = self.notification + ' %s' % new_po.name self.is_po = True - + + def generate_regular_purchase(self): + if self.apo_type == 'reordering': + raise UserError('Tombol ini hanya untuk Regular Fulfill SO') + if self.vendor_id: + raise UserError('Vendor tidak dapat diisi jika Regular Fulfill SO') + if self.purchase_lines: + raise UserError('Sudah digenerate sebelumnya, hapus line terlebih dahulu') + #TODO must add order by for fifo mechanism + #change the view of v.purchasing.job and use order by in query + query = [ + ('action', '=', 'kurang beli') + ] + jobs = self.env['v.purchasing.job'].search(query) + count = 0 + for job in jobs: + qty_purchase = job.outgoing - job.onhand + job.incoming + qty_available = job.onhand + job.incoming - job.outgoing + + domain = [ + ('product_id.id', '=', job.product_id.id), + ] + orderby = 'count_trx_po desc, count_trx_po_vendor desc' + purchase_pricelist = self.env['purchase.pricelist'].search(domain, order=orderby, limit=1) + + vendor_id = purchase_pricelist.vendor_id + price = self._get_valid_purchase_price(purchase_pricelist) + last_po_line = self.env['purchase.order.line'].search([('product_id', '=', job.product_id.id), ('order_id.state', '=', 'done')], order='id desc', limit=1) + + self.env['automatic.purchase.line'].create([{ + 'automatic_purchase_id': self.id, + 'product_id': job.product_id.id, + 'qty_purchase': qty_purchase, + 'qty_available': qty_available, + 'partner_id': vendor_id.id, + 'last_price': price, + 'subtotal': qty_purchase * price, + 'last_order_id': last_po_line.order_id.id, + 'last_orderline_id': last_po_line.id, + 'brand_id': job.product_id.product_tmpl_id.x_manufacture.id + }]) + count += 1 + _logger.info('Create Automatic Purchase Line %s' % job.product_id.name) + self.notification = "Automatic PO Created %s Lines" % count + print(1) + def generate_automatic_purchase(self): # for reordering rule only + if self.apo_type == 'regular': + raise UserError('Tombol ini hanya untuk Reordering Rule') if self.purchase_lines: raise UserError('Sudah digenerate sebelumnya, hapus line terlebih dahulu') @@ -187,6 +235,11 @@ class AutomaticPurchaseLine(models.Model): current_po_line_id = fields.Many2one('purchase.order.line', string='Current Line') brand_id = fields.Many2one('x_manufactures', string='Brand') + @api.onchange('last_price', 'qty_purchase') + def _calculate_subtotal(self): + for line in self: + line.subtotal = line.qty_purchase * line.last_price + class AutomaticPurchaseMatch(models.Model): _name = 'automatic.purchase.match' @@ -201,3 +254,15 @@ class AutomaticPurchaseMatch(models.Model): for match in self: match.vendor = match.order_id.partner_id.name match.total = match.order_id.amount_total + + +class AutomaticPurchaseSalesMatch(models.Model): + _name = 'automatic.purchase.sales.match' + _order = 'automatic_purchase_id, id' + + automatic_purchase_id = fields.Many2one('automatic.purchase', string='Ref', required=True, ondelete='cascade', index=True, copy=False) + sale_id = fields.Many2one('sale.order', string='SO') + partner_id = fields.Many2one('res.partner', string='Customer') + salesperson_id = fields.Many2one('res.user', string='Sales') + product_id = fields.Many2one('product.product', string='Product') + qty_so = fields.Float(string='Qty') -- cgit v1.2.3 From e2086bc4f96391260fb3430537feddbc25bdde40 Mon Sep 17 00:00:00 2001 From: stephanchrst Date: Tue, 19 Dec 2023 09:32:09 +0700 Subject: over to nathan --- indoteknik_custom/models/automatic_purchase.py | 51 ++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 438d365f..a7b24b4f 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -26,6 +26,18 @@ class AutomaticPurchase(models.Model): ('reordering', 'Reordering Rule'), ], string='Type', tracking=3) sales_match = fields.One2many('automatic.purchase.sales.match', 'automatic_purchase_id', string='SO Matches', auto_join=True) + total_qty_line = fields.Float(string='Total Qty Line', compute='_compute_total_qty') + total_qty_so = fields.Float(string='Total Qty SO', compute='_compute_total_qty') + + def _compute_total_qty(self): + for data in self: + qty_line = qty_so = 0 + for line in self.purchase_lines: + qty_line = qty_line + line.qty_purchase + for line in self.sales_match: + qty_so = qty_so + line.qty_so + data.total_qty_line = qty_line + data.total_qty_so = qty_so @api.model def create(self, vals): @@ -140,6 +152,33 @@ class AutomaticPurchase(models.Model): count += 1 _logger.info('Create Automatic Purchase Line %s' % job.product_id.name) self.notification = "Automatic PO Created %s Lines" % count + self._create_sales_matching() + print(1) + + def _create_sales_matching(self): + for line in self.purchase_lines: + domain = [ + ('product_id', '=', line.product_id.id) + ] + sales = self.env['v.sales.outstanding'].search(domain) + for sale in sales: + if line.qty_purchase > sale.outgoing: + qty_po = sale.outgoing + else: + qty_po = line.qty_purchase + self.env['automatic.purchase.sales.match'].create([{ + 'automatic_purchase_id': self.id, + 'sale_id': sale.sale_id.id, + 'sale_line_id': sale.sale_line_id.id, + 'picking_id': sale.picking_id.id, + 'move_id': sale.move_id.id, + 'partner_id': sale.partner_id.id, + 'partner_invoice_id': sale.partner_invoice_id.id, + 'salesperson_id': sale.salesperson_id.id, + 'product_id': sale.product_id.id, + 'qty_so': sale.outgoing, + 'qty_po': qty_po, + }]) print(1) def generate_automatic_purchase(self): @@ -261,8 +300,14 @@ class AutomaticPurchaseSalesMatch(models.Model): _order = 'automatic_purchase_id, id' automatic_purchase_id = fields.Many2one('automatic.purchase', string='Ref', required=True, ondelete='cascade', index=True, copy=False) + automatic_purchase_line_id = fields.Many2one('automatic.purchase.line', string='Automatic Line') sale_id = fields.Many2one('sale.order', string='SO') - partner_id = fields.Many2one('res.partner', string='Customer') - salesperson_id = fields.Many2one('res.user', string='Sales') + sale_line_id = fields.Many2one('sale.order.line', string='SO Line') + picking_id = fields.Many2one('stock.picking', string='Picking') + move_id = fields.Many2one('stock.move', string='Move') + partner_id = fields.Many2one('res.partner', string='Partner') + partner_invoice_id = fields.Many2one('res.partner', string='Invoice Partner') + salesperson_id = fields.Many2one('res.users', string='Sales') product_id = fields.Many2one('product.product', string='Product') - qty_so = fields.Float(string='Qty') + qty_so = fields.Float(string='Qty SO') + qty_po = fields.Float(string='Qty PO') -- cgit v1.2.3 From 8a10587c8582ed68944634928c9a7c34d3321dbe Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 22 Dec 2023 13:35:26 +0700 Subject: matches so on po and matches po on so --- indoteknik_custom/models/automatic_purchase.py | 237 +++++++++++++++++++------ 1 file changed, 184 insertions(+), 53 deletions(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index a7b24b4f..070db78f 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -1,7 +1,7 @@ from odoo import models, api, fields from odoo.exceptions import UserError from datetime import datetime -import logging +import logging, math _logger = logging.getLogger(__name__) @@ -50,64 +50,195 @@ class AutomaticPurchase(models.Model): raise UserError('Tidak ada Lines, belum bisa create PO') if self.is_po: raise UserError('Sudah pernah di create PO') + current_time = datetime.now() - vendor_ids = self.env['automatic.purchase.line'].read_group([('automatic_purchase_id', '=', self.id), ('partner_id', '!=', False)], fields=['partner_id'], groupby=['partner_id']) - - counter_po_number = 0 + vendor_ids = self.env['automatic.purchase.line'].read_group( + [('automatic_purchase_id', '=', self.id), ('partner_id', '!=', False)], + fields=['partner_id'], + groupby=['partner_id'] + ) + + counter = 0 for vendor in vendor_ids: - param_header = { - 'partner_id': vendor['partner_id'][0], - # 'partner_ref': 'Automatic PO', - 'currency_id': 12, - 'user_id': self.env.user.id, - 'company_id': 1, # indoteknik dotcom gemilang - 'picking_type_id': 28, # indoteknik bandengan receipts - 'date_order': current_time, - 'note_description': 'Automatic PO' - } + self.create_po_by_vendor(vendor['partner_id'][0]) + + # param_header = { + # 'partner_id': vendor['partner_id'][0], + # 'currency_id': 12, + # 'user_id': self.env.user.id, + # 'company_id': 1, # indoteknik dotcom gemilang + # 'picking_type_id': 28, # indoteknik bandengan receipts + # 'date_order': current_time, + # 'note_description': 'Automatic PO' + # } + + # products_vendors = self.env['automatic.purchase.line'].search([ + # ('automatic_purchase_id', '=', self.id), + # ('partner_id', '=', vendor['partner_id'][0]), + # ('qty_purchase', '>', 0) + # ], order='brand_id') + # counter += 1 # new_po = self.env['purchase.order'].create([param_header]) - products_vendors = self.env['automatic.purchase.line'].search([ - ('automatic_purchase_id', '=', self.id), - ('partner_id', '=', vendor['partner_id'][0]), - ('qty_purchase', '>', 0) - ], order='brand_id') - count = brand_id = 0 - for product in products_vendors: - if count == 200 or brand_id != product.brand_id.id: - count = 0 - counter_po_number += 1 - new_po = self.env['purchase.order'].create([param_header]) - new_po.name = new_po.name + "/A/"+str(counter_po_number) - self.env['automatic.purchase.match'].create([{ - 'automatic_purchase_id': self.id, - 'order_id': new_po.id - }]) - self.env.cr.commit() - # else: - # new_po = self.env['purchase.order'].create([param_header]) - brand_id = product.brand_id.id - count += 10 - - qty_available = product.product_id.qty_onhand_bandengan + product.product_id.qty_incoming_bandengan - product.product_id.outgoing_qty - suggest = 'harus beli' - if qty_available > product.qty_purchase: - suggest = 'masih cukup' + # new_po.name = new_po.name + "/A/" + str(counter) + # self.env['automatic.purchase.match'].create([{ + # 'automatic_purchase_id': self.id, + # 'order_id': new_po.id + # }]) + # self.env.cr.commit() + + # count = 0 + # for product in products_vendors: + # if count == 20: + # self.create_purchase_order_sales_match(new_po) + + # if count == 20: + # counter += 1 + # new_po = self.env['purchase.order'].create([param_header]) + # new_po.name = new_po.name + "/B/" + str(counter) + # self.env['automatic.purchase.match'].create([{ + # 'automatic_purchase_id': self.id, + # 'order_id': new_po.id + # }]) + + # self.create_purchase_order_sales_match(new_po) + # self.env.cr.commit() + + # count += 1 + # qty_available = ( + # product.product_id.qty_onhand_bandengan + + # product.product_id.qty_incoming_bandengan - + # product.product_id.outgoing_qty + # ) + # suggest = 'harus beli' if qty_available <= product.qty_purchase else 'masih cukup' + # param_line = { + # 'order_id': new_po.id, + # 'product_id': product.product_id.id, + # 'product_qty': product.qty_purchase, + # 'qty_available_store': qty_available, + # 'suggest': suggest, + # 'product_uom_qty': product.qty_purchase, + # 'price_unit': product.last_price, + # } + # new_line = self.env['purchase.order.line'].create([param_line]) + # product.current_po_id = new_po.id + # product.current_po_line_id = new_line.id + + # self.create_purchase_order_sales_match(new_po) + + self.notification = 'PO Created successfully' + self.is_po = True + + def create_po_by_vendor(self, vendor_id): + current_time = datetime.now() + + PRODUCT_PER_PO = 20 + + auto_purchase_line = self.env['automatic.purchase.line'] + + param_header = { + 'partner_id': vendor_id, + 'currency_id': 12, + 'user_id': self.env.user.id, + 'company_id': 1, # indoteknik dotcom gemilang + 'picking_type_id': 28, # indoteknik bandengan receipts + 'date_order': current_time, + 'note_description': 'Automatic PO' + } + + domain = [ + ('automatic_purchase_id', '=', self.id), + ('partner_id', '=', vendor_id), + ('qty_purchase', '>', 0) + ] + + products_len = auto_purchase_line.search_count(domain) + page = math.ceil(products_len / PRODUCT_PER_PO) + + # i start from zero (0) + for i in range(page): + new_po = self.env['purchase.order'].create([param_header]) + new_po.name = new_po.name + "/A/" + str(i + 1) + + self.env['automatic.purchase.match'].create([{ + 'automatic_purchase_id': self.id, + 'order_id': new_po.id + }]) + + lines = auto_purchase_line.search( + domain, + offset=i * PRODUCT_PER_PO, + limit=PRODUCT_PER_PO + ) + + for line in lines: + product = line.product_id param_line = { 'order_id': new_po.id, - 'sequence': count, - 'product_id': product.product_id.id, - 'product_qty': product.qty_purchase, - 'qty_available_store': qty_available, - 'suggest': suggest, - 'product_uom_qty': product.qty_purchase, - 'price_unit': product.last_price, + 'product_id': product.id, + 'product_qty': line.qty_purchase, + 'qty_available_store': product.qty_available_bandengan, + 'suggest': product._get_po_suggest(line.qty_purchase), + 'product_uom_qty': line.qty_purchase, + 'price_unit': line.last_price, } - new_line = self.env['purchase.order.line'].create([param_line]) - product.current_po_id = new_po.id - product.current_po_line_id = new_line.id - _logger.info('Automatic Create PO Line %s' % product.product_id.name) - self.notification = self.notification + ' %s' % new_po.name - self.is_po = True + new_po_line = self.env['purchase.order.line'].create([param_line]) + line.current_po_id = new_po.id + line.current_po_line_id = new_po_line.id + + self.create_purchase_order_sales_match(new_po) + + + def create_purchase_order_sales_match(self, purchase_order): + matches_so_product_ids = [line.product_id.id for line in purchase_order.order_line] + + matches_so = self.env['automatic.purchase.sales.match'].search([ + ('automatic_purchase_id', '=', self.id), + ('sale_line_id.product_id', 'in', matches_so_product_ids), + ]) + + for sale_order in matches_so: + matches_so_line = { + 'purchase_order_id': purchase_order.id, + 'sale_id': sale_order.sale_id.id, + 'sale_line_id': sale_order.sale_line_id.id, + 'picking_id': sale_order.picking_id.id, + 'move_id': sale_order.move_id.id, + 'partner_id': sale_order.partner_id.id, + 'partner_invoice_id': sale_order.partner_invoice_id.id, + 'salesperson_id': sale_order.salesperson_id.id, + 'product_id': sale_order.product_id.id, + 'qty_so': sale_order.qty_so, + 'qty_po': sale_order.qty_po, + } + po_matches_so_line = self.env['purchase.order.sales.match'].create([matches_so_line]) + + self.create_sales_order_purchase_match(purchase_order) + + def create_sales_order_purchase_match(self, purchase_order): + #TODO add matches po to sales order by automatic_purchase.sales.match + matches_po_product_ids = [line.product_id.id for line in purchase_order.order_line] + + sales_match_line = self.env['automatic.purchase.sales.match'].search([ + ('automatic_purchase_id', '=', self.id), + ('sale_line_id.product_id', 'in', matches_po_product_ids), + ]) + + for sales_match in sales_match_line: + purchase_line = self.env['automatic.purchase.line'].search([ + ('automatic_purchase_id', '=', self.id), + ('product_id', 'in', [sales_match.product_id.id]), + ]) + + matches_po_line = { + 'sales_order_id' : sales_match.sale_id.id, + 'purchase_order_id' : purchase_line.current_po_id.id, + 'purchase_line_id' : purchase_line.current_po_line_id.id, + 'product_id' : sales_match.product_id.id, + 'qty_so' : sales_match.qty_so, + 'qty_po' : sales_match.qty_po, + } + + sales_order_purchase_match = self.env['sales.order.purchase.match'].create([matches_po_line]) def generate_regular_purchase(self): if self.apo_type == 'reordering': -- cgit v1.2.3 From 624e4077925cf1517097da015076dd4385cf286c Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 27 Dec 2023 10:13:47 +0700 Subject: validate if product have po --- indoteknik_custom/models/automatic_purchase.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 070db78f..5ab05aed 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -44,6 +44,25 @@ class AutomaticPurchase(models.Model): vals['number'] = self.env['ir.sequence'].next_by_code('automatic.purchase') or '0' result = super(AutomaticPurchase, self).create(vals) return result + + def validate_so_is_po(self): + #TODO user cant create po if in so exist matches po + for line in self.purchase_lines: + # Assuming that 'order_sales_match_line' is a field on the model 'sale.order' + sale_id = self.env['sale.order'].search([ + ('id', '=', line.sale_id.id), + ('order_sales_match_line', '!=', False) + ]) + + # Check if there are multiple records + if len(sale_id) > 1: + raise UserError('Ada SO Yang sudah create PO, berikut SO nya: %s' % [sale.name for sale in sale_id]) + + # Check if there is exactly one record + if sale_id: + # Access the first record in the set + sale_id = sale_id[0] + raise UserError('Ada SO Yang sudah create PO, berikut SO nya: %s' % [sale.name for sale in sale_id]) def create_po_from_automatic_purchase(self): if not self.purchase_lines: @@ -51,6 +70,8 @@ class AutomaticPurchase(models.Model): if self.is_po: raise UserError('Sudah pernah di create PO') + self.validate_so_is_po() + current_time = datetime.now() vendor_ids = self.env['automatic.purchase.line'].read_group( [('automatic_purchase_id', '=', self.id), ('partner_id', '!=', False)], -- cgit v1.2.3 From 5eabba4b2a8a3e1ec233f60c6aa7a0fa7414fd51 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Wed, 27 Dec 2023 13:37:37 +0700 Subject: alert if so have matches po --- indoteknik_custom/models/automatic_purchase.py | 29 ++++++++++++-------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 5ab05aed..ed35835e 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -46,24 +46,21 @@ class AutomaticPurchase(models.Model): return result def validate_so_is_po(self): - #TODO user cant create po if in so exist matches po - for line in self.purchase_lines: - # Assuming that 'order_sales_match_line' is a field on the model 'sale.order' - sale_id = self.env['sale.order'].search([ - ('id', '=', line.sale_id.id), - ('order_sales_match_line', '!=', False) - ]) + # TODO user can't create po if in so exist matches po + sale_ids = self.env['automatic.purchase.sales.match'].search([ + ('automatic_purchase_id', '=', self.id), + ]) - # Check if there are multiple records - if len(sale_id) > 1: - raise UserError('Ada SO Yang sudah create PO, berikut SO nya: %s' % [sale.name for sale in sale_id]) - - # Check if there is exactly one record - if sale_id: - # Access the first record in the set - sale_id = sale_id[0] - raise UserError('Ada SO Yang sudah create PO, berikut SO nya: %s' % [sale.name for sale in sale_id]) + names = [] + for sale in sale_ids: + names.append(sale.sale_id.name) + + count = len(sale_ids) + if count > 0: + raise UserError('Ada sekitar %s SO Yang sudah create PO, berikut SO nya: %s' % (count, ', '.join(names))) + + def create_po_from_automatic_purchase(self): if not self.purchase_lines: raise UserError('Tidak ada Lines, belum bisa create PO') -- cgit v1.2.3 From bacd84a9895031fdd5ce2f7ec0074f1bcd9e0a9a Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 2 Jan 2024 15:44:20 +0700 Subject: create new window for sale detail qty_po get from matches so on po --- indoteknik_custom/models/automatic_purchase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index ed35835e..d0bbdb1e 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -67,7 +67,7 @@ class AutomaticPurchase(models.Model): if self.is_po: raise UserError('Sudah pernah di create PO') - self.validate_so_is_po() + # self.validate_so_is_po() current_time = datetime.now() vendor_ids = self.env['automatic.purchase.line'].read_group( -- cgit v1.2.3 From 98f44d62a1e818875911a29cb7a119907e5e2af1 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 5 Feb 2024 14:49:10 +0700 Subject: automatic purchase change request --- indoteknik_custom/models/automatic_purchase.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index d0bbdb1e..4051c093 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -283,7 +283,7 @@ class AutomaticPurchase(models.Model): purchase_pricelist = self.env['purchase.pricelist'].search(domain, order=orderby, limit=1) vendor_id = purchase_pricelist.vendor_id - price = self._get_valid_purchase_price(purchase_pricelist) + price = self._get_vaokelid_purchase_price(purchase_pricelist) last_po_line = self.env['purchase.order.line'].search([('product_id', '=', job.product_id.id), ('order_id.state', '=', 'done')], order='id desc', limit=1) self.env['automatic.purchase.line'].create([{ @@ -460,3 +460,19 @@ class AutomaticPurchaseSalesMatch(models.Model): product_id = fields.Many2one('product.product', string='Product') qty_so = fields.Float(string='Qty SO') qty_po = fields.Float(string='Qty PO') + + +class SyncPurchasingJob(models.Model): + _name = 'sync.purchasing.job' + _auto = False + _rec_name = 'product_id' + + automatic_purchase_id = fields.Many2one('automatic.purchase', string='Ref', required=True, ondelete='cascade', index=True, copy=False) + product_id = fields.Many2one('product.product', string="Product") + brand = fields.Char(string='Brand') + item_code = fields.Char(string='Item Code') + product = fields.Char(string='Product Name') + onhand = fields.Float(string='OnHand') + incoming = fields.Float(string="Incoming") + outgoing = fields.Float(string="Outgoing") + action = fields.Char(string="Status") -- cgit v1.2.3 From bc28a47b83eb481f52c89b0f0fa5a13a851fbc21 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 6 Feb 2024 14:08:16 +0700 Subject: new table sync purchasing job and fix bug duplicate product --- indoteknik_custom/models/automatic_purchase.py | 67 ++++++++++++++++++-------- 1 file changed, 46 insertions(+), 21 deletions(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 4051c093..4161d895 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -26,6 +26,7 @@ class AutomaticPurchase(models.Model): ('reordering', 'Reordering Rule'), ], string='Type', tracking=3) sales_match = fields.One2many('automatic.purchase.sales.match', 'automatic_purchase_id', string='SO Matches', auto_join=True) + purchasing_job_match = fields.One2many('sync.purchasing.job', 'automatic_purchase_id', string='Purchasing Job Matches', auto_join=True) total_qty_line = fields.Float(string='Total Qty Line', compute='_compute_total_qty') total_qty_so = fields.Float(string='Total Qty SO', compute='_compute_total_qty') @@ -283,7 +284,7 @@ class AutomaticPurchase(models.Model): purchase_pricelist = self.env['purchase.pricelist'].search(domain, order=orderby, limit=1) vendor_id = purchase_pricelist.vendor_id - price = self._get_vaokelid_purchase_price(purchase_pricelist) + price = self._get_valid_purchase_price(purchase_pricelist) last_po_line = self.env['purchase.order.line'].search([('product_id', '=', job.product_id.id), ('order_id.state', '=', 'done')], order='id desc', limit=1) self.env['automatic.purchase.line'].create([{ @@ -302,6 +303,7 @@ class AutomaticPurchase(models.Model): _logger.info('Create Automatic Purchase Line %s' % job.product_id.name) self.notification = "Automatic PO Created %s Lines" % count self._create_sales_matching() + self._create_sync_purchasing_job(jobs) print(1) def _create_sales_matching(self): @@ -311,24 +313,47 @@ class AutomaticPurchase(models.Model): ] sales = self.env['v.sales.outstanding'].search(domain) for sale in sales: - if line.qty_purchase > sale.outgoing: - qty_po = sale.outgoing - else: - qty_po = line.qty_purchase - self.env['automatic.purchase.sales.match'].create([{ - 'automatic_purchase_id': self.id, - 'sale_id': sale.sale_id.id, - 'sale_line_id': sale.sale_line_id.id, - 'picking_id': sale.picking_id.id, - 'move_id': sale.move_id.id, - 'partner_id': sale.partner_id.id, - 'partner_invoice_id': sale.partner_invoice_id.id, - 'salesperson_id': sale.salesperson_id.id, - 'product_id': sale.product_id.id, - 'qty_so': sale.outgoing, - 'qty_po': qty_po, - }]) - print(1) + existing_match = self.env['automatic.purchase.sales.match'].search([ + ('automatic_purchase_id', '=', self.id), + ('sale_id', '=', sale.sale_id.id), + ]) + + if not existing_match: + if line.qty_purchase > sale.outgoing: + qty_po = sale.outgoing + else: + qty_po = line.qty_purchase + + self.env['automatic.purchase.sales.match'].create([{ + 'automatic_purchase_id': self.id, + 'sale_id': sale.sale_id.id, + 'sale_line_id': sale.sale_line_id.id, + 'picking_id': sale.picking_id.id, + 'move_id': sale.move_id.id, + 'partner_id': sale.partner_id.id, + 'partner_invoice_id': sale.partner_invoice_id.id, + 'salesperson_id': sale.salesperson_id.id, + 'product_id': sale.product_id.id, + 'qty_so': sale.outgoing, + 'qty_po': qty_po, + }]) + + print(1) + + def _create_sync_purchasing_job(self, jobs): + date = datetime.utcnow() + for line in jobs: + self.env['sync.purchasing.job'].create([{ + 'automatic_purchase_id': self.id, + 'brand': line.brand, + 'item_code': line.item_code, + 'product_id': line.product_id.id, + 'onhand': line.onhand, + 'incoming': line.incoming, + 'outgoing': line.outgoing, + 'action': line.action, + 'date': date + }]) def generate_automatic_purchase(self): # for reordering rule only @@ -464,8 +489,7 @@ class AutomaticPurchaseSalesMatch(models.Model): class SyncPurchasingJob(models.Model): _name = 'sync.purchasing.job' - _auto = False - _rec_name = 'product_id' + _order = 'automatic_purchase_id, id' automatic_purchase_id = fields.Many2one('automatic.purchase', string='Ref', required=True, ondelete='cascade', index=True, copy=False) product_id = fields.Many2one('product.product', string="Product") @@ -476,3 +500,4 @@ class SyncPurchasingJob(models.Model): incoming = fields.Float(string="Incoming") outgoing = fields.Float(string="Outgoing") action = fields.Char(string="Status") + date = fields.Datetime(string="Date Sync") -- cgit v1.2.3 From edb3c1c80931078d40a8f56149aeca9efdcdc07d Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Tue, 6 Feb 2024 15:53:19 +0700 Subject: change request purchasing job --- indoteknik_custom/models/automatic_purchase.py | 28 +++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 4161d895..94dd9cdf 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -284,7 +284,7 @@ class AutomaticPurchase(models.Model): purchase_pricelist = self.env['purchase.pricelist'].search(domain, order=orderby, limit=1) vendor_id = purchase_pricelist.vendor_id - price = self._get_valid_purchase_price(purchase_pricelist) + price, taxes = self._get_valid_purchase_price(purchase_pricelist) last_po_line = self.env['purchase.order.line'].search([('product_id', '=', job.product_id.id), ('order_id.state', '=', 'done')], order='id desc', limit=1) self.env['automatic.purchase.line'].create([{ @@ -294,6 +294,7 @@ class AutomaticPurchase(models.Model): 'qty_available': qty_available, 'partner_id': vendor_id.id, 'last_price': price, + 'taxes_id': taxes, 'subtotal': qty_purchase * price, 'last_order_id': last_po_line.order_id.id, 'last_orderline_id': last_po_line.id, @@ -414,17 +415,19 @@ class AutomaticPurchase(models.Model): self.notification = "Automatic PO Created %s Lines" % count def _get_valid_purchase_price(self, purchase_price): - p_price = 0 - if purchase_price.system_price > 0 and purchase_price.product_price > 0: - if purchase_price.human_last_update > purchase_price.system_last_update: - p_price = purchase_price.product_price - else: - p_price = purchase_price.system_price - elif purchase_price.system_price > 0 and purchase_price.product_price == 0: - p_price = purchase_price.system_price - elif purchase_price.system_price == 0 and purchase_price.product_price > 0: - p_price = purchase_price.product_price - return p_price + price = 0 + taxes = None + human_last_update = purchase_price.human_last_update or datetime.min + system_last_update = purchase_price.system_last_update or datetime.min + + if system_last_update > human_last_update: + price = purchase_price.system_price + taxes = purchase_price.taxes_system_id.id + else: + price = purchase_price.product_price + taxes = purchase_price.taxes_product_id.id + + return price, taxes class AutomaticPurchaseLine(models.Model): @@ -447,6 +450,7 @@ class AutomaticPurchaseLine(models.Model): current_po_id = fields.Many2one('purchase.order', string='Current') current_po_line_id = fields.Many2one('purchase.order.line', string='Current Line') brand_id = fields.Many2one('x_manufactures', string='Brand') + taxes_id = fields.Many2one('account.tax', string='Taxes') @api.onchange('last_price', 'qty_purchase') def _calculate_subtotal(self): -- cgit v1.2.3 From c76e3d6126c3d595a6c3c5d6802a9f5e7015f378 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Fri, 9 Feb 2024 09:32:52 +0700 Subject: change request purchasing job --- indoteknik_custom/models/automatic_purchase.py | 30 ++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 5919467f..713853e9 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -13,14 +13,14 @@ class AutomaticPurchase(models.Model): _rec_name = 'number' number = fields.Char(string='Document No', index=True, copy=False, readonly=True) - date_doc = fields.Date(string='Date', required=True, help='Isi tanggal hari ini') + date_doc = fields.Date(string='Date', readonly=True, help='Isi tanggal hari ini') description = fields.Char(string='Description', help='bebas isi nya apa') purchase_lines = fields.One2many('automatic.purchase.line', 'automatic_purchase_id', string='Lines', auto_join=True) notification = fields.Char(string='Notification') is_po = fields.Boolean(string='Is PO') purchase_match = fields.One2many('automatic.purchase.match', 'automatic_purchase_id', string='PO Matches', auto_join=True) vendor_id = fields.Many2one('res.partner', string='Vendor', help='boleh kosong, jika diisi, maka hanya keluar data untuk vendor tersebut') - responsible_id = fields.Many2one('res.users', string='Responsible', required=True) + responsible_id = fields.Many2one('res.users', string='Responsible', readonly=True) apo_type = fields.Selection([ ('regular', 'Regular Fulfill SO'), ('reordering', 'Reordering Rule'), @@ -63,6 +63,13 @@ class AutomaticPurchase(models.Model): def create_po_from_automatic_purchase(self): + po = self.env['purchase.order'].search([ + ('state', '=', 'draft') + ]) + + if po: + raise UserError('Ada PO yang statusnya draft, proses dulu') + if not self.purchase_lines: raise UserError('Tidak ada Lines, belum bisa create PO') if self.is_po: @@ -152,10 +159,15 @@ class AutomaticPurchase(models.Model): auto_purchase_line = self.env['automatic.purchase.line'] + last_po = self.env['purchase.order'].search([ + ('partner_id', '=', vendor_id), + ('state', '=', 'done'), + ], order='id desc', limit=1) + param_header = { 'partner_id': vendor_id, 'currency_id': 12, - 'user_id': self.env.user.id, + 'user_id': last_po.user_id.id, 'company_id': 1, # indoteknik dotcom gemilang 'picking_type_id': 28, # indoteknik bandengan receipts 'date_order': current_time, @@ -264,16 +276,20 @@ class AutomaticPurchase(models.Model): raise UserError('Vendor tidak dapat diisi jika Regular Fulfill SO') if self.purchase_lines: raise UserError('Sudah digenerate sebelumnya, hapus line terlebih dahulu') + + self.responsible_id = self.env.user.id + self.date_doc = datetime.utcnow() + #TODO must add order by for fifo mechanism #change the view of v.purchasing.job and use order by in query query = [ - ('action', '=', 'kurang beli') + ('action', '=', 'kurang') ] jobs = self.env['v.purchasing.job'].search(query) count = 0 for job in jobs: - qty_purchase = job.outgoing - job.onhand + job.incoming - qty_available = job.onhand + job.incoming - job.outgoing + qty_purchase = job.outgoing - (job.onhand + job.incoming) + qty_available = (job.onhand + job.incoming) - job.outgoing domain = [ ('product_id.id', '=', job.product_id.id), @@ -361,6 +377,8 @@ class AutomaticPurchase(models.Model): if self.purchase_lines: raise UserError('Sudah digenerate sebelumnya, hapus line terlebih dahulu') + self.responsible_id = self.env.user.id + query = [ ('product_min_qty', '>', 0), ('product_id.x_manufacture.user_id.id', '=', self.responsible_id.id) -- cgit v1.2.3 From 0738a192409687790c16c757f85fe440cb1f377d Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 12 Feb 2024 08:27:42 +0700 Subject: change request purchasing job --- indoteknik_custom/models/automatic_purchase.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index 713853e9..da845645 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -63,13 +63,6 @@ class AutomaticPurchase(models.Model): def create_po_from_automatic_purchase(self): - po = self.env['purchase.order'].search([ - ('state', '=', 'draft') - ]) - - if po: - raise UserError('Ada PO yang statusnya draft, proses dulu') - if not self.purchase_lines: raise UserError('Tidak ada Lines, belum bisa create PO') if self.is_po: @@ -270,6 +263,11 @@ class AutomaticPurchase(models.Model): sales_order_purchase_match = self.env['sales.order.purchase.match'].create([matches_po_line]) def generate_regular_purchase(self): + po = self.env['purchase.order'].search([ + ('state', '=', 'draft') + ]) + if po: + raise UserError('Ada PO yang statusnya draft, proses dulu') if self.apo_type == 'reordering': raise UserError('Tombol ini hanya untuk Regular Fulfill SO') if self.vendor_id: -- cgit v1.2.3 From b2377426bec8aa334277aac48b0b25f0dfac420f Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 25 Mar 2024 13:07:44 +0700 Subject: purchasing job feedback --- indoteknik_custom/models/automatic_purchase.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indoteknik_custom/models/automatic_purchase.py') diff --git a/indoteknik_custom/models/automatic_purchase.py b/indoteknik_custom/models/automatic_purchase.py index da845645..3e2d31e7 100644 --- a/indoteknik_custom/models/automatic_purchase.py +++ b/indoteknik_custom/models/automatic_purchase.py @@ -164,6 +164,7 @@ class AutomaticPurchase(models.Model): 'company_id': 1, # indoteknik dotcom gemilang 'picking_type_id': 28, # indoteknik bandengan receipts 'date_order': current_time, + 'from_apo': True, 'note_description': 'Automatic PO' } @@ -192,8 +193,19 @@ class AutomaticPurchase(models.Model): limit=PRODUCT_PER_PO ) + lines = auto_purchase_line.search( + domain, + offset=i * PRODUCT_PER_PO, + limit=PRODUCT_PER_PO + ) + + for line in lines: product = line.product_id + sales_match = self.env['automatic.purchase.sales.match'].search([ + ('automatic_purchase_id', '=', self.id), + ('product_id', '=', product.id), + ]) param_line = { 'order_id': new_po.id, 'product_id': product.id, @@ -202,6 +214,7 @@ class AutomaticPurchase(models.Model): 'suggest': product._get_po_suggest(line.qty_purchase), 'product_uom_qty': line.qty_purchase, 'price_unit': line.last_price, + # 'so_line_id': [sales.sale_line_id.id for sales in sales_match], } new_po_line = self.env['purchase.order.line'].create([param_line]) line.current_po_id = new_po.id -- cgit v1.2.3