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

2018-09-01 14:49:42 +02:00 · 2018-09-01 14:49:42 +02:00 · 8d7dfaf98c
commit 8d7dfaf98c
parent b273587909 e4e1bf5a1a
1 changed files with 6 additions and 1 deletions
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@ -38,7 +38,12 @@ class DiscountAbsolute
 	 */
 	public $error;

-    public $id;					// Id discount
+	/**
+	 * @var string[]	Array of error strings
+	 */
+	public $errors=array();
+
+	public $id;					// Id discount
    public $fk_soc;
    public $discount_type;			// 0 => customer discount, 1 => supplier discount
    public $amount_ht;				//