Conflicts: ChangeLog htdocs/adherents/fiche.php htdocs/comm/fiche.php htdocs/comm/mailing/fiche.php htdocs/comm/propal.php htdocs/comm/propal/class/propal.class.php htdocs/commande/class/commande.class.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/compta/paiement.php htdocs/core/class/html.formcompany.class.php htdocs/core/tpl/login.tpl.php htdocs/expedition/fiche.php htdocs/fourn/commande/fiche.php htdocs/fourn/facture/fiche.php htdocs/fourn/facture/paiement.php htdocs/fourn/fiche.php htdocs/main.inc.php htdocs/product/fournisseurs.php htdocs/resource/card.php |
||
|---|---|---|
| .. | ||
| admin | ||
| ajax | ||
| canvas | ||
| class | ||
| composition | ||
| stats | ||
| stock | ||
| card.php | ||
| document.php | ||
| fournisseurs.php | ||
| index.php | ||
| list.php | ||
| photos.php | ||
| popuprop.php | ||
| price.php | ||
| reassort.php | ||
| traduction.php | ||