Skip to content

Commit

Permalink
[IMP] sale_order_import: apply pre-commit auto fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
antonioburic committed Jul 8, 2024
1 parent 69bc613 commit 464e5ff
Show file tree
Hide file tree
Showing 12 changed files with 107 additions and 59 deletions.
60 changes: 37 additions & 23 deletions sale_order_import/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,27 @@ Sale Order Import
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github
:target: https://github.com/OCA/edi/tree/16.0/sale_order_import
:target: https://github.com/OCA/edi/tree/17.0/sale_order_import
:alt: OCA/edi
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-sale_order_import
:target: https://translation.odoo-community.org/projects/edi-17-0/edi-17-0-sale_order_import
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/edi&target_branch=16.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/edi&target_branch=17.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|

This module adds support for the import of electronic RFQ or orders. This module provides the base methods to import electronic orders, and you can also plug additional formats by extending the wizard. It requires additional modules to support specific order formats:
This module adds support for the import of electronic RFQ or orders.
This module provides the base methods to import electronic orders, and
you can also plug additional formats by extending the wizard. It
requires additional modules to support specific order formats:

- module *sale_order_import_ubl*: adds support for `Universal Business
Language (UBL) <http://ubl.xml.org/>`__ RFQs and orders as:

* module *sale_order_import_ubl*: adds support for `Universal Business Language (UBL) <http://ubl.xml.org/>`_ RFQs and orders as:

- XML file,
- PDF file with an embedded XML file.
- XML file,
- PDF file with an embedded XML file.

**Table of contents**

Expand All @@ -44,47 +47,58 @@ This module adds support for the import of electronic RFQ or orders. This module
Usage
=====

This module adds a wizard in the sale menu named *Import RFQ or Order*. This wizard will propose you to select the order or RFQ file. Depending on the format of the file (XML or PDF) and the type of file (RFQ or order), it may propose you additional options.
This module adds a wizard in the sale menu named *Import RFQ or Order*.
This wizard will propose you to select the order or RFQ file. Depending
on the format of the file (XML or PDF) and the type of file (RFQ or
order), it may propose you additional options.

When you import an order, if there is a quotation in Odoo for the same customer, the wizard will propose you to either update the existing quotation or create a new order (in fact, it will create a new quotation, so that you are free to make some modifications before you click on the *Confirm Sale* button to convert the quotation to a sale order).
When you import an order, if there is a quotation in Odoo for the same
customer, the wizard will propose you to either update the existing
quotation or create a new order (in fact, it will create a new
quotation, so that you are free to make some modifications before you
click on the *Confirm Sale* button to convert the quotation to a sale
order).

Once the RFQ/order is imported, you should read the messages in the chatter of the quotation because it may contain important information about the import.
Once the RFQ/order is imported, you should read the messages in the
chatter of the quotation because it may contain important information
about the import.

Bug Tracker
===========

Bugs are tracked on `GitHub Issues <https://github.com/OCA/edi/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/edi/issues/new?body=module:%20sale_order_import%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/edi/issues/new?body=module:%20sale_order_import%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Credits
=======

Authors
~~~~~~~
-------

* Akretion
* Camptocamp

Contributors
~~~~~~~~~~~~
------------

* Alexis de Lattre <[email protected]>
* Dennis Sluijk <[email protected]>
* Andrea Stirpe <[email protected]>
* Simone Orsi <[email protected]>
* Duong (Tran Quoc) <[email protected]>
- Alexis de Lattre <[email protected]>
- Dennis Sluijk <[email protected]>
- Andrea Stirpe <[email protected]>
- Simone Orsi <[email protected]>
- Duong (Tran Quoc) <[email protected]>

Other credits
~~~~~~~~~~~~~
-------------

The migration of this module from 13.0 to 16.0 was financially supported by Camptocamp
The migration of this module from 13.0 to 16.0 was financially supported
by Camptocamp

Maintainers
~~~~~~~~~~~
-----------

This module is maintained by the OCA.

Expand All @@ -96,6 +110,6 @@ 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.

This module is part of the `OCA/edi <https://github.com/OCA/edi/tree/16.0/sale_order_import>`_ project on GitHub.
This module is part of the `OCA/edi <https://github.com/OCA/edi/tree/17.0/sale_order_import>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion sale_order_import/models/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def name_get(self):
res = super().name_get()
if self._context.get("sale_order_show_amount"):
new_res = []
for (sale_id, name) in res:
for sale_id, name in res:
sale = self.browse(sale_id)
# TODO: find a python method to easily display a float + currency
# symbol (before or after) depending on lang of context and currency
Expand Down
3 changes: 3 additions & 0 deletions sale_order_import/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["whool"]
build-backend = "whool.buildapi"
5 changes: 5 additions & 0 deletions sale_order_import/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Alexis de Lattre \<<[email protected]>\>
- Dennis Sluijk \<<[email protected]>\>
- Andrea Stirpe \<<[email protected]>\>
- Simone Orsi \<<[email protected]>\>
- Duong (Tran Quoc) \<<[email protected]>\>
5 changes: 0 additions & 5 deletions sale_order_import/readme/CONTRIBUTORS.rst

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
The migration of this module from 13.0 to 16.0 was financially supported by Camptocamp
The migration of this module from 13.0 to 16.0 was financially supported
by Camptocamp
9 changes: 9 additions & 0 deletions sale_order_import/readme/DESCRIPTION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
This module adds support for the import of electronic RFQ or orders.
This module provides the base methods to import electronic orders, and
you can also plug additional formats by extending the wizard. It
requires additional modules to support specific order formats:

- module *sale_order_import_ubl*: adds support for [Universal Business
Language (UBL)](http://ubl.xml.org/) RFQs and orders as:
- XML file,
- PDF file with an embedded XML file.
7 changes: 0 additions & 7 deletions sale_order_import/readme/DESCRIPTION.rst

This file was deleted.

15 changes: 15 additions & 0 deletions sale_order_import/readme/USAGE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
This module adds a wizard in the sale menu named *Import RFQ or Order*.
This wizard will propose you to select the order or RFQ file. Depending
on the format of the file (XML or PDF) and the type of file (RFQ or
order), it may propose you additional options.

When you import an order, if there is a quotation in Odoo for the same
customer, the wizard will propose you to either update the existing
quotation or create a new order (in fact, it will create a new
quotation, so that you are free to make some modifications before you
click on the *Confirm Sale* button to convert the quotation to a sale
order).

Once the RFQ/order is imported, you should read the messages in the
chatter of the quotation because it may contain important information
about the import.
5 changes: 0 additions & 5 deletions sale_order_import/readme/USAGE.rst

This file was deleted.

45 changes: 31 additions & 14 deletions sale_order_import/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand All @@ -9,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
: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 @@ -275,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 @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

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

span.section-subtitle {
Expand Down Expand Up @@ -369,10 +369,14 @@ <h1 class="title">Sale Order Import</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:8f06d86294fc834191b72ff6e038d8b5298882b4df0baaf2d0f69699bd6d08cd
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/edi/tree/16.0/sale_order_import"><img alt="OCA/edi" src="https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/edi-16-0/edi-16-0-sale_order_import"><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/edi&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds support for the import of electronic RFQ or orders. This module provides the base methods to import electronic orders, and you can also plug additional formats by extending the wizard. It requires additional modules to support specific order formats:</p>
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/edi/tree/17.0/sale_order_import"><img alt="OCA/edi" src="https://img.shields.io/badge/github-OCA%2Fedi-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/edi-17-0/edi-17-0-sale_order_import"><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/edi&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds support for the import of electronic RFQ or orders.
This module provides the base methods to import electronic orders, and
you can also plug additional formats by extending the wizard. It
requires additional modules to support specific order formats:</p>
<ul class="simple">
<li>module <em>sale_order_import_ubl</em>: adds support for <a class="reference external" href="http://ubl.xml.org/">Universal Business Language (UBL)</a> RFQs and orders as:<ul>
<li>module <em>sale_order_import_ubl</em>: adds support for <a class="reference external" href="http://ubl.xml.org/">Universal Business
Language (UBL)</a> RFQs and orders as:<ul>
<li>XML file,</li>
<li>PDF file with an embedded XML file.</li>
</ul>
Expand All @@ -394,16 +398,26 @@ <h1 class="title">Sale Order Import</h1>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<p>This module adds a wizard in the sale menu named <em>Import RFQ or Order</em>. This wizard will propose you to select the order or RFQ file. Depending on the format of the file (XML or PDF) and the type of file (RFQ or order), it may propose you additional options.</p>
<p>When you import an order, if there is a quotation in Odoo for the same customer, the wizard will propose you to either update the existing quotation or create a new order (in fact, it will create a new quotation, so that you are free to make some modifications before you click on the <em>Confirm Sale</em> button to convert the quotation to a sale order).</p>
<p>Once the RFQ/order is imported, you should read the messages in the chatter of the quotation because it may contain important information about the import.</p>
<p>This module adds a wizard in the sale menu named <em>Import RFQ or Order</em>.
This wizard will propose you to select the order or RFQ file. Depending
on the format of the file (XML or PDF) and the type of file (RFQ or
order), it may propose you additional options.</p>
<p>When you import an order, if there is a quotation in Odoo for the same
customer, the wizard will propose you to either update the existing
quotation or create a new order (in fact, it will create a new
quotation, so that you are free to make some modifications before you
click on the <em>Confirm Sale</em> button to convert the quotation to a sale
order).</p>
<p>Once the RFQ/order is imported, you should read the messages in the
chatter of the quotation because it may contain important information
about the import.</p>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/edi/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/edi/issues/new?body=module:%20sale_order_import%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/edi/issues/new?body=module:%20sale_order_import%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
Expand All @@ -427,16 +441,19 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
</div>
<div class="section" id="other-credits">
<h2><a class="toc-backref" href="#toc-entry-6">Other credits</a></h2>
<p>The migration of this module from 13.0 to 16.0 was financially supported by Camptocamp</p>
<p>The migration of this module from 13.0 to 16.0 was financially supported
by Camptocamp</p>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-7">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>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/edi/tree/16.0/sale_order_import">OCA/edi</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/edi/tree/17.0/sale_order_import">OCA/edi</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
Expand Down
7 changes: 4 additions & 3 deletions sale_order_import/wizard/sale_order_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -558,9 +558,10 @@ def update_order_lines(self, parsed_order, order, price_source):
if price_source != "order":
new_price_unit = order.pricelist_id.with_context(
date=order.date_order, uom=oline.product_uom.id
)._price_get(oline.product_id, write_vals["product_uom_qty"],)[
order.pricelist_id.id
]
)._price_get(
oline.product_id,
write_vals["product_uom_qty"],
)[order.pricelist_id.id]
if float_compare(
new_price_unit, oline.price_unit, precision_digits=price_prec
):
Expand Down

0 comments on commit 464e5ff

Please sign in to comment.