From a67441006d93b32577e2000db2fc10ad7e60dba9 Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Tue, 7 Dec 2021 10:39:11 +0100
Subject: [PATCH] new snippets

---
 addons/show_db_name                           |  2 +-
 addons/stock_logistics_workflow               |  2 +-
 ...ort_invoice_document.group_by_pickings.xml | 22 +++++++++++++------
 ...ice_document.replace_information_table.xml |  7 +++++-
 ...ort_invoice_document.sequence_in_table.xml |  2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/addons/show_db_name b/addons/show_db_name
index 18d18bec..9beaf503 160000
--- a/addons/show_db_name
+++ b/addons/show_db_name
@@ -1 +1 @@
-Subproject commit 18d18bec15374600d36d972f3ed7eaee0e2b13fc
+Subproject commit 9beaf503623b9f75a939f3fbc1275147c791f789
diff --git a/addons/stock_logistics_workflow b/addons/stock_logistics_workflow
index 8358e555..019dcd4a 160000
--- a/addons/stock_logistics_workflow
+++ b/addons/stock_logistics_workflow
@@ -1 +1 @@
-Subproject commit 8358e55547445c247bc1f3a770643a7e755b57b2
+Subproject commit 019dcd4abae8f57e176d3f63bf5762956cded918
diff --git a/snippets/account.report_invoice_document.group_by_pickings.xml b/snippets/account.report_invoice_document.group_by_pickings.xml
index 701342b2..07ab111f 100644
--- a/snippets/account.report_invoice_document.group_by_pickings.xml
+++ b/snippets/account.report_invoice_document.group_by_pickings.xml
@@ -1,22 +1,30 @@
 <?xml version="1.0"?>
 <data inherit_id="account.report_invoice_document">
 
-  <xpath expr="//t[@t-foreach='lines']" position="replace">
+  <xpath expr="//h2" position="before">
     <t t-set="pickings" t-value="[]"/>
     <t t-foreach="o.invoice_line_ids" t-as="line">
-      <t t-set="pickings" t-value="pickings+[line.picking_ids]"/>
+      <t t-if="'picking_ids' in line.fields_get()" t-set="pickings" t-value="pickings+[line.picking_ids]"/>
     </t>
+    <t t-set="has_multiple_pickings" t-value="len(pickings) > 1"/>
+  </xpath>
+
+  <xpath expr="//h2/span[1]" position="replace">
+    <span t-if="o.move_type == 'out_invoice' and o.state == 'posted' and not has_multiple_pickings">Rechnung</span>
+    <span t-if="o.move_type == 'out_invoice' and o.state == 'posted' and has_multiple_pickings">Sammelrechnung</span>
+  </xpath>
+
+  <xpath expr="//t[@t-foreach='lines']" position="replace">
     <t t-foreach="set(pickings)" t-as="picking">
-      <tr t-if="picking.name">
-        <td colspan="5">
+      <tr t-if="has_multiple_pickings and picking">
+        <td colspan="99" style="padding-top: 1rem;" >
           <strong t-esc="'Lieferung ' + picking.name.replace('WH/OUT/','')"/>
           <span> vom </span>
-          <span t-esc="picking.scheduled_date" t-options="{'widget': 'date'}"/>
-          <span>:</span>
+          <span t-esc="picking.scheduled_date" t-options="{'widget': 'date'}"/><span>:</span>
         </td>
       </tr>
       <t t-foreach="lines" t-as="line">
-        <t t-if="picking in line.picking_ids">
+        <t t-if="not has_multiple_pickings or (picking in line.picking_ids)">
           <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/>
           <t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/>
 
diff --git a/snippets/account.report_invoice_document.replace_information_table.xml b/snippets/account.report_invoice_document.replace_information_table.xml
index a0fa898c..49ba3ed8 100644
--- a/snippets/account.report_invoice_document.replace_information_table.xml
+++ b/snippets/account.report_invoice_document.replace_information_table.xml
@@ -2,7 +2,12 @@
 <data inherit_id="account.report_invoice_document" priority="50">
 
   <xpath expr="//*[@id='informations']" position="replace">
-
+    <style>
+      table#informations{
+        font-size: 0.8rem;
+        white-space: nowrap;
+      }
+    </style>
     <table id='informations' class="table table-borderless table-sm">
       <tr>
         <td class="text-right"><strong>Rechnungsdatum:</strong></td>
diff --git a/snippets/account.report_invoice_document.sequence_in_table.xml b/snippets/account.report_invoice_document.sequence_in_table.xml
index ff824131..fde8cffe 100644
--- a/snippets/account.report_invoice_document.sequence_in_table.xml
+++ b/snippets/account.report_invoice_document.sequence_in_table.xml
@@ -11,7 +11,7 @@
     <t t-set="index" t-value="1"/>
   </xpath>
   
-  <xpath expr="//table/tbody/t[4]/tr/t[1]/td[1]" position="before">
+  <xpath expr="//table/tbody//tr/t[1]/td[1]" position="before">
     <td>
       <span t-esc="index"/><t t-set="index" t-value="index+1"/>
     </td>