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

Fix: error when creating an invoice from a project

Browse Source
This commit is contained in:
Regis Houssin 2010-11-06 15:18:30 +00:00
parent f4e1484cb9
commit 68ffff7c19
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
htdocs/compta/facture.php
View File

@ -1374,26 +1374,33 @@ if ($_GET['action'] == 'create')
$subelement = $regs[2]; $subelement = $regs[2];
} }
// For compatibility if ($element == 'project')
if ($element == 'order') { $element = $subelement = 'commande'; } {
if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } $projectid=$_GET['originid'];
if ($element == 'contract') { $element = $subelement = 'contrat'; } }
else if (in_array($element,array('order','commande','propal','contrat','contract')))
require_once(DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php'); {
$classname = ucfirst($subelement); // For compatibility
$object = new $classname($db); if ($element == 'order') { $element = $subelement = 'commande'; }
$object->fetch($_GET['originid']); if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
$object->fetch_client(); if ($element == 'contract') { $element = $subelement = 'contrat'; }
$projectid = (!empty($object->fk_project)?$object->fk_project:''); require_once(DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php');
$ref_client = (!empty($object->ref_client)?$object->ref_client:''); $classname = ucfirst($subelement);
$object = new $classname($db);
$soc = $object->client; $object->fetch($_GET['originid']);
$cond_reglement_id = (!empty($object->cond_reglement_id)?$object->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1)); $object->fetch_client();
$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)); $projectid = (!empty($object->fk_project)?$object->fk_project:'');
$remise_absolue = (!empty($object->remise_absolue)?$object->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0)); $ref_client = (!empty($object->ref_client)?$object->ref_client:'');
$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
$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 else
{ {