Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
..
2015-05-07 13:35:09 +02:00
2015-04-18 23:17:44 +02:00
2015-03-31 11:32:47 +02:00
2014-11-27 21:03:51 +01:00
2015-05-07 13:35:09 +02:00
2015-02-18 21:01:17 +01:00
2015-04-19 03:05:37 +02:00
2014-09-18 20:33:37 +02:00
2015-04-19 03:05:37 +02:00
2014-09-13 19:10:05 +02:00
2015-04-19 03:05:37 +02:00
2014-09-18 20:33:37 +02:00
2015-04-19 03:05:37 +02:00