Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 10:10:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added check to ensure expense currency matches client\invoice currency

Browse Source
This commit is contained in:
Hillel Coren 2016-01-31 15:21:12 +02:00
parent 646c239cd8
commit e3a2605d3e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/invoices/edit.blade.php
View File

@ -52,7 +52,7 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body" style="padding-bottom: 0px;"> <div class="panel-body" style="padding-bottom: 0px;">
<div class="row" style="min-height:195px" onkeypress="formEnterClick(event)"> <div class="row" style="min-height:195px" onkeypress="formEnterClick(event)" onsubmit="onSubmit()">
<div class="col-md-4" id="col_1"> <div class="col-md-4" id="col_1">
@if ($invoice->id || $data) @if ($invoice->id || $data)
@ -1115,7 +1115,7 @@
// check currency matches for expenses // check currency matches for expenses
var expenseCurrencyId = model.expense_currency_id(); var expenseCurrencyId = model.expense_currency_id();
var clientCurrencyId = model.invoice().client().currency_id() || {{ $account->getCurrencyId() }}; var clientCurrencyId = model.invoice().client().currency_id() || {{ $account->getCurrencyId() }};
if (expenseCurrencyId != clientCurrencyId) { if (expenseCurrencyId && expenseCurrencyId != clientCurrencyId) {
alert("{!! trans('texts.expense_error_mismatch_currencies') !!}"); alert("{!! trans('texts.expense_error_mismatch_currencies') !!}");
return; return;
} }
@ -1125,6 +1125,11 @@
$('#submitButton').click(); $('#submitButton').click();
} }
function onSubmit() {
console.log('submit');
return true;
}
function submitBulkAction(value) { function submitBulkAction(value) {
$('#bulk_action').val(value); $('#bulk_action').val(value);
$('.bulkForm').submit(); $('.bulkForm').submit();