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

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2010-04-28 08:58:41 +00:00
parent 4cbcf554f7
commit 91c14faadc
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
htdocs/compta/facture.php
View File

@ -1497,10 +1497,10 @@ if ($_GET['action'] == 'create')
$ref_client=$propal->ref_client; $ref_client=$propal->ref_client;
$soc=$propal->client; $soc=$propal->client;
$cond_reglement_id = $propal->cond_reglement_id; $cond_reglement_id = $propal->cond_reglement_id;
$mode_reglement_id = $propal->mode_reglement_id; $mode_reglement_id = $propal->mode_reglement_id;
$remise_percent = $propal->remise_percent; $remise_percent = $propal->remise_percent;
$remise_absolue = $propal->remise_absolue; $remise_absolue = $propal->remise_absolue;
} }
elseif ($_GET['commandeid']) elseif ($_GET['commandeid'])
{ {
@ -1512,10 +1512,10 @@ if ($_GET['action'] == 'create')
$ref_client=$commande->ref_client; $ref_client=$commande->ref_client;
$soc=$commande->client; $soc=$commande->client;
$cond_reglement_id = $commande->cond_reglement_id; $cond_reglement_id = $commande->cond_reglement_id;
$mode_reglement_id = $commande->mode_reglement_id; $mode_reglement_id = $commande->mode_reglement_id;
$remise_percent = $commande->remise_percent; $remise_percent = $commande->remise_percent;
$remise_absolue = $commande->remise_absolue; $remise_absolue = $commande->remise_absolue;
} }
elseif ($_GET['contratid']) elseif ($_GET['contratid'])
{ {
@ -1526,10 +1526,10 @@ if ($_GET['action'] == 'create')
$projectid=$contrat->fk_project; $projectid=$contrat->fk_project;
$soc=$contrat->client; $soc=$contrat->client;
$cond_reglement_id = $soc->cond_reglement; $cond_reglement_id = $soc->cond_reglement_id;
$mode_reglement_id = $soc->mod_reglement; $mode_reglement_id = $soc->mode_reglement_id;
$remise_percent = $soc->remise_client; $remise_percent = $soc->remise_percent;
$remise_absolue = 0; $remise_absolue = 0;
$dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; $dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
} }
// TODO a mutualiser // TODO a mutualiser
@ -1549,19 +1549,19 @@ if ($_GET['action'] == 'create')
$object->fetch_client(); $object->fetch_client();
$soc = $object->client; $soc = $object->client;
$cond_reglement_id = $soc->cond_reglement; $cond_reglement_id = $soc->cond_reglement_id;
$mode_reglement_id = $soc->mode_reglement; $mode_reglement_id = $soc->mode_reglement_id;
$remise_percent = $soc->remise_client; $remise_percent = $soc->remise_percent;
$remise_absolue = 0; $remise_absolue = 0;
$dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; //$dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
} }
else else
{ {
$res=$soc->fetch($socid); $res=$soc->fetch($socid);
$cond_reglement_id = $soc->cond_reglement; $cond_reglement_id = $soc->cond_reglement_id;
$mode_reglement_id = $soc->mode_reglement; $mode_reglement_id = $soc->mode_reglement_id;
$remise_percent = $soc->remise_client; $remise_percent = $soc->remise_percent;
$remise_absolue = 0; $remise_absolue = 0;
$dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; $dateinvoice=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
} }
$absolute_discount=$soc->getAvailableDiscounts(); $absolute_discount=$soc->getAvailableDiscounts();

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

@ -88,9 +88,12 @@ class Societe extends CommonObject
var $forme_juridique_code; var $forme_juridique_code;
var $forme_juridique; var $forme_juridique;
var $remise_client; var $remise_percent;
var $mode_reglement; var $mode_reglement_id;
var $cond_reglement; var $cond_reglement_id;
var $remise_client; // TODO obsolete
var $mode_reglement; // TODO obsolete
var $cond_reglement; // TODO obsolete
var $client; // 0=no customer, 1=customer, 2=prospect var $client; // 0=no customer, 1=customer, 2=prospect
var $prospect; // 0=no prospect, 1=prospect var $prospect; // 0=no prospect, 1=prospect
@ -675,9 +678,13 @@ class Societe extends CommonObject
$this->prefix_comm = $obj->prefix_comm; $this->prefix_comm = $obj->prefix_comm;
$this->remise_client = $obj->remise_client; $this->remise_percent = $obj->remise_client;
$this->mode_reglement = $obj->mode_reglement; $this->mode_reglement_id = $obj->mode_reglement;
$this->cond_reglement = $obj->cond_reglement; $this->cond_reglement_id = $obj->cond_reglement;
$this->remise_client = $obj->remise_client; // TODO obsolete
$this->mode_reglement = $obj->mode_reglement; // TODO obsolete
$this->cond_reglement = $obj->cond_reglement; // TODO obsolete
$this->client = $obj->client; $this->client = $obj->client;
$this->fournisseur = $obj->fournisseur; $this->fournisseur = $obj->fournisseur;