audrius/stock-rma
1
0
Fork 0
mirror of https://github.com/ForgeFlow/stock-rma.git synced 2025-01-21 12:57:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX]rma_sale sale_policy instead of sale_type

Browse Source
This commit is contained in:
aaron
2018-05-24 12:05:51 +02:00
committed by ahenriquez
parent 37b2164b5f
commit d4d65f7ad0
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rma_sale/models/rma_operation.py
View File

@@ -7,7 +7,7 @@ from odoo import fields, models
class RmaOperation(models.Model): class RmaOperation(models.Model):
_inherit = 'rma.operation' _inherit = 'rma.operation'
sale_type = fields.Selection([ sale_policy = fields.Selection([
('no', 'Not required'), ('ordered', 'Based on Ordered Quantities'), ('no', 'Not required'), ('ordered', 'Based on Ordered Quantities'),
('received', 'Based on Received Quantities')], ('received', 'Based on Received Quantities')],
string="Sale Policy", default='no') string="Sale Policy", default='no')

12
rma_sale/models/rma_order_line.py
View File

@@ -9,23 +9,23 @@ from odoo.addons import decimal_precision as dp
class RmaOrderLine(models.Model): class RmaOrderLine(models.Model):
_inherit = "rma.order.line" _inherit = "rma.order.line"
@api.depends('sale_line_ids', 'sale_type', 'sales_count', @api.depends('sale_line_ids', 'sale_policy', 'sales_count',
'sale_line_ids.state') 'sale_line_ids.state')
@api.multi @api.multi
def _compute_qty_to_sell(self): def _compute_qty_to_sell(self):
for rec in self: for rec in self:
if rec.sale_type == 'no': if rec.sale_policy == 'no':
rec.qty_to_sell = 0.0 rec.qty_to_sell = 0.0
elif rec.sale_type == 'ordered': elif rec.sale_policy == 'ordered':
qty = self._get_rma_sold_qty() qty = self._get_rma_sold_qty()
rec.qty_to_sell = self.product_qty - qty rec.qty_to_sell = self.product_qty - qty
elif rec.sale_type == 'received': elif rec.sale_policy == 'received':
qty = self._get_rma_sold_qty() qty = self._get_rma_sold_qty()
rec.qty_to_sell = self.qty_received - qty rec.qty_to_sell = self.qty_received - qty
else: else:
rec.qty_to_sell = 0.0 rec.qty_to_sell = 0.0
@api.depends('sale_line_ids', 'sale_type', 'sales_count', @api.depends('sale_line_ids', 'sale_policy', 'sales_count',
'sale_line_ids.state') 'sale_line_ids.state')
def _compute_qty_sold(self): def _compute_qty_sold(self):
self.qty_sold = self._get_rma_sold_qty() self.qty_sold = self._get_rma_sold_qty()
@@ -59,7 +59,7 @@ class RmaOrderLine(models.Model):
digits=dp.get_precision('Product Unit of Measure'), digits=dp.get_precision('Product Unit of Measure'),
readonly=True, compute=_compute_qty_sold, readonly=True, compute=_compute_qty_sold,
store=True) store=True)
sale_type = fields.Selection(selection=[ sale_policy = fields.Selection(selection=[
('no', 'Not required'), ('ordered', 'Based on Ordered Quantities'), ('no', 'Not required'), ('ordered', 'Based on Ordered Quantities'),
('received', 'Based on Received Quantities')], ('received', 'Based on Received Quantities')],
string="Sale Policy", default='no', required=True) string="Sale Policy", default='no', required=True)

4
rma_sale/views/rma_operation_view.xml
View File

@@ -8,7 +8,7 @@
<field name="inherit_id" ref="rma.rma_operation_tree"/> <field name="inherit_id" ref="rma.rma_operation_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="delivery_policy" position="after"> <field name="delivery_policy" position="after">
<field name="sale_type"/> <field name="sale_policy"/>
</field> </field>
</field> </field>
</record> </record>
@@ -19,7 +19,7 @@
<field name="inherit_id" ref="rma.rma_operation_form"/> <field name="inherit_id" ref="rma.rma_operation_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="delivery_policy" position="after"> <field name="delivery_policy" position="after">
<field name="sale_type"/> <field name="sale_policy"/>
</field> </field>
</field> </field>
</record> </record>