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

7
htdocs/compta/facture.php
View File

@ -1374,6 +1374,12 @@ if ($_GET['action'] == 'create')
$subelement = $regs[2]; $subelement = $regs[2];
} }
if ($element == 'project')
{
$projectid=$_GET['originid'];
}
else if (in_array($element,array('order','commande','propal','contrat','contract')))
{
// For compatibility // For compatibility
if ($element == 'order') { $element = $subelement = 'commande'; } if ($element == 'order') { $element = $subelement = 'commande'; }
if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
@ -1395,6 +1401,7 @@ if ($_GET['action'] == 'create')
$remise_absolue = (!empty($object->remise_absolue)?$object->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue: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; $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
} }
}
else else
{ {
$res=$soc->fetch($socid); $res=$soc->fetch($socid);