dolibarr/htdocs/expedition
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
..
class Use billed field from database on fetch shipping 2017-10-12 21:19:24 +02:00
stats Update code using new css class 2017-05-15 16:25:51 +02:00
tpl Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
card.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-18 19:51:29 +02:00
contact.php NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
index.php New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
list.php Scrutinizer Auto-Fixes 2017-10-13 11:28:26 +00:00
note.php NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
shipment.php NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00