Laurent Destailleur 358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/action/index.php htdocs/core/class/html.form.class.php htdocs/core/lib/payments.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/projet/card.php htdocs/public/payment/newpayment.php htdocs/societe/list.php htdocs/ticket/document.php		2021-04-13 20:19:05 +02:00
..
tpl	Remove one thousand of useless files	2021-04-12 15:57:16 +02:00
card.php	Add right supplier_order	2021-04-12 09:47:16 +02:00
contact.php	Add right supplier_order	2021-04-12 09:47:16 +02:00
dispatch.php	Add right supplier_order	2021-04-12 09:47:16 +02:00
document.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-04-13 20:19:05 +02:00
index.php	Merge remote-tracking branch 'upstream/develop' into 14a36	2021-04-12 21:35:03 +02:00
info.php	Add right supplier_order	2021-04-12 09:47:16 +02:00
list.php	Add right supplier_order	2021-04-12 09:47:16 +02:00
note.php	Add right supplier_order	2021-04-12 09:47:16 +02:00