IMP

Author: AungKoKoLin1997

l10n_jp_summary_invoice_sale_partner/README.rst

@@ -28,7 +28,8 @@ Japan Summary Invoice Sale Partner
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module displays the sale partner in the summary invoice report.
+This module displays the sale order partner and the sale order shipping address per invoice
+in the summary invoice.
 
 .. IMPORTANT::
    This is an alpha version, the data model and design can change at any time without warning.
@@ -43,9 +44,19 @@ This module displays the sale partner in the summary invoice report.
 Configuration
 =============
 
+Go to *Invoicing/Accounting > Configuration > Settings* and update the following
+settings as necessary:
 
-- Go to *Invoicing/Accounting > Configuration > Settings*.
-- Choose the Summary Invoice Sale Partner Type as needed.
+- **Show Sale Order Partner**: If selected, the sales order partner will be shown for
+  each invoice in the summary invoice.
+- **Show Sale Order Shipping Partner**: If selected, the sales order shipping partner 
+  will be shown for each invoice in the summary invoice.
+
+Known issues / Roadmap
+======================
+
+This module cannot display the sale order partner and the sale order shipping address for
+each invoice line, nor at the summary invoice level.
 
 Bug Tracker
 ===========

l10n_jp_summary_invoice_sale_partner/models/__init__.py

@@ -1,3 +1,2 @@
-from . import account_move
 from . import res_company
 from . import res_config_settings

l10n_jp_summary_invoice_sale_partner/models/account_move.py

@@ -7,9 +7,11 @@
 class ResCompany(models.Model):
     _inherit = "res.company"
 
-    summary_invoice_sale_partner_type = fields.Selection(
-        selection=[
-            ("partner", "Sale Order Partner"),
-            ("delivery_address", "Sale Order Delivery Address"),
-        ],
+    show_sale_order_partner = fields.Boolean(
+        help="If enabled, the sales order partner will be displayed in the summary "
+        "invoice report lines.",
+    )
+    show_sale_order_shipping_partner = fields.Boolean(
+        help="If enabled, the sales order shipping partner will be displayed in the summary "
+        "invoice report lines.",
     )

l10n_jp_summary_invoice_sale_partner/models/res_company.py

@@ -7,6 +7,9 @@
 class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
-    summary_invoice_sale_partner_type = fields.Selection(
-        related="company_id.summary_invoice_sale_partner_type", readonly=False
+    show_sale_order_partner = fields.Boolean(
+        related="company_id.show_sale_order_partner", readonly=False
+    )
+    show_sale_order_shipping_partner = fields.Boolean(
+        related="company_id.show_sale_order_shipping_partner", readonly=False
     )

l10n_jp_summary_invoice_sale_partner/models/res_config_settings.py

@@ -1,3 +1,7 @@
+Go to *Invoicing/Accounting > Configuration > Settings* and update the following
+settings as necessary:
 
-- Go to *Invoicing/Accounting > Configuration > Settings*.
-- Choose the Summary Invoice Sale Partner Type as needed.
+- **Show Sale Order Partner**: If selected, the sales order partner will be shown for
+  each invoice in the summary invoice.
+- **Show Sale Order Shipping Partner**: If selected, the sales order shipping partner 
+  will be shown for each invoice in the summary invoice.

l10n_jp_summary_invoice_sale_partner/readme/CONFIGURE.rst

@@ -1 +1,2 @@
-This module displays the sale partner in the summary invoice report.
+This module displays the sale order partner and the sale order shipping address per invoice
+in the summary invoice.

l10n_jp_summary_invoice_sale_partner/readme/DESCRIPTION.rst

@@ -0,0 +1,2 @@
+This module cannot display the sale order partner and the sale order shipping address for
+each invoice line, nor at the summary invoice level.

l10n_jp_summary_invoice_sale_partner/readme/ROADMAP.rst

@@ -4,14 +4,22 @@
         inherit_id="l10n_jp_summary_invoice.bill_line_section_layout"
     >
         <xpath expr="//tr[td/span[@t-field='invoice.invoice_date']]" position="after">
+
+            <t t-if="o.company_id.show_sale_order_partner and invoice.partner_sale_id">
+                <tr>
+                    <td t-att-colspan="line_columns">
+                        <strong>Sold-to:</strong>
+                        <span t-field="invoice.partner_sale_id" />
+                    </td>
+                </tr>
+            </t>
             <t
-                t-set="sale_partner"
-                t-value="invoice.get_summary_invoice_sale_partner()"
-            />
-            <t t-if="sale_partner">
+                t-if="o.company_id.show_sale_order_shipping_partner and invoice.partner_shipping_id"
+            >
                 <tr>
                     <td t-att-colspan="line_columns">
-                        <span t-field="sale_partner.name" />
+                        <strong>Shipping Address:</strong>
+                        <span t-field="invoice.partner_shipping_id" />
                     </td>
                 </tr>
             </t>

l10n_jp_summary_invoice_sale_partner/reports/report_summary_invoice_templates.xml

@@ -369,7 +369,8 @@ <h1 class="title">Japan Summary Invoice Sale Partner</h1>
 !! source digest: sha256:cda469d4f57d8a01ed1bf6cbf8cca8a27f7252a0d6b33c83d1a0defe5b0d7e86
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.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-japan/tree/16.0/l10n_jp_summary_invoice_sale_partner"><img alt="OCA/l10n-japan" src="https://img.shields.io/badge/github-OCA%2Fl10n--japan-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/l10n-japan-16-0/l10n-japan-16-0-l10n_jp_summary_invoice_sale_partner"><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-japan&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 displays the sale partner in the summary invoice report.</p>
+<p>This module displays the sale order partner and the sale order shipping address per invoice
+in the summary invoice.</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
 <p class="last">This is an alpha version, the data model and design can change at any time without warning.
@@ -380,39 +381,49 @@ <h1 class="title">Japan Summary Invoice Sale Partner</h1>
 <div class="contents local topic" id="contents">
 <ul class="simple">
 <li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-5">Maintainers</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-2">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="configuration">
 <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
+<p>Go to <em>Invoicing/Accounting &gt; Configuration &gt; Settings</em> and update the following
+settings as necessary:</p>
 <ul class="simple">
-<li>Go to <em>Invoicing/Accounting &gt; Configuration &gt; Settings</em>.</li>
-<li>Choose the Summary Invoice Sale Partner Type as needed.</li>
+<li><strong>Show Sale Order Partner</strong>: If selected, the sales order partner will be shown for
+each invoice in the summary invoice.</li>
+<li><strong>Show Sale Order Shipping Partner</strong>: If selected, the sales order shipping partner
+will be shown for each invoice in the summary invoice.</li>
 </ul>
 </div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#toc-entry-2">Known issues / Roadmap</a></h1>
+<p>This module cannot display the sale order partner and the sale order shipping address for
+each invoice line, nor at the summary invoice level.</p>
+</div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/l10n-japan/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/l10n-japan/issues/new?body=module:%20l10n_jp_summary_invoice_sale_partner%0Aversion:%2016.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">
-<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <ul class="simple">
 <li>Quartile</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-6">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>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose