Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 14a22

Browse Source
This commit is contained in:
Alexandre SPANGARO
2021-02-28 21:30:25 +01:00
parent ca7958f273 79ed52c3d3
commit 7a3dfda8ee
219 changed files with 11412 additions and 9620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/commonobject.class.php
View File

@@ -493,6 +493,10 @@ abstract class CommonObject
*/
public $sendtoid;
/**
* @var float Amount already paid (used to show correct status)
*/
public $alreadypaid;
/**
* @var array List of child tables. To test if we can delete object.
@@ -2447,7 +2451,8 @@ abstract class CommonObject
$line->date_end,
$line->array_options,
$line->fk_unit,
$line->multicurrency_subprice
$line->multicurrency_subprice,
$line->ref_supplier
);
break;
case 'invoice_supplier':
@@ -2469,7 +2474,8 @@ abstract class CommonObject
$line->date_end,
$line->array_options,
$line->fk_unit,
$line->multicurrency_subprice
$line->multicurrency_subprice,
$line->ref_supplier
);
break;
default: