diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 22da7d8ac7b..5bb5e481dfe 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1374,26 +1374,33 @@ if ($_GET['action'] == 'create') $subelement = $regs[2]; } - // For compatibility - if ($element == 'order') { $element = $subelement = 'commande'; } - if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } - if ($element == 'contract') { $element = $subelement = 'contrat'; } - - require_once(DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php'); - $classname = ucfirst($subelement); - $object = new $classname($db); - $object->fetch($_GET['originid']); - $object->fetch_client(); - - $projectid = (!empty($object->fk_project)?$object->fk_project:''); - $ref_client = (!empty($object->ref_client)?$object->ref_client:''); - - $soc = $object->client; - $cond_reglement_id = (!empty($object->cond_reglement_id)?$object->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1)); - $mode_reglement_id = (!empty($object->mode_reglement_id)?$object->mode_reglement_id:(!empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0)); - $remise_percent = (!empty($object->remise_percent)?$object->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0)); - $remise_absolue = (!empty($object->remise_absolue)?$object->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0)); - $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; + if ($element == 'project') + { + $projectid=$_GET['originid']; + } + else if (in_array($element,array('order','commande','propal','contrat','contract'))) + { + // For compatibility + if ($element == 'order') { $element = $subelement = 'commande'; } + if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } + if ($element == 'contract') { $element = $subelement = 'contrat'; } + + require_once(DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php'); + $classname = ucfirst($subelement); + $object = new $classname($db); + $object->fetch($_GET['originid']); + $object->fetch_client(); + + $projectid = (!empty($object->fk_project)?$object->fk_project:''); + $ref_client = (!empty($object->ref_client)?$object->ref_client:''); + + $soc = $object->client; + $cond_reglement_id = (!empty($object->cond_reglement_id)?$object->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1)); + $mode_reglement_id = (!empty($object->mode_reglement_id)?$object->mode_reglement_id:(!empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0)); + $remise_percent = (!empty($object->remise_percent)?$object->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0)); + $remise_absolue = (!empty($object->remise_absolue)?$object->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0)); + $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; + } } else {