Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2017-10-30 16:02:18 +02:00
commit 52af1298e5
3 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

12
resources/assets/js/script.js
View File

@ -661,15 +661,9 @@ function calculateAmounts(invoice) {
var total = 0; var total = 0;
var hasTaxes = false; var hasTaxes = false;
var taxes = {}; var taxes = {};
invoice.has_product_key = false;
invoice.has_custom_item_value1 = false; invoice.has_custom_item_value1 = false;
invoice.has_custom_item_value2 = false; invoice.has_custom_item_value2 = false;
// Bold designs currently breaks w/o the product column
if (invoice.invoice_design_id == 2) {
invoice.has_product_key = true;
}
var hasStandard = false; var hasStandard = false;
var hasTask = false; var hasTask = false;
@ -702,12 +696,6 @@ function calculateAmounts(invoice) {
var taxRate2 = 0; var taxRate2 = 0;
var taxName2 = ''; var taxName2 = '';
if (item.product_key) {
invoice.has_product_key = true;
} else if (invoice.invoice_items.length == 1 && !item.qty) {
invoice.has_product_key = true;
}
if (invoice.features.invoice_settings) { if (invoice.features.invoice_settings) {
if (item.custom_value1) { if (item.custom_value1) {
invoice.has_custom_item_value1 = true; invoice.has_custom_item_value1 = true;