OpenConcerto

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

svn://code.openconcerto.org/openconcerto

Rev

Rev 177 | Rev 182 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 177 Rev 180
Line 116... Line 116...
116 
    private ElementComboBox comboVerificateur = new ElementComboBox();
 116 
    private ElementComboBox comboVerificateur = new ElementComboBox();
117 
    private final ElementComboBox comboBanque = new ElementComboBox();
 117 
    private final ElementComboBox comboBanque = new ElementComboBox();
118 
    private ElementComboBox selectContact;
 118 
    private ElementComboBox selectContact;
119 
    private JLabel labelCompteServ;
 119 
    private JLabel labelCompteServ;
120 
    private ISQLCompteSelector compteSelService;
 120 
    private ISQLCompteSelector compteSelService;
121 
    private static final SQLTable TABLE_PREFS_COMPTE = Configuration.getInstance().getBase().getTable("PREFS_COMPTE");
 - 
 
122 
    private static final SQLRow ROW_PREFS_COMPTE = TABLE_PREFS_COMPTE.getRow(2);
 - 
 
123 
    private final boolean displayDpt;
 121 
    private final boolean displayDpt;
124 
    private final ElementComboBox comboDpt = new ElementComboBox();
 122 
    private final ElementComboBox comboDpt = new ElementComboBox();
125 
 
 123 
 
126 
    private JCheckBox checkCompteServiceAuto;
 124 
    private JCheckBox checkCompteServiceAuto;
127 
 
 125 
 
Line 192... Line 190...
192 
                        // true);
 190 
                        // true);
193 
                    } else {
 191 
                    } else {
194 
                        boxTarif.setValue(foreignRow.getID());
 192 
                        boxTarif.setValue(foreignRow.getID());
195 
                    }
 193 
                    }
196 
                }
 194 
                }
197 
                if (!isFilling()) {
 - 
 
- 
 
 195 
 
198 
                    AvoirClientSQLComponent.this.table.setClient(row, true);
 196 
                AvoirClientSQLComponent.this.table.setClient(row, !isFilling());
199 
                }
 - 
 
200 
 
 197 
 
201 
            } else {
 198 
            } else {
202 
                table.setRowCatComptable(null);
 199 
                table.setRowCatComptable(null);
203 
                selectContact.getRequest().setWhere(Where.FALSE);
 200 
                selectContact.getRequest().setWhere(Where.FALSE);
204 
            }
 201 
            }
Line 219... Line 216...
219 
        this.eltModeRegl.setEditable(InteractionMode.DISABLED);
 216 
        this.eltModeRegl.setEditable(InteractionMode.DISABLED);
220 
        this.eltModeRegl.setCreated(false);
 217 
        this.eltModeRegl.setCreated(false);
221 
 
 218 
 
222 
 
 219 
 
223 
        // Selection du compte de service
 220 
        // Selection du compte de service
- 
 
 221 
        final SQLRow prefs = getTable().getDBRoot().getTable("PREFS_COMPTE").getTable().getRow(2);
224 
        int idCompteVenteService = ROW_PREFS_COMPTE.getInt("ID_COMPTE_PCE_VENTE_SERVICE");
 222 
        int idCompteVenteService = prefs.getInt("ID_COMPTE_PCE_VENTE_SERVICE");
225 
        if (idCompteVenteService <= 1) {
 223 
        if (idCompteVenteService <= 1) {
226 
            try {
 224 
            try {
227 
                idCompteVenteService = ComptePCESQLElement.getIdComptePceDefault("VentesServices");
 225 
                idCompteVenteService = ComptePCESQLElement.getIdComptePceDefault("VentesServices");
228 
            } catch (Exception e) {
 226 
            } catch (Exception e) {
229 
                e.printStackTrace();
 227 
                e.printStackTrace();
Line 652... Line 650...
652 
 
 650 
 
653 
        // FIXME implémenter la remise et les port pour les avoirs
 651 
        // FIXME implémenter la remise et les port pour les avoirs
654 
        JLabel labelPortHT = new JLabel(getLabelFor("PORT_HT"));
 652 
        JLabel labelPortHT = new JLabel(getLabelFor("PORT_HT"));
655 
        labelPortHT.setHorizontalAlignment(SwingConstants.RIGHT);
 653 
        labelPortHT.setHorizontalAlignment(SwingConstants.RIGHT);
656 
        cFrais.gridy++;
 654 
        cFrais.gridy++;
657 
        // panelPortEtRemise.add(labelPortHT, cFrais);
 655 
        panelPortEtRemise.add(labelPortHT, cFrais);
658 
        cFrais.gridx++;
 656 
        cFrais.gridx++;
659 
        DefaultGridBagConstraints.lockMinimumSize(textPortHT);
 657 
        DefaultGridBagConstraints.lockMinimumSize(textPortHT);
660 
        // panelPortEtRemise.add(textPortHT, cFrais);
 658 
        panelPortEtRemise.add(textPortHT, cFrais);
- 
 
 659 
 
- 
 
 660 
        JLabel labelTaxeHT = new JLabel(getLabelFor("ID_TAXE_PORT"));
- 
 
 661 
        labelTaxeHT.setHorizontalAlignment(SwingConstants.RIGHT);
- 
 
 662 
        cFrais.gridx = 1;
- 
 
 663 
        cFrais.gridy++;
- 
 
 664 
        panelPortEtRemise.add(labelTaxeHT, cFrais);
- 
 
 665 
        cFrais.gridx++;
- 
 
 666 
        SQLRequestComboBox boxTaxePort = new SQLRequestComboBox(false, 8);
- 
 
 667 
        panelPortEtRemise.add(boxTaxePort, cFrais);
- 
 
 668 
        this.addView(boxTaxePort, "ID_TAXE_PORT", REQ);
- 
 
 669 
 
- 
 
 670 
        boxTaxePort.addValueListener(new PropertyChangeListener() {
- 
 
 671 
 
- 
 
 672 
            @Override
- 
 
 673 
            public void propertyChange(PropertyChangeEvent evt) {
- 
 
 674 
                totalTTC.updateTotal();
- 
 
 675 
            }
- 
 
 676 
        });
661 
 
 677 
 
662 
        // Remise
 678 
        // Remise
663 
        JLabel labelRemiseHT = new JLabel(getLabelFor("REMISE_HT"));
 679 
        JLabel labelRemiseHT = new JLabel(getLabelFor("REMISE_HT"));
664 
        labelRemiseHT.setHorizontalAlignment(SwingConstants.RIGHT);
 680 
        labelRemiseHT.setHorizontalAlignment(SwingConstants.RIGHT);
665 
        cFrais.gridy++;
 681 
        cFrais.gridy++;
666 
        cFrais.gridx = 1;
 682 
        cFrais.gridx = 1;
667 
        // panelPortEtRemise.add(labelRemiseHT, cFrais);
 683 
        panelPortEtRemise.add(labelRemiseHT, cFrais);
668 
        cFrais.gridx++;
 684 
        cFrais.gridx++;
669 
        DefaultGridBagConstraints.lockMinimumSize(textRemiseHT);
 685 
        DefaultGridBagConstraints.lockMinimumSize(textRemiseHT);
670 
        // panelPortEtRemise.add(textRemiseHT, cFrais);
 686 
        panelPortEtRemise.add(textRemiseHT, cFrais);
671 
        cFrais.gridy++;
 687 
        cFrais.gridy++;
672 
 
 688 
 
673 
        c.gridx++;
 689 
        c.gridx++;
674 
        c.gridy = 0;
 690 
        c.gridy = 0;
675 
        c.gridheight = 2;
 691 
        c.gridheight = 2;
Line 697... Line 713...
697 
        addRequiredSQLObject(fieldService, "MONTANT_SERVICE");
 713 
        addRequiredSQLObject(fieldService, "MONTANT_SERVICE");
698 
        //
 714 
        //
699 
        JTextField poids = new JTextField();
 715 
        JTextField poids = new JTextField();
700 
        if (getTable().getFieldsName().contains("T_POIDS"))
 716 
        if (getTable().getFieldsName().contains("T_POIDS"))
701 
            addSQLObject(poids, "T_POIDS");
 717 
            addSQLObject(poids, "T_POIDS");
702 
        this.totalTTC = new TotalPanel(this.table, fieldEco, fieldHT, fieldTVA, fieldTTC, textPortHT, textRemiseHT, fieldService, null, fieldDevise, poids, null);
 718 
        this.totalTTC = new TotalPanel(this.table, fieldEco, fieldHT, fieldTVA, fieldTTC, textPortHT, textRemiseHT, fieldService, null, fieldDevise, poids, null, boxTaxePort, null);
703 
        totalTTC.setOpaque(false);
 719 
        totalTTC.setOpaque(false);
704 
        c.gridx++;
 720 
        c.gridx++;
705 
        c.gridy = 0;
 721 
        c.gridy = 0;
706 
        c.gridheight = 2;
 722 
        c.gridheight = 2;
707 
        c.fill = GridBagConstraints.BOTH;
 723 
        c.fill = GridBagConstraints.BOTH;