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

..

linkedobjectblock.tpl.php

Scrutinizer Auto-Fixes

2020-10-31 17:51:30 +00:00

objectline_create.tpl.php

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

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

objectline_edit.tpl.php

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

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

objectline_title.tpl.php

Fix warning

2020-11-25 18:07:52 +01:00

objectline_view.tpl.php

Fix bom line unit display #13831

2021-01-06 16:01:19 +01:00