Skip to content

Commit

Permalink
Merge PR #1082 into 14.0
Browse files Browse the repository at this point in the history
Signed-off-by feketemihai
  • Loading branch information
OCA-git-bot committed Oct 1, 2024
2 parents 3f94e98 + d293a92 commit a7c6393
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 14 deletions.
17 changes: 8 additions & 9 deletions l10n_ro_account_edi_ubl/models/account_edi_xml_cius_ro.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,17 +165,16 @@ def _export_invoice_vals(self, invoice):
index = 1
vals_list["main_template"] = "account_edi_ubl_cii.ubl_20_Invoice"
vals_list["vals"]["invoice_type_code"] = 380
if (
invoice.move_type in ("in_invoice", "in_refund")
and invoice.journal_id.l10n_ro_sequence_type == "autoinv2"
):
vals_list["vals"]["invoice_type_code"] = 389
point_of_sale = self.env["ir.module.module"].search(
point_of_sale = (
self.env["ir.module.module"]
.sudo()
.search(
[("name", "=", "point_of_sale"), ("state", "=", "installed")], limit=1
)
if point_of_sale:
if invoice.pos_order_ids:
vals_list["vals"]["invoice_type_code"] = 751
)
if point_of_sale:
if invoice.pos_order_ids:
vals_list["vals"]["invoice_type_code"] = 751
if vals_list["vals"].get("credit_note_type_code"):
vals_list["vals"].pop("credit_note_type_code")
for val in vals_list["vals"]["invoice_line_vals"]:
Expand Down
7 changes: 7 additions & 0 deletions l10n_ro_stock_account_date/models/stock_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,13 @@ def _trigger_assign(self):
def _get_price_unit(self):
# Update price unit for purchases in different currencies with the
# reception date.
mrp = (
self.env["ir.module.module"]
.sudo()
.search([("name", "=", "purchase_mrp"), ("state", "=", "installed")])
)
if mrp:
return super()._get_price_unit()
if self.is_l10n_ro_record:
if (
self.origin_returned_move_id
Expand Down
1 change: 1 addition & 0 deletions l10n_ro_stock_price_difference/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Romania - Stock Accounting Price Difference
|badge1| |badge2| |badge3| |badge4| |badge5|

The module is managing price diferences between invoices and receptions. It will create a landed cost with a "Price Difference" product available in the configuration.
***The price diference does not apply to receptions of products with a BOM (Bill of Materials).***

**Table of contents**

Expand Down
1 change: 1 addition & 0 deletions l10n_ro_stock_price_difference/readme/DESCRIPTION.rst
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
The module is managing price diferences between invoices and receptions. It will create a landed cost with a "Price Difference" product available in the configuration.
***The price diference does not apply to receptions of products with a BOM (Bill of Materials).***
14 changes: 9 additions & 5 deletions l10n_ro_stock_price_difference/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -274,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -369,7 +370,8 @@ <h1 class="title">Romania - Stock Accounting Price Difference</h1>
!! source digest: sha256:a7527d6caf2b01e02089446b7d78912245a9d13e462b6548164a6ad625b36783
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.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/l10n-romania/tree/14.0/l10n_ro_stock_price_difference"><img alt="OCA/l10n-romania" src="https://img.shields.io/badge/github-OCA%2Fl10n--romania-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-romania-14-0/l10n-romania-14-0-l10n_ro_stock_price_difference"><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/l10n-romania&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>The module is managing price diferences between invoices and receptions. It will create a landed cost with a “Price Difference” product available in the configuration.</p>
<p>The module is managing price diferences between invoices and receptions. It will create a landed cost with a “Price Difference” product available in the configuration.
<strong>*The price diference does not apply to receptions of products with a BOM (Bill of Materials).*</strong></p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
Expand Down Expand Up @@ -417,7 +419,9 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
Expand Down

0 comments on commit a7c6393

Please sign in to comment.