Laurent Destailleur
b675b9b610
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/comm/action/fiche.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/company.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/facture/fiche.php
htdocs/langs/en_US/admin.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
..
2014-02-10 01:30:48 +01:00
2014-01-29 10:11:39 +01:00
2014-03-13 09:20:05 +01:00
2013-12-04 18:20:58 +01:00
2014-03-16 14:48:46 +01:00
2014-03-31 00:44:45 +02:00
2014-03-21 18:05:08 +01:00
2014-03-04 23:56:35 +01:00
2014-01-08 15:16:56 +01:00
2014-03-14 23:18:46 +01:00
2014-03-31 00:44:45 +02:00
2014-02-16 23:51:29 +01:00
2014-02-16 23:51:29 +01:00
2014-01-02 16:41:23 +01:00
2014-03-07 11:35:16 +01:00
2014-02-10 00:38:10 +01:00
2014-01-26 19:27:42 +01:00
2014-03-27 15:56:26 +01:00
2014-02-16 23:51:29 +01:00
2014-03-05 17:26:59 +01:00
2014-03-05 09:57:36 +01:00
2014-03-12 01:21:18 +01:00
2014-03-15 23:12:00 +01:00
2013-12-06 10:23:26 +01:00
2013-11-23 16:34:08 +01:00