From 52caaace82b16898ed2e88cb89314da05c1128ec Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Mon, 2 Oct 2023 17:52:52 +0200 Subject: [PATCH 01/10] admin_percentage_cannot_be_less_than_0_and_more_than_90 --- app/scripts/abotypen/detail/abotypendetail.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/scripts/abotypen/detail/abotypendetail.html b/app/scripts/abotypen/detail/abotypendetail.html index e162b7c0..f7ca2cfe 100644 --- a/app/scripts/abotypen/detail/abotypendetail.html +++ b/app/scripts/abotypen/detail/abotypendetail.html @@ -182,8 +182,8 @@

Zusatzdaten

{{projekt.waehrung}}
{{projekt.waehrung}}
- - + +
@@ -198,8 +198,8 @@

Zusatzdaten

- - + +
%
From ed38639adb1d36a3c11bf2f48b4c7a180d073e11 Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Mon, 2 Oct 2023 17:56:52 +0200 Subject: [PATCH 02/10] bumped version to 2.6.15_test --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index a828342f..b7f09543 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.14", + "version": "2.6.15_test", "private": false, "dependencies": { "jquery": "npm:jquery#3.6.0", diff --git a/package.json b/package.json index 4fc7e9ae..bead872c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.14", + "version": "2.6.15_test", "description": "OpenOlitor Client Webapplication - Admin-Portal", "repository": { "type": "git", From a2b12ad03ad4056c2f4b7220c974ddba023f56c4 Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Tue, 3 Oct 2023 09:03:33 +0200 Subject: [PATCH 03/10] price_in_rechnung_max --- app/scripts/rechnungen/detail/rechnungendetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/rechnungen/detail/rechnungendetail.html b/app/scripts/rechnungen/detail/rechnungendetail.html index 33910c97..48acb4e1 100644 --- a/app/scripts/rechnungen/detail/rechnungendetail.html +++ b/app/scripts/rechnungen/detail/rechnungendetail.html @@ -141,7 +141,7 @@

Rechnungsdaten
{{projekt.waehrung}}
- +

From 69649a46c7b58f1d665e93e479053c16bba619ee Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Tue, 3 Oct 2023 09:04:53 +0200 Subject: [PATCH 04/10] bumped version to 2.6.15_test2 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index b7f09543..cbd9edd8 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.15_test", + "version": "2.6.15_test2_test", "private": false, "dependencies": { "jquery": "npm:jquery#3.6.0", diff --git a/package.json b/package.json index bead872c..dcce907e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.15_test", + "version": "2.6.15_test2_test", "description": "OpenOlitor Client Webapplication - Admin-Portal", "repository": { "type": "git", From 1fece81528f027d6b9acbae96f8303272f4f1190 Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Tue, 3 Oct 2023 09:16:55 +0200 Subject: [PATCH 05/10] bumped version to 2.6.15_test2 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index cbd9edd8..3bc71b86 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.15_test2_test", + "version": "2.6.15_test2", "private": false, "dependencies": { "jquery": "npm:jquery#3.6.0", diff --git a/package.json b/package.json index dcce907e..d59b4e2e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.15_test2_test", + "version": "2.6.15_test2", "description": "OpenOlitor Client Webapplication - Admin-Portal", "repository": { "type": "git", From 282f037e4b5eef8628ca710ee24f0bd118562e9d Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Tue, 3 Oct 2023 09:17:39 +0200 Subject: [PATCH 06/10] bumped version to 2.6.15_test3 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 3bc71b86..e0e9c0f9 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.15_test2", + "version": "2.6.15_test3", "private": false, "dependencies": { "jquery": "npm:jquery#3.6.0", diff --git a/package.json b/package.json index d59b4e2e..484cc497 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.15_test2", + "version": "2.6.15_test3", "description": "OpenOlitor Client Webapplication - Admin-Portal", "repository": { "type": "git", From c5f94014941e87536b56e7966c84bcdcd64d58ab Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Tue, 3 Oct 2023 12:56:41 +0200 Subject: [PATCH 07/10] adding the max value for the price in the abotyp --- app/scripts/abotypen/detail/abotypendetail.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/abotypen/detail/abotypendetail.html b/app/scripts/abotypen/detail/abotypendetail.html index f7ca2cfe..5d035b75 100644 --- a/app/scripts/abotypen/detail/abotypendetail.html +++ b/app/scripts/abotypen/detail/abotypendetail.html @@ -182,8 +182,8 @@

Zusatzdaten

{{projekt.waehrung}}
{{projekt.waehrung}}
- - + +
From ad417a2a880f754e42c890039fe7d89f8854717e Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Tue, 3 Oct 2023 12:58:03 +0200 Subject: [PATCH 08/10] New version 2.6.15 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index e0e9c0f9..7296f1f2 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.15_test3", + "version": "2.6.15", "private": false, "dependencies": { "jquery": "npm:jquery#3.6.0", diff --git a/package.json b/package.json index 484cc497..72b9e668 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openolitor-admin", - "version": "2.6.15_test3", + "version": "2.6.15", "description": "OpenOlitor Client Webapplication - Admin-Portal", "repository": { "type": "git", From 9477ca3f4384b6f19ece6762f79cfc705e7522b1 Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Tue, 3 Oct 2023 15:15:58 +0200 Subject: [PATCH 09/10] fix type --- app/scripts/abotypen/detail/abotypendetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/abotypen/detail/abotypendetail.html b/app/scripts/abotypen/detail/abotypendetail.html index 5d035b75..264e6dbf 100644 --- a/app/scripts/abotypen/detail/abotypendetail.html +++ b/app/scripts/abotypen/detail/abotypendetail.html @@ -183,7 +183,7 @@

Zusatzdaten

{{projekt.waehrung}}
{{projekt.waehrung}}
- +
From 281513bbc935a913816dbbeaecdc1adcd4e304f0 Mon Sep 17 00:00:00 2001 From: Mikel Cordovilla Date: Wed, 4 Oct 2023 10:07:14 +0200 Subject: [PATCH 10/10] allow negative prices --- app/scripts/abotypen/detail/abotypendetail.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/abotypen/detail/abotypendetail.html b/app/scripts/abotypen/detail/abotypendetail.html index 264e6dbf..a64da62c 100644 --- a/app/scripts/abotypen/detail/abotypendetail.html +++ b/app/scripts/abotypen/detail/abotypendetail.html @@ -182,8 +182,8 @@

Zusatzdaten

{{projekt.waehrung}}
{{projekt.waehrung}}
- - + +