OpenConcerto

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

svn://code.openconcerto.org/openconcerto

Compare Revisions

Regard whitespace Rev 90 → Rev 91

/trunk/OpenConcerto/src/org/openconcerto/ftp/updater/UpdateManager.java
116,11 → 116,13
BufferedReader bReaderRemote = null;
try {
ftp.connect(this.server);
 
System.err.println("UpdateManager connected to '" + this.server + "'");
boolean logged = ftp.login(this.login, this.pass);
 
if (!logged) {
throw new IllegalStateException("Identifiants refusés");
} else {
System.err.println("UpdateManager authenticated with '" + this.login + "' '" + pass + "'");
}
if (this.file == null) {
throw new IllegalStateException("Fichier de version non spécifié");
128,6 → 130,9
System.err.println("UpdateManager downloading '" + this.file + "'");
}
final InputStream retrieveFileStream = ftp.retrieveFileStream(this.file);
if (retrieveFileStream == null) {
throw new IllegalStateException("Téléchargement de " + this.file + " impossible");
}
bReaderRemote = new BufferedReader(new InputStreamReader(retrieveFileStream));
 
int newVersion = Integer.parseInt(bReaderRemote.readLine());
/trunk/OpenConcerto/src/org/openconcerto/ui/table/JCheckBoxTableCellRender.java
31,8 → 31,7
private JCheckBox checkBox;
 
public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
 
JPanel p = new JPanel();
final JPanel p = new JPanel();
p.setOpaque(true);
p.setLayout(new GridBagLayout());
GridBagConstraints c = new GridBagConstraints();
39,9 → 38,7
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.NORTH;
c.insets = new Insets(0, 0, 0, 0);
 
this.checkBox = new JCheckBox();
 
boolean bValue = ((Boolean) value).booleanValue();
this.checkBox.setSelected(bValue);
this.checkBox.addItemListener(this);
50,7 → 47,6
this.checkBox.setBorderPaintedFlat(false);
this.checkBox.setMargin(new Insets(0, 0, 0, 0));
p.add(this.checkBox, c);
 
return p;
}
 
71,12 → 67,11
cb.setBorder(null);
cb.setBorderPaintedFlat(false);
cb.setMargin(new Insets(0, 0, 0, 0));
if (value == null) {
cb.setSelected(false);
} else {
cb.setSelected(((Boolean) value).booleanValue());
// if (!isSelected) {
// p.setBackground(table.getBackground());
// } else {
// p.setBackground(table.getSelectionBackground());
// }
}
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.NORTH;
c.insets = new Insets(0, 0, 0, 0);
/trunk/OpenConcerto/src/org/openconcerto/sql/element/GroupSQLComponent.java
185,7 → 185,7
c.weighty = 0;
}
if (size.largeWidth()) {
if (size.isSplit()) {
if (size.isSplit() || !size.showLabel()) {
c.gridwidth = this.columns * 2;
} else {
c.gridwidth = this.columns * 2 - 1;
/trunk/OpenConcerto/src/org/openconcerto/sql/PropsConfiguration.java
545,7 → 545,7
try {
// TODO add and use server.port
final String[] serverAndPort = getProperty("server.ip").split(":");
log.info("ssl tunnel from local port " + localPort + " to remote " + serverAndPort[0] + ":" + serverAndPort[1]);
log.info("ssl tunnel from local port " + localPort + " to remote " + serverAndPort);
this.conn.setPortForwardingL(localPort, serverAndPort[0], Integer.valueOf(serverAndPort[1]));
} catch (final Exception e1) {
throw new IllegalStateException("Impossible de créer la liaison sécurisée. Vérifier que le logiciel n'est pas déjà lancé.", e1);
/trunk/OpenConcerto/src/org/openconcerto/sql/sqlobject/JUniqueTextField.java
226,7 → 226,7
selNum.addSelect(getTable().getKey(), "COUNT");
final Where w = new Where(getField(), "=", t);
selNum.setWhere(w);
if (JUniqueTextField.this.idSelected > 1) {
if (JUniqueTextField.this.idSelected > getTable().getUndefinedID()) {
selNum.andWhere(new Where(getTable().getKey(), "!=", JUniqueTextField.this.idSelected));
}
final String req = selNum.asString();
/trunk/OpenConcerto/src/org/openconcerto/utils/SleepingQueue.java
191,7 → 191,7
this.support.firePropertyChange("beingRun", old, beingRun);
}
 
protected final synchronized FutureTask<?> getBeingRun() {
public final synchronized FutureTask<?> getBeingRun() {
return this.beingRun;
}
 
/trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/OOXMLField.java
346,11 → 346,33
 
return result;
}
} else if (typeComp.equalsIgnoreCase("cumulPaye")) {
double val = ((Number) result).doubleValue();
double valC = ((Number) this.row.getForeign("ID_CUMULS_PAYE").getObject(field + "_C")).doubleValue();
return new Double(val + valC);
} else if (typeComp.equalsIgnoreCase("globalAcompte")) {
Long prix = (Long) result;
int pourcent = this.row.getInt("POURCENT_ACOMPTE");
long l = Math.round(prix.longValue() / (pourcent / 100.0));
return new Double(GestionDevise.currencyToString(l, false));
} else if (typeComp.equalsIgnoreCase("DatePaye")) {
 
SQLRowAccessor rowRegl = row.getForeign("ID_REGLEMENT_PAYE");
Calendar c = Calendar.getInstance();
 
c.set(Calendar.MONTH, this.row.getInt("ID_MOIS") - 2);
c.set(Calendar.YEAR, Integer.parseInt(this.row.getString("ANNEE")));
 
if (rowRegl.getInt("LE") != 31) {
 
c.set(Calendar.MONTH, c.get(Calendar.MONTH) + 1);
}
 
int max = c.getActualMaximum(Calendar.DAY_OF_MONTH);
int day = Math.min(rowRegl.getInt("LE"), max);
 
c.set(Calendar.DAY_OF_MONTH, day);
return c.getTime();
} else if (typeComp.equalsIgnoreCase("CumulPrec")) {
 
final long cumulPrecedent = getCumulPrecedent(this.row);
/trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/OOgenerationXML.java
641,6 → 641,19
 
private static boolean isIncluded(int filterID, String foreignTable, int id, String fieldWhere, SQLRowAccessor rowElt) {
 
if (rowElt.getTable().getName().equals("FICHE_PAYE_ELEMENT")) {
if (!rowElt.getBoolean("IMPRESSION")) {
return false;
}
if (!rowElt.getBoolean("IN_PERIODE")) {
return false;
}
}
 
if (fieldWhere != null && fieldWhere.trim().length() > 0 && rowElt.getTable().contains(fieldWhere) && rowElt.getTable().getField(fieldWhere).getType().getJavaType() == Boolean.class) {
return rowElt.getBoolean(fieldWhere);
}
 
// No filter
if (filterID <= 1) {
return true;
/trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/OOXMLTableElement.java
43,7 → 43,7
this.foreignTableWhere = tableau.getAttributeValue("tableForeignWhere");
this.fieldWhere = tableau.getAttributeValue("fieldWhere");
 
if (this.fieldWhere != null) {
if (this.fieldWhere != null && row.getTable().contains(fieldWhere)) {
this.filterId = row.getInt(this.fieldWhere);
}
 
124,7 → 124,7
// }
// // #endif
 
return cache.getReferentRows(this.row, tableElt, this.tableau.getAttributeValue("groupBy"));
return cache.getReferentRows(this.row, tableElt, this.tableau.getAttributeValue("groupBy"), this.tableau.getAttributeValue("orderBy"));
 
} else {
System.err.println("OOXMLTableElement.getRows() Table " + tableElt + " is null!");
/trunk/OpenConcerto/src/org/openconcerto/erp/generationDoc/OOXMLCache.java
21,8 → 21,11
import org.openconcerto.sql.model.SQLSelect;
import org.openconcerto.sql.model.SQLTable;
import org.openconcerto.sql.model.Where;
import org.openconcerto.utils.CompareUtils;
 
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
61,10 → 64,10
}
 
protected List<? extends SQLRowAccessor> getReferentRows(List<? extends SQLRowAccessor> row, SQLTable tableForeign) {
return getReferentRows(row, tableForeign, null);
return getReferentRows(row, tableForeign, null, null);
}
 
protected List<? extends SQLRowAccessor> getReferentRows(List<? extends SQLRowAccessor> row, final SQLTable tableForeign, String groupBy) {
protected List<? extends SQLRowAccessor> getReferentRows(List<? extends SQLRowAccessor> row, final SQLTable tableForeign, String groupBy, final String orderBy) {
Map<SQLTable, List<SQLRowAccessor>> c = cacheReferent.get(row.get(0));
 
if (c != null && c.get(tableForeign) != null) {
129,6 → 132,16
c.put(tableForeign, list);
}
 
if (orderBy != null && orderBy.trim().length() > 0) {
Collections.sort(list, new Comparator<SQLRowAccessor>() {
@Override
public int compare(SQLRowAccessor o1, SQLRowAccessor o2) {
 
return CompareUtils.compare(o1.getObject(orderBy), o2.getObject(orderBy));
}
});
}
 
return list;
}
// return row.getReferentRows(tableForeign);
/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/VariableSalarieSQLElement.java
18,6 → 18,7
import org.openconcerto.sql.element.UISQLComponent;
 
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
 
import javax.swing.JTextField;
40,6 → 41,7
l.add(field);
}
}
Collections.sort(l);
return l;
}
 
64,9 → 66,9
for (String i : listFields) {
 
if (pos % 2 == 0) {
this.addSQLObject(new JTextField(4), i, "left");
this.addSQLObject(new JTextField(15), i, "left");
} else {
this.addSQLObject(new JTextField(4), i, "right");
this.addSQLObject(new JTextField(15), i, "right");
}
 
}
/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/VariablePayeSQLElement.java
151,7 → 151,6
l.add("NB_PERS_A_CHARGE");
l.add("PAT");
l.add("SAL");
l.add("BASE");
l.add("MONTANT");
 
l.add("SAL_BRUT");
216,6 → 215,12
l.add(tableInfos.getField("SALAIRE_MOIS"));
l.add(tableInfos.getField("TAUX_AT"));
l.add(tableInfos.getField("CONGES_PAYES"));
if (tableInfos.contains("PRIME_TRANSPORT")) {
l.add(tableInfos.getField("PRIME_LOGEMENT"));
l.add(tableInfos.getField("PRIME_PANIER"));
l.add(tableInfos.getField("PRIME_TRANSPORT"));
}
 
mapTree.put("Contrat salarié", l);
 
List<SQLField> l2 = new ArrayList<SQLField>();
/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/FichePayeSQLElement.java
896,6 → 896,11
for (final SQLField field : tableVariableSal.getContentFields()) {
rowVals.put(field.getName(), Float.valueOf(0));
}
 
if (tableVariableSal.contains("NB_JOUR_MOIS")) {
rowVals.put("NB_JOUR_MOIS", Float.valueOf(31));
rowVals.put("NB_JOUR_TRAV", Float.valueOf(31));
}
SwingUtilities.invokeLater(new Runnable() {
public void run() { // FIXME: Ouch: sql in swing!
try {
/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/InfosSalariePayeSQLElement.java
254,6 → 254,74
c.weightx = 1;
panelBase.add(salaireBase, c);
 
if (getTable().contains("PRIME_TRANSPORT")) {
 
// PRIME_TRANSPORT
JLabel labelTransport = new JLabel(getLabelFor("PRIME_TRANSPORT"));
labelTransport.setHorizontalAlignment(SwingConstants.RIGHT);
 
c.gridy++;
c.gridx = 0;
c.gridheight = 1;
c.fill = GridBagConstraints.HORIZONTAL;
panelBase.add(labelTransport, c);
c.gridx++;
c.weightx = 1;
JTextField fieldTransp = new JTextField();
panelBase.add(fieldTransp, c);
addView(fieldTransp, "PRIME_TRANSPORT");
 
// Durée hebdomadaire
JLabel labelPanier = new JLabel(getLabelFor("PRIME_PANIER"));
labelPanier.setHorizontalAlignment(SwingConstants.RIGHT);
JTextField fieldPanier = new JTextField();
c.gridx++;
c.weightx = 0;
panelBase.add(labelPanier, c);
c.gridx++;
c.weightx = 1;
panelBase.add(fieldPanier, c);
addView(fieldPanier, "PRIME_PANIER");
 
// Salaire de base
JLabel labelLogement = new JLabel(getLabelFor("PRIME_LOGEMENT"));
labelLogement.setHorizontalAlignment(SwingConstants.RIGHT);
JTextField fieldLogement = new JTextField();
c.gridx++;
c.weightx = 0;
panelBase.add(labelLogement, c);
c.gridx++;
c.weightx = 1;
panelBase.add(fieldLogement, c);
addView(fieldLogement, "PRIME_LOGEMENT");
 
// PRIME_TRANSPORT
JLabel labelCnam = new JLabel(getLabelFor("NUMERO_CNAM"));
labelCnam.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridy++;
c.gridx = 0;
c.gridheight = 1;
c.fill = GridBagConstraints.HORIZONTAL;
panelBase.add(labelCnam, c);
c.gridx++;
c.weightx = 1;
JTextField fieldCnam = new JTextField();
panelBase.add(fieldCnam, c);
addView(fieldCnam, "NUMERO_CNAM");
 
// Durée hebdomadaire
JLabel labelCNSS = new JLabel(getLabelFor("NUMERO_CNSS"));
labelCNSS.setHorizontalAlignment(SwingConstants.RIGHT);
JTextField fieldCnss = new JTextField();
c.gridx++;
c.weightx = 0;
panelBase.add(labelCNSS, c);
c.gridx++;
c.weightx = 1;
panelBase.add(fieldCnss, c);
addView(fieldCnss, "NUMERO_CNSS");
 
}
// Taux AT
JLabel labelTauxAT = new JLabel(getLabelFor("TAUX_AT"));
labelTauxAT.setHorizontalAlignment(SwingConstants.RIGHT);
/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/report/FichePayeSheetXML.java
New file
0,0 → 1,46
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
* Copyright 2011 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.
*
* When distributing the software, include this License Header Notice in each file.
*/
package org.openconcerto.erp.core.humanresources.payroll.report;
 
import org.openconcerto.erp.generationDoc.AbstractSheetXMLWithDate;
import org.openconcerto.erp.preferences.PrinterNXProps;
import org.openconcerto.sql.Configuration;
import org.openconcerto.sql.model.SQLRow;
 
public class FichePayeSheetXML extends AbstractSheetXMLWithDate {
 
public static final String TEMPLATE_ID = "FichePaye";
public static final String TEMPLATE_PROPERTY_NAME = "LocationFichePaye";
 
public FichePayeSheetXML(SQLRow row) {
super(row);
this.printer = PrinterNXProps.getInstance().getStringProperty("FichePayePrinter");
this.elt = Configuration.getInstance().getDirectory().getElement("FICHE_PAYE");
 
}
 
@Override
public String getDefaultTemplateId() {
return TEMPLATE_ID;
}
 
@Override
public String getName() {
SQLRow rowSal = row.getForeign("ID_SALARIE");
SQLRow rowMois = row.getForeign("ID_MOIS");
return ("FichePaye_" + rowSal.getString("CODE") + "_" + rowMois.getString("NOM") + "_" + row.getString("ANNEE"));
 
}
 
}
/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/action/ListeDesFichesDePayeAction.java
17,7 → 17,9
import org.openconcerto.erp.config.ComptaPropsConfiguration;
import org.openconcerto.erp.core.common.ui.PanelFrame;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheet;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheetXML;
import org.openconcerto.erp.core.humanresources.payroll.ui.PanelCumulsPaye;
import org.openconcerto.erp.model.MouseSheetXmlListeListener;
import org.openconcerto.sql.Configuration;
import org.openconcerto.sql.element.SQLElement;
import org.openconcerto.sql.model.SQLRow;
28,6 → 30,7
import org.openconcerto.sql.view.IListener;
import org.openconcerto.sql.view.ListeAddPanel;
import org.openconcerto.sql.view.list.IListe;
import org.openconcerto.sql.view.list.RowAction;
import org.openconcerto.sql.view.list.SQLTableModelSourceOnline;
 
import java.awt.event.ActionEvent;
85,33 → 88,13
JPopupMenu menuDroit = new JPopupMenu();
 
final SQLRow rowFiche = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete().getTable("FICHE_PAYE").getRow(frame.getPanel().getListe().getSelectedId());
final File f = FichePayeSheet.getFile(rowFiche, FichePayeSheet.typeOO);
System.err.println("Display Menu, file --> " + f.getAbsolutePath());
 
AbstractAction actionOpen = new AbstractAction("Voir le document") {
public void actionPerformed(ActionEvent e) {
FichePayeSheet.visualisation(rowFiche, FichePayeSheet.typeOO);
}
};
MouseSheetXmlListeListener l = new MouseSheetXmlListeListener(FichePayeSheetXML.class);
 
AbstractAction actionPrint = new AbstractAction("Imprimer le document") {
public void actionPerformed(ActionEvent e) {
FichePayeSheet.impression(rowFiche);
for (RowAction action : l.getRowActions()) {
menuDroit.add(action.getAction());
}
};
 
menuDroit.add(new AbstractAction("Générer le document") {
public void actionPerformed(ActionEvent e) {
FichePayeSheet.generation(rowFiche);
}
});
 
actionPrint.setEnabled(f.exists());
menuDroit.add(actionPrint);
 
actionOpen.setEnabled(f.exists());
menuDroit.add(actionOpen);
 
menuDroit.add(new AbstractAction("Détails cumuls et variables") {
public void actionPerformed(ActionEvent e) {
 
/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/ui/HistoriqueFichePayePanel.java
16,6 → 16,8
import org.openconcerto.erp.config.ComptaPropsConfiguration;
import org.openconcerto.erp.core.common.ui.PanelFrame;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheet;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheetXML;
import org.openconcerto.erp.model.MouseSheetXmlListeListener;
import org.openconcerto.sql.Configuration;
import org.openconcerto.sql.element.SQLElement;
import org.openconcerto.sql.model.SQLRow;
27,6 → 29,7
import org.openconcerto.sql.view.IListener;
import org.openconcerto.sql.view.ListeAddPanel;
import org.openconcerto.sql.view.list.IListe;
import org.openconcerto.sql.view.list.RowAction;
import org.openconcerto.sql.view.list.SQLTableModelSourceOnline;
import org.openconcerto.ui.DefaultGridBagConstraints;
 
162,32 → 165,13
 
final SQLRow rowFiche = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete().getTable("FICHE_PAYE")
.getRow(HistoriqueFichePayePanel.this.listePanel.getListe().getSelectedId());
final File f = FichePayeSheet.getFile(rowFiche, FichePayeSheet.typeOO);
 
AbstractAction actionOpen = new AbstractAction("Voir le document") {
public void actionPerformed(ActionEvent e) {
FichePayeSheet.visualisation(rowFiche, FichePayeSheet.typeOO);
}
};
MouseSheetXmlListeListener l = new MouseSheetXmlListeListener(FichePayeSheetXML.class);
 
AbstractAction actionPrint = new AbstractAction("Imprimer le document") {
public void actionPerformed(ActionEvent e) {
FichePayeSheet.impression(rowFiche);
for (RowAction action : l.getRowActions()) {
menuDroit.add(action.getAction());
}
};
 
menuDroit.add(new AbstractAction("Générer le document") {
public void actionPerformed(ActionEvent e) {
FichePayeSheet.generation(rowFiche);
}
});
 
actionPrint.setEnabled(f.exists());
menuDroit.add(actionPrint);
 
actionOpen.setEnabled(f.exists());
menuDroit.add(actionOpen);
 
menuDroit.add(new AbstractAction("Détails cumuls et variables") {
public void actionPerformed(ActionEvent e) {
 
/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/ui/QteMultipleRowValuesRenderer.java
55,7 → 55,14
SQLRowValues rowVals = model.getRowValuesAt(row);
 
Number qteM = (Number) rowVals.getObject("QTE_ACHAT");
if (qteM == null) {
qteM = Integer.valueOf(0);
}
Number qte = (Number) rowVals.getObject("QTE");
if (qte == null) {
qte = Integer.valueOf(0);
}
 
final int qteAchat = qteM.intValue();
if (qteAchat != 0 && (qte.intValue() % qteAchat != 0)) {
if (!isSelected) {
/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/TotalPanel.java
566,7 → 566,10
 
@Override
protected void done() {
if (isCancelled()) {
// if cancel() is called after doInBackground() nothing happens
// but updating is set to a new instance
if (this.isCancelled() || TotalPanel.this.worker != this) {
// une autre maj arrive
return;
}
TotalCalculator calc;
/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/TotalCalculator.java
38,8 → 38,6
private final String fieldHT, fieldHA, fieldDevise;
 
private SQLRowAccessor rowDefaultCptProduit, rowDefaultCptService, rowDefaultCptTVACollecte, rowDefaultCptTVADeductible, rowDefaultCptAchat;
private static final SQLTable tablePrefCompte = Configuration.getInstance().getRoot().findTable("PREFS_COMPTE");
private static final SQLRow rowPrefsCompte = tablePrefCompte.getRow(2);
 
private double totalPoids;
 
78,6 → 76,8
this.fieldDevise = fieldDeviseTotal;
this.fieldHA = fieldHA;
this.fieldHT = fieldHT;
final SQLTable tablePrefCompte = Configuration.getInstance().getRoot().findTable("PREFS_COMPTE");
final SQLRow rowPrefsCompte = tablePrefCompte.getRow(2);
 
// Comptes par défaut
this.rowDefaultCptService = rowPrefsCompte.getForeign("ID_COMPTE_PCE_VENTE_SERVICE");
/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/Acompte.java
14,6 → 14,7
package org.openconcerto.erp.core.common.ui;
 
import org.openconcerto.utils.DecimalUtils;
import org.openconcerto.utils.GestionDevise;
import org.openconcerto.utils.StringUtils;
 
import java.math.BigDecimal;
57,7 → 58,7
if (percent != null) {
return percent.toString() + "%";
} else if (montant != null) {
return montant.toString();
return GestionDevise.currencyToString(montant);
} else {
return "";
}
/trunk/OpenConcerto/src/org/openconcerto/erp/model/EditionFichePayeModel.java
14,7 → 14,7
package org.openconcerto.erp.model;
 
import org.openconcerto.erp.core.humanresources.payroll.element.FichePayeSQLElement;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheet;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheetXML;
import org.openconcerto.erp.core.humanresources.payroll.ui.VisualisationPayeFrame;
import org.openconcerto.sql.Configuration;
import org.openconcerto.sql.element.SQLElement;
23,6 → 23,7
import org.openconcerto.sql.model.SQLSelect;
import org.openconcerto.sql.model.SQLTable;
import org.openconcerto.sql.model.SQLTableListener;
import org.openconcerto.sql.model.Where;
import org.openconcerto.utils.ExceptionHandler;
 
import java.sql.Date;
122,7 → 123,7
public boolean isCellEditable(int rowIndex, int columnIndex) {
 
String s = this.mapColumn.get(columnIndex).toString();
if (s.equalsIgnoreCase("A_CREER") || s.equalsIgnoreCase("IMPRESSION") || s.equalsIgnoreCase("VISU")) {
if (s.equalsIgnoreCase("A_CREER") || s.equalsIgnoreCase("IMPRESSION")) {
return true;
}
return false;
149,7 → 150,11
SQLElement eltSal = Configuration.getInstance().getDirectory().getElement("SALARIE");
SQLSelect sel = new SQLSelect(eltSal.getTable().getBase());
sel.addSelect(eltSal.getTable().getField("ID"));
 
final SQLTable tableInfos = eltSal.getTable().getTable("INFOS_SALARIE_PAYE");
Where w = new Where(tableInfos.getKey(), "=", eltSal.getTable().getField("ID_INFOS_SALARIE_PAYE"));
Where w2 = new Where(tableInfos.getField("DATE_SORTIE"), "=", (Object) null);
w2 = w2.or(new Where(tableInfos.getField("DATE_SORTIE"), ">", new java.util.Date()));
sel.setWhere(w.and(w2));
this.vData.removeAllElements();
List l = (List) eltSal.getTable().getBase().getDataSource().execute(sel.asString(), new ArrayListHandler());
if (l != null) {
161,8 → 166,8
m.put("NOM", new Integer(i));
m.put("BRUT", new Integer(i));
m.put("NET", new Integer(i));
m.put("VISU", Boolean.FALSE);
m.put("IMPRESSION", Boolean.TRUE);
m.put("VISU", Boolean.TRUE);
m.put("IMPRESSION", Boolean.FALSE);
m.put("ID_SALARIE", new Integer(idSal));
 
this.vData.add(m);
320,11 → 325,12
EditionFichePayeModel.this.bar.setValue(tmp++);
 
// Impression
SQLRow rowFiche = eltFichePaye.getTable().getRow(idFiche);
FichePayeSheetXML sheet = new FichePayeSheetXML(rowFiche);
sheet.createDocumentAsynchronous();
Boolean bPrint = (Boolean) m.get("IMPRESSION");
if (bPrint.booleanValue()) {
SQLRow rowFiche = eltFichePaye.getTable().getRow(idFiche);
FichePayeSheet.generation(rowFiche, false);
FichePayeSheet.impression(rowFiche);
sheet.showPrintAndExportAsynchronous(false, true, false);
}
 
EditionFichePayeModel.this.bar.setValue(tmp++);
/trunk/OpenConcerto/src/org/openconcerto/erp/preferences/GenerationDocumentPayePreferencePanel.java
14,7 → 14,7
package org.openconcerto.erp.preferences;
 
import org.openconcerto.erp.core.humanresources.payroll.report.EtatChargesPayeSheet;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheet;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheetXML;
import org.openconcerto.erp.core.humanresources.payroll.report.LivrePayeSheet;
import org.openconcerto.utils.Tuple2;
 
22,7 → 22,7
 
public GenerationDocumentPayePreferencePanel() {
super();
this.mapKeyLabel.put(Tuple2.create(FichePayeSheet.TEMPLATE_ID, "LocationFichePaye"), "Fiche paye");
this.mapKeyLabel.put(Tuple2.create(FichePayeSheetXML.TEMPLATE_ID, "LocationFichePaye"), "Fiche paye");
this.mapKeyLabel.put(Tuple2.create(LivrePayeSheet.TEMPLATE_ID, "LocationLivrePaye"), "Livre paye");
this.mapKeyLabel.put(Tuple2.create(EtatChargesPayeSheet.TEMPLATE_ID, "LocationEtatChargesPaye"), "Etat des charges");
// uiInit();
/trunk/OpenConcerto/src/org/openconcerto/erp/preferences/TemplateNXProps.java
20,6 → 20,7
import org.openconcerto.erp.core.finance.accounting.report.JournauxSheetXML;
import org.openconcerto.erp.core.humanresources.payroll.report.EtatChargesPayeSheet;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheet;
import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheetXML;
import org.openconcerto.erp.core.humanresources.payroll.report.LivrePayeSheet;
import org.openconcerto.erp.core.sales.invoice.report.ListeVenteXmlSheet;
import org.openconcerto.erp.core.sales.invoice.report.VenteComptoirSheet;
138,7 → 139,7
register(GrandLivreSheet.TEMPLATE_ID, GrandLivreSheet.TEMPLATE_PROPERTY_NAME, GrandLivreSheet.TEMPLATE_ID);
register(JournauxSheetXML.TEMPLATE_ID, JournauxSheetXML.TEMPLATE_PROPERTY_NAME, JournauxSheetXML.TEMPLATE_ID);
register(EtatChargesPayeSheet.TEMPLATE_ID, EtatChargesPayeSheet.TEMPLATE_PROPERTY_NAME, "Etat des charges");
register(FichePayeSheet.TEMPLATE_ID, FichePayeSheet.TEMPLATE_PROPERTY_NAME, "Fiche paye");
register(FichePayeSheetXML.TEMPLATE_ID, FichePayeSheetXML.TEMPLATE_PROPERTY_NAME, "Fiche paye");
register(LivrePayeSheet.TEMPLATE_ID, LivrePayeSheet.TEMPLATE_PROPERTY_NAME, "Livre paye");
register(CourrierClientSheet.TEMPLATE_ID, CourrierClientSheet.TEMPLATE_PROPERTY_NAME, AbstractGenerationDocumentPreferencePanel.getLabelFromTable("COMMANDE"));
register(PointageXmlSheet.TEMPLATE_ID, PointageXmlSheet.TEMPLATE_PROPERTY_NAME, null);
/trunk/OpenConcerto/src/org/openconcerto/erp/config/ServerFinderPanel.java
240,8 → 240,6
}
this.textBase.setText(this.props.getProperty("systemRoot"));
if (getToken() != null) {
this.textIP.setText("Cloud OpenConcerto");
this.textPort.setText("");
this.textFile.setText("");
}
}
/trunk/OpenConcerto/src/product.properties
1,2 → 1,2
NAME=OpenConcerto
VERSION=1.4b2
VERSION=1.4b3