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

Merge pull request #12296 from frederic34/patch-20

Browse Source 
Update index.php
This commit is contained in:
Laurent Destailleur 2019-11-02 10:09:55 +01:00 committed by GitHub
commit 82bda63920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/charges/index.php
View File

@ -185,8 +185,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
// Label // Label
print '<td>'; print '<td>';
$socialcontrib->id=$obj->rowid; $socialcontrib->id=$obj->rowid;
$socialcontrib->ref=$obj->libelle; $socialcontrib->ref=$obj->rowid;
$socialcontrib->lib=$obj->libelle; $socialcontrib->label=$obj->libelle;
print $socialcontrib->getNomUrl(1, '20'); print $socialcontrib->getNomUrl(1, '20');
print '</td>'; print '</td>';
// Type // Type

4
htdocs/compta/index.php
View File

@ -661,8 +661,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$chargestatic->id=$obj->rowid; $chargestatic->id=$obj->rowid;
$chargestatic->ref=$obj->libelle; $chargestatic->ref=$obj->rowid;
$chargestatic->lib=$obj->libelle; $chargestatic->label=$obj->libelle;
$chargestatic->paye=$obj->paye; $chargestatic->paye=$obj->paye;
print '<tr class="oddeven">'; print '<tr class="oddeven">';

4
htdocs/compta/sociales/info.php
View File

@ -79,8 +79,8 @@ dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, 'bill');
$morehtmlref='<div class="refidno">'; $morehtmlref='<div class="refidno">';
// Label of social contribution // Label of social contribution
$morehtmlref.=$form->editfieldkey("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1); $morehtmlref.=$form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
$morehtmlref.=$form->editfieldval("Label", 'lib', $object->lib, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1); $morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
// Project // Project
if (! empty($conf->projet->enabled)) if (! empty($conf->projet->enabled))
{ {

2
htdocs/compta/sociales/list.php
View File

@ -261,7 +261,7 @@ if ($resql)
$chargesociale_static->id=$obj->id; $chargesociale_static->id=$obj->id;
$chargesociale_static->ref=$obj->id; $chargesociale_static->ref=$obj->id;
$chargesociale_static->lib=$obj->libelle; $chargesociale_static->label=$obj->libelle;
$chargesociale_static->type_libelle=$obj->type_lib; $chargesociale_static->type_libelle=$obj->type_lib;
print '<tr class="oddeven">'; print '<tr class="oddeven">';

4
htdocs/compta/sociales/payments.php
View File

@ -176,8 +176,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
// Label // Label
print '<td>'; print '<td>';
$socialcontrib->id=$obj->rowid; $socialcontrib->id=$obj->rowid;
$socialcontrib->ref=$obj->libelle; $socialcontrib->ref=$obj->rowid;
$socialcontrib->lib=$obj->libelle; $socialcontrib->label=$obj->libelle;
print $socialcontrib->getNomUrl(1, '20'); print $socialcontrib->getNomUrl(1, '20');
print '</td>'; print '</td>';
// Type // Type