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

Merge pull request #462 from cbattarel/develop

Browse Source 
fix minor bugs in invoice and order creation from another object
This commit is contained in:
Regis Houssin 2012-10-25 06:56:49 -07:00
commit 4a99480da4
2 changed files with 2053 additions and 2053 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commande/fiche.php
View File

@ -1382,8 +1382,8 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines')) $objectsrc->fetch_lines(); if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines')) $objectsrc->fetch_lines();
$objectsrc->fetch_thirdparty(); $objectsrc->fetch_thirdparty();
$projectid = (!empty($objectsrc->fk_project)?$object->fk_project:''); $projectid = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
$ref_client = (!empty($objectsrc->ref_client)?$object->ref_client:''); $ref_client = (!empty($objectsrc->ref_client)?$objectsrc->ref_client:'');
$soc = $objectsrc->client; $soc = $objectsrc->client;
$cond_reglement_id = (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1)); $cond_reglement_id = (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));

2
htdocs/fourn/facture/fiche.php
View File

@ -965,7 +965,7 @@ if ($action == 'create')
$objectsrc->fetch(GETPOST('originid')); $objectsrc->fetch(GETPOST('originid'));
$objectsrc->fetch_thirdparty(); $objectsrc->fetch_thirdparty();
$projectid = (!empty($objectsrc->fk_project)?$object->fk_project:''); $projectid = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
//$ref_client = (!empty($objectsrc->ref_client)?$object->ref_client:''); //$ref_client = (!empty($objectsrc->ref_client)?$object->ref_client:'');
$soc = $objectsrc->client; $soc = $objectsrc->client;