Skip to content
Code-Schnipsel Gruppen Projekte
Commit 41ca4600 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

fix: use correct brutto sum for brutto display

Übergeordneter 8e764b69
Keine zugehörigen Branchen gefunden
Keine zugehörigen Tags gefunden
Keine zugehörigen Merge Requests gefunden
......@@ -54,8 +54,8 @@ function ($articles, $user) {
foreach ($brutto['articles'] as $k => $article) {
$vat = $article['vat'] / 100 + 1;
$bruttoSum = $result['articles'][$k]['sum'];
$quantity = $brutto['articles'][$k]['quantity'];
$bruttoSum = $article['sum'];
$quantity = $article['quantity'];
$unitPrice = $bruttoSum / $quantity;
$unitPrice = \round($unitPrice, $Currency->getPrecision());
......
......@@ -387,7 +387,7 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleList', [
this.$calculationRunning = true;
return new Promise(function (resolve) {
return new Promise(function (resolve, reject) {
var articles = self.$articles.map(function (Article) {
return Article.getAttributes();
});
......@@ -400,7 +400,11 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleList', [
}, {
'package': 'quiqqer/erp',
articles : JSON.encode({articles: articles}),
user : JSON.encode(self.$user)
user : JSON.encode(self.$user),
onError : function (err) {
console.error(err);
reject();
}
});
});
},
......
......@@ -295,9 +295,9 @@ public function recalculate($Calc = null)
/**
* @param null|Calc $Calc
* @return $this
* @return ArticleList|ArticleListUnique
*/
public function calc($Calc = null): ArticleList
public function calc($Calc = null)
{
if ($this->calculated) {
return $this;
......
......@@ -144,9 +144,9 @@ public function recalculate($Calc = null)
* calc makes the unique article list compatible to the article list
*
* @param $Calc
* @return $this
* @return ArticleListUnique
*/
public function calc($Calc = null): ArticleListUnique
public function calc($Calc = null)
{
// placeholder. unique list cant be calc
return $this;
......
0% Lade oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren