OpenConcerto

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

svn://code.openconcerto.org/openconcerto

Compare Revisions

Regard whitespace Rev 181 → Rev 182

/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/element/SocieteCommonSQLElement.java
1,7 → 1,7
/*
* 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
28,6 → 28,7
import org.openconcerto.sql.model.SQLTable;
import org.openconcerto.sql.model.graph.TablesMap;
import org.openconcerto.sql.sqlobject.ElementComboBox;
import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
import org.openconcerto.sql.sqlobject.SQLTextCombo;
import org.openconcerto.ui.DefaultGridBagConstraints;
import org.openconcerto.ui.FormLayouter;
45,6 → 46,7
import java.util.List;
 
import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
232,6 → 234,18
this.add(fieldIDSoc, c);
this.addView(fieldIDSoc, "ORG_PROTECTION_SOCIAL_ID");
 
c.gridx++;
c.weightx = 0;
JLabel labelIDCC = new JLabel(getLabelFor("ID_IDCC"));
labelIDCC.setHorizontalAlignment(SwingConstants.RIGHT);
this.add(labelIDCC, c);
 
c.gridx++;
c.weightx = 1;
final SQLRequestComboBox comboIDCC = new SQLRequestComboBox();
this.add(comboIDCC, c);
this.addView(comboIDCC, "ID_IDCC");
 
// RCS
c.gridy++;
c.gridx = 0;
316,6 → 330,38
this.addView(fieldPolice, "NUMERO_POLICE");
}
 
// ccode congés payés
JPanel panelAssuj = new JPanel();
 
JCheckBox boxAssujCFP = new JCheckBox(getLabelFor("ASSUJETTISSEMENT_CFP"));
panelAssuj.add(boxAssujCFP);
this.addView(boxAssujCFP, "ASSUJETTISSEMENT_CFP");
 
JCheckBox boxAssujCFPCDD = new JCheckBox(getLabelFor("ASSUJETTISSEMENT_CFP_CDD"));
panelAssuj.add(boxAssujCFPCDD);
this.addView(boxAssujCFPCDD, "ASSUJETTISSEMENT_CFP_CDD");
 
JCheckBox boxAssujTA = new JCheckBox(getLabelFor("ASSUJETTISSEMENT_TA"));
panelAssuj.add(boxAssujTA, c);
this.addView(boxAssujTA, "ASSUJETTISSEMENT_TA");
c.gridy++;
c.gridx = 0;
c.weightx = 0;
c.gridwidth = 2;
this.add(panelAssuj, c);
 
JLabel labelMotifTA = new JLabel(getLabelFor("ID_MOTIF_NON_ASSUJETIS_TA"));
labelMotifTA.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx += 2;
c.gridwidth = 1;
c.weightx = 0;
this.add(labelMotifTA, c);
c.gridx++;
c.weightx = 1;
ElementComboBox boxMotifTA = new ElementComboBox(true);
this.add(boxMotifTA, c);
this.addView(boxMotifTA, "ID_MOTIF_NON_ASSUJETIS_TA");
 
// Adresse
final TitledSeparator sepAdresse = new TitledSeparator(getLabelFor("ID_ADRESSE_COMMON"));
c.gridx = 0;