Laurent Destailleur 756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/compta/facture/list.php htdocs/core/class/discount.class.php htdocs/core/lib/functions.lib.php htdocs/core/lib/pdf.lib.php htdocs/core/modules/modFournisseur.class.php htdocs/fourn/facture/card.php htdocs/holiday/list.php htdocs/paybox/admin/paybox.php htdocs/paypal/admin/paypal.php htdocs/product/price.php htdocs/projet/activity/perday.php htdocs/projet/activity/permonth.php htdocs/projet/activity/perweek.php htdocs/stripe/admin/stripe.php		2021-06-11 19:05:05 +02:00
..
tpl	Remove one thousand of useless files	2021-04-12 15:57:16 +02:00
card.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-06-11 19:05:05 +02:00
contact.php	Update contact.php	2021-05-11 19:22:46 +02:00
document.php	Update document.php	2021-05-11 19:23:46 +02:00
index.php	Fix	2021-06-10 00:41:15 +02:00
info.php	code syntax fourn directory	2021-02-25 23:21:30 +01:00
list.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-06-11 19:05:05 +02:00
note.php	uniformize supplier cards	2021-05-07 21:28:35 +02:00
paiement.php	Clean code	2021-04-26 19:12:23 +02:00
rapport.php	code syntax fourn directory	2021-02-25 23:21:30 +01:00