dolibarr/htdocs/fourn
Laurent Destailleur 7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
2017-10-18 19:51:29 +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 Add API close to close an order 2017-10-18 15:34:03 +02:00
commande Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
facture Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
js Fix for 'lessone' mode 2017-09-26 15:44:40 +02:00
paiement Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
product USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
card.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 11:04:27 +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