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

[9.0][FIX] rma:

Browse Source 
* fix assignment of moves.
* default qty in rma lines.
* remove account dependency.
* test and flake8 fixes.
This commit is contained in:
lreficent
2017-08-02 17:05:58 +02:00
committed by ahenriquez
parent 92c8bb50dd
commit ff389a5fad
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rma_sale/models/rma_order.py
View File

@@ -17,7 +17,7 @@ class RmaOrder(models.Model):
self.sale_count = len(list(set(sales_list))) self.sale_count = len(list(set(sales_list)))
sale_count = fields.Integer(compute=_compute_sales_count, sale_count = fields.Integer(compute=_compute_sales_count,
string='# of Sales', copy=False, default=0) string='# of Sales', copy=False, default=0)
@api.model @api.model
def _get_line_domain(self, rma_id, line): def _get_line_domain(self, rma_id, line):
@@ -38,4 +38,4 @@ class RmaOrder(models.Model):
if rma_line.sale_line_id and rma_line.sale_line_id.id: if rma_line.sale_line_id and rma_line.sale_line_id.id:
order_ids.append(rma_line.sale_line_id.order_id.id) order_ids.append(rma_line.sale_line_id.order_id.id)
result['domain'] = [('id', 'in', order_ids)] result['domain'] = [('id', 'in', order_ids)]
return result return result

1
rma_sale/models/rma_order_line.py
View File

@@ -4,6 +4,7 @@
from openerp import _, api, fields, models from openerp import _, api, fields, models
from openerp.addons import decimal_precision as dp from openerp.addons import decimal_precision as dp
class RmaOrderLine(models.Model): class RmaOrderLine(models.Model):
_inherit = "rma.order.line" _inherit = "rma.order.line"

11
rma_sale/wizards/rma_add_sale.py
View File

@@ -2,11 +2,8 @@
# © 2017 Eficent Business and IT Consulting Services S.L. # © 2017 Eficent Business and IT Consulting Services S.L.
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
import time from openerp import _, api, fields, models
from openerp import models, fields, exceptions, api, _
from openerp.exceptions import ValidationError from openerp.exceptions import ValidationError
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DT_FORMAT
import openerp.addons.decimal_precision as dp
class RmaAddSale(models.TransientModel): class RmaAddSale(models.TransientModel):
@@ -31,9 +28,9 @@ class RmaAddSale(models.TransientModel):
return res return res
rma_id = fields.Many2one('rma.order', rma_id = fields.Many2one('rma.order',
string='RMA Order', string='RMA Order',
readonly=True, readonly=True,
ondelete='cascade') ondelete='cascade')
partner_id = fields.Many2one(comodel_name='res.partner', string='Partner', partner_id = fields.Many2one(comodel_name='res.partner', string='Partner',
readonly=True) readonly=True)

5
rma_sale/wizards/rma_make_picking.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# © 2017 Eficent Business and IT Consulting Services S.L. # © 2017 Eficent Business and IT Consulting Services S.L.
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
from openerp import models, fields, exceptions, api, _ from openerp import api, fields, models
class RmaMakePicking(models.TransientModel): class RmaMakePicking(models.TransientModel):
@@ -13,8 +13,9 @@ class RmaMakePicking(models.TransientModel):
res['sale_line_id'] = line.sale_line_id.id res['sale_line_id'] = line.sale_line_id.id
return res return res
class RmaMakePickingItem(models.TransientModel): class RmaMakePickingItem(models.TransientModel):
_inherit = "rma_make_picking.wizard.item" _inherit = "rma_make_picking.wizard.item"
sale_line_id = fields.Many2one('sale.order.line', sale_line_id = fields.Many2one('sale.order.line',
string='Sale Line') string='Sale Line')

6
rma_sale/wizards/rma_refund.py
View File

@@ -1,9 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# © 2017 Eficent Business and IT Consulting Services S.L. # © 2017 Eficent Business and IT Consulting Services S.L.
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html) # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
from openerp import models, fields, exceptions, api, _ from openerp import _, api, fields, models
import openerp.addons.decimal_precision as dp
from openerp.exceptions import ValidationError
class RmaRefund(models.TransientModel): class RmaRefund(models.TransientModel):
@@ -20,4 +18,4 @@ class RmaRefundItem(models.TransientModel):
_inherit = "rma.refund.item" _inherit = "rma.refund.item"
sale_line_id = fields.Many2one('sale.order.line', sale_line_id = fields.Many2one('sale.order.line',
string='Sale Line') string='Sale Line')