From 5455d7501e580cd27d5c0ab5a0bba485825994d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Tue, 4 Jun 2024 07:52:29 +0200 Subject: [PATCH 01/14] [add] first steps for packing list --- nfu_ekg_stock/README.rst | 4 +++- nfu_ekg_stock/__manifest__.py | 9 ++++++-- nfu_ekg_stock/readme/HISTORY.rst | 4 +++- nfu_ekg_stock/report/stock_report_views.xml | 19 +++++++++++++--- nfu_ekg_stock/static/description/index.html | 11 +++------ nfu_ekg_stock/views/report_packing_list.xml | 25 +++++++++++++++++++++ 6 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 nfu_ekg_stock/views/report_packing_list.xml diff --git a/nfu_ekg_stock/README.rst b/nfu_ekg_stock/README.rst index fd08dd9..0340d2b 100644 --- a/nfu_ekg_stock/README.rst +++ b/nfu_ekg_stock/README.rst @@ -34,7 +34,9 @@ Changelog ========= -:1.0.0: Initial module. +:1.0.0 Initial module. +:1.0.1 Add EKG Delivery Sip +:1.0.0 Add Packing List Bug Tracker =========== diff --git a/nfu_ekg_stock/__manifest__.py b/nfu_ekg_stock/__manifest__.py index 62294a8..c2260ed 100644 --- a/nfu_ekg_stock/__manifest__.py +++ b/nfu_ekg_stock/__manifest__.py @@ -4,9 +4,14 @@ "author": "BAKEUP", "website": "https://www.bakeup.org", "category": "Stock", - "version": "16.0.1.0.1", + "version": "16.0.1.0.2", "depends": ["stock"], - "data": ["views/report_deliveryslip.xml", "views/report_deliveryslip_compact.xml", "report/stock_report_views.xml"], + "data": [ + "views/report_deliveryslip.xml", + "views/report_deliveryslip_compact.xml", + "views/report_packing_list.xml", + "report/stock_report_views.xml", + ], "assets": {"web.report_assets_common": ["nfu_ekg_stock/static/src/scss/report_stock_rule.scss"]}, "license": "LGPL-3", "application": True, diff --git a/nfu_ekg_stock/readme/HISTORY.rst b/nfu_ekg_stock/readme/HISTORY.rst index 962941f..4fc6b90 100644 --- a/nfu_ekg_stock/readme/HISTORY.rst +++ b/nfu_ekg_stock/readme/HISTORY.rst @@ -1,2 +1,4 @@ -:1.0.0: Initial module. \ No newline at end of file +:1.0.0 Initial module. +:1.0.1 Add EKG Delivery Sip +:1.0.0 Add Packing List \ No newline at end of file diff --git a/nfu_ekg_stock/report/stock_report_views.xml b/nfu_ekg_stock/report/stock_report_views.xml index a5f1605..38aec46 100644 --- a/nfu_ekg_stock/report/stock_report_views.xml +++ b/nfu_ekg_stock/report/stock_report_views.xml @@ -1,11 +1,24 @@ + + EKG Packing List + stock.picking + qweb-html + nfu_ekg_stock.report_ekg_packing_list + nfu_ekg_stock.report_packing_list + 'EKG Packing List - %s - %s' % (object.partner_id.name or '', object.name) + + report + + EKG Delivery Slip stock.picking qweb-pdf nfu_ekg_stock.report_ekg_deliveryslip - nfu_ekg_stock.report_ekg_deliveryslip + nfu_ekg_stock.report_deliveryslip 'EKG Delivery Slip - %s - %s' % (object.partner_id.name or '', object.name) @@ -18,12 +31,12 @@ stock.picking qweb-pdf nfu_ekg_stock.report_ekg_deliveryslip_compact - nfu_ekg_stock.report_ekg_deliveryslip_compact + nfu_ekg_stock.report_deliveryslip_compact 'EKG Delivery Slip Compact - %s - %s' % (object.partner_id.name or '', object.name) report - + diff --git a/nfu_ekg_stock/static/description/index.html b/nfu_ekg_stock/static/description/index.html index c2869fb..197c8a8 100644 --- a/nfu_ekg_stock/static/description/index.html +++ b/nfu_ekg_stock/static/description/index.html @@ -386,14 +386,9 @@ ul.auto-toc {

Changelog

- --- - - - -
1.0.0:Initial module.
+

:1.0.0 Initial module. +:1.0.1 Add EKG Delivery Sip +:1.0.0 Add Packing List

Bug Tracker

diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml new file mode 100644 index 0000000..1345d49 --- /dev/null +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -0,0 +1,25 @@ + + + + From 301833787b7fb5201381b36c889b5cb24f38b974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Br=C3=BCck?= Date: Tue, 4 Jun 2024 17:57:35 +1000 Subject: [PATCH 02/14] Basic table layout, TODO pagination --- nfu_ekg_stock/report/stock_report_views.xml | 14 ++++++++++++++ nfu_ekg_stock/views/report_packing_list.xml | 21 +++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/nfu_ekg_stock/report/stock_report_views.xml b/nfu_ekg_stock/report/stock_report_views.xml index 38aec46..a6ff137 100644 --- a/nfu_ekg_stock/report/stock_report_views.xml +++ b/nfu_ekg_stock/report/stock_report_views.xml @@ -1,9 +1,23 @@ + + + Custom Paperformat for the packaging list report + + + A4 + Landscape + 10 + 8 + 5 + 5 + 90 + EKG Packing List stock.picking qweb-html + nfu_ekg_stock.report_ekg_packing_list nfu_ekg_stock.report_packing_list + + + + - + - - - + + + + + + + +
Product
+ +
From ca9da99bcde70b8b548ceafc6b82a7ac0600e31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Br=C3=BCck?= Date: Tue, 4 Jun 2024 18:03:01 +1000 Subject: [PATCH 03/14] Basic table layout with pagination --- nfu_ekg_stock/views/report_packing_list.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index 1fc6eb1..8f87f3e 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -7,12 +7,12 @@ - + - + @@ -20,7 +20,7 @@ - + @@ -28,6 +28,7 @@
Product
+ From 18bdaa3cbad6564d0b53ca7093a8325e508342b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Tue, 4 Jun 2024 13:42:10 +0200 Subject: [PATCH 04/14] [imp] add pagination and pagebreak --- nfu_ekg_stock/views/report_packing_list.xml | 30 +++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index 8f87f3e..030266a 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -4,30 +4,44 @@ - + - - + + +
+
- - - + + + + - + + +
ProductProduct
- +
+
From 1b383c6d14ff91dd03b803b289cc1c8de62db4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Tue, 4 Jun 2024 13:50:17 +0200 Subject: [PATCH 05/14] [imp] adjust pagination and product width --- nfu_ekg_stock/views/report_packing_list.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index 030266a..d5dc5a0 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -9,7 +9,7 @@ t-value="docs.filtered(lambda p:p.partner_id).mapped('move_ids').filtered(lambda x: x.product_uom_qty)" /> - + - Product + Product From 758501a645d6829707dee5f4457c17a2219e0850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Wed, 5 Jun 2024 19:14:59 +0200 Subject: [PATCH 06/14] [imp] remove zeros and make table width fit --- nfu_ekg_stock/views/report_packing_list.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index d5dc5a0..9ab9679 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -15,15 +15,14 @@ t-value="[partners[i:i+pagination] for i in range(0, len(partners), pagination)]" /> -
- +
+
- @@ -31,12 +30,13 @@ - From d89102e6d04db730af37119607d82cf5df3639ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Thu, 6 Jun 2024 19:00:08 +0200 Subject: [PATCH 07/14] [imp] Shorten lastname und fix width and truncate text --- nfu_ekg_stock/__manifest__.py | 2 +- .../static/src/scss/report_stock_rule.scss | 11 +++++++++++ nfu_ekg_stock/views/report_packing_list.xml | 15 ++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/nfu_ekg_stock/__manifest__.py b/nfu_ekg_stock/__manifest__.py index c2260ed..6423ef2 100644 --- a/nfu_ekg_stock/__manifest__.py +++ b/nfu_ekg_stock/__manifest__.py @@ -5,7 +5,7 @@ "website": "https://www.bakeup.org", "category": "Stock", "version": "16.0.1.0.2", - "depends": ["stock"], + "depends": ["stock", "partner_firstname"], "data": [ "views/report_deliveryslip.xml", "views/report_deliveryslip_compact.xml", diff --git a/nfu_ekg_stock/static/src/scss/report_stock_rule.scss b/nfu_ekg_stock/static/src/scss/report_stock_rule.scss index f2428fa..1af5638 100644 --- a/nfu_ekg_stock/static/src/scss/report_stock_rule.scss +++ b/nfu_ekg_stock/static/src/scss/report_stock_rule.scss @@ -5,6 +5,17 @@ th.fit { min-width: fit-content; } +th.partner { + min-width: 80px; + max-width: 80px; + white-space: nowrap; + text-align: left; +} + +td.product { + max-width: 160px; +} + .scissors { width: 100%; border-top: 3px dashed black; diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index 9ab9679..cdefb4b 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -9,25 +9,30 @@ t-value="docs.filtered(lambda p:p.partner_id).mapped('move_ids').filtered(lambda x: x.product_uom_qty)" /> - +
-
Product
- +
+
- + + - + - + + @@ -32,7 +32,11 @@ - - + + - + - - + + From 3b4b3f49ff6a855c1b69aad4ac61dc75e668198a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Mon, 1 Jul 2024 21:37:31 +0200 Subject: [PATCH 12/14] [imp] add batch information to delivery slip and some formating --- nfu_ekg_stock/report/stock_report_views.xml | 2 +- .../static/src/scss/report_stock_rule.scss | 14 ++++++++---- nfu_ekg_stock/views/report_deliveryslip.xml | 22 +++++++++---------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/nfu_ekg_stock/report/stock_report_views.xml b/nfu_ekg_stock/report/stock_report_views.xml index dc4299b..cb29d21 100644 --- a/nfu_ekg_stock/report/stock_report_views.xml +++ b/nfu_ekg_stock/report/stock_report_views.xml @@ -30,7 +30,7 @@ EKG Delivery Slip stock.picking - qweb-pdf + qweb-html nfu_ekg_stock.report_ekg_deliveryslip nfu_ekg_stock.report_deliveryslip
-
+
-
ProductProductBatch Size
kjhajdshlsadh
+ .
Date: Thu, 6 Jun 2024 19:13:53 +0200 Subject: [PATCH 08/14] [imp] add german translation --- nfu_ekg_stock/i18n/de.po | 82 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 nfu_ekg_stock/i18n/de.po diff --git a/nfu_ekg_stock/i18n/de.po b/nfu_ekg_stock/i18n/de.po new file mode 100644 index 0000000..305dcfa --- /dev/null +++ b/nfu_ekg_stock/i18n/de.po @@ -0,0 +1,82 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * nfu_ekg_stock +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-06-06 17:06+0000\n" +"PO-Revision-Date: 2024-06-06 19:10+0200\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.4.2\n" + +#. module: nfu_ekg_stock +#: model:ir.actions.report,print_report_name:nfu_ekg_stock.action_report_ekg_delivery +msgid "" +"'EKG Delivery Slip - %s - %s' % (object.partner_id.name or '', object.name)" +msgstr "" +"'EKG Lieferschein - %s - %s' % (object.partner_id.name or '', object.name)" + +#. module: nfu_ekg_stock +#: model:ir.actions.report,print_report_name:nfu_ekg_stock.action_report_ekg_delivery_compact +msgid "" +"'EKG Delivery Slip Compact - %s - %s' % (object.partner_id.name or '', " +"object.name)" +msgstr "" +"'EKG kompakter Lieferschein - %s - %s' % (object.partner_id.name or '', " +"object.name)" + +#. module: nfu_ekg_stock +#: model:ir.actions.report,print_report_name:nfu_ekg_stock.action_report_ekg_packing_list +msgid "" +"'EKG Packing List - %s - %s' % (object.partner_id.name or '', object.name)" +msgstr "" +"'EKG Packliste - %s - %s' % (object.partner_id.name or '', object.name)" + +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_document +msgid "Batch Size" +msgstr "Gebindegröße" + +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_document +msgid "Ordered" +msgstr "Bestellt" + +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_document +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_packing_list +msgid "Product" +msgstr "Produkt" + +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_compact_document +msgid "Qty" +msgstr "Menge" + +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_document +msgid "Signature" +msgstr "Unterschrift" + +#. module: nfu_ekg_stock +#: model:ir.actions.report,name:nfu_ekg_stock.action_report_ekg_delivery +msgid "EKG Delivery Slip" +msgstr "EKG Lieferschein" + +#. module: nfu_ekg_stock +#: model:ir.actions.report,name:nfu_ekg_stock.action_report_ekg_delivery_compact +msgid "EKG Delivery Slip Compact" +msgstr "EKG kompakter Lieferschein" + +#. module: nfu_ekg_stock +#: model:ir.actions.report,name:nfu_ekg_stock.action_report_ekg_packing_list +msgid "EKG Packing List" +msgstr "EKG Packliste" From db70241fbb3d9ec6ac1d3c4987b25f2df586c2d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Thu, 6 Jun 2024 19:18:52 +0200 Subject: [PATCH 09/14] [fix] switch back to pdf report --- nfu_ekg_stock/report/stock_report_views.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfu_ekg_stock/report/stock_report_views.xml b/nfu_ekg_stock/report/stock_report_views.xml index a6ff137..dc4299b 100644 --- a/nfu_ekg_stock/report/stock_report_views.xml +++ b/nfu_ekg_stock/report/stock_report_views.xml @@ -16,7 +16,7 @@ EKG Packing List stock.picking - qweb-html + qweb-pdf nfu_ekg_stock.report_ekg_packing_list nfu_ekg_stock.report_packing_list From ef77c4ff3274f6f4fab2ee7db81e32c63808d2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Fri, 14 Jun 2024 21:58:14 +0200 Subject: [PATCH 10/14] [imp] add packaging to pack list --- nfu_ekg_stock/views/report_packing_list.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index cdefb4b..1f81872 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -24,7 +24,7 @@
kjhajdshlsadh
+ />
.
+ + + + + Date: Mon, 1 Jul 2024 18:54:24 +0200 Subject: [PATCH 11/14] [imp] add internal reference and cr changes --- .../static/src/scss/report_stock_rule.scss | 15 +++++++++++++++ nfu_ekg_stock/views/report_packing_list.xml | 18 ++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/nfu_ekg_stock/static/src/scss/report_stock_rule.scss b/nfu_ekg_stock/static/src/scss/report_stock_rule.scss index 1af5638..b85adf4 100644 --- a/nfu_ekg_stock/static/src/scss/report_stock_rule.scss +++ b/nfu_ekg_stock/static/src/scss/report_stock_rule.scss @@ -12,8 +12,23 @@ th.partner { text-align: left; } +th.code { + max-width: 60px; +} + td.product { max-width: 160px; + font-size: smaller; +} + +td.packaging { + max-width: 160px; + font-size: x-small; +} + +td.code { + max-width: 60px; + font-size: xx-small; } .scissors { diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index 1f81872..daf0e7f 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -20,21 +20,23 @@
ProductBatch SizeInternal
Reference		Batch Size

- .
+
+ +
+ - +
+
- - - + + + - - From 0fb12905eac3b01696779f3c46f4235b2b1c0514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Mon, 1 Jul 2024 22:21:33 +0200 Subject: [PATCH 13/14] [fix] width with german translation and make everything pdf again --- nfu_ekg_stock/i18n/de.po | 34 +++++++++++++------ nfu_ekg_stock/report/stock_report_views.xml | 2 +- .../static/src/scss/report_stock_rule.scss | 15 ++++---- nfu_ekg_stock/views/report_deliveryslip.xml | 9 +++-- nfu_ekg_stock/views/report_packing_list.xml | 6 ++-- 5 files changed, 41 insertions(+), 25 deletions(-) diff --git a/nfu_ekg_stock/i18n/de.po b/nfu_ekg_stock/i18n/de.po index 305dcfa..96ced53 100644 --- a/nfu_ekg_stock/i18n/de.po +++ b/nfu_ekg_stock/i18n/de.po @@ -6,16 +6,16 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-06 17:06+0000\n" -"PO-Revision-Date: 2024-06-06 19:10+0200\n" +"POT-Creation-Date: 2024-07-01 20:16+0000\n" +"PO-Revision-Date: 2024-07-01 22:18+0200\n" "Last-Translator: \n" "Language-Team: \n" -"Language: de\n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.4.4\n" #. module: nfu_ekg_stock #: model:ir.actions.report,print_report_name:nfu_ekg_stock.action_report_ekg_delivery @@ -40,6 +40,11 @@ msgid "" msgstr "" "'EKG Packliste - %s - %s' % (object.partner_id.name or '', object.name)" +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_document +msgid "Available" +msgstr "Verfügbar" + #. module: nfu_ekg_stock #: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_document msgid "Batch Size" @@ -47,12 +52,6 @@ msgstr "Gebindegröße" #. module: nfu_ekg_stock #: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_document -msgid "Ordered" -msgstr "Bestellt" - -#. module: nfu_ekg_stock -#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_delivery_document -#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_packing_list msgid "Product" msgstr "Produkt" @@ -66,6 +65,11 @@ msgstr "Menge" msgid "Signature" msgstr "Unterschrift" +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_packing_list +msgid "Batch
Size" +msgstr "Gebinde
größe" + #. module: nfu_ekg_stock #: model:ir.actions.report,name:nfu_ekg_stock.action_report_ekg_delivery msgid "EKG Delivery Slip" @@ -80,3 +84,13 @@ msgstr "EKG kompakter Lieferschein" #: model:ir.actions.report,name:nfu_ekg_stock.action_report_ekg_packing_list msgid "EKG Packing List" msgstr "EKG Packliste" + +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_packing_list +msgid "Internal
Reference" +msgstr "Artikel
nummer" + +#. module: nfu_ekg_stock +#: model_terms:ir.ui.view,arch_db:nfu_ekg_stock.report_ekg_packing_list +msgid "Product" +msgstr "Produkt" diff --git a/nfu_ekg_stock/report/stock_report_views.xml b/nfu_ekg_stock/report/stock_report_views.xml index cb29d21..dc4299b 100644 --- a/nfu_ekg_stock/report/stock_report_views.xml +++ b/nfu_ekg_stock/report/stock_report_views.xml @@ -30,7 +30,7 @@ EKG Delivery Slip stock.picking - qweb-html + qweb-pdf nfu_ekg_stock.report_ekg_deliveryslip nfu_ekg_stock.report_deliveryslip
Batch SizeProductOrderedBatch SizeProductAvailable
- - - + + + + @@ -36,8 +36,8 @@

- + + - -


+ - -

+ t-field="move.description_picking" + /> 		diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index daf0e7f..a27202c 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -19,9 +19,9 @@ - - - + + +
ProductInternal
Reference		Batch SizeProductInternal
Reference		Batch
Size

From 2e10b1d1ba72ffefc25d88da9c476bce17f1ed8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Wed, 10 Jul 2024 14:06:27 +0200 Subject: [PATCH 14/14] [add] Lastname first reports --- nfu_ekg_stock/report/stock_report_views.xml | 30 ++++++++- nfu_ekg_stock/views/report_deliveryslip.xml | 19 +++++- nfu_ekg_stock/views/report_packing_list.xml | 70 +++++++++++++-------- 3 files changed, 91 insertions(+), 28 deletions(-) diff --git a/nfu_ekg_stock/report/stock_report_views.xml b/nfu_ekg_stock/report/stock_report_views.xml index dc4299b..f70dfad 100644 --- a/nfu_ekg_stock/report/stock_report_views.xml +++ b/nfu_ekg_stock/report/stock_report_views.xml @@ -13,6 +13,7 @@ 5 90 + EKG Packing List stock.picking @@ -27,6 +28,20 @@ report + + EKG Packing List LF + stock.picking + qweb-pdf + + nfu_ekg_stock.report_ekg_packing_list_lf + nfu_ekg_stock.report_packing_list + 'EKG Packing List - %s - %s' % (object.partner_id.name or '', object.name) + + report + + EKG Delivery Slip stock.picking @@ -35,7 +50,20 @@ nfu_ekg_stock.report_deliveryslip 'EKG Delivery Slip - %s - %s' % (object.partner_id.name or '', object.name) + >'EKG Delivery Slip - %s, %s - %s' % (object.partner_id.lastname or '',object.partner_id.firstname or '', object.name) + + report + + + + EKG Delivery Slip LF + stock.picking + qweb-pdf + nfu_ekg_stock.report_ekg_deliveryslip_lf + nfu_ekg_stock.report_deliveryslip + 'EKG Delivery Slip - %s, %s - %s' % (object.partner_id.lastname or '',object.partner_id.firstname or '', object.name) report diff --git a/nfu_ekg_stock/views/report_deliveryslip.xml b/nfu_ekg_stock/views/report_deliveryslip.xml index 6dc902c..1f8adfd 100644 --- a/nfu_ekg_stock/views/report_deliveryslip.xml +++ b/nfu_ekg_stock/views/report_deliveryslip.xml @@ -9,7 +9,12 @@
- + + , + + + +
@@ -67,4 +72,16 @@ + + + diff --git a/nfu_ekg_stock/views/report_packing_list.xml b/nfu_ekg_stock/views/report_packing_list.xml index a27202c..8161f45 100644 --- a/nfu_ekg_stock/views/report_packing_list.xml +++ b/nfu_ekg_stock/views/report_packing_list.xml @@ -1,21 +1,16 @@ -