Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

wip

Browse Source
This commit is contained in:
Frédéric FRANCE
2019-02-03 22:58:56 +01:00
parent 970392adb8
commit e1e14ae6e6
4 changed files with 3933 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement.php
View File

@@ -240,7 +240,7 @@ if (empty($reshook))
if (! empty($conf->banque->enabled))
{
// Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
if (GETPOST('accountid','int') <= 0)
if (GETPOST('accountid', 'int') <= 0)
{
setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
$error++;

74
htdocs/core/class/html.form.class.php
View File

@@ -1470,43 +1470,43 @@ class Form
$contactstatic->id=$obj->rowid;
$contactstatic->lastname=$obj->lastname;
$contactstatic->firstname=$obj->firstname;
if ($obj->statut == 1){
if ($htmlname != 'none')
{
$disabled=0;
if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) $disabled=1;
if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid, $limitto)) $disabled=1;
if (!empty($selected) && in_array($obj->rowid, $selected))
{
$out.= '<option value="'.$obj->rowid.'"';
if ($disabled) $out.= ' disabled';
$out.= ' selected>';
$out.= $contactstatic->getFullName($langs);
if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
$out.= '</option>';
}
else
{
$out.= '<option value="'.$obj->rowid.'"';
if ($disabled) $out.= ' disabled';
$out.= '>';
$out.= $contactstatic->getFullName($langs);
if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
$out.= '</option>';
}
}
else
{
if (in_array($obj->rowid, $selected))
{
$out.= $contactstatic->getFullName($langs);
if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
}
}
}
if ($obj->statut == 1) {
if ($htmlname != 'none')
{
$disabled=0;
if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) $disabled=1;
if (is_array($limitto) && count($limitto) && ! in_array($obj->rowid, $limitto)) $disabled=1;
if (!empty($selected) && in_array($obj->rowid, $selected))
{
$out.= '<option value="'.$obj->rowid.'"';
if ($disabled) $out.= ' disabled';
$out.= ' selected>';
$out.= $contactstatic->getFullName($langs);
if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
$out.= '</option>';
}
else
{
$out.= '<option value="'.$obj->rowid.'"';
if ($disabled) $out.= ' disabled';
$out.= '>';
$out.= $contactstatic->getFullName($langs);
if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
$out.= '</option>';
}
}
else
{
if (in_array($obj->rowid, $selected))
{
$out.= $contactstatic->getFullName($langs);
if ($showfunction && $obj->poste) $out.= ' ('.$obj->poste.')';
if (($showsoc > 0) && $obj->company) $out.= ' - ('.$obj->company.')';
}
}
}
$i++;
}
}

3896
htdocs/core/lib/functions.lib.php
View File

File diff suppressed because it is too large Load Diff

1
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@@ -1312,7 +1312,6 @@ class pdf_crabe extends ModelePDFFactures
$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
}
}
}
//}
// Revenue stamp