Merge PR #555 into 14.0

Signed-off-by aleuffre
OCA · Dec 20, 2023 · 6f5b03a · 6f5b03a
2 parents 954a098 + eb35a76
commit 6f5b03a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/purchase_sale_inter_company/README.rst b/purchase_sale_inter_company/README.rst
@@ -7,7 +7,7 @@ Inter Company Module for Purchase to Sale Order
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f53fd56fc79917557f2b5dc0ed78d6e8f6f277fd88ceee5dcf64323cf3a8252f
+   !! source digest: sha256:934c4171987df0050e7a4af775587a3a0ccf9a08d1a7c6b96c0076bdca6c6565
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/purchase_sale_inter_company/__manifest__.py b/purchase_sale_inter_company/__manifest__.py
@@ -22,4 +22,7 @@
         "views/res_config_view.xml",
         "wizard/stock_backorder_confirmation_views.xml",
     ],
+    "demo": [
+        "demo/res_partner_demo.xml",
+    ],
 }
diff --git a/purchase_sale_inter_company/demo/res_partner_demo.xml b/purchase_sale_inter_company/demo/res_partner_demo.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <!-- Technically a bug in `stock` module's demo data,
+    Just changing these fields to make it easier to test the module
+    The route for location "Inter-warehouse transit" doesn't exist
+    causing an error when creating the intercompany SO with demo data -->
+    <record id="stock.res_partner_address_41" model="res.partner">
+        <field name="property_stock_customer" ref="stock.stock_location_customers" />
+        <field name="property_stock_supplier" ref="stock.stock_location_suppliers" />
+    </record>
+
+</odoo>
diff --git a/purchase_sale_inter_company/static/description/index.html b/purchase_sale_inter_company/static/description/index.html
@@ -1,3 +1,4 @@
+<?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>
@@ -366,7 +367,7 @@ <h1 class="title">Inter Company Module for Purchase to Sale Order</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f53fd56fc79917557f2b5dc0ed78d6e8f6f277fd88ceee5dcf64323cf3a8252f
+!! source digest: sha256:934c4171987df0050e7a4af775587a3a0ccf9a08d1a7c6b96c0076bdca6c6565
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/multi-company/tree/14.0/purchase_sale_inter_company"><img alt="OCA/multi-company" src="https://img.shields.io/badge/github-OCA%2Fmulti--company-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/multi-company-14-0/multi-company-14-0-purchase_sale_inter_company"><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/multi-company&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 is useful if there are multiple companies in the same Odoo database and those companies sell goods or services among themselves.</p>