shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-09-08 11:11:36 +03:00
parent a3b5cc7ddd 496b28f971
commit f62374b0d4
48 changed files with 1230 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/AkauntingCarousel.vue
View File

@ -65,7 +65,7 @@ export default {
},
initial_index: {
type: Number,
default: 1,
default: 0,
description: "index of the initially active slide (starting from 0)"
},
trigger: {

8
resources/assets/js/components/AkauntingSelect.vue
View File

@ -980,6 +980,10 @@ export default {
}
this.$emit('interface', this.real_model);
setTimeout(function() {
this.change();
}.bind(this), 800);
},
methods: {
@ -1218,6 +1222,8 @@ export default {
} else {
this.real_model = value.toString();
}
this.change();
},
model: function (value) {
@ -1226,6 +1232,8 @@ export default {
} else {
this.real_model = value.toString();
}
this.change();
}
},
}

4
resources/assets/js/components/AkauntingSelectRemote.vue
View File

@ -616,6 +616,10 @@ export default {
}
this.$emit('interface', this.real_model);
setTimeout(function() {
this.change();
}.bind(this), 800);
},
methods: {

4
resources/assets/js/views/modules/apps.js vendored
View File

@ -32,6 +32,10 @@ const app = new Vue({
methods: {
onChangeCategory(category) {
if (!category.length) {
return;
}
let path = document.getElementById('category_page').value;
if (category != '*') {

4
resources/assets/js/views/modules/item.js vendored
View File

@ -61,6 +61,10 @@ const app = new Vue({
methods: {
onChangeCategory(category) {
if (!category.length) {
return;
}
let path = document.getElementById('category_page').value;
if (category != '*') {

14
resources/assets/js/views/purchases/bills.js vendored
View File

@ -46,6 +46,7 @@ const app = new Vue({
edit: {
status: false,
currency: false,
items: false,
},
}
},
@ -54,6 +55,7 @@ const app = new Vue({
if ((document.getElementById('items') != null) && (document.getElementById('items').rows)) {
this.colspan = document.getElementById("items").rows[0].cells.length - 1;
}
this.form.items = [];
if (this.form.method) {
@ -92,6 +94,10 @@ const app = new Vue({
methods: {
onChangeContact(contact_id) {
if (!contact_id) {
return;
}
if (this.edit.status && !this.edit.currency) {
this.edit.currency = true;
@ -226,7 +232,7 @@ const app = new Vue({
// set global total variable.
this.totals.sub = sub_total;
this.totals.tax = tax_total;
this.totals.tax = Math.abs(tax_total);
this.totals.item_discount = line_item_discount_total;
// Apply discount to total
@ -285,6 +291,12 @@ const app = new Vue({
},
onSelectItem(item, index) {
if (this.edit.status && !this.edit.items) {
this.edit.items = true;
return;
}
let tax_id = (item.tax_id) ? [item.tax_id.toString()] : '';
this.form.items[index].item_id = item.id;

11
resources/assets/js/views/sales/invoices.js vendored
View File

@ -46,6 +46,7 @@ const app = new Vue({
edit: {
status: false,
currency: false,
items: false,
},
}
},
@ -93,6 +94,10 @@ const app = new Vue({
methods: {
onChangeContact(contact_id) {
if (!contact_id) {
return;
}
if (this.edit.status && !this.edit.currency) {
this.edit.currency = true;
@ -286,6 +291,12 @@ const app = new Vue({
},
onSelectItem(item, index) {
if (this.edit.status && !this.edit.items) {
this.edit.items = true;
return;
}
let tax_id = (item.tax_id) ? [item.tax_id.toString()] : '';
this.form.items[index].item_id = item.id;