Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge branch 'v5-develop' into v5-develop

Browse Source
This commit is contained in:
David Bomba 2020-11-16 12:20:44 +11:00 committed by GitHub
commit 68a6ea4d22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 68762 additions and 68708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/PdfMaker/PdfMakerUtilities.php
View File

@ -140,7 +140,7 @@ trait PdfMakerUtilities
// .. in case string doesn't contain any HTML, we'll just return // .. in case string doesn't contain any HTML, we'll just return
// raw $content. // raw $content.
$_child = $this->document->createElement($child['element'], isset($child['content']) ? $child['content'] : ''); $_child = $this->document->createElement($child['element'], isset($child['content']) ? htmlspecialchars($child['content']) : '');
} }
$element->appendChild($_child); $element->appendChild($_child);

6
app/Utils/HtmlEngine.php
View File

@ -296,8 +296,8 @@ class HtmlEngine
$data['$product.date'] = ['value' => '', 'label' => ctrans('texts.date')]; $data['$product.date'] = ['value' => '', 'label' => ctrans('texts.date')];
$data['$product.discount'] = ['value' => '', 'label' => ctrans('texts.discount')]; $data['$product.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
$data['$product.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')]; $data['$product.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
$data['$product.notes'] = ['value' => '', 'label' => ctrans('texts.notes')]; $data['$product.description'] = ['value' => '', 'label' => ctrans('texts.description')];
$data['$product.cost'] = ['value' => '', 'label' => ctrans('texts.cost')]; $data['$product.unit_cost'] = ['value' => '', 'label' => ctrans('texts.unit_cost')];
$data['$product.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')]; $data['$product.quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
$data['$product.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['$product.tax_name1'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$product.tax'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['$product.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
@ -310,7 +310,7 @@ class HtmlEngine
$data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')]; $data['$task.date'] = ['value' => '', 'label' => ctrans('texts.date')];
$data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')]; $data['$task.discount'] = ['value' => '', 'label' => ctrans('texts.discount')];
$data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')]; $data['$task.product_key'] = ['value' => '', 'label' => ctrans('texts.product_key')];
$data['$task.notes'] = ['value' => '', 'label' => ctrans('texts.notes')]; $data['$task.description'] = ['value' => '', 'label' => ctrans('texts.description')];
$data['$task.rate'] = ['value' => '', 'label' => ctrans('texts.rate')]; $data['$task.rate'] = ['value' => '', 'label' => ctrans('texts.rate')];
$data['$task.hours'] = ['value' => '', 'label' => ctrans('texts.hours')]; $data['$task.hours'] = ['value' => '', 'label' => ctrans('texts.hours')];
$data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')]; $data['$task.tax'] = ['value' => '', 'label' => ctrans('texts.tax')];

1
app/Utils/Traits/MakesInvoiceValues.php
View File

@ -627,6 +627,7 @@ trait MakesInvoiceValues
$data[$key][$table_type.'.unit_cost'] = Number::formatMoney($item->cost, $this->client); $data[$key][$table_type.'.unit_cost'] = Number::formatMoney($item->cost, $this->client);
$data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $this->client); $data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $this->client);
$data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $this->client); $data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $this->client);
if (isset($item->discount) && $item->discount > 0) { if (isset($item->discount) && $item->discount > 0) {

2
public/flutter_service_worker.js vendored
View File

@ -28,7 +28,7 @@ const RESOURCES = {
"assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "c1242726c7eac4eb5e843d826f78fb1b", "assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "c1242726c7eac4eb5e843d826f78fb1b",
"assets/AssetManifest.json": "ea09ed4b9b8b6c83d6896248aac7c527", "assets/AssetManifest.json": "ea09ed4b9b8b6c83d6896248aac7c527",
"manifest.json": "77215c1737c7639764e64a192be2f7b8", "manifest.json": "77215c1737c7639764e64a192be2f7b8",
"main.dart.js": "da364552b4070edabc1616907f0c3caf", "main.dart.js": "7c5eabcd4c179bc7d4fd0918f27ad7fb",
"version.json": "399f70d54a0cf071e6e83bb5382fcdf5", "version.json": "399f70d54a0cf071e6e83bb5382fcdf5",
"/": "23224b5e03519aaa87594403d54412cf", "/": "23224b5e03519aaa87594403d54412cf",
"icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed", "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",

137459
public/main.dart.js vendored
View File

File diff suppressed because one or more lines are too long