Conflicts: htdocs/fourn/class/fournisseur.commande.class.php htdocs/install/mysql/migration/14.0.0-15.0.0.sql htdocs/langs/en_US/products.lang htdocs/reception/card.php htdocs/reception/class/reception.class.php |
||
|---|---|---|
| .. | ||
| reception.class.php | ||
| receptionstats.class.php | ||