WebSVN - OpenConcerto - Path Comparison

Ignore whitespace Rev 176 → Rev 177

/trunk/OpenConcerto/src/product.properties
1,5 → 1,5
NAME=OpenConcerto
VERSION=1.6.3
VERSION=1.6.4b6
ORGANIZATION_NAME=OpenConcerto
ORGANIZATION_ID=org.openconcerto

/trunk/OpenConcerto/src/org/openconcerto/sql/UserPropsTM.java
File deleted

 /trunk/OpenConcerto/src/org/openconcerto/sql/TM.java
 ,6 → 14,7
  package org.openconcerto.sql;
 import org.openconcerto.sql.preferences.UserProps;
+import org.openconcerto.utils.i18n.TMPool;
 import java.util.Locale;
 ,18 → 24,22
  *
  * @author Sylvain
  */
-public class TM extends UserPropsTM {
+public class TM extends org.openconcerto.utils.i18n.TM {
-    static private TM INSTANCE;
+    private static final TMPool<TM> POOL = new TMPool<TM>(TM::new);
-    // to be called as soon as UserProps has the correct Locale to initialize other translation
-    // managers
     static public TM getInstance() {
-        if (INSTANCE == null)
-            INSTANCE = new TM();
-        return INSTANCE;
+        return getInstance(getDefaultLocale());
     }
+    static public TM getInstance(final Locale l) {
+        return POOL.get(l);
+    }
+    static public String tr(final Locale l, final String key, final Object... args) {
+        return getInstance(l).translate(key, args);
+    }
     // useful for static import
     static public TM getTM() {
         return getInstance();
 ,14 → 49,7
         return getInstance().translate(key, args);
     }
-    private TM() {
+    private TM(final Locale l) {
+        super(l);
     }
-    @Override
-    protected void updateLocale(final UserProps userProps) {
-        final Locale locale = userProps.getLocale();
-        this.setLocale(locale);
-        org.openconcerto.utils.i18n.TM.getInstance().setLocale(locale);
-        org.openconcerto.ui.TM.getInstance().setLocale(locale);
-    }
 }

 /trunk/OpenConcerto/src/org/openconcerto/sql/model/SQLUpdate.java
 ,6 → 27,20
         this.where = where;
     }
+    public void importValuesFrom(SQLRowAccessor row) {
+        SQLField pk = row.getTable().getKey();
+        for (String field : row.getFields()) {
+            final SQLField sqlField = row.getTable().getField(field);
+            if (!pk.equals(sqlField)) {
+                if (sqlField.isForeignKey()) {
+                    add(sqlField, row.getForeignIDNumber(field));
+                } else {
+                    add(sqlField, row.getObject(field));
+                }
+            }
+        }
+    }
     public void add(SQLField field, Object value) {
         if (this.table == null) {
             this.table = field.getTable();
 ,10 → 98,14
             Object value = this.values.get(i);
             final Class<?> javaType = field.getType().getJavaType();
             Object str = value;
-            if (!javaType.isInstance(value)) {
-                str = SQLRowValues.convert(value.getClass(), value, javaType);
+            if (value != null) {
+                if (!javaType.isInstance(value)) {
+                    str = SQLRowValues.convert(value.getClass(), value, javaType);
+                }
+                builder.append(field.getType().toString(str));
+            } else {
+                builder.append("null");
             }
-            builder.append(field.getType().toString(str));
             if (i < stop - 1) {
                 builder.append(',');
             }

 /trunk/OpenConcerto/src/org/openconcerto/sql/model/SQLInsert.java
 ,11 → 13,15
  package org.openconcerto.sql.model;
+import org.openconcerto.sql.users.User;
 import java.io.IOException;
 import java.io.StringReader;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 ,6 → 36,28
     private List<Object> values = new ArrayList<>();
     private SQLTable table;
+    public void importValuesFrom(SQLRowAccessor row) {
+        SQLField pk = row.getTable().getKey();
+        for (String field : row.getFields()) {
+            final SQLField sqlField = row.getTable().getField(field);
+            if (!pk.equals(sqlField)) {
+                if (sqlField.isForeignKey()) {
+                    add(sqlField, row.getForeignIDNumber(field));
+                } else {
+                    add(sqlField, row.getObject(field));
+                }
+            }
+        }
+    }
+    public int getFieldsSize() {
+        return this.fields.size();
+    }
+    public List<SQLField> getFields() {
+        return Collections.unmodifiableList(this.fields);
+    }
     public void add(SQLField field, Object value) {
         if (this.table == null) {
             this.table = field.getTable();
 ,6 → 66,10
                 throw new IllegalArgumentException(field + " is not in table " + this.table.toString());
             }
         }
+        int index = this.fields.indexOf(field);
+        if (index >= 0) {
+            throw new IllegalArgumentException(field + " field already in list");
+        }
         this.fields.add(field);
         this.values.add(value);
     }
 ,6 → 89,23
         this.values.set(index, value);
     }
+    public void addCreationTrackedField(User u, SQLTable table) {
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        final SQLField creationDateField = table.getCreationDateField();
+        final SQLField creationUserField = table.getCreationUserField();
+        if (creationDateField != null && creationUserField != null) {
+            add(creationDateField, now);
+            add(creationUserField, u.getId());
+        }
+        final SQLField modifDateField = table.getModifDateField();
+        final SQLField modifUserField = table.getModifUserField();
+        if (modifDateField != null && modifUserField != null) {
+            add(modifDateField, now);
+            add(modifUserField, u.getId());
+        }
+    }
     public boolean contains(SQLField field) {
         return this.fields.indexOf(field) >= 0;
     }
 ,11 → 142,15
             final SQLField field = this.fields.get(i);
             final Class<?> javaType = field.getType().getJavaType();
             Object str = value;
-            if (value != null && !javaType.isInstance(value)) {
-                str = SQLRowValues.convert(value.getClass(), value, javaType);
+            if (value != null) {
+                if (!javaType.isInstance(value)) {
+                    str = SQLRowValues.convert(value.getClass(), value, javaType);
+                }
+                builder.append(field.getType().toString(str));
+            } else {
+                builder.append("null");
             }
-            builder.append(field.getType().toString(str));
             if (i < stop - 1) {
                 builder.append(',');
             }

 /trunk/OpenConcerto/src/org/openconcerto/sql/model/SQLInjector.java
 ,9 → 25,12
 import org.openconcerto.utils.cc.ITransformer;
 import java.sql.SQLException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 ,6 → 189,8
     }
+    DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
     protected void transfertNumberReference(SQLRowAccessor srcRow, SQLRowValues rowVals, final SQLTable tableElementDestination, String refField) {
         SQLPreferences prefs = SQLPreferences.getMemCached(srcRow.getTable().getDBRoot());
 ,14 → 197,27
         if (prefs.getBoolean("TransfertRef", true)) {
             String label = rowVals.getString("NOM");
             if (label != null && label.trim().length() > 0) {
-                rowVals.put("NOM", label + ", " + srcRow.getString("NUMERO"));
+                final String value = label + ", " + srcRow.getString("NUMERO");
+                List<String> l = StringUtils.fastSplit(value, ',');
+                Set<String> s = new HashSet<>(l);
+                String nom = "";
+                if (s.size() > 1) {
+                    for (String string : s) {
+                        nom += string + ",";
+                    }
+                } else if (s.size() == 1) {
+                    nom = s.iterator().next();
+                }
+                rowVals.put("NOM", nom);
             } else {
                 rowVals.put("NOM", srcRow.getString("NUMERO"));
             }
         } else if (prefs.getBoolean("TransfertMultiRef", false)) {
             SQLRowValues rowValsHeader = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(tableElementDestination));
+            // FIXME Style forcé en titre 1 via l'ID
+            rowValsHeader.put("ID_STYLE", 3);
             String elementName = StringUtils.firstUp(Configuration.getInstance().getDirectory().getElement(getSource()).getName().getVariant(org.openconcerto.utils.i18n.Grammar.SINGULAR));
-            rowValsHeader.put("NOM", elementName + " N° " + srcRow.getString("NUMERO"));
+            rowValsHeader.put("NOM", elementName + "\n N° " + srcRow.getString("NUMERO") + " du " + dateFormat.format(srcRow.getDate("DATE").getTime()));
             rowValsHeader.put(refField, rowVals);
         }
     }

 /trunk/OpenConcerto/src/org/openconcerto/sql/model/SQLTable.java
 ,6 → 123,7
     @SuppressWarnings("unchecked")
     public static final Map<String, Number> getUndefIDs(final SQLSchema schema) {
+        assert Thread.holdsLock(UNDEFINED_IDs);
         if (!UNDEFINED_IDs.containsKey(schema)) {
             final Map<String, Number> r;
             if (schema.contains(undefTable)) {
 ,6 → 165,14
         }
     }
+    public static final Map<String, Number> getUndefinedIDs(final SQLSchema schema) {
+        final Map<String, Number> res;
+        synchronized (UNDEFINED_IDs) {
+            res = new HashMap<>(getUndefIDs(schema));
+        }
+        return Collections.unmodifiableMap(res);
+    }
     private static final SQLCreateMoveableTable getCreateUndefTable(SQLSyntax syntax) {
         final SQLCreateMoveableTable createTable = new SQLCreateMoveableTable(syntax, undefTable);
         createTable.addVarCharColumn(UNDEF_TABLE_TABLENAME_FIELD, 250);

 /trunk/OpenConcerto/src/org/openconcerto/sql/view/list/UpdateQueue.java
 ,7 → 46,7
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
 import java.util.logging.Level;
 import net.jcip.annotations.GuardedBy;
 ,7 → 59,7
      * @param f a task in this queue, can be <code>null</code>.
      * @return <code>true</code> if <code>f</code> loads from the db.
      */
-    static boolean isUpdate(FutureTask<?> f) {
+    static boolean isUpdate(RunnableFuture<?> f) {
         return isUpdate(SearchQueue.getRunnable(f));
     }
 ,15 → 103,15
     // TODO rm : needed for now since our optimizations are false if there's a where not on the
     // primary table, see http://192.168.1.10:3000/issues/show/22
     private boolean alwaysUpdateAll = false;
-    private final IClosure<Deque<FutureTask<?>>> cancelClosure;
+    private final IClosure<Deque<RunnableFuture<?>>> cancelClosure;
     public UpdateQueue(ITableModel model) {
         super(UpdateQueue.class.getSimpleName() + " on " + model);
         this.tableModel = model;
         this.fullList = new ArrayList<ListSQLLine>();
-        this.cancelClosure = createCancelClosure(this, new ITransformer<FutureTask<?>, TaskType>() {
+        this.cancelClosure = createCancelClosure(this, new ITransformer<RunnableFuture<?>, TaskType>() {
             @Override
-            public TaskType transformChecked(FutureTask<?> input) {
+            public TaskType transformChecked(RunnableFuture<?> input) {
                 final Runnable r = SearchQueue.getRunnable(input);
                 if (isCancelableUpdate(r))
                     return TaskType.COMPUTE;
 ,9 → 377,9
         // use tasksDo() so that no other runnable can come between setState and updateAll.
         // Otherwise an updateOne might use new columns and add a line with different columns than
         // the full list.
-        this.tasksDo(new IClosure<Deque<FutureTask<?>>>() {
+        this.tasksDo(new IClosure<Deque<RunnableFuture<?>>>() {
             @Override
-            public void executeChecked(Deque<FutureTask<?>> input) {
+            public void executeChecked(Deque<RunnableFuture<?>> input) {
                 put(new SetStateRunnable() {
                     @Override
                     public void run() {
 ,7 → 528,7
     }
     @Override
-    protected void willPut(final FutureTask<?> qr) throws InterruptedException {
+    protected void willPut(final RunnableFuture<?> qr) throws InterruptedException {
         if (SearchQueue.getRunnable(qr) instanceof ChangeAllRunnable) {
             // si on met tout à jour, ne sert à rien de garder les maj précédentes.
             this.tasksDo(this.cancelClosure);
 ,16 → 546,16
         }
     }
-    static public final IClosure<Deque<FutureTask<?>>> createCancelClosure(final SleepingQueue q, final ITransformer<? super FutureTask<?>, TaskType> cancelablePred) {
-        return new IClosure<Deque<FutureTask<?>>>() {
+    static public final IClosure<Deque<RunnableFuture<?>>> createCancelClosure(final SleepingQueue q, final ITransformer<? super RunnableFuture<?>, TaskType> cancelablePred) {
+        return new IClosure<Deque<RunnableFuture<?>>>() {
             @Override
-            public void executeChecked(final Deque<FutureTask<?>> tasks) {
+            public void executeChecked(final Deque<RunnableFuture<?>> tasks) {
                 // on part de la fin et on supprime toutes les maj jusqu'a ce qu'on trouve
                 // un runnable qui n'est pas annulable
-                final Iterator<FutureTask<?>> iter = tasks.descendingIterator();
+                final Iterator<RunnableFuture<?>> iter = tasks.descendingIterator();
                 boolean needsPrevious = false;
                 while (iter.hasNext() && !needsPrevious) {
-                    final FutureTask<?> current = iter.next();
+                    final RunnableFuture<?> current = iter.next();
                     final TaskType type = cancelablePred.transformChecked(current);
                     needsPrevious = type.dependsOnPrevious;
                     if (type.cancelable)
 ,7 → 565,7
                 if (!needsPrevious) {
                     // before trying to cancel being run we should have been through all the backlog
                     assert !iter.hasNext();
-                    final FutureTask<?> br = q.getBeingRun();
+                    final RunnableFuture<?> br = q.getBeingRun();
                     if (br != null && cancelablePred.transformChecked(br).cancelable) {
                         // might already be done by now, but it's OK cancel() will just return false
                         br.cancel(true);

 /trunk/OpenConcerto/src/org/openconcerto/sql/view/list/RowValuesTableModel.java
 ,19 → 16,23
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.model.Constraint;
 import org.openconcerto.sql.model.SQLField;
+import org.openconcerto.sql.model.SQLInsert;
 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.SQLRowValuesCluster.StoreMode;
+import org.openconcerto.sql.model.SQLRowValuesCluster.StoreResult;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLSyntax.ConstraintType;
 import org.openconcerto.sql.model.SQLTable;
+import org.openconcerto.sql.model.SQLUpdate;
 import org.openconcerto.sql.model.UndefinedRowValuesCache;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.utils.AlterTable;
 import org.openconcerto.utils.CompareUtils;
 import org.openconcerto.utils.ExceptionHandler;
+import org.openconcerto.utils.ListMap;
 import org.openconcerto.utils.OrderedSet;
 import java.math.BigDecimal;
 ,6 → 287,13
      * Valider les modifications dans la base
      */
     public void commitData() {
+        commitData(false);
+    }
+    /**
+     * Valider les modifications dans la base
+     */
+    public void commitData(boolean useMultipleInsertUpdate) {
         checkEDT();
         final List<SQLRowValues> rowsToCommmit = new ArrayList<SQLRowValues>();
         rowsToCommmit.addAll(this.rowValues);
 ,17 → 307,63
                 table.fetchFields();
                 table.getSchema().updateVersion();
             }
             BigDecimal o = table.getMaxOrder(Boolean.FALSE);
             final int size = rowsToCommmit.size();
-            for (int i = 0; i < size; i++) {
-                final SQLRowValues r = rowsToCommmit.get(i);
-                r.put(r.getTable().getOrderField().getFieldName(), o.add(new BigDecimal(i + 1)));
-                final SQLRow row = r.getGraph().store(StoreMode.COMMIT).getStoredRow(r);
-                r.setID(row.getIDNumber());
+            if (useMultipleInsertUpdate) {
+                List<SQLUpdate> updates = new ArrayList<>();
+                ListMap<List<SQLField>, SQLInsert> mapInsertByFields = new ListMap<>();
+                ListMap<List<SQLField>, SQLRowValues> mapInsertRowValues = new ListMap<>();
+                for (int i = 0; i < size; i++) {
+                    final SQLRowValues r = rowsToCommmit.get(i);
+                    r.put(r.getTable().getOrderField().getFieldName(), o.add(new BigDecimal(i + 1)));
+                    if (r.hasID()) {
+                        SQLUpdate up = new SQLUpdate(new Where(table.getKey(), "=", r.getID()));
+                        up.importValuesFrom(r);
+                        updates.add(up);
+                    } else {
+                        SQLInsert insert = new SQLInsert();
+                        insert.importValuesFrom(r);
+                        List<SQLField> fields = insert.getFields();
+                        mapInsertByFields.add(fields, insert);
+                        mapInsertRowValues.add(fields, r);
+                    }
+                }
+                if (!mapInsertByFields.isEmpty()) {
+                    for (List<SQLField> fieldSize : mapInsertByFields.keySet()) {
+                        List<Number> ids = SQLInsert.executeSimilarInserts(table.getDBSystemRoot(), mapInsertByFields.get(fieldSize), true);
+                        List<SQLRowValues> insertsRowValues = mapInsertRowValues.get(fieldSize);
+                        if (ids.size() == insertsRowValues.size()) {
+                            for (int i = 0; i < ids.size(); i++) {
+                                final SQLRowValues r = insertsRowValues.get(i);
+                                r.setID(ids.get(i));
+                            }
+                        }
+                    }
+                }
+                if (!updates.isEmpty()) {
+                    SQLUpdate.executeMultipleWithBatch(table.getDBSystemRoot(), updates);
+                }
+                table.fireTableModified(-1);
+            } else {
+                for (int i = 0; i < size; i++) {
+                    final SQLRowValues r = rowsToCommmit.get(i);
+                    r.put(r.getTable().getOrderField().getFieldName(), o.add(new BigDecimal(i + 1)));
+                    final StoreResult store = r.getGraph().store(StoreMode.COMMIT, false);
+                    final SQLRow row = store.getStoredRow(r);
+                    r.setID(row.getIDNumber());
+                }
             }
         } catch (SQLException e) {
             ExceptionHandler.handle("Unable to commit rows", e);
         }
     }
     public void addTableModelListener(TableModelListener l) {
 ,7 → 657,7
             final List<SQLRowValues> newRows = new ArrayList<SQLRowValues>();
-            if (rowVals.getID() > 1) {
+            if (rowVals.hasID() && !rowVals.isUndefined() && rowVals.getID() != SQLRow.NONEXISTANT_ID) {
                 SQLRow row = rowVals.getTable().getRow(rowVals.getID());
                 List<SQLRow> rowSet;
                 if (referentField == null) {

 /trunk/OpenConcerto/src/org/openconcerto/sql/view/list/ITableModel.java
 ,7 → 47,7
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 ,7 → 198,7
             @Override
             public void propertyChange(final PropertyChangeEvent evt) {
                 if (evt.getPropertyName().equals("beingRun")) {
-                    final boolean isLoading = UpdateQueue.isUpdate((FutureTask<?>) evt.getNewValue());
+                    final boolean isLoading = UpdateQueue.isUpdate((RunnableFuture<?>) evt.getNewValue());
                     SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {
 ,7 → 222,7
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 if (evt.getPropertyName().equals("beingRun")) {
-                    final boolean isSearching = SearchQueue.isSearch((FutureTask<?>) evt.getNewValue());
+                    final boolean isSearching = SearchQueue.isSearch((RunnableFuture<?>) evt.getNewValue());
                     SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {

 /trunk/OpenConcerto/src/org/openconcerto/sql/view/list/search/SearchQueue.java
 ,7 → 30,7
 import java.util.Collection;
 import java.util.Deque;
-import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
 import javax.swing.SwingUtilities;
 ,12 → 45,12
      * @param f a task in this queue, can be <code>null</code>.
      * @return <code>true</code> if <code>f</code> searches.
      */
-    public static boolean isSearch(final FutureTask<?> f) {
+    public static boolean isSearch(final RunnableFuture<?> f) {
         final Runnable r = getRunnable(f);
         return r instanceof SearchRunnable && ((SearchRunnable) r).performsSearch();
     }
-    public static Runnable getRunnable(final FutureTask<?> f) {
+    public static Runnable getRunnable(final RunnableFuture<?> f) {
         if (f instanceof IFutureTask)
             return ((IFutureTask<?>) f).getRunnable();
         else
 ,7 → 75,7
     SearchSpec search;
     private final ListAccess listAccess;
     // thread-safe
-    private final IClosure<Deque<FutureTask<?>>> cancelClosure;
+    private final IClosure<Deque<RunnableFuture<?>>> cancelClosure;
     public SearchQueue(final ListAccess la) {
         super(SearchQueue.class.getName() + " on " + la.getModel());
 ,9 → 82,9
         this.listAccess = la;
         this.model = la.getModel();
         this.search = null;
-        this.cancelClosure = UpdateQueue.createCancelClosure(this, new ITransformer<FutureTask<?>, TaskType>() {
+        this.cancelClosure = UpdateQueue.createCancelClosure(this, new ITransformer<RunnableFuture<?>, TaskType>() {
             @Override
-            public TaskType transformChecked(FutureTask<?> input) {
+            public TaskType transformChecked(RunnableFuture<?> input) {
                 final Runnable r = getRunnable(input);
                 if (r instanceof SearchRunnable)
                     return TaskType.COMPUTE;
 ,9 → 137,9
         // couldn't cancel it.
         // use tasksDo() so that no other runnable can come between setSearch and searchAll.
         // Otherwise a runnable might the new search query but not the new filtered list.
-        this.tasksDo(new IClosure<Deque<FutureTask<?>>>() {
+        this.tasksDo(new IClosure<Deque<RunnableFuture<?>>>() {
             @Override
-            public void executeChecked(Deque<FutureTask<?>> input) {
+            public void executeChecked(Deque<RunnableFuture<?>> input) {
                 put(new SetStateRunnable() {
                     @Override
                     public void run() {
 ,7 → 164,7
     }
     @Override
-    protected void willPut(final FutureTask<?> qr) throws InterruptedException {
+    protected void willPut(final RunnableFuture<?> qr) throws InterruptedException {
         if (getRunnable(qr) instanceof SearchAll) {
             // si on recherche tout, ne sert à rien de garder les recherches précédentes.
             this.tasksDo(this.cancelClosure);

 /trunk/OpenConcerto/src/org/openconcerto/sql/view/list/SQLTableModelLinesSourceOffline.java
 ,7 → 300,7
     // *** Modify virtual rows ***
     private final <T> Future<T> execInUpdateQ(final OfflineCallable<T> call) {
-        return this.getModel().getUpdateQ().execute(new FutureTask<T>(call));
+        return this.getModel().getUpdateQ().add(new FutureTask<T>(call));
     }
     public final Future<Number> add(final SQLRowValues vals) {

 /trunk/OpenConcerto/src/org/openconcerto/sql/view/list/RowValuesTableControlPanel.java
 ,7 → 195,11
         for (String elt : this.table.getClearCloneTableElement()) {
             if (rowValsBis.getTable().getFieldsName().contains(elt)) {
-                rowValsBis.putEmptyLink(elt);
+                if (rowValsBis.getTable().getField(elt).isKey()) {
+                    rowValsBis.putEmptyLink(elt);
+                } else {
+                    rowValsBis.put(elt, this.model.getDefaultRowValues().getObject(elt));
+                }
             }
         }

 /trunk/OpenConcerto/src/org/openconcerto/sql/PropsConfiguration.java
 ,6 → 70,7
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.ResourceBundle.Control;
 import java.util.Set;
 ,6 → 210,8
     private BaseDirs baseDirs;
     @GuardedBy("restLock")
     private File logDir;
+    @GuardedBy("restLock")
+    private Locale locale = Locale.getDefault();
     private final boolean inIDE;
     // split sql tree and the rest since creating the tree is costly
 ,7 → 1001,7
     }
     protected final SQLFieldTranslator loadTranslations(final SQLFieldTranslator trns, final DBRoot root, final List<String> mappings) {
-        final Locale locale = TM.getInstance().getTranslationsLocale();
+        final Locale locale = this.getLocale();
         final Control cntrl = TranslationManager.getControl();
         boolean found = false;
         // better to have a translation in the correct language than a translation for the correct
 ,6 → 1376,13
         }
     }
+    @Override
+    public Locale getLocale() {
+        synchronized (this.restLock) {
+            return this.locale;
+        }
+    }
     // *** setters
     // MAYBE add synchronized (not necessary since they're private, and only called with the lock)
 ,6 → 1407,24
         this.wd = dir;
     }
+    public void setLocale(Locale locale) {
+        Objects.requireNonNull(locale);
+        // don't create the directory
+        final boolean localeChangedAndDirExists;
+        synchronized (this.restLock) {
+            if (locale.equals(this.locale)) {
+                localeChangedAndDirExists = false;
+            } else {
+                this.locale = locale;
+                localeChangedAndDirExists = this.directory.isComputeStarted();
+            }
+        }
+        if (localeChangedAndDirExists) {
+            final SQLElementDirectory dir = this.getDirectory();
+            dir.setTranslator(createTranslator(dir));
+        }
+    }
     public FieldMapper getFieldMapper() {
         return fieldMapper;
     }

 /trunk/OpenConcerto/src/org/openconcerto/sql/ui/ConnexionPanel.java
 ,6 → 15,7
 import static org.openconcerto.sql.TM.getTM;
 import org.openconcerto.sql.Configuration;
+import org.openconcerto.sql.PropsConfiguration;
 import org.openconcerto.sql.TM;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLTable;
 ,6 → 57,7
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 ,6 → 515,18
         this.buttonConnect.setText(bundle.getString("buttonConnect"));
         this.langButton.setText(locale.getLanguage());
         this.langButton.setVisible(true);
+        // for next launch
         UserProps.getInstance().setLocale(locale);
+        // for current run
+        ((PropsConfiguration) Configuration.getInstance()).setLocale(locale);
+        // for code that will never need more than one Locale concurrently
+        // (e.g. used by TM singletons in various packages)
+        Locale.setDefault(locale);
+        // as explained in Locale.setDefault() javadoc : "be prepared to reinitialize
+        // locale-sensitive code"
+        JComponent.setDefaultLocale(locale);
+        // throw RuntimeException like ResourceBundle.getBundle() at the beginning of this
+        // method
+        TranslationManager.createDefaultInstance();
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/sql/ui/SoftwareInfoPanel.java
 ,6 → 30,7
 import org.openconcerto.utils.i18n.I18nUtils;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import javax.swing.JLabel;
 ,15 → 51,15
     public static final IFactory<String> FACTORY = new IFactory<String>() {
         @Override
         public String createChecked() {
-            return get(false).toString();
+            return get(false, Locale.ENGLISH).toString();
         }
     };
-    public static Map<Info, String> get(final boolean html) {
+    public static Map<Info, String> get(final boolean html, final Locale locale) {
         final Map<Info, String> res = new HashMap<Info, String>();
         final UserRightsManager userRightsManager = UserRightsManager.getInstance();
-        res.put(Info.RIGHTS, org.openconcerto.utils.i18n.TM.tr(I18nUtils.getYesNoKey(userRightsManager != null)));
+        res.put(Info.RIGHTS, org.openconcerto.utils.i18n.TM.tr(locale, I18nUtils.getYesNoKey(userRightsManager != null)));
         final User user = UserManager.getUser();
         if (user != null) {
             final UserRights userRights = UserRightsManager.getCurrentUserRights();
 ,11 → 79,11
         final String name, version;
         if (productInfo == null) {
-            name = TM.tr("infoPanel.noAppName");
-            version = TM.tr("infoPanel.noVersion");
+            name = TM.tr(locale, "infoPanel.noAppName");
+            version = TM.tr(locale, "infoPanel.noVersion");
         } else {
             name = productInfo.getName();
-            version = productInfo.getProperty(ProductInfo.VERSION, TM.tr("infoPanel.noVersion"));
+            version = productInfo.getProperty(ProductInfo.VERSION, TM.tr(locale, "infoPanel.noVersion"));
         }
         res.put(Info.APP_NAME, name);
         res.put(Info.APP_VERSION, version);
 ,12 → 94,12
         if (conf != null)
             res.put(Info.DB_URL, conf.getSystemRoot().getDataSource().getUrl());
         if (conf != null) {
-            final String logs = propsConf == null ? "" : " ; " + SystemInfo.getLink(TM.tr("infoPanel.logs"), propsConf.getLogDir().toURI(), html);
+            final String logs = propsConf == null ? "" : " ; " + SystemInfo.getLink(TM.tr(locale, "infoPanel.logs"), propsConf.getLogDir().toURI(), html);
             final BaseDirs baseDirs = conf.getBaseDirs();
-            String dirs = " ; " + SystemInfo.getLink(TM.tr("infoPanel.dataDir"), baseDirs.getAppDataFolder().toURI(), html);
-            dirs = dirs + " ; " + SystemInfo.getLink(TM.tr("infoPanel.prefsDir"), baseDirs.getPreferencesFolder().toURI(), html);
-            dirs = dirs + " ; " + SystemInfo.getLink(TM.tr("infoPanel.cacheDir"), baseDirs.getCacheFolder().toURI(), html);
-            res.put(Info.DIRS, SystemInfo.getLink(TM.tr("infoPanel.docs"), conf.getWD().toURI(), html) + logs + dirs);
+            String dirs = " ; " + SystemInfo.getLink(TM.tr(locale, "infoPanel.dataDir"), baseDirs.getAppDataFolder().toURI(), html);
+            dirs = dirs + " ; " + SystemInfo.getLink(TM.tr(locale, "infoPanel.prefsDir"), baseDirs.getPreferencesFolder().toURI(), html);
+            dirs = dirs + " ; " + SystemInfo.getLink(TM.tr(locale, "infoPanel.cacheDir"), baseDirs.getCacheFolder().toURI(), html);
+            res.put(Info.DIRS, SystemInfo.getLink(TM.tr(locale, "infoPanel.docs"), conf.getWD().toURI(), html) + logs + dirs);
         }
         return res;
 ,31 → 107,33
     private final FormLayouter l;
-    public SoftwareInfoPanel() {
+    public SoftwareInfoPanel(final Locale locale) {
         this.l = new FormLayouter(this, 1);
-        this.refresh();
+        this.refresh(locale);
     }
-    public final void refresh() {
+    public final void refresh(final Locale locale) {
         this.l.clear();
-        final Map<Info, String> infos = get(true);
-        this.l.add(TM.tr("infoPanel.rights"), new JLabel(infos.get(Info.RIGHTS)));
+        final Map<Info, String> infos = get(true, locale);
+        this.l.add(TM.tr(locale, "infoPanel.rights"), new JLabel(infos.get(Info.RIGHTS)));
         final String user = infos.get(Info.USER);
         if (user != null) {
-            this.l.add(org.openconcerto.utils.i18n.TM.tr("user"), new JLabel(user));
+            this.l.add(org.openconcerto.utils.i18n.TM.tr(locale, "user"), new JLabel(user));
         }
-        this.l.add(TM.tr("infoPanel.appName"), new JLabel(infos.get(Info.APP_NAME)));
-        this.l.add(TM.tr("infoPanel.version"), new JLabel(infos.get(Info.APP_VERSION)));
+        this.l.add(TM.tr(locale, "infoPanel.appName"), new JLabel(infos.get(Info.APP_NAME)));
+        this.l.add(TM.tr(locale, "infoPanel.version"), new JLabel(infos.get(Info.APP_VERSION)));
         final String secureLink = infos.get(Info.SECURE_LINK);
         if (secureLink != null) {
-            this.l.add(TM.tr("infoPanel.secureLink"), new JLabel(secureLink));
+            this.l.add(TM.tr(locale, "infoPanel.secureLink"), new JLabel(secureLink));
         }
         final JLabel dbURL = new JLabel(infos.get(Info.DB_URL));
         if (dbURL != null)
-            this.l.add(TM.tr("infoPanel.dbURL"), dbURL);
+            this.l.add(TM.tr(locale, "infoPanel.dbURL"), dbURL);
         final String dirs = infos.get(Info.DIRS);
         if (dirs != null)
-            this.l.add(TM.tr("infoPanel.dirs"), new HTMLTextField(dirs));
+            this.l.add(TM.tr(locale, "infoPanel.dirs"), new HTMLTextField(dirs));
+        this.l.getComponent().revalidate();
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/sql/ui/InfoPanel.java
 ,6 → 23,7
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Arrays;
+import java.util.Locale;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 ,25 → 33,28
  */
 public class InfoPanel extends JPanel {
-    public InfoPanel() {
+    private final Locale locale;
+    public InfoPanel(final Locale locale) {
         super(new GridBagLayout());
+        this.locale = locale;
         final GridBagConstraints c = new DefaultGridBagConstraints();
         c.weightx = 1;
         c.weighty = 1;
         this.add(createTitle("infoPanel.softwareTitle"), c);
         c.gridy++;
-        this.add(new SoftwareInfoPanel(), c);
+        this.add(new SoftwareInfoPanel(locale), c);
         c.gridy++;
         this.add(createTitle("infoPanel.systemTitle"), c);
         c.gridy++;
-        this.add(new SystemInfoPanel(), c);
+        this.add(new SystemInfoPanel(locale), c);
     }
     private JLabel createTitle(final String text) {
-        final JLabel res = new JLabel(TM.tr(text));
+        final JLabel res = new JLabel(TM.tr(this.locale, text));
         final Font font = res.getFont();
         res.setFont(font.deriveFont(font.getSize2D() * 1.2f).deriveFont(Font.BOLD));
-        res.setToolTipText(TM.tr("infoPanel.refresh"));
+        res.setToolTipText(TM.tr(this.locale, "infoPanel.refresh"));
         res.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
 ,8 → 70,8
     private final void refresh(final int index) {
         if (index < 0 || index == 1)
-            ((SoftwareInfoPanel) this.getComponent(1)).refresh();
+            ((SoftwareInfoPanel) this.getComponent(1)).refresh(this.locale);
         if (index < 0 || index == 3)
-            ((SystemInfoPanel) this.getComponent(3)).refresh();
+            ((SystemInfoPanel) this.getComponent(3)).refresh(this.locale);
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/sql/Configuration.java
 ,6 → 40,7
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 ,6 → 209,10
         return DBItemFileCache.getDescendant(getDBConfDir(), DBFileCache.getJDBCAncestorNames(db, true));
     }
+    public Locale getLocale() {
+        return Locale.getDefault();
+    }
     /**
      * Add the directory of <code>o</code> to this.
      *

 /trunk/OpenConcerto/src/org/openconcerto/sql/request/BaseFillSQLRequest.java
 ,7 → 14,6
  package org.openconcerto.sql.request;
 import org.openconcerto.sql.FieldExpander;
-import org.openconcerto.sql.TM;
 import org.openconcerto.sql.model.FieldRef;
 import org.openconcerto.sql.model.IFieldPath;
 import org.openconcerto.sql.model.OrderComparator;
 ,7 → 613,9
         if (type.getJavaType() == String.class) {
             return Collections.singletonList(selF.getFieldRef());
         } else if (type.getJavaType() == Boolean.class) {
-            return Collections.singletonList("case when " + selF.getFieldRef() + " then " + syntax.quoteString(TM.tr("true_key")) + " else " + syntax.quoteString(TM.tr("false_key")) + " end");
+            final org.openconcerto.utils.i18n.TM utilsTM = org.openconcerto.utils.i18n.TM.getInstance(l);
+            return Collections.singletonList(
+                    "case when " + selF.getFieldRef() + " then " + syntax.quoteString(utilsTM.translate("true_key")) + " else " + syntax.quoteString(utilsTM.translate("false_key")) + " end");
         } else if (Timestamp.class.isAssignableFrom(type.getJavaType())) {
             final String shortFmt = formatTime(selF, DateProp.SHORT_DATETIME_SKELETON, l, syntax);
             final String longFmt = formatTime(selF, DateProp.LONG_DATETIME_SKELETON, l, syntax);

 /trunk/OpenConcerto/src/org/openconcerto/utils/cc/ExceptionFuture.java
 New file
 ,0 → 1,55
+/*
+ * 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.utils.cc;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+public class ExceptionFuture<V, X extends Exception, X2 extends Exception> extends FutureTask<V> {
+    static public class OneExceptionFuture<V, X extends Exception> extends ExceptionFuture<V, X, RuntimeException> {
+        public <X2 extends RuntimeException> OneExceptionFuture(final I2ExnFactory<? extends V, ? extends X, ? extends RuntimeException> cl) {
+            super(cl, RuntimeException.class);
+        }
+    }
+    private final Class<X2> exnClass;
+    public ExceptionFuture(final I2ExnFactory<? extends V, ? extends X, ? extends X2> cl, final Class<X2> exnClass) {
+        super(cl::createChecked);
+        this.exnClass = exnClass;
+    }
+    public final V getWithOriginalException() throws InterruptedException, X, X2 {
+        try {
+            return this.get();
+        } catch (ExecutionException e) {
+            final Throwable cause = e.getCause();
+            if (cause instanceof Error) {
+                throw (Error) cause;
+            } else if (cause instanceof RuntimeException) {
+                throw (RuntimeException) cause;
+                // Not strictly necessary but it feels more robust than to cast "cause" to X even
+                // when it's really X2
+            } else if (this.exnClass.isInstance(cause)) {
+                throw this.exnClass.cast(cause);
+            } else {
+                // our Callable throws X or X2 but the latter is already handled above.
+                @SuppressWarnings("unchecked")
+                final X casted = (X) cause;
+                throw casted;
+            }
+        }
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/utils/cc/IncludeExclude.java
 ,6 → 17,7
 import org.openconcerto.utils.CompareUtils;
 import org.openconcerto.utils.Tuple2;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 ,6 → 48,11
         return (IncludeExclude<T>) FULL;
     }
+    @SafeVarargs
+    public static <T> IncludeExclude<T> getNormalized(final T... includes) {
+        return getNormalized(Arrays.asList(includes));
+    }
     public static <T> IncludeExclude<T> getNormalized(final Collection<? extends T> includes) {
         return getNormalized(includes, Collections.<T> emptySet());
     }
 ,6 → 115,8
      * @return <code>true</code> if is in include and not in exclude.
      */
     public final boolean isIncluded(final T s) {
+        // "if" order is irrelevant since those methods use getNormal() and it can't be both "all"
+        // and "none".
         if (this.isAllIncluded())
             return true;
         else if (this.isNoneIncluded())
 ,6 → 178,7
      * @return <code>true</code> if {@link #isIncluded(Object)} always return <code>true</code>
      */
     public final boolean isAllIncluded() {
+        // use normalized value to avoid ambiguous "include all" and "exclude all"
         return this.normal == FULL;
     }
 ,6 → 188,7
      * @return <code>true</code> if {@link #isIncluded(Object)} always return <code>false</code>
      */
     public final boolean isNoneIncluded() {
+        // use normalized value to avoid ambiguous "include all" and "exclude all"
         return this.normal == EMPTY;
     }
 ,6 → 222,11
             return ifNoSole;
     }
+    @SafeVarargs
+    public final IncludeExclude<T> include(final T... items) {
+        return this.include(Arrays.asList(items));
+    }
     public final IncludeExclude<T> include(final Collection<? extends T> items) {
         if (this.areAllIncluded(items))
             return this;
 ,6 → 253,11
         return new IncludeExclude<T>(newIncludes, newExcludes, false, false);
     }
+    @SafeVarargs
+    public final IncludeExclude<T> exclude(final T... items) {
+        return this.exclude(Arrays.asList(items));
+    }
     public final IncludeExclude<T> exclude(final Collection<? extends T> items) {
         if (this.areNoneIncluded(items))
             return this;

 /trunk/OpenConcerto/src/org/openconcerto/utils/cc/TransformerFuture.java
 ,10 → 14,9
  package org.openconcerto.utils.cc;
 import org.openconcerto.utils.Value;
+import org.openconcerto.utils.cc.ExceptionFuture.OneExceptionFuture;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
 ,13 → 24,13
 public class TransformerFuture<E, T, X extends Exception> implements ITransformerFuture<E, T, X> {
     private final AtomicReference<Value<E>> input;
-    private final FutureTask<T> f;
+    private final OneExceptionFuture<T, X> f;
     public TransformerFuture(final ITransformerExn<? super E, ? extends T, ? extends X> cl) {
         super();
-        this.f = new FutureTask<T>(new Callable<T>() {
+        this.f = new OneExceptionFuture<T, X>(new IExnFactory<T, X>() {
             @Override
-            public T call() throws X {
+            public T createChecked() throws X {
                 return cl.transformChecked(TransformerFuture.this.input.get().getValue());
             }
         });
 ,22 → 69,10
         this.f.run();
         assert this.f.isDone();
         try {
-            return this.f.get();
+            return this.f.getWithOriginalException();
         } catch (InterruptedException e) {
             // shouldn't happen since f is done
             throw new IllegalStateException(e);
-        } catch (ExecutionException e) {
-            final Throwable cause = e.getCause();
-            if (cause instanceof Error) {
-                throw (Error) cause;
-            } else if (cause instanceof RuntimeException) {
-                throw (RuntimeException) cause;
-            } else {
-                // our Callable throws X
-                @SuppressWarnings("unchecked")
-                final X casted = (X) cause;
-                throw casted;
-            }
         }
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/utils/cc/AbstractMapDecorator.java
 ,7 → 109,7
     }
     @Override
-    protected Object clone() throws CloneNotSupportedException {
+    protected Object clone() {
         try {
             final Map<K, V> delegate = CopyUtils.copy(this.delegate);
             @SuppressWarnings("unchecked")
 ,11 → 117,8
             res.delegate = delegate;
             return res;
         } catch (CloneNotSupportedException e) {
-            throw e;
-        } catch (Exception e) {
-            final CloneNotSupportedException exn = new CloneNotSupportedException();
-            exn.initCause(e);
-            throw exn;
+            // As done in java.util collections
+            throw new InternalError(e);
         }
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/utils/cc/ClosureFuture.java
 ,12 → 13,12
  package org.openconcerto.utils.cc;
-public class ClosureFuture<E, X extends Exception> extends TransformerFuture<E, Object, X> implements IClosureFuture<E, X> {
+public class ClosureFuture<E, X extends Exception> extends TransformerFuture<E, Void, X> implements IClosureFuture<E, X> {
     public ClosureFuture(final IExnClosure<? super E, ? extends X> cl) {
-        super(new ITransformerExn<E, Object, X>() {
+        super(new ITransformerExn<E, Void, X>() {
             @Override
-            public Object transformChecked(E input) throws X {
+            public Void transformChecked(E input) throws X {
                 cl.executeChecked(input);
                 return null;
             }

 /trunk/OpenConcerto/src/org/openconcerto/utils/cc/I2ExnFactory.java
 New file
 ,0 → 1,20
+/*
+ * 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.utils.cc;
+public interface I2ExnFactory<E, X extends Exception, X2 extends Exception> {
+    public abstract E createChecked() throws X, X2;
+}

 /trunk/OpenConcerto/src/org/openconcerto/utils/cc/IExnFactory.java
 ,8 → 13,6
  package org.openconcerto.utils.cc;
-public interface IExnFactory<E, X extends Exception> {
+public interface IExnFactory<E, X extends Exception> extends I2ExnFactory<E, X, RuntimeException> {
-    public abstract E createChecked() throws X;
 }

/trunk/OpenConcerto/src/org/openconcerto/utils/cc/IClosureFuture.java
24,6 → 24,6
* @param <E> The parameter type for the <tt>executeChecked</tt> method
* @param <X> The type of exception thrown by the <tt>executeChecked</tt> method
*/
public interface IClosureFuture<E, X extends Exception> extends Future<Object>, IExnClosure<E, X> {
public interface IClosureFuture<E, X extends Exception> extends Future<Void>, IExnClosure<E, X> {

}

 /trunk/OpenConcerto/src/org/openconcerto/utils/net/HTTPClient.java
 New file
 ,0 → 1,175
+/*
+ * 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.utils.net;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.Set;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSocketFactory;
+public class HTTPClient {
+    private static final int MIN_GZIP_SIZE = 64;
+    static public class ServerException extends RuntimeException {
+        private final int responseCode;
+        private final boolean authenticateError;
+        protected ServerException(int responseCode, boolean authenticateError) {
+            super("Response code was " + responseCode);
+            this.responseCode = responseCode;
+            this.authenticateError = authenticateError;
+        }
+        public final int getResponseCode() {
+            return this.responseCode;
+        }
+        public final boolean isAuthenticateError() {
+            return this.authenticateError;
+        }
+    }
+    static public final class Response {
+        protected final static Response create(HttpsURLConnection con, final Set<Integer> okCodes) throws IOException {
+            final boolean success = okCodes == null ? con.getResponseCode() == 200 : okCodes.contains(con.getResponseCode());
+            return new Response(success, con.getResponseCode(), con.getResponseMessage(), con.getContentEncoding(), con.getContentType());
+        }
+        private final boolean success;
+        private final int code;
+        private final String message;
+        private final String contentEncoding, contentType;
+        protected Response(boolean success, int code, String message, String contentEncoding, String contentType) {
+            super();
+            this.success = success;
+            this.code = code;
+            this.message = message;
+            this.contentEncoding = contentEncoding;
+            this.contentType = contentType;
+        }
+        public final int getCode() {
+            return this.code;
+        }
+        public final boolean isSuccess() {
+            return this.success;
+        }
+        public final String getMessage() {
+            return this.message;
+        }
+        public final String getContentEncoding() {
+            return this.contentEncoding;
+        }
+        public final String getContentType() {
+            return this.contentType;
+        }
+    }
+    private final String url;
+    private SSLSocketFactory socketFactory;
+    private String token;
+    private boolean throwException = true;
+    public HTTPClient(final String url) {
+        this.url = url;
+    }
+    public final SSLSocketFactory getSocketFactory() {
+        return this.socketFactory;
+    }
+    public final void setSocketFactory(SSLSocketFactory socketFactory) {
+        this.socketFactory = socketFactory;
+    }
+    public final void setToken(String token) {
+        this.token = token;
+    }
+    public final boolean hasToken() {
+        return this.getToken() != null;
+    }
+    protected final String getToken() {
+        return this.token;
+    }
+    public final void setThrowException(boolean throwException) {
+        this.throwException = throwException;
+    }
+    public final boolean throwsException() {
+        return this.throwException;
+    }
+    public final Response checkResponseCode(final HttpsURLConnection con) throws IOException {
+        return checkResponseCode(con, null);
+    }
+    public final Response checkResponseCode(final HttpsURLConnection con, final Set<Integer> okCodes) throws IOException {
+        final Response res = Response.create(con, okCodes);
+        if (this.throwsException() && !res.isSuccess())
+            throw new ServerException(res.getCode(), con.getHeaderField("WWW-Authenticate") != null);
+        return res;
+    }
+    public final HttpsURLConnection openConnection(final String path) throws IOException {
+        final HttpsURLConnection con = (HttpsURLConnection) new URL(this.url + path).openConnection();
+        con.setRequestProperty("Accept-Encoding", "gzip");
+        if (this.getSocketFactory() != null)
+            con.setSSLSocketFactory(this.getSocketFactory());
+        if (getToken() != null)
+            con.setRequestProperty("Authorization", "Bearer " + Base64.getEncoder().encodeToString(getToken().getBytes(StandardCharsets.UTF_8)));
+        return con;
+    }
+    public final InputStream getInputStream(final HttpsURLConnection con) throws IOException {
+        return "gzip".equals(con.getContentEncoding()) ? new GZIPInputStream(con.getInputStream()) : con.getInputStream();
+    }
+    public final HttpsURLConnection send(final HttpsURLConnection con, final String params) throws IOException {
+        return this.send(con, params, true);
+    }
+    public final HttpsURLConnection send(final HttpsURLConnection con, final String params, final boolean allowGzip) throws IOException {
+        return this.send(con, params.getBytes(StandardCharsets.UTF_8), allowGzip);
+    }
+    public final HttpsURLConnection send(final HttpsURLConnection con, final byte[] toSend, final boolean allowGzip) throws IOException {
+        final boolean useGzip = allowGzip && toSend.length >= MIN_GZIP_SIZE;
+        if (useGzip)
+            con.setRequestProperty("Content-Encoding", "gzip");
+        con.setRequestMethod("POST");
+        con.setDoOutput(true);
+        try (final OutputStream o = useGzip ? new GZIPOutputStream(con.getOutputStream()) : con.getOutputStream()) {
+            o.write(toSend);
+        }
+        return con;
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/utils/SleepingQueue.java
 ,8 → 24,10
 import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 ,12 → 38,12
 import net.jcip.annotations.GuardedBy;
 /**
- * A queue that can be put to sleep. Submitted runnables are converted to FutureTask, that can later
- * be cancelled.
+ * A queue that can be put to sleep. Submitted runnables are converted to RunnableFuture, that can
+ * later be cancelled.
  *
  * @author Sylvain
  */
-public class SleepingQueue {
+public class SleepingQueue implements Executor {
     public static enum RunningState {
         NEW, RUNNING, WILL_DIE, DYING, DEAD
 ,7 → 148,7
             public void run() {
                 final boolean isDone;
                 final RunningState runningState;
-                final FutureTask<?> beingRun;
+                final RunnableFuture<?> beingRun;
                 final SleepingQueue q = lethalFuture.getQueue();
                 synchronized (q) {
                     runningState = q.getRunningState();
 ,13 → 203,13
     private final PropertyChangeSupport support;
     @GuardedBy("this")
-    private FutureTask<?> beingRun;
+    private RunnableFuture<?> beingRun;
     private final SingleThreadedExecutor tasksQueue;
     @GuardedBy("this")
     private boolean canceling;
     @GuardedBy("this")
-    private IPredicate<FutureTask<?>> cancelPredicate;
+    private IPredicate<? super RunnableFuture<?>> cancelPredicate;
     public SleepingQueue() {
         this(SleepingQueue.class.getName() + System.currentTimeMillis());
 ,44 → 289,49
         thr.setPriority(Thread.MIN_PRIORITY);
     }
-    protected final <T> FutureTask<T> newTaskFor(final Runnable task) {
+    protected final <T> RunnableFuture<T> newTaskFor(final Runnable task) {
         return this.newTaskFor(task, null);
     }
-    protected <T> FutureTask<T> newTaskFor(final Runnable task, T value) {
+    protected <T> RunnableFuture<T> newTaskFor(final Runnable task, T value) {
         return new IFutureTask<T>(task, value, " for {" + this.name + "}");
     }
-    public final FutureTask<?> put(Runnable workRunnable) {
-        // otherwise if passing a FutureTask, it will itself be wrapped in another FutureTask. The
-        // outer FutureTask will call the inner one's run(), which just record any exception. So the
-        // outer one's get() won't throw it and the exception will effectively be swallowed.
-        final FutureTask<?> t;
-        if (workRunnable instanceof FutureTask) {
-            t = ((FutureTask<?>) workRunnable);
+    public final RunnableFuture<?> put(Runnable workRunnable) {
+        /*
+         * Otherwise if passing a RunnableFuture, it will itself be wrapped in another
+         * RunnableFuture. The outer RunnableFuture will call the inner one's run(), which just
+         * record any exception. So the outer one's get() won't throw it and the exception will
+         * effectively be swallowed.
+         */
+        final RunnableFuture<?> t;
+        if (workRunnable instanceof RunnableFuture) {
+            t = ((RunnableFuture<?>) workRunnable);
         } else {
             t = this.newTaskFor(workRunnable);
         }
-        return this.execute(t);
+        return this.add(t);
     }
-    public final <F extends FutureTask<?>> F execute(F t) {
+    @Override
+    public final void execute(Runnable command) {
+        this.put(command);
+    }
+    public final <F extends RunnableFuture<?>> F add(F t) {
         if (this.shallAdd(t)) {
-            this.add(t);
+            // no need to synchronize, if die() is called after our test, t won't be executed anyway
+            if (this.dieCalled())
+                throw new IllegalStateException("Already dead, cannot exec " + t);
+            this.tasksQueue.put(t);
             return t;
-        } else
+        } else {
             return null;
+        }
     }
-    private void add(FutureTask<?> t) {
-        // no need to synchronize, if die() is called after our test, t won't be executed anyway
-        if (this.dieCalled())
-            throw new IllegalStateException("Already dead, cannot exec " + t);
-        this.tasksQueue.put(t);
-    }
-    private final boolean shallAdd(FutureTask<?> runnable) {
+    private final boolean shallAdd(RunnableFuture<?> runnable) {
         if (runnable == null)
             throw new NullPointerException("null runnable");
         try {
 ,7 → 349,7
      * @param r the runnable that is being added.
      * @throws InterruptedException if r should not be added to this queue.
      */
-    protected void willPut(FutureTask<?> r) throws InterruptedException {
+    protected void willPut(RunnableFuture<?> r) throws InterruptedException {
     }
     /**
 ,16 → 385,16
      *
      * @param pred a predicate to know which tasks to cancel.
      */
-    protected final void cancel(final IPredicate<FutureTask<?>> pred) {
-        this.tasksDo(new IClosure<Collection<FutureTask<?>>>() {
+    protected final void cancel(final IPredicate<? super RunnableFuture<?>> pred) {
+        this.tasksDo(new IClosure<Collection<RunnableFuture<?>>>() {
             @Override
-            public void executeChecked(Collection<FutureTask<?>> tasks) {
+            public void executeChecked(Collection<RunnableFuture<?>> tasks) {
                 cancel(pred, tasks);
             }
         });
     }
-    private final void cancel(IPredicate<FutureTask<?>> pred, Collection<FutureTask<?>> tasks) {
+    private final void cancel(IPredicate<? super RunnableFuture<?>> pred, Collection<RunnableFuture<?>> tasks) {
         try {
             synchronized (this) {
                 this.canceling = true;
 ,7 → 402,7
                 this.cancelCheck(this.getBeingRun());
             }
-            for (final FutureTask<?> t : tasks) {
+            for (final RunnableFuture<?> t : tasks) {
                 this.cancelCheck(t);
             }
         } finally {
 ,11 → 414,11
         }
     }
-    public final void tasksDo(IClosure<? super Deque<FutureTask<?>>> c) {
+    public final void tasksDo(IClosure<? super Deque<RunnableFuture<?>>> c) {
         this.tasksQueue.itemsDo(c);
     }
-    private void cancelCheck(FutureTask<?> t) {
+    private void cancelCheck(RunnableFuture<?> t) {
         if (t != null)
             synchronized (this) {
                 if (this.canceling && (this.cancelPredicate == null || this.cancelPredicate.evaluateChecked(t)))
 ,7 → 426,7
             }
     }
-    private void setBeingRun(final FutureTask<?> beingRun) {
+    private void setBeingRun(final RunnableFuture<?> beingRun) {
         final Future<?> old;
         synchronized (this) {
             old = this.beingRun;
 ,7 → 435,7
         this.support.firePropertyChange("beingRun", old, beingRun);
     }
-    public final synchronized FutureTask<?> getBeingRun() {
+    public final synchronized RunnableFuture<?> getBeingRun() {
         return this.beingRun;
     }
 ,13 → 553,13
             }
         });
         // die as soon as possible not after all currently queued tasks
-        this.tasksQueue.itemsDo(new IClosure<Deque<FutureTask<?>>>() {
+        this.tasksQueue.itemsDo(new IClosure<Deque<RunnableFuture<?>>>() {
             @Override
-            public void executeChecked(Deque<FutureTask<?>> input) {
+            public void executeChecked(Deque<RunnableFuture<?>> input) {
                 // since we cancel the current task, we might as well remove all of them since they
                 // might depend on the cancelled one
                 // cancel removed tasks so that callers of get() don't wait forever
-                for (final FutureTask<?> ft : input) {
+                for (final RunnableFuture<?> ft : input) {
                     // by definition tasks in the queue aren't executing, so interrupt parameter is
                     // useless. On the other hand cancel() might return false if already cancelled.
                     ft.cancel(false);
 ,7 → 568,7
                 input.addFirst(res);
                 // die as soon as possible, even if there's a long task already running
-                final FutureTask<?> beingRun = getBeingRun();
+                final RunnableFuture<?> beingRun = getBeingRun();
                 // since we hold the lock on items
                 assert beingRun != res : "beingRun: " + beingRun + " ; res: " + res;
                 if (beingRun != null)
 ,13 → 640,13
         this.support.removePropertyChangeListener(l);
     }
-    private final class SingleThreadedExecutor extends DropperQueue<FutureTask<?>> {
+    private final class SingleThreadedExecutor extends DropperQueue<RunnableFuture<?>> {
         private SingleThreadedExecutor() {
             super(SleepingQueue.this.name + System.currentTimeMillis());
         }
         @Override
-        protected void process(FutureTask<?> task) {
+        protected void process(RunnableFuture<?> task) {
             if (!task.isDone()) {
                 /*
                  * From ThreadPoolExecutor : Track execution state to ensure that afterExecute is
 ,12 → 669,12
             }
         }
-        protected void beforeExecute(final FutureTask<?> f) {
+        protected void beforeExecute(final RunnableFuture<?> f) {
             cancelCheck(f);
             setBeingRun(f);
         }
-        protected void afterExecute(final FutureTask<?> f, final Throwable t) {
+        protected void afterExecute(final RunnableFuture<?> f, final Throwable t) {
             setBeingRun(null);
             try {

 /trunk/OpenConcerto/src/org/openconcerto/utils/CollectionUtils.java
 ,7 → 417,8
             return null;
         }
-        final List<E> result = new ArrayList<E>();
+        final int size = list.size();
+        final List<E> result = new ArrayList<E>(size);
         for (int i = 0; i < list.size(); i++) {
             result.add(c.cast(list.get(i)));
         }

 /trunk/OpenConcerto/src/org/openconcerto/utils/ooxml/XLSXSheet.java
 ,7 → 66,8
         this.startX = start.x;
         this.startY = start.y;
-        final Point end = resolve(parts.get(1));
+        // Feuille vierge dimension = A1
+        final Point end = resolve(parts.size() == 1 ? parts.get(0) : parts.get(1));
         this.endX = end.x;
         this.endY = end.y;
         this.rows = new ArrayList<>(end.y - start.y);

 /trunk/OpenConcerto/src/org/openconcerto/utils/ExceptionHandler.java
 ,6 → 47,7
 import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 ,7 → 482,7
                 version = productInfo.getProperty(ProductInfo.VERSION, version);
             }
-            final Map<Info, String> systemInfos = SystemInfo.get(false);
+            final Map<Info, String> systemInfos = SystemInfo.get(false, Locale.ENGLISH);
             final String os = systemInfos.remove(Info.OS);
             final String java = systemInfos.toString();
             final String encodedData = "java=" + PercentEncoder.encode(java, cs) + "&os=" + PercentEncoder.encode(os, cs) + "&software=" + PercentEncoder.encode(name + version, cs) + "&stack="

 /trunk/OpenConcerto/src/org/openconcerto/utils/SystemInfo.java
 ,6 → 28,7
 import java.util.Enumeration;
 import java.util.Formatter;
 import java.util.List;
+import java.util.Locale;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 ,7 → 48,8
     public static final String CLASS_PROTOCOL = "class";
-    static public NavigableMap<Info, String> get(final boolean html) {
+    static public NavigableMap<Info, String> get(final boolean html, final Locale locale) {
+        final TM tm = TM.getInstance(locale);
         final NavigableMap<Info, String> res = new TreeMap<Info, String>();
         final String lineBreak = getLineBreak(html);
 ,11 → 67,12
             e1.printStackTrace();
         }
         final Runtime rt = Runtime.getRuntime();
-        final String stats = "<i>" + TM.tr("memory") + " :</i> " + formatBytes(rt.freeMemory()) + " / " + formatBytes(rt.totalMemory()) + " ; " + TM.tr("processors", rt.availableProcessors());
-        final String lafDesc = lookAndFeel == null ? TM.tr("no.laf") : getLink(lookAndFeel.getName(), lafURI, html) + ", " + lookAndFeel.getDescription();
+        final String stats = "<i>" + tm.translate("memory") + " :</i> " + formatBytes(tm, rt.freeMemory()) + " / " + formatBytes(tm, rt.totalMemory()) + " ; "
+                + tm.translate("processors", rt.availableProcessors());
+        final String lafDesc = lookAndFeel == null ? tm.translate("no.laf") : getLink(lookAndFeel.getName(), lafURI, html) + ", " + lookAndFeel.getDescription();
-        final String p = TM.tr("javaVersion", version, getLink(getProperty("java.vendor"), vendorURI, html)) + " ; " + getLink(TM.tr("javaHome"), new File(getProperty("java.home")).toURI(), html)
-                + lineBreak + stats + lineBreak + lafDesc;
+        final String p = tm.translate("javaVersion", version, getLink(getProperty("java.vendor"), vendorURI, html)) + " ; "
+                + getLink(tm.translate("javaHome"), new File(getProperty("java.home")).toURI(), html) + lineBreak + stats + lineBreak + lafDesc;
         res.put(Info.JAVA, p);
 ,8 → 80,8
         res.put(Info.OS, "<b>" + getProperty("os.name") + "</b> " + getProperty("os.version") + " (" + getProperty("os.arch") + ")");
         // * Sylvain ; C:\Documents and Settings\Sylvain ; D:\workspace\CTech
-        res.put(Info.USER, getProperty("user.name") + " ; " + getLink(TM.tr("home.dir"), new File(getProperty("user.home")).toURI(), html) + " ; "
-                + getLink(TM.tr("cwd"), new File(getProperty("user.dir")).toURI(), html));
+        res.put(Info.USER, getProperty("user.name") + " ; " + getLink(tm.translate("home.dir"), new File(getProperty("user.home")).toURI(), html) + " ; "
+                + getLink(tm.translate("cwd"), new File(getProperty("user.dir")).toURI(), html));
         // * eth0 192.168.28.52/24, état: inactif, nom complet: ""
         final List<String> ifs = new ArrayList<String>();
 ,12 → 99,12
                             return "<b>" + input.getAddress().getHostAddress() + "</b>" + "/" + input.getNetworkPrefixLength();
                         }
                     }));
-                    sb.append(" ; <i>" + TM.tr("interfaceState") + " :</i> " + TM.tr(ni.isUp() ? "interfaceStateUp" : "interfaceStateDown"));
+                    sb.append(" ; <i>" + tm.translate("interfaceState") + " :</i> " + tm.translate(ni.isUp() ? "interfaceStateUp" : "interfaceStateDown"));
                     sb.append(lineBreak);
-                    sb.append(" <i>" + TM.tr("interfaceFullName") + " :</i> " + ni.getDisplayName());
+                    sb.append(" <i>" + tm.translate("interfaceFullName") + " :</i> " + ni.getDisplayName());
                     sb.append(lineBreak);
-                    sb.append(" <i>" + TM.tr("hardwareAddress") + " :</i> ");
+                    sb.append(" <i>" + tm.translate("hardwareAddress") + " :</i> ");
                     final Formatter fmt = new Formatter(sb);
                     final byte[] mac = ni.getHardwareAddress();
                     for (int i = 0; i < mac.length; i++) {
 ,7 → 137,7
         }
     }
-    private static String formatBytes(long b) {
-        return TM.tr("megabytes", b / 1024 / 1024);
+    private static String formatBytes(final TM tm, final long b) {
+        return tm.translate("megabytes", b / 1024 / 1024);
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/utils/Zip.java
 ,7 → 173,9
      */
     public void zip(File newFile) throws IOException {
         // on ne garde que la derniere partie du chemin
-        this.zip(newFile.getName(), new BufferedInputStream(new FileInputStream(newFile)));
+        try (final BufferedInputStream ins = new BufferedInputStream(new FileInputStream(newFile))) {
+            this.zip(newFile.getName(), ins);
+        }
     }
     /**

 /trunk/OpenConcerto/src/org/openconcerto/utils/MessageDigestUtils.java
 ,6 → 17,7
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 ,18 → 97,30
     }
     public static String getHashString(MessageDigest md, final InputStream ins) throws IOException {
-        final DigestOutputStream out = new DigestOutputStream(StreamUtils.NULL_OS, md);
-        StreamUtils.copy(ins, out);
-        out.close();
-        return getHashString(md);
+        return asHex(getHash(md, ins));
     }
-    public static String getMD5(File f) throws IOException {
+    public static byte[] getHash(MessageDigest md, final InputStream ins) throws IOException {
+        return getHash(md, ins, StreamUtils.NULL_OS);
+    }
+    public static byte[] getHash(MessageDigest md, final InputStream ins, final OutputStream out) throws IOException {
+        try (final DigestOutputStream digestStream = new DigestOutputStream(out, md)) {
+            StreamUtils.copy(ins, digestStream);
+        }
+        return md.digest();
+    }
+    public static byte[] getHash(MessageDigest md, final File f) throws IOException {
         try (final InputStream ins = new FileInputStream(f)) {
-            return getHashString(getMD5(), ins);
+            return getHash(md, ins);
         }
     }
+    public static String getMD5(File f) throws IOException {
+        return asHex(getHash(getMD5(), f));
+    }
     public static MessageDigest getMD5() {
         try {
             return MessageDigest.getInstance("MD5");

 /trunk/OpenConcerto/src/org/openconcerto/utils/NetUtils.java
 ,15 → 17,21
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.ServerSocket;
 import java.net.SocketException;
 import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
 import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 ,6 → 184,41
         return content;
     }
+    static public final String urlEncode(final String... kv) {
+        final int size = kv.length;
+        if (size % 2 != 0)
+            throw new IllegalArgumentException("Odd number of items : " + size);
+        final LinkedHashMap<String, Object> map = new LinkedHashMap<>(size / 2, 1);
+        for (int i = 0; i < size; i += 2) {
+            map.put(kv[i], kv[i + 1]);
+        }
+        return urlEncode(map);
+    }
+    static public final String urlEncode(final Map<String, ?> map) {
+        if (map.isEmpty())
+            return "";
+        final String charset = StandardCharsets.UTF_8.name();
+        final StringBuilder sb = new StringBuilder(256);
+        for (final Entry<String, ?> e : map.entrySet()) {
+            final Object value = e.getValue();
+            // Avoid null and "null" confusion.
+            if (value != null) {
+                try {
+                    sb.append(URLEncoder.encode(e.getKey(), charset));
+                    sb.append('=');
+                    sb.append(URLEncoder.encode(String.valueOf(value), charset));
+                    sb.append('&');
+                } catch (UnsupportedEncodingException exn) {
+                    throw new IllegalStateException("UTF-8 should be standard", exn);
+                }
+            }
+        }
+        // remove last '&'
+        sb.setLength(sb.length() - 1);
+        return sb.toString();
+    }
     // Create a trust manager that does not validate certificate chains
     static private final TrustManager[] TRUSTALL_MANAGERS = new TrustManager[] { new X509TrustManager() {
         public java.security.cert.X509Certificate[] getAcceptedIssuers() {

 /trunk/OpenConcerto/src/org/openconcerto/utils/StringUtils.java
 ,6 → 19,8
 import java.awt.FontMetrics;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
+import java.text.Normalizer;
+import java.text.Normalizer.Form;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 ,11 → 28,14
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import com.ibm.icu.lang.UCharacter;
 /**
  * @author Sylvain CUAZ
  */
 ,4 → 835,152
         }
         return null;
     }
+    static public interface Search {
+        public boolean equals(String str, String anotherString);
+        public boolean startsWith(String str, String prefix);
+        public boolean endsWith(String str, String suffix);
+        public boolean contains(String str, String anotherString);
+    }
+    static public final Search EXACT_SEARCH = new Search() {
+        @Override
+        public boolean startsWith(String str, String prefix) {
+            return str.startsWith(prefix);
+        }
+        @Override
+        public boolean equals(String str, String anotherString) {
+            return str.equals(anotherString);
+        }
+        @Override
+        public boolean endsWith(String str, String suffix) {
+            return str.endsWith(suffix);
+        }
+        @Override
+        public boolean contains(String str, String searchStr) {
+            return str.contains(searchStr);
+        }
+    };
+    // Simple (Single-Character) Case Mapping
+    static public final Search SIMPLE_CASE_MAPPING_SEARCH = new Search() {
+        @Override
+        public boolean startsWith(String str, String prefix) {
+            return str.regionMatches(true, 0, prefix, 0, prefix.length());
+        }
+        @Override
+        public boolean equals(String str, String anotherString) {
+            return str.equalsIgnoreCase(anotherString);
+        }
+        @Override
+        public boolean endsWith(String str, String suffix) {
+            final int suffixLength = suffix.length();
+            return str.regionMatches(true, str.length() - suffixLength, suffix, 0, suffixLength);
+        }
+        @Override
+        public boolean contains(String str, String searchStr) {
+            final int length = searchStr.length();
+            if (length == 0)
+                return true;
+            for (int i = str.length() - length; i >= 0; i--) {
+                if (str.regionMatches(true, i, searchStr, 0, length))
+                    return true;
+            }
+            return false;
+        }
+    };
+    static public abstract class NormalizeSearch implements Search {
+        protected abstract String normalize(String s);
+        @Override
+        public boolean startsWith(String str, String prefix) {
+            return normalize(str).startsWith(normalize(prefix));
+        }
+        @Override
+        public boolean equals(String str, String anotherString) {
+            return normalize(str).equals(normalize(anotherString));
+        }
+        @Override
+        public boolean endsWith(String str, String suffix) {
+            return normalize(str).endsWith(normalize(suffix));
+        }
+        @Override
+        public boolean contains(String str, String searchStr) {
+            return normalize(str).contains(normalize(searchStr));
+        }
+    };
+    // Fixed Locale
+    static public final class LowerCaseMappingSearch extends NormalizeSearch {
+        private final Locale locale;
+        public LowerCaseMappingSearch(Locale locale) {
+            super();
+            this.locale = locale;
+        }
+        public final Locale getLocale() {
+            return this.locale;
+        }
+        @Override
+        protected String normalize(String s) {
+            return s.toLowerCase(this.getLocale());
+        }
+    };
+    // Locale.getDefault() at the time of the call
+    static public final Search DEFAULT_LOWERCASE_MAPPING_SEARCH = new NormalizeSearch() {
+        @Override
+        protected String normalize(String s) {
+            return s.toLowerCase();
+        }
+    };
+    static public final Search CASE_FOLDING_SEARCH = new NormalizeSearch() {
+        @Override
+        protected String normalize(String s) {
+            return normalizeCase(s);
+        }
+    };
+    static private final Pattern BLANK_PATTERN = Pattern.compile("\\p{Blank}+");
+    // replace tabs and multiple spaces by one space
+    static public final String normalizeBlanks(String s) {
+        return BLANK_PATTERN.matcher(s.trim()).replaceAll(" ");
+    }
+    static private final Pattern DIACRITICAL_PATTERN = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
+    static public String removeDiacritical(final String s) {
+        return DIACRITICAL_PATTERN.matcher(Normalizer.normalize(s, Form.NFD)).replaceAll("");
+    }
+    static public final String normalizeCase(final String s) {
+        // the JRE only does Single-Character Case Mapping so it can't handle Tschüß/TSCHÜSS
+        // http://userguide.icu-project.org/transforms/casemappings
+        // https://unicode.org/faq/casemap_charprop.html#casemap
+        return UCharacter.foldCase(s, true);
+    }
+    static public final String normalizeForSearch(final String s) {
+        return normalizeCase(removeDiacritical(normalizeBlanks(s)));
+    }
 }

 /trunk/OpenConcerto/src/org/openconcerto/utils/sync/HashWriter.java
 ,6 → 23,8
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.security.MessageDigest;
+import java.util.Arrays;
+import java.util.Objects;
 public class HashWriter {
     public static final int BLOCK_SIZE = 1024;
 ,51 → 80,13
     public static byte[] getHash(File f) throws IOException {
         final MessageDigest hashSum = MessageDigestUtils.getSHA256();
-        FileInputStream fIn = null;
-        try {
-            fIn = new FileInputStream(f);
-            BufferedInputStream fb = null;
-            try {
-                fb = new BufferedInputStream(fIn);
-                final byte[] buffer = new byte[BLOCK_SIZE];
-                int readSize = fb.read(buffer);
-                while (readSize > 0) {
-                    // Update
-                    hashSum.update(buffer, 0, readSize);
-                    // read
-                    readSize = fb.read(buffer);
-                }
-            } catch (Exception e) {
-                throw new IOException(e);
-            } finally {
-                if (fb != null) {
-                    fb.close();
-                }
-            }
-        } catch (Exception e) {
-            throw new IOException(e);
-        } finally {
-            if (fIn != null) {
-                fIn.close();
-            }
-        }
-        byte[] fileHash = new byte[hashSum.getDigestLength()];
-        fileHash = hashSum.digest();
-        return fileHash;
+        return MessageDigestUtils.getHash(hashSum, f);
     }
     public static boolean compareHash(byte[] h1, byte[] h2) {
-        final int length = h1.length;
-        if (length != h2.length) {
-            return false;
-        }
-        for (int i = 0; i < length; i++) {
-            if (h1[i] != h2[i]) {
-                return false;
-            }
-        }
-        return true;
+        Objects.requireNonNull(h1);
+        Objects.requireNonNull(h2);
+        return Arrays.equals(h1, h2);
     }
     private static final char[] hexArray = "0123456789ABCDEF".toCharArray();

 /trunk/OpenConcerto/src/org/openconcerto/utils/sync/SimpleSyncClient.java
 ,17 → 15,18
 import org.openconcerto.utils.CollectionUtils;
 import org.openconcerto.utils.MessageDigestUtils;
+import org.openconcerto.utils.NetUtils;
 import org.openconcerto.utils.StreamUtils;
+import org.openconcerto.utils.net.HTTPClient;
+import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 ,20 → 43,15
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiFunction;
 import java.util.function.Predicate;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSocketFactory;
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
 import net.minidev.json.parser.JSONParser;
-public final class SimpleSyncClient {
+public final class SimpleSyncClient extends HTTPClient {
-    private static final int MIN_GZIP_SIZE = 64;
     static protected final long getLong(final Object o) {
         return ((Number) o).longValue();
     }
 ,67 → 60,6
         return Instant.ofEpochMilli(getLong(o));
     }
-    static public class ServerException extends RuntimeException {
-        private final int responseCode;
-        private final boolean authenticateError;
-        protected ServerException(int responseCode, boolean authenticateError) {
-            super("Response code was " + responseCode);
-            this.responseCode = responseCode;
-            this.authenticateError = authenticateError;
-        }
-        public final int getResponseCode() {
-            return this.responseCode;
-        }
-        public final boolean isAuthenticateError() {
-            return this.authenticateError;
-        }
-    }
-    static public final class Response {
-        protected final static Response create(HttpsURLConnection con, final Set<Integer> okCodes) throws IOException {
-            final boolean success = okCodes == null ? con.getResponseCode() == 200 : okCodes.contains(con.getResponseCode());
-            return new Response(success, con.getResponseCode(), con.getResponseMessage(), con.getContentEncoding(), con.getContentType());
-        }
-        private final boolean success;
-        private final int code;
-        private final String message;
-        private final String contentEncoding, contentType;
-        protected Response(boolean success, int code, String message, String contentEncoding, String contentType) {
-            super();
-            this.success = success;
-            this.code = code;
-            this.message = message;
-            this.contentEncoding = contentEncoding;
-            this.contentType = contentType;
-        }
-        public final int getCode() {
-            return this.code;
-        }
-        public final boolean isSuccess() {
-            return this.success;
-        }
-        public final String getMessage() {
-            return this.message;
-        }
-        public final String getContentEncoding() {
-            return this.contentEncoding;
-        }
-        public final String getContentType() {
-            return this.contentType;
-        }
-    }
     static protected abstract class BaseAttrs {
         private final String path;
         private final String name;
 ,87 → 199,13
         }
     }
-    private final String url;
-    private SSLSocketFactory socketFactory;
-    private String token;
-    private boolean throwException = true;
     public SimpleSyncClient(final String url) {
-        this.url = url;
+        super(url);
     }
-    public final SSLSocketFactory getSocketFactory() {
-        return this.socketFactory;
-    }
-    public final void setSocketFactory(SSLSocketFactory socketFactory) {
-        this.socketFactory = socketFactory;
-    }
-    public final void setToken(String token) {
-        this.token = token;
-    }
-    public final boolean hasToken() {
-        return this.getToken() != null;
-    }
-    protected final String getToken() {
-        return this.token;
-    }
-    public final void setThrowException(boolean throwException) {
-        this.throwException = throwException;
-    }
-    public final boolean throwsException() {
-        return this.throwException;
-    }
-    protected Response checkResponseCode(final HttpsURLConnection con) throws IOException {
-        return checkResponseCode(con, null);
-    }
-    protected Response checkResponseCode(final HttpsURLConnection con, final Set<Integer> okCodes) throws IOException {
-        final Response res = Response.create(con, okCodes);
-        if (this.throwsException() && !res.isSuccess())
-            throw new ServerException(res.getCode(), con.getHeaderField("WWW-Authenticate") != null);
-        return res;
-    }
-    private final HttpsURLConnection openConnection(final String path) throws IOException {
-        final HttpsURLConnection con = (HttpsURLConnection) new URL(this.url + path).openConnection();
-        con.setRequestProperty("Accept-Encoding", "gzip");
-        if (this.getSocketFactory() != null)
-            con.setSSLSocketFactory(this.getSocketFactory());
-        if (getToken() != null)
-            con.setRequestProperty("Authorization", "Bearer " + Base64.getEncoder().encodeToString(getToken().getBytes(StandardCharsets.UTF_8)));
-        return con;
-    }
-    private final InputStream getInputStream(final HttpsURLConnection con) throws IOException {
-        return "gzip".equals(con.getContentEncoding()) ? new GZIPInputStream(con.getInputStream()) : con.getInputStream();
-    }
-    private final HttpsURLConnection send(final HttpsURLConnection con, final String params) throws IOException {
-        return this.send(con, params.getBytes(StandardCharsets.UTF_8), false);
-    }
-    private final HttpsURLConnection send(final HttpsURLConnection con, final byte[] toSend, final boolean allowGzip) throws IOException {
-        final boolean useGzip = allowGzip && toSend.length >= MIN_GZIP_SIZE;
-        if (useGzip)
-            con.setRequestProperty("Content-Encoding", "gzip");
-        con.setRequestMethod("POST");
-        con.setDoOutput(true);
-        try (final OutputStream o = useGzip ? new GZIPOutputStream(con.getOutputStream()) : con.getOutputStream()) {
-            o.write(toSend);
-        }
-        return con;
-    }
     public DirContent getDir(final String path) throws Exception {
         final HttpsURLConnection con = openConnection("/getDir");
-        final Response res = checkResponseCode(send(con, "rp=" + path + "&type=json"));
+        final Response res = checkResponseCode(send(con, NetUtils.urlEncode("rp", path, "type", "json")));
         if (!res.isSuccess())
             return null;
         final JSONParser p = new JSONParser(JSONParser.MODE_STRICTEST);
 ,7 → 223,7
     public Response getFile(final String path, final String fileName, final FileConsumer fileConsumer) throws IOException {
         final HttpsURLConnection con = openConnection("/get");
-        send(con, "rn=" + fileName + "&rp=" + path);
+        send(con, NetUtils.urlEncode("rn", fileName, "rp", path));
         final Response res = checkResponseCode(con, GETFILE_OK_CODES);
         if (res.getCode() == 404) {
             fileConsumer.accept(null, null);
 ,23 → 252,44
         return !missing.get();
     }
-    public Response deleteFile(final String path, final String fileName) throws MalformedURLException, IOException, ProtocolException, UnsupportedEncodingException {
+    public Response deleteFile(final String path, final String fileName) throws IOException {
         final HttpsURLConnection con = openConnection("/delete");
-        return checkResponseCode(send(con, "rn=" + fileName + "&rp=" + path));
+        return checkResponseCode(send(con, NetUtils.urlEncode("rn", fileName, "rp", path)));
     }
-    public Response sendFile(String path, File localFile) throws Exception, MalformedURLException, IOException, ProtocolException {
-        byte[] newsha256 = HashWriter.getHash(localFile);
-        long size = localFile.length();
+    public final Response renameFile(final String path, final String fileName, final String newFileName) throws IOException {
+        return this.renameFile(path, fileName, null, newFileName);
+    }
+    public final Response renameFile(final String path, final String fileName, final String newPath, final String newFileName) throws IOException {
+        final HttpsURLConnection con = openConnection("/rename");
+        return checkResponseCode(send(con, NetUtils.urlEncode("rn", fileName, "rp", path, "newPath", newPath, "newName", newFileName)));
+    }
+    public Response sendFile(String path, File localFile) throws IOException {
+        return this.sendFile(path, localFile, false);
+    }
+    public Response sendFile(String path, File localFile, final boolean overwrite) throws IOException {
+        final long size = localFile.length();
+        if (size >= Integer.MAX_VALUE)
+            throw new OutOfMemoryError("Required array size too large : " + size);
+        final ByteArrayOutputStream ba = new ByteArrayOutputStream((int) size);
+        final byte[] newsha256;
+        // compute digest at the same time to protect against race conditions
+        try (final InputStream ins = new BufferedInputStream(new FileInputStream(localFile))) {
+            newsha256 = MessageDigestUtils.getHash(MessageDigestUtils.getSHA256(), ins, ba);
+        }
         final HttpsURLConnection con = openConnection("/put");
         // We use Base64 because headers are not supporting UTF8
         con.setRequestProperty("X_FILENAME_B64", Base64.getEncoder().encodeToString(localFile.getName().getBytes(StandardCharsets.UTF_8)));
         con.setRequestProperty("X_PATH_B64", Base64.getEncoder().encodeToString(path.getBytes(StandardCharsets.UTF_8)));
+        con.setRequestProperty("X-OVERWRITE", Boolean.toString(overwrite));
         con.setRequestProperty("X_FILESIZE", String.valueOf(size));
         con.setRequestProperty("X_SHA256", HashWriter.bytesToHex(newsha256));
         con.setRequestProperty("X-Last-Modified-ms", String.valueOf(localFile.lastModified()));
-        return checkResponseCode(send(con, Files.readAllBytes(localFile.toPath()), true));
+        return checkResponseCode(send(con, ba.toByteArray(), true));
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/utils/i18n/TranslationPool.java
 New file
 ,0 → 1,102
+/*
+ * 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.utils.i18n;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import net.jcip.annotations.ThreadSafe;
+@ThreadSafe
+public class TranslationPool<T, X extends Exception> {
+    static public enum Mode {
+        /**
+         * Try to create if needed, but allow <code>null</code>.
+         */
+        OPTIONAL_CREATE(true, true),
+        /**
+         * Try to create if needed, but disallow <code>null</code>.
+         */
+        GET_OR_CREATE(true, false),
+        /**
+         * The item must already exist.
+         */
+        GET_CREATED(false, false);
+        private final boolean allowCreation, allowNull;
+        private Mode(boolean allowCreation, boolean allowNull) {
+            this.allowCreation = allowCreation;
+            this.allowNull = allowNull;
+        }
+    }
+    // it's rare to load many Locale
+    private final Map<Locale, T> byLocale = new HashMap<>(8);
+    private final Function<Locale, T> createInstance;
+    public TranslationPool() {
+        this(null);
+    }
+    public TranslationPool(final Function<Locale, T> createInstance) {
+        this.createInstance = createInstance;
+    }
+    protected T createTM(final Locale l) throws X {
+        return this.createInstance.apply(l);
+    }
+    public final T get(final Locale l) throws X {
+        return this.get(l, Mode.GET_OR_CREATE);
+    }
+    public final T get(final Locale l, final Mode mode) throws X {
+        Objects.requireNonNull(l, "Missing locale");
+        Objects.requireNonNull(mode, "Missing mode");
+        T res;
+        synchronized (this) {
+            res = this.byLocale.get(l);
+            if (res == null && mode.allowCreation) {
+                res = this.createTM(l);
+                if (res != null)
+                    this.byLocale.put(l, res);
+            }
+            if (res == null && !mode.allowNull)
+                throw new IllegalStateException("Missing instance for " + l);
+        }
+        return res;
+    }
+    public final T getCreated(final Locale l) {
+        // Don't call get(Locale, Mode) since it throws a generic exception that can't be caught
+        Objects.requireNonNull(l, "Missing locale");
+        synchronized (this) {
+            final T res = this.byLocale.get(l);
+            if (res == null)
+                throw new IllegalStateException("Missing instance for " + l);
+            return res;
+        }
+    }
+    final Collection<T> getCreated() {
+        assert Thread.holdsLock(this);
+        return this.byLocale.values();
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/utils/i18n/TranslationManager.java
 ,10 → 14,12
  package org.openconcerto.utils.i18n;
 import org.openconcerto.utils.Log;
+import org.openconcerto.utils.i18n.TranslationPool.Mode;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 ,14 → 26,17
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle.Control;
+import java.util.function.Consumer;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 import net.jcip.annotations.GuardedBy;
 import net.jcip.annotations.ThreadSafe;
 ,6 → 43,16
 @ThreadSafe
 public class TranslationManager {
+    public static final void setVMLocale(Locale locale) {
+        Locale.setDefault(locale);
+        // As explained in Locale.setDefault() javadoc : "be prepared to reinitialize
+        // locale-sensitive code". As ResourceBundle.getBundle(), this throws RuntimeException if no
+        // instance can be created.
+        TranslationManager.createDefaultInstance();
+        // nothing to do for TM
+    }
     private static final Locale FALLBACK_LOCALE = Locale.ENGLISH;
     private static final Control CONTROL = new I18nUtils.SameLanguageControl() {
 ,64 → 68,110
         return CONTROL;
     }
+    static public interface Loader extends Consumer<TranslationManager> {
+    }
     private static final String BASENAME = "translation";
-    private static final TranslationManager instance = new TranslationManager();
+    private static final TranslationPool<TranslationManager, RuntimeException> POOL = new TranslationPool<TranslationManager, RuntimeException>() {
+        @Override
+        protected TranslationManager createTM(Locale l) throws RuntimeException {
+            assert Thread.holdsLock(POOL);
+            // Allow some apps to not create an instance at all
+            if (classes.isEmpty())
+                return null;
+            final TranslationManager res = new TranslationManager(l);
+            res.setTranslations(classes, true);
+            return res;
+        }
+    };
+    /**
+     * Create the default instance if needed. Must be called each time {@link TM#getDefaultLocale()}
+     * changes otherwise {@link #getInstance()} will throw an exception.
+     *
+     * @return the instance for the default locale, <code>null</code> if
+     *         {@link #addTranslationStreamFromClass(Class)} wasn't called.
+     */
+    public static final TranslationManager createDefaultInstance() {
+        return POOL.get(TM.getDefaultLocale(), Mode.OPTIONAL_CREATE);
+    }
     public static final TranslationManager getInstance() {
-        return instance;
+        return getInstance(TM.getDefaultLocale());
     }
-    @GuardedBy("classes")
-    private final List<Class<?>> classes;
-    @GuardedBy("classes")
-    private Locale locale;
+    // TODO throw exception
+    public static final TranslationManager createInstance(final Locale l) {
+        return POOL.get(l);
+    }
-    private final Object trMutex = new Object();
-    @GuardedBy("trMutex")
-    private Map<String, String> menuTranslation;
-    @GuardedBy("trMutex")
-    private Map<String, String> itemTranslation;
-    @GuardedBy("trMutex")
-    private Map<String, String> actionTranslation;
+    /**
+     * Get an instance already created by {@link #createInstance(Locale)}. This method won't block,
+     * that's what createInstance() is for.
+     *
+     * @param l the locale
+     * @return the cached instance.
+     */
+    public static final TranslationManager getInstance(final Locale l) {
+        return POOL.getCreated(l);
+    }
-    private TranslationManager() {
-        this.classes = new ArrayList<>();
+    @GuardedBy("POOL")
+    private static final List<Object> classes = new ArrayList<>();
+    public static final void addTranslationStreamFromClass(Class<?> c) {
+        _addLoader(c);
     }
-    public void addTranslationStreamFromClass(Class<?> c) {
-        synchronized (this.classes) {
-            this.classes.add(c);
-            if (this.getLocale() != null) {
-                loadTranslation(this.getLocale(), c);
-            }
-        }
+    public static final void addLoader(final Loader loader) {
+        _addLoader(loader);
     }
-    public void removeTranslationStreamFromClass(Class<?> c) {
-        synchronized (this.classes) {
-            if (this.classes.remove(c) && this.getLocale() != null) {
-                loadAllTranslation();
+    private static final void _addLoader(final Object loader) {
+        synchronized (POOL) {
+            classes.add(loader);
+            for (final TranslationManager tm : POOL.getCreated()) {
+                tm.addTranslations(loader, true);
             }
         }
     }
-    public final Locale getLocale() {
-        synchronized (this.classes) {
-            return this.locale;
-        }
+    public static final void removeTranslationStreamFromClass(Class<?> c) {
+        _removeLoader(c);
     }
-    public final void setLocale(Locale l) {
-        if (l == null)
-            throw new NullPointerException("null Locale");
-        synchronized (this.classes) {
-            if (!l.equals(this.locale)) {
-                this.locale = l;
-                loadAllTranslation();
+    public static final void removeLoader(final Loader loader) {
+        _removeLoader(loader);
+    }
+    private static final void _removeLoader(final Object o) {
+        synchronized (POOL) {
+            if (classes.remove(o)) {
+                for (final TranslationManager tm : POOL.getCreated()) {
+                    tm.setTranslations(classes, false);
+                }
             }
         }
     }
+    private final Locale locale;
+    private final Object trMutex = new Object();
+    @GuardedBy("trMutex")
+    private Map<String, String> menuTranslation;
+    @GuardedBy("trMutex")
+    private Map<String, String> itemTranslation;
+    @GuardedBy("trMutex")
+    private Map<String, String> actionTranslation;
+    private TranslationManager(final Locale locale) {
+        this.locale = locale;
+    }
+    public final Locale getLocale() {
+        return this.locale;
+    }
     private void checkNulls(String id, String label) {
         if (id == null)
             throw new NullPointerException("null id");
 ,7 → 179,7
             throw new NullPointerException("null label");
     }
-    // Menus
+    // Menus in menu bar and menu items
     public String getTranslationForMenu(String id) {
         synchronized (this.trMutex) {
 ,7 → 194,7
         }
     }
-    // Items
+    // Items labels in panels
     public String getTranslationForItem(String id) {
         synchronized (this.trMutex) {
 ,7 → 209,7
         }
     }
-    // Actions
+    // Actions (buttons or contextual menus)
     public String getTranslationForAction(String id) {
         synchronized (this.trMutex) {
 ,35 → 224,43
         }
     }
-    private void loadAllTranslation() {
+    private void setTranslations(final Collection<?> classes, final boolean warn) {
         synchronized (this.trMutex) {
             this.menuTranslation = new HashMap<>();
             this.itemTranslation = new HashMap<>();
             this.actionTranslation = new HashMap<>();
-            if (this.classes.isEmpty()) {
+            if (warn && classes.isEmpty()) {
                 Log.get().warning("TranslationManager has no resources to load (" + this.getLocale() + ")");
             }
-            for (Class<?> c : this.classes) {
-                boolean loaded = loadTranslation(this.getLocale(), c);
-                if (!loaded) {
-                    Log.get().warning("TranslationManager was unable to load translation " + c.getCanonicalName() + " for locale " + this.getLocale());
-                }
+            for (Object o : classes) {
+                this.addTranslations(o, warn);
             }
         }
     }
+    private void addTranslations(final Object o, final boolean warn) {
+        if (o instanceof Class) {
+            final Class<?> c = (Class<?>) o;
+            boolean loaded = loadTranslation(this.getLocale(), c);
+            if (warn && !loaded) {
+                Log.get().warning("TranslationManager was unable to load translation " + c.getCanonicalName() + " for locale " + this.getLocale());
+            }
+        } else {
+            final Loader loader = (Loader) o;
+            loader.accept(this);
+        }
+    }
     // return all existing (e.g fr_CA only specify differences with fr)
-    private List<InputStream> findStream(final Locale locale, final Class<?> c, final boolean rootLast) {
+    private List<String> findResources(final Locale locale, final Class<?> c, final boolean rootLast) {
         final Control cntrl = CONTROL;
-        final List<InputStream> res = new ArrayList<>();
+        final List<String> res = new ArrayList<>();
         final String baseName = c.getPackage().getName() + "." + BASENAME;
         // test emptiness to not mix languages
         for (Locale targetLocale = locale; targetLocale != null && res.isEmpty(); targetLocale = cntrl.getFallbackLocale(baseName, targetLocale)) {
             for (final Locale candidate : cntrl.getCandidateLocales(baseName, targetLocale)) {
-                final InputStream ins = c.getClassLoader().getResourceAsStream(cntrl.toResourceName(cntrl.toBundleName(baseName, candidate), "xml"));
-                if (ins != null)
-                    res.add(ins);
+                res.add(cntrl.toResourceName(cntrl.toBundleName(baseName, candidate), "xml"));
             }
         }
         if (!rootLast)
 ,49 → 268,47
         return res;
     }
-    private boolean loadTranslation(final Locale l, Class<?> c) {
+    private boolean loadTranslation(final Locale l, final Class<?> c) {
         boolean translationLoaded = false;
-        // we want more specific translations to replace general ones, i.e. root Locale first
-        for (final InputStream input : findStream(l, c, false)) {
-            // create new instances to check if there's no duplicates in each resource
-            final Map<String, String> menuTranslation = new HashMap<>(), itemTranslation = new HashMap<>(), actionTranslation = new HashMap<>();
-            loadTranslation(input, menuTranslation, itemTranslation, actionTranslation);
-            // on the other hand, it's OK for one resource to override another
-            this.menuTranslation.putAll(menuTranslation);
-            this.itemTranslation.putAll(itemTranslation);
-            this.actionTranslation.putAll(actionTranslation);
-            translationLoaded = true;
-        }
-        return translationLoaded;
-    }
-    private static void loadTranslation(final InputStream input, final Map<String, String> menuTranslation, final Map<String, String> itemTranslation, final Map<String, String> actionTranslation) {
         // FIXME : l'implementation de Java est lente
         // com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl : 60 ms!
         // On pourrait passer à 1ms avec Piccolo...
         final DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        final DocumentBuilder dBuilder;
         try {
             dbFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
             dbFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-            final DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-            final Document doc = dBuilder.parse(input);
-            // Menus
-            loadTranslation(doc, "menu", menuTranslation);
-            // Items (title, labels not related to fields...)
-            loadTranslation(doc, "item", itemTranslation);
-            // Actions
-            loadTranslation(doc, "action", actionTranslation);
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (input != null) {
-                    input.close();
-                }
-            } catch (IOException e) {
+            dBuilder = dbFactory.newDocumentBuilder();
+        } catch (ParserConfigurationException e) {
+            throw new IllegalStateException("Couldn't create DocumentBuilder", e);
+        }
+        // we want more specific translations to replace general ones, i.e. root Locale first
+        for (final String rsrcName : findResources(l, c, false)) {
+            // create new instances to check if there's no duplicates in each resource
+            final Map<String, String> menuTranslation = new HashMap<>(), itemTranslation = new HashMap<>(), actionTranslation = new HashMap<>();
+            try (final InputStream input = c.getClassLoader().getResourceAsStream(rsrcName)) {
+                if (input == null)
+                    continue;
+                final Document doc = dBuilder.parse(input);
+                // Menus
+                loadTranslation(doc, "menu", menuTranslation);
+                // Items (title, labels not related to fields...)
+                loadTranslation(doc, "item", itemTranslation);
+                // Actions
+                loadTranslation(doc, "action", actionTranslation);
+            } catch (SAXException | IOException e) {
                 e.printStackTrace();
+                // don't return to load as much as possible
             }
+            // on the other hand, it's OK for one resource to override another
+            this.menuTranslation.putAll(menuTranslation);
+            this.itemTranslation.putAll(itemTranslation);
+            this.actionTranslation.putAll(actionTranslation);
+            translationLoaded = true;
         }
+        return translationLoaded;
     }
     private static void loadTranslation(final Document doc, final String tagName, final Map<String, String> m) {

 /trunk/OpenConcerto/src/org/openconcerto/utils/i18n/RuleBasedNumberFormatUtils.java
 New file
 ,0 → 1,76
+/*
+ * 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.utils.i18n;
+import org.openconcerto.utils.SystemUtils.PropertyList;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import com.ibm.icu.text.MessageFormat;
+import com.ibm.icu.text.RuleBasedNumberFormat;
+import com.ibm.icu.util.ULocale;
+/**
+ * Prints names that can be passed to {@link RuleBasedNumberFormat#setDefaultRuleSet(String)},
+ * {@link RuleBasedNumberFormat#format(long, String)} or {@link MessageFormat}. Can also be used to
+ * test {@link MessageFormat}, e.g. "{0, ordinal, %digits-ordinal-feminine} femme" => "1re femme".
+ *
+ * @author sylvain
+ */
+public class RuleBasedNumberFormatUtils {
+    public static final String LOCALE_PROP_NAME = "locales";
+    public static void main(String[] args) {
+        if (args.length == 0) {
+            System.out.println("--list\tList rule names");
+            System.out.println("--eval number message\tEvaluate the passed string using MessageFormat");
+            System.out.println("Use " + LOCALE_PROP_NAME + " system property to define locales to use");
+            System.exit(0);
+        }
+        final String action = args[0];
+        if (action.equals("--list")) {
+            for (final ULocale l : getLocales()) {
+                System.out.println(I18nUtils.dumpAllRules(l));
+                System.out.println();
+            }
+        } else if (action.equals("--eval")) {
+            final Object[] params = new Object[] { Long.valueOf(args[1]) };
+            final String message = args[2];
+            for (final ULocale l : getLocales()) {
+                System.out.println(l.getName() + ":");
+                System.out.println(new MessageFormat(message, l).format(params));
+                System.out.println();
+            }
+        } else {
+            throw new IllegalArgumentException("Unknown action : " + action);
+        }
+    }
+    private static List<ULocale> getLocales() {
+        final List<ULocale> res;
+        final List<String> pl = new PropertyList(LOCALE_PROP_NAME, ",").getValues();
+        if (pl == null || pl.isEmpty()) {
+            res = Collections.singletonList(ULocale.getDefault());
+        } else {
+            res = new ArrayList<>(pl.size());
+            for (final String l : pl) {
+                res.add(ULocale.forLanguageTag(l));
+            }
+        }
+        return res;
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/utils/i18n/TMPool.java
 New file
 ,0 → 1,23
+/*
+ * 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.utils.i18n;
+import java.util.Locale;
+import java.util.function.Function;
+public class TMPool<T extends TM> extends TranslationPool<T, RuntimeException> {
+    public TMPool(final Function<Locale, T> createInstance) {
+        super(createInstance);
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/utils/i18n/TM.java
 ,6 → 39,8
 import com.ibm.icu.text.MessagePattern.Part;
 import com.ibm.icu.text.MessagePattern.Part.Type;
+import net.jcip.annotations.ThreadSafe;
 /**
  * Translation manager. The translations are provided by {@link Translator} instances, they are
  * created either from a class ending in a language tag that implements it, or by properties files
 ,6 → 50,7
  * @author Sylvain
  * @see LocalizedInstances
  */
+@ThreadSafe
 public class TM {
     static public enum MissingMode {
 ,11 → 92,11
     static private final MissingMode DEFAULT_MISSING_MODE = MissingMode.STRING;
-    static private final TM INSTANCE = new TM();
+    private static final TMPool<TM> POOL = new TMPool<TM>(TM::new);
     static private final Pattern splitPtrn = Pattern.compile("__", Pattern.LITERAL);
     static private boolean USE_DYNAMIC_MAP = true;
-    public static void setUseDynamicMap(boolean b) {
+    public static synchronized void setUseDynamicMap(boolean b) {
         USE_DYNAMIC_MAP = b;
     }
 ,14 → 109,31
      *
      * @return <code>true</code> if <code>DynamicMap</code> should be used.
      */
-    public static boolean useDynamicMap() {
+    public static synchronized boolean useDynamicMap() {
         return USE_DYNAMIC_MAP;
     }
+    /**
+     * The default locale for {@link #getInstance()}. Currently just {@link Locale#getDefault()}.
+     *
+     * @return the default locale.
+     */
+    public static final Locale getDefaultLocale() {
+        return Locale.getDefault();
+    }
     static public TM getInstance() {
-        return INSTANCE;
+        return getInstance(getDefaultLocale());
     }
+    static public TM getInstance(final Locale l) {
+        return POOL.get(l);
+    }
+    static public String tr(final Locale l, final String key, final Object... args) {
+        return getInstance(l).translate(key, args);
+    }
     static public String tr(final String key, final Object... args) {
         return getInstance().translate(key, args);
     }
 ,16 → 142,11
     private TranslatorChain translations;
     private Locale translationsLocale;
-    protected TM() {
-        init();
+    protected TM(final Locale locale) {
+        setLocale(locale);
     }
-    protected void init() {
-        setLocale(Locale.getDefault());
-    }
-    public final void setLocale(final Locale locale) {
-        this.locale = locale;
+    private final void setLocale(final Locale locale) {
         final LocalizedInstances<Translator> localizedInstances = new LocalizedInstances<Translator>(Translator.class, TranslationManager.getControl()) {
             @Override
             protected Translator createInstance(final String bundleName, final Locale l, final Class<?> cl) throws IOException {
 ,8 → 169,11
             };
         };
         final Tuple2<Locale, List<Translator>> createInstances = localizedInstances.createInstances(getBaseName(), locale);
-        this.translationsLocale = createInstances.get0();
-        this.translations = new TranslatorChain(createInstances.get1());
+        synchronized (this) {
+            this.locale = locale;
+            this.translationsLocale = createInstances.get0();
+            this.translations = new TranslatorChain(createInstances.get1());
+        }
     }
     /**
 ,7 → 182,7
      * @return the requested locale.
      * @see #setLocale(Locale)
      */
-    public final Locale getLocale() {
+    public final synchronized Locale getLocale() {
         return this.locale;
     }
 ,10 → 191,14
      *
      * @return the actual locale.
      */
-    public final Locale getTranslationsLocale() {
+    public final synchronized Locale getTranslationsLocale() {
         return this.translationsLocale;
     }
+    private final synchronized TranslatorChain getTranslations() {
+        return this.translations;
+    }
     protected String getBaseName() {
         return I18nUtils.getBaseName(this.getClass());
     }
 ,7 → 261,7
         Objects.requireNonNull(mode, "Null mode");
         Objects.requireNonNull(key, "Null key");
         Objects.requireNonNull(args, "Null arguments");
-        final String res = this.translations.translate(key, args);
+        final String res = this.getTranslations().translate(key, args);
         return mode.returnResult(this, res, key);
     }

 /trunk/OpenConcerto/src/org/openconcerto/utils/PEMImporter.java
 ,9 → 18,9
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.cert.CertificateException;
 ,7 → 40,7
 public class PEMImporter {
-    public static SSLServerSocketFactory createSSLFactory(File privateKeyPem, File certificatePem, String password) throws Exception {
+    public static SSLServerSocketFactory createSSLFactory(File privateKeyPem, File certificatePem, String password) throws IOException, GeneralSecurityException {
         final SSLContext context = SSLContext.getInstance("TLS");
         final KeyStore keystore = createKeyStore(privateKeyPem, certificatePem, password);
         final KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
 ,8 → 57,7
      * @param certificatePem the certificate(s) PEM file
      * @param the password to set to protect the private key
      */
-    public static KeyStore createKeyStore(File privateKeyPem, File certificatePem, final String password)
-            throws Exception, KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
+    public static KeyStore createKeyStore(File privateKeyPem, File certificatePem, final String password) throws IOException, GeneralSecurityException {
         final X509Certificate[] cert = createCertificates(certificatePem);
         final KeyStore keystore = KeyStore.getInstance("JKS");
         keystore.load(null);
 ,7 → 67,7
         return keystore;
     }
-    private static PrivateKey createPrivateKey(File privateKeyPem) throws Exception {
+    private static PrivateKey createPrivateKey(File privateKeyPem) throws IOException, GeneralSecurityException {
         final BufferedReader r = new BufferedReader(new FileReader(privateKeyPem));
         String s = r.readLine();
         if (s == null || !s.contains("BEGIN PRIVATE KEY")) {
 ,7 → 89,7
         return generatePrivateKeyFromDER(bytes);
     }
-    private static X509Certificate[] createCertificates(File certificatePem) throws Exception {
+    private static X509Certificate[] createCertificates(File certificatePem) throws IOException, CertificateException {
         final List<X509Certificate> result = new ArrayList<X509Certificate>();
         final BufferedReader r = new BufferedReader(new FileReader(certificatePem));
         String s = r.readLine();

 /trunk/OpenConcerto/src/org/openconcerto/utils/SystemUtils.java
 ,6 → 13,7
  package org.openconcerto.utils;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 ,5 → 99,28
             } else
                 return false;
         }
+        public final boolean remove(final String value) {
+            return this.remove(value, true);
+        }
+        public final boolean remove(final String value, final boolean unsetIfEmpty) {
+            if (value == null)
+                throw new NullPointerException("Null value");
+            final List<String> l = getValues();
+            if (l == null || l.size() == 0 || !l.contains(value))
+                return false;
+            final List<String> newList = new ArrayList<>(l.size() - 1);
+            for (final String item : l) {
+                if (!item.equals(value))
+                    newList.add(item);
+            }
+            if (unsetIfEmpty && newList.isEmpty())
+                System.clearProperty(this.name);
+            else
+                System.setProperty(this.name, CollectionUtils.join(newList, this.getSeparator()));
+            return true;
+        }
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/utils/UnmodifiableCollectionMap.java
 ,6 → 201,11
     }
     @Override
+    public boolean containsInCollection(K key, V val) {
+        return getDel().containsInCollection(key, val);
+    }
+    @Override
     public Collection<V> allValues() {
         if (this.values == null) {
             this.values = Collections.unmodifiableCollection(getDel().allValues());

 /trunk/OpenConcerto/src/org/openconcerto/utils/NumberUtils.java
 ,13 → 13,17
  package org.openconcerto.utils;
+import org.openconcerto.utils.convertor.NumberConvertor;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import org.openconcerto.utils.convertor.NumberConvertor;
 public class NumberUtils {
     /**
 ,6 → 219,47
         }
     }
+    static public final int divideRoundUp(final int n, final int d) {
+        return divideRound(n, d, RoundingMode.UP);
+    }
+    static public final int divideRoundDown(final int n, final int d) {
+        return divideRound(n, d, RoundingMode.DOWN);
+    }
+    static public final int divideRoundCeiling(final int n, final int d) {
+        return divideRound(n, d, RoundingMode.CEILING);
+    }
+    static public final int divideRoundFloor(final int n, final int d) {
+        return divideRound(n, d, RoundingMode.FLOOR);
+    }
+    static final Set<RoundingMode> DIVIDE_SUPPORTED_MODES = Collections.unmodifiableSet(EnumSet.of(RoundingMode.UP, RoundingMode.DOWN, RoundingMode.CEILING, RoundingMode.FLOOR));
+    static final int divideRound(final int n, final int d, final RoundingMode mode) {
+        if (n == 0)
+            return 0;
+        final int mult;
+        if (mode == RoundingMode.DOWN) {
+            mult = 0;
+        } else if (mode == RoundingMode.UP) {
+            mult = signum(n) * (d - 1);
+        } else if (mode == RoundingMode.CEILING) {
+            // If the result is positive, behaves as for RoundingMode.UP; if negative, behaves as
+            // for RoundingMode.DOWN
+            mult = n > 0 ? (d - 1) : 0;
+        } else if (mode == RoundingMode.FLOOR) {
+            // If the result is positive, behave as for RoundingMode.DOWN; if negative, behave as
+            // for RoundingMode.UP
+            mult = n > 0 ? 0 : -(d - 1);
+        } else {
+            throw new UnsupportedOperationException();
+        }
+        return (n + mult) / d;
+    }
     static public Number negate(Number n) {
         if (n == null)
             return null;
 ,6 → 294,17
         return res;
     }
+    static public int signum(final long l) {
+        final int res;
+        if (l == 0)
+            res = 0;
+        else if (l < 0)
+            res = -1;
+        else
+            res = 1;
+        return res;
+    }
     static public int signum(Number n) {
         if (n == null)
             throw new NullPointerException();
 ,13 → 319,7
         } else if (clazz == Float.class) {
             res = (int) Math.signum(n.floatValue());
         } else if (clazz == Byte.class || clazz == Short.class || clazz == Integer.class || clazz == Long.class || clazz == AtomicInteger.class || clazz == AtomicLong.class) {
-            final long l = n.longValue();
-            if (l == 0)
-                res = 0;
-            else if (l < 0)
-                res = -1;
-            else
-                res = 1;
+            res = signum(n.longValue());
         } else {
             // limit overflow for unknown class
             res = (int) Math.signum(n.doubleValue());

 /trunk/OpenConcerto/src/org/openconcerto/utils/CollectionMap2.java
 ,6 → 223,19
         return this.get(key, !this.isEmptyCollSameAsNoColl(), true);
     }
+    @Override
+    public boolean containsInCollection(K key, V val) throws NullPointerException {
+        final C c = this.get(key);
+        if (c != null)
+            return c.contains(val);
+        else if (!this.containsKey(key))
+            return false;
+        else if (getMode() == Mode.NULL_MEANS_ALL)
+            return true;
+        else
+            throw new NullPointerException("Null value for " + key);
+    }
     /**
      * Returns a {@link Collection} view of all the values contained in this map. The collection is
      * backed by the map, so changes to the map are reflected in the collection, and vice-versa. If
 ,7 → 677,7
     }
     @Override
-    public CollectionMap2<K, C, V> clone() throws CloneNotSupportedException {
+    public CollectionMap2<K, C, V> clone() {
         @SuppressWarnings("unchecked")
         final CollectionMap2<K, C, V> result = (CollectionMap2<K, C, V>) super.clone();
         // allValues has a reference to this

 /trunk/OpenConcerto/src/org/openconcerto/utils/StreamUtils.java
 ,6 → 41,8
         }
     };
+    public static final File NULL_FILE = new File(System.getProperty("os.name").startsWith("Windows") ? "NUL" : "/dev/null");
     /**
      * Verbatim copy an entry from input to output stream.
      *

 /trunk/OpenConcerto/src/org/openconcerto/utils/ProcessStreams.java
 ,6 → 57,9
         DO_NOTHING
     }
+    // Added to Java 9
+    public static final Redirect DISCARD = Redirect.to(StreamUtils.NULL_FILE);
     static public final ProcessBuilder redirect(final ProcessBuilder pb) throws IOException {
         return pb.redirectErrorStream(true).redirectOutput(Redirect.INHERIT);
     }

 /trunk/OpenConcerto/src/org/openconcerto/utils/CollectionMap2Itf.java
 ,6 → 51,21
     public C getCollection(Object key);
     /**
+     * Returns <tt>true</tt> if the collection mapped to the passed key contains the specified
+     * element.
+     *
+     * @param key the key.
+     * @param element element whose presence in the collection is to be tested.
+     * @return <tt>true</tt> if the collection mapped to the passed key contains the specified
+     *         element or if the key exists, its collection is <code>null</code> and the
+     *         {@link #getMode() mode} is {@link Mode#NULL_MEANS_ALL} <br>
+     *         <code>false</code> if <code>!this.containsKey(key)</code>.
+     * @throws NullPointerException if the key exists, its collection is <code>null</code> and the
+     *         {@link #getMode() mode} is not {@link Mode#NULL_MEANS_ALL}.
+     */
+    public boolean containsInCollection(K key, V element) throws NullPointerException;
+    /**
      * Returns a {@link Collection} view of all the values contained in this map. The collection is
      * backed by the map, so changes to the map are reflected in the collection, and vice-versa. If
      * the map is modified while an iteration over the collection is in progress (except through the

 /trunk/OpenConcerto/src/org/openconcerto/utils/change/CollectionChangeEvent.java
 ,16 → 51,28
         super(source, propertyName, oldValue, newValue);
     }
+    @Override
+    public Collection<?> getOldValue() {
+        // checked by constructor
+        return (Collection<?>) super.getOldValue();
+    }
+    @Override
+    public Collection<?> getNewValue() {
+        // checked by constructor
+        return (Collection<?>) super.getNewValue();
+    }
     public Collection getItemsAdded() {
-        return CollectionUtils.subtract((Collection<?>) this.getNewValue(), (Collection<?>) this.getOldValue());
+        return CollectionUtils.subtract(this.getNewValue(), this.getOldValue());
     }
     public Collection getItemsRemoved() {
-        return CollectionUtils.subtract((Collection<?>) this.getOldValue(), (Collection<?>) this.getNewValue());
+        return CollectionUtils.subtract(this.getOldValue(), this.getNewValue());
     }
     public Collection getItemsNotChanged() {
-        return CollectionUtils.intersection((Collection<?>) this.getNewValue(), (Collection<?>) this.getOldValue());
+        return CollectionUtils.intersection(this.getNewValue(), this.getOldValue());
     }
     /**

 /trunk/OpenConcerto/src/org/openconcerto/utils/ListMap.java
 ,7 → 119,7
     }
     @Override
-    public ListMap<K, V> clone() throws CloneNotSupportedException {
+    public ListMap<K, V> clone() {
         return (ListMap<K, V>) super.clone();
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/utils/protocol/JavaSourceFromString.java
 New file
 ,0 → 1,45
+/*
+ * 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.utils.protocol;
+import java.net.URI;
+import javax.tools.JavaCompiler;
+import javax.tools.SimpleJavaFileObject;
+/**
+ * From {@link JavaCompiler} javadoc.
+ */
+public class JavaSourceFromString extends SimpleJavaFileObject {
+    /**
+     * The source code of this "file".
+     */
+    private final String code;
+    /**
+     * Constructs a new JavaSourceFromString.
+     *
+     * @param name the name of the compilation unit represented by this file object
+     * @param code the source code for the compilation unit represented by this file object
+     */
+    JavaSourceFromString(String name, String code) {
+        super(URI.create("string:///" + name.replace('.', '/') + Kind.SOURCE.extension), Kind.SOURCE);
+        this.code = code;
+    }
+    @Override
+    public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+        return this.code;
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/utils/protocol/Helper.java
 ,11 → 26,16
     static private final PropertyList PL = new PropertyList("java.protocol.handler.pkgs", "|");
     static final public void register() {
-        // works even if setURLStreamHandlerFactory() is called (as long as the factoy returns null
+        // Works even if setURLStreamHandlerFactory() is called (as long as the factory returns null
         // for our protocols)
+        // On Java 11, there's also URLStreamHandlerProvider
         PL.add(Helper.class.getPackage().getName());
     }
+    static final public void unregister() {
+        PL.remove(Helper.class.getPackage().getName());
+    }
     /**
      * Set the {@link URL#setURLStreamHandlerFactory(URLStreamHandlerFactory) factory} to add our
      * protocols. This is needed for example in web start when one of our url is embedded into a
 ,10 → 64,14
      *         "jar:jarjar:file:/C:/mylibs/Outer.jar^/Inner.jar!/".
      */
     public static final URL toJarJar(URL u) {
+        return toJarJar(u, "");
+    }
+    public static final URL toJarJar(final URL u, final String s) {
         // if it's a jar inside another jar
         if ("jar".equals(u.getProtocol()) && u.getPath().endsWith(".jar")) {
             try {
-                return new URL("jar:jar" + u.toString().replace('!', '^') + "!/");
+                return new URL("jar:jar" + u.toString().replace('!', '^') + "!/" + s);
             } catch (MalformedURLException e) {
                 // shouldn't happen since we modify a valid URL
                 throw new IllegalStateException("Couldn't transform " + u, e);

 /trunk/OpenConcerto/src/org/openconcerto/utils/prog/VMLauncher.java
 ,11 → 16,11
 import org.openconcerto.utils.FileUtils;
 import org.openconcerto.utils.OSFamily;
 import org.openconcerto.utils.ProcessStreams;
-import org.openconcerto.utils.ProcessStreams.Action;
 import org.openconcerto.utils.PropertiesUtils;
 import java.io.File;
 import java.io.IOException;
+import java.lang.ProcessBuilder.Redirect;
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
 ,7 → 167,7
         return restart(mainClass, Arrays.asList(args));
     }
-    public static final Process restart(final Action action, final Class<?> mainClass, final String... args) throws IOException {
+    public static final Process restart(final Redirect action, final Class<?> mainClass, final String... args) throws IOException {
         return restart(action, mainClass, Arrays.asList(args));
     }
 ,16 → 182,16
      * @see #NO_RESTART
      */
     public static final Process restart(final Class<?> mainClass, final List<String> args) throws IOException {
-        return restart(Action.CLOSE, mainClass, args);
+        return restart(ProcessStreams.DISCARD, mainClass, args);
     }
-    public static final Process restart(final Action action, final Class<?> mainClass, final List<String> args) throws IOException {
+    public static final Process restart(final Redirect action, final Class<?> mainClass, final List<String> args) throws IOException {
         if (Boolean.getBoolean(NO_RESTART))
             return null;
         final File wd = FileUtils.getWD();
         final List<String> command = getNativeCommand(args);
         if (command != null) {
-            return ProcessStreams.handle(new ProcessBuilder(command).directory(wd).start(), action);
+            return new ProcessBuilder(command).directory(wd).redirectErrorStream(true).redirectOutput(action).start();
         } else {
             try {
                 mainClass.getMethod("main", String[].class);
 ,7 → 210,7
                 }
                 @Override
-                protected Action getStreamAction() {
+                protected Redirect getStreamRedirect() {
                     return action;
                 }
             }.launch(mainClass.getName(), args);
 ,7 → 278,7
         return split(res);
     }
-    protected final Process launch(final String mainClass) throws IOException {
+    public final Process launch(final String mainClass) throws IOException {
         return this.launch(mainClass, Collections.<String> emptyList());
     }
 ,7 → 302,7
      * @return the new Process.
      * @throws IOException if the process couldn't be started.
      */
-    protected final Process launch(final String mainClass, final List<String> progParams) throws IOException {
+    public final Process launch(final String mainClass, final List<String> progParams) throws IOException {
         final boolean debug = Boolean.getBoolean("launcher.debug");
         final String javaBinary = getJavaBinary();
         final File sameJava = new File(System.getProperty("java.home"), "bin/" + javaBinary);
 ,17 → 353,15
             System.err.println("Std out and err :");
         }
-        final Process res = procBuilder.start();
-        ProcessStreams.handle(res, debug ? Action.REDIRECT : this.getStreamAction());
-        return res;
+        procBuilder.redirectErrorStream(true).redirectOutput(debug ? Redirect.INHERIT : this.getStreamRedirect());
+        return procBuilder.start();
     }
     protected void modifyEnv(Map<String, String> environment) {
     }
-    protected Action getStreamAction() {
-        return Action.CLOSE;
+    protected Redirect getStreamRedirect() {
+        return ProcessStreams.DISCARD;
     }
     protected boolean enableRemoteDebug(Properties props) {

 /trunk/OpenConcerto/src/org/openconcerto/utils/SetMap.java
 ,7 → 127,7
     }
     @Override
-    public SetMap<K, V> clone() throws CloneNotSupportedException {
+    public SetMap<K, V> clone() {
         return (SetMap<K, V>) super.clone();
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/task/TM.java
 ,20 → 13,27
  package org.openconcerto.task;
-import org.openconcerto.sql.UserPropsTM;
+import org.openconcerto.utils.i18n.TMPool;
-public class TM extends UserPropsTM {
+import java.util.Locale;
-    static private final TM INSTANCE = new TM();
+public class TM extends org.openconcerto.utils.i18n.TM {
-    static public final TM getTM() {
-        return INSTANCE;
+    private static final TMPool<TM> POOL = new TMPool<TM>(TM::new);
+    static public TM getTM() {
+        return getTM(getDefaultLocale());
     }
+    static public TM getTM(final Locale l) {
+        return POOL.get(l);
+    }
     static public final String tr(final String key, final Object... args) {
         return getTM().translate(key, args);
     }
-    private TM() {
+    private TM(final Locale l) {
+        super(l);
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/task/config/ComptaBasePropsConfiguration.java
 ,10 → 20,13
 import org.openconcerto.sql.model.DBRoot;
 import org.openconcerto.sql.model.DBSystemRoot;
 import org.openconcerto.sql.model.SQLBase;
+import org.openconcerto.sql.model.SQLDataSource;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLFilter;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLTable;
+import org.openconcerto.sql.model.SQLTableEvent;
+import org.openconcerto.sql.model.SQLTableModifiedListener;
 import org.openconcerto.sql.users.UserCommonSQLElement;
 import org.openconcerto.sql.users.rights.RightSQLElement;
 import org.openconcerto.sql.users.rights.UserRightSQLElement;
 ,6 → 52,8
 import java.util.List;
 import java.util.Properties;
+import net.jcip.annotations.GuardedBy;
 public abstract class ComptaBasePropsConfiguration extends PropsConfiguration {
     public abstract void setUpSocieteDataBaseConnexion(int base);
 ,8 → 105,10
         throw new FileNotFoundException(name + " not found in " + Arrays.asList(dirs));
     }
-    private int idSociete = SQLRow.NONEXISTANT_ID;
+    @GuardedBy("this")
     private SQLRow rowSociete = null;
+    private final SQLTableModifiedListener rowSocieteListener = (evt) -> updateRowSociete(evt);
+    @GuardedBy("this")
     private DBRoot baseSociete;
     {
 ,15 → 122,26
         super(props);
         this.setProductInfo(productInfo);
-        String name = "ilm";
         // don't overwrite (allow to map no roots, just to test connection)
         if (getProperty("systemRoot.rootsToMap") == null) {
-            this.setProperty("systemRoot.rootsToMap", name + "_Common");
-            this.setProperty("systemRoot.rootPath", name + "_Common");
+            final String interAppRootName = getInterAppRootName();
+            this.setProperty("systemRoot.rootsToMap", interAppRootName);
+            this.setProperty("systemRoot.rootPath", interAppRootName);
         }
     }
+    @Override
+    public void destroy() {
+        this.setRowSociete(null);
+        super.destroy();
+    }
+    public final String getInterAppRootName() {
+        String name = "ilm";
+        return name + "_Common";
+    }
     // use Configuration directory if it exists
     @Override
     protected FileMode getFileMode() {
 ,6 → 149,17
     }
     @Override
+    protected void initDS(SQLDataSource ds) {
+        super.initDS(ds);
+        // Old H2 versions need this to safely open page store files
+        // (https://github.com/h2database/h2database/issues/1023), and new version ignore it
+        // (https://github.com/h2database/h2database/pull/1208).
+        ds.addConnectionProperty("MVCC", "false");
+        // Don't begin transition from page store just yet.
+        ds.addConnectionProperty("MV_STORE", "false");
+    }
+    @Override
     protected List<String> getMappings() {
         final List<String> res = new ArrayList<>(super.getMappings());
         final String pkg = "/" + TM.class.getPackage().getName().replace('.', '/');
 ,32 → 197,64
         return getRowSociete().getString("DATABASE_NAME");
     }
-    public final SQLRow getRowSociete() {
+    public synchronized final SQLRow getRowSociete() {
         return this.rowSociete;
     }
     public final int getSocieteID() {
-        return this.idSociete;
+        final SQLRow row = this.getRowSociete();
+        return row == null ? SQLRow.NONEXISTANT_ID : row.getID();
     }
-    protected final void setRowSociete(int id) {
-        this.idSociete = id;
-        final SQLTable tableSociete = getSystemRoot().findTable("SOCIETE_COMMON");
-        final SQLRow row = tableSociete.getRow(id);
-        if (row == null) {
-            throw new IllegalArgumentException("no row for id " + id + " in " + tableSociete);
-        } else if (!row.isValid()) {
-            throw new IllegalArgumentException("invalid row : " + row);
+    private synchronized void updateRowSociete(SQLTableEvent evt) {
+        if (evt.getRow().equals(this.rowSociete)) {
+            this.rowSociete.fetchValues();
         }
-        this.rowSociete = row;
     }
+    public final SQLTable getSocieteTable() {
+        return getSocieteTable(true);
+    }
+    protected final SQLTable getSocieteTable(final boolean mustExist) {
+        return getSystemRoot().findTable("SOCIETE_COMMON", mustExist);
+    }
+    // undefined ID is allowed (used for the template root)
+    protected final void setRowSociete(Number id) {
+        final boolean clear = id == null;
+        final SQLRow row;
+        final SQLTable tableSociete = getSocieteTable(!clear);
+        if (clear) {
+            row = null;
+            // might be null if mapsToRoot is empty (e.g. tests)
+            if (tableSociete != null)
+                tableSociete.removeTableModifiedListener(this.rowSocieteListener);
+        } else {
+            row = tableSociete.getRow(id.intValue());
+            if (row == null) {
+                throw new IllegalArgumentException("no row for id " + id + " in " + tableSociete);
+            } else if (!row.isValid()) {
+                throw new IllegalArgumentException("invalid row : " + row);
+            }
+            tableSociete.addTableModifiedListener(this.rowSocieteListener);
+        }
+        synchronized (this) {
+            this.rowSociete = row;
+        }
+    }
+    @Deprecated
     public final SQLBase getSQLBaseSociete() {
         return this.getRootSociete().getBase();
     }
     public final DBRoot getRootSociete() {
-        if (this.baseSociete == null && this.rowSociete != null)
+        return this.getRootSociete(true);
+    }
+    protected synchronized final DBRoot getRootSociete(final boolean create) {
+        if (create && this.baseSociete == null && this.getRowSociete() != null)
             this.baseSociete = this.createSQLBaseSociete();
         return this.baseSociete;
     }

/trunk/OpenConcerto/src/org/openconcerto/erp/core/customerrelationship/customer/element/CustomerGroup.java
75,6 → 75,7
gPayment.addItem("BIC", LayoutHints.DEFAULT_FIELD_HINTS);
gPayment.addItem("ID_MODE_REGLEMENT", new LayoutHints(true, true, true, true, true, false, true, true));
gPayment.addItem("ID_COMPTE_PCE");
gPayment.addItem("ID_SEPA_MANDATE_DEFAULT");
gPayment.addItem("ENCOURS_MAX");
gPayment.addItem("ID_COMPTE_PCE_PRODUIT");
gPayment.addItem("ID_COMPTE_PCE_SERVICE");

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/customerrelationship/customer/element/CustomerSQLComponent.java
 ,8 → 16,10
 import org.openconcerto.erp.core.common.component.AdresseSQLComponent;
 import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
 import org.openconcerto.erp.core.customerrelationship.customer.ui.AdresseClientItemTable;
+import org.openconcerto.erp.core.finance.accounting.element.ComptePCESQLElement;
 import org.openconcerto.erp.core.sales.product.element.ClientCodeArticleTable;
 import org.openconcerto.erp.core.sales.product.ui.CustomerProductQtyPriceListTable;
+import org.openconcerto.erp.preferences.GestionCommercialeGlobalPreferencePanel;
 import org.openconcerto.erp.preferences.ModeReglementDefautPrefPanel;
 import org.openconcerto.erp.utils.TM;
 import org.openconcerto.sql.Configuration;
 ,8 → 29,11
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
+import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.UndefinedRowValuesCache;
+import org.openconcerto.sql.model.Where;
+import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.sqlobject.JUniqueTextField;
 import org.openconcerto.sql.sqlobject.SQLSearchableTextCombo;
 import org.openconcerto.sql.ui.textmenu.TextFieldWithMenu;
 ,6 → 54,7
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 ,8 → 76,6
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import com.lowagie.text.Font;
 public class CustomerSQLComponent extends GroupSQLComponent {
     private ContactItemTable table;
     private ClientCodeArticleTable tableCustomProduct;
 ,9 → 330,48
                 });
             }
         }
+        SQLPreferences prefs = new SQLPreferences(getTable().getDBRoot());
+        if (prefs.getBoolean(GestionCommercialeGlobalPreferencePanel.COMPTE_CLIENT_AUTO, Boolean.FALSE)) {
+            createCompteClientFromCodeAuto(id);
+        }
         return id;
     }
+    private void createCompteClientFromCodeAuto(int idClient) {
+        final SQLRow rowClient = getTable().getRow(idClient);
+        if (rowClient.isForeignEmpty("ID_COMPTE_PCE")) {
+            SQLRowValues rowVals = rowClient.createEmptyUpdateRow();
+            final String text = rowClient.getString("CODE");
+            String compte = "411" + text;
+            SQLTable table = getTable().getForeignTable("ID_COMPTE_PCE");
+            SQLSelect selCompte = new SQLSelect();
+            selCompte.addSelectFunctionStar("COUNT");
+            selCompte.setArchivedPolicy(SQLSelect.BOTH);
+            selCompte.setWhere(new Where(table.getField("NUMERO"), "LIKE", compte + "%"));
+            System.err.println(selCompte.asString());
+            Object o = getTable().getDBRoot().getDBSystemRoot().getDataSource().executeScalar(selCompte.asString());
+            int nb = 0;
+            if (o != null) {
+                Long i = (Long) o;
+                nb = i.intValue();
+            }
+            if (nb > 0) {
+                compte = compte + nb;
+            }
+            int idCpt = ComptePCESQLElement.getId(compte, rowClient.getString("NOM"));
+            rowVals.put("ID_COMPTE_PCE", idCpt);
+            try {
+                rowVals.update();
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        }
+    }
     private JComponent createAdressesComponent() {
         final JTabbedPane tabbedAdresse = new JTabbedPane() {
             public void insertTab(String title, Icon icon, Component component, String tip, int index) {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/customerrelationship/mail/EmailTemplate.java
 ,6 → 24,7
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Font;
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 ,8 → 43,6
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
-import com.lowagie.text.Font;
 public class EmailTemplate {
     private String name;
     private String title;
 ,7 → 136,7
                 if (t.isDefault) {
                     l.setFont(l.getFont().deriveFont(Font.BOLD));
                 } else {
-                    l.setFont(l.getFont().deriveFont(Font.NORMAL));
+                    l.setFont(l.getFont().deriveFont(Font.PLAIN));
                 }
                 return l;
             }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/customerrelationship/mail/EmailTemplateSQLComponent.java
 ,7 → 25,7
     @Override
     protected SQLRowValues createDefaults() {
-        final SQLRowValues defaultValues = super.createDefaults();
+        final SQLRowValues defaultValues = new SQLRowValues(getTable());
         defaultValues.put("FORMAT_DATE", "dd/MM/yyyy");
         return defaultValues;
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/tax/model/TaxeCache.java
 ,7 → 38,7
         final DBRoot root = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete();
         final SQLTable table = root.getTable("TAXE");
         SQLRowValues rowVals = new SQLRowValues(table);
-        rowVals.putNulls("TAUX", "CODE", "NOM", "ID_TAXE", "DEFAULT");
+        rowVals.putNulls("TAUX", "CODE", "NOM", "ID_TAXE", "DEFAULT", "DEFAULT_ACHAT");
         List<String> compteFields = Arrays.asList("ID_COMPTE_PCE_COLLECTE", "ID_COMPTE_PCE_DED", "ID_COMPTE_PCE", "ID_COMPTE_PCE_VENTE", "ID_COMPTE_PCE_VENTE_SERVICE", "ID_COMPTE_PCE_COLLECTE_INTRA",
                 "ID_COMPTE_PCE_DED_INTRA");
         for (String foreignFieldName : compteFields) {
 ,6 → 51,7
     private final Map<SQLRowAccessor, Float> mapRowTaux = new LinkedHashMap<>();
     private static TaxeCache instance;
     private SQLRow firstIdTaxe = null;
+    private SQLRow firstIdTaxeAchat = null;
     private TaxeCache() {
         loadCache();
 ,6 → 62,7
         this.mapRowTaux.clear();
         this.mapTaux.clear();
         this.firstIdTaxe = null;
+        this.firstIdTaxeAchat = null;
         final SQLRowValuesListFetcher sel = getSel();
 ,6 → 73,9
             if (sqlRow.getBoolean("DEFAULT")) {
                 this.firstIdTaxe = sqlRow.asRow();
             }
+            if (sqlRow.getBoolean("DEFAULT_ACHAT")) {
+                this.firstIdTaxeAchat = sqlRow.asRow();
+            }
         }
     }
 ,6 → 128,20
         return this.firstIdTaxe;
     }
+    public synchronized SQLRow getFirstTaxeAchat() {
+        if (this.firstIdTaxeAchat == null) {
+            final SQLRowValuesListFetcher sel = getSel();
+            final List<SQLRowValues> rows = sel.fetch(new Where(sel.getReq().getTable("TAXE").getField("DEFAULT_ACHAT"), "=", Boolean.TRUE));
+            if (rows != null && !rows.isEmpty()) {
+                this.firstIdTaxeAchat = rows.get(0).asRow();
+            } else {
+                this.firstIdTaxeAchat = getFirstTaxe();
+            }
+        }
+        return this.firstIdTaxeAchat;
+    }
     public synchronized Integer getIdFromTaux(Float tax) {
         Set<Integer> s = mapTaux.keySet();
         for (Integer integer : s) {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/component/EncaisserMontantSQLComponent.java
 ,7 → 17,6
 import org.openconcerto.erp.core.common.ui.DeviseField;
 import org.openconcerto.erp.core.finance.accounting.element.MouvementSQLElement;
 import org.openconcerto.erp.core.finance.payment.element.EncaisserMontantSQLElement;
-import org.openconcerto.erp.core.finance.payment.element.TypeReglementSQLElement;
 import org.openconcerto.erp.core.finance.payment.ui.EncaisseMontantTable;
 import org.openconcerto.erp.preferences.ModeReglementDefautPrefPanel;
 import org.openconcerto.sql.Configuration;
 ,7 → 65,85
     private JLabel labelWarning = new JLabelWarning("Le montant est trop élevé!");
     private JDate date;
+    private ElementSQLObject eltModeRegl;
+    final TableModelListener tableListener = new TableModelListener() {
+        @Override
+        public void tableChanged(TableModelEvent e) {
+            final RowValuesTableModel model = table.getRowValuesTable().getRowValuesTableModel();
+            if (e.getColumn() == TableModelEvent.ALL_COLUMNS || e.getColumn() == model.getColumnIndexForElement(table.getMontantElement())) {
+                final int rowCount = model.getRowCount();
+                long total = 0;
+                for (int i = 0; i < rowCount; i++) {
+                    Number nHT = (Number) model.getValueAt(i, model.getColumnIndexForElement(table.getMontantElement()));
+                    if (nHT != null) {
+                        total += nHT.longValue();
+                    }
+                }
+                montant.getDocument().removeDocumentListener(listenerMontant);
+                montant.setText(GestionDevise.currencyToString(total));
+                montant.getDocument().addDocumentListener(listenerMontant);
+                // Selection du mode de reglement
+                if (getMode() == SQLComponent.Mode.INSERTION) {
+                    if (rowCount >= 1) {
+                        MouvementSQLElement element = getElement().getDirectory().getElement(MouvementSQLElement.class);
+                        SQLRowValues row1 = model.getRowValuesAt(0);
+                        if (row1.getObject("ID_MOUVEMENT_ECHEANCE") != null && !row1.isForeignEmpty("ID_MOUVEMENT_ECHEANCE")) {
+                            final int idScr = element.getSourceId(row1.getForeignID("ID_MOUVEMENT_ECHEANCE"));
+                            SQLTable tableMvt = element.getTable();
+                            if (idScr > 1) {
+                                SQLRow rowMvt = tableMvt.getRow(idScr);
+                                String source = rowMvt.getString("SOURCE");
+                                int idSource = rowMvt.getInt("IDSOURCE");
+                                SQLElement eltSource = element.getDirectory().getElement(source);
+                                if (eltSource != null) {
+                                    SQLRow rowSource = eltSource.getTable().getRow(idSource);
+                                    if (rowSource != null) {
+                                        SQLRow rowModeRegl = rowSource.getForeignRow("ID_MODE_REGLEMENT");
+                                        if (rowModeRegl != null) {
+                                            System.err.println("Set mode de règlement");
+                                            int idTypeRegl = rowModeRegl.getInt("ID_TYPE_REGLEMENT");
+                                            SQLTable tableModeRegl = Configuration.getInstance().getDirectory().getElement("MODE_REGLEMENT").getTable();
+                                            SQLRowValues rowVals = new SQLRowValues(tableModeRegl);
+                                            rowVals.put("ID_TYPE_REGLEMENT", idTypeRegl);
+                                            rowVals.put("COMPTANT", Boolean.TRUE);
+                                            rowVals.put("AJOURS", 0);
+                                            rowVals.put("LENJOUR", 0);
+                                            rowVals.put("ID_" + BanqueSQLElement.TABLENAME, rowModeRegl.getInt("ID_" + BanqueSQLElement.TABLENAME));
+                                            eltModeRegl.setValue(rowVals);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if (e.getColumn() == TableModelEvent.ALL_COLUMNS || e.getColumn() == model.getColumnIndexForElement(table.getMontantElement())
+                    || e.getColumn() == model.getColumnIndexForElement(table.getMontantAReglerElement())) {
+                updateWarning();
+            }
+        }
+    };
+    final SimpleDocumentListener listenerMontant = new SimpleDocumentListener() {
+        @Override
+        public void update(DocumentEvent e) {
+            table.getRowValuesTable().getRowValuesTableModel().removeTableModelListener(tableListener);
+            updateMontant(montant.getText());
+            table.getRowValuesTable().getRowValuesTableModel().addTableModelListener(tableListener);
+            updateWarning();
+        }
+    };
     public EncaisserMontantSQLComponent(SQLElement elt) {
         super(elt);
     }
 ,7 → 161,6
         c.weighty = 1;
         c.fill = GridBagConstraints.BOTH;
         this.add(this.table, c);
-        this.table.getRowValuesTable().setEnabled(false);
         c.fill = GridBagConstraints.HORIZONTAL;
         c.gridwidth = 1;
         c.gridy++;
 ,11 → 220,13
         c.gridx++;
         c.gridwidth = 3;
+        c.weightx = 1;
         c.fill = GridBagConstraints.NONE;
         this.add(this.montant, c);
         // Warning
         c.gridx++;
+        c.weightx = 0;
         c.gridwidth = GridBagConstraints.REMAINDER;
         this.labelWarning.setHorizontalAlignment(SwingConstants.RIGHT);
         this.add(this.labelWarning, c);
 ,9 → 248,12
         c.gridy++;
         c.gridwidth = GridBagConstraints.REMAINDER;
         this.addView("ID_MODE_REGLEMENT", BaseSQLComponent.REQ + ";" + BaseSQLComponent.DEC + ";" + BaseSQLComponent.SEP);
-        final ElementSQLObject eltModeRegl = (ElementSQLObject) this.getView("ID_MODE_REGLEMENT");
-        this.add(eltModeRegl, c);
+        this.eltModeRegl = (ElementSQLObject) this.getView("ID_MODE_REGLEMENT");
+        this.add(this.eltModeRegl, c);
+        ModeDeReglementSQLComponent modeReglComp;
+        modeReglComp = (ModeDeReglementSQLComponent) this.eltModeRegl.getSQLChild();
+        modeReglComp.addDateCompListener(this.date);
         this.addRequiredSQLObject(this.date, "DATE");
         this.addRequiredSQLObject(this.montant, "MONTANT");
 ,78 → 263,7
         this.addSQLObject(new JTextField(), "TIERS");
         DefaultGridBagConstraints.lockMinimumSize(this.montant);
-        final TableModelListener tableListener = new TableModelListener() {
-            @Override
-            public void tableChanged(TableModelEvent e) {
-                final RowValuesTableModel model = table.getRowValuesTable().getRowValuesTableModel();
-                if (e.getColumn() == TableModelEvent.ALL_COLUMNS || e.getColumn() == model.getColumnIndexForElement(table.getMontantElement())) {
-                    final int rowCount = model.getRowCount();
-                    long total = 0;
-                    for (int i = 0; i < rowCount; i++) {
-                        Number nHT = (Number) model.getValueAt(i, model.getColumnIndexForElement(table.getMontantElement()));
-                        if (nHT != null) {
-                            total += nHT.longValue();
-                        }
-                    }
-                    montant.setText(GestionDevise.currencyToString(total));
-                    // Selection du mode de reglement
-                    if (getMode() == SQLComponent.Mode.INSERTION) {
-                        if (rowCount >= 1 && model.getRowValuesAt(0).getObject("ID_MOUVEMENT_ECHEANCE") != null && !model.getRowValuesAt(0).isForeignEmpty("ID_MOUVEMENT_ECHEANCE")) {
-                            final int idScr = MouvementSQLElement.getSourceId(model.getRowValuesAt(0).getInt("ID_MOUVEMENT_ECHEANCE"));
-                            SQLTable tableMvt = Configuration.getInstance().getDirectory().getElement("MOUVEMENT").getTable();
-                            if (idScr > 1) {
-                                SQLRow rowMvt = tableMvt.getRow(idScr);
-                                String source = rowMvt.getString("SOURCE");
-                                int idSource = rowMvt.getInt("IDSOURCE");
-                                SQLElement eltSource = Configuration.getInstance().getDirectory().getElement(source);
-                                if (eltSource != null) {
-                                    SQLRow rowSource = eltSource.getTable().getRow(idSource);
-                                    if (rowSource != null) {
-                                        SQLRow rowModeRegl = rowSource.getForeignRow("ID_MODE_REGLEMENT");
-                                        if (rowModeRegl != null) {
-                                            System.err.println("Set mode de règlement");
-                                            int idTypeRegl = rowModeRegl.getInt("ID_TYPE_REGLEMENT");
-                                            SQLTable tableModeRegl = Configuration.getInstance().getDirectory().getElement("MODE_REGLEMENT").getTable();
-                                            SQLRowValues rowVals = new SQLRowValues(tableModeRegl);
-                                            if (idTypeRegl == TypeReglementSQLElement.INDEFINI) {
-                                                idTypeRegl = TypeReglementSQLElement.CHEQUE;
-                                            }
-                                            rowVals.put("ID_TYPE_REGLEMENT", idTypeRegl);
-                                            rowVals.put("COMPTANT", Boolean.TRUE);
-                                            rowVals.put("AJOURS", 0);
-                                            rowVals.put("LENJOUR", 0);
-                                            rowVals.put("ID_" + BanqueSQLElement.TABLENAME, rowModeRegl.getInt("ID_" + BanqueSQLElement.TABLENAME));
-                                            eltModeRegl.setValue(rowVals);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                if (e.getColumn() == TableModelEvent.ALL_COLUMNS || e.getColumn() == model.getColumnIndexForElement(table.getMontantAReglerElement())) {
-                    updateWarning();
-                }
-            }
-        };
-        this.montant.getDocument().addDocumentListener(new SimpleDocumentListener() {
-            @Override
-            public void update(DocumentEvent e) {
-                table.getRowValuesTable().getRowValuesTableModel().removeTableModelListener(tableListener);
-                updateMontant(montant.getText());
-                table.getRowValuesTable().getRowValuesTableModel().addTableModelListener(tableListener);
-                updateWarning();
-            }
-        });
+        this.montant.getDocument().addDocumentListener(listenerMontant);
         this.table.getRowValuesTable().getRowValuesTableModel().addTableModelListener(tableListener);
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/component/ModeDeReglementSQLComponent.java
 ,6 → 15,7
 import org.openconcerto.erp.config.Log;
 import org.openconcerto.erp.core.common.element.BanqueSQLElement;
+import org.openconcerto.erp.core.finance.payment.element.ModeDeReglementSQLElement;
 import org.openconcerto.erp.core.finance.payment.element.TypeReglementSQLElement;
 import org.openconcerto.erp.model.BanqueModifiedListener;
 import org.openconcerto.sql.element.BaseSQLComponent;
 ,6 → 41,7
 import java.awt.event.ItemListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 ,6 → 281,39
         });
     }
+    public void addDateCompListener(JDate dateParent) {
+        dateParent.addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                ModeDeReglementSQLComponent.this.currentDate = dateParent.getValue();
+                refreshDatePrev();
+            }
+        });
+        dateParent.addValueListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                ModeDeReglementSQLComponent.this.currentDate = dateParent.getValue();
+                refreshDatePrev();
+            }
+        });
+    }
+    private void refreshDatePrev() {
+        if (this.currentDate != null) {
+            int aJ = this.comboA.getValue().trim().length() == 0 ? 0 : Integer.valueOf(this.comboA.getValue());
+            int nJ = this.comboLe.getValue().trim().length() == 0 ? 0 : Integer.valueOf(this.comboLe.getValue());
+            Date d = ModeDeReglementSQLElement.calculDate(aJ, nJ, this.currentDate);
+            this.datePrev.setDate(d);
+        } else {
+            this.datePrev.setDate(null);
+        }
+    }
+    private JDate datePrev = new JDate();
+    private Date currentDate = null;
     private void createPanelEcheance() {
         final GridBagConstraints c = new DefaultGridBagConstraints();
 ,6 → 325,13
         this.comboA.setMinimumSize(new Dimension(60, this.comboA.getMinimumSize().height));
         this.comboA.setPreferredSize(new Dimension(60, this.comboA.getMinimumSize().height));
         this.comboA.setMaximumSize(new Dimension(60, this.comboA.getMinimumSize().height));
+        this.comboA.addValueListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                refreshDatePrev();
+            }
+        });
         this.panelEcheance.add(this.comboA, c);
         c.gridx += 1;
         c.gridwidth = 1;
 ,7 → 342,21
         c.fill = GridBagConstraints.HORIZONTAL;
         this.buttonDateFacture.setOpaque(false);
         this.panelEcheance.add(this.buttonDateFacture, c);
         c.gridy++;
+        c.gridx = 0;
+        c.weightx = 1;
+        c.gridwidth = 1;
+        // ((BaseSQLComponent)((ElementSQLObject)getSQLParent()).getSQLParent()).getView("DATE");
+        this.panelEcheance.add(new JLabel("Soit le"), c);
+        c.gridx++;
+        c.gridwidth = 1;
+        this.datePrev.setEnabled(false);
+        this.panelEcheance.add(this.datePrev, c);
+        // c.gridy++;
+        c.gridwidth = 2;
+        c.gridx = 3;
         c.weightx = 0;
         c.fill = GridBagConstraints.NONE;
         this.buttonFinMois.setOpaque(false);
 ,6 → 370,13
         this.comboLe.setMinimumSize(new Dimension(60, this.comboLe.getMinimumSize().height));
         this.comboLe.setPreferredSize(new Dimension(60, this.comboLe.getMinimumSize().height));
         this.comboLe.setMaximumSize(new Dimension(60, this.comboLe.getMinimumSize().height));
+        this.comboLe.addValueListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                refreshDatePrev();
+            }
+        });
         this.panelEcheance.add(this.comboLe, c);
         this.panelActive = this.panelEcheance;
         this.m.put(Mode.ECHEANCE, this.panelEcheance);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/element/ReglerMontantSQLComponent.java
 ,6 → 16,7
 import org.openconcerto.erp.core.common.element.BanqueSQLElement;
 import org.openconcerto.erp.core.common.ui.DeviseField;
 import org.openconcerto.erp.core.finance.accounting.element.MouvementSQLElement;
+import org.openconcerto.erp.core.finance.payment.component.ModeDeReglementSQLComponent;
 import org.openconcerto.erp.core.finance.payment.ui.RegleMontantTable;
 import org.openconcerto.erp.generationEcritures.GenerationReglementAchat;
 import org.openconcerto.erp.preferences.ModeReglementDefautPrefPanel;
 ,6 → 146,9
         this.addView("ID_MODE_REGLEMENT", BaseSQLComponent.REQ + ";" + BaseSQLComponent.DEC + ";" + BaseSQLComponent.SEP);
         final ElementSQLObject eltModeRegl = (ElementSQLObject) this.getView("ID_MODE_REGLEMENT");
         this.add(eltModeRegl, c);
+        ModeDeReglementSQLComponent modeReglComp;
+        modeReglComp = (ModeDeReglementSQLComponent) eltModeRegl.getSQLChild();
+        modeReglComp.addDateCompListener(this.date);
         this.addRequiredSQLObject(this.date, "DATE");
         this.addRequiredSQLObject(this.montant, "MONTANT");
 ,10 → 190,7
                                             System.err.println("Set mode de règlement");
                                             int idTypeRegl = rowModeRegl.getInt("ID_TYPE_REGLEMENT");
                                             SQLTable tableModeRegl = Configuration.getInstance().getDirectory().getElement("MODE_REGLEMENT").getTable();
-                                            SQLRowValues rowVals = new SQLRowValues(tableModeRegl);
-                                            if (idTypeRegl > TypeReglementSQLElement.TRAITE) {
-                                                idTypeRegl = TypeReglementSQLElement.CHEQUE;
-                                            }
+                                            SQLRowValues rowVals = new SQLRowValues(tableModeRegl);
                                             rowVals.put("ID_TYPE_REGLEMENT", idTypeRegl);
                                             rowVals.put("COMPTANT", Boolean.TRUE);
                                             rowVals.put("AJOURS", 0);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/element/DepotChequeSQLElement.java
 ,6 → 13,7
  package org.openconcerto.erp.core.finance.payment.element;
+import org.openconcerto.erp.core.common.element.BanqueSQLElement;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
 import org.openconcerto.erp.core.finance.payment.component.DepotChequeSQLComponent;
 import org.openconcerto.erp.generationDoc.gestcomm.DepotChequeXmlSheet;
 ,7 → 48,7
         final List<String> l = new ArrayList<String>();
         l.add("DATE");
         l.add("NOM");
-        l.add("ID_BANQUE");
+        l.add("ID_" + BanqueSQLElement.TABLENAME);
         l.add("MONTANT");
         return l;
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/element/SDDMessageSQLElement.java
 ,10 → 75,12
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.concurrent.ExecutionException;
 import java.util.prefs.Preferences;
 import javax.swing.AbstractAction;
 import javax.swing.JFileChooser;
+import javax.swing.SwingWorker;
 import org.jdom2.Document;
 import org.jdom2.Element;
 ,11 → 115,29
             @Override
             public void actionPerformed(ActionEvent e) {
                 final IListe l = IListe.get(e);
-                // XML field values are quite large so only fetch them when needed
                 final SQLTable t = l.getSource().getPrimaryTable();
-                final SQLSelect sel = new SQLSelect().addSelectStar(t);
-                sel.setWhere(new Where(t.getKey(), l.getSelection().getUserSelectedIDs()));
-                exportXML(l, SQLRowListRSH.execute(sel));
+                final Set<Integer> userSelectedIDs = l.getSelection().getUserSelectedIDs();
+                new SwingWorker<List<SQLRow>, Void>() {
+                    @Override
+                    protected List<SQLRow> doInBackground() throws Exception {
+                        final SQLSelect sel = new SQLSelect().addSelectStar(t);
+                        // XML field values are quite large so only fetch them when needed
+                        sel.setWhere(new Where(t.getKey(), userSelectedIDs));
+                        return SQLRowListRSH.execute(sel);
+                    }
+                    @Override
+                    protected void done() {
+                        List<SQLRow> execute;
+                        try {
+                            execute = get();
+                            exportXML(l, execute);
+                        } catch (InterruptedException | ExecutionException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }.execute();
             }
         }, true, false).setPredicate(IListeEvent.getNonEmptySelectionPredicate()));
         this.rowSociété = conf.getRowSociete();
 ,7 → 216,11
     }
     protected static BigDecimal getInvoiceAmount(final SQLRowValues invoice) {
-        return BigDecimal.valueOf(invoice.getLong("NET_A_PAYER")).movePointLeft(2);
+        if (invoice.getTable().getName().equals("SAISIE_VENTE_FACTURE")) {
+            return BigDecimal.valueOf(invoice.getLong("NET_A_PAYER")).movePointLeft(2);
+        } else {
+            return BigDecimal.valueOf(invoice.getLong("MONTANT")).movePointLeft(2);
+        }
     }
     static private final class InvoiceElem extends Tuple2<SQLRowValues, Element> {
 ,6 → 320,47
             return IgnoreReason.NONE;
         }
+        final IgnoreReason addEcheance(final SQLRowValues prlvt) {
+            Date date = prlvt.getDate("DATE").getTime();
+            // don't ask direct debit too far in advance
+            if (date.after(this.upperBound)) {
+                return IgnoreReason.TOO_FAR_IN_FUTURE;
+            } else if (date.before(this.lowerBound)) {
+                date = this.lowerBound;
+            }
+            final Element elem;
+            try {
+                elem = createDDTx(this.elemCreator, prlvt);
+            } catch (MissingInfoException e) {
+                return IgnoreReason.MISSING_INFO;
+            }
+            // needed so that EndToEndId is unique
+            if (!this.invoiceNumbers.add(prlvt.getForeign("ID_MOUVEMENT").getForeign("ID_PIECE").getString("NOM")))
+                throw new IllegalStateException("Duplicate invoice number : " + prlvt);
+            final SQLRowAccessor mandate = prlvt.getForeign("ID_SEPA_MANDATE");
+            if (!mandate.getBoolean("ACTIVE"))
+                throw new IllegalStateException("Inactive mandate for " + prlvt);
+            // needed otherwise would have to update seqType while generating
+            // MAYBE sum all invoices for a single mandate, but which date to choose ?
+            if (!this.invoiceMandates.add(mandate.getString("MandateIdentification")))
+                return IgnoreReason.DUPLICATE_MANDATE;
+            this.lockedInvoicesIDs.add(prlvt.getIDNumber());
+            ListMap<String, InvoiceElem> bySeqType = this.map.get(date);
+            if (bySeqType == null) {
+                bySeqType = new ListMap<>();
+                this.map.put(date, bySeqType);
+            }
+            bySeqType.add(mandate.getString("SequenceType"), new InvoiceElem(prlvt, elem));
+            this.sum = this.sum.add(BigDecimal.valueOf(prlvt.getLong("MONTANT")).movePointLeft(2));
+            return IgnoreReason.NONE;
+        }
         public final int getTransactionCount() {
             return this.lockedInvoicesIDs.size();
         }
 ,9 → 388,12
         private final ListMapItf<IgnoreReason, SQLRowValues> ignoredInvoices;
         private final SQLRow insertedMessage;
         private final int invoiceCount;
+        private final SQLTable table;
-        protected GenerationResult(Collection<? extends Number> passedIDs, List<SQLRowValues> withDDWithoutMessage, ListMap<IgnoreReason, SQLRowValues> ignoredInvoices, SQLRow insertedMessage) {
+        protected GenerationResult(SQLTable table, Collection<? extends Number> passedIDs, List<SQLRowValues> withDDWithoutMessage, ListMap<IgnoreReason, SQLRowValues> ignoredInvoices,
+                SQLRow insertedMessage) {
             super();
+            this.table = table;
             this.passedIDs = passedIDs;
             this.withDDWithoutMessage = Collections.unmodifiableList(withDDWithoutMessage);
             assert !ignoredInvoices.containsKey(null) && !ignoredInvoices.containsKey(IgnoreReason.NONE);
 ,6 → 421,10
             return this.invoiceCount;
         }
+        public SQLTable getTable() {
+            return table;
+        }
         @Override
         public String toString() {
             return this.getClass().getSimpleName() + ": of the " + this.passedIDs.size() + " passed, " + this.withDDWithoutMessage.size() + " needed a SDD message, of those "
 ,7 → 432,7
         }
     }
-    public GenerationResult generateXML(Collection<? extends Number> invoiceIDs) throws SQLException {
+    public GenerationResult generateXML(final SQLTable table, Collection<? extends Number> invoiceIDs) throws SQLException {
         final Namespace painNS = Namespace.getNamespace("urn:iso:std:iso:20022:tech:xsd:pain.008.001.02");
         final Element rootElem = new Element("Document", painNS);
         final Namespace xsiNS = Namespace.getNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
 ,8 → 466,7
             }
         });
-        final SQLTable invoiceT = getDirectory().getElement(SaisieVenteFactureSQLElement.class).getTable();
-        final SQLField invoiceSDDMessageF = invoiceT.getField(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME);
+        final SQLField invoiceSDDMessageF = table.getField(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME);
         return SQLUtils.executeAtomic(getTable().getDBSystemRoot().getDataSource(), new ConnectionHandlerNoSetup<GenerationResult, SQLException>() {
             @Override
             public GenerationResult handle(SQLDataSource ds) throws SQLException {
 ,12 → 473,29
                 final SQLRowValues lockedSociété = selSociété.fetchOne(SDDMessageSQLElement.this.rowSociété.getIDNumber());
                 if (lockedSociété == null)
                     throw new IllegalStateException("Missing société " + SDDMessageSQLElement.this.rowSociété);
+                if (lockedSociété.getString("IBAN").trim().length() == 0) {
+                    throw new IllegalStateException("Missing société IBAN " + SDDMessageSQLElement.this.rowSociété);
+                }
+                if (lockedSociété.getString("BIC").trim().length() == 0) {
+                    throw new IllegalStateException("Missing société BIC " + SDDMessageSQLElement.this.rowSociété);
+                }
                 // find and lock invoices with TYPE_REGLEMENT direct debit and no message
-                final SQLRowValues invoiceVals = new SQLRowValues(invoiceT);
-                invoiceVals.putRowValues("ID_CLIENT").putNulls("NOM", "BIC", "IBAN");
-                invoiceVals.putRowValues("ID_MODE_REGLEMENT").putNulls("AJOURS", "LENJOUR").putRowValues("ID_SEPA_MANDATE").setAllToNull();
-                invoiceVals.putNulls("NET_A_PAYER", "DATE", "NUMERO", "NOM");
+                final SQLRowValues invoiceVals = new SQLRowValues(table);
+                final boolean fromInvoices = table.getName().equals("SAISIE_VENTE_FACTURE");
+                if (fromInvoices) {
+                    invoiceVals.putRowValues("ID_CLIENT").putNulls("NOM", "BIC", "IBAN");
+                    invoiceVals.putRowValues("ID_MODE_REGLEMENT").putNulls("AJOURS", "LENJOUR").putRowValues("ID_SEPA_MANDATE").setAllToNull();
+                    invoiceVals.putNulls("NET_A_PAYER", "DATE", "NUMERO", "NOM");
+                } else {
+                    invoiceVals.putRowValues("ID_CLIENT").putNulls("NOM", "BIC", "IBAN");
+                    invoiceVals.putRowValues("ID_SEPA_MANDATE").setAllToNull();
+                    invoiceVals.putNulls("MONTANT", "DATE");
+                    invoiceVals.putRowValues("ID_MOUVEMENT").putRowValues("ID_PIECE").setAllToNull();
+                }
                 final SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(invoiceVals);
                 fetcher.setReturnedRowsUnmodifiable(true);
                 // required for locking rows and to make sure that there's a SEPA Mandate
 ,19 → 505,28
                     public SQLSelect transformChecked(SQLSelect sel) {
                         // we will update FACTURE.ID_MESSAGE
                         sel.setLockStrength(LockStrength.UPDATE);
-                        final SQLSelectJoin join = sel.getJoin(invoiceT.getField("ID_MODE_REGLEMENT"));
-                        join.setWhere(new Where(join.getJoinedTable().getField("ID_TYPE_REGLEMENT"), "=", TypeReglementSQLElement.PRELEVEMENT));
+                        if (fromInvoices) {
+                            final SQLSelectJoin join = sel.getJoin(table.getField("ID_MODE_REGLEMENT"));
+                            join.setWhere(new Where(join.getJoinedTable().getField("ID_TYPE_REGLEMENT"), "=", TypeReglementSQLElement.PRELEVEMENT));
+                        }
                         return sel;
                     }
                 });
                 final List<SQLRowValues> ddInvoices = fetcher
-                        .fetch(new Where(invoiceT.getKey(), invoiceIDs).and(new Where(invoiceSDDMessageF, "=", invoiceSDDMessageF.getForeignTable().getUndefinedIDNumber())));
+                        .fetch(new Where(table.getKey(), invoiceIDs).and(new Where(invoiceSDDMessageF, "=", invoiceSDDMessageF.getForeignTable().getUndefinedIDNumber())));
                 final InvoicesByPaymentInfo map = new InvoicesByPaymentInfo(lowerBound, upperBound, new ElementCreator(painNS, SDDMessageSQLElement.this.fieldTranslator));
                 final ListMap<IgnoreReason, SQLRowValues> ignoredInvoices = new ListMap<>();
                 for (final SQLRowValues invoice : ddInvoices) {
-                    final IgnoreReason ignoredReason = map.addInvoice(invoice);
-                    if (ignoredReason != IgnoreReason.NONE) {
-                        ignoredInvoices.add(ignoredReason, invoice);
+                    if (fromInvoices) {
+                        final IgnoreReason ignoredReason = map.addInvoice(invoice);
+                        if (ignoredReason != IgnoreReason.NONE) {
+                            ignoredInvoices.add(ignoredReason, invoice);
+                        }
+                    } else {
+                        final IgnoreReason ignoredReason = map.addEcheance(invoice);
+                        if (ignoredReason != IgnoreReason.NONE) {
+                            ignoredInvoices.add(ignoredReason, invoice);
+                        }
                     }
                 }
 ,7 → 578,7
                     getTable().getDBRoot().setMetadata(SERIAL_MD, msgSerial);
                 }
-                return new GenerationResult(invoiceIDs, ddInvoices, ignoredInvoices, newMsg);
+                return new GenerationResult(table, invoiceIDs, ddInvoices, ignoredInvoices, newMsg);
             }
         });
     }
 ,7 → 652,8
         res.addContent(creditor);
         final Element creditorAccount = new Element("CdtrAcct", painNS);
-        creditorAccount.addContent(new Element("Id", painNS).addContent(elemCreator.createWithNonEmptyText("IBAN", lockedSociété, "IBAN")));
+        String iban = lockedSociété.getString("IBAN").replaceAll(" ", "");
+        creditorAccount.addContent(new Element("Id", painNS).addContent(elemCreator.createWithNonEmptyText("IBAN", iban, "IBAN")));
         res.addContent(creditorAccount);
         final Element creditorAgent = new Element("CdtrAgt", painNS);
 ,7 → 690,13
         invoiceElem.get1().addContent(0, paymentId);
         // update mandate fields
-        final SQLRowAccessor mandate = invoiceElem.get0().getForeign("ID_MODE_REGLEMENT").getForeign("ID_SEPA_MANDATE");
+        final SQLRowAccessor mandate;
+        if (invoiceElem.get0().contains("ID_SEPA_MANDATE")) {
+            mandate = invoiceElem.get0().getForeign("ID_SEPA_MANDATE");
+        } else {
+            mandate = invoiceElem.get0().getForeign("ID_MODE_REGLEMENT").getForeign("ID_SEPA_MANDATE");
+        }
         final String seqType = mandate.getString("SequenceType");
         if (seqType.equals(SEPAMandateSQLElement.SEQ_FIRST)) {
             mandate.createEmptyUpdateRow().put("SequenceType", SEPAMandateSQLElement.SEQ_RECURRENT).update();
 ,7 → 714,14
         res.addContent(new Element("InstdAmt", painNS).setAttribute("Ccy", "EUR").setText(getInvoiceAmount(invoice).toPlainString()));
         final Element mandateRltdInfo = new Element("MndtRltdInf", painNS);
-        final SQLRowAccessor mandate = invoice.getForeign("ID_MODE_REGLEMENT").getForeign("ID_SEPA_MANDATE");
+        final SQLRowAccessor mandate;
+        final boolean fromInvoice = invoice.getTable().getName().equals("SAISIE_VENTE_FACTURE");
+        if (fromInvoice) {
+            mandate = invoice.getForeign("ID_MODE_REGLEMENT").getForeign("ID_SEPA_MANDATE");
+        } else {
+            mandate = invoice.getForeign("ID_SEPA_MANDATE");
+        }
         assert !mandate.isUndefined() : "Undefined mandate returned by fetcher";
         mandateRltdInfo.addContent(elemCreator.createWithNonEmptyText("MndtId", mandate, "MandateIdentification"));
         mandateRltdInfo.addContent(elemCreator.createWithNonEmptyText("DtOfSgntr", formatDate(mandate.getObjectAs("DateOfSignature", Date.class))));
 ,7 → 735,12
         res.addContent(new Element("Purp", painNS).addContent(new Element("Cd", painNS).setText("OTHR")));
-        final String info = (invoice.getString("NUMERO") + ' ' + invoice.getString("NOM")).trim();
+        final String info;
+        if (fromInvoice) {
+            info = (invoice.getString("NUMERO") + ' ' + invoice.getString("NOM")).trim();
+        } else {
+            info = invoice.getForeign("ID_MOUVEMENT").getForeign("ID_PIECE").getString("NOM");
+        }
         if (!info.isEmpty())
             res.addContent(new Element("RmtInf", painNS).addContent(elemCreator.create("Ustrd").setText(elemCreator.shortenText(info, 140))));

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/element/ReglerMontantSQLElement.java
 ,9 → 15,16
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
 import org.openconcerto.sql.element.SQLComponent;
+import org.openconcerto.sql.model.FieldPath;
+import org.openconcerto.sql.model.SQLRowAccessor;
+import org.openconcerto.sql.model.graph.Path;
+import org.openconcerto.sql.view.list.BaseSQLTableModelColumn;
+import org.openconcerto.sql.view.list.SQLTableModelSource;
+import org.openconcerto.utils.CollectionUtils;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 public class ReglerMontantSQLElement extends ComptaSQLConfElement {
 ,7 → 35,7
     protected List<String> getListFields() {
         final List<String> l = new ArrayList<String>();
         l.add("DATE");
-        l.add("ID_ECHEANCE_FOURNISSEUR");
+        l.add("ID_FOURNISSEUR");
         l.add("ID_MODE_REGLEMENT");
         l.add("MONTANT");
         return l;
 ,6 → 48,27
         return l;
     }
+    @Override
+    protected void _initTableSource(SQLTableModelSource res) {
+        super._initTableSource(res);
+        final BaseSQLTableModelColumn racCol = new BaseSQLTableModelColumn("Report échéance", Boolean.class) {
+            @Override
+            protected Object show_(SQLRowAccessor r) {
+                return !r.getForeign("ID_MODE_REGLEMENT").getBoolean("COMPTANT");
+            }
+            @Override
+            public Set<FieldPath> getPaths() {
+                Path p = new Path(getTable());
+                Path p2 = p.add(p.getLast().getField("ID_MODE_REGLEMENT"));
+                return CollectionUtils.createSet(new FieldPath(p2, "COMPTANT"));
+            }
+        };
+        res.getColumns().add(racCol);
+    }
     public SQLComponent createComponent() {
         return new ReglerMontantSQLComponent(this);
     };

/trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/payment/ui/EncaisseMontantTable.java
62,15 → 62,18

final SQLTableElement tableElement_Mvt = new SQLTableElement(e.getTable().getField("ID_MOUVEMENT_ECHEANCE"), Integer.class, new DefaultCellEditor(new JTextField()));
tableElement_Mvt.setRenderer(new KeyTableCellRenderer(Configuration.getInstance().getDirectory().getElement("MOUVEMENT")));
tableElement_Mvt.setEditable(false);
list.add(tableElement_Mvt);

// Date
final SQLTableElement dateElement = new SQLTableElement(e.getTable().getField("DATE"), Timestamp.class, new TimestampTableCellEditor());
dateElement.setEditable(false);
list.add(dateElement);

// Total HT
montantARegler = new SQLTableElement(e.getTable().getField("MONTANT_A_REGLER"), Long.class, new DeviseCellEditor());
montantARegler.setRenderer(new DeviseNiceTableCellRenderer());
montantARegler.setEditable(false);
list.add(montantARegler);

// Total HT

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/report/BalanceSheet.java
 ,10 → 14,12
  package org.openconcerto.erp.core.finance.accounting.report;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
+import org.openconcerto.erp.element.objet.Compte;
 import org.openconcerto.erp.generationDoc.DocumentLocalStorageManager;
 import org.openconcerto.erp.generationDoc.SheetInterface;
 import org.openconcerto.erp.preferences.PrinterNXProps;
 import org.openconcerto.sql.Configuration;
+import org.openconcerto.sql.model.SQLBase;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowListRSH;
 import org.openconcerto.sql.model.SQLSelect;
 ,6 → 28,7
 import org.openconcerto.utils.GestionDevise;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 ,7 → 70,7
         return TEMPLATE_ID;
     }
-    public BalanceSheet(Date du, Date au, String compteDeb, String compteEnd, boolean centralClient, boolean centralFourn, boolean centralFournImmo) {
+    public BalanceSheet(Date du, Date au, String compteDeb, String compteEnd, boolean centralClient, boolean centralFourn, boolean centralFournImmo, boolean displayAll) {
         super();
         Calendar cal = Calendar.getInstance();
 ,7 → 87,7
         // this.locationPDF = storage.getPDFOutputDirectory(TEMPLATE_ID);
         this.dateAu = au;
         this.dateDu = du;
+        this.viewMode = displayAll;
         this.compteDeb = compteDeb;
         this.compteEnd = compteEnd;
         this.centralClient = centralClient;
 ,45 → 124,11
         this.mapStyleRow.put(new Integer(row), "Titre 1");
     }
+    private boolean viewMode = true;
     protected void createMap() {
-        this.mapReplace = new HashMap();
-        this.mCell = new HashMap();
-        this.mapStyleRow = new HashMap();
-        SQLSelect sel = new SQLSelect();
-        sel.addSelect(tableCompte.getField("ID"));
-        sel.addSelect(tableEcriture.getField("DEBIT"), "SUM");
-        sel.addSelect(tableEcriture.getField("CREDIT"), "SUM");
-        Where w = (new Where(tableEcriture.getField("DATE"), this.dateDu, this.dateAu));
-        if (dateDu == null) {
-            w = (new Where(tableEcriture.getField("DATE"), "<=", this.dateAu));
-        }
-        if (compteDeb.equals(this.compteEnd)) {
-            w = w.and(new Where(tableCompte.getField("NUMERO"), "=", this.compteDeb));
-        } else {
-            w = w.and(new Where(tableCompte.getField("NUMERO"), (Object) this.compteDeb, (Object) this.compteEnd));
-        }
-        // FIXME use flag cloture
-        Where wCloture = new Where(tableEcriture.getField("NOM"), "NOT LIKE", "Fermeture du compte%");
-        wCloture = wCloture.and(new Where(tableEcriture.getField("DATE"), "=", this.dateAu));
-        wCloture = wCloture.or(new Where(tableEcriture.getField("DATE"), "<", this.dateAu));
-        w = w.and(wCloture);
-        sel.setWhere(w);
-        String req = sel.asString() + " AND \"ECRITURE\".\"ID_COMPTE_PCE\" = \"COMPTE_PCE\".\"ID\" GROUP BY  \"COMPTE_PCE\".\"NUMERO\", \"COMPTE_PCE\".\"ID\" ORDER BY \"COMPTE_PCE\".\"NUMERO\"";
-        System.err.println(req);
-        List l = (List) base.getDataSource().execute(req, new ArrayListHandler());
         int posLine = 1;
         int firstLine = 1;
-        System.err.println("START CREATE Grand livre, NB ecritures  " + l.size());
         this.nbPage = 0;
         long totalDebit, totalCredit, sousTotalDebit, sousTotalCredit;
 ,160 → 158,279
         int j = 0;
         String classe = "";
-        SQLSelect selCompte = new SQLSelect();
-        selCompte.addSelectStar(tableCompte);
-        List<SQLRow> compteRows = SQLRowListRSH.execute(selCompte);
-        Map<Integer, SQLRow> mapCompte = new HashMap<Integer, SQLRow>();
-        for (SQLRow sqlRow : compteRows) {
-            mapCompte.put(sqlRow.getID(), sqlRow);
-        }
+        if (viewMode) {
+            getBalance();
-        for (int i = 0; i < l.size();) {
+            for (int i = 0; i < this.vecteurCompte.size();) {
-            System.err.println("START NEW PAGE; POS : " + posLine);
+                System.err.println("START NEW PAGE; POS : " + posLine);
-            /***************************************************************************************
-             * ENTETE
-             **************************************************************************************/
-            makeEntete(posLine);
-            posLine += debutFill - 1;
+                /***************************************************************************************
+                 * ENTETE
+                 **************************************************************************************/
+                makeEntete(posLine);
+                posLine += debutFill - 1;
-            /***************************************************************************************
-             * CONTENU
-             **************************************************************************************/
-            for (j = 0; (j < endFill - debutFill + 1) && i < l.size(); j++) {
-                Object[] o = (Object[]) l.get(i);
-                int idCpt = Integer.parseInt(o[0].toString());
-                // SQLRow rowCpt = tableCompte.getRow(idCpt);
-                SQLRow rowCpt = mapCompte.get(idCpt);
+                /***************************************************************************************
+                 * CONTENU
+                 **************************************************************************************/
+                for (j = 0; (j < endFill - debutFill + 1) && i < this.vecteurCompte.size(); j++) {
+                    Compte compte = this.vecteurCompte.get(i);
-                String numeroCpt = rowCpt.getString("NUMERO").trim();
-                String nomCpt = rowCpt.getString("NOM");
-                // Changement de classe de compte
-                if (classe.trim().length() != 0 && numeroCpt.length() > 0 && !classe.trim().equalsIgnoreCase(numeroCpt.substring(0, 1))) {
+                    String numeroCpt = compte.getNumero();
+                    String nomCpt = compte.getNom();
-                    makeSousTotalClasse(posLine, sousTotalDebit, sousTotalCredit, classe);
+                    long deb = compte.getTotalDebit();
+                    long cred = compte.getTotalCredit();
-                    sousTotalCredit = 0;
-                    sousTotalDebit = 0;
-                    classe = numeroCpt.substring(0, 1);
-                } else {
-                    if (classe.trim().length() == 0 && numeroCpt.trim().length() > 0) {
-                        classe = numeroCpt.substring(0, 1);
-                    }
-                    long deb = new Double(o[1].toString()).longValue();
-                    long cred = new Double(o[2].toString()).longValue();
                     totalCredit += cred;
                     sousTotalCredit += cred;
                     totalDebit += deb;
                     sousTotalDebit += deb;
-                    // Centralisation compte client
-                    if (this.centralClient && (numeroCpt.equalsIgnoreCase("411") || numeroCpt.startsWith("411"))) {
-                        totalDebitClient += deb;
-                        totalCreditClient += cred;
-                        deb = totalDebitClient;
-                        cred = totalCreditClient;
+                    this.mCell.put("A" + posLine, numeroCpt);
+                    this.mCell.put("B" + posLine, nomCpt);
+                    this.mCell.put("C" + posLine, new Double(GestionDevise.currencyToString(deb, false)));
+                    this.mCell.put("D" + posLine, new Double(GestionDevise.currencyToString(cred, false)));
+                    this.mCell.put("E" + posLine, new Double(GestionDevise.currencyToString(deb - cred, false)));
+                    if (compte.getSousCompte().isEmpty()) {
+                        this.mapStyleRow.put(new Integer(posLine), "Normal");
+                    } else {
+                        this.mapStyleRow.put(new Integer(posLine), "Titre 1");
                     }
-                    // Centralisation compte fournisseur immo
-                    else if (this.centralFournImmo && (numeroCpt.equalsIgnoreCase("404") || numeroCpt.startsWith("404"))) {
-                        totalDebitFournImmo += deb;
-                        totalCreditFournImmo += cred;
-                        deb = totalDebitFournImmo;
-                        cred = totalCreditFournImmo;
-                    }
-                    // Centralisation compte fournisseur
-                    else if (this.centralFourn && (numeroCpt.equalsIgnoreCase("401") || numeroCpt.startsWith("401"))) {
-                        totalDebitFourn += deb;
-                        totalCreditFourn += cred;
-                        deb = totalDebitFourn;
-                        cred = totalCreditFourn;
-                    }
+                    i++;
-                    if (this.centralClient && !numeroCpt.equalsIgnoreCase("411") && numeroCpt.startsWith("411")) {
-                        if (addedLine || !this.centralFournImmo) {
-                            posLine--;
-                            j--;
-                        } else {
-                            addedLine = true;
-                        }
-                        this.mCell.put("A" + posLine, numCptClient);
-                        this.mCell.put("B" + posLine, nomCptClient);
-                    } else if (this.centralFourn && !numeroCpt.equalsIgnoreCase("401") && numeroCpt.startsWith("401")) {
+                    posLine++;
+                }
-                        if (addedLineFourn) {
-                            posLine--;
-                            j--;
-                        } else {
-                            addedLineFourn = true;
-                        }
+                if (i >= this.vecteurCompte.size() && j < endFill - debutFill + 1) {
-                        this.mCell.put("A" + posLine, numCptFourn);
-                        this.mCell.put("B" + posLine, nomCptFourn);
-                    } else if (this.centralFournImmo && !numeroCpt.equalsIgnoreCase("404") && numeroCpt.startsWith("404")) {
-                        if (addedLineImmo || !this.centralFourn) {
-                            posLine--;
-                            j--;
-                        } else {
-                            addedLineImmo = true;
-                        }
+                    makeSousTotalClasse(posLine, sousTotalDebit, sousTotalCredit, classe);
+                }
-                        this.mCell.put("A" + posLine, numCptFournImmo);
-                        this.mCell.put("B" + posLine, nomCptFournImmo);
-                    } else {
-                        this.mCell.put("A" + posLine, numeroCpt);
-                        this.mCell.put("B" + posLine, nomCpt);
-                    }
+                posLine = firstLine + endFill;
+                /*
+                 * if (this.mapStyleRow.get(new Integer(posLine - 1)) != null) {
+                 * this.mapStyleRow.put(new Integer(posLine - 1), "Titre 2"); }
+                 */
-                    this.mCell.put("C" + posLine, new Double(GestionDevise.currencyToString(deb, false)));
-                    this.mCell.put("D" + posLine, new Double(GestionDevise.currencyToString(cred, false)));
-                    this.mCell.put("E" + posLine, new Double(GestionDevise.currencyToString(deb - cred, false)));
+                // Total
+                this.mCell.put("C" + posLine, ((totalDebit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalDebit, false))));
+                this.mCell.put("D" + posLine, ((totalCredit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalCredit, false))));
+                this.mCell.put("E" + posLine, (totalDebit - totalCredit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalDebit - totalCredit, false)));
-                    this.mapStyleRow.put(new Integer(posLine), "Normal");
-                    i++;
-                }
+                posLine += 2;
+                // bas de page
+                makePiedPage(posLine);
                 posLine++;
+                firstLine = posLine;
+                this.nbPage++;
+                // if (i >= this.vecteurCompte.size() && j >= (endFill - debutFill + 1)) {
+                //
+                // makeEntete(posLine);
+                // posLine += debutFill - 1;
+                //
+                // makeSousTotalClasse(posLine, sousTotalDebit, sousTotalCredit, classe);
+                //
+                // this.nbPage++;
+                // }
             }
+        } else {
-            if (i >= l.size() && j < endFill - debutFill + 1) {
+            this.mapReplace = new HashMap();
+            this.mCell = new HashMap();
+            this.mapStyleRow = new HashMap();
-                makeSousTotalClasse(posLine, sousTotalDebit, sousTotalCredit, classe);
+            SQLSelect sel = new SQLSelect();
+            sel.addSelect(tableCompte.getField("ID"));
+            sel.addSelect(tableEcriture.getField("DEBIT"), "SUM");
+            sel.addSelect(tableEcriture.getField("CREDIT"), "SUM");
+            Where w = (new Where(tableEcriture.getField("DATE"), this.dateDu, this.dateAu));
+            if (dateDu == null) {
+                w = (new Where(tableEcriture.getField("DATE"), "<=", this.dateAu));
             }
-            posLine = firstLine + endFill;
-            /*
-             * if (this.mapStyleRow.get(new Integer(posLine - 1)) != null) {
-             * this.mapStyleRow.put(new Integer(posLine - 1), "Titre 2"); }
-             */
+            if (compteDeb.equals(this.compteEnd)) {
+                w = w.and(new Where(tableCompte.getField("NUMERO"), "=", this.compteDeb));
+            } else {
+                w = w.and(new Where(tableCompte.getField("NUMERO"), (Object) this.compteDeb, (Object) this.compteEnd));
+            }
-            // Total
-            this.mCell.put("C" + posLine, ((totalDebit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalDebit, false))));
-            this.mCell.put("D" + posLine, ((totalCredit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalCredit, false))));
-            this.mCell.put("E" + posLine, (totalDebit - totalCredit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalDebit - totalCredit, false)));
+            // FIXME use flag cloture
+            Where wCloture = new Where(tableEcriture.getField("NOM"), "NOT LIKE", "Fermeture du compte%");
+            wCloture = wCloture.and(new Where(tableEcriture.getField("DATE"), "=", this.dateAu));
+            wCloture = wCloture.or(new Where(tableEcriture.getField("DATE"), "<", this.dateAu));
+            w = w.and(wCloture);
-            posLine += 2;
+            sel.setWhere(w);
-            // bas de page
-            makePiedPage(posLine);
+            String req = sel.asString() + " AND \"ECRITURE\".\"ID_COMPTE_PCE\" = \"COMPTE_PCE\".\"ID\" GROUP BY  \"COMPTE_PCE\".\"NUMERO\", \"COMPTE_PCE\".\"ID\" ORDER BY \"COMPTE_PCE\".\"NUMERO\"";
-            posLine++;
-            firstLine = posLine;
-            this.nbPage++;
+            System.err.println(req);
-            if (i >= l.size() && j >= (endFill - debutFill + 1)) {
+            List l = (List) base.getDataSource().execute(req, new ArrayListHandler());
+            SQLSelect selCompte = new SQLSelect();
+            selCompte.addSelectStar(tableCompte);
+            List<SQLRow> compteRows = SQLRowListRSH.execute(selCompte);
+            Map<Integer, SQLRow> mapCompte = new HashMap<Integer, SQLRow>();
+            for (SQLRow sqlRow : compteRows) {
+                mapCompte.put(sqlRow.getID(), sqlRow);
+            }
+            for (int i = 0; i < l.size();) {
+                System.err.println("START NEW PAGE; POS : " + posLine);
+                /***************************************************************************************
+                 * ENTETE
+                 **************************************************************************************/
                 makeEntete(posLine);
                 posLine += debutFill - 1;
-                makeSousTotalClasse(posLine, sousTotalDebit, sousTotalCredit, classe);
+                /***************************************************************************************
+                 * CONTENU
+                 **************************************************************************************/
+                for (j = 0; (j < endFill - debutFill + 1) && i < l.size(); j++) {
+                    Object[] o = (Object[]) l.get(i);
+                    int idCpt = Integer.parseInt(o[0].toString());
+                    // SQLRow rowCpt = tableCompte.getRow(idCpt);
+                    SQLRow rowCpt = mapCompte.get(idCpt);
+                    String numeroCpt = rowCpt.getString("NUMERO").trim();
+                    String nomCpt = rowCpt.getString("NOM");
+                    // Changement de classe de compte
+                    if (classe.trim().length() != 0 && numeroCpt.length() > 0 && !classe.trim().equalsIgnoreCase(numeroCpt.substring(0, 1))) {
+                        makeSousTotalClasse(posLine, sousTotalDebit, sousTotalCredit, classe);
+                        sousTotalCredit = 0;
+                        sousTotalDebit = 0;
+                        classe = numeroCpt.substring(0, 1);
+                    } else {
+                        if (classe.trim().length() == 0 && numeroCpt.trim().length() > 0) {
+                            classe = numeroCpt.substring(0, 1);
+                        }
+                        long deb = new Double(o[1].toString()).longValue();
+                        long cred = new Double(o[2].toString()).longValue();
+                        totalCredit += cred;
+                        sousTotalCredit += cred;
+                        totalDebit += deb;
+                        sousTotalDebit += deb;
+                        // Centralisation compte client
+                        if (this.centralClient && (numeroCpt.equalsIgnoreCase("411") || numeroCpt.startsWith("411"))) {
+                            totalDebitClient += deb;
+                            totalCreditClient += cred;
+                            deb = totalDebitClient;
+                            cred = totalCreditClient;
+                        }
+                        // Centralisation compte fournisseur immo
+                        else if (this.centralFournImmo && (numeroCpt.equalsIgnoreCase("404") || numeroCpt.startsWith("404"))) {
+                            totalDebitFournImmo += deb;
+                            totalCreditFournImmo += cred;
+                            deb = totalDebitFournImmo;
+                            cred = totalCreditFournImmo;
+                        }
+                        // Centralisation compte fournisseur
+                        else if (this.centralFourn && (numeroCpt.equalsIgnoreCase("401") || numeroCpt.startsWith("401"))) {
+                            totalDebitFourn += deb;
+                            totalCreditFourn += cred;
+                            deb = totalDebitFourn;
+                            cred = totalCreditFourn;
+                        }
+                        if (this.centralClient && !numeroCpt.equalsIgnoreCase("411") && numeroCpt.startsWith("411")) {
+                            if (addedLine || !this.centralFournImmo) {
+                                posLine--;
+                                j--;
+                            } else {
+                                addedLine = true;
+                            }
+                            this.mCell.put("A" + posLine, numCptClient);
+                            this.mCell.put("B" + posLine, nomCptClient);
+                        } else if (this.centralFourn && !numeroCpt.equalsIgnoreCase("401") && numeroCpt.startsWith("401")) {
+                            if (addedLineFourn) {
+                                posLine--;
+                                j--;
+                            } else {
+                                addedLineFourn = true;
+                            }
+                            this.mCell.put("A" + posLine, numCptFourn);
+                            this.mCell.put("B" + posLine, nomCptFourn);
+                        } else if (this.centralFournImmo && !numeroCpt.equalsIgnoreCase("404") && numeroCpt.startsWith("404")) {
+                            if (addedLineImmo || !this.centralFourn) {
+                                posLine--;
+                                j--;
+                            } else {
+                                addedLineImmo = true;
+                            }
+                            this.mCell.put("A" + posLine, numCptFournImmo);
+                            this.mCell.put("B" + posLine, nomCptFournImmo);
+                        } else {
+                            this.mCell.put("A" + posLine, numeroCpt);
+                            this.mCell.put("B" + posLine, nomCpt);
+                        }
+                        this.mCell.put("C" + posLine, new Double(GestionDevise.currencyToString(deb, false)));
+                        this.mCell.put("D" + posLine, new Double(GestionDevise.currencyToString(cred, false)));
+                        this.mCell.put("E" + posLine, new Double(GestionDevise.currencyToString(deb - cred, false)));
+                        this.mapStyleRow.put(new Integer(posLine), "Normal");
+                        i++;
+                    }
+                    posLine++;
+                }
+                if (i >= l.size() && j < endFill - debutFill + 1) {
+                    makeSousTotalClasse(posLine, sousTotalDebit, sousTotalCredit, classe);
+                }
+                posLine = firstLine + endFill;
+                /*
+                 * if (this.mapStyleRow.get(new Integer(posLine - 1)) != null) {
+                 * this.mapStyleRow.put(new Integer(posLine - 1), "Titre 2"); }
+                 */
+                // Total
+                this.mCell.put("C" + posLine, ((totalDebit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalDebit, false))));
+                this.mCell.put("D" + posLine, ((totalCredit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalCredit, false))));
+                this.mCell.put("E" + posLine, (totalDebit - totalCredit == 0) ? new Double(0) : new Double(GestionDevise.currencyToString(totalDebit - totalCredit, false)));
+                posLine += 2;
+                // bas de page
+                makePiedPage(posLine);
+                posLine++;
+                firstLine = posLine;
                 this.nbPage++;
+                if (i >= l.size() && j >= (endFill - debutFill + 1)) {
+                    makeEntete(posLine);
+                    posLine += debutFill - 1;
+                    makeSousTotalClasse(posLine, sousTotalDebit, sousTotalCredit, classe);
+                    this.nbPage++;
+                }
             }
         }
         // on conserve la page d'origine du model
 ,4 → 438,118
             this.nbPage--;
         }
     }
+    private long totalDebitBalance = 0;
+    private long totalCreditBalance = 0;
+    private List<Compte> vecteurCompte = new ArrayList<Compte>();
+    public void getBalance() {
+        // Compte numero -- totalDebit
+        Map<Number, Long> mapCompteDebit = new HashMap<Number, Long>();
+        Map<Number, Long> mapCompteCredit = new HashMap<Number, Long>();
+        List<Compte> comptes = new ArrayList<Compte>();
+        this.totalDebitBalance = 0;
+        this.totalCreditBalance = 0;
+        SQLBase base = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete();
+        SQLTable compteTable = base.getTable("COMPTE_PCE");
+        SQLTable ecritureTable = base.getTable("ECRITURE");
+        SQLSelect sel = new SQLSelect();
+        // On recupere le solde des comptes
+        sel.addSelect(compteTable.getField("ID"));
+        sel.addSelect(ecritureTable.getField("DEBIT"), "SUM");
+        sel.addSelect(ecritureTable.getField("CREDIT"), "SUM");
+        sel.addSelect(compteTable.getField("NUMERO"));
+        sel.setDistinct(true);
+        Where w = (new Where(tableEcriture.getField("DATE"), this.dateDu, this.dateAu));
+        if (dateDu == null) {
+            w = (new Where(tableEcriture.getField("DATE"), "<=", this.dateAu));
+        }
+        sel.setWhere(w.and(new Where(compteTable.getField("ID"), "=", ecritureTable.getField("ID_COMPTE_PCE"))));
+        String req = sel.asString() + " GROUP BY \"COMPTE_PCE\".\"ID\",\"COMPTE_PCE\".\"NUMERO\"  ORDER BY \"COMPTE_PCE\".\"NUMERO\"";
+        System.out.println(req);
+        Object ob = base.getDataSource().execute(req, new ArrayListHandler());
+        List myList = (List) ob;
+        if (myList.size() != 0) {
+            for (int i = 0; i < myList.size(); i++) {
+                Object[] tmp = (Object[]) myList.get(i);
+                mapCompteDebit.put((Number) tmp[0], Long.parseLong(tmp[1].toString()));
+                mapCompteCredit.put((Number) tmp[0], Long.parseLong(tmp[2].toString()));
+            }
+        }
+        // Création du vecteur balance
+        sel = new SQLSelect();
+        sel.addSelect(compteTable.getKey());
+        sel.addSelect(compteTable.getField("NUMERO"));
+        sel.addSelect(compteTable.getField("NOM"));
+        sel.addRawOrder("\"COMPTE_PCE\".\"NUMERO\"");
+        String reqCompte = sel.asString();
+        System.out.println(req);
+        Object obCompte = base.getDataSource().execute(reqCompte, new ArrayListHandler());
+        List myListCompte = (List) obCompte;
+        if (myListCompte.size() != 0) {
+            for (int i = 0; i < myListCompte.size(); i++) {
+                Object[] tmp = (Object[]) myListCompte.get(i);
+                System.err.println("Compte " + tmp[1].toString().trim());
+                long totalDebit = 0;
+                long totalCredit = 0;
+                if (mapCompteDebit.get(tmp[0]) != null) {
+                    totalDebit = Long.parseLong(mapCompteDebit.get(tmp[0]).toString());
+                }
+                if (mapCompteCredit.get(tmp[0]) != null) {
+                    totalCredit = Long.parseLong(mapCompteCredit.get(tmp[0]).toString());
+                }
+                this.totalDebitBalance += totalDebit;
+                this.totalCreditBalance += totalCredit;
+                List<String> sousCompte = new ArrayList<>();
+                for (int j = i + 1; j < (myListCompte.size() - 1); j++) {
+                    Object[] tmpNext = (Object[]) myListCompte.get(j);
+                    if (tmpNext[1].toString().trim().startsWith(tmp[1].toString().trim())) {
+                        System.err.println("Sous Compte " + tmpNext[1].toString().trim());
+                        sousCompte.add(tmpNext[1].toString().trim());
+                        if (mapCompteDebit.get(tmpNext[0]) != null) {
+                            totalDebit += Long.parseLong(mapCompteDebit.get(tmpNext[0]).toString());
+                        }
+                        if (mapCompteCredit.get(tmpNext[0]) != null) {
+                            totalCredit += Long.parseLong(mapCompteCredit.get(tmpNext[0]).toString());
+                        }
+                    } else {
+                        break;
+                    }
+                }
+                if ((totalDebit != 0.0) || (totalCredit != 0.0)) {
+                    Compte cpt = new Compte(((Number) tmp[0]).intValue(), tmp[1].toString(), tmp[2].toString(), "", totalDebit, totalCredit);
+                    cpt.addSousCompte(sousCompte);
+                    comptes.add(cpt);
+                }
+            }
+        }
+        this.vecteurCompte = comptes;
+    }
 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/report/JournauxSheetXML.java
 ,6 → 191,10
             values.put("NUMERO_COMPTE", rowEcr.getString("COMPTE_NUMERO"));
+            if (tableEcriture.contains("NOM_PIECE")) {
+                values.put("NOM_PIECE", rowEcr.getObject("NOM_PIECE"));
+            }
             values.put("NUMERO_MOUVEMENT", rowMvt.getObject("NUMERO"));
             Object libelle = rowEcr.getObject("NOM");
             values.put("LIBELLE", libelle);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/report/Map2033A.java
 ,7 → 17,9
 import org.openconcerto.erp.config.Gestion;
 import org.openconcerto.erp.core.finance.accounting.model.SommeCompte;
 import org.openconcerto.sql.Configuration;
+import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLRow;
+import org.openconcerto.sql.model.Where;
 import org.openconcerto.utils.GestionDevise;
 import java.text.DateFormat;
 ,8 → 26,10
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import javax.swing.JOptionPane;
 import javax.swing.JProgressBar;
 import javax.swing.SwingUtilities;
 ,8 → 121,9
         // Fix Abaque 208 - 2087
         long v014 = this.sommeCompte.soldeCompteDebiteur(109, 109, true, this.dateDebut, this.dateFin) + this.sommeCompte.sommeCompteFils("201", this.dateDebut, this.dateFin)
                 + this.sommeCompte.sommeCompteFils("203", this.dateDebut, this.dateFin) + this.sommeCompte.sommeCompteFils("232", this.dateDebut, this.dateFin)
-                + this.sommeCompte.sommeCompteFils("205", this.dateDebut, this.dateFin) + this.sommeCompte.soldeCompte(208, 208, true, this.dateDebut, this.dateFin)
-                - this.sommeCompte.soldeCompte(2087, 2087, true, this.dateDebut, this.dateFin) + this.sommeCompte.sommeCompteFils("237", this.dateDebut, this.dateFin);
+                + this.sommeCompte.sommeCompteFils("234", this.dateDebut, this.dateFin) + this.sommeCompte.sommeCompteFils("205", this.dateDebut, this.dateFin)
+                + this.sommeCompte.soldeCompte(208, 208, true, this.dateDebut, this.dateFin) - this.sommeCompte.soldeCompte(2087, 2087, true, this.dateDebut, this.dateFin)
+                + this.sommeCompte.sommeCompteFils("237", this.dateDebut, this.dateFin);
         this.m.put("ACTIF1.1", GestionDevise.currencyToString(v014, false));
         // 016 -SommeSolde( 280, 280* ) - SommeSolde(2905) - SommeSolde (2908)
 ,7 → 153,8
         // Racine = "210-215, 218, 230-231, 238"
         // S028=211...215+218+22+231+238
         long v028 = this.sommeCompte.soldeCompte(211, 215, true, this.dateDebut, this.dateFin) + this.sommeCompte.sommeCompteFils("218", this.dateDebut, this.dateFin)
-                + this.sommeCompte.sommeCompteFils("231", this.dateDebut, this.dateFin) + this.sommeCompte.sommeCompteFils("238", this.dateDebut, this.dateFin);
+                + this.sommeCompte.sommeCompteFils("231", this.dateDebut, this.dateFin) + this.sommeCompte.sommeCompteFils("238", this.dateDebut, this.dateFin)
+                + this.sommeCompte.soldeCompte(24, 24, true, this.dateDebut, this.dateFin);
         this.m.put("ACTIF1.2", GestionDevise.currencyToString(v028, false));
         // 030 -SommeSolde( 281, 289* )-SommeSolde( 290, 295* )
 ,7 → 585,9
         // Racine1 = "7"
         // long v136 = -this.sommeCompte.sommeCompteFils("12", dateDebut,
         // dateFin);
-        long v136 = -this.sommeCompte.sommeCompteFils("7", this.dateDebut, this.dateFin) - this.sommeCompte.sommeCompteFils("6", this.dateDebut, this.dateFin);
+        long v136 = -this.sommeCompte.sommeCompteFils("12", this.dateDebut, this.dateFin) - this.sommeCompte.sommeCompteFils("7", this.dateDebut, this.dateFin)
+                - this.sommeCompte.sommeCompteFils("6", this.dateDebut, this.dateFin);
         this.m.put("PASSIF3.21", GestionDevise.currencyToString(v136, false));
         // 137 -N-1: +R136
 ,6 → 855,15
         this.m.put("PASSIF4.33", "");
         this.m.put("PASSIF4.34", "");
+        final SQLField field = ComptaPropsConfiguration.getInstanceCompta().getRootSociete().getTable("COMPTE_PCE").getField("NUMERO");
+        Where where = new Where(field, "NOT LIKE", "6%");
+        where = where.and(new Where(field, "NOT LIKE", "7%"));
+        where = where.and(new Where(field, "NOT LIKE", "8%"));
+        List<String> unused = this.sommeCompte.getNonUsedCompte(where, this.dateDebut, this.dateFin);
+        if (unused != null && !unused.isEmpty()) {
+            JOptionPane.showMessageDialog(null, "Certains comptes n'ont pas été intégré : " + unused);
+        }
         p.generateFrom(this.m);
         SwingUtilities.invokeLater(new Runnable() {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/report/Map2033B.java
 ,7 → 17,9
 import org.openconcerto.erp.config.Gestion;
 import org.openconcerto.erp.core.finance.accounting.model.SommeCompte;
 import org.openconcerto.sql.Configuration;
+import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLRow;
+import org.openconcerto.sql.model.Where;
 import org.openconcerto.utils.GestionDevise;
 import java.text.DateFormat;
 ,8 → 26,10
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import javax.swing.JOptionPane;
 import javax.swing.JProgressBar;
 import javax.swing.SwingUtilities;
 ,7 → 86,9
         this.m.put("PRODUIT1.1", GestionDevise.currencyToString(v215, false));
         // 214 -SommeSolde( 700, 705* )-SommeSolde( 7090, 7095* )
-        long v214 = -this.sommeCompte.soldeCompte(700, 705, true, this.dateDeb, this.dateFin) - this.sommeCompte.soldeCompte(7090, 7095, true, this.dateDeb, this.dateFin);
+        long v214 = -this.sommeCompte.soldeCompte(700, 705, true, this.dateDeb, this.dateFin) - this.sommeCompte.soldeCompte("709", this.dateDeb, this.dateFin)
+                - this.sommeCompte.soldeCompte(7090, 7095, true, this.dateDeb, this.dateFin);
         this.m.put("PRODUIT2.1", GestionDevise.currencyToString(v214, false));
         // 201
 ,7 → 270,7
          ******************************************************************************************/
         // 250 SommeSolde( 640, 644* )+SommeSolde( 648, 649* )
         long v250 = this.sommeCompte.soldeCompte(644, 644, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(648, 649, true, this.dateDeb, this.dateFin)
-                + this.sommeCompte.soldeCompte(641, 641, true, this.dateDeb, this.dateFin)+ this.sommeCompte.soldeCompte(642, 642, true, this.dateDeb, this.dateFin);
+                + this.sommeCompte.soldeCompte(641, 641, true, this.dateDeb, this.dateFin) + this.sommeCompte.soldeCompte(642, 642, true, this.dateDeb, this.dateFin);
         this.m.put("CHARGES3.14", GestionDevise.currencyToString(v250, false));
         // 220
 ,8 → 375,8
          * PRODUITS EXCEPTIONNELS
          ******************************************************************************************/
         // 290 -SommeSolde( 77, 77* )-SommeSolde( 787, 789* )-SommeSolde( 797, 799* )
-        long v290 = -this.sommeCompte.soldeCompte(770, 772, true, this.dateDeb, this.dateFin) - this.sommeCompte.soldeCompte(775, 778, true, this.dateDeb, this.dateFin)
-                - this.sommeCompte.soldeCompte(787, 787, true, this.dateDeb, this.dateFin) - this.sommeCompte.soldeCompte(797, 797, true, this.dateDeb, this.dateFin);
+        long v290 = -this.sommeCompte.soldeCompte(77, 77, true, this.dateDeb, this.dateFin) - this.sommeCompte.soldeCompte(787, 787, true, this.dateDeb, this.dateFin)
+                - this.sommeCompte.soldeCompte(797, 797, true, this.dateDeb, this.dateFin);
         this.m.put("PCHARGES3.22", GestionDevise.currencyToString(v290, false));
         // 245
 ,6 → 490,14
         this.m.put("T4.41", "");
         this.m.put("T2.42", "");
+        final SQLField field = ComptaPropsConfiguration.getInstanceCompta().getRootSociete().getTable("COMPTE_PCE").getField("NUMERO");
+        Where where = new Where(field, "LIKE", "6%");
+        where = where.or(new Where(field, "LIKE", "7%"));
+        List<String> unused = this.sommeCompte.getNonUsedCompte(where, this.dateDeb, this.dateFin);
+        if (unused != null && !unused.isEmpty()) {
+            JOptionPane.showMessageDialog(null, "Certains comptes n'ont pas été intégré : " + unused);
+        }
         // final SQLField field =
         // ComptaPropsConfiguration.getInstanceCompta().getRootSociete().getTable("COMPTE_PCE").getField("NUMERO");
         // Where where = new Where(field, "LIKE", "6%");

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/action/ImportEcritureFECAction.java
 New file
 ,0 → 1,42
+/*
+ * 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.finance.accounting.action;
+import org.openconcerto.erp.core.finance.accounting.ui.ImportEcritureFECPanel;
+import org.openconcerto.sql.Configuration;
+import org.openconcerto.ui.FrameUtil;
+import org.openconcerto.ui.PanelFrame;
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+public class ImportEcritureFECAction extends AbstractAction {
+    public ImportEcritureFECAction() {
+        super("Import d'écritures FEC");
+    }
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        final PanelFrame frame = new PanelFrame(new ImportEcritureFECPanel(Configuration.getInstance().getDirectory()), "Import d'écritures FEC");
+        frame.pack();
+        frame.setResizable(false);
+        frame.setLocationRelativeTo(null);
+        FrameUtil.show(frame);
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/CompteGestCommPreferencePanel.java
 ,9 → 44,9
 public class CompteGestCommPreferencePanel extends DefaultPreferencePanel {
-    private ISQLCompteSelector selCompteTVAIntraComm, selCompteFourn, selCompteAchat, selCompteValeurEncaissement, selCompteAvanceClient, selCompteClient, selCompteVenteProduits,
+    private ISQLCompteSelector selCompteCBAttente, selCompteTVAIntraComm, selCompteFourn, selCompteAchat, selCompteValeurEncaissement, selCompteAvanceClient, selCompteClient, selCompteVenteProduits,
             selCompteVenteService, selCompteTVACol, selCompteTVADed, selCompteTVAImmo, selCompteAchatIntra, selCompteFactor, selComptePortSoumis, selComptePortNonSoumis;
-    private ElementComboBox selJrnlFactor, selJrnlValEnc;
+    private ElementComboBox selJrnlFactor, selJrnlValEnc, selJrnlCB;
     private final static SQLBase base = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete();
     private static final SQLTable tablePrefCompte = base.getTable("PREFS_COMPTE");
     private SQLRowValues rowPrefCompteVals = new SQLRowValues(tablePrefCompte);
 ,6 → 186,27
         this.selJrnlValEnc.init(Configuration.getInstance().getDirectory().getElement("JOURNAL"));
         this.add(this.selJrnlValEnc, c);
+        // Journal
+        c.gridy++;
+        c.weightx = 0;
+        c.gridx = 0;
+        this.add(new JLabel("Journal CB Attente"), c);
+        c.weightx = 1;
+        c.gridx++;
+        this.selJrnlCB = new ElementComboBox();
+        this.selJrnlCB.init(Configuration.getInstance().getDirectory().getElement("JOURNAL"));
+        this.add(this.selJrnlCB, c);
+        c.gridy++;
+        c.weightx = 0;
+        c.gridx = 0;
+        this.add(new JLabel("Compte CB Attente"), c);
+        c.weightx = 1;
+        c.gridx++;
+        this.selCompteCBAttente = new ISQLCompteSelector();
+        this.selCompteCBAttente.init();
+        this.add(this.selCompteCBAttente, c);
         // Compte vente produits
         c.gridy++;
         c.weightx = 0;
 ,6 → 362,9
         final int selectedIdEnc = this.selJrnlValEnc.getSelectedId();
         this.rowPrefCompteVals.put("ID_JOURNAL_VALEUR_ENCAISSEMENT", (selectedIdEnc > 1) ? selectedIdEnc : 1);
+        final int selectedIdCB = this.selJrnlCB.getSelectedId();
+        this.rowPrefCompteVals.put("ID_JOURNAL_CB_ATTENTE", (selectedIdCB > 1) ? selectedIdCB : 1);
+        this.rowPrefCompteVals.put("ID_COMPTE_PCE_CB_ATTENTE", this.selCompteCBAttente.getSelectedId() > 1 ? this.selCompteCBAttente.getSelectedId() : 1);
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_FOURNISSEUR", this.selCompteFourn.getValue());
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_CLIENT", this.selCompteClient.getValue());
         this.rowPrefCompteVals.put("ID_COMPTE_PCE_AVANCE_CLIENT", this.selCompteAvanceClient.getValue());
 ,7 → 504,20
                 }
                 this.selJrnlFactor.setValue(value);
             }
             {
+                // Journal CB
+                int value = (this.rowPrefCompteVals.getObject("ID_JOURNAL_CB_ATTENTE") == null ? 1 : this.rowPrefCompteVals.getInt("ID_JOURNAL_CB_ATTENTE"));
+                if (value > 1) {
+                    this.selJrnlCB.setValue(value);
+                }
+                int valueCpt = (this.rowPrefCompteVals.getObject("ID_COMPTE_PCE_CB_ATTENTE") == null ? 1 : this.rowPrefCompteVals.getInt("ID_COMPTE_PCE_CB_ATTENTE"));
+                if (valueCpt > 1) {
+                    this.selCompteCBAttente.setValue(valueCpt);
+                }
+            }
+            {
                 // Journal Val enc
                 int value = (this.rowPrefCompteVals.getObject("ID_JOURNAL_VALEUR_ENCAISSEMENT") == null ? 1 : this.rowPrefCompteVals.getInt("ID_JOURNAL_VALEUR_ENCAISSEMENT"));
                 if (value <= 1) {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/SaisieJournalItemTable.java
 ,7 → 34,6
 import org.openconcerto.sql.view.list.RowValuesTableControlPanel;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.sql.view.list.SQLTableElement;
-import org.openconcerto.sql.view.list.TextTableCellEditorWithCompletion;
 import org.openconcerto.sql.view.list.ValidStateChecker;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.JComponentUtils;
 ,6 → 47,7
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 ,9 → 109,9
         final SQLElement elt = Configuration.getInstance().getDirectory().getElement("SAISIE_KM_ELEMENT");
         // TODO Obligation de choisir un compte correct
-        final List<SQLTableElement> list = new Vector<SQLTableElement>();
+        final List<SQLTableElement> list = new Vector<>();
         final SQLTable tableElement = elt.getTable();
-        final SQLTableElement tableElementJour = new SQLTableElement(tableElement.getField("JOUR"), Integer.class, rangedIntegerTableCellEditor) {
+        final SQLTableElement tableElementJour = new SQLTableElement(tableElement.getField("JOUR"), Integer.class, this.rangedIntegerTableCellEditor) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
 ,6 → 158,7
             final MultiLineTableCellEditor multiLineTableCellEditor = new MultiLineTableCellEditor((RowValuesMultiLineEditTable) analytiqueAssocTable.getTable(), analytiqueAssocTable);
             SQLTableElement eltPourcentAnalytique = new SQLTableElement(tableElement.getField("ANALYTIQUE"), String.class, multiLineTableCellEditor) {
+                @Override
                 public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
                     return vals.getString("NUMERO") != null && (vals.getString("NUMERO").startsWith("6") || vals.getString("NUMERO").startsWith("7"));
                 };
 ,12 → 174,10
                 final int debitIndex = getColumnIndexForElement(SaisieJournalItemTable.this.debit);
                 final int creditIndex = getColumnIndexForElement(SaisieJournalItemTable.this.credit);
-                // float debitVal = ((Float) model.getValueAt(rowIndex, debitIndex);
-                if (debitIndex == columnIndex && ((Long) aValue).longValue() != 0 && ((Long) getValueAt(rowIndex, creditIndex)).longValue() != 0) {
+                if (debitIndex == columnIndex && ((Number) aValue).longValue() != 0 && ((Number) getValueAt(rowIndex, creditIndex)).longValue() != 0) {
                     setValueAt(Long.valueOf(0), rowIndex, creditIndex);
                 } else {
-                    if (creditIndex == columnIndex && ((Long) aValue).longValue() != 0 && ((Long) getValueAt(rowIndex, debitIndex)).longValue() != 0) {
+                    if (creditIndex == columnIndex && ((Number) aValue).longValue() != 0 && ((Number) getValueAt(rowIndex, debitIndex)).longValue() != 0) {
                         setValueAt(Long.valueOf(0), rowIndex, debitIndex);
                     }
                 }
 ,54 → 188,54
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
-        tableElementNomEcriture.getTableCellEditor(table).addCellEditorListener(new CellEditorListener() {
+        tableElementNomEcriture.getTableCellEditor(this.table).addCellEditorListener(new CellEditorListener() {
             @Override
             public void editingStopped(ChangeEvent e) {
                 e.getSource();
-                int row = table.getSelectedRow();
+                int row = SaisieJournalItemTable.this.table.getSelectedRow();
                 int col = 4;
-                if (table.getValueAt(row, col) != null) {
-                    defaultRowVals.put("NOM_ECRITURE", table.getValueAt(row, col));
+                if (SaisieJournalItemTable.this.table.getValueAt(row, col) != null) {
+                    defaultRowVals.put("NOM_ECRITURE", SaisieJournalItemTable.this.table.getValueAt(row, col));
                 }
-                // defaultRowVals.put
             }
             @Override
             public void editingCanceled(ChangeEvent e) {
-                // TODO Auto-generated method stub
+                //
             }
         });
-        tableElementNomPiece.getTableCellEditor(table).addCellEditorListener(new CellEditorListener() {
+        tableElementNomPiece.getTableCellEditor(this.table).addCellEditorListener(new CellEditorListener() {
             @Override
             public void editingStopped(ChangeEvent e) {
                 e.getSource();
-                int row = table.getSelectedRow();
+                int row = SaisieJournalItemTable.this.table.getSelectedRow();
                 int col = 3;
-                if (table.getValueAt(row, col) != null) {
-                    defaultRowVals.put("NOM_PIECE", table.getValueAt(row, col));
+                if (SaisieJournalItemTable.this.table.getValueAt(row, col) != null) {
+                    defaultRowVals.put("NOM_PIECE", SaisieJournalItemTable.this.table.getValueAt(row, col));
                 }
-                // defaultRowVals.put
             }
             @Override
             public void editingCanceled(ChangeEvent e) {
-                // TODO Auto-generated method stub
+                //
             }
         });
-        tableElementJour.getTableCellEditor(table).addCellEditorListener(new CellEditorListener() {
+        tableElementJour.getTableCellEditor(this.table).addCellEditorListener(new CellEditorListener() {
             @Override
             public void editingStopped(ChangeEvent e) {
-                final Object valueAt = table.getValueAt(0, 0);
+                final Object valueAt = SaisieJournalItemTable.this.table.getValueAt(0, 0);
                 defaultRowVals.put("JOUR", valueAt);
-                if (table.getRowCount() > 1) {
-                    for (int i = 1; i < table.getRowCount(); i++) {
-                        table.getRowValuesTableModel().putValue(valueAt, i, "JOUR");
+                if (SaisieJournalItemTable.this.table.getRowCount() > 1) {
+                    for (int i = 1; i < SaisieJournalItemTable.this.table.getRowCount(); i++) {
+                        SaisieJournalItemTable.this.table.getRowValuesTableModel().putValue(valueAt, i, "JOUR");
                     }
                 }
             }
 ,25 → 242,13
             @Override
             public void editingCanceled(ChangeEvent e) {
-                // TODO Auto-generated method stub
+                //
             }
         });
-        ;
-        final KeyListener keyListenerContrepartie = new KeyListener() {
+        final KeyListener keyListenerContrepartie = new KeyAdapter() {
             @Override
-            public void keyTyped(KeyEvent e) {
-            }
-            @Override
-            public void keyReleased(KeyEvent e) {
-            }
-            @Override
             public void keyPressed(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
                     montantValid(defaultRowVals, false, textField);
 ,7 → 268,7
                     @Override
                     public ValidState getValidState(Object o) {
                         if (o != null) {
-                            return elt.getCompteNumeroValidState(o.toString());
+                            return this.elt.getCompteNumeroValidState(o.toString());
                         }
                         return super.getValidState(o);
                     }
 ,12 → 285,10
         m2.setFillWithField("NOM");
         m2.setWhere(w);
-        TextTableCellEditorWithCompletion t = (TextTableCellEditorWithCompletion) this.tableElementNumeroCompte.getTableCellEditor(this.table);
-        JButton buttonClone = new JButton(TM.tr("duplicateLine"));
+        JButton buttonClone = new JButton(TM.tr(Configuration.getInstance().getLocale(), "duplicateLine"));
         buttonClone.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
-                cloneLine(table.getSelectedRow());
+                cloneLine(SaisieJournalItemTable.this.table.getSelectedRow());
             }
         });
         buttonClone.setEnabled(false);
 ,7 → 317,7
             public void tableChanged(TableModelEvent e) {
                 // Sélectionne automatiquement la ligne ajoutée
                 if (e.getType() == TableModelEvent.INSERT) {
-                    if (table.getRowCount() == 1) {
+                    if (SaisieJournalItemTable.this.table.getRowCount() == 1) {
                         editCellAt(e.getFirstRow(), 0);
                     } else {
                         editCellAt(e.getFirstRow(), 1);
 ,7 → 382,7
         final PropertyChangeListener lActiveAddButton = new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
-                controlPanel.setButtonAjouterEnabled(!panel.getBoxJournal().isEmpty() && !panel.getBoxMois().isEmpty());
+                SaisieJournalItemTable.this.controlPanel.setButtonAjouterEnabled(!panel.getBoxJournal().isEmpty() && !panel.getBoxMois().isEmpty());
             }
         };
         panel.getBoxJournal().addModelListener("wantedID", lActiveAddButton);
 ,7 → 399,7
                         c.set(Calendar.DAY_OF_MONTH, 1);
                         c.set(Calendar.YEAR, (Integer) SaisieJournalItemTable.this.panel.spin.getValue());
                         c.set(Calendar.MONTH, SaisieJournalItemTable.this.panel.getSelectedMonth());
-                        rangedIntegerTableCellEditor.setMax(c.getActualMaximum(Calendar.DAY_OF_MONTH));
+                        SaisieJournalItemTable.this.rangedIntegerTableCellEditor.setMax(c.getActualMaximum(Calendar.DAY_OF_MONTH));
                     }
                 }
             }
 ,14 → 414,14
         long totalD = 0L;
         long totalC = 0L;
-        for (int i = 0; i < table.getRowCount(); i++) {
-            Long c = (Long) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("DEBIT"));
-            Long d = (Long) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("CREDIT"));
+        for (int i = 0; i < this.table.getRowCount(); i++) {
+            Number c = (Number) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("DEBIT"));
+            Number d = (Number) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("CREDIT"));
             if (c != null) {
-                totalC += c;
+                totalC += c.longValue();
             }
             if (d != null) {
-                totalD += d;
+                totalD += d.longValue();
             }
         }
 ,19 → 438,19
         long totalC = 0L;
         boolean cptOK = true;
         String lib = null;
-        for (int i = 0; i < table.getRowCount(); i++) {
-            Long c = (Long) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("DEBIT"));
-            Long d = (Long) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("CREDIT"));
+        for (int i = 0; i < this.table.getRowCount(); i++) {
+            Number c = (Number) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("DEBIT"));
+            Number d = (Number) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("CREDIT"));
             if (c != null) {
-                totalC += c;
+                totalC += c.longValue();
             }
             if (d != null) {
-                totalD += d;
+                totalD += d.longValue();
             }
             if (lib == null) {
-                lib = (String) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("NOM"));
+                lib = (String) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("NOM"));
             }
-            String cptNUmber = (String) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("NUMERO"));
+            String cptNUmber = (String) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("NUMERO"));
             cptOK = cptOK && cptNUmber != null && ComptePCESQLElement.isExist(cptNUmber);
         }
         return totalD + totalC != 0 && totalD == totalC && cptOK;
 ,10 → 460,10
         int day = 1;
         String lib = null;
-        for (int i = 0; i < table.getRowCount(); i++) {
-            day = (Integer) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("JOUR"));
+        for (int i = 0; i < this.table.getRowCount(); i++) {
+            day = (Integer) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("JOUR"));
             if (lib == null) {
-                lib = (String) table.getRowValuesTableModel().getValueAt(i, table.getRowValuesTableModel().getColumnForField("NOM"));
+                lib = (String) this.table.getRowValuesTableModel().getValueAt(i, this.table.getRowValuesTableModel().getColumnForField("NOM"));
             }
         }
         // Create saisieKM
 ,13 → 475,12
     }
     public void montantValid(final SQLRowValues defaultRowVals, final boolean fromAnalytique, final JTextField textPiece) {
-        System.err.println("Enter");
         final SQLRowValues vals = SaisieJournalItemTable.this.table.getSelectedRowValues();
         final int selectedRow = SaisieJournalItemTable.this.table.getSelectedRow();
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                if (boxAutoInsert.isSelected() && isSaisieValid()) {
+                if (SaisieJournalItemTable.this.boxAutoInsert.isSelected() && isSaisieValid()) {
                     if (SaisieJournalItemTable.this.panel.getSelectedJournal() == SQLRow.NONEXISTANT_ID || SaisieJournalItemTable.this.panel.getSelectedMonth() == -1) {
                         JOptionPane.showMessageDialog(SaisieJournalItemTable.this.panel, "Impossible de créer la saisie si aucun journal ou aucun mois n'est sélectionné!");
                     } else {
 ,7 → 487,8
                         createSaisie(defaultRowVals, textPiece);
                     }
                 } else {
-                    if (!fromAnalytique && !hideAnalytique && vals.getString("NUMERO") != null && (vals.getString("NUMERO").startsWith("6") || vals.getString("NUMERO").startsWith("7"))) {
+                    if (!fromAnalytique && !SaisieJournalItemTable.this.hideAnalytique && vals.getString("NUMERO") != null
+                            && (vals.getString("NUMERO").startsWith("6") || vals.getString("NUMERO").startsWith("7"))) {
                         // Update montant
                         Collection<SQLRowValues> rowsLinked = vals.getReferentRows(vals.getTable().getTable("ASSOCIATION_ANALYTIQUE"));
 ,7 → 498,7
                                     .setScale(0, RoundingMode.HALF_UP).longValue());
                         }
-                        editCellAt(selectedRow, table.getRowValuesTableModel().getColumnForField("ANALYTIQUE"));
+                        editCellAt(selectedRow, SaisieJournalItemTable.this.table.getRowValuesTableModel().getColumnForField("ANALYTIQUE"));
                     } else {
                         long l = getContrepartie();
 ,19 → 536,19
         try {
             id = rowVAlsKM.insert().getID();
-            table.updateField("ID_SAISIE_KM", id);
-            table.clear();
+            this.table.updateField("ID_SAISIE_KM", id);
+            this.table.clear();
             GenerationMvtSaisieKm gen = new GenerationMvtSaisieKm(id);
             int idMvt = gen.genereMouvement();
             // maj de l'id du mouvement correspondant
             SQLRowValues rowValsKMMvt = new SQLRowValues(SaisieJournalItemTable.this.table.getRowValuesTableModel().getSQLElement().getTable().getForeignTable("ID_SAISIE_KM"));
-            rowValsKMMvt.put("ID_MOUVEMENT", new Integer(idMvt));
+            rowValsKMMvt.put("ID_MOUVEMENT", Integer.valueOf(idMvt));
             rowValsKMMvt.update(id);
             defaultRowVals.put("NOM_PIECE", "");
             defaultRowVals.put("NOM_ECRITURE", "");
-            table.getRowValuesTableModel().addNewRow();
+            this.table.getRowValuesTableModel().addNewRow();
             pieceText.setText("");
         } catch (SQLException e) {
             e.printStackTrace();
 ,11 → 611,11
         final int debitIndex = model.getColumnIndexForElement(getDebitElement());
         for (int i = 0; i < this.table.getRowCount(); i++) {
             if (model.isRowValid(i)) {
-                final Long fTc = (Long) model.getValueAt(i, creditIndex);
+                final Number fTc = (Number) model.getValueAt(i, creditIndex);
                 if (fTc != null) {
                     totalCred += fTc.longValue();
                 }
-                final Long fTd = (Long) model.getValueAt(i, debitIndex);
+                final Number fTd = (Number) model.getValueAt(i, debitIndex);
                 if (fTd != null) {
                     totalDeb += fTd.longValue();
                 }
 ,7 → 638,7
         assert SwingUtilities.isEventDispatchThread();
         if (text == null)
             return;
-        RowValuesTableModel model = table.getRowValuesTableModel();
+        RowValuesTableModel model = this.table.getRowValuesTableModel();
         int size = model.getRowCount();
         for (int i = 0; i < size; i++) {
             SQLRowValues r = model.getRowValuesAt(i);
 ,6 → 649,7
         model.fireTableDataChanged();
     }
+    @Override
     public void mousePressed(final MouseEvent e) {
         final int rowSel = this.table.getSelectedRow();
         if (e.getButton() == MouseEvent.BUTTON3 && rowSel >= 0 && rowSel < this.table.getRowCount()) {
 ,22 → 678,28
         }
     }
+    @Override
     public void mouseReleased(final MouseEvent e) {
+        // Nothing
     }
+    @Override
     public void mouseClicked(final MouseEvent e) {
+        // Nothing
     }
+    @Override
     public void mouseEntered(final MouseEvent e) {
+        // Nothing
     }
+    @Override
     public void mouseExited(final MouseEvent e) {
+        // Nothing
     }
     private void cloneLine(int row) {
         if (row < 0) {
-            System.err.println("RowValuesTableControlPanel.cloneLine() wrong selected line, index = " + row);
-            Thread.dumpStack();
             return;
         }
         SQLRowValues rowVals = this.table.getRowValuesTableModel().getRowValuesAt(row);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/ImpressionBalancePanel.java
 ,6 → 50,7
     private JCheckBox checkClientCentral;
     private JCheckBox checkFournCentral;
     private JCheckBox checkFournImmoCentral;
+    private JCheckBox checkTotalRacine;
     private JProgressBar bar = new JProgressBar(0, 3);
     private JTextField compteDeb, compteEnd;
 ,6 → 123,13
         this.checkFournImmoCentral = new JCheckBox("Centralisation des comptes fournisseurs d'immobilisations");
         this.add(this.checkFournImmoCentral, c);
+        // Centralisation Fournisseurs
+        c.gridy++;
+        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.gridx = 0;
+        this.checkTotalRacine = new JCheckBox("Total par racine");
+        this.add(this.checkTotalRacine, c);
         // Progress bar
         c.gridwidth = GridBagConstraints.REMAINDER;
         c.gridy++;
 ,7 → 171,7
                 new Thread(new Runnable() {
                     public void run() {
                         BalanceSheet bSheet = new BalanceSheet(dateStart.getDate(), dateEnd.getDate(), compteDeb.getText(), compteEnd.getText(), checkClientCentral.isSelected(),
-                                checkFournCentral.isSelected(), checkFournImmoCentral.isSelected());
+                                checkFournCentral.isSelected(), checkFournImmoCentral.isSelected(), checkTotalRacine.isSelected());
                         final SpreadSheetGeneratorCompta generator = new SpreadSheetGeneratorCompta(bSheet, "Balance" + new Date().getTime(), checkImpr.isSelected(), checkVisu.isSelected());
                         SwingUtilities.invokeLater(new Runnable() {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/SaisieKmItemTable.java
 ,7 → 166,7
         m2.setWhere(w);
         TextTableCellEditorWithCompletion t = (TextTableCellEditorWithCompletion) this.tableElementNumeroCompte.getTableCellEditor(this.table);
-        JButton buttonClone = new JButton(TM.tr("duplicateLine"));
+        JButton buttonClone = new JButton(TM.tr(Configuration.getInstance().getLocale(), "duplicateLine"));
         buttonClone.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
                 cloneLine(table.getSelectedRow());

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/ImportEcritureFECPanel.java
 New file
 ,0 → 1,110
+/*
+ * 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.finance.accounting.ui;
+import org.openconcerto.erp.panel.compta.ImportFEC;
+import org.openconcerto.sql.element.SQLElementDirectory;
+import org.openconcerto.sql.users.UserManager;
+import org.openconcerto.ui.DefaultGridBagConstraints;
+import org.openconcerto.ui.ReloadPanel;
+import org.openconcerto.ui.SwingThreadUtils;
+import java.awt.FileDialog;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+public class ImportEcritureFECPanel extends JPanel {
+    private final Map<String, Integer> mapJournal = new HashMap<>();
+    private final Map<String, Integer> mapCompte = new HashMap<>();
+    public ImportEcritureFECPanel(final SQLElementDirectory dir) {
+        super(new GridBagLayout());
+        JLabel label = new JLabel("Import depuis un fichier au format FEC.");
+        final JButton button = new JButton("Sélectionner le ficher");
+        GridBagConstraints c = new DefaultGridBagConstraints();
+        c.gridwidth = 2;
+        this.add(label, c);
+        c.gridy++;
+        c.gridwidth = 1;
+        c.weightx = 1;
+        final ReloadPanel rlPanel = new ReloadPanel();
+        c.anchor = GridBagConstraints.EAST;
+        c.fill = GridBagConstraints.NONE;
+        this.add(rlPanel, c);
+        c.gridx++;
+        c.weightx = 0;
+        this.add(button, c);
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                button.setEnabled(false);
+                final Frame frame = SwingThreadUtils.getAncestorOrSelf(Frame.class, ImportEcritureFECPanel.this);
+                final FileDialog fd = new FileDialog(frame, "Import d'écritures", FileDialog.LOAD);
+                fd.setVisible(true);
+                rlPanel.setMode(ReloadPanel.MODE_ROTATE);
+                if (fd.getFile() != null) {
+                    new Thread() {
+                        @Override
+                        public void run() {
+                            final File fileToImport = new File(fd.getDirectory(), fd.getFile());
+                            ImportFEC fec = new ImportFEC();
+                            try {
+                                fec.loadFrom(fileToImport);
+                                fec.importTo(dir, dir.getElement("ECRITURE").getTable().getDBRoot(), UserManager.getUser());
+                            } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                            } catch (SQLException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                            }finally {
+                                SwingUtilities.invokeLater(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        if (fd != null) {
+                                            rlPanel.setMode(ReloadPanel.MODE_EMPTY);
+                                        }
+                                        JOptionPane.showMessageDialog(null, "Import terminé!");
+                                    }
+                                });
+                            }
+                        }
+                    }.start();
+                }
+            }
+        });
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/LettragePanel.java
 ,6 → 104,10
     private JDate dateDeb, dateFin, dateLettrage;
     public LettragePanel() {
+        this(ComptePCESQLElement.getId("4"));
+    }
+    public LettragePanel(int idCompte) {
         this.setLayout(new GridBagLayout());
         GridBagConstraints c = new DefaultGridBagConstraints();
         final SQLElementDirectory directory = Configuration.getInstance().getDirectory();
 ,7 → 128,7
         }
         createComboRequest.setWhere(new Where(eltCpt.getTable().getField("NUMERO"), function, "^4.*$"));
         this.selCompte.init(eltCpt, createComboRequest);
-        this.selCompte.setValue(ComptePCESQLElement.getId("4"));
+        this.selCompte.setValue(idCompte);
         c.gridx++;
         c.weightx = 1;

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/ImportEcriturePanel.java
 ,12 → 112,6
                 button.setEnabled(false);
                 final Frame frame = SwingThreadUtils.getAncestorOrSelf(Frame.class, ImportEcriturePanel.this);
                 final FileDialog fd = new FileDialog(frame, "Import d'écritures", FileDialog.LOAD);
-                fd.setFilenameFilter(new FilenameFilter() {
-                    @Override
-                    public boolean accept(File dir, String name) {
-                        return name.endsWith("." + ContentTypeVersioned.SPREADSHEET.getExtension());
-                    }
-                });
                 fd.setVisible(true);
                 rlPanel.setMode(ReloadPanel.MODE_ROTATE);
                 if (fd.getFile() != null) {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/model/SommeCompte.java
 ,6 → 123,62
         return sommeDebit - sommeCredit;
     }
+    public long soldeCompte(String numeroCompte, Date dateDebut, Date dateFin) {
+        long sommeDebit = 0;
+        long sommeCredit = 0;
+        SQLTable ecritureTable = base.getTable("ECRITURE");
+        SQLTable compteTable = base.getTable("COMPTE_PCE");
+        SQLSelect sel = new SQLSelect();
+        sel.addSelect(ecritureTable.getField("DEBIT"), "SUM");
+        sel.addSelect(ecritureTable.getField("CREDIT"), "SUM");
+        // sel.addSelect(compteTable.getField("ID"));
+        // sel.addSelect(compteTable.getField("NUMERO"));
+        // Where w = new Where(ecritureTable.getField("ID_COMPTE_PCE"), "=",
+        // compteTable.getField("ID"));
+        sel.addJoin("LEFT", ecritureTable.getField("ID_COMPTE_PCE"));
+        Where w2 = new Where(compteTable.getField("NUMERO"), "LIKE", numeroCompte);
+        this.compteUsed.add(numeroCompte);
+        Where w4 = new Where(ecritureTable.getField("DATE"), dateDebut, dateFin);
+        if (this.removeClotureCompte) {
+            Where w5 = new Where(ecritureTable.getField("NOM"), "NOT LIKE", "Fermeture du compte %");
+            sel.setWhere(w2.and(w4).and(w5));
+        } else {
+            sel.setWhere(w2.and(w4));
+        }
+        addAnalytiqueJoin(sel);
+        // String req = sel.asString() +
+        // " GROUP BY \"COMPTE_PCE\".\"ID\",\"COMPTE_PCE\".\"NUMERO\" ORDER BY
+        // \"COMPTE_PCE\".\"NUMERO\"";
+        String req = sel.asString();
+        Object ob = base.getDataSource().execute(req, new ArrayListHandler());
+        List myList = (List) ob;
+        if (myList.size() != 0) {
+            for (int i = 0; i < myList.size(); i++) {
+                Object[] objTmp = (Object[]) myList.get(i);
+                if (objTmp[0] != null) {
+                    sommeDebit += ((Number) objTmp[0]).longValue();
+                }
+                if (objTmp[1] != null) {
+                    sommeCredit += ((Number) objTmp[1]).longValue();
+                }
+            }
+        }
+        return sommeDebit - sommeCredit;
+    }
     /***********************************************************************************************
      * Calcul le solde débiteur des comptes compris dans l'intervalle numeroStart numeroEnd
      *
 ,7 → 436,7
         this.compteUsed.clear();
     }
-    public void getNonUsedCompte(Where where, Date dateDebut, Date dateFin) {
+    public List<String> getNonUsedCompte(Where where, Date dateDebut, Date dateFin) {
         SQLSelect sel = new SQLSelect();
         final SQLTable table = base.getTable("COMPTE_PCE");
 ,6 → 458,6
         for (String string : s) {
             System.err.println("Compte " + s);
         }
+        return s;
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/element/EcritureSQLElement.java
 ,6 → 20,7
 import org.openconcerto.erp.core.edm.AttachmentAction;
 import org.openconcerto.erp.core.finance.accounting.ui.AssociationAnalytiquePanel;
 import org.openconcerto.erp.core.finance.accounting.ui.ConsultationCompteFrame;
+import org.openconcerto.erp.core.finance.accounting.ui.LettragePanel;
 import org.openconcerto.erp.core.finance.accounting.ui.LettrageRenderer;
 import org.openconcerto.erp.core.finance.accounting.ui.ListEcritureRenderer;
 import org.openconcerto.erp.core.finance.accounting.ui.ListeDesEcrituresPanel;
 ,6 → 101,18
         consult.setPredicate(IListeEvent.getSingleSelectionPredicate());
         getRowActions().add(consult);
+        PredicateRowAction interrogation = new PredicateRowAction(new AbstractAction("Interrogation du compte") {
+            public void actionPerformed(ActionEvent event) {
+                SQLRowAccessor row = IListe.get(event).getSelectedRow();
+                PanelFrame f = new PanelFrame(new LettragePanel(row.getForeignID("ID_COMPTE_PCE")), "Lettrage manuel par compte");
+                f.setVisible(true);
+            }
+        }, false);
+        interrogation.setPredicate(IListeEvent.getSingleSelectionPredicate());
+        getRowActions().add(interrogation);
         PredicateRowAction contre = new PredicateRowAction(new AbstractAction("Contrepassation") {
             public void actionPerformed(ActionEvent event) {
                 EcritureSQLElement.contrePassationPiece(IListe.get(event).getSelectedId());

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/element/SaisieKmSQLElement.java
 ,6 → 15,7
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
+import org.openconcerto.erp.core.finance.accounting.ui.AnalytiqueItemTable;
 import org.openconcerto.erp.core.finance.accounting.ui.SaisieKmItemTable;
 import org.openconcerto.erp.generationEcritures.GenerationMvtSaisieKm;
 import org.openconcerto.sql.Configuration;
 ,6 → 115,7
         SQLTable ecrTable = base.getTable("ECRITURE");
         SQLTable compteTable = base.getTable("COMPTE_PCE");
         SQLTable saisieKmTable = base.getTable("SAISIE_KM_ELEMENT");
+        SQLTable assocTable = base.getTable("ASSOCIATION_ANALYTIQUE");
         SQLRowValues vals = new SQLRowValues(base.getTable("SAISIE_KM"));
         vals.put("ID_MOUVEMENT", new Integer(idMvt));
 ,7 → 154,16
                 valsTmp.put("DEBIT", rowEcrTmp.getObject("DEBIT"));
                 valsTmp.put("CREDIT", rowEcrTmp.getObject("CREDIT"));
                 valsTmp.put("ID_ECRITURE", new Integer(rowEcrTmp.getID()));
-                valsTmp.insert();
+                List<SQLRow> assocRows = rowEcrTmp.getReferentRows(assocTable);
+                if (assocRows.size() > 0) {
+                    for (int a = 0; a < assocRows.size(); a++) {
+                        assocRows.get(a).createUpdateRow().put("ID_SAISIE_KM_ELEMENT", valsTmp);
+                    }
+                    valsTmp.put("ANALYTIQUE", AnalytiqueItemTable.getStringAssocs(valsTmp));
+                }
+                valsTmp.commit();
             }
             Object[] objTmp = (Object[]) myListEcriture.get(0);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/RubriqueBrutSQLElement.java
 ,6 → 27,7
 import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.utils.ListMap;
+import org.openconcerto.utils.NoneSelectedButtonGroup;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 ,7 → 70,8
         l.add("COTISABLE");
         l.add("PART_CP");
         l.add("TAXABLE_CM");
+        l.add("CSG_NORMAL");
+        l.add("CSG_REDUIT");
         return l;
     }
 ,6 → 341,28
                 JCheckBox checkCP = new JCheckBox(getLabelFor("PART_CP"));
                 panelProp.add(checkCP, cPanel);
+                // CSG Normal
+                cPanel.gridx = 1;
+                cPanel.weightx = 1;
+                cPanel.gridy++;
+                c.fill = GridBagConstraints.HORIZONTAL;
+                cPanel.gridwidth = GridBagConstraints.REMAINDER;
+                JCheckBox checkCSGN = new JCheckBox(getLabelFor("CSG_NORMAL"));
+                panelProp.add(checkCSGN, cPanel);
+                // CSG Réduite
+                cPanel.gridx = 1;
+                cPanel.weightx = 1;
+                cPanel.gridy++;
+                c.fill = GridBagConstraints.HORIZONTAL;
+                cPanel.gridwidth = GridBagConstraints.REMAINDER;
+                JCheckBox checkCSGR = new JCheckBox(getLabelFor("CSG_REDUIT"));
+                panelProp.add(checkCSGR, cPanel);
+                NoneSelectedButtonGroup groupCSG = new NoneSelectedButtonGroup();
+                groupCSG.add(checkCSGN);
+                groupCSG.add(checkCSGR);
                 // Type
                 JLabel labelSelCodeRubrique = new JLabel("Code DSN (S21.G00.51.011)");
                 labelSelCodeRubrique.setHorizontalAlignment(SwingConstants.RIGHT);
 ,6 → 401,8
                 this.addSQLObject(checkCotis, "COTISABLE");
                 this.addSQLObject(checkCP, "PART_CP");
                 this.addSQLObject(checkImpo, "TAXABLE_CM");
+                this.addSQLObject(checkCSGN, "CSG_NORMAL");
+                this.addSQLObject(checkCSGR, "CSG_REDUIT");
                 selSalarie.addValueListener(new PropertyChangeListener() {
 ,7 → 420,7
                 rowVals.put("TAXABLE_CM", Boolean.TRUE);
                 rowVals.put("COTISABLE", Boolean.TRUE);
                 rowVals.put("PART_BRUT", Boolean.TRUE);
+                rowVals.put("CSG_NORMAL", Boolean.TRUE);
                 return rowVals;
             }
         };

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/ReglementPayeSQLElement.java
 ,8 → 57,8
     protected List<String> getComboFields() {
         final List<String> l = new ArrayList<String>();
-        l.add("NOM_BANQUE");
-        l.add("RIB");
+        l.add("IBAN");
+        l.add("BIC");
         return l;
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/ContratSalarieSQLElement.java
 ,6 → 22,8
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 ,8 → 100,10
                 this.add(labelNature, c);
                 c.gridx++;
                 c.weightx = 1;
+                c.gridwidth = 3;
                 this.add(textNature, c);
+                c.gridwidth = 1;
                 // Catégorie socioprofessionnelle
                 JLabel labelCatSocio = new JLabel(getLabelFor("ID_CODE_EMPLOI"));
                 labelCatSocio.setHorizontalAlignment(SwingConstants.RIGHT);
 ,21 → 116,61
                 c.gridx++;
                 c.weightx = 1;
                 this.add(selCodeCatSocio, c);
                 JLabel complPCSLabel = new JLabel(getLabelFor("COMPLEMENT_PCS"));
                 complPCSLabel.setHorizontalAlignment(SwingConstants.RIGHT);
                 JTextField complPCS = new JTextField();
-                c.gridy++;
-                c.gridx = 0;
+                c.gridx++;
                 c.weightx = 0;
                 this.add(complPCSLabel, c);
                 c.gridx++;
                 c.weightx = 1;
                 this.add(complPCS, c);
-                addView(complPCS,"COMPLEMENT_PCS");
+                addView(complPCS, "COMPLEMENT_PCS");
+                JLabel objetSpecLabel = new JLabel(getLabelFor("SPECTACLE_OBJET"));
+                objetSpecLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+                JTextField objetSpec = new JTextField();
+                c.gridy++;
+                c.gridx = 0;
+                c.weightx = 0;
+                this.add(objetSpecLabel, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(objetSpec, c);
+                addView(objetSpec, "SPECTACLE_OBJET");
+                objetSpec.setEditable(false);
+                JLabel jourContratLabel = new JLabel(getLabelFor("SPECTACLE_JOUR_CONTRAT"));
+                jourContratLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+                JTextField jourContrat = new JTextField();
+                c.gridx++;
+                c.weightx = 0;
+                this.add(jourContratLabel, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(jourContrat, c);
+                addView(jourContrat, "SPECTACLE_JOUR_CONTRAT");
+                jourContrat.setEditable(false);
+                final ElementComboBox selCaractActivite = new ElementComboBox();
+                selCaractActivite.setInfoIconVisible(false);
+                this.addRequiredSQLObject(selCaractActivite, "ID_CODE_CARACT_ACTIVITE");
+                selCaractActivite.addModelListener("wantedID", new PropertyChangeListener() {
+                    @Override
+                    public void propertyChange(PropertyChangeEvent evt) {
+                        final boolean b = selCaractActivite.getSelectedRow() != null && selCaractActivite.getSelectedRow().getString("CODE").equals("04");
+                        objetSpec.setEditable(b);
+                        jourContrat.setEditable(b);
+                        if (!b) {
+                            objetSpec.setText("");
+                            ;
+                            jourContrat.setText("");
+                        }
+                    }
+                });
                 // Contrat de travail
                 JLabel labelContratTravail = new JLabel(getLabelFor("ID_CODE_CONTRAT_TRAVAIL"));
                 labelContratTravail.setHorizontalAlignment(SwingConstants.RIGHT);
 ,8 → 189,7
                 labelDroitContrat.setHorizontalAlignment(SwingConstants.RIGHT);
                 ElementComboBox selDroitContrat = new ElementComboBox();
                 selDroitContrat.setInfoIconVisible(false);
-                c.gridy++;
-                c.gridx = 0;
+                c.gridx++;
                 c.weightx = 0;
                 this.add(labelDroitContrat, c);
                 c.gridx++;
 ,8 → 199,7
                 // caracteristiques activité
                 JLabel labelCaractActivite = new JLabel(getLabelFor("ID_CODE_CARACT_ACTIVITE"));
                 labelCaractActivite.setHorizontalAlignment(SwingConstants.RIGHT);
-                ElementComboBox selCaractActivite = new ElementComboBox();
-                selCaractActivite.setInfoIconVisible(false);
                 c.gridy++;
                 c.gridx = 0;
                 c.weightx = 0;
 ,8 → 213,7
                 labelStatutProf.setHorizontalAlignment(SwingConstants.RIGHT);
                 ElementComboBox selStatutProf = new ElementComboBox();
                 selStatutProf.setInfoIconVisible(false);
-                c.gridy++;
-                c.gridx = 0;
+                c.gridx++;
                 c.weightx = 0;
                 this.add(labelStatutProf, c);
                 c.gridx++;
 ,7 → 230,6
                 c.weightx = 0;
                 this.add(labelStatutCat, c);
                 c.gridx++;
-                c.weighty = 1;
                 c.weightx = 1;
                 this.add(selStatutCat, c);
 ,25 → 238,28
                 labelStatutCatConv.setHorizontalAlignment(SwingConstants.RIGHT);
                 ElementComboBox selStatutCatConv = new ElementComboBox();
                 selStatutCatConv.setInfoIconVisible(false);
-                c.gridy++;
-                c.gridx = 0;
+                c.gridx++;
                 c.weightx = 0;
                 this.add(labelStatutCatConv, c);
                 c.gridx++;
-                c.weighty = 1;
                 c.weightx = 1;
                 this.add(selStatutCatConv, c);
                 List<String> dsnFF = Arrays.asList("ID_CONTRAT_MODALITE_TEMPS", "ID_CONTRAT_REGIME_MALADIE", "ID_CONTRAT_REGIME_VIEILLESSE", "ID_CONTRAT_DETACHE_EXPATRIE",
-                        "ID_CONTRAT_DISPOSITIF_POLITIQUE");
+                        "ID_CONTRAT_DISPOSITIF_POLITIQUE", "ID_CONTRAT_MOTIF_RECOURS");
+                int p = 0;
                 for (String ffName : dsnFF) {
                     JLabel labelFF = new JLabel(getLabelFor(ffName));
                     labelFF.setHorizontalAlignment(SwingConstants.RIGHT);
                     ElementComboBox selFF = new ElementComboBox();
                     selFF.setInfoIconVisible(false);
-                    c.gridy++;
-                    c.gridx = 0;
+                    if (p % 2 == 0) {
+                        c.gridy++;
+                        c.gridx = 0;
+                    } else {
+                        c.gridx++;
+                    }
+                    p++;
                     c.weightx = 0;
                     this.add(labelFF, c);
                     c.gridx++;
 ,21 → 266,12
                     c.weighty = 1;
                     c.weightx = 1;
                     this.add(selFF, c);
-                    this.addRequiredSQLObject(selFF, ffName);
+                    if (ffName.equals("ID_CONTRAT_MOTIF_RECOURS")) {
+                        this.addSQLObject(selFF, ffName);
+                    } else {
+                        this.addRequiredSQLObject(selFF, ffName);
+                    }
                 }
-                JLabel labelFF = new JLabel(getLabelFor("ID_CONTRAT_MOTIF_RECOURS"));
-                labelFF.setHorizontalAlignment(SwingConstants.RIGHT);
-                ElementComboBox selFF = new ElementComboBox();
-                selFF.setInfoIconVisible(false);
-                c.gridy++;
-                c.gridx = 0;
-                c.weightx = 0;
-                this.add(labelFF, c);
-                c.gridx++;
-                c.weighty = 1;
-                c.weightx = 1;
-                this.add(selFF, c);
-                this.addSQLObject(selFF, "ID_CONTRAT_MOTIF_RECOURS");
                 // Code Arrco, agirc retirés du contrat et ajoutés dans les caisses de cotisations
 ,18 → 372,18
                 // this.add(textCodeRegimeRetraite, c);
                 // addRequiredSQLObject(textCodeRegimeRetraite, "CODE_REGIME_RETRAITE_DSN");
-                JLabel labelDateModif = new JLabel(getLabelFor("DATE_MODIFICATION"));
-                labelDateModif.setHorizontalAlignment(SwingConstants.RIGHT);
-                JDate textDateModif = new JDate();
-                c.gridy++;
-                c.gridx = 0;
-                c.weightx = 0;
-                this.add(textDateModif, c);
-                c.gridx++;
-                c.weighty = 1;
-                c.weightx = 1;
-                this.add(textDateModif, c);
-                addSQLObject(textDateModif, "DATE_MODIFICATION");
+                // JLabel labelDateModif = new JLabel(getLabelFor("DATE_MODIFICATION"));
+                // labelDateModif.setHorizontalAlignment(SwingConstants.RIGHT);
+                // JDate textDateModif = new JDate();
+                // c.gridy++;
+                // c.gridx = 0;
+                // c.weightx = 0;
+                // this.add(textDateModif, c);
+                // c.gridx++;
+                // c.weighty = 1;
+                // c.weightx = 1;
+                // this.add(textDateModif, c);
+                // addSQLObject(textDateModif, "DATE_MODIFICATION");
                 // JLabel labelCM = new JLabel(getLabelFor("ID_INFOS_SALARIE_PAYE_MODIFIE"));
                 // labelCM.setHorizontalAlignment(SwingConstants.RIGHT);
 ,7 → 410,6
                 c.weightx = 0;
                 this.add(labelDateDebut, c);
                 c.gridx++;
-                c.weighty = 1;
                 c.weightx = 1;
                 this.add(textDateDebut, c);
                 addSQLObject(textDateDebut, "DATE_DEBUT", REQ);
 ,19 → 417,64
                 JLabel labelDateFin = new JLabel(getLabelFor("DATE_PREV_FIN"));
                 labelDateFin.setHorizontalAlignment(SwingConstants.RIGHT);
                 JDate textDateFin = new JDate();
-                c.gridy++;
-                c.gridx = 0;
+                c.gridx++;
                 c.weightx = 0;
                 this.add(labelDateFin, c);
                 c.gridx++;
-                c.weighty = 1;
                 c.weightx = 1;
                 this.add(textDateFin, c);
                 addSQLObject(textDateFin, "DATE_PREV_FIN");
+                JLabel labelAmen = new JLabel(getLabelFor("ID_CODE_AMENAGEMENT_PARTIEL"));
+                labelAmen.setHorizontalAlignment(SwingConstants.RIGHT);
+                ElementComboBox selAmen = new ElementComboBox();
+                selAmen.setInfoIconVisible(false);
+                c.gridy++;
+                c.gridx = 0;
+                c.weightx = 0;
+                this.add(labelAmen, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(selAmen, c);
+                this.addSQLObject(selAmen, "ID_CODE_AMENAGEMENT_PARTIEL");
+                JLabel labelSupsension = new JLabel(getLabelFor("ID_CODE_SUSPENSION"));
+                labelSupsension.setHorizontalAlignment(SwingConstants.RIGHT);
+                ElementComboBox selSupsension = new ElementComboBox();
+                selSupsension.setInfoIconVisible(false);
+                c.gridx++;
+                c.weightx = 0;
+                this.add(labelSupsension, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(selSupsension, c);
+                this.addSQLObject(selSupsension, "ID_CODE_SUSPENSION");
+                JLabel labelDateDebutSusp = new JLabel(getLabelFor("DATE_DEBUT_SUSPENSION"));
+                labelDateDebutSusp.setHorizontalAlignment(SwingConstants.RIGHT);
+                JDate textDateDebutSups = new JDate();
+                c.gridy++;
+                c.gridx = 0;
+                c.weightx = 0;
+                this.add(labelDateDebutSusp, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(textDateDebutSups, c);
+                this.addSQLObject(textDateDebutSups, "DATE_DEBUT_SUSPENSION");
+                JLabel labelDateFinSups = new JLabel(getLabelFor("DATE_FIN_SUSPENSION"));
+                labelDateFinSups.setHorizontalAlignment(SwingConstants.RIGHT);
+                JDate textDateFinSuspension = new JDate();
+                c.gridx++;
+                c.weightx = 0;
+                this.add(labelDateFinSups, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(textDateFinSuspension, c);
+                this.addSQLObject(textDateFinSuspension, "DATE_FIN_SUSPENSION");
                 this.addRequiredSQLObject(selCodeCatSocio, "ID_CODE_EMPLOI");
                 this.addRequiredSQLObject(selContratTravail, "ID_CODE_CONTRAT_TRAVAIL");
-                this.addRequiredSQLObject(selCaractActivite, "ID_CODE_CARACT_ACTIVITE");
                 this.addRequiredSQLObject(selDroitContrat, "ID_CODE_DROIT_CONTRAT");
                 this.addRequiredSQLObject(selStatutProf, "ID_CODE_STATUT_PROF");
                 this.addRequiredSQLObject(selStatutCat, "ID_CODE_STATUT_CATEGORIEL");

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/CodeAmenagementPartielSQLElement.java
 New file
 ,0 → 1,28
+/*
+ * 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.element;
+import org.openconcerto.sql.model.DBRoot;
+public class CodeAmenagementPartielSQLElement extends AbstractCodeSQLElement {
+    public CodeAmenagementPartielSQLElement(final DBRoot root) {
+        super(root.getTable("CODE_AMENAGEMENT_PARTIEL"), "un code d'aménagement partiel", "codes d'aménagement partiel");
+    }
+    @Override
+    protected String createCode() {
+        return createCodeOfPackage() + ".partiel.code";
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/CodeSuspensionSQLElement.java
 New file
 ,0 → 1,28
+/*
+ * 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.element;
+import org.openconcerto.sql.model.DBRoot;
+public class CodeSuspensionSQLElement extends AbstractCodeSQLElement {
+    public CodeSuspensionSQLElement(final DBRoot root) {
+        super(root.getTable("CODE_SUSPENSION"), "un code de suspension", "codes suspension");
+    }
+    @Override
+    protected String createCode() {
+        return createCodeOfPackage() + ".supension.code";
+    }
+}

/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/VariablePayeSQLElement.java
261,6 → 261,7
l2.add(tableFichePaye.getField("NET_IMP"));
l2.add(tableFichePaye.getField("NET_A_PAYER"));
l2.add(tableFichePaye.getField("CSG"));
l2.add(tableFichePaye.getField("CSG_REDUITE"));

mapTree.put("Contenu paye", l2);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/FichePayeSQLElement.java
 ,7 → 21,6
 import org.openconcerto.erp.core.humanresources.payroll.report.FichePayeSheetXML;
 import org.openconcerto.erp.core.humanresources.payroll.ui.FichePayeRenderer;
 import org.openconcerto.erp.core.humanresources.payroll.ui.PanelCumulsPaye;
-import org.openconcerto.erp.generationEcritures.GenerationMvtFichePaye;
 import org.openconcerto.erp.model.FichePayeModel;
 import org.openconcerto.erp.model.MouseSheetXmlListeListener;
 import org.openconcerto.erp.model.RubriquePayeTree;
 ,9 → 48,9
 import org.openconcerto.sql.view.list.RowAction.PredicateRowAction;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.JDate;
-import org.openconcerto.ui.component.ITextArea;
 import org.openconcerto.ui.component.InteractionMode;
 import org.openconcerto.utils.ExceptionHandler;
+import org.openconcerto.utils.ListMap;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 ,9 → 101,32
         }, true);
         actionCumuls.setPredicate(IListeEvent.getSingleSelectionPredicate());
         getRowActions().add(actionCumuls);
+        PredicateRowAction genererNonSimplifie = new PredicateRowAction(new AbstractAction("Créer le bulletin détaillé") {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                SQLRow row = IListe.get(e).getSelectedRow().asRow();
+                FichePayeSheetXML sheet = new FichePayeSheetXML(row, false);
+                try {
+                    sheet.createDocument();
+                    sheet.showPrintAndExport(true, false, true);
+                } catch (Exception e1) {
+                    ExceptionHandler.handle("Erreur lors de la création du document.", e1);
+                }
+            }
+        }, false);
+        genererNonSimplifie.setPredicate(IListeEvent.getSingleSelectionPredicate());
+        getRowActions().add(genererNonSimplifie);
     }
+    @Override
+    public ListMap<String, String> getShowAs() {
+        final ListMap<String, String> map = new ListMap<>();
+        map.put("ID_SALARIE", Arrays.asList("CODE", "NOM", "PRENOM", "ID_REGLEMENT_PAYE"));
+        return map;
+    }
     protected List<String> getListFields() {
         final List<String> l = new ArrayList<String>();
         l.add("ID_SALARIE");
 ,7 → 177,6
             JDate dateDu, dateAu;
             private JScrollPane paneTreeLeft;
             private JPanel pDate;
-            private JButton buttonValider, buttonGenCompta;
             public void addViews() {
 ,7 → 208,7
                 c.gridheight = 1;
                 c.gridwidth = 2;
                 this.selSalCombo = new ElementComboBox();
-                // c.gridx++;
                 panelRight.add(this.selSalCombo, c);
                 // Mois
 ,7 → 220,6
                 this.dateDu = new JDate();
                 this.dateAu = new JDate();
-                // JTextField textMois = new JTextField();
                 JLabel labelAnnee = new JLabel("Année");
                 this.textAnnee = new JTextField();
                 {
 ,7 → 245,6
                     this.pDate.add(this.dateAu, cDate);
                     c.gridy++;
-                    // c.gridx++;
                     c.fill = GridBagConstraints.HORIZONTAL;
                     c.weightx = 1;
                     c.weighty = 0;
 ,11 → 252,6
                     c.gridwidth = 2;
                     panelRight.add(this.pDate, c);
                 }
-                // c.gridx += 2;
-                // c.weightx = 1;
-                // c.gridwidth = 1;
-                // c.fill = GridBagConstraints.HORIZONTAL;
-                // panelRight.add(new JPanel(), c);
                 // Action Button
 ,16 → 317,16
                 // Total Periode
                 JPanel panelTotal = new JPanel(new GridBagLayout());
-                panelTotal.setBorder(BorderFactory.createTitledBorder("Total période"));
+                panelTotal.setBorder(BorderFactory.createTitledBorder("Totaux sur la période"));
                 GridBagConstraints cPanel = new DefaultGridBagConstraints();
                 JLabel labelInfosConges = new JLabel(getLabelFor("DETAILS_CONGES"));
                 panelTotal.add(labelInfosConges, cPanel);
-                ITextArea textConges = new ITextArea();
+                JTextField textConges = new JTextField();
                 cPanel.gridx++;
                 cPanel.weightx = 1;
-                cPanel.gridwidth = GridBagConstraints.REMAINDER;
+                cPanel.gridwidth = 5;
                 panelTotal.add(textConges, cPanel);
                 addView(textConges, "DETAILS_CONGES");
 ,7 → 339,7
                 panelTotal.add(labelBrut, cPanel);
                 JTextField textSalBrut = new JTextField(10);
                 cPanel.gridx++;
-                cPanel.weightx = 0;
+                cPanel.weightx = 1;
                 panelTotal.add(textSalBrut, cPanel);
                 textSalBrut.setEditable(false);
                 textSalBrut.setEnabled(false);
 ,10 → 346,12
                 // acompte
                 cPanel.gridx++;
+                cPanel.weightx = 0;
                 JLabel labelAcompte = new JLabel(getLabelFor("ACOMPTE"));
                 panelTotal.add(labelAcompte, cPanel);
                 JTextField textAcompte = new JTextField(10);
                 cPanel.gridx++;
+                cPanel.weightx = 1;
                 panelTotal.add(textAcompte, cPanel);
                 // textAcompte.setEditable(false);
                 // textAcompte.setEnabled(false);
 ,19 → 358,23
                 // Conges Acquis
                 cPanel.gridx++;
+                cPanel.weightx = 0;
                 JLabel labelCongesAcquis = new JLabel(getLabelFor("CONGES_ACQUIS"));
                 panelTotal.add(labelCongesAcquis, cPanel);
                 JTextField textCongesAcquis = new JTextField(10);
                 cPanel.gridx++;
+                cPanel.weightx = 1;
                 panelTotal.add(textCongesAcquis, cPanel);
                 // cotisation salariale
                 cPanel.gridx = 0;
                 cPanel.gridy++;
+                cPanel.weightx = 0;
                 JLabel labelCotSal = new JLabel(getLabelFor("COT_SAL"));
                 panelTotal.add(labelCotSal, cPanel);
                 JTextField textCotSal = new JTextField(10);
                 cPanel.gridx++;
+                cPanel.weightx = 1;
                 panelTotal.add(textCotSal, cPanel);
                 textCotSal.setEditable(false);
                 textCotSal.setEnabled(false);
 ,10 → 381,12
                 // cotisation patronale
                 cPanel.gridx++;
+                cPanel.weightx = 0;
                 JLabel labelCotPat = new JLabel(getLabelFor("COT_PAT"));
                 panelTotal.add(labelCotPat, cPanel);
                 JTextField textCotPat = new JTextField(10);
                 cPanel.gridx++;
+                cPanel.weightx = 1;
                 panelTotal.add(textCotPat, cPanel);
                 textCotPat.setEditable(false);
                 textCotPat.setEnabled(false);
 ,9 → 393,11
                 JLabel labelCSG = new JLabel(getLabelFor("CSG"));
                 cPanel.gridx++;
+                cPanel.weightx = 0;
                 panelTotal.add(labelCSG, cPanel);
                 JTextField textCSG = new JTextField(10);
                 cPanel.gridx++;
+                cPanel.weightx = 1;
                 panelTotal.add(textCSG, cPanel);
                 textCSG.setEditable(false);
                 textCSG.setEnabled(false);
 ,28 → 405,34
                 // net imposable
                 cPanel.gridx = 0;
                 cPanel.gridy++;
+                cPanel.weightx = 0;
                 JLabel labelNetImp = new JLabel(getLabelFor("NET_IMP"));
                 panelTotal.add(labelNetImp, cPanel);
                 JTextField textNetImp = new JTextField(10);
                 cPanel.gridx++;
+                cPanel.weightx = 1;
                 panelTotal.add(textNetImp, cPanel);
                 textNetImp.setEditable(false);
                 textNetImp.setEnabled(false);
                 cPanel.gridx++;
+                cPanel.weightx = 0;
                 JLabel labelNetAPayer = new JLabel(getLabelFor("NET_A_PAYER"));
                 panelTotal.add(labelNetAPayer, cPanel);
                 JTextField textNetAPayer = new JTextField(10);
                 cPanel.gridx++;
+                cPanel.weightx = 1;
                 panelTotal.add(textNetAPayer, cPanel);
                 textNetAPayer.setEditable(false);
                 textNetAPayer.setEnabled(false);
                 cPanel.gridx++;
+                cPanel.weightx = 0;
                 JLabel labelCice = new JLabel(getLabelFor("CICE"));
                 panelTotal.add(labelCice, cPanel);
                 JTextField textCice = new JTextField(10);
                 cPanel.gridx++;
+                cPanel.weightx = 1;
                 panelTotal.add(textCice, cPanel);
                 textCice.setEditable(false);
                 textCice.setEnabled(false);
 ,18 → 448,6
                 // Cumuls
-                c.gridx = 1;
-                c.gridy++;
-                c.gridwidth = 1;
-                c.fill = GridBagConstraints.NONE;
-                this.buttonValider = new JButton("Valider");
-                // panelRight.add(buttonValider, c);
-                c.gridx++;
-                c.gridwidth = 1;
-                this.buttonGenCompta = new JButton("Generer la comptabilité");
-                // panelRight.add(buttonGenCompta, c);
                 GridBagConstraints cGlobal = new DefaultGridBagConstraints();
                 cGlobal.gridx = 0;
                 cGlobal.gridy = 0;
 ,32 → 458,6
                 cGlobal.weighty = 1;
                 this.add(new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, this.paneTreeLeft, panelRight), cGlobal);
-                // Listeners
-                this.buttonGenCompta.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        try {
-                            int[] i = new int[1];
-                            i[0] = getSelectedID();
-                            SQLRow rowMois = getTable().getBase().getTable("MOIS").getRow(selMois.getSelectedId());
-                            new GenerationMvtFichePaye(i, rowMois.getString("NOM"), textAnnee.getText());
-                        } catch (Exception ex) {
-                            ExceptionHandler.handle("Erreur de génération des mouvements", ex);
-                        }
-                    }
-                });
-                this.buttonValider.addActionListener(new ActionListener() {
-                    public void actionPerformed(ActionEvent e) {
-                        try {
-                            validationFiche();
-                        } catch (SQLException e1) {
-                            ExceptionHandler.handle("Error while updating pay slip", e1);
-                        }
-                    }
-                });
                 buttonUp.addActionListener(new ActionListener() {
                     public void actionPerformed(ActionEvent e) {
 ,7 → 557,6
                                     cal.set(Calendar.DAY_OF_MONTH, 1);
                                     cal.set(Calendar.MONTH, selMois.getSelectedId() - 2);
-                                    System.err.println("Du " + cal.getTime());
                                     dateDu.setValue(cal.getTime());
                                 }
                                 fireValidChange();
 ,7 → 582,6
                                     cal.set(Calendar.DAY_OF_MONTH, 1);
                                     cal.set(Calendar.MONTH, selMois.getSelectedId() - 2);
                                     cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
-                                    System.err.println("Au " + cal.getTime());
                                     dateAu.setValue(cal.getTime());
                                 }
                                 fireValidChange();
 ,7 → 670,6
                     this.selSalCombo.setVisible(((Boolean) r.getObject("VALIDE")).booleanValue());
                     this.paneTreeLeft.setVisible(!((Boolean) r.getObject("VALIDE")).booleanValue());
-                    this.buttonValider.setVisible(!((Boolean) r.getObject("VALIDE")).booleanValue());
                     setpDateEnabled(!((Boolean) r.getObject("VALIDE")).booleanValue());
                 }
                 this.selSalCombo.setInteractionMode(InteractionMode.DISABLED);
 ,30 → 679,16
             }
             private void setpDateEnabled(boolean b) {
-                // System.err.println("Set date enable --> " + b);
                 this.selMois.setInteractionMode((b) ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
-                // this.selMois.setEnabled(b);
                 this.textAnnee.setEditable(b);
                 this.textAnnee.setEnabled(b);
                 this.dateDu.setInteractionMode((b) ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
                 this.dateAu.setInteractionMode((b) ? InteractionMode.READ_WRITE : InteractionMode.DISABLED);
             }
-            private void validationFiche() throws SQLException {
-                this.update();
-                FichePayeSQLElement.validationFiche(this.getSelectedID());
-            }
             protected SQLRowValues createDefaults() {
-                System.err.println("**********Set Defaults on FichePaye.date");
-                SQLRowValues rowVals = new SQLRowValues(getTable());
-                Calendar cal = Calendar.getInstance();
+                final SQLRowValues rowVals = new SQLRowValues(getTable());
+                final Calendar cal = Calendar.getInstance();
                 rowVals.put("ID_MOIS", cal.get(Calendar.MONTH) + 2);
                 rowVals.put("ANNEE", cal.get(Calendar.YEAR));
 ,7 → 714,6
                 if (JOptionPane.showConfirmDialog(null, "Soustraire les cumuls de cette fiche à celle en cours?", "Suppression d'une fiche de paye",
                         JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
                     // on effectue le cumul
-                    // System.err.println("Calcul des cumuls");
                     SQLRow rowSal = row.getForeignRow("ID_SALARIE");
 ,13 → 819,8
         // creer et associer une nouvelle fiche au salarie
         final SQLRowValues rowValsNewFiche = new SQLRowValues(tableFiche);
-        try {
-            SQLRow r = rowValsNewFiche.insert();
-            rowValsNewFiche.put("ID", r.getID());
-            // System.err.println("rowValsNewFiche -----> " + r.getID());
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
+        SQLRow r = rowValsNewFiche.insert();
+        rowValsNewFiche.put("ID", r.getID());
         // mis a jour de la periode
         int mois = rowFiche.getInt("ID_MOIS");
 ,22 → 834,6
         calDu.set(Calendar.DAY_OF_MONTH, calDu.getActualMaximum(Calendar.DAY_OF_MONTH));
         rowValsNewFiche.put("AU", calDu.getTime());
         rowValsNewFiche.put("ID_PROFIL_PAYE", rowFiche.getInt("ID_PROFIL_PAYE"));
-        /*
-         * int ancMois = rowFiche.getInt("ID_MOIS"); int ancAnnee = rowFiche.getInt("ANNEE");
-         *
-         * rowValsSal.put("DERNIER_MOIS", ancMois); rowValsSal.put("DERNIERE_ANNEE", ancAnnee);
-         *
-         * try { rowValsSal.update(rowFiche.getInt("ID_SALARIE")); } catch (SQLException e1) {
-         * e1.printStackTrace(); }
-         *
-         * int mois = ancMois - 2; mois = (mois + 1) % 12; mois += 2; int annee = ancAnnee; if (mois
-         * == 2) { annee++; } rowValsNewFiche.put("ID_MOIS", mois); rowValsNewFiche.put("ANNEE",
-         * annee); rowValsNewFiche.put("ID_PROFIL_PAYE", rowFiche.getInt("ID_PROFIL_PAYE"));
-         *
-         * try { rowValsNewFiche.update(); } catch (SQLException e) { e.printStackTrace(); }
-         */
         rowValsNewFiche.put("ID_SALARIE", rowSal.getID());
         rowValsSal.put("ID_FICHE_PAYE", rowValsNewFiche.getID());
 ,7 → 872,6
         }
         // on effectue le cumul
-        // System.err.println("Calcul des cumuls");
         final SQLRow rowVarSal = tableVariableSal.getRow(rowSal.getInt("ID_VARIABLE_SALARIE"));
         int idCumuls = rowSal.getInt("ID_CUMULS_PAYE");
         SQLRow rowCumuls = tableCumuls.getRow(idCumuls);
 ,10 → 884,9
         float netAPayer = rowCumuls.getFloat("NET_A_PAYER_C") + rowFiche.getFloat("NET_A_PAYER") + rowFiche.getFloat("ACOMPTE");
         rowValsCumul.put("NET_A_PAYER_C", new Float(netAPayer));
-        SQLRow r = rowValsCumul.insert();
-        rowValsCumul.put("ID", r.getID());
+        SQLRow row = rowValsCumul.insert();
+        rowValsCumul.put("ID", row.getID());
-        // System.err.println("Mis a jour de la fiche de paye");
         rowValsSal.put("ID_CUMULS_PAYE", rowValsCumul.getID());
         SwingUtilities.invokeLater(new Runnable() {
 ,13 → 1005,7
                 e1.printStackTrace();
             }
         }
-        /*
-         * int mois = ancMois - 2; mois = (mois + 1) % 12; mois += 2; int annee = ancAnnee; if (mois
-         * == 2) { annee++; } rowValsNewFiche.put("ID_MOIS", mois); rowValsNewFiche.put("ANNEE",
-         * annee); rowValsNewFiche.put("ID_PROFIL_PAYE", rowFiche.getInt("ID_PROFIL_PAYE"));
-         *
-         * try { rowValsNewFiche.update(); } catch (SQLException e) { e.printStackTrace(); }
-         */
     }
     // stocke les éléments validés (cumuls congés, paye, ...)
 ,7 → 1039,6
     private static void validElements(int id) {
         SQLBase base = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete();
-        System.err.println("Validation des éléments de la fiche.");
         String trueString = "1";
         if (Configuration.getInstance().getBase().getServer().getSQLSystem() == SQLSystem.POSTGRESQL) {
             trueString = "true";
 ,7 → 1047,6
         base.getDataSource().execute(req);
-        System.err.println("Validation terminée.");
     }
     private static boolean checkDateValid(int idFiche) {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/report/FichePayeSheetXML.java
 ,13 → 46,16
     final Map<Integer, String> cotisationSimplifieeLink = new HashMap<>();
     public FichePayeSheetXML(final SQLRow row) {
+        this(row, !new SQLPreferences(row.getTable().getDBRoot()).getBoolean(PayeGlobalPreferencePanel.NOT_PAYE_SIMPL, Boolean.FALSE));
+    }
+    public FichePayeSheetXML(final SQLRow row, boolean simplifie) {
         super(row);
         this.printer = PrinterNXProps.getInstance().getStringProperty("FichePayePrinter");
         this.elt = Configuration.getInstance().getDirectory().getElement("FICHE_PAYE");
-        SQLPreferences prefs = new SQLPreferences(elt.getTable().getDBRoot());
-        boolean prefBulletinSimpl = !prefs.getBoolean(PayeGlobalPreferencePanel.NOT_PAYE_SIMPL, Boolean.FALSE);
-        if (prefBulletinSimpl) {
+        if (simplifie) {
             SQLSelect sel = new SQLSelect();
             sel.addSelect(row.getTable().getDBRoot().findTable("RUBRIQUE_COTISATION").getField("LIGNE_PAYE_SIMPLIFIEE"));
             sel.addSelect(row.getTable().getDBRoot().findTable("RUBRIQUE_COTISATION").getKey());

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/report/LivrePayeSheet.java
 ,6 → 21,7
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
+import org.openconcerto.utils.StringUtils;
 import java.text.DateFormat;
 import java.util.Date;
 ,75 → 157,88
             mapSal.put(new Integer(idSal), "");
-            if (rowFicheElt.getString("SOURCE").equalsIgnoreCase("RUBRIQUE_BRUT")) {
+            float montantTestTotal = 0;
+            if (rowFicheElt.getObject("MONTANT_SAL_AJ") != null) {
+                montantTestTotal += rowFicheElt.getFloat("MONTANT_SAL_AJ");
+            }
+            if (rowFicheElt.getObject("MONTANT_SAL_DED") != null) {
+                montantTestTotal -= rowFicheElt.getFloat("MONTANT_SAL_DED");
+            }
-                mapRubriqueBrut.put(new Integer(rowFicheElt.getInt("IDSOURCE")), "");
-                mapTotal = mapTotalbrut;
-                if (mapSalarieBrut.get(new Integer(idSal)) == null) {
-                    mapSalarieBrut.put(new Integer(idSal), mapValue);
-                } else {
-                    mapValue = (Map) mapSalarieBrut.get(new Integer(idSal));
-                }
-            } else {
-                if (rowFicheElt.getString("SOURCE").equalsIgnoreCase("RUBRIQUE_COTISATION")) {
-                    mapRubriqueCot.put(new Integer(rowFicheElt.getInt("IDSOURCE")), "");
-                    mapTotal = mapTotalCot;
-                    if (mapSalarieCot.get(new Integer(idSal)) == null) {
-                        mapSalarieCot.put(new Integer(idSal), mapValue);
+            if (rowFicheElt.getObject("MONTANT_PAT") != null) {
+                montantTestTotal += rowFicheElt.getFloat("MONTANT_PAT");
+            }
+            if (montantTestTotal != 0) {
+                if (rowFicheElt.getString("SOURCE").equalsIgnoreCase("RUBRIQUE_BRUT")) {
+                    mapRubriqueBrut.put(new Integer(rowFicheElt.getInt("IDSOURCE")), "");
+                    mapTotal = mapTotalbrut;
+                    if (mapSalarieBrut.get(new Integer(idSal)) == null) {
+                        mapSalarieBrut.put(new Integer(idSal), mapValue);
                     } else {
-                        mapValue = (Map) mapSalarieCot.get(new Integer(idSal));
+                        mapValue = (Map) mapSalarieBrut.get(new Integer(idSal));
                     }
                 } else {
-                    if (rowFicheElt.getString("SOURCE").equalsIgnoreCase("RUBRIQUE_NET")) {
-                        mapRubriqueNet.put(new Integer(rowFicheElt.getInt("IDSOURCE")), "");
-                        mapTotal = mapTotalNet;
-                        if (mapSalarieNet.get(new Integer(idSal)) == null) {
-                            mapSalarieNet.put(new Integer(idSal), mapValue);
+                    if (rowFicheElt.getString("SOURCE").equalsIgnoreCase("RUBRIQUE_COTISATION")) {
+                        mapRubriqueCot.put(new Integer(rowFicheElt.getInt("IDSOURCE")), "");
+                        mapTotal = mapTotalCot;
+                        if (mapSalarieCot.get(new Integer(idSal)) == null) {
+                            mapSalarieCot.put(new Integer(idSal), mapValue);
                         } else {
-                            mapValue = (Map) mapSalarieNet.get(new Integer(idSal));
+                            mapValue = (Map) mapSalarieCot.get(new Integer(idSal));
                         }
+                    } else {
+                        if (rowFicheElt.getString("SOURCE").equalsIgnoreCase("RUBRIQUE_NET")) {
+                            mapRubriqueNet.put(new Integer(rowFicheElt.getInt("IDSOURCE")), "");
+                            mapTotal = mapTotalNet;
+                            if (mapSalarieNet.get(new Integer(idSal)) == null) {
+                                mapSalarieNet.put(new Integer(idSal), mapValue);
+                            } else {
+                                mapValue = (Map) mapSalarieNet.get(new Integer(idSal));
+                            }
+                        }
                     }
                 }
-            }
-            if (rowFicheElt.getObject("MONTANT_SAL_AJ") != null) {
-                Object o = mapValue.get(new Integer(rowFicheElt.getInt("IDSOURCE")));
-                Object oTot = mapTotal.get(new Integer(rowFicheElt.getInt("IDSOURCE")));
+                if (rowFicheElt.getObject("MONTANT_SAL_AJ") != null) {
+                    Object o = mapValue.get(new Integer(rowFicheElt.getInt("IDSOURCE")));
+                    Object oTot = mapTotal.get(new Integer(rowFicheElt.getInt("IDSOURCE")));
-                float montant = (o == null) ? 0.0F : ((Float) o).floatValue();
-                float montantTotal = (oTot == null) ? 0.0F : ((Float) oTot).floatValue();
-                montant += rowFicheElt.getFloat("MONTANT_SAL_AJ");
-                montantTotal += rowFicheElt.getFloat("MONTANT_SAL_AJ");
+                    float montant = (o == null) ? 0.0F : ((Float) o).floatValue();
+                    float montantTotal = (oTot == null) ? 0.0F : ((Float) oTot).floatValue();
+                    montant += rowFicheElt.getFloat("MONTANT_SAL_AJ");
+                    montantTotal += rowFicheElt.getFloat("MONTANT_SAL_AJ");
-                mapValue.put(new Integer(rowFicheElt.getInt("IDSOURCE")), new Float(montant));
-                mapTotal.put(new Integer(rowFicheElt.getInt("IDSOURCE")), new Float(montantTotal));
-            }
-            if (rowFicheElt.getObject("MONTANT_SAL_DED") != null) {
-                Object o = mapValue.get(new Integer(rowFicheElt.getInt("IDSOURCE")));
-                Object oTot = mapTotal.get(new Integer(rowFicheElt.getInt("IDSOURCE")));
+                    mapValue.put(new Integer(rowFicheElt.getInt("IDSOURCE")), new Float(montant));
+                    mapTotal.put(new Integer(rowFicheElt.getInt("IDSOURCE")), new Float(montantTotal));
+                }
+                if (rowFicheElt.getObject("MONTANT_SAL_DED") != null) {
+                    Object o = mapValue.get(new Integer(rowFicheElt.getInt("IDSOURCE")));
+                    Object oTot = mapTotal.get(new Integer(rowFicheElt.getInt("IDSOURCE")));
-                float montant = (o == null) ? 0.0F : ((Float) o).floatValue();
-                float montantTot = (oTot == null) ? 0.0F : ((Float) oTot).floatValue();
-                montant -= rowFicheElt.getFloat("MONTANT_SAL_DED");
-                montantTot -= rowFicheElt.getFloat("MONTANT_SAL_DED");
+                    float montant = (o == null) ? 0.0F : ((Float) o).floatValue();
+                    float montantTot = (oTot == null) ? 0.0F : ((Float) oTot).floatValue();
+                    montant -= rowFicheElt.getFloat("MONTANT_SAL_DED");
+                    montantTot -= rowFicheElt.getFloat("MONTANT_SAL_DED");
-                mapValue.put(new Integer(rowFicheElt.getInt("IDSOURCE")), new Float(montant));
-                mapTotal.put(new Integer(rowFicheElt.getInt("IDSOURCE")), new Float(montantTot));
-            }
+                    mapValue.put(new Integer(rowFicheElt.getInt("IDSOURCE")), new Float(montant));
+                    mapTotal.put(new Integer(rowFicheElt.getInt("IDSOURCE")), new Float(montantTot));
+                }
-            if (rowFicheElt.getObject("MONTANT_PAT") != null) {
-                Object o = mapValue.get(new Integer(rowFicheElt.getInt("IDSOURCE")) + "_PAT");
-                Object oTot = mapTotal.get(new Integer(rowFicheElt.getInt("IDSOURCE")) + "_PAT");
+                if (rowFicheElt.getObject("MONTANT_PAT") != null) {
+                    Object o = mapValue.get(new Integer(rowFicheElt.getInt("IDSOURCE")) + "_PAT");
+                    Object oTot = mapTotal.get(new Integer(rowFicheElt.getInt("IDSOURCE")) + "_PAT");
-                float montant = (o == null) ? 0.0F : ((Float) o).floatValue();
-                float montantTotal = (oTot == null) ? 0.0F : ((Float) oTot).floatValue();
-                montant += rowFicheElt.getFloat("MONTANT_PAT");
-                montantTotal += rowFicheElt.getFloat("MONTANT_PAT");
+                    float montant = (o == null) ? 0.0F : ((Float) o).floatValue();
+                    float montantTotal = (oTot == null) ? 0.0F : ((Float) oTot).floatValue();
+                    montant += rowFicheElt.getFloat("MONTANT_PAT");
+                    montantTotal += rowFicheElt.getFloat("MONTANT_PAT");
-                mapValue.put(new Integer(rowFicheElt.getInt("IDSOURCE")) + "_PAT", new Float(montant));
-                mapTotal.put(new Integer(rowFicheElt.getInt("IDSOURCE")) + "_PAT", new Float(montantTotal));
+                    mapValue.put(new Integer(rowFicheElt.getInt("IDSOURCE")) + "_PAT", new Float(montant));
+                    mapTotal.put(new Integer(rowFicheElt.getInt("IDSOURCE")) + "_PAT", new Float(montantTotal));
+                }
             }
         }
         // Dump
 ,7 → 301,7
                 int idRub = ((Number) mapRubriqueBrut.keySet().toArray()[i]).intValue();
                 SQLRow rowRub = tableRubBrut.getRow(idRub);
-                this.mCell.put("A" + posLine, rowRub.getObject("NOM"));
+                this.mCell.put("A" + posLine, StringUtils.limitLength(rowRub.getString("NOM"), 55));
                 this.mCell.put("B" + posLine, fillLine(mapSalarieBrut, idRub, mapSal, numFirstSal, mapTotalbrut, false));
                 this.mCell.put("C" + posLine, fillLine(mapSalarieBrut, idRub, mapSal, numFirstSal, mapTotalbrut, true));
 ,7 → 317,7
                 int idRub = ((Number) mapRubriqueCot.keySet().toArray()[i]).intValue();
                 SQLRow rowRub = tableRubCot.getRow(idRub);
-                this.mCell.put("A" + posLine, rowRub.getObject("NOM"));
+                this.mCell.put("A" + posLine, StringUtils.limitLength(rowRub.getString("NOM"), 55));
                 this.mCell.put("B" + posLine, fillLine(mapSalarieCot, idRub, mapSal, numFirstSal, mapTotalCot, false));
                 this.mCell.put("C" + posLine, fillLine(mapSalarieCot, idRub, mapSal, numFirstSal, mapTotalCot, true));
 ,7 → 334,7
                 int idRub = ((Number) mapRubriqueNet.keySet().toArray()[i]).intValue();
                 SQLRow rowRub = tableRubNet.getRow(idRub);
-                this.mCell.put("A" + posLine, rowRub.getObject("NOM"));
+                this.mCell.put("A" + posLine, StringUtils.limitLength(rowRub.getString("NOM"), 55));
                 this.mCell.put("B" + posLine, fillLine(mapSalarieNet, idRub, mapSal, numFirstSal, mapTotalNet, false));
                 this.mCell.put("C" + posLine, fillLine(mapSalarieNet, idRub, mapSal, numFirstSal, mapTotalNet, true));

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/CaisseMenuPanel.java
 ,7 → 159,7
                     @Override
                     public void actionPerformed(ActionEvent e) {
                         try {
-                            final boolean quit = caisseFrame.getDB().fetchRegisterState().checkIfMoved();
+                            final boolean quit = caisseFrame.getDB().fetchRegisterState().checkIfMoved(caisseFrame.getConf().getERP_TM());
                             if (!quit) {
                                 frame.getControler().setLCD("Cloture", "En cours...", 0);
                                 final int userID = caisseFrame.getPOSConf().getUserID();

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/PaiementPanel.java
 ,11 → 47,13
      */
     private char mode = ' ';
     private boolean init = true;
+    private CaissePanel caissePanel;
-    public PaiementPanel(CaisseControler controller) {
-        this.controller = controller;
+    public PaiementPanel(CaissePanel caissePanel) {
+        this.controller = caissePanel.getControler();
         this.controller.addCaisseListener(this);
         this.controller.addBarcodeListener(this);
+        this.caissePanel = caissePanel;
         this.setOpaque(false);
         this.addMouseListener(this);
 ,7 → 558,7
     @Override
     public void keyReceived(KeyEvent e) {
-        if (e.getID() == KeyEvent.KEY_TYPED) {
+        if (!this.caissePanel.isModeSearch() && e.getID() == KeyEvent.KEY_TYPED) {
             System.out.println("PaiementPanel.keyPressed()" + e.getKeyChar());
             handleCharacter(e.getKeyChar());
         }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/CaisseFrame.java
 ,6 → 134,7
             }
             final ComptaPropsConfiguration conf = posConf.createConnexion();
+            final TM erpTM = conf.getERP_TM();
             final int userID = posConf.getUserID();
             final int posID = posConf.getPosID();
 ,13 → 144,13
             final SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(new SQLRowValues(registerDB.getRegisterTable()));
             if (fetcher.fetchOne(posID) == null) {
                 SwingUtilities.invokeLater(() -> {
-                    JOptionPane.showMessageDialog(null, TM.tr("register.missing", posID), TM.tr("register.missing.title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null, erpTM.translate("register.missing", posID), erpTM.translate("register.missing.title"), JOptionPane.ERROR_MESSAGE);
                 });
                 posConf.closeConnexion();
                 return;
             }
             // check before changing any state
-            final boolean quit = registerDB.fetchRegisterState().checkIfMoved();
+            final boolean quit = registerDB.fetchRegisterState().checkIfMoved(erpTM);
             if (quit) {
                 quit(posConf);
                 return;
 ,17 → 170,17
                 final String generalMsg;
                 boolean onlyOptionPane = false;
                 if (re instanceof OutsideMeddlingException) {
-                    generalMsg = TM.tr("register.notReconciled.outsideMeddling") + '\n';
+                    generalMsg = erpTM.translate("register.notReconciled.outsideMeddling") + '\n';
                     onlyOptionPane = true;
                 } else if (re instanceof ResumeException) {
-                    generalMsg = TM.tr("register.notReconciled.resumeFailed") + '\n';
+                    generalMsg = erpTM.translate("register.notReconciled.resumeFailed") + '\n';
                 } else {
                     generalMsg = "";
                 }
-                final String message = TM.getTM().trM("register.notReconciled." + re.getTranslationKey(), "localDate", re.getLocalState().copyDate(), "remoteDate", re.getRemoteState().copyDate());
+                final String message = erpTM.trM("register.notReconciled." + re.getTranslationKey(), "localDate", re.getLocalState().copyDate(), "remoteDate", re.getRemoteState().copyDate());
                 if (onlyOptionPane) {
                     SwingUtilities.invokeLater(() -> {
-                        JOptionPane.showMessageDialog(null, generalMsg + message, TM.tr("register.notReconciled.title"), JOptionPane.ERROR_MESSAGE);
+                        JOptionPane.showMessageDialog(null, generalMsg + message, erpTM.translate("register.notReconciled.title"), JOptionPane.ERROR_MESSAGE);
                     });
                 } else {
                     ExceptionHandler.handle(generalMsg + message, re);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/ui/CaissePanel.java
 ,7 → 105,7
         // Column 3
         c.gridx++;
         c.weightx = 0;
-        this.add(new PaiementPanel(this.controler), c);
+        this.add(new PaiementPanel(this), c);
         this.controler.addCaisseListener(this);
     }
 ,6 → 433,10
     }
+    public boolean isModeSearch() {
+        return this.selector == this.articleSearchPanel;
+    }
     public CaisseControler getControler() {
         return this.controler;
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/model/RegisterFiles.java
 ,6 → 48,7
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.logging.Level;
 ,10 → 365,14
     public final RegisterLog open(final int userID, final DBState dbState) throws IOException {
         if (!this.hasLock.get())
             throw new IllegalStateException("Not locked");
+        Objects.requireNonNull(dbState, "Missing DBState");
+        // pass null RegisterDB since the DB is already open
         return createOpen(userID, null, dbState).transformChecked(this);
     }
     public final RegisterLog open(final int userID, final RegisterDB registerDB) throws IOException {
+        Objects.requireNonNull(registerDB, "Missing RegisterDB");
+        // pass null DBState to ask for the opening
         return this.doWithLock(createOpen(userID, registerDB, null));
     }
 ,7 → 382,6
             @Override
             public RegisterLog transformChecked(RegisterFiles input) throws IOException {
                 POSConfiguration.getLogger().log(Level.FINE, "Begin opening of FS state for register {0}", input.getPosID());
-                POSConfiguration.checkRegisterID(input.getPosID(), registerDB.getPosID());
                 final RegisterLog lastLog = input.checkStatus(true);
                 final String lastLocalHash;
                 final Date prevDate;
 ,6 → 402,7
                 final DBState dbState;
                 if (passedDBState == null) {
                     try {
+                        POSConfiguration.checkRegisterID(input.getPosID(), registerDB.getPosID());
                         dbState = registerDB.open(lastLocalHash, userID);
                     } catch (SQLException e) {
                         throw new IOException("Couldn't open the register in the DB", e);
 ,7 → 449,7
                     }
                 }
-                POSConfiguration.getLogger().log(Level.INFO, "Finished opening of FS state for register {0}", registerDB);
+                POSConfiguration.getLogger().log(Level.INFO, "Finished opening of FS state for register {0}", input.getPosID());
                 // TODO parse and validate before moving into place
                 try {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/model/DBState.java
 ,11 → 144,12
      * Check if the register installation has moved and ask the user about it if it did. This can be
      * called from outside the EDT.
      *
+     * @param erpTM UI locale
      * @return <code>true</code> if the user wants to quit.
      * @throws InterruptedException if this thread was interrupted while waiting on the EDT.
      * @throws ExecutionException if there was an error while asking the user.
      */
-    public final boolean checkIfMoved() throws InterruptedException, ExecutionException {
+    public final boolean checkIfMoved(final TM erpTM) throws InterruptedException, ExecutionException {
         final SQLRowValues lastEntry = this.getLastEntry();
         if (lastEntry == null) {
             return false;
 ,13 → 160,14
         if (dbValues.equals(currentValues) || NULL_VALUES.equals(dbValues)) {
             return false;
         } else {
-            final String message = TM.tr("register.moved", getPosID());
-            final String[] options = new String[] { TM.tr("register.moved.ignore"), TM.tr("register.moved.quit") };
+            final String message = erpTM.translate("register.moved", getPosID());
+            final String[] options = new String[] { erpTM.translate("register.moved.ignore"), erpTM.translate("register.moved.quit") };
             final FutureTask<Boolean> askUserCallable = new FutureTask<>(new Callable<Boolean>() {
                 @Override
                 public Boolean call() throws Exception {
                     // quit by default
-                    final int ans = JOptionPane.showOptionDialog(null, message, TM.tr("register.moved.title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
+                    final int ans = JOptionPane.showOptionDialog(null, message, erpTM.translate("register.moved.title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, options,
+                            options[1]);
                     // CLOSED_OPTION also means quit, only clicking "ignore" means don't quit
                     return ans != 0;
                 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/pos/POSConfiguration.java
 ,7 → 74,6
 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;
 ,8 → 247,8
     public ComptaPropsConfiguration createConnexion() {
         final ComptaPropsConfiguration conf = ComptaPropsConfiguration.create();
-        TranslationManager.getInstance().addTranslationStreamFromClass(MainFrame.class);
-        TranslationManager.getInstance().setLocale(Locale.getDefault());
+        TranslationManager.addTranslationStreamFromClass(MainFrame.class);
+        TranslationManager.createDefaultInstance();
         Configuration.setInstance(conf);
         try {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/shipment/action/ListeDesBonsDeLivraisonAction.java
 ,7 → 21,6
 import org.openconcerto.erp.core.sales.shipment.element.BonDeLivraisonSQLElement;
 import org.openconcerto.erp.core.sales.shipment.report.BonLivraisonXmlSheet;
 import org.openconcerto.erp.model.MouseSheetXmlListeListener;
-import org.openconcerto.erp.utils.TM;
 import org.openconcerto.sql.model.FieldPath;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLInjector;
 ,9 → 73,9
         // Tabs
         final JTabbedPane tabs = new JTabbedPane();
-        tabs.addTab(TM.tr("sales.shipment.allShipments"), createAllDeliveryPanel(toInvoiceAction));
-        tabs.addTab(TM.tr("sales.shipment.nonInvoicedShipments"), createDeliveryWithoutInvoicePanel(toInvoiceAction));
-        tabs.addTab(TM.tr("sales.shipment.invoicedShipments"), createDeliveryWithInvoicePanel());
+        tabs.addTab(getConf().getERP_TM().translate("sales.shipment.allShipments"), createAllDeliveryPanel(toInvoiceAction));
+        tabs.addTab(getConf().getERP_TM().translate("sales.shipment.nonInvoicedShipments"), createDeliveryWithoutInvoicePanel(toInvoiceAction));
+        tabs.addTab(getConf().getERP_TM().translate("sales.shipment.invoicedShipments"), createDeliveryWithInvoicePanel());
         frame.setContentPane(tabs);
         return frame;
 ,7 → 86,7
         final List<SQLField> fields = new ArrayList<SQLField>(2);
         fields.add(eltCmd.getTable().getField("TOTAL_HT"));
-        final IListTotalPanel totalPanel = new IListTotalPanel(panel.getListe(), fields, TM.tr("sales.shipment.listTotal"));
+        final IListTotalPanel totalPanel = new IListTotalPanel(panel.getListe(), fields, getConf().getERP_TM().translate("sales.shipment.listTotal"));
         final GridBagConstraints c = new DefaultGridBagConstraints();
         c.gridwidth = GridBagConstraints.REMAINDER;

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/shipment/ui/BonDeLivraisonItemTable.java
 ,6 → 27,7
 import org.openconcerto.erp.core.sales.pos.io.BarcodeReader;
 import org.openconcerto.erp.core.sales.pos.ui.BarcodeListener;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
+import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
 import org.openconcerto.erp.core.sales.product.ui.ArticleRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.CurrencyWithSymbolRenderer;
 import org.openconcerto.erp.core.sales.product.ui.DeliveredQtyRowValuesRenderer;
 ,6 → 34,7
 import org.openconcerto.erp.core.sales.product.ui.QteUnitRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QtyToDeliverRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.ReliquatRowValuesTable;
+import org.openconcerto.erp.core.supplychain.stock.element.StockSQLElement;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 ,6 → 53,8
 import org.openconcerto.sql.sqlobject.ITextWithCompletion;
 import org.openconcerto.sql.users.rights.UserRights;
 import org.openconcerto.sql.users.rights.UserRightsManager;
+import org.openconcerto.sql.view.EditFrame;
+import org.openconcerto.sql.view.EditPanel.EditMode;
 import org.openconcerto.sql.view.list.AutoCompletionManager;
 import org.openconcerto.sql.view.list.CellDynamicModifier;
 import org.openconcerto.sql.view.list.RowValuesTable;
 ,6 → 70,7
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.awt.event.KeyEvent;
 ,7 → 80,9
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Vector;
 import javax.swing.AbstractAction;
 ,12 → 112,20
         this.reliquatTable = reliquatTable;
     }
+    public static Map<String, Boolean> customVisibilityMap = new HashMap<String, Boolean>();
     @Override
+    protected Map<String, Boolean> getCustomVisibilityMap() {
+        return customVisibilityMap;
+    }
+    @Override
     protected void init() {
         final SQLElement e = getSQLElement();
         SQLPreferences prefs = new SQLPreferences(getSQLElement().getTable().getDBRoot());
         final boolean selectArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.USE_CREATED_ARTICLE, false);
+        final boolean activeCalculM2 = prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVE_CALCUL_M2, false);
         final boolean createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
         final boolean filterFamilleArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.FILTER_BY_FAMILY, false);
         final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
 ,7 → 141,11
         final SQLTableElement tableFamille = new SQLTableElement(e.getTable().getField("ID_FAMILLE_ARTICLE"));
         list.add(tableFamille);
         // Article
+        SQLTableElement tableElementDepot = new SQLTableElement(e.getTable().getField("ID_DEPOT_STOCK"), true, true, true);
+        list.add(tableElementDepot);
+        // Article
         final SQLTableElement tableElementArticle = new SQLTableElement(e.getTable().getField("ID_ARTICLE"), true, true, true) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
 ,6 → 340,29
             list.add(eltUnitDevise);
         }
+        SQLTableElement eltLongueur = new SQLTableElement(e.getTable().getField("LONGUEUR")) {
+            @Override
+            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
+                int idUv = vals.getForeignID("ID_UNITE_VENTE");
+                return idUv == UniteVenteArticleSQLElement.M2;
+            }
+        };
+        list.add(eltLongueur);
+        SQLTableElement eltLargeur = new SQLTableElement(e.getTable().getField("LARGEUR")) {
+            @Override
+            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
+                int idUv = vals.getForeignID("ID_UNITE_VENTE");
+                return idUv == UniteVenteArticleSQLElement.M2;
+            }
+        };
+        list.add(eltLargeur);
+        SQLTableElement eltHauteur = new SQLTableElement(e.getTable().getField("HAUTEUR"));
+        list.add(eltHauteur);
         SQLTableElement qteU = new SQLTableElement(e.getTable().getField("QTE_UNITAIRE"), BigDecimal.class) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
 ,6 → 370,8
                 SQLRowAccessor row = vals.getForeign("ID_UNITE_VENTE");
                 if (row != null && !row.isUndefined() && row.getBoolean("A_LA_PIECE")) {
                     return false;
+                } else if (activeCalculM2 && row != null && !row.isUndefined() && row.getID() == UniteVenteArticleSQLElement.M2) {
+                    return false;
                 } else {
                     return super.isCellEditable(vals, rowIndex, columnIndex);
                 }
 ,7 → 640,7
                         rowVals.put("PV_T_DEVISE", rowVals.getBigDecimal("PRIX_METRIQUE_VT_1").multiply(globalQty));
                     }
                 }
-                super.commitData();
+                super.commitData(true);
             }
         };
         this.setModel(model);
 ,6 → 647,7
         this.table = new RowValuesTable(model, getConfigurationFile());
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
+        this.table.getClearCloneTableElement().add("ID_COMMANDE_CLIENT_ELEMENT");
         if (filterFamilleArticle) {
             ((SQLTextComboTableCellEditor) tableElementArticle.getTableCellEditor(this.table)).setDynamicWhere(e.getTable().getTable("ARTICLE").getField("ID_FAMILLE_ARTICLE"));
 ,6 → 681,9
         completionField.add("PRIX_METRIQUE_VT_3");
         completionField.add("SERVICE");
         completionField.add("ID_FAMILLE_ARTICLE");
+        completionField.add("LONGUEUR");
+        completionField.add("LARGEUR");
+        completionField.add("HAUTEUR");
         if (getSQLElement().getTable().getFieldsName().contains("DESCRIPTIF")) {
             completionField.add("DESCRIPTIF");
         }
 ,7 → 703,7
                 Object res = tarifCompletion(row, field, rowDest, true);
                 if (res == null) {
                     res = super.getValueFrom(row, field, rowDest);
-                }
+                }
                 if (field.equals("POURCENT_REMISE")) {
                     return getRemiseClient(row);
                 }
 ,7 → 795,7
                 Object res = tarifCompletion(row, field, rowDest, true);
                 if (res == null) {
                     res = super.getValueFrom(row, field, rowDest);
-                }
+                }
                 if (field.equals("POURCENT_REMISE")) {
                     return getRemiseClient(row);
                 }
 ,7 → 818,7
                 Object res = tarifCompletion(row, field, rowDest, true);
                 if (res == null) {
                     res = super.getValueFrom(row, field, rowDest);
-                }
+                }
                 if (field.equals("POURCENT_REMISE")) {
                     return getRemiseClient(row);
                 }
 ,6 → 1119,28
             }
         });
+        uniteVente.addModificationListener(qteU);
+        eltLargeur.addModificationListener(qteU);
+        eltLongueur.addModificationListener(qteU);
+        qteU.setModifier(new CellDynamicModifier() {
+            public Object computeValueFrom(SQLRowValues row, SQLTableElement source) {
+                SQLRowAccessor rowUnite = row.getForeign("ID_UNITE_VENTE");
+                if (rowUnite != null && !rowUnite.isUndefined() && rowUnite.getBoolean("A_LA_PIECE")) {
+                    return BigDecimal.ONE;
+                } else if (activeCalculM2 && rowUnite != null && !rowUnite.isUndefined() && rowUnite.getID() == UniteVenteArticleSQLElement.M2) {
+                    BigDecimal longueur = row.getBigDecimal("LONGUEUR");
+                    BigDecimal largeur = row.getBigDecimal("LARGEUR");
+                    if (longueur == null || largeur == null) {
+                        return BigDecimal.ONE;
+                    }
+                    return longueur.multiply(largeur);
+                } else {
+                    return row.getObject("QTE_UNITAIRE");
+                }
+            }
+        });
         // Mode Gestion article avancé
         String valModeAvanceVt = DefaultNXProps.getInstance().getStringProperty("ArticleModeVenteAvance");
         Boolean bModeAvance = Boolean.valueOf(valModeAvanceVt);
 ,6 → 1158,11
             setColumnVisible(model.getColumnForField("T_POIDS_COLIS_NET"), false);
         }
+        // ACtivation calcul m2
+        setColumnVisible(model.getColumnForField("HAUTEUR"), false);
+        setColumnVisible(model.getColumnForField("LARGEUR"), activeCalculM2);
+        setColumnVisible(model.getColumnForField("LONGUEUR"), activeCalculM2);
         setColumnVisible(model.getColumnForField("ID_ARTICLE"), selectArticle);
         setColumnVisible(model.getColumnForField("CODE"), !selectArticle || (selectArticle && createAuto));
         setColumnVisible(model.getColumnForField("NOM"), !selectArticle || (selectArticle && createAuto));
 ,10 → 1183,23
         setColumnVisible(model.getColumnForField("PRIX_METRIQUE_HA_1"), showHAPrice);
         setColumnVisible(model.getColumnForField("MARGE_HT"), showHAPrice);
         setColumnVisible(model.getColumnForField("T_PA_HT"), showHAPrice);
+        setColumnVisible(model.getColumnForField("ID_DEPOT_STOCK"), prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false));
         if (e.getTable().contains("ID_COMMANDE_CLIENT_ELEMENT")) {
             setColumnVisible(model.getColumnForField("ID_COMMANDE_CLIENT_ELEMENT"), false);
         }
+        for (String string : AbstractVenteArticleItemTable.getVisibilityMap().keySet()) {
+            setColumnVisible(model.getColumnForField(string), AbstractVenteArticleItemTable.getVisibilityMap().get(string));
+        }
+        Map<String, Boolean> mapCustom = getCustomVisibilityMap();
+        if (mapCustom != null) {
+            for (String string : mapCustom.keySet()) {
+                setColumnVisible(model.getColumnForField(string), mapCustom.get(string));
+            }
+        }
         // Barcode reader
         final BarcodeReader barcodeReader = ComptaPropsConfiguration.getInstanceCompta().getBarcodeReader();
         if (barcodeReader != null) {
 ,6 → 1247,34
         }
+        if (this.table.getRowValuesTableModel().getColumnForField("ID_DEPOT_STOCK") >= 0 && this.table.getRowValuesTableModel().getColumnForField("ID_ARTICLE") >= 0) {
+            if (this.buttons == null) {
+                this.buttons = new ArrayList<>();
+            }
+            JButton buttonStock = new JButton("Consulter le stock");
+            buttonStock.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent event) {
+                    SQLRowValues rowValsSel = table.getSelectedRowValues();
+                    if (rowValsSel != null) {
+                        SQLRowAccessor foreignArt = rowValsSel.getForeign("ID_ARTICLE");
+                        if (foreignArt != null && !foreignArt.isUndefined()) {
+                            SQLRowAccessor rowValsStock = StockSQLElement.getStock(rowValsSel);
+                            if (rowValsStock != null && !rowValsStock.isUndefined()) {
+                                EditFrame frame = new EditFrame(table.getRowValuesTableModel().getSQLElement().getDirectory().getElement("STOCK"), EditMode.READONLY);
+                                frame.selectionId(rowValsStock.getID());
+                                frame.setVisible(true);
+                            }
+                        }
+                    }
+                }
+            });
+            this.buttons.add(buttonStock);
+        }
         // On réécrit la configuration au cas ou les preferences aurait changé
         this.table.writeState();

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/credit/component/AvoirClientSQLComponent.java
 ,13 → 956,16
                         }
                         rowVals.update();
-                        EcritureSQLElement eltEcr = (EcritureSQLElement) Configuration.getInstance().getDirectory().getElement("ECRITURE");
-                        final int foreignIDmvt = rowFacture.getForeignID("ID_MOUVEMENT");
-                        eltEcr.archiveMouvementProfondeur(foreignIDmvt, false);
-                        System.err.println("Regeneration des ecritures");
-                        new GenerationMvtSaisieVenteFacture(rowFacture.getID(), foreignIDmvt);
-                        System.err.println("Fin regeneration");
+                        List<SQLRow> rowEch = rowFacture.getReferentRows(rowFacture.getTable().getTable("ECHEANCE_CLIENT"));
+                        for (SQLRow sqlRow : rowEch) {
+                            if (!sqlRow.getBoolean("REG_COMPTA") && !sqlRow.getBoolean("REGLE")) {
+                                // update echeance
+                                SQLRowValues createEmptyUpdateRow2 = sqlRow.createEmptyUpdateRow();
+                                createEmptyUpdateRow2.put("MONTANT", Math.max(0, sqlRow.getLong("MONTANT") - totalAvoir));
+                                createEmptyUpdateRow2.commit();
+                                break;
+                            }
+                        }
                     } catch (SQLException e1) {
                         ExceptionHandler.handle("Erreur lors de l'affection de l'avoir sur la facture!", e1);
                     } finally {

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/order/element/ChiffrageCommandeClientSQLElement.java
 ,11 → 17,14
 import org.openconcerto.erp.core.common.ui.DeviseTableCellRenderer;
 import org.openconcerto.sql.element.SQLComponent;
 import org.openconcerto.sql.element.UISQLComponent;
+import org.openconcerto.sql.view.list.SQLTableModelColumn;
 import org.openconcerto.sql.view.list.SQLTableModelSource;
 import org.openconcerto.utils.ListMap;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 public class ChiffrageCommandeClientSQLElement extends ComptaSQLConfElement {
 ,6 → 33,20
     }
+    @Override
+    public Set<String> getReadOnlyFields() {
+        Set<String> s = new HashSet<>();
+        s.add("NOM");
+        s.add("ID_FAMILLE_ARTICLE");
+        s.add("PA_HT");
+        s.add("PV_HT");
+        s.add("QTE");
+        s.add("ID_UNITE_VENTE");
+        s.add("T_PA_HT");
+        s.add("T_PV_HT");
+        return s;
+    }
     /*
      * (non-Javadoc)
      *
 ,11 → 70,31
     @Override
     protected void _initTableSource(SQLTableModelSource res) {
         super._initTableSource(res);
-        res.getColumn(getTable().getField("QTE")).setRenderer(new DeviseTableCellRenderer());
-        res.getColumn(getTable().getField("PA_HT")).setRenderer(new DeviseTableCellRenderer());
-        res.getColumn(getTable().getField("MARGE")).setRenderer(new DeviseTableCellRenderer());
-        res.getColumn(getTable().getField("T_PA_HT")).setRenderer(new DeviseTableCellRenderer());
+        SQLTableModelColumn columnQte = res.getColumn(getTable().getField("QTE"));
+        if (columnQte != null) {
+            columnQte.setRenderer(new DeviseTableCellRenderer());
+        }
+        if (getTable().contains("ANT")) {
+            final SQLTableModelColumn columnAnt = res.getColumn(getTable().getField("ANT"));
+            if (columnAnt != null) {
+                columnAnt.setRenderer(new DeviseTableCellRenderer());
+            }
+        }
+        final SQLTableModelColumn columnPA = res.getColumn(getTable().getField("PA_HT"));
+        if (columnPA != null) {
+            columnPA.setRenderer(new DeviseTableCellRenderer());
+        }
+        final SQLTableModelColumn columnmarge = res.getColumn(getTable().getField("MARGE"));
+        if (columnmarge != null) {
+            columnmarge.setRenderer(new DeviseTableCellRenderer());
+        }
+        SQLTableModelColumn column = res.getColumn(getTable().getField("T_PA_HT"));
+        if (column != null) {
+            column.setRenderer(new DeviseTableCellRenderer());
+        }
     }
     /*
 ,16 → 129,25
      * @see org.openconcerto.devis.SQLElement#getComponent()
      */
     public SQLComponent createComponent() {
-        return new UISQLComponent(this) {
+        return new UISQLComponent(this, 3) {
             public void addViews() {
-                this.addView("NOM");
-                this.addView("ID_FAMILLE_ARTICLE");
-                this.addView("PA_HT");
-                this.addView("PV_HT");
-                this.addView("QTE");
-                this.addView("ID_UNITE_VENTE");
-                this.addView("T_PA_HT");
-                this.addView("T_PV_HT");
+                this.addView("NOM", "1");
+                this.addView("ID_FAMILLE_ARTICLE", "1");
+                this.addView("PA_HT", "1");
+                this.addView("PV_HT", "1");
+                this.addView("QTE", "1");
+                if (getTable().contains("RESTANT")) {
+                    this.addView("RESTANT", "1");
+                }
+                this.addView("ID_UNITE_VENTE", "1");
+                this.addView("T_PA_HT", "1");
+                this.addView("T_PV_HT", "1");
+                if (getTable().contains("ANT")) {
+                    this.addView("ANT", "1");
+                }
+                if (getTable().contains("MOTIF")) {
+                    this.addView("MOTIF", "1");
+                }
             }
         };
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/order/element/CommandeClientElementSQLElement.java
 ,6 → 74,22
         rowAction.setPredicate(IListeEvent.getNonEmptySelectionPredicate());
         getRowActions().add(rowAction);
+        PredicateRowAction rowActionBL = new PredicateRowAction(new AbstractAction("Transférer la commande en BL") {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                List<SQLRowValues> resultId = new ArrayList<>();
+                CommandeClientSQLElement cmdElt = (CommandeClientSQLElement) getForeignElement("ID_COMMANDE_CLIENT");
+                for (SQLRowValues sqlRowAccessor : IListe.get(e).getSelectedRows()) {
+                    resultId.add(sqlRowAccessor.getForeign("ID_COMMANDE_CLIENT").asRowValues());
+                }
+                cmdElt.transfertBonLivraisonClient(resultId);
+            }
+        }, true);
+        rowActionBL.setPredicate(IListeEvent.getNonEmptySelectionPredicate());
+        getRowActions().add(rowActionBL);
         PredicateRowAction rowActionCmd = new PredicateRowAction(new AbstractAction("Modifier la commande associée") {
             @Override

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/order/component/CommandeClientSQLComponent.java
 ,10 → 864,10
             super.select(rVals);
         }
         if (r != null) {
-            this.table.insertFrom("ID_COMMANDE_CLIENT", r.getID());
-            this.tableFacturationItem.insertFrom("ID_COMMANDE_CLIENT", r.getID());
+            this.table.getRowValuesTable().insertFrom(r);
+            this.tableFacturationItem.getRowValuesTable().insertFrom(r);
             if (this.tableChiffrageItem != null) {
-                this.tableChiffrageItem.insertFrom("ID_COMMANDE_CLIENT", r.getID());
+                this.tableChiffrageItem.getRowValuesTable().insertFrom(r);
             }
         }
         // this.radioEtat.setVisible(r.getID() > 1);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/account/VenteFactureSituationSQLComponent.java
 ,6 → 67,8
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 public class VenteFactureSituationSQLComponent extends TransfertGroupSQLComponent {
     public static final String ID = "sales.invoice.partial";
 ,7 → 203,7
         sqlRequestComboBox.setEnabled(false);
         final AcompteField acompteField = ((AcompteField) getEditor("sales.invoice.partial.amount"));
-        acompteField.getDocument().addDocumentListener(new SimpleDocumentListener() {
+        listenerAcompteField = new SimpleDocumentListener() {
             @Override
             public void update(DocumentEvent e) {
 ,7 → 210,25
                 Acompte a = acompteField.getValue();
                 table.calculPourcentage(a, TypeCalcul.CALCUL_FACTURABLE);
             }
-        });
+        };
+        acompteField.getDocument().addDocumentListener(listenerAcompteField);
+        listenerTable = new TableModelListener() {
+            @Override
+            public void tableChanged(TableModelEvent e) {
+                acompteField.getDocument().removeDocumentListener(listenerAcompteField);
+                if (e.getColumn() == table.getModel().getColumnForField("POURCENT_FACTURABLE")) {
+                    Acompte a = new Acompte(null, table.getTotalHT(TypeCalcul.CALCUL_MONTANT_TOTAL));
+                    acompteField.setValue(a);
+                }
+                acompteField.getDocument().addDocumentListener(listenerAcompteField);
+            }
+        };
+        table.getRowValuesTable().getModel().addTableModelListener(listenerTable);
         total.addValueListener(new PropertyChangeListener() {
             @Override
 ,19 → 240,9
     }
-    int countPole = 0;
+    private SimpleDocumentListener listenerAcompteField;
+    private TableModelListener listenerTable;
-    // @Override
-    // public Component addView(MutableRowItemView rowItemView, String fields, Object specObj) {
-    //
-    // if (fields.contains("ID_POLE_PRODUIT") && countPole == 0) {
-    // countPole++;
-    // return null;
-    // } else {
-    // return super.addView(rowItemView, fields, specObj);
-    // }
-    // }
     @Override
     public JComponent getLabel(String id) {
         if (id.equals("sales.invoice.partial.amount")) {
 ,10 → 293,11
             // Set only VAT Editable
             for (int i = 0; i < items.getRowValuesTable().getColumnModel().getColumnCount(false); i++) {
                 final SQLTableElement sqlTableElementAt = items.getRowValuesTable().getRowValuesTableModel().getSQLTableElementAt(i);
-                if (sqlTableElementAt.getField() == null || !sqlTableElementAt.getField().getName().equalsIgnoreCase("ID_TAXE")) {
+                if (sqlTableElementAt.getField() != null && (sqlTableElementAt.getField().getName().equalsIgnoreCase("ID_STYLE")
+                        || sqlTableElementAt.getField().getName().equalsIgnoreCase("POURCENT_FACTURABLE") || sqlTableElementAt.getField().getName().equalsIgnoreCase("ID_TAXE"))) {
+                    sqlTableElementAt.setEditable(true);
+                } else {
                     sqlTableElementAt.setEditable(false);
-                } else {
-                    sqlTableElementAt.setEditable(true);
                 }
             }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/account/VenteFactureSoldeSQLComponent.java
 ,22 → 14,29
  package org.openconcerto.erp.core.sales.account;
 import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
+import org.openconcerto.erp.core.common.ui.AbstractVenteArticleItemTable.TypeCalcul;
 import org.openconcerto.erp.core.common.ui.Acompte;
 import org.openconcerto.erp.core.common.ui.AcompteField;
-import org.openconcerto.erp.core.common.ui.AbstractVenteArticleItemTable.TypeCalcul;
 import org.openconcerto.erp.core.sales.invoice.element.SaisieVenteFactureSQLElement;
 import org.openconcerto.erp.core.sales.invoice.ui.FactureSituationItemTable;
+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.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.element.GlobalMapper;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
+import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.ui.group.Group;
 import org.openconcerto.utils.DecimalUtils;
+import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.Tuple2;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
 ,10 → 73,28
     @Override
     public int insert(SQLRow order) {
-        return super.insert(order);
+        int id = super.insert(order);
+        try {
+            updateStock(id);
+        } catch (SQLException e) {
+            ExceptionHandler.handle("Erreur lors de la mise à jour du stock.", e);
+            e.printStackTrace();
+        }
+        return id;
     }
     @Override
+    public void update() {
+        super.update();
+        try {
+            updateStock(getSelectedID());
+        } catch (SQLException e) {
+            ExceptionHandler.handle("Erreur lors de la mise à jour du stock.", e);
+            e.printStackTrace();
+        }
+    }
+    @Override
     public void importFrom(List<SQLRowValues> rows) {
         super.importFrom(rows);
 ,6 → 139,34
         return l;
     }
+    protected String getLibelleStock(SQLRowAccessor row, SQLRowAccessor rowElt) {
+        return "Saisie vente facture N°" + row.getString("NUMERO");
+    }
+    /**
+     * Mise à jour des stocks pour chaque article composant la facture
+     *
+     * @throws SQLException
+     */
+    private void updateStock(int id) throws SQLException {
+        SQLPreferences prefs = SQLPreferences.getMemCached(getTable().getDBRoot());
+        if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_FACT, true)) {
+            SQLRow row = getTable().getRow(id);
+            StockItemsUpdater stockUpdater = new StockItemsUpdater(new StockLabel() {
+                @Override
+                public String getLabel(SQLRowAccessor rowOrigin, SQLRowAccessor rowElt) {
+                    return getLibelleStock(rowOrigin, rowElt);
+                }
+            }, row, row.getReferentRows(getTable().getTable("SAISIE_VENTE_FACTURE_ELEMENT")),
+                    getTable().contains("CREATE_VIRTUAL_STOCK") && row.getBoolean("CREATE_VIRTUAL_STOCK") ? TypeStockUpdate.REAL_VIRTUAL_DELIVER : TypeStockUpdate.REAL_DELIVER);
+            stockUpdater.update();
+        }
+    }
     // @Override
     // public Component addView(MutableRowItemView rowItemView, String fields, Object specObj) {
     //

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/action/ListeDesVentesAction.java
 ,6 → 14,7
  package org.openconcerto.erp.core.sales.invoice.action;
 import org.openconcerto.erp.action.CreateFrameAbstractAction;
+import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.common.ui.PanelFrame;
 import org.openconcerto.erp.core.sales.invoice.ui.ListeDesVentesPanel;
 ,15 → 21,17
 import javax.swing.Action;
 import javax.swing.JFrame;
 public class ListeDesVentesAction extends CreateFrameAbstractAction {
-    public ListeDesVentesAction() {
+    private final ComptaPropsConfiguration conf;
+    public ListeDesVentesAction(final ComptaPropsConfiguration conf) {
         super();
-        this.putValue(Action.NAME, "Liste des ventes");
+        this.conf = conf;
     }
+    @Override
     public JFrame createFrame() {
-        return new PanelFrame(new ListeDesVentesPanel(), "Liste des ventes");
+        return new PanelFrame(new ListeDesVentesPanel(this.conf), (String) this.getValue(Action.NAME));
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/action/ListeEcheancePrelevementAction.java
 New file
 ,0 → 1,491
+/*
+ * 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.sales.invoice.action;
+import org.openconcerto.erp.action.CreateFrameAbstractAction;
+import org.openconcerto.erp.config.ComptaPropsConfiguration;
+import org.openconcerto.erp.core.finance.payment.element.SDDMessageSQLElement;
+import org.openconcerto.erp.core.finance.payment.element.SDDMessageSQLElement.GenerationResult;
+import org.openconcerto.erp.core.finance.payment.element.SDDMessageSQLElement.IgnoreReason;
+import org.openconcerto.erp.core.sales.invoice.element.EcheanceClientSQLElement;
+import org.openconcerto.erp.core.sales.invoice.element.SaisieVenteFactureSQLElement;
+import org.openconcerto.erp.generationEcritures.GenerationMvtSepa;
+import org.openconcerto.erp.utils.TM;
+import org.openconcerto.sql.model.FieldPath;
+import org.openconcerto.sql.model.SQLRow;
+import org.openconcerto.sql.model.SQLRowAccessor;
+import org.openconcerto.sql.model.SQLRowValues;
+import org.openconcerto.sql.model.SQLRowValuesListFetcher;
+import org.openconcerto.sql.model.SQLTable;
+import org.openconcerto.sql.model.Where;
+import org.openconcerto.sql.model.graph.Path;
+import org.openconcerto.sql.request.UpdateBuilder;
+import org.openconcerto.sql.view.IListFrame;
+import org.openconcerto.sql.view.ListeAddPanel;
+import org.openconcerto.sql.view.list.BaseSQLTableModelColumn;
+import org.openconcerto.sql.view.list.IListe;
+import org.openconcerto.sql.view.list.IListeAction.IListeEvent;
+import org.openconcerto.sql.view.list.RowAction;
+import org.openconcerto.sql.view.list.SQLTableModelSourceOnline;
+import org.openconcerto.ui.DefaultGridBagConstraints;
+import org.openconcerto.ui.FrameUtil;
+import org.openconcerto.utils.CollectionUtils;
+import org.openconcerto.utils.ExceptionHandler;
+import org.openconcerto.utils.i18n.Grammar_fr;
+import java.awt.GridBagConstraints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import javax.swing.AbstractAction;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.SwingWorker;
+public class ListeEcheancePrelevementAction extends CreateFrameAbstractAction {
+    private final EcheanceClientSQLElement elem;
+    private final ComptaPropsConfiguration conf;
+    public ListeEcheancePrelevementAction(ComptaPropsConfiguration conf) {
+        super();
+        this.elem = conf.getDirectory().getElement(EcheanceClientSQLElement.class);
+        this.conf = conf;
+    }
+    public final EcheanceClientSQLElement getElem() {
+        return this.elem;
+    }
+    private void setWhere(final SQLTableModelSourceOnline tableSource, boolean showHistory) {
+        final SQLTable tableEcheance = this.elem.getTable();
+        Where w = new Where(tableEcheance.getField("ID_SEPA_MANDATE"), "!=", (Object) null);
+        if (!showHistory) {
+            w = w.and(new Where(tableEcheance.getField("REGLE"), "=", Boolean.FALSE));
+            w = w.and(new Where(tableEcheance.getField("REG_COMPTA"), "=", Boolean.FALSE));
+        }
+        tableSource.getReq().setWhere(w);
+    }
+    @Override
+    public JFrame createFrame() {
+        final SQLTableModelSourceOnline tableSource = this.elem.getTableSource(true);
+        setWhere(tableSource, false);
+        final TM tm = conf.getERP_TM();
+        tableSource.getColumns().add(new BaseSQLTableModelColumn("Etat", String.class) {
+            @Override
+            protected Object show_(SQLRowAccessor r) {
+                if (r.getBoolean("REGLE")) {
+                    return TM.tr("sepa.deadline.done");
+                } else if (r.getBoolean("REG_COMPTA")) {
+                    return TM.tr("sepa.deadline.regul");
+                } else if (!r.isForeignEmpty("ID_SDD_MESSAGE")) {
+                    return TM.tr("sepa.deadline.filecreated");
+                }
+                return TM.tr("sepa.deadline.waiting");
+            }
+            @Override
+            public Set<FieldPath> getPaths() {
+                Path p = new Path(elem.getTable());
+                return CollectionUtils.createSet(new FieldPath(p, "REGLE"), new FieldPath(p, "REG_COMPTA"), new FieldPath(p, "ID_SDD_MESSAGE"));
+            }
+        });
+        tableSource.getColumns().add(new BaseSQLTableModelColumn("Fichier SEPA", String.class) {
+            @Override
+            protected Object show_(SQLRowAccessor r) {
+                if (r.isForeignEmpty("ID_SDD_MESSAGE")) {
+                    return "";
+                } else {
+                    return r.getForeign("ID_SDD_MESSAGE").getString("MessageIdentification");
+                }
+            }
+            @Override
+            public Set<FieldPath> getPaths() {
+                Path p = new Path(elem.getTable());
+                p = p.add(elem.getTable().getField("ID_SDD_MESSAGE"));
+                return CollectionUtils.createSet(new FieldPath(p, "MessageIdentification"));
+            }
+        });
+        final ListeAddPanel panel = new ListeAddPanel(this.elem, new IListe(tableSource));
+        final IListFrame res = new IListFrame(panel);
+        res.setTextTitle("Prélèvements SEPA");
+        res.getPanel().setReadWriteButtonsVisible(false);
+        GridBagConstraints c = new DefaultGridBagConstraints();
+        c.gridy += 2;
+        c.weighty = 0;
+        c.fill = GridBagConstraints.NONE;
+        c.anchor = GridBagConstraints.WEST;
+        final JCheckBox checkboxHistory = new JCheckBox(TM.tr("sepa.history.hide"));
+        checkboxHistory.setSelected(true);
+        checkboxHistory.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                setWhere(tableSource, !checkboxHistory.isSelected());
+            }
+        });
+        res.getPanel().add(checkboxHistory, c);
+        final SDDMessageSQLElement sepaMsgElem = this.elem.getDirectory().getElement(SDDMessageSQLElement.class);
+        final String aMessageLabel = this.elem.getForeignElement(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME).getName().getVariant(Grammar_fr.INDEFINITE_ARTICLE_SINGULAR);
+        RowAction actionFileCreate = new RowAction.PredicateRowAction(new AbstractAction("Générer " + aMessageLabel, null) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final IListe l = IListe.get(e);
+                final List<Integer> selectedIDs = new ArrayList<>();
+                final Set<Integer> selectedClientIDs = new HashSet<>();
+                for (SQLRowValues rowVals : l.getSelectedRows()) {
+                    selectedClientIDs.add(rowVals.getForeignID("ID_CLIENT"));
+                    if (rowVals.getLong("MONTANT") > 0) {
+                        selectedIDs.add(rowVals.getID());
+                    }
+                }
+                // TODO dialog with label informing of the successful creation of message for n
+                // invoices/n2 messages too far in the future/n3 messages with collection date
+                // changed and having a button to open the file chooser
+                new SwingWorker<String, Void>() {
+                    @Override
+                    protected String doInBackground() throws Exception {
+                        return checkSEPA(selectedClientIDs);
+                    }
+                    @Override
+                    protected void done() {
+                        try {
+                            String msg = get();
+                            if (msg.trim().length() > 0) {
+                                msg = "Des informations nécessaires à la création du fichier sont manquantes : \n" + msg;
+                                msg += "Le fichier ne pourra être créer tant que ces informations n'auront pas été renseignées.";
+                                JOptionPane.showMessageDialog(null, msg, "Création du fichier SEPA annulée", JOptionPane.WARNING_MESSAGE);
+                                return;
+                            }
+                        } catch (Exception e) {
+                            ExceptionHandler.handle(l, "Impossible de générer " + aMessageLabel, e);
+                            return;
+                        }
+                        new SwingWorker<GenerationResult, Void>() {
+                            @Override
+                            protected GenerationResult doInBackground() throws Exception {
+                                return sepaMsgElem.generateXML(elem.getTable(), selectedIDs);
+                            }
+                            @Override
+                            protected void done() {
+                                final GenerationResult genRes;
+                                try {
+                                    genRes = this.get();
+                                } catch (Exception e) {
+                                    ExceptionHandler.handle(l, "Impossible de générer " + aMessageLabel, e);
+                                    return;
+                                }
+                                final int includedInvoicesCount = genRes.getIncludedInvoicesCount();
+                                final Map<String, Object> tmMap = new HashMap<>();
+                                tmMap.put("msgElem", sepaMsgElem.getName());
+                                tmMap.put("invoiceElem", elem.getName());
+                                tmMap.put("invoiceElemCount", includedInvoicesCount);
+                                if (genRes.getDDInvoicesWithoutMessage().isEmpty()) {
+                                    JOptionPane.showMessageDialog(l, tm.trM("sddMessage.generation.noneNeeded", tmMap));
+                                } else if (genRes.getIgnoredInvoices().isEmpty()) {
+                                    JOptionPane.showMessageDialog(l, tm.trM("sddMessage.generation.noneIgnored", tmMap));
+                                } else {
+                                    final int futureCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.TOO_FAR_IN_FUTURE).size();
+                                    final int duplicateCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.DUPLICATE_MANDATE).size();
+                                    final int missingInfoCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.MISSING_INFO).size();
+                                    tmMap.put("futureCount", futureCount);
+                                    tmMap.put("duplicateCount", duplicateCount);
+                                    tmMap.put("missingInfoCount", missingInfoCount);
+                                    final StringBuilder msg = new StringBuilder(256);
+                                    msg.append(tm.trM("sddMessage.generation.someIgnored", tmMap));
+                                    if (futureCount > 0) {
+                                        msg.append("\n- ");
+                                        msg.append(tm.trM("sddMessage.generation.someIgnored.future", tmMap));
+                                    }
+                                    if (duplicateCount > 0) {
+                                        msg.append("\n- ");
+                                        msg.append(tm.trM("sddMessage.generation.someIgnored.duplicateMandate", tmMap));
+                                    }
+                                    if (missingInfoCount > 0) {
+                                        msg.append("\n- ");
+                                        msg.append(tm.trM("sddMessage.generation.someIgnored.missingInfo", tmMap));
+                                    }
+                                    final int messageType = duplicateCount == 0 ? JOptionPane.WARNING_MESSAGE : JOptionPane.ERROR_MESSAGE;
+                                    JOptionPane.showMessageDialog(l, msg.toString(), null, messageType);
+                                }
+                                if (genRes.getInsertedMessage() != null) {
+                                    sepaMsgElem.exportXML(l, Collections.singletonList(genRes.getInsertedMessage()));
+                                }
+                            }
+                        }.execute();
+                    }
+                }.execute();
+            }
+        }, true, true).setPredicate(IListeEvent.getNonEmptySelectionPredicate());
+        // TODO remove once we have a join with {SENT, OK, DEFINITIVE_ERROR, TRANSIENT_ERROR}
+        RowAction actionSepaAgain = new RowAction.PredicateRowAction(new AbstractAction("Prélever à nouveau", null) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final IListe l = IListe.get(e);
+                if (JOptionPane.showConfirmDialog(l, "Voulez-vous vraiment prélever à nouveau les factures sélectionnées ? Cette action est définitive.", "Prélever à nouveau",
+                        JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION)
+                    return;
+                final List<Integer> selectedIDs = l.getSelection().getSelectedIDs();
+                final SQLTable table = l.getSource().getPrimaryTable();
+                new SwingWorker<Void, Void>() {
+                    @Override
+                    protected Void doInBackground() throws Exception {
+                        final UpdateBuilder upd = new UpdateBuilder(table);
+                        upd.setObject(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME, upd.getTable().getForeignTable(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME).getUndefinedIDNumber());
+                        upd.setObject(SaisieVenteFactureSQLElement.END2END_FIELD_NAME, "");
+                        // don't allow to debit already payed invoices
+                        upd.setWhere(new Where(upd.getTable().getKey(), selectedIDs).and(new Where(upd.getTable().getField("REGLE"), "=", Boolean.FALSE))
+                                .and(new Where(upd.getTable().getField("REG_COMPTA"), "=", Boolean.FALSE)));
+                        upd.getTable().getDBSystemRoot().getDataSource().execute(upd.asString());
+                        return null;
+                    }
+                    @Override
+                    protected void done() {
+                        try {
+                            get();
+                            final SQLTable table = l.getSource().getPrimaryTable().getTable();
+                            final List<String> modifiedFields = Arrays.asList(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME, SaisieVenteFactureSQLElement.END2END_FIELD_NAME);
+                            for (final Integer id : selectedIDs) {
+                                table.fireTableModified(id, modifiedFields);
+                            }
+                        } catch (InterruptedException | ExecutionException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }.execute();
+            }
+        }, false, true).setPredicate(IListeEvent.getNonEmptySelectionPredicate());
+        panel.getListe().addIListeAction(actionFileCreate);
+        panel.getListe().addIListeAction(actionSepaAgain);
+        RowAction actionCompta = new RowAction(new AbstractAction("Valider le paiement", null) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final IListe l = IListe.get(e);
+                if (JOptionPane.showConfirmDialog(l, "Voulez-vous vraiment transférer ces prélèvements en comptabilité ?", "Comptabiliser", JOptionPane.OK_CANCEL_OPTION,
+                        JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION)
+                    return;
+                List<SQLRow> rows = new ArrayList<>();
+                List<Integer> ids = new ArrayList<>();
+                for (SQLRowAccessor sqlRow : l.getSelectedRows()) {
+                    rows.add(sqlRow.asRow());
+                    ids.add(sqlRow.getID());
+                }
+                new SwingWorker<Void, Void>() {
+                    @Override
+                    protected Void doInBackground() throws Exception {
+                        try {
+                            GenerationMvtSepa sepa = new GenerationMvtSepa(rows);
+                            sepa.genere();
+                            UpdateBuilder build = new UpdateBuilder(elem.getTable());
+                            build.setObject(elem.getTable().getField("REGLE"), Boolean.TRUE);
+                            build.setWhere(new Where(elem.getTable().getKey(), ids));
+                            elem.getTable().getDBSystemRoot().getDataSource().execute(build.asString());
+                        } catch (Exception e) {
+                            ExceptionHandler.handle("Erreur lors du transfert en comptabilité", e);
+                        }
+                        return null;
+                    }
+                    @Override
+                    protected void done() {
+                        try {
+                            get();
+                            for (final Integer id : ids)
+                                elem.getTable().fireTableModified(id, Arrays.asList("REGLE"));
+                        } catch (InterruptedException | ExecutionException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }.execute();
+            }
+        }, true, true) {
+            @Override
+            public boolean enabledFor(List<SQLRowValues> selection) {
+                if (selection != null && selection.size() >= 1) {
+                    for (SQLRowValues sqlRowValues : selection) {
+                        if (sqlRowValues.getBoolean("REGLE")) {
+                            return false;
+                        }
+                    }
+                    return true;
+                }
+                return false;
+            }
+        };
+        panel.getListe().addIListeAction(actionCompta);
+        RowAction actionHistoSEPA = new RowAction.PredicateRowAction(new AbstractAction("Historique Fichiers SEPA", null) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final IListFrame res = new IListFrame(new ListeAddPanel(elem.getDirectory().getElement(SDDMessageSQLElement.class)));
+                res.getPanel().setReadWriteButtonsVisible(false);
+                FrameUtil.showPacked(res);
+            }
+        }, true, true).setPredicate(IListeEvent.createSelectionCountPredicate(0, Integer.MAX_VALUE));
+        panel.getListe().addIListeAction(actionHistoSEPA);
+        RowAction actionRelancer = new RowAction.PredicateRowAction(new AbstractAction("Relancer", null) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                elem.relanceClient(IListe.get(e).getSelectedRow().asRow());
+            }
+        }, true, true).setPredicate(IListeEvent.getSingleSelectionPredicate());
+        panel.getListe().addIListeAction(actionRelancer);
+        RowAction actionCancelPaiement = new RowAction(new AbstractAction("Annuler la validation", null) {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                final IListe l = IListe.get(e);
+                if (JOptionPane.showConfirmDialog(l, "Voulez-vous vraiment annuler le transfert de ce prélèvement en comptabilité ?", "Comptabiliser", JOptionPane.OK_CANCEL_OPTION,
+                        JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION)
+                    return;
+                final SQLRowValues selectedRow = IListe.get(e).getSelectedRow();
+                new SwingWorker<Void, Void>() {
+                    @Override
+                    protected Void doInBackground() throws Exception {
+                        Collection<? extends SQLRowAccessor> res = selectedRow.asRow().getForeign("ID_MOUVEMENT")
+                                .getReferentRows(elem.getTable().getTable("ENCAISSER_MONTANT_ELEMENT").getField("ID_MOUVEMENT_ECHEANCE"));
+                        if (res.size() >= 1) {
+                            try {
+                                elem.getDirectory().getElement("MOUVEMENT").archive(res.iterator().next().getForeign("ID_ENCAISSER_MONTANT").getForeignID("ID_MOUVEMENT"));
+                                UpdateBuilder build = new UpdateBuilder(elem.getTable());
+                                build.setObject(elem.getTable().getField("REGLE"), Boolean.FALSE);
+                                build.setWhere(new Where(elem.getTable().getKey(), "=", l.getSelectedId()));
+                                elem.getTable().getDBSystemRoot().getDataSource().execute(build.asString());
+                            } catch (SQLException e1) {
+                                e1.printStackTrace();
+                            }
+                        }
+                        return null;
+                    }
+                    @Override
+                    protected void done() {
+                        try {
+                            get();
+                            elem.getTable().fireTableModified(l.getSelectedId(), Arrays.asList("REGLE"));
+                        } catch (InterruptedException | ExecutionException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }.execute();
+            }
+        }, false, true) {
+            @Override
+            public boolean enabledFor(List<SQLRowValues> selection) {
+                if (selection != null && selection.size() == 1) {
+                    return selection.get(0).getBoolean("REGLE");
+                }
+                return false;
+            }
+        };
+        panel.getListe().addIListeAction(actionCancelPaiement);
+        return res;
+    }
+    private String checkSEPA(Set<Integer> selectedClientIDs) {
+        StringBuilder msg = new StringBuilder();
+        SQLRow rowSociete = conf.getRowSociete();
+        if (rowSociete.getString("IBAN").trim().length() == 0) {
+            msg.append("IBAN non renseigné dans les informations de la société.\n");
+        }
+        if (rowSociete.getString("BIC").trim().length() == 0) {
+            msg.append("BIC non renseigné dans les informations de la société.\n");
+        }
+        if (rowSociete.getString("SEPA_CREDITOR_ID").trim().length() == 0) {
+            msg.append("Idenfiant de créancier non renseigné dans les informations de la société.\n");
+        }
+        if (msg.length() == 0) {
+            SQLRowValues rowVals = new SQLRowValues(elem.getTable().getForeignTable("ID_CLIENT"));
+            rowVals.putNulls("CODE", "NOM", "IBAN", "BIC");
+            SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(rowVals);
+            List<SQLRowValues> res = fetcher.fetch(new Where(rowVals.getTable().getKey(), selectedClientIDs));
+            for (SQLRowValues r : res) {
+                final int ibanLength = r.getString("IBAN").trim().length();
+                final int bicLength = r.getString("BIC").trim().length();
+                if (ibanLength == 0 && bicLength == 0) {
+                    msg.append("IBAN et BIC non renseignés pour le client " + r.getString("NOM") + ".\n");
+                } else if (ibanLength == 0) {
+                    msg.append("IBAN non renseignés pour le client " + r.getString("NOM") + ".\n");
+                } else if (bicLength == 0) {
+                    msg.append("BIC non renseignés pour le client " + r.getString("NOM") + ".\n");
+                }
+            }
+        }
+        return msg.toString();
+    }
+}

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/ui/ListPanelEcheancesClients.java
 ,6 → 93,8
         // FIXME : remove queries from AWT
         final SQLTable elementEchT = getListe().getSource().getPrimaryTable();
         Where wNotRegle = new Where(elementEchT.getField("REGLE"), "=", Boolean.FALSE);
+        wNotRegle = wNotRegle.and(new Where(elementEchT.getTable().getField("ID_SEPA_MANDATE"), "=", (Object) null));
         if (!showRegCompta) {
             wNotRegle = wNotRegle.and(new Where(elementEchT.getField("REG_COMPTA"), "=", Boolean.FALSE));
         }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/ui/ListeDesEcheancesClientsPanel.java
 ,12 → 15,11
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.config.Gestion;
-import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
 import org.openconcerto.erp.core.common.ui.IListFilterDatePanel;
 import org.openconcerto.erp.core.common.ui.IListTotalPanel;
-import org.openconcerto.erp.core.customerrelationship.customer.element.RelanceSQLElement;
 import org.openconcerto.erp.core.finance.accounting.element.MouvementSQLElement;
 import org.openconcerto.erp.core.finance.payment.component.EncaisserMontantSQLComponent;
+import org.openconcerto.erp.core.sales.invoice.element.EcheanceClientSQLElement;
 import org.openconcerto.erp.rights.ComptaUserRight;
 import org.openconcerto.erp.rights.NXRights;
 import org.openconcerto.sql.Configuration;
 ,12 → 30,10
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.users.rights.UserRightsManager;
 import org.openconcerto.sql.view.EditFrame;
-import org.openconcerto.sql.view.EditPanelListener;
 import org.openconcerto.sql.view.IListPanel;
 import org.openconcerto.sql.view.IListener;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.ui.DefaultGridBagConstraints;
-import org.openconcerto.utils.ExceptionHandler;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 ,10 → 41,8
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import javax.swing.JButton;
 ,7 → 125,7
             this.add(this.relancer, c);
             this.relancer.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
-                    relanceClient();
+                    ((EcheanceClientSQLElement) panelEcheances.getElement()).relanceClient(getListPanelEcheancesClients().getListe().getSelectedRow().asRow());
                 }
             });
         }
 ,70 → 267,6
     }
-    private void relanceClient() {
-        SQLBase base = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete();
-        final SQLElement relanceElt = Configuration.getInstance().getDirectory().getElement("RELANCE");
-        final SQLRow rowSource = this.panelEcheances.getListe().fetchSelectedRow();
-        if (rowSource != null) {
-            int idMvtSource = MouvementSQLElement.getSourceId(rowSource.getInt("ID_MOUVEMENT"));
-            SQLRow rowMvtSource = base.getTable("MOUVEMENT").getRow(idMvtSource);
-            if (!rowMvtSource.getString("SOURCE").equalsIgnoreCase("SAISIE_VENTE_FACTURE")) {
-                this.relancer.setEnabled(false);
-                return;
-            }
-            if (this.editRelance == null) {
-                this.editRelance = new EditFrame(relanceElt);
-                this.editRelance.setIconImages(Gestion.getFrameIcon());
-                this.editRelance.addEditPanelListener(new EditPanelListener() {
-                    public void cancelled() {
-                        // rien
-                    }
-                    public void modified() {
-                        // rien
-                    }
-                    public void deleted() {
-                        // rien
-                    }
-                    public void inserted(int id) {
-                        int nbRelance = rowSource.getInt("NOMBRE_RELANCE");
-                        nbRelance++;
-                        SQLRowValues rowValsEch = new SQLRowValues(rowSource.getTable());
-                        rowValsEch.put("NOMBRE_RELANCE", nbRelance);
-                        rowValsEch.put("DATE_LAST_RELANCE", new Date());
-                        try {
-                            rowValsEch.update(rowSource.getID());
-                            relanceElt.getTable().getRow(id).createEmptyUpdateRow().put("ID_ECHEANCE_CLIENT", rowSource.getID()).commit();
-                        } catch (SQLException e1) {
-                            ExceptionHandler.handle("erreur lors de la mise à jour du nombre de relances", e1);
-                        }
-                    }
-                });
-            }
-            SQLRowValues rowVals = new SQLRowValues(relanceElt.getTable());
-            rowVals.put("ID_SAISIE_VENTE_FACTURE", rowMvtSource.getInt("IDSOURCE"));
-            rowVals.put("MONTANT", rowSource.getObject("MONTANT"));
-            rowVals.put("ID_CLIENT", rowSource.getInt("ID_CLIENT"));
-            rowVals.put("NUMERO", NumerotationAutoSQLElement.getNextNumero(RelanceSQLElement.class, new Date()));
-            this.editRelance.getSQLComponent().select(rowVals);
-            this.editRelance.pack();
-            this.editRelance.setVisible(true);
-        } else {
-            Thread.dumpStack();
-        }
-    }
     public IListPanel getListPanelEcheancesClients() {
         return this.panelEcheances;
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/ui/ListeDesVentesPanel.java
 ,8 → 25,8
 import org.openconcerto.erp.core.sales.pos.POSConfiguration;
 import org.openconcerto.erp.core.sales.pos.ui.TextAreaTicketPanel;
 import org.openconcerto.erp.utils.TM;
-import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
+import org.openconcerto.sql.element.SQLElementDirectory;
 import org.openconcerto.sql.model.FieldPath;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLRowAccessor;
 ,7 → 79,7
     private JLabelBold textField = new JLabelBold("0");
     private JLabelBold textField2 = new JLabelBold("0");
-    public ListeDesVentesPanel() {
+    public ListeDesVentesPanel(final ComptaPropsConfiguration conf) {
         this.setLayout(new GridBagLayout());
         GridBagConstraints c = new GridBagConstraints();
         c.insets = new Insets(2, 2, 1, 2);
 ,7 → 94,8
         JTabbedPane tabbedPane = new JTabbedPane();
-        final SQLElement elementVF = Configuration.getInstance().getDirectory().getElement("SAISIE_VENTE_FACTURE");
+        final SQLElementDirectory dir = conf.getDirectory();
+        final SQLElement elementVF = dir.getElement("SAISIE_VENTE_FACTURE");
         // tab Vente facture
         final SQLElement eltFacture = elementVF;
         final SQLTableModelSourceOnline src = eltFacture.getTableSource(true);
 ,91 → 151,7
         src.getColumns().add(new SQLTableModelColumnPath(new FieldPath(new Path(eltFacture.getTable()).addForeignField(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME), "MessageIdentification")));
         this.listeFact = new ListeGestCommEltPanel(eltFacture, new IListe(src), true);
-        final SDDMessageSQLElement sepaMsgElem = eltFacture.getDirectory().getElement(SDDMessageSQLElement.class);
-        final String aMessageLabel = sepaMsgElem.getName().getVariant(Grammar_fr.INDEFINITE_ARTICLE_SINGULAR);
-        this.listeFact.getListe().addIListeAction(new RowAction.PredicateRowAction(new AbstractAction("Générer " + aMessageLabel, null) {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                final IListe l = IListe.get(e);
-                final List<Integer> selectedIDs = l.getSelection().getSelectedIDs();
-                // TODO dialog with label informing of the successful creation of message for n
-                // invoices/n2 messages too far in the future/n3 messages with collection date
-                // changed and having a button to open the file chooser
-                new SwingWorker<GenerationResult, Void>() {
-                    @Override
-                    protected GenerationResult doInBackground() throws Exception {
-                        return sepaMsgElem.generateXML(selectedIDs);
-                    }
-                    @Override
-                    protected void done() {
-                        final GenerationResult genRes;
-                        try {
-                            genRes = this.get();
-                        } catch (Exception e) {
-                            ExceptionHandler.handle(l, "Impossible de générer " + aMessageLabel, e);
-                            return;
-                        }
-                        final int includedInvoicesCount = genRes.getIncludedInvoicesCount();
-                        final Map<String, Object> tmMap = new HashMap<>();
-                        tmMap.put("msgElem", sepaMsgElem.getName());
-                        tmMap.put("invoiceElem", elementVF.getName());
-                        tmMap.put("invoiceElemCount", includedInvoicesCount);
-                        if (genRes.getDDInvoicesWithoutMessage().isEmpty()) {
-                            JOptionPane.showMessageDialog(l, TM.getTM().trM("sddMessage.generation.noneNeeded", tmMap));
-                        } else if (genRes.getIgnoredInvoices().isEmpty()) {
-                            JOptionPane.showMessageDialog(l, TM.getTM().trM("sddMessage.generation.noneIgnored", tmMap));
-                        } else {
-                            final int futureCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.TOO_FAR_IN_FUTURE).size();
-                            final int duplicateCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.DUPLICATE_MANDATE).size();
-                            final int missingInfoCount = genRes.getIgnoredInvoices().getNonNull(IgnoreReason.MISSING_INFO).size();
-                            tmMap.put("futureCount", futureCount);
-                            tmMap.put("duplicateCount", duplicateCount);
-                            tmMap.put("missingInfoCount", missingInfoCount);
-                            final StringBuilder msg = new StringBuilder(256);
-                            msg.append(TM.getTM().trM("sddMessage.generation.someIgnored", tmMap));
-                            if (futureCount > 0) {
-                                msg.append("\n- ");
-                                msg.append(TM.getTM().trM("sddMessage.generation.someIgnored.future", tmMap));
-                            }
-                            if (duplicateCount > 0) {
-                                msg.append("\n- ");
-                                msg.append(TM.getTM().trM("sddMessage.generation.someIgnored.duplicateMandate", tmMap));
-                            }
-                            if (missingInfoCount > 0) {
-                                msg.append("\n- ");
-                                msg.append(TM.getTM().trM("sddMessage.generation.someIgnored.missingInfo", tmMap));
-                            }
-                            final int messageType = duplicateCount == 0 ? JOptionPane.WARNING_MESSAGE : JOptionPane.ERROR_MESSAGE;
-                            JOptionPane.showMessageDialog(l, msg.toString(), null, messageType);
-                        }
-                        if (genRes.getInsertedMessage() != null) {
-                            sepaMsgElem.exportXML(l, Collections.singletonList(genRes.getInsertedMessage()));
-                        }
-                    }
-                }.execute();
-            }
-        }, false, true).setPredicate(IListeEvent.getNonEmptySelectionPredicate()));
-        // TODO remove once we have a join with {SENT, OK, DEFINITIVE_ERROR, TRANSIENT_ERROR}
-        this.listeFact.getListe().addIListeAction(new RowAction.PredicateRowAction(new AbstractAction("Prélever à nouveau", null) {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                final IListe l = IListe.get(e);
-                if (JOptionPane.showConfirmDialog(l, "Voulez-vous vraiment prélever à nouveau les factures sélectionnées ? Cette action est définitive.", "Prélever à nouveau",
-                        JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.OK_OPTION)
-                    return;
-                final List<Integer> selectedIDs = l.getSelection().getSelectedIDs();
-                final UpdateBuilder upd = new UpdateBuilder(l.getSource().getPrimaryTable());
-                upd.setObject(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME, upd.getTable().getForeignTable(SaisieVenteFactureSQLElement.MESSAGE_FIELD_NAME).getUndefinedIDNumber());
-                upd.setObject(SaisieVenteFactureSQLElement.END2END_FIELD_NAME, "");
-                // don't allow to debit already payed invoices
-                upd.setWhere(new Where(upd.getTable().getKey(), selectedIDs).and(Where.isNull(upd.getTable().getField("DATE_REGLEMENT"))));
-                upd.getTable().getDBSystemRoot().getDataSource().execute(upd.asString());
-                for (final Integer id : selectedIDs)
-                    upd.getTable().fireTableModified(id, upd.getFieldsNames());
-            }
-        }, false, true).setPredicate(IListeEvent.getNonEmptySelectionPredicate()));
         this.listeFact.setOpaque(false);
         this.listeFact.getListe().setModificationAllowed(true);
         final JTable tableFact = this.listeFact.getListe().getJTable();
 ,7 → 233,7
             {
                 // Tab Vente caisse
-                ListeViewPanel panelTicket = new ListeViewPanel(Configuration.getInstance().getDirectory().getElement("TICKET_CAISSE")) {
+                ListeViewPanel panelTicket = new ListeViewPanel(dir.getElement("TICKET_CAISSE")) {
                     @Override
                     protected void handleAction(JButton source, ActionEvent evt) {
                         if (source == this.buttonModifier) {
 ,7 → 282,7
             }
             // Tab Vente comptoir
             {
-                final ListeGestCommEltPanel listeVC = new ListeGestCommEltPanel(Configuration.getInstance().getDirectory().getElement("SAISIE_VENTE_COMPTOIR"), true);
+                final ListeGestCommEltPanel listeVC = new ListeGestCommEltPanel(dir.getElement("SAISIE_VENTE_COMPTOIR"), true);
                 listeVC.getListe().setModificationAllowed(false);
                 listeVC.setOpaque(false);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/component/SaisieVenteFactureSQLComponent.java
 ,6 → 935,7
         ModeDeReglementSQLComponent modeReglComp;
         modeReglComp = (ModeDeReglementSQLComponent) this.eltModeRegl.getSQLChild();
+        modeReglComp.addDateCompListener(this.dateSaisie);
         this.selAvoir.getRequest().setWhere(new Where(this.tableAvoir.getField("SOLDE"), "=", Boolean.FALSE));
         this.selAvoir.fillCombo();
 ,12 → 1947,13
         // FIXME listener pour le module project à déplacer dans le module quand l'interface passera
         // en group
-        if (getTable().contains("ID_AFFAIRE")) {
+        if (getTable().contains("ID_AFFAIRE") && getView("ID_AFFAIRE") != null && getView("ID_AFFAIRE") instanceof SQLRequestComboBox) {
             final SQLRequestComboBox viewClient = (SQLRequestComboBox) getView("ID_CLIENT").getComp();
             final SQLRequestComboBox viewAffaire = (SQLRequestComboBox) getView("ID_AFFAIRE").getComp();
             final SQLRequestComboBox viewComm = (SQLRequestComboBox) getView("ID_COMMERCIAL").getComp();
             final SQLRequestComboBox viewAgence;
-            if (getTable().contains("ID_POLE_PRODUIT")) {
+            if (getTable().contains("ID_POLE_PRODUIT") && (SQLRequestComboBox) getView("ID_POLE_PRODUIT") != null) {
                 viewAgence = (SQLRequestComboBox) getView("ID_POLE_PRODUIT").getComp();
             } else {
                 viewAgence = null;

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/element/SaisieVenteFactureItemSQLElement.java
 ,23 → 164,23
      *
      * @see org.openconcerto.devis.BaseSQLElement#getListFields()
      */
+    @Override
     protected List<String> getListFields() {
         List<String> l = new ArrayList<String>();
         l.add("ID_SAISIE_VENTE_FACTURE");
-            l.add("CODE");
-            l.add("NOM");
-            l.add("DESCRIPTIF");
-            String articleAdvanced = DefaultNXProps.getInstance().getStringProperty("ArticleModeVenteAvance");
-            Boolean bArticleAdvanced = Boolean.valueOf(articleAdvanced);
-            if (bArticleAdvanced) {
-                l.add("PRIX_METRIQUE_VT_1");
-                l.add("ID_MODE_VENTE_ARTICLE");
-            }
-            if (UserRightsManager.getCurrentUserRights().haveRight(AbstractVenteArticleItemTable.SHOW_PRIX_ACHAT_CODE)) {
-                l.add("PA_HT");
-            }
-            l.add("PV_HT");
+        l.add("CODE");
+        l.add("NOM");
+        l.add("DESCRIPTIF");
+        String articleAdvanced = DefaultNXProps.getInstance().getStringProperty("ArticleModeVenteAvance");
+        Boolean bArticleAdvanced = Boolean.valueOf(articleAdvanced);
+        if (bArticleAdvanced) {
+            l.add("PRIX_METRIQUE_VT_1");
+            l.add("ID_MODE_VENTE_ARTICLE");
+        }
+        if (UserRightsManager.getCurrentUserRights().haveRight(AbstractVenteArticleItemTable.SHOW_PRIX_ACHAT_CODE)) {
+            l.add("PA_HT");
+        }
+        l.add("PV_HT");
         l.add("QTE");
         if (getTable().contains("ID_ECO_CONTRIBUTION")) {
             l.add("ID_ECO_CONTRIBUTION");

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/invoice/element/EcheanceClientSQLElement.java
 ,6 → 14,7
  package org.openconcerto.erp.core.sales.invoice.element;
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
+import org.openconcerto.erp.config.Gestion;
 import org.openconcerto.erp.core.common.element.ComptaSQLConfElement;
 import org.openconcerto.erp.core.common.element.NumerotationAutoSQLElement;
 import org.openconcerto.erp.core.common.ui.DeviseField;
 ,6 → 52,7
 import org.openconcerto.sql.utils.SQLUtils;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.EditPanel.EditMode;
+import org.openconcerto.sql.view.EditPanelListener;
 import org.openconcerto.sql.view.list.BaseSQLTableModelColumn;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.sql.view.list.IListeAction.IListeEvent;
 ,7 → 449,7
     @Override
     protected void _initListRequest(ListSQLRequest req) {
         super._initListRequest(req);
-        req.addToGraphToFetch("REG_COMPTA", "REGLE");
+        req.addToGraphToFetch("REG_COMPTA", "REGLE","NOMBRE_RELANCE");
     }
     /*
 ,4 → 540,63
         return createCodeOfPackage() + ".commitment";
     }
+    public void relanceClient(final SQLRow rowEch) {
+        final SQLElement relanceElt = getDirectory().getElement("RELANCE");
+        rowEch.fetchValues();
+        if (rowEch != null) {
+            int idMvtSource = MouvementSQLElement.getSourceId(rowEch.getForeignID("ID_MOUVEMENT"));
+            SQLRow rowMvtSource = getTable().getTable("MOUVEMENT").getRow(idMvtSource);
+            if (!rowMvtSource.getString("SOURCE").equalsIgnoreCase("SAISIE_VENTE_FACTURE")) {
+                return;
+            }
+            EditFrame editRelance = new EditFrame(relanceElt);
+            editRelance.setIconImages(Gestion.getFrameIcon());
+            editRelance.addEditPanelListener(new EditPanelListener() {
+                public void cancelled() {
+                    // rien
+                }
+                public void modified() {
+                    // rien
+                }
+                public void deleted() {
+                    // rien
+                }
+                public void inserted(int id) {
+                    int nbRelance = rowEch.getInt("NOMBRE_RELANCE");
+                    nbRelance++;
+                    SQLRowValues rowValsEch = new SQLRowValues(rowEch.getTable());
+                    rowValsEch.put("NOMBRE_RELANCE", nbRelance);
+                    rowValsEch.put("DATE_LAST_RELANCE", new Date());
+                    try {
+                        rowValsEch.update(rowEch.getID());
+                        relanceElt.getTable().getRow(id).createEmptyUpdateRow().put("ID_ECHEANCE_CLIENT", rowEch.getID()).commit();
+                    } catch (SQLException e1) {
+                        ExceptionHandler.handle("erreur lors de la mise à jour du nombre de relances", e1);
+                    }
+                }
+            });
+            SQLRowValues rowVals = new SQLRowValues(relanceElt.getTable());
+            rowVals.put("ID_SAISIE_VENTE_FACTURE", rowMvtSource.getInt("IDSOURCE"));
+            rowVals.put("MONTANT", rowEch.getObject("MONTANT"));
+            rowVals.put("ID_CLIENT", rowEch.getForeignID("ID_CLIENT"));
+            rowVals.put("NUMERO", NumerotationAutoSQLElement.getNextNumero(RelanceSQLElement.class, new Date()));
+            editRelance.getSQLComponent().select(rowVals);
+            editRelance.pack();
+            editRelance.setVisible(true);
+        }
+    }
 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/quote/element/DevisSQLElement.java
 ,16 → 677,19
                 @Override
                 protected Object show_(SQLRowAccessor r) {
-                    SQLRowAccessor rowAd;
+                    SQLRowAccessor rowAd = null;
                     if (!r.isForeignEmpty("ID_ADRESSE_LIVRAISON")) {
                         rowAd = r.getForeign("ID_ADRESSE_LIVRAISON");
-                    } else if (r.getForeign("ID_CLIENT").getObject("ID_ADRESSE_L") != null && !r.getForeign("ID_CLIENT").isForeignEmpty("ID_ADRESSE_L")) {
-                        rowAd = r.getForeign("ID_CLIENT").getForeign("ID_ADRESSE_L");
-                    } else {
-                        rowAd = r.getForeign("ID_CLIENT").getForeign("ID_ADRESSE");
+                    } else if (!r.isForeignEmpty("ID_CLIENT")) {
+                        if (r.getForeign("ID_CLIENT").getObject("ID_ADRESSE_L") != null && !r.getForeign("ID_CLIENT").isForeignEmpty("ID_ADRESSE_L")) {
+                            rowAd = r.getForeign("ID_CLIENT").getForeign("ID_ADRESSE_L");
+                        } else {
+                            rowAd = r.getForeign("ID_CLIENT").getForeign("ID_ADRESSE");
+                        }
                     }
-                    String lib = rowAd.getString("LIBELLE") + " " + rowAd.getString("VILLE");
+                    String lib = rowAd == null ? "" : rowAd.getString("LIBELLE") + " " + rowAd.getString("VILLE");
                     return lib;
                 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/element/ReferenceArticleSQLElement.java
 ,9 → 59,7
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import javax.swing.AbstractAction;
 ,6 → 214,7
         l.add("PV_TTC");
         l.add("ID_FAMILLE_ARTICLE");
         l.add("ID_FOURNISSEUR");
+        l.add("POIDS");
         l.add("SKU");
         // if (!prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false)) {
 ,6 → 249,9
         }
         l.add("NOM");
+        l.add("PA_HT");
+        l.add("PV_HT");
+        l.add("DERNIER_DATE_ACHAT");
         return l;
     }
 ,4 → 543,20
         // req.addForeignToGraphToFetch("ID_DEPOT_STOCK", Arrays.asList("ID"));
     }
+    static public void updateDateAchat(final SQLTable tableArticle, final SQLRow article) {
+        assert article == null || article.getTable() == tableArticle;
+        SQLTable tableTarifF = tableArticle.getTable("ARTICLE_TARIF_FOURNISSEUR");
+        String up = "UPDATE " + tableArticle.getSQLName().quote() + " a SET " + tableArticle.getField("DERNIER_DATE_ACHAT").getQuotedName();
+        up += " =(select MAX(" + tableTarifF.getField("DATE_PRIX").getQuotedName() + ")  ";
+        up += " FROM " + tableTarifF.getSQLName().quote() + "  t" + " WHERE (t." + tableTarifF.getKey().getQuotedName() + " <> 1) ";
+        up += " AND (t." + tableTarifF.getField("ARCHIVE").getQuotedName() + " = 0) ";
+        up += "AND t." + tableTarifF.getField("ID_ARTICLE").getQuotedName() + " = " + (article == null ? "a." + tableArticle.getKey().getQuotedName() : article.getID()) + ")";
+        if (article != null) {
+            up += "WHERE " + tableArticle.getKey().getQuotedName() + " = " + article.getID();
+        }
+        tableArticle.getDBSystemRoot().getDataSource().execute(up);
+    }
 }

/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/element/UniteVenteArticleSQLElement.java
30,6 → 30,7
public class UniteVenteArticleSQLElement extends ComptaSQLConfElement {

public static final int A_LA_PIECE = 2;
public static final int M2 = 4;

public UniteVenteArticleSQLElement() {
super("UNITE_VENTE", "une unité de vente", "unité de vente");

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/action/TransfertStockPanel.java
 ,7 → 214,6
             public void actionPerformed(ActionEvent e) {
                 buttonUpdate.setEnabled(false);
-                defaultLabel = label.getText();
                 BigDecimal qteReel = fieldReel.getValue();
                 List<String> multipleRequestsHundred = new ArrayList<String>(100);
 ,9 → 223,10
                 final SQLRow selectedRowArticle = comboArticle.getSelectedRow();
+                final SQLRow selectedRowDepotDepart = comboStockDepart.getSelectedRow();
+                final SQLRow selectedRowDepotArrivee = comboStockArrive.getSelectedRow();
                 {
                     // DEPART
-                    final SQLRow selectedRowDepotDepart = comboStockDepart.getSelectedRow();
                     final SQLRowAccessor rowStockDepart = ProductComponent.findOrCreateStock(selectedRowArticle, selectedRowDepotDepart);
                     StockItem item = new StockItem(selectedRowArticle, rowStockDepart);
                     if (!item.isStockInit()) {
 ,16 → 245,15
                     stockItems.add(item);
                     double diff = -qteReel.doubleValue();
                     item.updateQty(diff, TypeStockMouvement.REEL);
-                    multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, label.getText(), true, usePrice));
+                    multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, getLabel(label.getText(), selectedRowDepotDepart, selectedRowDepotArrivee), true, usePrice));
                     item.updateQty(diff, TypeStockMouvement.THEORIQUE);
-                    multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, label.getText(), false, usePrice));
+                    multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, getLabel(label.getText(), selectedRowDepotDepart, selectedRowDepotArrivee), false, usePrice));
                     multipleRequestsHundred.add(item.getUpdateRequest());
                 }
                 // ARRIVEE
                 {
-                    final SQLRow selectedRowDepotArrivee = comboStockArrive.getSelectedRow();
                     final SQLRowAccessor rowStockArrivee = ProductComponent.findOrCreateStock(selectedRowArticle, selectedRowDepotArrivee);
                     StockItem item = new StockItem(selectedRowArticle, rowStockArrivee);
 ,10 → 273,10
                     stockItems.add(item);
                     double diff = qteReel.doubleValue();
                     item.updateQty(diff, TypeStockMouvement.REEL);
-                    multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, label.getText(), true, usePrice));
+                    multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, getLabel(label.getText(), selectedRowDepotDepart, selectedRowDepotArrivee), true, usePrice));
                     item.updateQty(diff, TypeStockMouvement.THEORIQUE);
-                    multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, label.getText(), false, usePrice));
+                    multipleRequestsHundred.add(getMvtRequest(dateValue, BigDecimal.ZERO, diff, item, getLabel(label.getText(), selectedRowDepotDepart, selectedRowDepotArrivee), false, usePrice));
                     multipleRequestsHundred.add(item.getUpdateRequest());
                 }
 ,6 → 317,12
         });
     }
+    private String getLabel(String label, SQLRowAccessor fromDepot, SQLRowAccessor toDepot) {
+        return label + " de " + fromDepot.getString("NOM") + " vers " + toDepot.getString("NOM");
+    }
     private String getMvtRequest(Date time, BigDecimal prc, double qteFinal, StockItem item, String label, boolean reel, boolean usePrice) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String mvtStockQuery = "INSERT INTO " + mvtStockTableQuoted + " (\"QTE\",\"DATE\",\"ID_ARTICLE\",\"ID_STOCK\",\"NOM\",\"REEL\",\"ORDRE\"";

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/ui/GestionArticlePreferencePanel.java
 ,8 → 16,10
 import org.openconcerto.erp.config.ComptaPropsConfiguration;
 import org.openconcerto.erp.core.common.ui.AbstractVenteArticleItemTable;
 import org.openconcerto.erp.core.common.ui.TotalPanel;
+import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.sql.Configuration;
+import org.openconcerto.sql.sqlobject.SQLRequestComboBox;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.VerticalLayout;
 import org.openconcerto.ui.preferences.DefaultPreferencePanel;
 ,6 → 32,7
 import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 public class GestionArticlePreferencePanel extends DefaultPreferencePanel {
 ,8 → 39,9
     private final JCheckBox checkModeVente, checkLongueur, checkLargeur, checkPoids;
     private final JCheckBox checkService, checkVenteComptoir, checkShowPoids, checkShowStyle, checkSFE;
-    private final JCheckBox  checkMarge;
+    private final JCheckBox checkMarge;
     private JCheckBox checkSite;
+    private SQLRequestComboBox boxDepot = new SQLRequestComboBox();
     public GestionArticlePreferencePanel() {
         super();
 ,7 → 61,18
         this.checkShowPoids = new JCheckBox("Voir le Poids");
         this.checkMarge = new JCheckBox("Afficher le taux de marque au lieu du taux de marge");
+        final ComptaPropsConfiguration comptaPropsConfiguration = (ComptaPropsConfiguration) Configuration.getInstance();
+        final DepotStockSQLElement elementDepot = comptaPropsConfiguration.getDirectory().getElement(DepotStockSQLElement.class);
+        this.boxDepot.uiInit(elementDepot.createComboRequest());
+        this.add(new JLabel("Dépôt de stock par défaut"), c);
+        c.gridx++;
+        this.add(this.boxDepot, c);
+        c.gridx = 0;
+        c.gridy++;
+        c.gridwidth = 2;
         this.add(this.checkMarge, c);
         c.gridy++;
         this.add(this.checkService, c);
 ,6 → 122,11
         }
         props.setProperty("ArticleVenteComptoir", String.valueOf(this.checkVenteComptoir.isSelected()));
         props.setProperty(TotalPanel.MARGE_MARQUE, String.valueOf(this.checkMarge.isSelected()));
+        int selId = DepotStockSQLElement.DEFAULT_ID;
+        if (!this.boxDepot.isEmpty() && !this.boxDepot.getSelectedRow().isUndefined()) {
+            selId = this.boxDepot.getSelectedId();
+        }
+        props.setProperty("DepotStockDefault", String.valueOf(selId));
         props.store();
     }
 ,6 → 152,11
     private void setValues() {
         final DefaultProps props = DefaultNXProps.getInstance();
+        // depot
+        final int depot = props.getIntProperty("DepotStockDefault");
+        this.boxDepot.setValue(depot);
         // service
         final String service = props.getStringProperty("ArticleService");
         final Boolean bService = Boolean.valueOf(service);
 ,7 → 192,6
         // Show Style
         this.checkShowStyle.setSelected(props.getBooleanValue("ArticleShowStyle", false));
         // Devise
         this.checkMarge.setSelected(props.getBooleanValue(TotalPanel.MARGE_MARQUE, false));

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/ui/DeliveredQtyRowValuesRenderer.java
 ,6 → 18,7
 import org.openconcerto.sql.view.list.RowValuesTable;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.ui.table.AlternateTableCellRenderer;
+import org.openconcerto.ui.table.XTableColumnModel;
 import org.openconcerto.utils.CollectionUtils;
 import java.awt.Color;
 ,26 → 65,31
         if (table instanceof RowValuesTable) {
             ((JLabel) comp).setHorizontalAlignment(SwingConstants.RIGHT);
-            RowValuesTableModel model = ((RowValuesTable) table).getRowValuesTableModel();
-            SQLRowValues rowVals = model.getRowValuesAt(row);
+            RowValuesTable rowValuesTable = (RowValuesTable) table;
+            XTableColumnModel columnModel = rowValuesTable.getColumnModel();
+            RowValuesTableModel model = rowValuesTable.getRowValuesTableModel();
+            boolean qteALivrerVisible = columnModel.isColumnVisible(columnModel.getColumnByModelIndex(model.getColumnForField("QTE_A_LIVRER")));
+            if (qteALivrerVisible) {
+                SQLRowValues rowVals = model.getRowValuesAt(row);
-            Number qte;
-            Number qteL;
-            if (this.customer) {
-                qte = (Number) rowVals.getObject("QTE");
-                qteL = (Number) rowVals.getObject("QTE_LIVREE");
-            } else {
-                qte = (Number) rowVals.getObject("QTE_ORIGINE");
-                qteL = (Number) rowVals.getObject("QTE");
-            }
-            if (qte != null && qteL != null) {
-                if (qte.intValue() < qteL.intValue()) {
-                    comp.setBackground(red);
-                } else if (qteL.intValue() <= 0) {
-                    comp.setBackground(lightBlack);
-                } else if (qteL.intValue() != qte.intValue()) {
-                    comp.setBackground(orange);
+                Number qte;
+                Number qteL;
+                if (this.customer) {
+                    qte = (Number) rowVals.getObject("QTE");
+                    qteL = (Number) rowVals.getObject("QTE_LIVREE");
+                } else {
+                    qte = (Number) rowVals.getObject("QTE_ORIGINE");
+                    qteL = (Number) rowVals.getObject("QTE");
                 }
+                if (qte != null && qteL != null) {
+                    if (qte.intValue() < qteL.intValue()) {
+                        comp.setBackground(red);
+                    } else if (qteL.intValue() <= 0) {
+                        comp.setBackground(lightBlack);
+                    } else if (qteL.intValue() != qte.intValue()) {
+                        comp.setBackground(orange);
+                    }
+                }
             }
         }
         return comp;

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/model/ProductHelper.java
 ,6 → 25,7
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.ListMap;
+import org.openconcerto.utils.Tuple2;
 import org.openconcerto.utils.cc.ITransformer;
 import java.math.BigDecimal;
 ,6 → 453,46
     }
+    public Tuple2<BigDecimal, BigDecimal> getStandardBomPrices(Collection<? extends SQLRowAccessor> rowValuesProductItems) {
+        final Map<Long, Integer> productQties = new HashMap<Long, Integer>();
+        for (SQLRowAccessor v : rowValuesProductItems) {
+            if (v.getObject("ID_ARTICLE") != null) {
+                System.out.println("id:" + v.getObject("ID_ARTICLE"));
+                int id = v.getForeignID("ID_ARTICLE");
+                int qte = v.getInt("QTE");
+                Integer qteForId = productQties.get(Long.valueOf(id));
+                if (qteForId == null) {
+                    productQties.put(Long.valueOf(id), qte);
+                } else {
+                    productQties.put(Long.valueOf(id), qte + qteForId);
+                }
+            }
+        }
+        BigDecimal costPV = null;
+        BigDecimal costPA = null;
+        for (SQLRowAccessor v : rowValuesProductItems) {
+            if (v.getObject("ID_ARTICLE") != null) {
+                SQLRowAccessor rowChild = v.getForeign("ID_ARTICLE");
+                int qte = v.getInt("QTE");
+                BigDecimal unitCostPV = rowChild.getBigDecimal("PV_HT");
+                BigDecimal unitCostPA = rowChild.getBigDecimal("PA_HT");
+                BigDecimal lineCostPV = unitCostPV.multiply(BigDecimal.valueOf(qte)).multiply(v.getBigDecimal("QTE_UNITAIRE"));
+                if (costPV == null) {
+                    costPV = BigDecimal.ZERO;
+                }
+                costPV = costPV.add(lineCostPV);
+                BigDecimal lineCostPA = unitCostPA.multiply(BigDecimal.valueOf(qte)).multiply(v.getBigDecimal("QTE_UNITAIRE"));
+                if (costPA == null) {
+                    costPA = BigDecimal.ZERO;
+                }
+                costPA = costPA.add(lineCostPA);
+            }
+        }
+        return Tuple2.create(costPA, costPV);
+    }
     public BigDecimal getUnitCost(int id, int qty, TypePrice type) {
         Map<Long, Integer> productQties = new HashMap<Long, Integer>();
         productQties.put(Long.valueOf(id), Integer.valueOf(qty));

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/product/component/ReferenceArticleSQLComponent.java
 ,6 → 23,7
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
 import org.openconcerto.erp.core.sales.product.element.SupplierPriceListTable;
 import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
+import org.openconcerto.erp.core.sales.product.model.ProductHelper;
 import org.openconcerto.erp.core.sales.product.ui.ArticleCategorieComptableTable;
 import org.openconcerto.erp.core.sales.product.ui.ArticleDesignationTable;
 import org.openconcerto.erp.core.sales.product.ui.ArticleTarifTable;
 ,9 → 30,7
 import org.openconcerto.erp.core.sales.product.ui.ProductItemListTable;
 import org.openconcerto.erp.core.sales.product.ui.ProductQtyPriceListTable;
 import org.openconcerto.erp.core.sales.product.ui.RowValuesTableEditionPanel;
-import org.openconcerto.erp.core.supplychain.stock.element.ComposedItemStockUpdater;
 import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
-import org.openconcerto.erp.core.supplychain.stock.element.StockItem;
 import org.openconcerto.erp.model.ISQLCompteSelector;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 ,6 → 49,7
 import org.openconcerto.sql.sqlobject.SQLTextCombo;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.FormLayouter;
+import org.openconcerto.ui.JDate;
 import org.openconcerto.ui.TitledSeparator;
 import org.openconcerto.ui.component.ITextArea;
 import org.openconcerto.ui.preferences.DefaultProps;
 ,6 → 56,7
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.ExceptionHandler;
 import org.openconcerto.utils.StringUtils;
+import org.openconcerto.utils.Tuple2;
 import org.openconcerto.utils.text.SimpleDocumentListener;
 import java.awt.Component;
 ,7 → 70,6
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 ,6 → 84,8
 import javax.swing.SwingConstants;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 public class ReferenceArticleSQLComponent extends BaseSQLComponent {
 ,6 → 468,7
                 selectModeVente(ReferenceArticleSQLComponent.this.comboSelModeVente.getSelectedId());
             }
         };
         setListenerModeVenteActive(true);
         this.comboSelModeVente.setValue(ReferenceArticleSQLElement.A_LA_PIECE);
 ,9 → 501,31
         panel.add(textTare, c);
         addView(textTare, "TARE");
+        c.gridy++;
+        c.gridx = 0;
         c.weightx = 0;
+        JLabel labelDLC = new JLabel(getLabelFor("DLC"));
+        panel.add(labelDLC, c);
+        c.weightx = 1;
+        c.gridx++;
+        JDate dateDLC = new JDate();
+        panel.add(dateDLC, c);
+        addView(dateDLC, "DLC");
+        c.weightx = 0;
         c.gridy++;
         c.gridx = 0;
+        if (getTable().contains("POIDS_COLIS_NET")) {
+            JLabel labelPdsColis = new JLabel(getLabelFor("POIDS_COLIS_NET"));
+            panel.add(labelPdsColis, c);
+            c.weightx = 1;
+            c.gridx++;
+            JTextField textPdsColis = new JTextField(40);
+            panel.add(textPdsColis, c);
+            addView(textPdsColis, "POIDS_COLIS_NET");
+            c.gridx++;
+        }
         JLabel labelMasque = new JLabel(getLabelFor("MASQUE_CAISSE"));
         c.fill = GridBagConstraints.BOTH;
         panel.add(labelMasque, c);
 ,6 → 614,42
             panel.add(fieldColoris, c);
             this.addView(fieldColoris, "COLORIS");
         }
+        JTextField fieldLongueur = new JTextField();
+        c.gridy++;
+        c.fill = GridBagConstraints.HORIZONTAL;
+        c.weightx = 0;
+        c.gridwidth = 1;
+        panel.add(new JLabel(getLabelFor("LONGUEUR")), c);
+        c.weightx = 1;
+        c.gridx++;
+        panel.add(fieldLongueur, c);
+        this.addView(fieldLongueur, "LONGUEUR");
+        JTextField fieldLargeur = new JTextField();
+        c.gridx++;
+        c.fill = GridBagConstraints.HORIZONTAL;
+        c.weightx = 0;
+        c.gridwidth = 1;
+        panel.add(new JLabel(getLabelFor("LARGEUR")), c);
+        c.weightx = 1;
+        c.gridx++;
+        panel.add(fieldLargeur, c);
+        this.addView(fieldLargeur, "LARGEUR");
+        JTextField fieldHauteur = new JTextField();
+        c.gridy++;
+        c.gridx = 0;
+        c.fill = GridBagConstraints.HORIZONTAL;
+        c.weightx = 0;
+        c.gridwidth = 1;
+        panel.add(new JLabel(getLabelFor("HAUTEUR")), c);
+        c.weightx = 1;
+        c.gridx++;
+        panel.add(fieldHauteur, c);
+        this.addView(fieldHauteur, "HAUTEUR");
         ITextArea area = new ITextArea();
         JLabel sep = new JLabel("Descriptif complet");
         c.gridy++;
 ,12 → 897,96
         SQLPreferences prefs = new SQLPreferences(ComptaPropsConfiguration.getInstanceCompta().getRootSociete());
         final boolean supplierCode = prefs.getBoolean(GestionArticleGlobalPreferencePanel.SUPPLIER_PRODUCT_CODE, false);
+        // Tarif fournisseur
+        c.gridy++;
+        c.gridx = 0;
+        c.gridwidth = GridBagConstraints.REMAINDER;
+        TitledSeparator sep = new TitledSeparator("Tarifs fournisseurs");
+        panel.add(sep, c);
+        // Ajout fournisseur
+        c.gridwidth = 1;
+        c.weightx = 0;
+        c.gridy++;
+        c.gridx = 0;
+        panel.add(new JLabel("Ajouter le fournisseur "), c);
+        final ElementComboBox boxF = new ElementComboBox();
+        boxF.init(Configuration.getInstance().getDirectory().getElement("FOURNISSEUR"));
+        c.gridx++;
+        panel.add(boxF, c);
+        c.fill = GridBagConstraints.NONE;
+        c.gridx++;
+        JButton buttonAjouter = new JButton("Ajouter");
+        buttonAjouter.setOpaque(false);
+        panel.add(buttonAjouter, c);
+        c.gridx++;
+        JButton buttonSupprimer = new JButton("Supprimer");
+        buttonSupprimer.setOpaque(false);
+        panel.add(buttonSupprimer, c);
+        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.fill = GridBagConstraints.BOTH;
+        c.weightx = 1;
+        c.weighty = 1;
+        c.gridy++;
+        c.gridx = 0;
+        c.fill = GridBagConstraints.BOTH;
+        this.tableFourSec.setOpaque(false);
+        panel.add(this.tableFourSec, c);
+        // Listeners
+        buttonAjouter.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                SQLRow rowCat = boxF.getSelectedRow();
+                if (rowCat == null || rowCat.isUndefined()) {
+                    return;
+                }
+                int nbRows = tableFourSec.getModel().getRowCount();
+                // for (int i = 0; i < nbRows; i++) {
+                // SQLRowValues rowVals = tableFourSec.getModel().getRowValuesAt(i);
+                // int idTarif =
+                // Integer.parseInt(rowVals.getObject("ID_FOURNISSEUR").toString());
+                // if (idTarif == rowCat.getID()) {
+                // JOptionPane.showMessageDialog(null, "Impossible d'ajouter.\nLe fournisseur
+                // est déjà présent dans la liste!");
+                // return;
+                // }
+                // }
+                SQLRowValues rowVals = new SQLRowValues(Configuration.getInstance().getBase().getTable("ARTICLE_TARIF_FOURNISSEUR"));
+                if (getSelectedID() > 1) {
+                    rowVals.put("ID_ARTICLE", getSelectedID());
+                }
+                rowVals.put("ID_FOURNISSEUR", rowCat.getID());
+                tableFourSec.getModel().addRow(rowVals);
+            }
+        });
+        buttonSupprimer.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                tableFourSec.removeSelectedRow();
+            }
+        });
         if (getTable().getSchema().contains("CODE_FOURNISSEUR") && supplierCode) {
+            c.gridy++;
+            c.gridx = 0;
+            c.gridwidth = GridBagConstraints.REMAINDER;
+            TitledSeparator sepC = new TitledSeparator("Codes fournisseurs");
+            panel.add(sepC, c);
             this.rowValuesDefaultCodeFournisseur = new SQLRowValues(getTable().getTable("CODE_FOURNISSEUR"));
             this.codeFournisseurTable = new CodeFournisseurItemTable(this.rowValuesDefaultCodeFournisseur);
             c.gridy++;
             c.gridx = 0;
-            c.gridwidth = 3;
+            c.gridwidth = GridBagConstraints.REMAINDER;
             c.weighty = 1;
             c.weightx = 1;
             c.fill = GridBagConstraints.BOTH;
 ,88 → 998,9
                     rowValuesDefaultCodeFournisseur.put("ID_FOURNISSEUR", comboSelFournisseur.getSelectedId());
                 }
             });
-        } else {
-            // Tarif fournisseur
-            c.gridy++;
-            c.gridx = 0;
-            c.gridwidth = GridBagConstraints.REMAINDER;
-            TitledSeparator sep = new TitledSeparator("Tarifs fournisseurs");
-            panel.add(sep, c);
-            // Ajout fournisseur
-            c.gridwidth = 1;
-            c.weightx = 0;
-            c.gridy++;
-            c.gridx = 0;
-            panel.add(new JLabel("Ajouter le fournisseur "), c);
-            final ElementComboBox boxF = new ElementComboBox();
-            boxF.init(Configuration.getInstance().getDirectory().getElement("FOURNISSEUR"));
-            c.gridx++;
-            panel.add(boxF, c);
-            c.fill = GridBagConstraints.NONE;
-            c.gridx++;
-            JButton buttonAjouter = new JButton("Ajouter");
-            buttonAjouter.setOpaque(false);
-            panel.add(buttonAjouter, c);
-            c.gridx++;
-            JButton buttonSupprimer = new JButton("Supprimer");
-            buttonSupprimer.setOpaque(false);
-            panel.add(buttonSupprimer, c);
-            c.gridwidth = GridBagConstraints.REMAINDER;
-            c.fill = GridBagConstraints.BOTH;
-            c.weightx = 1;
-            c.weighty = 1;
-            c.gridy++;
-            c.gridx = 0;
-            c.fill = GridBagConstraints.BOTH;
-            this.tableFourSec.setOpaque(false);
-            panel.add(this.tableFourSec, c);
-            // Listeners
-            buttonAjouter.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    SQLRow rowCat = boxF.getSelectedRow();
-                    if (rowCat == null || rowCat.isUndefined()) {
-                        return;
-                    }
-                    int nbRows = tableFourSec.getModel().getRowCount();
-                    // for (int i = 0; i < nbRows; i++) {
-                    // SQLRowValues rowVals = tableFourSec.getModel().getRowValuesAt(i);
-                    // int idTarif =
-                    // Integer.parseInt(rowVals.getObject("ID_FOURNISSEUR").toString());
-                    // if (idTarif == rowCat.getID()) {
-                    // JOptionPane.showMessageDialog(null, "Impossible d'ajouter.\nLe fournisseur
-                    // est déjà présent dans la liste!");
-                    // return;
-                    // }
-                    // }
-                    SQLRowValues rowVals = new SQLRowValues(Configuration.getInstance().getBase().getTable("ARTICLE_TARIF_FOURNISSEUR"));
-                    if (getSelectedID() > 1) {
-                        rowVals.put("ID_ARTICLE", getSelectedID());
-                    }
-                    rowVals.put("ID_FOURNISSEUR", rowCat.getID());
-                    tableFourSec.getModel().addRow(rowVals);
-                }
-            });
-            buttonSupprimer.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    tableFourSec.removeSelectedRow();
-                }
-            });
         }
         return panel;
     }
     private JPanel createExportationPanel() {
 ,17 → 1209,68
         panel.setOpaque(false);
         GridBagConstraints c = new DefaultGridBagConstraints();
+        final JCheckBox checkAutoPrice = new JCheckBox(getLabelFor("AUTO_PRIX_MIN_VENTE_NOMENCLATURE"));
+        panel.add(checkAutoPrice, c);
+        this.addView(checkAutoPrice, "AUTO_PRIX_MIN_VENTE_NOMENCLATURE");
+        c.gridx++;
+        final JCheckBox checkAutoPriceHA = new JCheckBox(getLabelFor("AUTO_PRIX_ACHAT_NOMENCLATURE"));
+        panel.add(checkAutoPriceHA, c);
+        this.addView(checkAutoPriceHA, "AUTO_PRIX_ACHAT_NOMENCLATURE");
+        checkAutoPrice.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                updatePricesNomenclature(checkAutoPrice, checkAutoPriceHA);
+            }
+        });
+        checkAutoPriceHA.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                updatePricesNomenclature(checkAutoPrice, checkAutoPriceHA);
+            }
+        });
         c.gridwidth = GridBagConstraints.REMAINDER;
         c.fill = GridBagConstraints.BOTH;
         c.weightx = 1;
         c.weighty = 1;
         c.gridx = 0;
+        c.gridy++;
         c.fill = GridBagConstraints.BOTH;
         this.tableBom.setOpaque(false);
         panel.add(new RowValuesTableEditionPanel(this.tableBom), c);
+        this.tableBom.getModel().addTableModelListener(new TableModelListener() {
+            @Override
+            public void tableChanged(TableModelEvent e) {
+                updatePricesNomenclature(checkAutoPrice, checkAutoPriceHA);
+            }
+        });
         return panel;
     }
+    private void updatePricesNomenclature(final JCheckBox checkAutoPrice, final JCheckBox checkAutoPriceHA) {
+        final Boolean vtAuto = checkAutoPrice.isSelected();
+        final Boolean haAuto = checkAutoPriceHA.isSelected();
+        if (vtAuto || haAuto) {
+            ProductHelper helper = new ProductHelper(getTable().getDBRoot());
+            Tuple2<BigDecimal, BigDecimal> p = helper.getStandardBomPrices(tableBom.getRowValuesTable().getRowValuesTableModel().getCopyOfValues());
+            if (haAuto && p.get0() != null) {
+                textPAHT.setText(p.get0().toString());
+            }
+            if (vtAuto && p.get1() != null) {
+                textPVHT.setText(p.get1().toString());
+            }
+        }
+    }
     private JPanel createTarifQtePanel() {
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setOpaque(false);
 ,27 → 1680,28
     @Override
     public void update() {
         SQLRow row = this.getTable().getRow(this.getSelectedID());
+        final int selectedID = getSelectedID();
             super.update();
-        this.tableTarifVente.updateField("ID_ARTICLE", getSelectedID());
-        this.tableCatComptable.updateField("ID_ARTICLE", getSelectedID());
-        this.tableFourSec.updateField("ID_ARTICLE", getSelectedID());
-        this.tableTarifQteVente.updateField("ID_ARTICLE", getSelectedID());
+        this.tableTarifVente.updateField("ID_ARTICLE", selectedID);
+        this.tableCatComptable.updateField("ID_ARTICLE", selectedID);
+        this.tableFourSec.updateField("ID_ARTICLE", selectedID);
+        this.tableTarifQteVente.updateField("ID_ARTICLE", selectedID);
         if (this.tableBom != null) {
-            this.tableBom.updateField("ID_ARTICLE_PARENT", getSelectedID());
+            this.tableBom.updateField("ID_ARTICLE_PARENT", selectedID);
         }
-        this.tableDes.updateField("ID_ARTICLE", getSelectedID());
-        this.tableCodeClient.updateField("ID_ARTICLE", getSelectedID());
+        this.tableDes.updateField("ID_ARTICLE", selectedID);
+        this.tableCodeClient.updateField("ID_ARTICLE", selectedID);
         if (this.codeFournisseurTable != null) {
-            this.codeFournisseurTable.updateField("ID_ARTICLE", getSelectedID());
+            this.codeFournisseurTable.updateField("ID_ARTICLE", selectedID);
         }
-        ((ReferenceArticleSQLElement) getElement()).initStock(getSelectedID());
+        ((ReferenceArticleSQLElement) getElement()).initStock(selectedID);
         SQLSelect sel = new SQLSelect();
         SQLTable tableStock = getTable().getTable("STOCK");
         sel.addSelect(tableStock.getKey());
-        Where w = new Where(tableStock.getField("ID_ARTICLE"), "=", getSelectedID()).and(new Where(tableStock.getField("ID_DEPOT_STOCK"), "=", row.getForeignID("ID_DEPOT_STOCK")));
+        Where w = new Where(tableStock.getField("ID_ARTICLE"), "=", selectedID).and(new Where(tableStock.getField("ID_DEPOT_STOCK"), "=", row.getForeignID("ID_DEPOT_STOCK")));
         sel.setWhere(w);
         List<SQLRow> stock = SQLRowListRSH.execute(sel);
 ,6 → 1713,54
             }
         }
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                SQLRow rowArticle = getTable().getRow(selectedID);
+                List<SQLRow> itemsRows = rowArticle.getReferentRows(getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE"));
+                for (SQLRow rowArticleItem : itemsRows) {
+                    SQLRow rowA = rowArticleItem.getForeign("ID_ARTICLE_PARENT");
+                    if (rowA != null && !rowA.isUndefined()) {
+                        final Boolean vtAuto = rowA.getBoolean("AUTO_PRIX_MIN_VENTE_NOMENCLATURE");
+                        final Boolean haAuto = rowA.getBoolean("AUTO_PRIX_ACHAT_NOMENCLATURE");
+                        if (vtAuto || haAuto) {
+                            ProductHelper helper = new ProductHelper(rowA.getTable().getDBRoot());
+                            Tuple2<BigDecimal, BigDecimal> p = helper.getStandardBomPrices(rowA.getReferentRows(rowA.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT")));
+                            SQLRowValues rowVals = rowA.createEmptyUpdateRow();
+                            boolean up = false;
+                            if (vtAuto && p.get1() != null) {
+                                rowVals.put("PRIX_METRIQUE_VT_1", p.get1());
+                                rowVals.put("PV_HT", p.get1());
+                                float t = TaxeCache.getCache().getFirstTaxe().getFloat("TAUX");
+                                if (!rowA.isForeignEmpty("ID_TAXE")) {
+                                    t = TaxeCache.getCache().getTauxFromId(rowA.getForeignID("ID_TAXE"));
+                                }
+                                rowVals.put("PV_TTC", p.get1().multiply(new BigDecimal(t).movePointLeft(2).add(BigDecimal.ONE)).setScale(2, RoundingMode.HALF_UP));
+                                up = true;
+                            }
+                            if (haAuto && p.get0() != null) {
+                                rowVals.put("PRIX_METRIQUE_HA_1", p.get0());
+                                rowVals.put("PA_HT", p.get0());
+                                up = true;
+                            }
+                            if (up) {
+                                try {
+                                    rowVals.commit();
+                                } catch (SQLException e) {
+                                    ExceptionHandler.handle("Erreur lors de la mise à jour des tarifs des nomenclatures", e);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        new Thread(r).run();
+        ReferenceArticleSQLElement.updateDateAchat(getTable(), getTable().getRow(selectedID));
     }
     /**
 ,6 → 1827,7
             this.codeFournisseurTable.updateField("ID_ARTICLE", id);
         }
         ((ReferenceArticleSQLElement) getElement()).initStock(id);
+        ReferenceArticleSQLElement.updateDateAchat(getTable(), getTable().getRow(id));
         return id;
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/IListTotalPanel.java
 ,9 → 19,11
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.sql.view.list.ITableModel;
+import org.openconcerto.sql.view.list.ListSQLLine;
 import org.openconcerto.sql.view.list.SQLTableModelColumn;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.JLabelBold;
+import org.openconcerto.utils.TableSorter;
 import org.openconcerto.utils.Tuple2;
 import java.awt.GridBagConstraints;
 ,6 → 43,7
 import javax.swing.event.EventListenerList;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
 public class IListTotalPanel extends JPanel {
     CurrencyConverter cc = new CurrencyConverter();
 ,7 → 84,10
         List<Tuple2<? extends SQLTableModelColumn, Type>> lFinal = new ArrayList<Tuple2<? extends SQLTableModelColumn, Type>>();
         for (SQLField field : l) {
-            lFinal.add(Tuple2.create(iL.getSource().getColumn(field), Type.SOMME));
+            final SQLTableModelColumn col = iL.getSource().getColumn(field);
+            if (col == null)
+                throw new IllegalArgumentException("No column with just " + field + " : " + iL.getSource().getColumns());
+            lFinal.add(Tuple2.create(col, Type.SOMME));
         }
         return lFinal;
     }
 ,27 → 144,44
         }
         this.list.addListener(new TableModelListener() {
+            private Object getValueAt(final ListSQLLine line, final SQLTableModelColumn col, final List<SQLTableModelColumn> columns) {
+                final int indexOf = columns.indexOf(col);
+                final Object res = line.getValueAt(indexOf);
+                if (res == null)
+                    throw new IllegalStateException("Null value for " + col + " in " + line);
+                return res;
+            }
             @Override
             public void tableChanged(TableModelEvent e) {
+                final TableModel model = (TableModel) e.getSource();
+                final ITableModel sqlModel;
+                if (model instanceof ITableModel)
+                    sqlModel = (ITableModel) model;
+                else
+                    sqlModel = (ITableModel) ((TableSorter) model).getTableModel();
                 Map<SQLTableModelColumn, BigDecimal> mapTotal = new HashMap<SQLTableModelColumn, BigDecimal>();
                 Map<SQLTableModelColumn, Double> mapPourcent = new HashMap<SQLTableModelColumn, Double>();
                 Map<SQLTableModelColumn, Integer> mapPourcentSize = new HashMap<SQLTableModelColumn, Integer>();
                 for (Tuple2<? extends SQLTableModelColumn, Type> field : listField) {
                     if (field.get1() == Type.COUNT) {
-                        map.get(field.get0()).setText(String.valueOf(list.getRowCount()));
+                        map.get(field.get0()).setText(String.valueOf(model.getRowCount()));
                     }
                 }
-                for (int i = 0; i < list.getRowCount(); i++) {
+                for (int i = 0; i < model.getRowCount(); i++) {
+                    final ListSQLLine line = sqlModel.getRow(i);
+                    final SQLRowValues rowAt = line.getRow();
+                    final List<SQLTableModelColumn> columns = line.getColumns().getColumns();
-                    final SQLRowValues rowAt = ITableModel.getLine(list.getModel(), i).getRow();
+                    for (final Tuple2<? extends SQLTableModelColumn, Type> field : listField) {
+                        final Type type = field.get1();
-                    for (Tuple2<? extends SQLTableModelColumn, Type> field : listField) {
+                        if (type == Type.MOYENNE_POURCENT) {
+                            final Double n2 = (Double) getValueAt(line, field.get0(), columns);
-                        if (field.get1() == Type.MOYENNE_POURCENT) {
-                            Double n2 = (Double) list.getModel().getValueAt(i, list.getSource().getColumns().indexOf(field.get0()));
                             boolean in = true;
                             if (filters != null) {
 ,13 → 211,12
                                 }
                             }
-                        } else if (field.get1() == Type.AVANCEMENT_TTC) {
+                        } else if (type == Type.AVANCEMENT_TTC) {
                             BigDecimal n = mapTotal.get(field.get0());
-                            final SQLTableModelColumn columnTTC = list.getSource().getColumn(list.getSource().getPrimaryTable().getField("T_TTC"));
-                            BigDecimal ttc = BigDecimal.valueOf(((Number) list.getModel().getValueAt(i, list.getSource().getColumns().indexOf(columnTTC))).doubleValue());
+                            BigDecimal ttc = BigDecimal.valueOf(line.getRow().getObjectAs("T_TTC", Number.class).doubleValue());
-                            BigDecimal av = BigDecimal.valueOf(((Number) list.getModel().getValueAt(i, list.getSource().getColumns().indexOf(field.get0()))).doubleValue());
+                            BigDecimal av = BigDecimal.valueOf(((Number) getValueAt(line, field.get0(), columns)).doubleValue());
                             boolean in = true;
 ,10 → 238,11
                                     mapTotal.put(field.get0(), n.add(ttc.multiply(av).movePointLeft(2)));
                                 }
                             }
-                        } else if (field.get1() != Type.MOYENNE_MARGE && field.get1() != Type.COUNT) {
+                        } else if (type != Type.MOYENNE_MARGE && type != Type.COUNT) {
                             BigDecimal n = mapTotal.get(field.get0());
-                            BigDecimal n2 = BigDecimal.valueOf(((Number) list.getModel().getValueAt(i, list.getSource().getColumns().indexOf(field.get0()))).doubleValue());
+                            final Object value = getValueAt(line, field.get0(), columns);
+                            final BigDecimal n2 = BigDecimal.valueOf(((Number) value).doubleValue());
                             boolean in = true;

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractArticleItemTable.java
 ,6 → 372,7
                     BigDecimal prixUnitHT = BigDecimal.ZERO;
                     BigDecimal prixUnitHA = BigDecimal.ZERO;
+                    BigDecimal prixUnitEco = BigDecimal.ZERO;
                     boolean update = false;
                     int indexToUpdate = index;
 ,6 → 392,10
                                 // Cumul des valeurs
                                 prixUnitHT = prixUnitHT.add(rowVals.getBigDecimal("PV_HT").multiply(new BigDecimal(rowVals.getInt("QTE"))).multiply(rowVals.getBigDecimal("QTE_UNITAIRE")));
                                 prixUnitHA = prixUnitHA.add(rowVals.getBigDecimal("PA_HT").multiply(new BigDecimal(rowVals.getInt("QTE"))).multiply(rowVals.getBigDecimal("QTE_UNITAIRE")));
+                                BigDecimal eco = rowVals.getBigDecimal("ECO_CONTRIBUTION");
+                                if (eco != null) {
+                                    prixUnitEco = prixUnitEco.add(eco.multiply(new BigDecimal(rowVals.getInt("QTE"))).multiply(rowVals.getBigDecimal("QTE_UNITAIRE")));
+                                }
                             }
                         }
                     }
 ,6 → 409,10
                         if (columnForFieldPVht1 >= 0) {
                             this.model.setValueAt(prixUnitHT, indexToUpdate, columnForFieldPVht1);
                         }
+                        final int columnForFieldEco = this.model.getColumnForField("ECO_CONTRIBUTION");
+                        if (columnForFieldEco >= 0) {
+                            this.model.setValueAt(prixUnitEco, indexToUpdate, columnForFieldEco);
+                        }
                     }
                     index = indexToUpdate - 1;
                 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractVenteArticleItemTable.java
 ,6 → 19,7
 import org.openconcerto.erp.core.sales.pos.io.BarcodeReader;
 import org.openconcerto.erp.core.sales.pos.ui.BarcodeListener;
 import org.openconcerto.erp.core.sales.product.element.ReferenceArticleSQLElement;
+import org.openconcerto.erp.core.sales.product.element.UniteVenteArticleSQLElement;
 import org.openconcerto.erp.core.sales.product.model.ProductComponent;
 import org.openconcerto.erp.core.sales.product.model.ProductHelper;
 import org.openconcerto.erp.core.sales.product.model.ProductHelper.TypePrice;
 ,6 → 27,7
 import org.openconcerto.erp.core.sales.product.ui.CurrencyWithSymbolRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QteMultipleRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QteUnitRowValuesRenderer;
+import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
 import org.openconcerto.erp.core.supplychain.stock.element.StockSQLElement;
 import org.openconcerto.erp.importer.ArrayTableModel;
 import org.openconcerto.erp.importer.DataImporter;
 ,6 → 60,7
 import org.openconcerto.sql.view.list.SQLTableElement;
 import org.openconcerto.sql.view.list.SQLTextComboTableCellEditor;
 import org.openconcerto.sql.view.list.ValidStateChecker;
+import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.CompareUtils;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.StringUtils;
 ,7 → 139,7
     protected SQLTableElement tableElementRemise;
     public enum TypeCalcul {
-        CALCUL_FACTURABLE("MONTANT_FACTURABLE", "POURCENT_FACTURABLE"), CALCUL_REMISE("MONTANT_REMISE", "POURCENT_REMISE");
+        CALCUL_MONTANT_TOTAL("MONTANT_FACTURABLE", "POURCENT_FACTURABLE"), CALCUL_FACTURABLE("MONTANT_FACTURABLE", "POURCENT_FACTURABLE"), CALCUL_REMISE("MONTANT_REMISE", "POURCENT_REMISE");
         String fieldMontant, fieldPourcent;
 ,7 → 157,10
         }
     };
+    private Acompte acompteFacturer = null;
     public void calculPourcentage(final Acompte a, final TypeCalcul type) {
+        this.acompteFacturer = a;
         Runnable r = new Runnable() {
             @Override
 ,39 → 184,8
                                 tableElement.fireModification(model.getRowValuesAt(i));
                             }
                         } else {
-                            // FIXME repartition du montant sur chaque ligne
-                            BigDecimal totalHT = BigDecimal.ZERO;
-                            for (SQLRowValues rowVals : getRowValuesAtLevel(1)) {
-                                int qte = rowVals.getInt("QTE");
-                                BigDecimal qteU = rowVals.getBigDecimal("QTE_UNITAIRE");
-                                BigDecimal pU = rowVals.getBigDecimal("PV_HT");
+                            BigDecimal totalHT = getTotalHT(type);
-                                BigDecimal totalLine = pU.multiply(qteU, DecimalUtils.HIGH_PRECISION).multiply(new BigDecimal(qte), DecimalUtils.HIGH_PRECISION).setScale(2, RoundingMode.HALF_UP);
-                                // BigDecimal lremise = (type == TypeCalcul.CALCUL_FACTURABLE ?
-                                // rowVals.getBigDecimal("POURCENT_REMISE") : BigDecimal.ZERO);
-                                //
-                                // if (lremise.compareTo(BigDecimal.ZERO) > 0 &&
-                                // lremise.compareTo(BigDecimal.valueOf(100)) < 100) {
-                                // totalLine =
-                                // totalLine.multiply(BigDecimal.valueOf(100).subtract(lremise),
-                                // DecimalUtils.HIGH_PRECISION).movePointLeft(2);
-                                // }
-                                if (type == TypeCalcul.CALCUL_FACTURABLE) {
-                                    if (rowVals.getTable().getFieldsName().contains("MONTANT_REMISE")) {
-                                        final BigDecimal acomptePercent = rowVals.getBigDecimal("POURCENT_REMISE");
-                                        final BigDecimal acompteMontant = rowVals.getBigDecimal("MONTANT_REMISE");
-                                        Remise remise = new Remise(acomptePercent, acompteMontant);
-                                        totalLine = remise.getResultFrom(totalLine);
-                                    }
-                                }
-                                totalHT = totalHT.add(totalLine);
-                            }
-                            // BigDecimal percent = (totalHT.signum() != 0 ?
-                            // a.getMontant().divide(totalHT, DecimalUtils.HIGH_PRECISION) :
-                            // BigDecimal.ZERO);
                             for (int i = 0; i < model.getRowCount(); i++) {
                                 // Restrict to level 1
                                 if (model.getRowValuesAt(i).getInt("NIVEAU") != 1) {
 ,15 → 199,6
                                 BigDecimal totalLine = pU.multiply(qteU, DecimalUtils.HIGH_PRECISION).multiply(new BigDecimal(qte), DecimalUtils.HIGH_PRECISION).setScale(2, RoundingMode.HALF_UP);
-                                // BigDecimal lremise = (type == TypeCalcul.CALCUL_FACTURABLE ?
-                                // rowVals.getBigDecimal("POURCENT_REMISE") : BigDecimal.ZERO);
-                                //
-                                // if (lremise.compareTo(BigDecimal.ZERO) > 0 &&
-                                // lremise.compareTo(BigDecimal.valueOf(100)) < 100) {
-                                // totalLine =
-                                // totalLine.multiply(BigDecimal.valueOf(100).subtract(lremise),
-                                // DecimalUtils.HIGH_PRECISION).movePointLeft(2);
-                                // }
                                 if (rowVals.getTable().getFieldsName().contains("MONTANT_REMISE")) {
                                     final BigDecimal acomptePercent = rowVals.getBigDecimal("POURCENT_REMISE");
                                     final BigDecimal acompteMontant = rowVals.getBigDecimal("MONTANT_REMISE");
 ,6 → 214,7
                         }
                         model.fireTableDataChanged();
                     }
                 });
             }
         };
 ,6 → 222,37
     }
+    public BigDecimal getTotalHT(final TypeCalcul type) {
+        BigDecimal totalHT = BigDecimal.ZERO;
+        for (SQLRowValues rowVals : getRowValuesAtLevel(1)) {
+            int qte = rowVals.getInt("QTE");
+            BigDecimal qteU = rowVals.getBigDecimal("QTE_UNITAIRE");
+            BigDecimal pU = rowVals.getBigDecimal("PV_HT");
+            BigDecimal totalLine = pU.multiply(qteU, DecimalUtils.HIGH_PRECISION).multiply(new BigDecimal(qte), DecimalUtils.HIGH_PRECISION).setScale(2, RoundingMode.HALF_UP);
+            if (type == TypeCalcul.CALCUL_FACTURABLE || type == TypeCalcul.CALCUL_MONTANT_TOTAL) {
+                if (rowVals.getTable().getFieldsName().contains("MONTANT_REMISE")) {
+                    final BigDecimal acomptePercent = rowVals.getBigDecimal("POURCENT_REMISE");
+                    final BigDecimal acompteMontant = rowVals.getBigDecimal("MONTANT_REMISE");
+                    Remise remise = new Remise(acomptePercent, acompteMontant);
+                    totalLine = remise.getResultFrom(totalLine);
+                }
+            }
+            if (type == TypeCalcul.CALCUL_MONTANT_TOTAL) {
+                if (rowVals.getTable().getFieldsName().contains("POURCENT_FACTURABLE")) {
+                    final BigDecimal acomptePercent = rowVals.getBigDecimal("POURCENT_FACTURABLE");
+                    final BigDecimal acompteMontant = rowVals.getBigDecimal("MONTANT_FACTURABLE");
+                    Acompte acompte = new Acompte(acomptePercent, acompteMontant);
+                    totalLine = acompte.getResultFrom(totalLine);
+                }
+            }
+            totalHT = totalHT.add(totalLine);
+        }
+        return totalHT;
+    }
     private static Map<String, Boolean> visibilityMap = new HashMap<String, Boolean>();
     public static Map<String, Boolean> getVisibilityMap() {
 ,6 → 266,7
         SQLPreferences prefs = SQLPreferences.getMemCached(getSQLElement().getTable().getDBRoot());
         final boolean selectArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.USE_CREATED_ARTICLE, false);
+        final boolean activeCalculM2 = prefs.getBoolean(GestionArticleGlobalPreferencePanel.ACTIVE_CALCUL_M2, false);
         final boolean filterFamilleArticle = prefs.getBoolean(GestionArticleGlobalPreferencePanel.FILTER_BY_FAMILY, false);
         final boolean createAuto = prefs.getBoolean(GestionArticleGlobalPreferencePanel.CREATE_ARTICLE_AUTO, true);
         final boolean showEco = prefs.getBoolean(AbstractVenteArticleItemTable.SHOW_ECO_CONTRIBUTION_COLUMNS, false);
 ,8 → 480,29
             list.add(this.tableElementEco);
         }
-        // // Prix d'achat HT de la métrique 1
+        SQLTableElement eltLongueur = new SQLTableElement(e.getTable().getField("LONGUEUR")) {
+            @Override
+            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
+                int idUv = vals.getForeignID("ID_UNITE_VENTE");
+                return idUv == UniteVenteArticleSQLElement.M2;
+            }
+        };
+        list.add(eltLongueur);
+        SQLTableElement eltLargeur = new SQLTableElement(e.getTable().getField("LARGEUR")) {
+            @Override
+            public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
+                int idUv = vals.getForeignID("ID_UNITE_VENTE");
+                return idUv == UniteVenteArticleSQLElement.M2;
+            }
+        };
+        list.add(eltLargeur);
+        SQLTableElement eltHauteur = new SQLTableElement(e.getTable().getField("HAUTEUR"));
+        list.add(eltHauteur);
         SQLTableElement qteU = new SQLTableElement(e.getTable().getField("QTE_UNITAIRE"), BigDecimal.class) {
             @Override
             public boolean isCellEditable(SQLRowValues vals, int rowIndex, int columnIndex) {
 ,6 → 510,8
                 SQLRowAccessor row = vals.getForeign("ID_UNITE_VENTE");
                 if (row != null && !row.isUndefined() && row.getBoolean("A_LA_PIECE")) {
                     return false;
+                } else if (activeCalculM2 && row != null && !row.isUndefined() && row.getID() == UniteVenteArticleSQLElement.M2) {
+                    return false;
                 } else {
                     return super.isCellEditable(vals, rowIndex, columnIndex);
                 }
 ,8 → 622,17
         list.add(this.tableElementPoidsTotal);
         // Packaging
-        if (prefs.getBoolean(GestionArticleGlobalPreferencePanel.ITEM_PACKAGING, false)) {
+        if (e.getTable().contains("POIDS_COLIS_NET") && prefs.getBoolean(GestionArticleGlobalPreferencePanel.ITEM_PACKAGING, false)) {
+            SQLTableElement tareColis = new SQLTableElement(e.getTable().getField("TARE"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(tareColis);
             SQLTableElement poidsColis = new SQLTableElement(e.getTable().getField("POIDS_COLIS_NET"), BigDecimal.class) {
                 @Override
                 public TableCellRenderer getTableCellRenderer() {
 ,18 → 658,57
             nbColis.addModificationListener(totalPoidsColis);
             totalPoidsColis.setModifier(new CellDynamicModifier() {
                 public Object computeValueFrom(final SQLRowValues row, SQLTableElement source) {
-                    final Object o2 = row.getObject("POIDS_COLIS_NET");
+                    final BigDecimal pdsColis = row.getBigDecimal("POIDS_COLIS_NET");
                     final Object o3 = row.getObject("NB_COLIS");
-                    if (o2 != null && o3 != null) {
-                        BigDecimal poids = (BigDecimal) o2;
+                    BigDecimal pdsColisTotal = BigDecimal.ZERO;
+                    if (pdsColis != null && o3 != null) {
                         int nb = (Integer) o3;
-                        return poids.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION).setScale(totalPoidsColis.getDecimalDigits(), RoundingMode.HALF_UP);
-                    } else {
-                        return row.getObject("T_POIDS_COLIS_NET");
+                        pdsColisTotal = pdsColis.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION);
                     }
+                    return pdsColisTotal.setScale(totalPoidsColis.getDecimalDigits(), RoundingMode.HALF_UP);
                 }
             });
+            final SQLTableElement totalPoidsBrut = new SQLTableElement(e.getTable().getField("T_POIDS_BRUT"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(totalPoidsBrut);
+            tareColis.addModificationListener(totalPoidsBrut);
+            poidsColis.addModificationListener(totalPoidsBrut);
+            nbColis.addModificationListener(totalPoidsBrut);
+            this.tableElementPoidsTotal.addModificationListener(totalPoidsBrut);
+            totalPoidsBrut.setModifier(new CellDynamicModifier() {
+                public Object computeValueFrom(final SQLRowValues row, SQLTableElement source) {
+                    final BigDecimal tare = row.getBigDecimal("TARE");
+                    final int qte = row.getInt("QTE");
+                    final BigDecimal pdsColis = row.getBigDecimal("POIDS_COLIS_NET");
+                    final Object o3 = row.getObject("NB_COLIS");
+                    BigDecimal pdsBrutTotal = BigDecimal.ZERO;
+                    if (row.getObject("T_POIDS") != null) {
+                        pdsBrutTotal = new BigDecimal(row.getFloat("T_POIDS"));
+                    }
+                    if (tare != null) {
+                        pdsBrutTotal = pdsBrutTotal.add(tare.multiply(new BigDecimal(qte)));
+                    }
+                    if (pdsColis != null && o3 != null) {
+                        int nb = (Integer) o3;
+                        pdsBrutTotal = pdsBrutTotal.add(pdsColis.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION));
+                    }
+                    return pdsBrutTotal.setScale(totalPoidsBrut.getDecimalDigits(), RoundingMode.HALF_UP);
+                }
+            });
         }
         // Service
 ,6 → 727,8
         totalRenderer.setHideZeroValue(true);
         this.totalHT.setRenderer(totalRenderer);
         this.totalHT.setEditable(false);
+        this.totalHA = new SQLTableElement(e.getTable().getField("T_PA_HT"), BigDecimal.class);
         if (e.getTable().getFieldsName().contains("MONTANT_FACTURABLE")) {
             // SQLTableElement tableElementAcompte = new
             // SQLTableElement(e.getTable().getField("POURCENT_ACOMPTE"));
 ,6 → 762,7
                 }
             });
             tableElementFacturable.addModificationListener(this.totalHT);
+            tableElementFacturable.addModificationListener(this.totalHA);
             list.add(tableElementFacturable);
         }
 ,7 → 811,6
         }
         // Total HT
-        this.totalHA = new SQLTableElement(e.getTable().getField("T_PA_HT"), BigDecimal.class);
         this.totalHA.setRenderer(totalRenderer);
         this.totalHA.setEditable(false);
         list.add(this.totalHA);
 ,6 → 928,12
         defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
         defaultRowVals.put("CODE", "");
         defaultRowVals.put("NOM", "");
+        if (e.getTable().contains("ID_DEPOT_STOCK")) {
+            DefaultProps props = DefaultNXProps.getInstance();
+            Integer depotDefault = props.getIntProperty("DepotStockDefault", DepotStockSQLElement.DEFAULT_ID);
+            this.defaultRowVals.put("ID_DEPOT_STOCK", depotDefault);
+        }
         final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("ID_TAXE"), false, defaultRowVals) {
             @Override
             public void commitData() {
 ,7 → 946,7
                         rowVals.put("PV_T_DEVISE", rowVals.getBigDecimal("PRIX_METRIQUE_VT_1").multiply(globalQty));
                     }
                 }
-                super.commitData();
+                super.commitData(true);
             }
         };
         setModel(model);
 ,6 → 954,11
         this.table = new RowValuesTable(model, getConfigurationFile());
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
+        if (getSQLElement().getTable().getName().equals("COMMANDE_CLIENT_ELEMENT")) {
+            this.table.getClearCloneTableElement().add("QTE_LIVREE");
+            this.table.getClearCloneTableElement().add("LIVRE");
+            this.table.getClearCloneTableElement().add("LIVRE_FORCED");
+        }
         this.table.getTableHeader().addMouseListener(new MouseAdapter() {
             @Override
 ,6 → 1008,7
         if (e.getTable().getFieldsName().contains("ID_ECO_CONTRIBUTION")) {
             completionField.add("ID_ECO_CONTRIBUTION");
         }
         if (showDevise) {
             completionField.add("CODE_DOUANIER");
             completionField.add("ID_PAYS");
 ,6 → 1032,9
         completionField.add("PRIX_METRIQUE_VT_3");
         completionField.add("SERVICE");
         completionField.add("ID_FAMILLE_ARTICLE");
+        completionField.add("LONGUEUR");
+        completionField.add("LARGEUR");
+        completionField.add("HAUTEUR");
         if (getSQLElement().getTable().getFieldsName().contains("DESCRIPTIF")) {
             completionField.add("DESCRIPTIF");
         }
 ,6 → 1046,13
             completionField.add("QTE_ACHAT");
         }
+        if (getSQLElement().getTable().getFieldsName().contains("POIDS_COLIS_NET") && sqlTableArticle.getTable().getFieldsName().contains("POIDS_COLIS_NET")) {
+            completionField.add("POIDS_COLIS_NET");
+        }
+        if (getSQLElement().getTable().getFieldsName().contains("TARE") && sqlTableArticle.getTable().getFieldsName().contains("TARE")) {
+            completionField.add("TARE");
+        }
         final AutoCompletionManager m = new AutoCompletionManager(tableElementCode, sqlTableArticle.getField("CODE"), this.table, this.table.getRowValuesTableModel()) {
             @Override
 ,7 → 1329,7
                             BigDecimal fVT = (BigDecimal) row.getObject("PV_HT");
                             BigDecimal r = b.multiply(fVT.multiply(BigDecimal.valueOf(qte), DecimalUtils.HIGH_PRECISION), DecimalUtils.HIGH_PRECISION);
-                            if (lremise.compareTo(BigDecimal.ZERO) > 0 && lremise.compareTo(BigDecimal.valueOf(100)) < 100) {
+                            if (lremise.compareTo(BigDecimal.ZERO) > 0) {
                                 r = r.multiply(BigDecimal.valueOf(100).subtract(lremise), DecimalUtils.HIGH_PRECISION).movePointLeft(2);
                             }
 ,6 → 1338,16
                                 final BigDecimal acompteMontantR = row.getBigDecimal("MONTANT_REMISE");
                                 Remise remise = new Remise(acomptePercentR, acompteMontantR);
                                 r = remise.getResultFrom(r);
+                                // Si factrue d'avancement et remise =100% ou pv =0 alors on
+                                // applique le
+                                // ratio entre le montant facturer et le montant global
+                                if (acompteMontant.signum() == 0 && (acomptePercentR != null && acomptePercentR.compareTo(BigDecimal.ONE.movePointRight(2)) == 0)) {
+                                    r = BigDecimal.ZERO;
+                                    BigDecimal totalHTGlobal = getTotalHT(TypeCalcul.CALCUL_FACTURABLE);
+                                    if (acompteFacturer != null && acompteFacturer.getMontant() != null && totalHTGlobal != null && totalHTGlobal.signum() != 0) {
+                                        rHA = rHA.multiply(acompteFacturer.getMontant().divide(totalHTGlobal, DecimalUtils.HIGH_PRECISION), DecimalUtils.HIGH_PRECISION);
+                                    }
+                                }
                             }
                             if (r.signum() != 0) {
                                 rHA = rHA.multiply(acompteMontant.divide(r, DecimalUtils.HIGH_PRECISION), DecimalUtils.HIGH_PRECISION);
 ,11 → 1468,20
         });
         uniteVente.addModificationListener(qteU);
+        eltLargeur.addModificationListener(qteU);
+        eltLongueur.addModificationListener(qteU);
         qteU.setModifier(new CellDynamicModifier() {
             public Object computeValueFrom(SQLRowValues row, SQLTableElement source) {
                 SQLRowAccessor rowUnite = row.getForeign("ID_UNITE_VENTE");
                 if (rowUnite != null && !rowUnite.isUndefined() && rowUnite.getBoolean("A_LA_PIECE")) {
                     return BigDecimal.ONE;
+                } else if (activeCalculM2 && rowUnite != null && !rowUnite.isUndefined() && rowUnite.getID() == UniteVenteArticleSQLElement.M2) {
+                    BigDecimal longueur = row.getBigDecimal("LONGUEUR");
+                    BigDecimal largeur = row.getBigDecimal("LARGEUR");
+                    if (longueur == null || largeur == null) {
+                        return BigDecimal.ONE;
+                    }
+                    return longueur.multiply(largeur);
                 } else {
                     return row.getObject("QTE_UNITAIRE");
                 }
 ,6 → 1610,11
             setColumnVisible(model.getColumnForField("T_ECO_CONTRIBUTION"), showEco);
         }
+        // ACtivation calcul m2
+        setColumnVisible(model.getColumnForField("HAUTEUR"), false);
+        setColumnVisible(model.getColumnForField("LARGEUR"), activeCalculM2);
+        setColumnVisible(model.getColumnForField("LONGUEUR"), activeCalculM2);
         // Gestion des unités de vente
         final boolean gestionUV = prefs.getBoolean(GestionArticleGlobalPreferencePanel.UNITE_VENTE, true);
         setColumnVisible(model.getColumnForField("QTE_UNITAIRE"), gestionUV);
 ,6 → 1642,9
         setColumnVisible(model.getColumnForField("ID_DEPOT_STOCK"), prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false));
+        setColumnVisible(model.getColumnForField("T_POIDS_COLIS_NET"), false);
+        setColumnVisible(model.getColumnForField("T_POIDS_BRUT"), false);
         for (String string : visibilityMap.keySet()) {
             setColumnVisible(model.getColumnForField(string), visibilityMap.get(string));
         }
 ,7 → 1919,7
             super.setClient(rowClient, ask);
             if (getRowClient() != null && !getRowClient().isUndefined()) {
                 this.cacheRemise = getRowClient().getReferentRows(getSQLElement().getTable().getTable("TARIF_ARTICLE_CLIENT"));
-                if (ask && getRowValuesTable().getRowCount() > 0
+                if (ask && this.cacheRemise.size() > 0 && getRowValuesTable().getRowCount() > 0
                         && JOptionPane.showConfirmDialog(null, "Appliquer les remises associées au client sur les lignes déjà présentes?") == JOptionPane.YES_OPTION) {
                     int nbRows = this.table.getRowCount();
                     for (int i = 0; i < nbRows; i++) {
 ,8 → 1951,8
     public void setTarif(SQLRowAccessor rowValuesTarif, boolean ask) {
         if (rowValuesTarif == null || getTarif() == null || rowValuesTarif.getID() != getTarif().getID()) {
             super.setTarif(rowValuesTarif, ask);
-            if (ask && getRowValuesTable().getRowCount() > 0
-                    && JOptionPane.showConfirmDialog(null, "Appliquer les tarifs associés au client sur les lignes déjà présentes?") == JOptionPane.YES_OPTION) {
+            if (ask && getRowValuesTable().getRowCount() > 0 && (rowValuesTarif == null || getTarif() == null || rowValuesTarif.isUndefined()
+                    || JOptionPane.showConfirmDialog(null, "Appliquer les tarifs associés au client sur les lignes déjà présentes?") == JOptionPane.YES_OPTION)) {
                 int nbRows = this.table.getRowCount();
                 for (int i = 0; i < nbRows; i++) {
                     SQLRowValues rowVals = getRowValuesTable().getRowValuesTableModel().getRowValuesAt(i);
 ,7 → 1986,9
         // }
         SQLRowAccessor rowA = row.getForeign("ID_ARTICLE");
-        if (rowA != null && !rowA.isUndefined() && rowA.getTable().contains("AUTO_PRIX_MIN_VENTE_NOMENCLATURE") && rowA.getBoolean("AUTO_PRIX_MIN_VENTE_NOMENCLATURE")) {
+        if (rowA != null && !rowA.isUndefined() && rowA.getTable().getDBRoot().contains("ARTICLE_PRIX_PUBLIC") && rowA.getTable().contains("AUTO_PRIX_MIN_VENTE_NOMENCLATURE")
+                && rowA.getBoolean("AUTO_PRIX_MIN_VENTE_NOMENCLATURE")) {
             BigDecimal b = row.getBigDecimal("QTE_UNITAIRE");
             int q = row.getInt("QTE");
             BigDecimal qteTotal = b.multiply(new BigDecimal(q), DecimalUtils.HIGH_PRECISION);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/TotalCalculator.java
 ,14 → 554,18
                 // TODO Optimiser les requetes
                 if (this.rowCatComptable != null && !this.rowCatComptable.isUndefined()) {
                     String suffix = (this.achat ? "_ACHAT" : "_VENTE");
+                    if (!this.rowCatComptable.isForeignEmpty("ID_COMPTE_PCE" + suffix)) {
+                        cptCatComptable = cacheForTableCompte.getRowFromId(this.rowCatComptable.getForeignID("ID_COMPTE_PCE" + suffix));
+                    }
                     Collection<? extends SQLRowAccessor> rows = article.getReferentRows(this.compteTable.getTable("ARTICLE_CATEGORIE_COMPTABLE"));
                     for (SQLRowAccessor sqlRowAccessor : rows) {
                         if (sqlRowAccessor.getForeignID("ID_CATEGORIE_COMPTABLE") == this.rowCatComptable.getID()) {
-                            cptCatComptable = cacheForTableCompte.getRowFromId(this.rowCatComptable.getForeignID("ID_COMPTE_PCE" + suffix));
+                            if (!sqlRowAccessor.isForeignEmpty("ID_COMPTE_PCE" + suffix)) {
+                                cptCatComptable = cacheForTableCompte.getRowFromId(sqlRowAccessor.getForeignID("ID_COMPTE_PCE" + suffix));
+                            }
                         }
                     }
                 }
                 if (cptCatComptable == null) {
                     String suffix = (this.achat ? "_ACHAT" : "");
                     SQLRowAccessor compteArticle = cacheForTableCompte.getRowFromId(article.getForeignID("ID_COMPTE_PCE" + suffix));

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/AbstractAchatArticleItemTable.java
 ,6 → 23,8
 import org.openconcerto.erp.core.sales.product.ui.CurrencyWithSymbolRenderer;
 import org.openconcerto.erp.core.sales.product.ui.DeliveredQtyRowValuesRenderer;
 import org.openconcerto.erp.core.sales.product.ui.QteUnitRowValuesRenderer;
+import org.openconcerto.erp.core.supplychain.stock.element.DepotStockSQLElement;
+import org.openconcerto.erp.core.supplychain.stock.element.StockSQLElement;
 import org.openconcerto.erp.preferences.DefaultNXProps;
 import org.openconcerto.erp.preferences.GestionArticleGlobalPreferencePanel;
 import org.openconcerto.sql.Configuration;
 ,6 → 42,8
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.sqlobject.ITextArticleWithCompletionCellEditor;
 import org.openconcerto.sql.sqlobject.ITextWithCompletion;
+import org.openconcerto.sql.view.EditFrame;
+import org.openconcerto.sql.view.EditPanel.EditMode;
 import org.openconcerto.sql.view.list.AutoCompletionManager;
 import org.openconcerto.sql.view.list.CellDynamicModifier;
 import org.openconcerto.sql.view.list.RowValuesTable;
 ,6 → 50,7
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.sql.view.list.SQLTableElement;
 import org.openconcerto.sql.view.list.ValidStateChecker;
+import org.openconcerto.ui.preferences.DefaultProps;
 import org.openconcerto.utils.DecimalUtils;
 import org.openconcerto.utils.Tuple3;
 import org.openconcerto.utils.i18n.TranslationManager;
 ,6 → 57,7
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
 import java.awt.event.KeyEvent;
 ,6 → 76,7
 import java.util.Vector;
 import javax.swing.AbstractAction;
+import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 ,7 → 362,96
         // Poids total
         this.tableElementPoidsTotal = new SQLTableElement(e.getTable().getField("T_POIDS"), Float.class);
         list.add(this.tableElementPoidsTotal);
+        // Packaging
+        if (e.getTable().contains("POIDS_COLIS_NET") && prefs.getBoolean(GestionArticleGlobalPreferencePanel.ITEM_PACKAGING, false)) {
+            SQLTableElement tareColis = new SQLTableElement(e.getTable().getField("TARE"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(tareColis);
+            SQLTableElement poidsColis = new SQLTableElement(e.getTable().getField("POIDS_COLIS_NET"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(poidsColis);
+            SQLTableElement nbColis = new SQLTableElement(e.getTable().getField("NB_COLIS"), Integer.class);
+            list.add(nbColis);
+            final SQLTableElement totalPoidsColis = new SQLTableElement(e.getTable().getField("T_POIDS_COLIS_NET"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(totalPoidsColis);
+            poidsColis.addModificationListener(totalPoidsColis);
+            nbColis.addModificationListener(totalPoidsColis);
+            totalPoidsColis.setModifier(new CellDynamicModifier() {
+                public Object computeValueFrom(final SQLRowValues row, SQLTableElement source) {
+                    final BigDecimal pdsColis = row.getBigDecimal("POIDS_COLIS_NET");
+                    final Object o3 = row.getObject("NB_COLIS");
+                    BigDecimal pdsColisTotal = BigDecimal.ZERO;
+                    if (pdsColis != null && o3 != null) {
+                        int nb = (Integer) o3;
+                        pdsColisTotal = pdsColis.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION);
+                    }
+                    return pdsColisTotal.setScale(totalPoidsColis.getDecimalDigits(), RoundingMode.HALF_UP);
+                }
+            });
+            final SQLTableElement totalPoidsBrut = new SQLTableElement(e.getTable().getField("T_POIDS_BRUT"), BigDecimal.class) {
+                @Override
+                public TableCellRenderer getTableCellRenderer() {
+                    return new QteUnitRowValuesRenderer();
+                }
+            };
+            list.add(totalPoidsBrut);
+            tareColis.addModificationListener(totalPoidsBrut);
+            poidsColis.addModificationListener(totalPoidsBrut);
+            nbColis.addModificationListener(totalPoidsBrut);
+            this.tableElementPoidsTotal.addModificationListener(totalPoidsBrut);
+            totalPoidsBrut.setModifier(new CellDynamicModifier() {
+                public Object computeValueFrom(final SQLRowValues row, SQLTableElement source) {
+                    final BigDecimal tare = row.getBigDecimal("TARE");
+                    final int qte = row.getInt("QTE");
+                    final BigDecimal pdsColis = row.getBigDecimal("POIDS_COLIS_NET");
+                    final Object o3 = row.getObject("NB_COLIS");
+                    BigDecimal pdsBrutTotal = BigDecimal.ZERO;
+                    if (row.getObject("T_POIDS") != null) {
+                        pdsBrutTotal = new BigDecimal(row.getFloat("T_POIDS"));
+                    }
+                    if (tare != null) {
+                        pdsBrutTotal = pdsBrutTotal.add(tare.multiply(new BigDecimal(qte)));
+                    }
+                    if (pdsColis != null && o3 != null) {
+                        int nb = (Integer) o3;
+                        pdsBrutTotal = pdsBrutTotal.add(pdsColis.multiply(new BigDecimal(nb), DecimalUtils.HIGH_PRECISION));
+                    }
+                    // return row.getObject("T_POIDS_COLIS_NET");
+                    return pdsBrutTotal.setScale(totalPoidsBrut.getDecimalDigits(), RoundingMode.HALF_UP);
+                }
+            });
+        }
         // Service
         String val = DefaultNXProps.getInstance().getStringProperty("ArticleService");
         Boolean b = Boolean.valueOf(val);
 ,7 → 497,7
         list.add(this.tableElementTotalTTC);
         this.defaultRowVals = new SQLRowValues(UndefinedRowValuesCache.getInstance().getDefaultRowValues(e.getTable()));
-        this.defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
+        this.defaultRowVals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxeAchat().getID());
         this.defaultRowVals.put("CODE", "");
         this.defaultRowVals.put("NOM", "");
         this.defaultRowVals.put("QTE", 1);
 ,12 → 504,32
         this.defaultRowVals.put("QTE_UNITAIRE", BigDecimal.ONE);
         this.defaultRowVals.put("ID_UNITE_VENTE", UniteVenteArticleSQLElement.A_LA_PIECE);
         this.defaultRowVals.put("ID_MODE_VENTE_ARTICLE", ReferenceArticleSQLElement.A_LA_PIECE);
-        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("NOM"), false, this.defaultRowVals);
+        if (e.getTable().contains("ID_DEPOT_STOCK")) {
+            DefaultProps props = DefaultNXProps.getInstance();
+            Integer depotDefault = props.getIntProperty("DepotStockDefault", DepotStockSQLElement.DEFAULT_ID);
+            this.defaultRowVals.put("ID_DEPOT_STOCK", depotDefault);
+        }
+        final RowValuesTableModel model = new RowValuesTableModel(e, list, e.getTable().getField("NOM"), false, this.defaultRowVals) {
+            @Override
+            public void commitData() {
+                super.commitData(true);
+            }
+        };
         setModel(model);
         this.table = new RowValuesTable(model, getConfigurationFile());
         ToolTipManager.sharedInstance().unregisterComponent(this.table);
         ToolTipManager.sharedInstance().unregisterComponent(this.table.getTableHeader());
+        if (getSQLElement().getTable().getName().equals("COMMANDE_ELEMENT")) {
+            this.table.getClearCloneTableElement().add("QTE_RECUE");
+            this.table.getClearCloneTableElement().add("RECU");
+            this.table.getClearCloneTableElement().add("RECU_FORCED");
+        } else if (getSQLElement().getTable().getName().equals("BON_RECEPTION_ELEMENT")) {
+            this.table.getClearCloneTableElement().add("ID_COMMANDE_ELEMENT");
+        }
         table.addMouseListener(new MouseAdapter() {
             @Override
 ,9 → 622,14
         if (e.getTable().getFieldsName().contains("ID_FAMILLE_ARTICLE")) {
             completionFields.add("ID_FAMILLE_ARTICLE");
         }
-        this.m = new AutoCompletionManager(tableElementCode, ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete().getField("ARTICLE.CODE"), this.table,
-                this.table.getRowValuesTableModel()) {
+        final SQLTable sqlTableArticle = e.getTable().getTable("ARTICLE");
+        if (getSQLElement().getTable().getFieldsName().contains("POIDS_COLIS_NET") && sqlTableArticle.getTable().getFieldsName().contains("POIDS_COLIS_NET")) {
+            completionFields.add("POIDS_COLIS_NET");
+        }
+        if (getSQLElement().getTable().getFieldsName().contains("TARE") && sqlTableArticle.getTable().getFieldsName().contains("TARE")) {
+            completionFields.add("TARE");
+        }
+        this.m = new AutoCompletionManager(tableElementCode, sqlTableArticle.getField("CODE"), this.table, this.table.getRowValuesTableModel()) {
             @Override
             protected Object getValueFrom(SQLRow row, String field, SQLRowAccessor rowDest) {
                 Object res = tarifCompletion(row, field);
 ,10 → 642,12
         };
         m.fill("NOM", "NOM");
         m.fill("ID", "ID_ARTICLE");
+        if (e.getTable().contains("ID_CODE_FOURNISSEUR") && supplierCode) {
+            m.fill("ID_CODE_FOURNISSEUR", "ID_CODE_FOURNISSEUR");
+        }
         for (String string : completionFields) {
             m.fill(string, string);
         }
-        final SQLTable sqlTableArticle = ((ComptaPropsConfiguration) Configuration.getInstance()).getRootSociete().getTable("ARTICLE");
         final Where w = new Where(sqlTableArticle.getField("OBSOLETE"), "=", Boolean.FALSE);
         m.setWhere(w);
 ,6 → 702,7
                     }
                 }
             };
+            m4.fill("ID", "ID_ARTICLE");
             m4.fill("CODE", "CODE");
             m4.fill("NOM", "NOM");
             for (String string : completionFields) {
 ,10 → 851,12
                 int qte = Integer.parseInt(row.getObject("QTE").toString());
                 BigDecimal f = (BigDecimal) row.getObject("PA_HT");
                 int idTaux = Integer.parseInt(row.getObject("ID_TAXE").toString());
-                if (idTaux < 0) {
-                    System.out.println(row);
+                Float resultTaux = TaxeCache.getCache().getTauxFromId(idTaux);
+                if (resultTaux == null) {
+                    SQLRow rowTax = TaxeCache.getCache().getFirstTaxe();
+                    row.put("ID_TAXE", rowTax.getID());
+                    resultTaux = rowTax.getFloat("TAUX");
                 }
-                Float resultTaux = TaxeCache.getCache().getTauxFromId(idTaux);
                 editorPAHT.setTaxe(resultTaux);
                 BigDecimal b = (row.getObject("QTE_UNITAIRE") == null) ? BigDecimal.ONE : (BigDecimal) row.getObject("QTE_UNITAIRE");
                 BigDecimal r = b.multiply(f.multiply(BigDecimal.valueOf(qte), DecimalUtils.HIGH_PRECISION), DecimalUtils.HIGH_PRECISION).setScale(tableElementTotalTTC.getDecimalDigits(),
 ,6 → 905,9
         setColumnVisible(model.getColumnForField("ID_DEPOT_STOCK"), prefs.getBoolean(GestionArticleGlobalPreferencePanel.STOCK_MULTI_DEPOT, false));
+        setColumnVisible(model.getColumnForField("T_POIDS_COLIS_NET"), false);
+        setColumnVisible(model.getColumnForField("T_POIDS_BRUT"), false);
         // Calcul automatique du poids unitaire
         tableElement_ValeurMetrique1.addModificationListener(tableElementPoids);
         tableElement_ValeurMetrique2.addModificationListener(tableElementPoids);
 ,6 → 1045,34
         // On réécrit la configuration au cas ou les preferences aurait changé
         this.table.writeState();
+        if (this.table.getRowValuesTableModel().getColumnForField("ID_DEPOT_STOCK") >= 0 && this.table.getRowValuesTableModel().getColumnForField("ID_ARTICLE") >= 0) {
+            if (this.buttons == null) {
+                this.buttons = new ArrayList<>();
+            }
+            JButton buttonStock = new JButton("Consulter le stock");
+            buttonStock.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent event) {
+                    SQLRowValues rowValsSel = table.getSelectedRowValues();
+                    if (rowValsSel != null) {
+                        SQLRowAccessor foreignArt = rowValsSel.getForeign("ID_ARTICLE");
+                        if (foreignArt != null && !foreignArt.isUndefined()) {
+                            SQLRowAccessor rowValsStock = StockSQLElement.getStock(rowValsSel);
+                            if (rowValsStock != null && !rowValsStock.isUndefined()) {
+                                EditFrame frame = new EditFrame(table.getRowValuesTableModel().getSQLElement().getDirectory().getElement("STOCK"), EditMode.READONLY);
+                                frame.selectionId(rowValsStock.getID());
+                                frame.setVisible(true);
+                            }
+                        }
+                    }
+                }
+            });
+            this.buttons.add(buttonStock);
+        }
     }
     private static Map<String, Boolean> visibilityMap = new HashMap<String, Boolean>();
 ,6 → 1120,23
     public Object tarifCompletion(SQLRow row, String field) {
         final SQLTable tTarifFournisseur = this.getSQLElement().getTable().getDBRoot().getTable("ARTICLE_TARIF_FOURNISSEUR");
+        if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("ID_CODE_FOURNISSEUR")) && this.rowFournisseur != null && !this.rowFournisseur.isUndefined()) {
+            final SQLTable foreignTableCodeF = getSQLElement().getTable().getForeignTable("ID_CODE_FOURNISSEUR");
+            List<SQLRow> resultCode = row.getReferentRows(foreignTableCodeF);
+            int idCode = foreignTableCodeF.getUndefinedID();
+            for (SQLRow sqlRow : resultCode) {
+                if (sqlRow.getForeignID("ID_FOURNISSEUR") == this.rowFournisseur.getID()) {
+                    return sqlRow.getID();
+                }
+            }
+            return idCode;
+        }
+        if (field.equalsIgnoreCase("ID_CODE_FOURNISSEUR")) {
+            final SQLTable foreignTableCodeF = getSQLElement().getTable().getForeignTable("ID_CODE_FOURNISSEUR");
+            return foreignTableCodeF.getUndefinedID();
+        }
         if (row != null && !row.isUndefined() && (field.equalsIgnoreCase("PRIX_METRIQUE_HA_1") || field.equalsIgnoreCase("PA_HT")) && tTarifFournisseur != null) {
             List<String> incoTerms;
 ,7 → 1148,7
                 incoTerms = Arrays.asList("PRIX_ACHAT");
             }
             List<SQLRow> rows = row.getReferentRows(tTarifFournisseur);
-            if (row.getBoolean("AUTO_PRIX_ACHAT_NOMENCLATURE")) {
+            if (row.getBoolean("AUTO_PRIX_ACHAT_NOMENCLATURE") && row.getTable().getDBRoot().contains("ARTICLE_PRIX_REVIENT")) {
                 List<SQLRow> rowsElt = row.getReferentRows(row.getTable().getTable("ARTICLE_ELEMENT").getField("ID_ARTICLE_PARENT"));
                 BigDecimal price = BigDecimal.ZERO;
 ,7 → 1410,7
                 Float resultTaux = TaxeCache.getCache().getTauxFromId(row2Insert.getForeignID("ID_TAXE"));
                 if (resultTaux == null) {
-                    SQLRow rowTax = TaxeCache.getCache().getFirstTaxe();
+                    SQLRow rowTax = TaxeCache.getCache().getFirstTaxeAchat();
                     resultTaux = rowTax.getFloat("TAUX");
                 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/MontantPanel.java
 ,7 → 85,37
             calculMontant();
         }
     };
+    private final DocumentListener listenerTextTaxe = new DocumentListener() {
+        public void changedUpdate(DocumentEvent e) {
+            if (MontantPanel.this.enabled) {
+                long taxe = GestionDevise.parseLongCurrency(MontantPanel.this.textTaxe.getText());
+                if (MontantPanel.this.checkHT.isSelected()) {
+                    long ht = GestionDevise.parseLongCurrency(MontantPanel.this.textHT.getText());
+                    long ttc = taxe + ht;
+                    MontantPanel.this.textTTC.getDocument().removeDocumentListener(MontantPanel.this.listenerTextTTC);
+                    MontantPanel.this.textTTC.setText(GestionDevise.currencyToString(ttc));
+                    MontantPanel.this.textTTC.getDocument().addDocumentListener(MontantPanel.this.listenerTextTTC);
+                } else {
+                    long ttc = GestionDevise.parseLongCurrency(MontantPanel.this.textTTC.getText());
+                    long ht = ttc - taxe;
+                    MontantPanel.this.textHT.getDocument().removeDocumentListener(MontantPanel.this.listenerTextHT);
+                    MontantPanel.this.textHT.setText(GestionDevise.currencyToString(ht));
+                    MontantPanel.this.textHT.getDocument().addDocumentListener(MontantPanel.this.listenerTextHT);
+                }
+            }
+        }
+        public void removeUpdate(DocumentEvent e) {
+            changedUpdate(e);
+        }
+        public void insertUpdate(DocumentEvent e) {
+            changedUpdate(e);
+        }
+    };
     public MontantPanel() {
         uiInit();
     }
 ,8 → 167,6
         this.comboTaxe.addValueListener(new PropertyChangeListener() {
             public void propertyChange(PropertyChangeEvent evt) {
-                // System.out.println("ID TAXE Changed " +
-                // MontantPanel.this.comboTaxe.getSelectedId());
                 calculMontant();
             }
         });
 ,10 → 211,10
         setHT(true);
         this.textTTC.getDocument().addDocumentListener(this.listenerTextTTC);
         this.textHT.getDocument().addDocumentListener(this.listenerTextHT);
+        this.textTaxe.getDocument().addDocumentListener(this.listenerTextTaxe);
     }
     private void setHT(boolean b) {
-        System.err.println("MontantPanel.setHT()" + b);
         if (b) {
             this.textHT.setEditable(true);
             this.textHT.setEnabled(true);
 ,16 → 230,13
     public void calculMontant() {
-        float taux;
-        PrixHT pHT;
-        PrixTTC pTTC;
-        System.out.println("Recalcul montant");
         if (this.enabled) {
+            float taux;
+            PrixHT pHT;
+            PrixTTC pTTC;
             // taux de la TVA selectionnee
             int idTaxe = this.comboTaxe.getSelectedId();
-            System.out.println("ID_TAXE =  " + idTaxe);
             if (idTaxe > 1) {
                 SQLRow ligneTaxe = SQLBackgroundTableCache.getInstance().getCacheForTable(((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete().getTable("TAXE"))
                         .getRowFromId(idTaxe);
 ,8 → 264,9
                             ttc = GestionDevise.currencyToString(pHT.calculLongTTC(taux));
                         }
                         updateText(tva, ttc, pHT.toString(), true);
-                    } else
+                    } else {
                         updateText("", "", "", true);
+                    }
                 } else {
                     if (this.textTTC.getText().trim().length() > 0) {
 ,7 → 307,7
             public void run() {
                 MontantPanel.this.textHT.getDocument().removeDocumentListener(MontantPanel.this.listenerTextHT);
                 MontantPanel.this.textTTC.getDocument().removeDocumentListener(MontantPanel.this.listenerTextTTC);
+                MontantPanel.this.textTaxe.getDocument().removeDocumentListener(MontantPanel.this.listenerTextTaxe);
                 // Update text with formated values
                 if (!isHT) {
                     MontantPanel.this.textHT.setText(prixHT);
 ,6 → 318,7
                 setHT(isHT);
                 MontantPanel.this.textHT.getDocument().addDocumentListener(MontantPanel.this.listenerTextHT);
                 MontantPanel.this.textTTC.getDocument().addDocumentListener(MontantPanel.this.listenerTextTTC);
+                MontantPanel.this.textTaxe.getDocument().addDocumentListener(MontantPanel.this.listenerTextTaxe);
             }
         });
     }
 ,7 → 327,7
         this.enabled = b;
         this.checkHT.setEnabled(b);
         this.checkTTC.setEnabled(b);
-        this.setHT(checkHT.isSelected());
+        this.setHT(this.checkHT.isSelected());
     }
     public DeviseField getMontantTTC() {
 ,4 → 355,5
         this.labelUE.setVisible(b);
         calculMontant();
     }
 }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/element/AdresseSQLElement.java
 ,6 → 15,7
 import org.openconcerto.erp.core.common.component.AdresseSQLComponent;
 import org.openconcerto.sql.element.SQLComponent;
+import org.openconcerto.utils.ListMap;
 import java.util.ArrayList;
 import java.util.List;
 ,6 → 26,15
         super("ADRESSE", "une adresse", "adresses");
     }
+    @Override
+    public ListMap<String, String> getShowAs() {
+        if (this.getTable().contains("DISTRICT")) {
+            return ListMap.singleton(null, "RUE", "DISTRICT", "DEPARTEMENT", "CODE_POSTAL", "VILLE");
+        } else {
+            return ListMap.singleton(null, "RUE", "CODE_POSTAL", "VILLE");
+        }
+    }
     protected List<String> getListFields() {
         final List<String> l = new ArrayList<String>();
         l.add("RUE");

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/element/BanqueSQLElement.java
 ,6 → 17,7
 import org.openconcerto.sql.element.UISQLComponent;
 import org.openconcerto.sql.request.ComboSQLRequest;
 import org.openconcerto.sql.request.ComboSQLRequest.KeepMode;
+import org.openconcerto.utils.ListMap;
 import org.openconcerto.utils.ProductInfo;
 import java.util.ArrayList;
 ,6 → 33,13
     }
     @Override
+    public ListMap<String, String> getShowAs() {
+        ListMap<String, String> map = new ListMap<>();
+        map.add(null, "NOM");
+        return map;
+    }
+    @Override
     protected void _initComboRequest(ComboSQLRequest req) {
         super._initComboRequest(req);
         req.addForeignToGraphToFetch("ID_JOURNAL", Arrays.asList("ID", "CODE", "NOM"));

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/reports/history/ui/ListeHistoriquePanel.java
 ,6 → 26,7
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.element.SQLElementDirectory;
+import org.openconcerto.sql.model.AliasedTable;
 import org.openconcerto.sql.model.SQLDataSource;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLFieldsSet;
 ,6 → 66,7
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.SQLException;
 import java.util.ArrayList;
 ,7 → 126,7
             SQLRowAccessor row = ListeHistoriquePanel.this.jListePanel.getModel().getRowAt(selectIndex);
-            if ((row == null || row.isUndefined()) && undefinedLabel == null) {
+            if ((row == null || row.isUndefined()) && ListeHistoriquePanel.this.undefinedLabel == null) {
                 return;
             }
 ,10 → 162,53
                         w2 = w2.and(new Where(table.getForeignTable(field.getName()).getField("ID_" + ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName()), "=", id));
                         liste.getListe().getRequest().setWhere(w2.and(w));
                     } else {
-                        if (liste.getElement().getTable().equals(jListePanel.getModel().getTable())) {
-                            liste.getListe().getRequest().setWhere(new Where(table.getKey(), "=", id).and(w));
+                        if (liste.getElement().getTable().equals(ListeHistoriquePanel.this.jListePanel.getModel().getTable())) {
+                            final Where whereMatch = new Where(table.getField("ID_" + ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName()), "=", id);
+                            if ((table.getName().equals("COMMANDE_ELEMENT") || table.getName().equals("BON_RECEPTION_ELEMENT"))
+                                    && ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName().equals("AFFAIRE")) {
+                                // FIXME alias forcé à la main, voir pour remplacer avec un
+                                // selectTransformer
+                                final String tablePere = table.getName().replaceAll("_ELEMENT", "");
+                                AliasedTable tableAlias = new AliasedTable(table.getTable(tablePere), "tAlias__ID_" + tablePere + "__" + tablePere);
+                                final int idAffaire = id;
+                                Where wPere = new Where(tableAlias.getField("ID_AFFAIRE"), "=", idAffaire);
+                                liste.getListe().getRequest().setWhere(whereMatch.or(wPere).and(w));
+                                // whereMatch = whereMatch.or(new Where(new
+                                // AliasedTable(table.getForeignTable("ID_"+tablePere),
+                                // alias).getField("ID_AFFAIRE"), "=", id));
+                            } else {
+                                liste.getListe().getRequest().setWhere(whereMatch.and(w));
+                            }
                         } else {
-                            liste.getListe().getRequest().setWhere(new Where(table.getField("ID_" + ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName()), "=", id).and(w));
+                            if ((table.getName().equals("MOUVEMENT_STOCK")) && ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName().equals("AFFAIRE")) {
+                                final String tableStock = "STOCK";
+                                AliasedTable tableAlias = new AliasedTable(table.getTable(tableStock), "tAlias__ID_" + tableStock + "__" + tableStock);
+                                final int idAffaire = table.getTable("AFFAIRE").getRow(id).getForeignID("ID_DEPOT_STOCK");
+                                Where w2 = new Where(table.getField("REEL"), "=", Boolean.TRUE);
+                                w2 = w2.and(new Where(table.getField("SOURCE"), "=", ""));
+                                Where wPere = new Where(tableAlias.getField("ID_DEPOT_STOCK"), "=", idAffaire).and(w2);
+                                liste.getListe().getRequest().setWhere(wPere);
+                            } else {
+                                final Where whereMatch = new Where(table.getField("ID_" + ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName()), "=", id);
+                                if ((table.getName().equals("FACTURE_FOURNISSEUR_ELEMENT") || table.getName().equals("COMMANDE_ELEMENT") || table.getName().equals("BON_RECEPTION_ELEMENT"))
+                                        && ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName().equals("AFFAIRE")) {
+                                    // FIXME alias forcé à la main, voir pour remplacer avec un
+                                    // selectTransformer
+                                    final String tablePere = table.getName().replaceAll("_ELEMENT", "");
+                                    AliasedTable tableAlias = new AliasedTable(table.getTable(tablePere), "tAlias__ID_" + tablePere + "__" + tablePere);
+                                    final int idAffaire = id;
+                                    Where wPere = new Where(tableAlias.getField("ID_AFFAIRE"), "=", idAffaire);
+                                    liste.getListe().getRequest().setWhere(whereMatch.or(wPere).and(w).and(new Where(table.getField("PA_HT"), "!=", BigDecimal.ZERO)));
+                                } else {
+                                    liste.getListe().getRequest().setWhere(whereMatch.and(w));
+                                }
+                            }
                         }
                     }
                 } else {
 ,8 → 387,10
                             }
                         };
-                    } else {
+                    } else
+                    {
                         liste = new ListeAddPanel(elt, new IListe(createTableSource), "historique-" + title) {
                             @Override
                             protected void handleAction(JButton source, ActionEvent evt) {
 ,7 → 546,7
         this.addAncestorListener(new AncestorListener() {
             @Override
             public void ancestorAdded(AncestorEvent event) {
-                jListePanel.addListSelectionListener(listListener);
+                ListeHistoriquePanel.this.jListePanel.addListSelectionListener(ListeHistoriquePanel.this.listListener);
             }
             @Override
 ,7 → 556,7
             @Override
             public void ancestorRemoved(AncestorEvent event) {
-                jListePanel.removeListSelectionListener(listListener);
+                ListeHistoriquePanel.this.jListePanel.removeListSelectionListener(ListeHistoriquePanel.this.listListener);
             }
         });
 ,7 → 594,7
     public void addListSelectionListener(ListSelectionListener l) {
         this.jListePanel.addListSelectionListener(l);
-        System.out.println("ListeHistoriquePanel.addListSelectionListener()" + jListePanel);
+        System.out.println("ListeHistoriquePanel.addListSelectionListener()" + this.jListePanel);
     }
     public void removeListSelectionListener(ListSelectionListener l) {
 ,11 → 630,17
         IListe liste = getIListeFromTableName(tableName);
         List<Integer> listeIds = null;
         if (liste != null) {
-            int size = liste.getRowCount();
-            listeIds = new ArrayList<Integer>(size);
+            ITableModel m = liste.getModel();
+            int size = m.getRowCount();
+            listeIds = new ArrayList<>(size);
             for (int i = 0; i < size; i++) {
-                listeIds.add(liste.idFromIndex(i));
+                try {
+                    listeIds.add(m.idFromIndex(i));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         } else {
             listeIds = Collections.emptyList();
         }
 ,7 → 650,7
     public void removeAllTableListener() {
         this.jListePanel.removeAllTableListener();
         for (Integer i : this.mapListener.keySet()) {
-            IListPanel panel = vectListePanel.get(i);
+            IListPanel panel = this.vectListePanel.get(i);
             List<TableModelListener> l = this.mapListener.get(i);
             for (TableModelListener tableModelListener : l) {
                 final IListe liste = panel.getListe();

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/component/CommandeSQLComponent.java
 ,6 → 91,8
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import com.ibm.icu.math.BigDecimal;
 public class CommandeSQLComponent extends TransfertBaseSQLComponent {
     private CommandeItemTable table = new CommandeItemTable();
 ,6 → 1189,9
                 final SQLRowValues rowVals = rowElt.createUpdateRow();
                 rowVals.clearPrimaryKeys();
+                rowVals.put("RECU", Boolean.FALSE);
+                rowVals.put("RECU_FORCED", Boolean.FALSE);
+                rowVals.put("QTE_RECUE", BigDecimal.ZERO);
                 this.table.getModel().addRow(rowVals);
                 final int rowIndex = this.table.getModel().getRowCount() - 1;
                 this.table.getModel().fireTableModelModified(rowIndex);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/component/FactureFournisseurSQLComponent.java
 ,6 → 21,7
 import org.openconcerto.erp.core.common.ui.TotalPanel;
 import org.openconcerto.erp.core.finance.accounting.element.EcritureSQLElement;
 import org.openconcerto.erp.core.finance.accounting.model.CurrencyConverter;
+import org.openconcerto.erp.core.finance.payment.component.ModeDeReglementSQLComponent;
 import org.openconcerto.erp.core.finance.tax.model.TaxeCache;
 import org.openconcerto.erp.core.supplychain.order.ui.FactureFournisseurItemTable;
 import org.openconcerto.erp.generationDoc.gestcomm.FactureFournisseurXmlSheet;
 ,6 → 65,7
 import java.util.Set;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 ,7 → 395,11
         c.gridy++;
         c.weighty = 0;
         this.add(getBottomPanel(), c);
+        ModeDeReglementSQLComponent modeReglComp;
+        modeReglComp = (ModeDeReglementSQLComponent) this.eltModeRegl.getSQLChild();
+        modeReglComp.addDateCompListener(this.dateCommande);
         c.gridx = 0;
         c.gridy++;
         c.fill = GridBagConstraints.HORIZONTAL;
 ,6 → 704,9
                 totalTTC.updateTotal();
             }
         });
+        ModeDeReglementSQLComponent modeReglComp = (ModeDeReglementSQLComponent) this.eltModeRegl.getSQLChild();
+        modeReglComp.addDateCompListener(this.dateCommande);
         return panel;
     }
 ,16 → 745,27
         this.table.updateField("ID_FACTURE_FOURNISSEUR", row.getID());
         this.table.createArticle(getSelectedID(), this.getElement());
-        int idMvt = (row.getObject("ID_MOUVEMENT") == null ? 1 : row.getInt("ID_MOUVEMENT"));
-        System.err.println("__________***************** UPDATE" + idMvt);
+        boolean createCompte = (rowFactureOld.getForeignID("ID_FOURNISSEUR") != row.getForeignID("ID_FOURNISSEUR"));
+        createCompte = createCompte || (rowFactureOld.getForeignID("ID_COMPTE_PCE") != row.getForeignID("ID_COMPTE_PCE"));
+        createCompte = createCompte || rowFactureOld.getLong("T_TTC") != row.getLong("T_TTC");
+        createCompte = createCompte || rowFactureOld.getLong("T_TVA") != row.getLong("T_TVA");
+        createCompte = createCompte || rowFactureOld.getLong("T_HT") != row.getLong("T_HT");
+        if (!createCompte) {
+            int a = JOptionPane.showConfirmDialog(null, "Voulez vous recréer la comptabilité ?", "Comptabilité", JOptionPane.YES_NO_OPTION);
+            createCompte = a == JOptionPane.YES_OPTION;
+        }
+        if (createCompte) {
+            int idMvt = (row.getObject("ID_MOUVEMENT") == null ? 1 : row.getInt("ID_MOUVEMENT"));
+            System.err.println("__________***************** UPDATE" + idMvt);
-        // on supprime tout ce qui est lié à la facture
-        EcritureSQLElement eltEcr = (EcritureSQLElement) Configuration.getInstance().getDirectory().getElement("ECRITURE");
-        eltEcr.archiveMouvementProfondeur(idMvt, false);
-        if (idMvt > 1) {
-            new GenerationMvtFactureFournisseur(row, idMvt);
-        } else {
-            new GenerationMvtFactureFournisseur(row);
+            // on supprime tout ce qui est lié à la facture
+            EcritureSQLElement eltEcr = (EcritureSQLElement) Configuration.getInstance().getDirectory().getElement("ECRITURE");
+            eltEcr.archiveMouvementProfondeur(idMvt, false);
+            if (idMvt > 1) {
+                new GenerationMvtFactureFournisseur(row, idMvt);
+            } else {
+                new GenerationMvtFactureFournisseur(row);
+            }
         }
         final FactureFournisseurXmlSheet sheet = new FactureFournisseurXmlSheet(row);
         sheet.createDocumentAsynchronous();
 ,7 → 943,10
         if (idFacture > 1) {
             SQLRow row = fact.getTable().getRow(idFacture);
             SQLRowValues rowVals = new SQLRowValues(fact.getTable());
-            rowVals.put("ID_FOURNISSEUR", row.getInt("ID_FOURNISSEUR"));
+            rowVals.put("ID_FOURNISSEUR", row.getForeignID("ID_FOURNISSEUR"));
+            if (!row.isForeignEmpty("ID_COMPTE_PCE")) {
+                rowVals.put("ID_COMPTE_PCE", row.getForeignID("ID_COMPTE_PCE"));
+            }
             // if (getTable().contains("ID_NUMEROTATION_AUTO")) {
             // rowVals.put("NUMERO",
             // NumerotationAutoSQLElement.getNextNumero(SaisieVenteFactureSQLElement.class, new

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/component/SaisieAchatSQLComponent.java
 ,7 → 329,7
         this.addSQLObject(this.comboAvoir, "ID_AVOIR_FOURNISSEUR");
         this.addSQLObject(this.checkImmo, "IMMO");
-        this.montant.setChoixTaxe(TaxeCache.getCache().getFirstTaxe().getID());
+        this.montant.setChoixTaxe(TaxeCache.getCache().getFirstTaxeAchat().getID());
         this.nomFournisseur.addModelListener("wantedID", this.listenerModeReglDefaut);
 ,7 → 496,7
             }
         }
         vals.put("ID_COMPTE_PCE", idCompteAchat);
-        vals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxe().getID());
+        vals.put("ID_TAXE", TaxeCache.getCache().getFirstTaxeAchat().getID());
         return vals;
     }

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/table/ChiffrageCommandeTable.java
 ,12 → 65,25
         final SQLTableElement tableElementNom = new SQLTableElement(e.getTable().getField("NOM"));
         list.add(tableElementNom);
+        if (e.getTable().contains("ID_TYPE_CMD")) {
+            final SQLTableElement cat = new SQLTableElement(e.getTable().getField("ID_TYPE_CMD"));
+            list.add(cat);
+        }
+        if (e.getTable().contains("ID_CATEGORIE_HEURE")) {
+            final SQLTableElement cat = new SQLTableElement(e.getTable().getField("ID_CATEGORIE_HEURE"));
+            list.add(cat);
+        }
         final SQLTableElement fam = new SQLTableElement(e.getTable().getField("ID_FAMILLE_ARTICLE"));
         list.add(fam);
         final SQLField fieldHA = e.getTable().getField("PA_HT");
         final DeviseNumericCellEditor editorPAHT = new DeviseNumericCellEditor(fieldHA);
         final SQLTableElement pa = new SQLTableElement(fieldHA, BigDecimal.class, editorPAHT);
         pa.setRenderer(new DeviseTableCellRenderer());
+        if (e.getTable().contains("ID_CATEGORIE_HEURE")) {
+            pa.setEditable(false);
+        }
         list.add(pa);
         final SQLField fieldPV = e.getTable().getField("PV_HT");
 ,7 → 100,29
         };
         qteU.setRenderer(new DeviseTableCellRenderer());
         list.add(qteU);
+        if (e.getTable().contains("ANT")) {
+            SQLTableElement ant = new SQLTableElement(e.getTable().getField("ANT"), BigDecimal.class) {
+                protected Object getDefaultNullValue() {
+                    return BigDecimal.ZERO;
+                }
+            };
+            ant.setRenderer(new DeviseTableCellRenderer());
+            list.add(ant);
+        }
+        if (e.getTable().contains("RESTANT")) {
+            SQLTableElement restant = new SQLTableElement(e.getTable().getField("RESTANT"), BigDecimal.class) {
+                protected Object getDefaultNullValue() {
+                    return BigDecimal.ZERO;
+                }
+            };
+            restant.setRenderer(new DeviseTableCellRenderer());
+            list.add(restant);
+        }
         final SQLTableElement unit = new SQLTableElement(e.getTable().getField("ID_UNITE_VENTE"));
         list.add(unit);

 /trunk/OpenConcerto/src/org/openconcerto/erp/core/supplychain/order/element/FactureFournisseurSQLElement.java
 ,17 → 19,27
 import org.openconcerto.erp.generationDoc.gestcomm.FactureFournisseurXmlSheet;
 import org.openconcerto.erp.model.MouseSheetXmlListeListener;
 import org.openconcerto.sql.element.SQLComponent;
+import org.openconcerto.sql.model.FieldPath;
 import org.openconcerto.sql.model.SQLRowAccessor;
+import org.openconcerto.sql.model.graph.Path;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.EditPanel;
+import org.openconcerto.sql.view.list.BaseSQLTableModelColumn;
 import org.openconcerto.sql.view.list.IListe;
+import org.openconcerto.sql.view.list.RowAction;
+import org.openconcerto.sql.view.list.SQLTableModelSource;
 import org.openconcerto.sql.view.list.IListeAction.IListeEvent;
-import org.openconcerto.sql.view.list.RowAction;
 import org.openconcerto.sql.view.list.RowAction.PredicateRowAction;

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

svn://code.openconcerto.org/openconcerto

Compare Revisions

Ignore whitespace Rev 176 → Rev 177