diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 814ff3140bd7..01594fa5a89b 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -372,14 +372,10 @@ class InvoiceController extends BaseController $action = Input::get('action'); $entityType = Input::get('entityType'); - if (config('ninja.lock_sent_invoices')) { - $invoice = $request->entity(); - } else { - $invoice = $this->invoiceService->save($data, $request->entity()); - $entityType = $invoice->getEntityType(); - $message = trans("texts.updated_{$entityType}"); - Session::flash('message', $message); - } + $invoice = $this->invoiceService->save($data, $request->entity()); + $entityType = $invoice->getEntityType(); + $message = trans("texts.updated_{$entityType}"); + Session::flash('message', $message); if ($action == 'clone_invoice') { return url(sprintf('invoices/%s/clone', $invoice->public_id)); diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index 8f0fd67a41ca..32a3909f25f4 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -742,7 +742,7 @@ class InvoiceRepository extends BaseRepository if ($product && (Auth::user()->can('edit', $product))) { $product->notes = ($task || $expense) ? '' : $item['notes']; if (! $account->convert_products) { - $product->cost = $expense ? 0 : $item['cost']; + $product->cost = $expense ? 0 : Utils::parseFloat($item['cost']); } $product->tax_name1 = isset($item['tax_name1']) ? $item['tax_name1'] : null; $product->tax_rate1 = isset($item['tax_rate1']) ? $item['tax_rate1'] : 0;