From 086d7782e7b9d4089f04596a39bd967ac17d5708 Mon Sep 17 00:00:00 2001 From: Beate Trzensiok Date: Fri, 2 Sep 2022 11:59:54 +0200 Subject: [PATCH] =?UTF-8?q?Anpassung=20Zuschl=C3=A4ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auto_invoice_generator/auto_invoice_generator.json | 5 +++-- .../doctype/auto_invoice_generator/auto_invoice_generator.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/msp/msp/doctype/auto_invoice_generator/auto_invoice_generator.json b/msp/msp/doctype/auto_invoice_generator/auto_invoice_generator.json index 4018f53..9950c0c 100644 --- a/msp/msp/doctype/auto_invoice_generator/auto_invoice_generator.json +++ b/msp/msp/doctype/auto_invoice_generator/auto_invoice_generator.json @@ -33,7 +33,8 @@ { "fieldname": "close", "fieldtype": "Button", - "label": "Close" + "label": "Close", + "options": "close_invoiced_delivery_notes" }, { "fieldname": "invoices_from_delivery_notes_section", @@ -78,7 +79,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2022-08-29 14:44:35.107379", + "modified": "2022-09-02 11:56:18.512522", "modified_by": "Administrator", "module": "MSP", "name": "Auto Invoice Generator", diff --git a/msp/msp/doctype/auto_invoice_generator/auto_invoice_generator.py b/msp/msp/doctype/auto_invoice_generator/auto_invoice_generator.py index b906b80..d639c42 100644 --- a/msp/msp/doctype/auto_invoice_generator/auto_invoice_generator.py +++ b/msp/msp/doctype/auto_invoice_generator/auto_invoice_generator.py @@ -128,7 +128,7 @@ class AutoInvoiceGenerator(Document): print(dn["name"]) print(item.qty) print(item.uom) - if item.item_group == "Dienstleistungen" or item.item_group == "Anfahrten" or item.item_group == "Arbeitszeiten Techniker" or item.item_group == "Anwendungsentwicklung": + if item.item_group == "Dienstleistungen" or item.item_group == "Anfahrten" or item.item_group == "Arbeitszeiten Techniker" or item.item_group == "Zuschläge" or item.item_group == "Anwendungsentwicklung": service_items.append(invoice_doc_item) elif item.against_sales_order: sales_order_items.append(invoice_doc_item)