Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
..
2015-01-18 18:44:22 +01:00
2014-05-03 18:18:44 +02:00
2014-09-18 21:18:25 +02:00
2014-11-27 21:03:51 +01:00
2015-01-18 18:44:22 +01:00
2014-09-18 20:33:37 +02:00
2014-10-12 00:23:19 +02:00
2014-09-18 20:33:37 +02:00
2014-10-12 00:23:19 +02:00
2014-09-13 19:10:05 +02:00
2014-11-23 17:43:19 +01:00
2014-09-18 20:33:37 +02:00
2014-11-25 20:13:43 +01:00