Cambia los campos de depósitos en la vista de res.partner a una página en el notebook
Quita algunos warnings sobre campos no válidos [wip] Botón y esqueleto de la liquidación de ventas, el método no está implementado todavía
This commit is contained in:
parent
8c2719b77d
commit
f19067e67b
GPG key ID:
A9FD34930EADBE71
3 changed files with 110 additions and 8 deletions
|
|
@ -33,7 +33,6 @@
|
|||
<field name="name">Depósitos Salidas</field>
|
||||
<field name="usage">view</field>
|
||||
<field name="location_id" ref="stock_picking_deposito.stock_location_deposits_parent"/>
|
||||
<field name="warehouse_id" ref="wh_deposits"/>
|
||||
</record>
|
||||
|
||||
<record id="seq_stock_picking_deposit_in" model="ir.sequence">
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@ class ResPartner(models.Model):
|
|||
string='Fecha de la última liquidación de compras',
|
||||
help="Cuándo se realizó la última liquidación de compras con éste proveedor."
|
||||
)
|
||||
deposit_sale_last_liquidation_date = fields.Datetime(
|
||||
string='Fecha de la última liquidación de ventas',
|
||||
help="Cuándo se realizó la última liquidación de ventas con éste proveedor."
|
||||
)
|
||||
|
||||
@api.onchange('deposit_sale_accept')
|
||||
def _onchange_deposit_sale_accept(self):
|
||||
|
|
@ -61,6 +65,67 @@ 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),
|
||||
('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)
|
||||
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:
|
||||
product_list.append([0, False, {
|
||||
'product_id': mv.product_id.id,
|
||||
'quantity': mv.qty_done,
|
||||
'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
|
||||
}
|
||||
])
|
||||
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,
|
||||
'partner_id': self.id,
|
||||
'invoice_line_ids': product_list,
|
||||
})
|
||||
invoice = self.env['account.invoice'].create(invoice_vals)
|
||||
views = [(self.env.ref('account.invoice_form').id, 'form')]
|
||||
return {
|
||||
'type': 'ir.actions.act_window',
|
||||
'res_model': 'account.invoice',
|
||||
'res_id': invoice.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")
|
||||
else:
|
||||
msg += "No se ha realizado ninguna liquidación 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),
|
||||
|
|
|
|||
|
|
@ -3,15 +3,22 @@
|
|||
|
||||
<record model="ir.actions.server" id="action_res_partner_liquidacion_buy">
|
||||
<field name="name">Liquidación Depósito Compras</field>
|
||||
<field name="condition">True</field>
|
||||
<field name="type">ir.actions.server</field>
|
||||
<field name="model_id" ref="base.model_res_partner" />
|
||||
<field name="state">code</field>
|
||||
<field name="code">action =record.make_liquidation_buy()</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.server" id="action_res_partner_liquidacion_sale">
|
||||
<field name="name">Liquidación Depósito Ventas</field>
|
||||
<field name="type">ir.actions.server</field>
|
||||
<field name="model_id" ref="base.model_res_partner" />
|
||||
<field name="state">code</field>
|
||||
<field name="code">action =record.make_liquidation_sale()</field>
|
||||
</record>
|
||||
|
||||
<record id="action_open_liquidacion_buy" model="ir.actions.act_window">
|
||||
<field name="name">Abre Liquidación</field>
|
||||
<field name="name">Liquida Compras</field>
|
||||
<field name="res_model">account.invoice</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
|
|
@ -19,27 +26,49 @@
|
|||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
<record id="action_open_liquidacion_sale" model="ir.actions.act_window">
|
||||
<field name="name">Liquida Ventas</field>
|
||||
<field name="res_model">account.invoice</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="account.invoice_form"/>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
<!--
|
||||
<record model="ir.ui.view" id="view_open_liquidation_buy">
|
||||
<field name="name">view_open_liquidation_buy_form</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="groups_id"></field>
|
||||
<field name="type">form</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_open_liquidation_buy">
|
||||
<field name="name">view_open_liquidation_buy_form</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="groups_id"></field>
|
||||
<field name="type">form</field>
|
||||
</record>
|
||||
|
||||
-->
|
||||
<record id="view_partner_form" model="ir.ui.view">
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||
<field name="priority">200</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="vat" position="after">
|
||||
<group>
|
||||
<page name="internal_notes" position="after">
|
||||
<page name="depositos" string="Depósitos">
|
||||
<div clas="o_horizontal_separator"><h2>Depósitos</h2></div>
|
||||
<group class="o_group o_inner_group o_group_col_6">
|
||||
<field name="deposit_sale_accept"/>
|
||||
<field name="deposit_sale_location_id" />
|
||||
<field name="deposit_sale_last_liquidation_date" readonly="1" />
|
||||
</group>
|
||||
<group class="o_group o_inner_group o_group_col_6">
|
||||
<field name="deposit_buy_accept"/>
|
||||
<field name="deposit_buy_location_id" />
|
||||
<field name="deposit_buy_last_liquidation_date" readonly="1" />
|
||||
</group>
|
||||
</field>
|
||||
</group>
|
||||
</page>
|
||||
</page>
|
||||
<div name="button_box" position="inside">
|
||||
<button name="%(stock_picking_deposito.action_res_partner_liquidacion_buy)d"
|
||||
string="Liquida Compras"
|
||||
|
|
@ -50,6 +79,15 @@
|
|||
groups="stock.group_stock_manager"
|
||||
attrs="{'invisible': [('deposit_buy_accept', '!=', True)]}"
|
||||
/>
|
||||
<button name="%(stock_picking_deposito.action_res_partner_liquidacion_sale)d"
|
||||
string="Liquida Ventas"
|
||||
type="action"
|
||||
class="oe_stat_button"
|
||||
icon="fa-calendar"
|
||||
help="Realiza la factura de ventas para éste cliente."
|
||||
groups="stock.group_stock_manager"
|
||||
attrs="{'invisible': [('deposit_sale_accept', '!=', True)]}"
|
||||
/>
|
||||
</div>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue