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
..
tpl	Fix: Permissions on files	2013-08-06 00:36:21 +02:00
contact.php	Fix: Security does not need special case	2013-03-24 21:06:45 +01:00
dispatch.php	Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into	2014-03-16 20:49:56 +01:00
document.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-11-19 21:08:02 +01:00
fiche.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-31 00:44:45 +02:00
history.php	standardize code	2013-06-20 09:18:12 +02:00
index.php	Fix: Permissions on files	2013-08-06 00:36:21 +02:00
liste.php	Add ref supplier as column and clear varialbes in double	2014-03-21 15:01:40 +01:00
note.php	Qual: Mutualize code for actions of editing notes	2014-01-11 13:33:30 +01:00