diff --git a/SO_to_Inv/readSO.py b/SO_to_Inv/readSO.py
index f7895b4..2d94296 100644
--- a/SO_to_Inv/readSO.py
+++ b/SO_to_Inv/readSO.py
@@ -409,18 +409,22 @@ class SalesOrderQuery:
                     if 'Sales' in ItemFullName and 'Disc' in ItemFullName:
                         continue    #skip this sales discount line
                     Quantity = SalesOrderLineRet.find('Quantity').text
-                    UnitOfMeasure = SalesOrderLineRet.find('UnitOfMeasure').text
+                    UnitOfMeasure = SalesOrderLineRet.find('UnitOfMeasure')
+                    if UnitOfMeasure is None:
+                        print("No UOM")
+                    else:
+                        UnitOfMeasure = UnitOfMeasure.text
 
-                    ### modified if UOM has ConvertQTY: '_' or ' of '-> in OverrideUOMSetRef
-                    if '_' in UnitOfMeasure:
-                        convertQTY = int(UnitOfMeasure.split('_')[1])
-                    OverrideUOMSetRef = SalesOrderLineRet.find('OverrideUOMSetRef/FullName')
-                    if OverrideUOMSetRef != None:
-                        OverrideUOMSetRef = OverrideUOMSetRef.text
-                        if 'of' in OverrideUOMSetRef and UnitOfMeasure.upper() == 'BOX':
-                            convertQTY = int(OverrideUOMSetRef.split('of')[1])
-                            print(f'OverrideUOMSetRef:{OverrideUOMSetRef}')
-                    ###
+                        ### modified if UOM has ConvertQTY: '_' or ' of '-> in OverrideUOMSetRef
+                        if '_' in UnitOfMeasure:
+                            convertQTY = int(UnitOfMeasure.split('_')[1])
+                        OverrideUOMSetRef = SalesOrderLineRet.find('OverrideUOMSetRef/FullName')
+                        if OverrideUOMSetRef != None:
+                            OverrideUOMSetRef = OverrideUOMSetRef.text
+                            if 'of' in OverrideUOMSetRef and UnitOfMeasure.upper() == 'BOX':
+                                convertQTY = int(OverrideUOMSetRef.split('of')[1])
+                                print(f'OverrideUOMSetRef:{OverrideUOMSetRef}')
+                        ###
 
                     Rate = Decimal(SalesOrderLineRet.find('Rate').text)
                     Amount = Decimal(SalesOrderLineRet.find('Amount').text)
diff --git a/django/Invoice/templates/Invoice/so_details_form.html b/django/Invoice/templates/Invoice/so_details_form.html
index 56fe7e2..5e62790 100644
--- a/django/Invoice/templates/Invoice/so_details_form.html
+++ b/django/Invoice/templates/Invoice/so_details_form.html
@@ -103,7 +103,7 @@
             </div>
         </div>
         <div class="modal-footer">
-            <button type="submit" class="btn btn-primary mt-2 me-2 ms-2" id="id_btnsave" >Save</button>
+            <button type="submit" class="btn btn-primary mt-2 me-2 ms-2" id="id_btnsave" >Save to Invoice</button>
         </div>
     </form>
 </div>
diff --git a/django/Invoice/templates/Invoice/so_list_form.html b/django/Invoice/templates/Invoice/so_list_form.html
index 8bb5d21..9d7fb31 100644
--- a/django/Invoice/templates/Invoice/so_list_form.html
+++ b/django/Invoice/templates/Invoice/so_list_form.html
@@ -40,7 +40,7 @@
             </div>
         </div>
         <div class="modal-footer">
-            <button type="submit" class="btn btn-primary mt-2 me-2 ms-2" id="id_btnsave" >Save</button>
+            <button type="submit" class="btn btn-primary mt-2 me-2 ms-2" id="id_btnsave" >Choose</button>
         </div>
     </form>
 </div>
diff --git a/django/Invoice/views.py b/django/Invoice/views.py
index 2c83afe..3ccd633 100644
--- a/django/Invoice/views.py
+++ b/django/Invoice/views.py
@@ -410,11 +410,14 @@ 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']}<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())}")
+                    balance_remaining = "{:,}".format(float(saved_inv['BalanceRemaining']))
+                    date_format = '%Y-%m-%d'
+                    date_obj = datetime.strptime(saved_inv['TxnDate'], date_format).strftime('%d %b %Y')
+                    messages.success(request, f"Customer : {saved_inv['Customer_FullName']}<br>Invoice No : {saved_inv['RefNumber']} &emsp; Date : {date_obj}<br>Invoice Amount : Rp. {balance_remaining}<br> Is SAVED with link to SO No. : {unique(df['RefNumber'].to_list())}<br>it takes {round(timeit.default_timer() - starttime, 4)} secs")
                     
                     # messages.info(request, 'Invoice Has Been SAVED2')
                 else:
-                    messages.warning(request, f"")
+                    messages.warning(request, f"Error saving SO No. {unique(df['RefNumber'].to_list())}<br>Status: {status_msg}")
                 print("The time difference finish Save Inv is :", timeit.default_timer() - starttime)
 
                 return redirect('Invoice:show_customer')
diff --git a/django/templates/base.html b/django/templates/base.html
index e8f603e..43d4691 100644
--- a/django/templates/base.html
+++ b/django/templates/base.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 {% load static %}
 {% load tz %}
+
 <html lang="en">
 <head>
     <meta charset="UTF-8">
@@ -96,17 +97,19 @@
           </div>
         </div>
       </nav>
+
       {% if messages %}
       {% for message in messages %}
       <div class="alert alert-{{ message.tags }} alert-dismissible fade show" role="alert">
-        <strong>{{message | safe}}</strong>
+        {{message | safe}}
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
       </div>
       {% endfor %}
       {% endif %}
-        <div>
-    {% block body %}{% endblock body %}
-        </div>
+
+      <div>
+      {% block body %}{% endblock body %}
+      </div>
 
   
   <!-- Modal -->