WebSVN - OpenConcerto - Diff - Rev 177 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/POSConfiguration.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import org.openconcerto.utils.BaseDirs;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.i18n.TranslationManager;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
     private int screenWidth, screenHeight;
     private TicketPrinterConfiguration ticketPrinterConf1, ticketPrinterConf2;
     private int userID = 2;
     private int companyID = 42;
     private int posID = 2;
+    private int depotStockId = 2;
     private int scanDelay = 80;
-    private List<TicketLine> headerLines = new ArrayList<TicketLine>();
+    private List<TicketLine> headerLines = new ArrayList<>();
-    private List<TicketLine> footerLines = new ArrayList<TicketLine>();
+    private List<TicketLine> footerLines = new ArrayList<>();
     // Terminal CB
     private String creditCardPort = "";
     // LCD
     private String LCDType = "serial";
     private String LCDPort = "";
         return file.exists();
+    }
     // Screen
     public int getScreenWidth() {
+        if (screenWidth == 0) {
+            GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+            screenWidth = gd.getDisplayMode().getWidth();
+        }
         return screenWidth;
+    }
     public int getScreenHeight() {
+        if (screenHeight == 0) {
+            GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+            screenHeight = gd.getDisplayMode().getHeight();
+        }
         return screenHeight;
+    }
     // Database connection
     public int getUserID() {
+    }
     public void setPosID(int posID) {
         this.posID = posID;
+    }
+    // Depot stock
+    public void setDepotID(int depotStockId) {
+        this.depotStockId = depotStockId;
+    }
+    public int getDepotID() {
+        return depotStockId;
+    }
     public int getScanDelay() {
         return scanDelay;
+    }
                 int idClient = ticket.getClient().getId();
                 if (idClient <= 0) {
                     idClient = defaultIDClient;
+                }
+                rowVals.put("ID_CLIENT", idClient);
+                SQLRow rowClient = elt.getTable().getForeignTable("ID_CLIENT").getRow(idClient);
+                SQLRowAccessor rowCat = rowClient.getNonEmptyForeign("ID_CATEGORIE_COMPTABLE");
                 // TODO fusionner TotalCalculator avec Ticket.GetTotalCalcutor
-                TotalCalculator calc = new TotalCalculator("T_PA_HT", "T_PV_HT", null, null);
+                TotalCalculator calc = new TotalCalculator("T_PA_HT", "T_PV_HT", null, rowCat);
                 String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
                 Boolean bServiceActive = Boolean.valueOf(val);
                 calc.setServiceActive(bServiceActive != null && bServiceActive);
                 // Articles
                 for (TicketItem item : ticket.getItems()) {
                     SQLRowValues rowValsElt = new SQLRowValues(eltFact.getTable());
                     final Article article = item.getArticle();
                     final BigDecimal nb = item.getQty();
+                    rowValsElt.put("ID_DEPOT_STOCK", getDepotID());
                     if (article.getSalesUnit() == null) {
                         rowValsElt.put("QTE", nb.intValue());
                     } else {
                         rowValsElt.put("QTE", 1);
                         rowValsElt.put("QTE_UNITAIRE", nb);
+                    }
-                    rowValsElt.put("PV_HT", article.getPriceWithoutTax());
+                    rowValsElt.put("PV_HT", article.getPriceWithoutTax(nb, false));
                     Float tauxFromId = TaxeCache.getCache().getTauxFromId(article.getIdTaxe());
                     BigDecimal tauxTVA = BigDecimal.valueOf(tauxFromId).movePointLeft(2).add(BigDecimal.ONE);
+                    final BigDecimal valueHT = article.getPriceWithoutTax(nb, true).multiply(nb, DecimalUtils.HIGH_PRECISION);
-                    final BigDecimal valueHT = article.getPriceWithoutTax().multiply(nb, DecimalUtils.HIGH_PRECISION);
                     if (article.getSalesUnit() != null) {
                         rowValsElt.put("ID_UNITE_VENTE", mapUniteVenteName.get(article.getSalesUnit()));
+                    }
                     rowValsElt.put("T_PV_HT", valueHT);
                     rowValsElt.put("T_PV_TTC", valueHT.multiply(tauxTVA, DecimalUtils.HIGH_PRECISION));
                     rowValsElt.put("ID_TAXE", article.getIdTaxe());
                     rowValsElt.put("CODE", article.getCode());
+                    rowValsElt.put("POURCENT_REMISE", article.getDiscountPct().movePointRight(2));
+                    rowValsElt.put("ECO_CONTRIBUTION", article.getEcoTaxe());
+                    rowValsElt.put("T_ECO_CONTRIBUTION", article.getEcoTaxe().multiply(nb));
                     rowValsElt.put("NOM", article.getName());
                     rowValsElt.put("ID_TICKET_CAISSE", rowVals);
                     rowValsElt.put("ID_ARTICLE", article.getId());
                     calc.addLine(rowValsElt, eltArticle.getTable().getRow(article.getId()), 0, false);
+                }
             SQLSelect sel = new SQLSelect();
             sel.addSelectStar(elt.getTable());
             sel.setWhere(new Where(elt.getTable().getField("NOM"), "=", "Caisse OpenConcerto"));
             @SuppressWarnings("unchecked")
             List<SQLRow> l = (List<SQLRow>) elt.getTable().getBase().getDataSource().execute(sel.asString(), new SQLSelectHandlerBuilder(sel).createHandler());
-            if (l.size() > 0) {
+            if (!l.isEmpty()) {
                 rowClient = l.get(0);
             } else {
                 SQLRowValues rowValues = new SQLRowValues(elt.getTable());
                 rowValues.put("NOM", "Caisse OpenConcerto");
                 SQLRowValues rowValuesMode = new SQLRowValues(elt.getTable().getTable("MODE_REGLEMENT"));
         // config
         final Element rootElement = document.getRootElement();
         setUserID(Integer.valueOf(rootElement.getAttributeValue("userID", "2")));
         setCompanyID(Integer.valueOf(rootElement.getAttributeValue("societeID", "42")));
         setPosID(Integer.valueOf(rootElement.getAttributeValue("caisseID", "2")));
+        setDepotID(Integer.valueOf(rootElement.getAttributeValue("depotID", "2")));
         setScanDelay(Integer.valueOf(rootElement.getAttributeValue("scanDelay", "80")));
         setAskPostalCode(rootElement.getAttributeValue("askPostalCode", "false").equals("true"));
         // screen
         final List<Element> children = rootElement.getChildren("screen");
             final Document doc = new Document();
             final Element configElement = new Element("config");
             configElement.setAttribute("userID", String.valueOf(this.userID));
             configElement.setAttribute("societeID", String.valueOf(this.companyID));
             configElement.setAttribute("caisseID", String.valueOf(this.posID));
+            configElement.setAttribute("depotID", String.valueOf(this.depotStockId));
             configElement.setAttribute("scanDelay", String.valueOf(this.scanDelay));
             configElement.setAttribute("askPostalCode", this.askPostalCode ? "true" : "false");
             doc.addContent(configElement);
             // screen size
             final Element screenElement = new Element("screen");
+            }
+        }
+    }
     public boolean isUsingJPos() {
-        // TODO Auto-generated method stub
         return false;
+    }
-    public List<String> getJPosDirectories() {// TODO Auto-generated method stub
+    public List<String> getJPosDirectories() {
         final ArrayList<String> result = new ArrayList<String>();
         return result;
+    }
     public String getLCDPort() {
         List<Client> l = new ArrayList<Client>();
         for (SQLRowValues sqlRowValues : result) {
             Client c = new Client(sqlRowValues.getID(), sqlRowValues.getString("NOM"), sqlRowValues.getBigDecimal("SOLDE_COMPTE"));
             final SQLRowAccessor foreign = sqlRowValues.getForeign("ID_ADRESSE");
-            c.setAdresse(foreign.getString("RUE") + " " + foreign.getString("VILLE"));
+            c.setAdresse(foreign.getString("RUE") + "\n" + foreign.getString("VILLE"));
             l.add(c);
+        }
         Collections.sort(l, new Comparator<Client>() {
             @Override
+    }
     public void setAskPostalCode(boolean askPostalCode) {
         this.askPostalCode = askPostalCode;
+    }
+}

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/POSConfiguration.java - Rev 177 → 182