audrius/rma
1
0
Fork 1
mirror of https://github.com/OCA/rma.git synced 2025-02-16 17:11:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #374 into 14.0

Browse Source 
Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-11-07 16:53:32 +00:00
parent a5d476fd73 b5778d33f0
commit f3988c0ed9
5 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rma_sale/README.rst
View File

@@ -7,7 +7,7 @@ Return Merchandise Authorization Management - Link with Sales
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:39fa5c0e9b816d7bf19689674b96c160586e4e716b0c028e6e94b7b2bc1f6a42
!! source digest: sha256:7e0618b54228b56d98fe59f32f0d347363353c739194e3fbeb60760c7964b120
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -106,6 +106,7 @@ Contributors
* Chafique Delli <chafique.delli@akretion.com>
* Giovanni Serra - Ooops <giovanni@ooops404.com>
* Michael Tietz (MT Software) <mtietz@mt-software.de>
Maintainers
~~~~~~~~~~~

4
rma_sale/models/rma.py
View File

@@ -1,4 +1,5 @@
# Copyright 2020 Tecnativa - Ernesto Tejeda
# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo import api, fields, models
@@ -116,3 +117,6 @@ class Rma(models.Model):
if line:
line_form.discount = line.discount
line_form.sequence = line.sequence
analytic_account = line.order_id.analytic_account_id
if analytic_account:
line_form.analytic_account_id = analytic_account

1
rma_sale/readme/CONTRIBUTORS.rst
View File

@@ -7,3 +7,4 @@
* Chafique Delli <chafique.delli@akretion.com>
* Giovanni Serra - Ooops <giovanni@ooops404.com>
* Michael Tietz (MT Software) <mtietz@mt-software.de>

3
rma_sale/static/description/index.html
View File

@@ -367,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:39fa5c0e9b816d7bf19689674b96c160586e4e716b0c028e6e94b7b2bc1f6a42
!! source digest: sha256:7e0618b54228b56d98fe59f32f0d347363353c739194e3fbeb60760c7964b120
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/rma/tree/14.0/rma_sale"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma_sale"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module allows you to link a sales order to an RMA.
@@ -455,6 +455,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
</li>
<li>Chafique Delli &lt;<a class="reference external" href="mailto:chafique.delli&#64;akretion.com">chafique.delli&#64;akretion.com</a>&gt;</li>
<li>Giovanni Serra - Ooops &lt;<a class="reference external" href="mailto:giovanni&#64;ooops404.com">giovanni&#64;ooops404.com</a>&gt;</li>
<li>Michael Tietz (MT Software) &lt;<a class="reference external" href="mailto:mtietz&#64;mt-software.de">mtietz&#64;mt-software.de</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">

8
rma_sale/tests/test_rma_sale.py
View File

@@ -1,5 +1,6 @@
# Copyright 2020 Tecnativa - Ernesto Tejeda
# Copyright 2022 Tecnativa - Víctor Martínez
# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo.tests import Form, SavepointCase
@@ -91,11 +92,18 @@ class TestRmaSale(SavepointCase):
{"login": "test_refund_with_so", "name": "Test"}
)
order.user_id = user.id
order.analytic_account_id = self.env["account.analytic.account"].create(
{"name": "Test Account"}
)
rma.action_confirm()
rma.reception_move_id.quantity_done = rma.product_uom_qty
rma.reception_move_id.picking_id._action_done()
rma.action_refund()
self.assertEqual(rma.refund_id.user_id, user)
self.assertEqual(
rma.refund_id.invoice_line_ids.analytic_account_id,
order.analytic_account_id,
)
@users("partner@rma")
def test_create_rma_from_so_portal_user(self):