lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13508 from hregis/8.0_mc3

Browse Source 
FIX missing member entity
This commit is contained in:
Laurent Destailleur 2020-04-07 21:14:06 +02:00 committed by GitHub
commit 2ec60c9d55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/societe/class/societe.class.php
View File

@ -3275,6 +3275,7 @@ class Societe extends CommonObject
$this->phone=$member->phone; // Prof phone $this->phone=$member->phone; // Prof phone
$this->email=$member->email; $this->email=$member->email;
$this->skype=$member->skype; $this->skype=$member->skype;
$this->entity=$member->entity;
$this->client = 1; // A member is a customer by default $this->client = 1; // A member is a customer by default
$this->code_client = ($customercode?$customercode:-1); $this->code_client = ($customercode?$customercode:-1);
@ -3778,7 +3779,7 @@ class Societe extends CommonObject
$outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits; $outstandingOpened+=$obj->total_ttc - $paiement - $creditnotes - $deposits;
} }
//if credit note is converted but not used //if credit note is converted but not used
if($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())$outstandingOpened-=$tmpobject->getSumFromThisCreditNotesNotUsed(); if($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())$outstandingOpened-=$tmpobject->getSumFromThisCreditNotesNotUsed();