From 612cf8fde58c120255c3accbcf3d8ac4ccd72c4d Mon Sep 17 00:00:00 2001
From: bcomsugi <bcomsugi@yahoo.com>
Date: Sat, 6 Jan 2024 04:11:04 +0700
Subject: [PATCH] fix sales discount salesorderlineret skip

---
 SO_to_Inv/readSO.py     | 4 +++-
 django/Invoice/views.py | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SO_to_Inv/readSO.py b/SO_to_Inv/readSO.py
index 38843fc..f7895b4 100644
--- a/SO_to_Inv/readSO.py
+++ b/SO_to_Inv/readSO.py
@@ -402,10 +402,12 @@ class SalesOrderQuery:
                     ItemFullName = SalesOrderLineRet.find('ItemRef/FullName')
                     if ItemFullName is None:
                         print("no itemfullname")
-                        continue
+                        continue    #skip this orderline
                     else:
                         ItemFullName=ItemFullName.text
                     # print(ItemFullName)
+                    if 'Sales' in ItemFullName and 'Disc' in ItemFullName:
+                        continue    #skip this sales discount line
                     Quantity = SalesOrderLineRet.find('Quantity').text
                     UnitOfMeasure = SalesOrderLineRet.find('UnitOfMeasure').text
 
diff --git a/django/Invoice/views.py b/django/Invoice/views.py
index 0d00e8a..2c83afe 100644
--- a/django/Invoice/views.py
+++ b/django/Invoice/views.py
@@ -410,7 +410,7 @@ def save_inv(request):
                     saved_inv = ini.get_saved_refnumber(result)
                     print(saved_inv)
                     # context['messages']=[{"alert":"info", "message": "invoice Is Good"}]
-                    messages.success(request, f"Customer:{saved_inv['Customer_FullName']}\nInvoice No: {saved_inv['RefNumber']}  Date: {saved_inv['TxnDate']}\nAmount Invoiced: {saved_inv['BalanceRemaining']}\n Has Been SAVED with link SO No. : {unique(df['RefNumber'].to_list())}")
+                    messages.success(request, f"Customer:{saved_inv['Customer_FullName']}<br>Invoice No: {saved_inv['RefNumber']}  Date: {saved_inv['TxnDate']}<br>Invoice Amount: {saved_inv['BalanceRemaining']}<br> Is SAVED with link to SO No. : {unique(df['RefNumber'].to_list())}")
                     
                     # messages.info(request, 'Invoice Has Been SAVED2')
                 else:
@@ -510,7 +510,7 @@ def prepare_data(request):
                     messages.warning(request, f"Saving Not Success. status: {msg}")
                     print(f"Saving Not Success. status: {msg}")
             if ret:
-                messages.info(request, "<p> You are <em>pretty</em><br> smart</p>")
+                # messages.info(request, "<p> You are <em>pretty</em><br> smart</p>")
                 messages.info(request, f"{subject} has been updated Successfully in {round(timeit.default_timer() - starttime, 4)} seconds. {FullName}")
 
         else: