mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-04 16:12:39 +01:00
Conflicts: htdocs/core/boxes/box_commandes.php htdocs/core/boxes/box_propales.php htdocs/core/boxes/box_shipments.php htdocs/core/boxes/box_supplier_orders.php htdocs/core/boxes/box_supplier_orders_awaiting_reception.php htdocs/core/tpl/objectline_edit.tpl.php