Laurent Destailleur c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/compta/cashcontrol/cashcontrol_list.php htdocs/fourn/class/fournisseur.facture.class.php htdocs/modulebuilder/index.php htdocs/modulebuilder/template/myobject_list.php htdocs/product/class/api_products.class.php		2021-10-22 15:56:44 +02:00
..
api_products.class.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-22 15:56:44 +02:00
html.formproduct.class.php	Rename method into selectLotDataList	2021-10-17 14:38:12 +02:00
product.class.php	Update product.class.php	2021-10-16 21:22:53 +02:00
productbatch.class.php	Clean code	2021-09-27 15:50:19 +02:00
productcustomerprice.class.php	fix scrutinizer	2021-10-21 18:20:07 +02:00
productfournisseurprice.class.php	Fix trans labels status	2021-10-16 19:37:57 +02:00
propalmergepdfproduct.class.php	Merge pull request #18462 from grandoc/new_branch_22_08_2021	2021-08-28 18:35:40 +02:00