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

Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php

2021-01-06 20:20:37 +01:00

..

api_contacts.class.php

Fix api contact

2020-11-24 12:03:31 +01:00

api_thirdparties.class.php

include

2020-12-21 15:25:15 +01:00

client.class.php

Scrutinizer Auto-Fixes

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

companybankaccount.class.php

Scrutinizer Auto-Fixes

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

companypaymentmode.class.php

doxygen

2020-12-05 23:53:55 +01:00

index.html

…

societe.class.php

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

2021-01-06 20:20:37 +01:00

societeaccount.class.php

Update societeaccount.class.php

2020-12-07 22:30:24 +01:00