Laurent Destailleur 1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ...

Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php

2021-06-10 16:53:09 +02:00

..

admin

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

class

FIX inconsistency in margin recording with option "Force to sale price"

2021-03-24 21:49:45 +01:00

stats

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

2020-11-29 21:35:03 +01:00

tpl

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

card-rec.php

FIX #16503

2021-03-02 23:09:55 +01:00

card.php

Update card.php

2021-06-08 12:01:05 +02:00

contact.php

Fix combo to add contact and status of contact on popup

2020-11-30 15:18:58 +01:00

document.php

move include_once to include when it's a tpl

2021-04-12 21:25:58 +02:00

index.html

…

index.php

Fix height of graph

2020-12-03 20:18:37 +01:00

info.php

end of dol_fiche_end

2020-10-27 18:19:31 +01:00

invoicetemplate_list.php

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

2021-02-15 16:45:17 +01:00

list.php

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

2021-06-10 16:53:09 +02:00

note.php

Scrutinizer Auto-Fixes

2020-10-31 13:32:18 +00:00

prelevement.php

Fix css

2020-12-23 23:16:27 +01:00