Laurent Destailleur 7438f92912 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ...

Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/compta/tva/document.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/card.php

2020-01-27 01:50:02 +01:00

..

class

Merge branch 'develop' into 11.0_https

2019-10-01 06:11:43 +02:00

card.php

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

clients.php

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

document.php

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

2020-01-27 01:50:02 +01:00

index.php

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

info.php

replace deprecated user->societe_id by user->socid

2019-10-31 20:46:31 +01:00

list.php

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00

quadri_detail.php

Fix $_SESSION['newtoken'] must be newToken()

2019-12-18 23:12:31 +01:00