From 0ab76a67a14bfc91bcbf65c885acbbeed2d660cc Mon Sep 17 00:00:00 2001 From: santiky Date: Sat, 11 Sep 2021 20:30:05 +0200 Subject: [PATCH] =?UTF-8?q?Funcionando=20la=20liquidaci=C3=B3n=20de=20vent?= =?UTF-8?q?as,=20genera=20un=20sale.order.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stock_picking_deposito/__manifest__.py | 5 +- stock_picking_deposito/data/data.xml | 4 +- stock_picking_deposito/models/res_partner.py | 72 ++++++++------------ 3 files changed, 32 insertions(+), 49 deletions(-) diff --git a/stock_picking_deposito/__manifest__.py b/stock_picking_deposito/__manifest__.py index 1199864..a0483a2 100644 --- a/stock_picking_deposito/__manifest__.py +++ b/stock_picking_deposito/__manifest__.py @@ -14,11 +14,12 @@ "depends": [ "stock", "account", + "sale_management", ], "data": [ - "views/stock_picking.xml", + "views/stock_picking.xml", "views/view_res_partner.xml", "data/data.xml", - "views/res_config_settings_views.xml", + "views/res_config_settings_views.xml", ], } diff --git a/stock_picking_deposito/data/data.xml b/stock_picking_deposito/data/data.xml index bbbe1be..24b37c1 100644 --- a/stock_picking_deposito/data/data.xml +++ b/stock_picking_deposito/data/data.xml @@ -11,7 +11,7 @@ Depósitos Salidas view - + diff --git a/stock_picking_deposito/models/res_partner.py b/stock_picking_deposito/models/res_partner.py index 35735c2..2f29669 100644 --- a/stock_picking_deposito/models/res_partner.py +++ b/stock_picking_deposito/models/res_partner.py @@ -45,7 +45,7 @@ class ResPartner(models.Model): new_loc = self.env['stock.location'].create({ 'usage': 'internal', 'name': self.name, - 'location_id': self.env.ref('stock_picking_deposito.location_deposit_sale').id + 'location_id': self.env.ref('stock_picking_deposito.stock_location_deposits_stock').id }) self.update({ 'deposit_sale_location_id': new_loc @@ -65,7 +65,6 @@ class ResPartner(models.Model): def make_liquidation_buy(self, context = None): invoice_obj = self.env['account.invoice'] - search_vals = [ ('location_id', '=', self.deposit_buy_location_id.id),'|', ('location_dest_id', '=', self.env.ref('stock.stock_location_customers').id), @@ -75,9 +74,6 @@ class ResPartner(models.Model): search_vals.append(('date', '>', self.deposit_buy_last_liquidation_date.strftime("%Y-%m-%d %H:%M:%S"))) move_lines = self.env['stock.move.line'].search(search_vals) product_list = [] - - - for mv in move_lines: new_prod = True for p in product_list: @@ -99,7 +95,7 @@ class ResPartner(models.Model): self.deposit_buy_last_liquidation_date = fields.datetime.now() invoice_vals = invoice_obj.default_get(invoice_obj._fields.keys()) invoice_vals.update({ - 'origin': "Liquidación " + self.deposit_buy_last_liquidation_date.strftime("%d-%m-%Y"), + 'origin': "Liquidación Compras " + self.deposit_buy_last_liquidation_date.strftime("%d-%m-%Y"), 'type': 'in_invoice', 'date_invoice': self.deposit_buy_last_liquidation_date.strftime("%Y-%m-%d %H:%M:%S"), 'journal_id': self.env.user.company_id.deposit_journal_id.id, @@ -119,65 +115,51 @@ class ResPartner(models.Model): else: msg= "No se ha vendido ningún producto en depósito de éste provedor desde la última liquidación.\n\n" if self.deposit_buy_last_liquidation_date: - msg += "Fecha última liquidación : %s" %self.deposit_buy_last_liquidation_date.strftime("%d-%m-%Y, %H:%M:%S") + msg += "Fecha última liquidación de compras : %s" %self.deposit_buy_last_liquidation_date.strftime("%d-%m-%Y, %H:%M:%S") else: - msg += "No se ha realizado ninguna liquidación a éste proveedor." + msg += "No se ha realizado ninguna liquidación de compras a éste proveedor." raise ValidationError(msg) def make_liquidation_sale(self, context = None): - invoice_obj = self.env['account.invoice'] - search_vals = [ - ('location_id', '=', self.deposit_buy_location_id.id),'|', - ('location_dest_id', '=', self.env.ref('stock.stock_location_customers').id), - ('location_dest_id', '=', self.env.ref('stock.stock_location_stock').id), - ] - if self.deposit_buy_last_liquidation_date: - search_vals.append(('date', '>', self.deposit_buy_last_liquidation_date.strftime("%Y-%m-%d %H:%M:%S"))) - move_lines = self.env['stock.move.line'].search(search_vals) + self.deposit_sale_location_id + sale_order_obj = self.env['sale.order'] + search_vals = [('location_id', '=', self.deposit_sale_location_id.id)] + stock_lines = self.env['stock.quant'].search(search_vals) product_list = [] - for mv in move_lines: - new_prod = True - for p in product_list: - if p[2]['product_id'] == mv.product_id.id: - p[2]['quantity'] += mv.qty_done - new_prod = False - break - if new_prod: + for mv in stock_lines: product_list.append([0, False, { 'product_id': mv.product_id.id, - 'quantity': mv.qty_done, + 'product_uom_qty': mv.quantity, 'name': mv.product_id.name, 'price_unit': mv.product_id.lst_price, - 'uom_id': mv.product_id.uom_id.id, - 'account_id': self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_expenses').id)], limit=1).id + 'product_uom': mv.product_id.uom_id.id, } ]) if len(product_list): - self.deposit_buy_last_liquidation_date = fields.datetime.now() - invoice_vals = invoice_obj.default_get(invoice_obj._fields.keys()) - invoice_vals.update({ - 'origin': "Liquidación " + self.deposit_buy_last_liquidation_date.strftime("%d-%m-%Y"), - 'type': 'in_invoice', - 'date_invoice': self.deposit_buy_last_liquidation_date.strftime("%Y-%m-%d %H:%M:%S"), - 'journal_id': self.env.user.company_id.deposit_journal_id.id, - 'account_id': self.env['account.account'].search([('user_type_id', '=', self.env.ref('account.data_account_type_receivable').id)], limit=1).id, + self.deposit_sale_last_liquidation_date = fields.datetime.now() + so_vals = sale_order_obj.default_get(sale_order_obj._fields.keys()) + so_vals.update({ 'partner_id': self.id, - 'invoice_line_ids': product_list, + 'origin': "Liquidación Ventas " + self.deposit_sale_last_liquidation_date.strftime("%d-%m-%Y"), + 'date_order': self.deposit_sale_last_liquidation_date.strftime("%Y-%m-%d %H:%M:%S"), + #'journal_id': self.env.user.company_id.deposit_journal_id.id, + 'order_line': product_list, + 'warehouse_id': self.env.ref('stock_picking_deposito.wh_deposits').id }) - invoice = self.env['account.invoice'].create(invoice_vals) - views = [(self.env.ref('account.invoice_form').id, 'form')] + sale_order = self.env['sale.order'].sudo().create(so_vals) + views = [(self.env.ref('sale.view_order_form').id, 'form')] return { 'type': 'ir.actions.act_window', - 'res_model': 'account.invoice', - 'res_id': invoice.id, + 'res_model': 'sale.order', + 'res_id': sale_order.id, 'target': 'current', 'views': views, } else: - msg= "No se ha vendido ningún producto en depósito de éste provedor desde la última liquidación.\n\n" - if self.deposit_buy_last_liquidation_date: - msg += "Fecha última liquidación : %s" %self.deposit_buy_last_liquidation_date.strftime("%d-%m-%Y, %H:%M:%S") + msg= "No hay ningún producto en depósito a éste cliente desde la última liquidación de ventas.\n\n" + if self.deposit_sale_last_liquidation_date: + msg += "Fecha última liquidación de ventas: %s" %self.deposit_buy_last_liquidation_date.strftime("%d-%m-%Y, %H:%M:%S") else: - msg += "No se ha realizado ninguna liquidación a éste proveedor." + msg += "No se ha realizado ninguna liquidación de ventas a éste proveedor." raise ValidationError(msg)