fix: ArticleSummary calculations

bin/backend/controls/articles/ArticleList.js

@@ -40,7 +40,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleList', [
             '$onArticleReplace',
             '$onArticleCalc',
             '$calc',
-            '$onInject'
+            '$onInject',
+            '$executeCalculation'
         ],
 
         options: {
@@ -250,11 +251,11 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleList', [
             Child.setAttribute('List', this);
 
             Child.addEvents({
-                onDelete     : this.$onArticleDelete,
-                onSelect     : this.$onArticleSelect,
-                onUnSelect   : this.$onArticleUnSelect,
-                onReplace    : this.$onArticleReplace,
-                onArticleCalc: this.$onArticleCalc
+                onDelete  : this.$onArticleDelete,
+                onSelect  : this.$onArticleSelect,
+                onUnSelect: this.$onArticleUnSelect,
+                onReplace : this.$onArticleReplace,
+                onCalc    : this.$executeCalculation
             });
 
             if (this.$Container) {
@@ -551,8 +552,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleList', [
          */
         $onArticleSetPosition: function (Article) {
             Article.getElm()
-                   .getElement('.quiqqer-erp-backend-erpArticlePlaceholder-pos')
-                   .set('html', Article.getAttribute('position'));
+                .getElement('.quiqqer-erp-backend-erpArticlePlaceholder-pos')
+                .set('html', Article.getAttribute('position'));
         },
 
         /**
@@ -647,16 +648,6 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleList', [
             this.fireEvent('articleReplaceClick', [this, Article]);
         },
 
-        /**
-         * event: on article calculation
-         *
-         * @param Article
-         * @param calculation
-         */
-        $onArticleCalc: function (Article, calculation) {
-            this.$calculations = calculation;
-        },
-
         /**
          * Return the current selected Article
          *

bin/backend/controls/articles/ArticleSummary.html

 <div class="quiqqer-erp-backend-temporaryErp-summary-pos">
-    <div class="quiqqer-erp-backend-temporaryErp-summary-pos-title">Pos. Info:</div>
+    <div class="quiqqer-erp-backend-temporaryErp-summary-pos-title">{{labelPosInfo}}:</div>
 
     <div class="quiqqer-erp-backend-temporaryErp-summary-pos-netto">
-        <span class="netto-title">Netto</span>
+        <span class="netto-title">{{labelNet}}:</span>
         <span class="netto-value"></span>
     </div>
     <div class="quiqqer-erp-backend-temporaryErp-summary-pos-brutto">
-        <span class="brutto-title">Brutto</span>
+        <span class="brutto-title">{{labelGross}}:</span>
         <span class="brutto-value"></span>
     </div>
 </div>
 
 <div class="quiqqer-erp-backend-temporaryErp-summary-total">
-    <div class="quiqqer-erp-backend-temporaryErp-summary-total-title">Summen:</div>
+    <div class="quiqqer-erp-backend-temporaryErp-summary-total-title">{{labelSums}}:</div>
 
     <div class="quiqqer-erp-backend-temporaryErp-summary-total-vat">
-        <span class="vat-title">MwSt:</span>
+        <span class="vat-title">{{labelVat}}:</span>
         <span class="vat-value"></span>
     </div>
     <div class="quiqqer-erp-backend-temporaryErp-summary-total-netto">
-        <span class="netto-title">Netto:</span>
+        <span class="netto-title">{{labelNet}}:</span>
         <span class="netto-value"></span>
     </div>
     <div class="quiqqer-erp-backend-temporaryErp-summary-total-brutto">
-        <span class="brutto-title">Brutto:</span>
+        <span class="brutto-title">{{labelGross}}:</span>
         <span class="brutto-value"></span>
     </div>
 </div>

bin/backend/controls/articles/ArticleSummary.js

@@ -18,6 +18,8 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
 ], function (QUI, QUIControl, Article, Mustache, QUILocale, template) {
     "use strict";
 
+    var lg = 'quiqqer/erp';
+
     return new Class({
 
         Extends: QUIControl,
@@ -41,12 +43,6 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
             this.$NettoSum  = null;
             this.$BruttoSum = null;
 
-            this.$Formatter = QUILocale.getNumberFormatter({
-                style                : 'currency',
-                currency             : this.getAttribute('currency'),
-                minimumFractionDigits: 2
-            });
-
             this.addEvents({
                 onInject: this.$onInject
             });
@@ -60,7 +56,13 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
         create: function () {
             this.$Elm = new Element('div', {
                 'class': 'quiqqer-erp-backend-temporaryErp-summary',
-                html   : Mustache.render(template)
+                html   : Mustache.render(template, {
+                    labelPosInfo: QUILocale.get(lg, 'article.summary.tpl.labelPosInfo'),
+                    labelNet    : QUILocale.get(lg, 'article.summary.tpl.labelNet'),
+                    labelGross  : QUILocale.get(lg, 'article.summary.tpl.labelGross'),
+                    labelSums   : QUILocale.get(lg, 'article.summary.tpl.labelSums'),
+                    labelVat    : QUILocale.get(lg, 'article.summary.tpl.labelVat'),
+                })
             });
 
             this.$Elm.addEvent('click', this.openSummary);
@@ -89,6 +91,12 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
                 this.setStyles(this.getAttribute('styles'));
             }
 
+            this.$Formatter = QUILocale.getNumberFormatter({
+                style                : 'currency',
+                currency             : this.getAttribute('currency'),
+                minimumFractionDigits: 2
+            });
+
             return this.$Elm;
         },
 
@@ -163,9 +171,10 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
                     }));
 
                     var Total = Content.getElement('.quiqqer-erp-backend-temporaryErp-summaryWin-total');
+                    var calc  = calculations.calculations;
 
-                    Total.getElement('.netto-value').set('html', calculations.nettoSum);
-                    Total.getElement('.brutto-value').set('html', calculations.sum);
+                    Total.getElement('.netto-value').set('html', self.$Formatter.format(calc.nettoSum));
+                    Total.getElement('.brutto-value').set('html', self.$Formatter.format(calc.sum));
 
                     Content.getElements(
                         '.quiqqer-erp-backend-temporaryErp-summaryWin-priceFactors'
@@ -196,6 +205,10 @@ define('package/quiqqer/erp/bin/backend/controls/articles/ArticleSummary', [
 
             var calc = calculated.calculations;
 
+            if (!(ArticleInstance instanceof Article)) {
+                ArticleInstance = List.getSelectedArticle();
+            }
+
             if (ArticleInstance instanceof Article) {
                 var articleCalc = ArticleInstance.getCalculations();
 

locale.xml

@@ -606,6 +606,28 @@
     </groups>
 
     <groups name="quiqqer/erp" datatype="js">
+        
+        <locale name="article.summary.tpl.labelPosInfo">
+            <de><![CDATA[Pos.-Info]]></de>
+            <en><![CDATA[Pos. info]]></en>
+        </locale>
+        <locale name="article.summary.tpl.labelNet">
+            <de><![CDATA[Netto]]></de>
+            <en><![CDATA[Net]]></en>
+        </locale>
+        <locale name="article.summary.tpl.labelGross">
+            <de><![CDATA[Brutto]]></de>
+            <en><![CDATA[Gross]]></en>
+        </locale>
+        <locale name="article.summary.tpl.labelVat">
+            <de><![CDATA[MwSt.]]></de>
+            <en><![CDATA[VAT]]></en>
+        </locale>
+        <locale name="article.summary.tpl.labelSums">
+            <de><![CDATA[Summen]]></de>
+            <en><![CDATA[Sums]]></en>
+        </locale>
+        
         <locale name="comments.message.no.comments">
             <de><![CDATA[Keine Daten vorhanden]]></de>
             <en><![CDATA[No data available]]></en>