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

fix: #91

Übergeordneter c7e7b395
No related branches found
No related tags found
1 Merge Request!8fix: quiqqer/erp#91
......@@ -15,6 +15,8 @@
QUI::$Ajax->registerFunction(
'package_quiqqer_erp_ajax_products_calc',
function ($articles, $priceFactors, $user, $currency, $nettoInput) {
$nettoInput = (int)$nettoInput;
$articles = json_decode($articles, true);
$user = json_decode($user, true);
$priceFactors = json_decode($priceFactors, true);
......@@ -62,6 +64,8 @@ function ($articles, $priceFactors, $user, $currency, $nettoInput) {
} catch (QUI\Exception $Exception) {
}
$result = $Articles->toArray();
// brutto stuff (for display)
$User->setAttribute('RUNTIME_NETTO_BRUTTO_STATUS', QUI\ERP\Utils\User::IS_BRUTTO_USER);
......@@ -69,7 +73,6 @@ function ($articles, $priceFactors, $user, $currency, $nettoInput) {
$Articles->setUser($User);
$Articles->recalculate($Calc);
$result = $Articles->toArray();
$brutto = $Articles->toArray();
// discount stuff
......
......@@ -283,7 +283,7 @@ public function calcArticleList(ArticleList $List, $callback = false): ArticleLi
} else {
$PriceFactor->setSum($vatSum + $PriceFactor->getNettoSum());
}
// formatted
$PriceFactor->setNettoSumFormatted($Currency->format($PriceFactor->getNettoSum()));
$PriceFactor->setSumFormatted($Currency->format($PriceFactor->getSum()));
......@@ -439,6 +439,17 @@ public function calcArticleList(ArticleList $List, $callback = false): ArticleLi
if ($added === false) {
$bruttoSum = $bruttoSum + $diff;
// netto check 1cent check
$bruttoVatSum = 0;
foreach ($vatArray as $vat => $data) {
$bruttoVatSum = $bruttoVatSum + $data['sum'];
}
if ($bruttoSum - $bruttoVatSum !== $nettoSum) {
$nettoSum = $nettoSum + $diff;
}
}
}
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren