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

develop

Conflicts:
	htdocs/product/price.php
This commit is contained in:
Laurent Destailleur 2017-12-22 12:55:16 +01:00
commit 3b54be5dac
2 changed files with 2 additions and 2 deletions

View File

@ -3168,7 +3168,7 @@ a.impayee:hover { font-weight: bold; color: #550000; }
*/
.product_line_stock_ok { color: #002200; }
.product_line_stock_too_low { color: #664400; }
.product_line_stock_too_low { color: #884400; }
.fieldrequired { font-weight: bold; color: #000055; }

View File

@ -3235,7 +3235,7 @@ a.impayee:hover { font-weight: bold; color: #550000; }
*/
.product_line_stock_ok { color: #002200; }
.product_line_stock_too_low { color: #664400; }
.product_line_stock_too_low { color: #884400; }
.fieldrequired { font-weight: bold; color: #000055; }