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

..

admin

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00

class

Fix test

2021-06-10 16:31:28 +02:00

stats

Look and feel v14

2021-03-29 13:00:17 +02:00

tpl

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00

card-rec.php

Merge pull request #17429 from fr69400/develop

2021-05-03 13:16:45 +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

FIX #yogosha5746

2021-03-29 15:07:23 +02:00

document.php

Fix permission

2021-06-08 16:19:21 +02:00

index.php

Fix

2021-06-10 00:41:15 +02:00

info.php

Fix #yogosha235

2021-03-18 20:27:36 +01:00

invoicetemplate_list.php

Fix total tva

2021-06-10 02:12:29 +02: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

Fix #yogosha235

2021-03-18 20:27:36 +01:00

prelevement.php

Update prelevement.php

2021-05-11 19:21:08 +02:00