Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Oliver Walters 2021-03-10 13:16:53 +11:00
commit 4dc790eab8
4 changed files with 182 additions and 577 deletions

File diff suppressed because it is too large Load Diff

View File

@ -44,8 +44,9 @@
id='new_po_{{ supplier.id }}' id='new_po_{{ supplier.id }}'
title='Create new purchase order for {{ supplier.name }}' title='Create new purchase order for {{ supplier.name }}'
type='button' type='button'
supplierid='{{ supplier.id }}'
onclick='newPurchaseOrderFromOrderWizard()'> onclick='newPurchaseOrderFromOrderWizard()'>
<span supplier-id='{{ supplier.id }}' class='fas fa-plus-circle'></span> <span supplierid='{{ supplier.id }}' class='fas fa-plus-circle'></span>
</button> </button>
</td> </td>
<td> <td>

View File

@ -59,7 +59,7 @@ function newPurchaseOrderFromOrderWizard(e) {
var src = e.target || e.srcElement; var src = e.target || e.srcElement;
var supplier = $(src).attr('supplier-id'); var supplier = $(src).attr('supplierid');
launchModalForm("/order/purchase-order/new/", { launchModalForm("/order/purchase-order/new/", {
modal: '#modal-form-secondary', modal: '#modal-form-secondary',