WebSVN - OpenConcerto - Diff - Rev 151 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/model/FichePayeModel.java

     // Configuration.getInstance().getBase().getTable("PERIODE_VALIDITE");
     private SQLJavaEditor javaEdit = new SQLJavaEditor(VariablePayeSQLElement.getMapTree());
     // liste des variable de paye à calculer
-    private BigDecimal salBrut, salBrutBase, salBrutCotis, salBrutTaxable, cotPat, cotSal, taxCmPat, taxCmSal, netImp, netAPayer, csg, csgSansAbattement, cice, allegmentCotisation, avantage,
+    private BigDecimal salBrut, salBrutBase, salBrutCotis, salBrutTaxable, cotPat, cotSal, taxCmPat, taxCmSal, netImp, pas, netAPayer, csg, csgSansAbattement, cice, allegmentCotisation, avantage,
             reduction;
     private Map<Integer, String> mapField;
     private final BigDecimal tauxCSG;
     public BigDecimal getCsgSansAbattement() {
         return csgSansAbattement;
+    }
+    public BigDecimal getPas() {
+        return pas;
+    }
     public BigDecimal getNetAPayerTotal() {
         return netAPayer.add(this.salBrut);
+    }
     public BigDecimal getNetImpTotal() {
-        return netImp.add(this.salBrut);
+        return netImp.add(this.salBrutTaxable);
+    }
+    public BigDecimal getNetAvantPas() {
+        return getNetAPayerTotal().subtract(this.pas);
+    }
     public BigDecimal getSalBrut() {
         return salBrut;
+    }
         this.cotPat = BigDecimal.ZERO;
         this.cotSal = BigDecimal.ZERO;
         this.taxCmPat = BigDecimal.ZERO;
         this.taxCmSal = BigDecimal.ZERO;
         this.netAPayer = BigDecimal.ZERO;
+        this.pas = BigDecimal.ZERO;
         this.netImp = BigDecimal.ZERO;
         this.csg = BigDecimal.ZERO;
         this.csgSansAbattement = BigDecimal.ZERO;
+    }
             rowValsFiche.put("SAL_BASE_BRUT", this.salBrutBase);
             rowValsFiche.put("SAL_BRUT_COTISABLE", this.salBrutCotis);
             rowValsFiche.put("SAL_BRUT_TAXABLE", this.salBrutTaxable);
             rowValsFiche.put("NET_IMP", getNetImpTotal());
             rowValsFiche.put("NET_A_PAYER", getNetAPayerTotal());
+            rowValsFiche.put("NET_AVANT_PAS", getNetAvantPas());
             rowValsFiche.put("COT_SAL", this.cotSal);
             rowValsFiche.put("COT_PAT", this.cotPat);
             rowValsFiche.put("TAXE_CM_PAT", this.taxCmPat);
             rowValsFiche.put("TAXE_CM_SAL", this.taxCmSal);
             rowValsFiche.put("CSG", getCsgTotal());
             rowValsFiche.put("HEURE_TRAV", getHeureTrav());
+            rowValsFiche.put("TOTAL_PAS", getPas());
             if (this.cice == null) {
                 if (salBrut.signum() > 0
                         && salBrut.compareTo(new BigDecimal(getSmicHoraire(tableFichePaye.getDBRoot())).multiply(getHeureTrav()).multiply(new BigDecimal(2.5), DecimalUtils.HIGH_PRECISION)) <= 0) {
                     this.cice = salBrut;
                 } else {
                     this.netAPayer = this.netAPayer.subtract(montant);
                     if (rowSource.getBoolean("IMPOSABLE")) {
                         this.netImp = this.netImp.subtract(montant);
+                    }
+                    if (rowSource.getBoolean("PAS")) {
+                        this.pas = this.pas.subtract(montant);
+                    }
                 } // Gain
                 else {
                     rowVals.put("MONTANT_SAL_AJ", montant);
                     this.netAPayer = this.netAPayer.add(montant);
                     if (rowSource.getBoolean("IMPOSABLE")) {
                         this.netImp = this.netImp.add(montant);
+                    }
+                    if (rowSource.getBoolean("PAS")) {
+                        this.pas = this.pas.add(montant);
+                    }
+                }
                 // Mis a jour du salaire net
                 // updateValueFiche();
             } else {
                 if (ded != null) {
                     this.netAPayer = this.netAPayer.subtract(ded);
                     if (rowSource.getBoolean("IMPOSABLE")) {
                         this.netImp = this.netImp.subtract(ded);
+                    }
+                    if (rowSource.getBoolean("PAS")) {
+                        this.pas = this.pas.subtract(ded);
+                    }
+                }
                 BigDecimal add = rowVals.getBigDecimal("MONTANT_SAL_AJ");
                 if (add != null) {
                     this.netAPayer = this.netAPayer.add(add);
                     if (rowSource.getBoolean("IMPOSABLE")) {
                         this.netImp = this.netImp.add(add);
+                    }
+                    if (rowSource.getBoolean("IMPOSABLE")) {
+                        this.pas = this.pas.add(add);
+                    }
+                }
+            }
+        }
+    }
                 this.cotPat = this.cotPat.add(montantPat);
+            }
             // CICE
             int codeTP = rowSource.getForeignID("ID_CODE_CAISSE_TYPE_RUBRIQUE");
-            if (codeTP == 298) {
+            String codeStringTP = "";
+            if (rowSource.getForeign("ID_CODE_CAISSE_TYPE_RUBRIQUE") != null && !rowSource.isForeignEmpty("ID_CODE_CAISSE_TYPE_RUBRIQUE")) {
+                codeStringTP = rowSource.getForeign("ID_CODE_CAISSE_TYPE_RUBRIQUE").getString("CODE");
+            }
+            if (codeTP == 298 || codeStringTP.equals("400")) {
                 this.cice = rowVals.getBigDecimal("NB_BASE");
+            }
             // Mis a jour des cotisations
             // updateValueFiche();
+        }
+    }
     private void loadElementCotisation(final SQLRow rowSource, SQLRow row) {
         SQLRowValues rowVals = new SQLRowValues(tableFichePayeElt);
         // System.err.println("________________________LOAD ELT COTISATION");
         if (loadElement(rowVals, rowSource, row)) {
             this.vectRubrique.add(rowVals);
             return;
+        }
+        try {
-        Object baseOb = this.javaEdit.checkFormule(rowSource.getString("NB_BASE"), "BASE");
+            Object baseOb = this.javaEdit.checkFormule(rowSource.getString("NB_BASE"), "BASE");
-        Object tauxSalOb = this.javaEdit.checkFormule(rowSource.getString("TAUX_SAL"), "SAL");
+            Object tauxSalOb = this.javaEdit.checkFormule(rowSource.getString("TAUX_SAL"), "SAL");
-        Object tauxPatOb = this.javaEdit.checkFormule(rowSource.getString("TAUX_PAT"), "PAT");
+            Object tauxPatOb = this.javaEdit.checkFormule(rowSource.getString("TAUX_PAT"), "PAT");
-        Object montantPatOb = this.javaEdit.checkFormule(rowSource.getString("MONTANT_PAT"), "MONTANT");
+            Object montantPatOb = this.javaEdit.checkFormule(rowSource.getString("MONTANT_PAT"), "MONTANT");
-        Object montantAdOb = this.javaEdit.checkFormule(rowSource.getString("MONTANT_SAL_AJ"), "MONTANT");
+            Object montantAdOb = this.javaEdit.checkFormule(rowSource.getString("MONTANT_SAL_AJ"), "MONTANT");
-        rowVals.put("MONTANT_SAL_AJ", montantAj);
+            rowVals.put("MONTANT_SAL_AJ", montantAj);
-        final BigDecimal montantDed = (montantDedOb == null) ? null : new BigDecimal(montantDedOb.toString());
+            final BigDecimal montantDed = (montantDedOb == null) ? null : new BigDecimal(montantDedOb.toString());
-        rowVals.put("MONTANT_SAL_DED", montantDed);
+            rowVals.put("MONTANT_SAL_DED", montantDed);
-        boolean b = isEltImprimable(rowSource, rowVals);
+            boolean b = isEltImprimable(rowSource, rowVals);
-        // System.err.println("Impression --- > " + b);
-        rowVals.put("IMPRESSION", Boolean.valueOf(b));
+            rowVals.put("IMPRESSION", Boolean.valueOf(b));
-        if (rowSource.getBoolean("REDUCTION_GVT_COM")) {
+            if (rowSource.getBoolean("REDUCTION_GVT_COM")) {
-            if (montantAj != null) {
+                if (montantAj != null) {
-                this.reduction = this.reduction.subtract(montantAj);
+                    this.reduction = this.reduction.subtract(montantAj);
-                this.reduction = this.reduction.add(montantDed);
+                    this.reduction = this.reduction.add(montantDed);
+                }
+            }
-        this.vectRubrique.add(rowVals);
+            this.vectRubrique.add(rowVals);
+        } catch (NumberFormatException e) {
+            JOptionPane.showMessageDialog(null, "Une des formules de la rubrique de commentaire " + rowSource.getString("CODE") + " -- " + rowSource.getString("NOM") + " n'est pas correcte!");
+        }
+    }
     private void calculValue() {
         System.err.println("Start calculValue At " + new Date());
         resetValueFiche();
-        /*
-         * this.threadUpdate = new Thread("Update Fiche Paye") { public void run() {
-         */
         Vector<SQLRowValues> vectTmp = new Vector<SQLRowValues>(this.vectRubrique);
         this.vectRubrique = new Vector<SQLRowValues>();
         for (int i = 0; i < vectTmp.size(); i++) {
             int idSource = rowVals.getInt("IDSOURCE");
             SQLRow row = tableFichePayeElt.getRow(rowVals.getID());
             if (source.trim().length() != 0) {
-                // System.err.println("Source != null");
                 if (this.mapTableSource.get(source) != null) {
                     SQLRow rowSource = this.mapTableSource.get(source).getRow(idSource);
                     if (rowSource.getTable().getName().equalsIgnoreCase("RUBRIQUE_BRUT")) {
                         loadElementBrut(rowSource, row);
+            }
+        }
         System.err.println(this.vectRubrique.size() + " elements ADDed ");
         updateValueFiche();
         fireTableDataChanged();
-        /*
-         * } }; this.threadUpdate.start();
-         */
         System.err.println("End calculValue At " + new Date());
+    }
     public void validElt() {

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/model/FichePayeModel.java - Rev 151 → 156