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

 import org.openconcerto.erp.core.sales.pos.model.Paiement;
 import org.openconcerto.erp.core.sales.pos.model.ReceiptCode;
 import org.openconcerto.erp.core.sales.pos.model.RegisterFiles.HashMode;
 import org.openconcerto.erp.core.sales.pos.model.RegisterLogEntry.ReceiptEntry;
 import org.openconcerto.erp.core.sales.pos.model.Ticket;
+import org.openconcerto.erp.core.sales.pos.model.TicketItem;
 import org.openconcerto.erp.core.sales.pos.model.TicketLine;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater;
 import org.openconcerto.erp.core.supplychain.stock.element.StockItemsUpdater.TypeStockUpdate;
 import org.openconcerto.erp.core.supplychain.stock.element.StockLabel;
 import org.openconcerto.erp.generationEcritures.GenerationMvtTicketCaisse;
 import org.openconcerto.erp.generationEcritures.GenerationReglementVenteNG;
 import org.openconcerto.erp.model.PrixTTC;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
+import org.openconcerto.sql.element.SQLElementDirectory;
 import org.openconcerto.sql.model.SQLBase;
 import org.openconcerto.sql.model.SQLDataSource;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
+import org.openconcerto.sql.model.SQLRowListRSH;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.SQLRowValuesListFetcher;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLSelectHandlerBuilder;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.utils.SQLUtils;
 import org.openconcerto.utils.BaseDirs;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.ExceptionHandler;
-import org.openconcerto.utils.Pair;
 import org.openconcerto.utils.i18n.TranslationManager;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.logging.Logger;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
     private String LCDType = "serial";
     private String LCDPort = "";
     private String LCDLine1 = "Bienvenue";
     private String LCDLine2 = "ILM Informatique";
+    private boolean askPostalCode = false;
     public static POSConfiguration createInstance() throws JDOMException, IOException {
         POSConfiguration res = new POSConfiguration(getConfigFile(new File(".")));
         res.loadConfiguration();
         return res;
+    }
             JOptionPane.showMessageDialog(null, "Impossible de configurer la connexion à la base de donnée.\n ID société: " + getCompanyID() + " \n ID utilisateur: " + getUserID());
             e.printStackTrace();
             System.exit(2);
+        }
-        NouvelleConnexionAction.initCache(conf);
+        NouvelleConnexionAction.initCache(conf, -1);
+        TaxeCache.getCache();
         return conf;
+    }
     public final Path getRootDir() throws IOException {
         return Configuration.getInstance().getBaseDirs().getAppDataFolderToWrite().toPath();
     public final int importReceipts(final List<Ticket> tickets, final List<ReceiptEntry> entries) throws SQLException {
         if (entries != null && entries.size() != tickets.size())
             throw new IllegalArgumentException("Size mismatch");
         final int defaultIDClient = getClientCaisse().getID();
+        final SQLElementDirectory directory = Configuration.getInstance().getDirectory();
-        SQLElement elt = Configuration.getInstance().getDirectory().getElement("TICKET_CAISSE");
+        SQLElement elt = directory.getElement("TICKET_CAISSE");
-        SQLElement eltFact = Configuration.getInstance().getDirectory().getElement("SAISIE_VENTE_FACTURE_ELEMENT");
+        SQLElement eltFact = directory.getElement("SAISIE_VENTE_FACTURE_ELEMENT");
-        SQLElement eltEnc = Configuration.getInstance().getDirectory().getElement("ENCAISSER_MONTANT");
+        SQLElement eltEnc = directory.getElement("ENCAISSER_MONTANT");
-        SQLElement eltMode = Configuration.getInstance().getDirectory().getElement("MODE_REGLEMENT");
+        SQLElement eltMode = directory.getElement("MODE_REGLEMENT");
-        SQLElement eltArticle = Configuration.getInstance().getDirectory().getElement("ARTICLE");
+        SQLElement eltArticle = directory.getElement("ARTICLE");
         final SQLDataSource ds = elt.getTable().getDBSystemRoot().getDataSource();
         int imported = 0;
+        //
+        final SQLSelect selUniteVente = new SQLSelect();
+        selUniteVente.addSelectStar(directory.getElement("UNITE_VENTE").getTable());
+        final Map<String, Integer> mapUniteVenteName = new HashMap<>();
+        for (SQLRow row : SQLRowListRSH.execute(selUniteVente)) {
+            mapUniteVenteName.put(row.getString("CODE"), row.getID());
+        }
         final Iterator<ReceiptEntry> entriesIter = entries == null ? null : entries.iterator();
         for (Ticket ticket : tickets) {
             SQLSelect sel = new SQLSelect();
             sel.addSelectFunctionStar("COUNT");
             sel.setWhere(new Where(elt.getTable().getField("NUMERO"), "=", ticket.getCode()));
                 SQLRowValues rowVals = new SQLRowValues(elt.getTable());
                 rowVals.put("NUMERO", ticket.getCode());
                 rowVals.put("DATE", ticket.getCreationDate());
                 rowVals.put("ID_CAISSE", getPosID());
+                if (elt.getTable().contains("CODE_POSTAL")) {
+                    rowVals.put("CODE_POSTAL", ticket.getCodePostal());
+                }
                 if (entry != null) {
                     rowVals.put("FILE_HASH", entry.getFileHash());
                     rowVals.put("FILE_HASH_PREVIOUS", ticket.getPreviousHash());
+                }
                 int idClient = ticket.getClient().getId();
                 String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
                 Boolean bServiceActive = Boolean.valueOf(val);
                 calc.setServiceActive(bServiceActive != null && bServiceActive);
                 // Articles
-                for (Pair<Article, Integer> item : ticket.getArticles()) {
+                for (TicketItem item : ticket.getItems()) {
                     SQLRowValues rowValsElt = new SQLRowValues(eltFact.getTable());
-                    final Article article = item.getFirst();
+                    final Article article = item.getArticle();
-                    final Integer nb = item.getSecond();
+                    final BigDecimal nb = item.getQty();
+                    if (article.getSalesUnit() == null) {
+                        rowValsElt.put("QTE", nb.intValue());
+                    } else {
-                    rowValsElt.put("QTE", nb);
+                        rowValsElt.put("QTE", 1);
+                        rowValsElt.put("QTE_UNITAIRE", nb);
+                    }
                     rowValsElt.put("PV_HT", article.getPriceWithoutTax());
                     Float tauxFromId = TaxeCache.getCache().getTauxFromId(article.getIdTaxe());
-                    BigDecimal tauxTVA = new BigDecimal(tauxFromId).movePointLeft(2).add(BigDecimal.ONE);
+                    BigDecimal tauxTVA = BigDecimal.valueOf(tauxFromId).movePointLeft(2).add(BigDecimal.ONE);
-                    final BigDecimal valueHT = article.getPriceWithoutTax().multiply(new BigDecimal(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("NOM", article.getName());
                                 "Règlement " + sqlRow.getForeignRow("ID_MODE_REGLEMENT").getForeignRow("ID_TYPE_REGLEMENT").getString("NOM") + " Ticket " + rowFinal.getString("NUMERO"),
                                 sqlRow.getForeign("ID_CLIENT"), ttc, sqlRow.getDate("DATE").getTime(), sqlRow.getForeignRow("ID_MODE_REGLEMENT"), rowFinal, rowFinal.getForeignRow("ID_MOUVEMENT"),
                                 false);
+                    }
                     if (totalEnc > longValueTotal) {
-                        final SQLTable table = Configuration.getInstance().getDirectory().getElement("TYPE_REGLEMENT").getTable();
+                        final SQLTable table = directory.getElement("TYPE_REGLEMENT").getTable();
                         int idComptePceCaisse = table.getRow(TypeReglementSQLElement.ESPECE).getInt("ID_COMPTE_PCE_CLIENT");
                         if (idComptePceCaisse == table.getUndefinedID()) {
                             idComptePceCaisse = ComptePCESQLElement.getId(ComptePCESQLElement.getComptePceDefault("VenteEspece"));
+                        }
                         new GenerationMvtVirement(idComptePceCaisse, rowFinal.getForeign("ID_CLIENT").getInt("ID_COMPTE_PCE"), 0, totalEnc - longValueTotal,
+            }
         }, row, row.getReferentRows(getClientCaisse().getTable().getTable("SAISIE_VENTE_FACTURE_ELEMENT")), TypeStockUpdate.REAL_VIRTUAL_DELIVER);
         stockUpdater.update();
+    }
-    public List<Ticket> allTickets() {
+    public List<Ticket> allTickets() throws IOException {
         final List<Ticket> l = new ArrayList<Ticket>();
         for (final File f : ReceiptCode.getReceiptsToImport(getPosID())) {
             // old receipts have no hash files
             final Ticket ticket = Ticket.parseFile(f, HashMode.NOT_REQUIRED);
-            if (ticket != null) {
-                l.add(ticket);
+            l.add(ticket);
+        }
-        }
         return l;
+    }
     public List<TicketLine> getHeaderLines() {
         return headerLines;
         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")));
         setScanDelay(Integer.valueOf(rootElement.getAttributeValue("scanDelay", "80")));
+        setAskPostalCode(rootElement.getAttributeValue("askPostalCode", "false").equals("true"));
         // screen
         final List<Element> children = rootElement.getChildren("screen");
         if (children != null) {
             for (Element e : children) {
                 this.screenWidth = Integer.valueOf(e.getAttributeValue("width", "0"));
                 this.footerLines.add(new TicketLine(header.getValue(), header.getAttributeValue("style")));
+            }
+        }
         // ticket printers
         final List<Element> printers = rootElement.getChildren("ticketPrinter");
-        if (printers.size() > 0) {
+        if (!printers.isEmpty()) {
             configureTicketPrinter(this.ticketPrinterConf1, printers.get(0));
+        }
         if (printers.size() > 1) {
             configureTicketPrinter(this.ticketPrinterConf2, printers.get(1));
+        }
             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("scanDelay", String.valueOf(this.scanDelay));
+            configElement.setAttribute("askPostalCode", this.askPostalCode ? "true" : "false");
             doc.addContent(configElement);
             // screen size
             final Element screenElement = new Element("screen");
             screenElement.setAttribute("width", String.valueOf(this.screenWidth));
             screenElement.setAttribute("height", String.valueOf(this.screenHeight));
+    }
     public String getLCDType() {
         return this.LCDType;
+    }
+    public boolean askPostalCode() {
+        return this.askPostalCode;
+    }
+    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 156 → 174