Laurent Destailleur f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/admin/supplier_payment.php htdocs/core/lib/ajax.lib.php htdocs/don/admin/donation.php htdocs/product/admin/product.php		2017-08-23 16:11:51 +02:00
..
ajax	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-23 16:11:51 +02:00
commande	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-23 16:11:51 +02:00
facture	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-23 16:11:51 +02:00
js	Fix reception of product interface	2017-06-27 14:02:01 +02:00
paiement	Fix GETPOST of lang_id	2017-06-27 17:27:01 +02:00
product	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
card.php	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-08-22 11:18:17 +02:00
contact.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
index.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
recap-fourn.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00