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_products.class.php

FIX variant api code v13+

2020-12-21 16:07:46 +01:00

html.formproduct.class.php

Debug v13

2020-11-05 22:25:14 +01:00

index.html

…

product.class.php

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

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

productbatch.class.php

More PHPUnit for movements

2020-12-16 12:26:01 +01:00

productcustomerprice.class.php

Scrutinizer Auto-Fixes

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

propalmergepdfproduct.class.php

Scrutinizer Auto-Fixes

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