Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
..
2015-02-19 00:01:26 +01:00
2015-03-18 21:44:57 +01:00
2015-03-13 14:37:27 +01:00
2015-02-19 00:01:26 +01:00
2015-03-04 17:54:43 +01:00
2015-03-16 23:21:17 +00:00
2014-12-04 13:20:56 +01:00
2014-08-30 05:30:37 +02:00
2015-03-25 14:31:04 +01:00
2015-02-10 13:32:00 +01:00
2015-02-19 00:01:26 +01:00
2015-02-19 00:01:26 +01:00
2015-03-22 18:17:25 +01:00
2015-03-29 18:22:45 +02:00
2014-12-22 03:14:22 +01:00
2015-02-10 11:38:13 +01:00
2015-02-22 13:16:49 +01:00
2014-10-19 19:57:42 +02:00
2015-01-24 21:46:05 +01:00
2015-02-10 10:25:59 +01:00
2015-02-26 16:02:03 +01:00
2015-03-22 18:17:25 +01:00
2015-04-01 16:33:39 +02:00
2015-02-02 15:43:22 +01:00
2015-02-10 21:33:43 +01:00
2014-09-27 17:13:15 +02:00
2014-11-05 16:37:07 +01:00
2014-12-04 13:20:56 +01:00
2015-03-06 02:10:01 +00:00
2014-12-04 13:20:56 +01:00
2015-03-28 17:42:33 +01:00
2015-02-10 10:45:48 +01:00
2015-02-10 10:52:48 +01:00
2015-02-18 22:54:02 +01:00
2014-09-18 21:18:25 +02:00
2015-03-16 23:21:17 +00:00
2015-02-10 13:17:37 +01:00
2015-03-16 23:21:17 +00:00
2015-03-16 23:21:17 +00:00
2015-03-18 15:27:27 +01:00
2014-12-04 13:20:56 +01:00
2014-11-15 18:30:37 +01:00
2014-10-18 16:08:15 +02:00
2014-10-18 16:08:15 +02:00
2015-01-23 18:39:40 +01:00
2014-09-18 21:18:25 +02:00
2015-02-19 00:01:26 +01:00
2015-03-16 23:21:17 +00:00
2015-02-10 13:17:37 +01:00
2015-03-22 22:29:52 +01:00
2014-09-27 16:00:11 +02:00