bluedragon/dasaproject
1
0
Fork 0
mirror of https://github.com/bcomsugi/dasaproject.git synced 2026-01-09 15:22:37 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix messages layout

Browse Source
This commit is contained in:
Sugiarto 2024-01-06 05:11:16 +07:00
parent 612cf8fde5
commit dfda2dcfd6
5 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SO_to_Inv/readSO.py
View File

@ -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)

2
django/Invoice/templates/Invoice/so_details_form.html
View File

@ -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>

2
django/Invoice/templates/Invoice/so_list_form.html
View File

@ -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>

7
django/Invoice/views.py
View File

@ -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')

11
django/templates/base.html
View File

@ -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 -->