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

Fix: use specific variable

Browse Source
This commit is contained in:
Regis Houssin 2012-09-09 16:31:00 +02:00
parent 9058439015
commit a7bfc722d5
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/categories/categorie.php
View File

@ -223,7 +223,7 @@ if ($socid)
print '</td></tr>'; print '</td></tr>';
} }
if (! empty($conf->global->MAIN_MODULE_BARCODE)) if (! empty($conf->barcode->enabled))
{ {
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>'; print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>';
} }

2
htdocs/societe/agenda.php
View File

@ -105,7 +105,7 @@ if ($socid)
print '</td></tr>'; print '</td></tr>';
} }
if ($conf->global->MAIN_MODULE_BARCODE) if (! empty($conf->barcode->enabled))
{ {
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>'; print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>';
} }

2
htdocs/societe/canvas/company/tpl/card_create.tpl.php
View File

@ -96,7 +96,7 @@
</tr> </tr>
<?php } }?> <?php } }?>
<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?> <?php if (! empty($conf->barcode->enabled)) { ?>
<tr> <tr>
<td><?php echo $langs->trans('Gencod'); ?></td> <td><?php echo $langs->trans('Gencod'); ?></td>
<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td> <td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>

2
htdocs/societe/canvas/company/tpl/card_edit.tpl.php
View File

@ -111,7 +111,7 @@ if ($this->control->tpl['fournisseur']) {
</tr> </tr>
<?php } }?> <?php } }?>
<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?> <?php if (! empty($conf->barcode->enabled)) { ?>
<tr> <tr>
<td><?php echo $langs->trans('Gencod'); ?></td> <td><?php echo $langs->trans('Gencod'); ?></td>
<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td> <td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>

2
htdocs/societe/canvas/company/tpl/card_view.tpl.php
View File

@ -69,7 +69,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
</tr> </tr>
<?php } ?> <?php } ?>
<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?> <?php if (! empty($conf->barcode->enabled)) { ?>
<tr> <tr>
<td><?php echo $langs->trans('Gencod'); ?></td> <td><?php echo $langs->trans('Gencod'); ?></td>
<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td> <td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>

2
htdocs/societe/canvas/individual/tpl/card_create.tpl.php
View File

@ -106,7 +106,7 @@
</tr> </tr>
<?php } }?> <?php } }?>
<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?> <?php if (! empty($conf->barcode->enabled)) { ?>
<tr> <tr>
<td><?php echo $langs->trans('Gencod'); ?></td> <td><?php echo $langs->trans('Gencod'); ?></td>
<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td> <td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>

2
htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
View File

@ -108,7 +108,7 @@ if ($this->control->tpl['fournisseur']) {
</tr> </tr>
<?php } }?> <?php } }?>
<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?> <?php if (! empty($conf->barcode->enabled)) { ?>
<tr> <tr>
<td><?php echo $langs->trans('Gencod'); ?></td> <td><?php echo $langs->trans('Gencod'); ?></td>
<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td> <td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>

2
htdocs/societe/canvas/individual/tpl/card_view.tpl.php
View File

@ -68,7 +68,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
</tr> </tr>
<?php } ?> <?php } ?>
<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?> <?php if (! empty($conf->barcode->enabled)) { ?>
<tr> <tr>
<td><?php echo $langs->trans('Gencod'); ?></td> <td><?php echo $langs->trans('Gencod'); ?></td>
<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td> <td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>

8
htdocs/societe/soc.php
View File

@ -784,7 +784,7 @@ else
print '</td></tr>'; print '</td></tr>';
// Barcode // Barcode
if (! empty($conf->global->MAIN_MODULE_BARCODE)) if (! empty($conf->barcode->enabled))
{ {
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">'; print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">';
print '</td></tr>'; print '</td></tr>';
@ -1218,7 +1218,7 @@ else
} }
// Barcode // Barcode
if ($conf->global->MAIN_MODULE_BARCODE) if (! empty($conf->barcode->enabled))
{ {
print '<tr><td valign="top">'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">'; print '<tr><td valign="top">'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">';
print '</td></tr>'; print '</td></tr>';
@ -1469,7 +1469,7 @@ else
if (! empty($conf->global->SOCIETE_USEPREFIX)) $rowspan++; if (! empty($conf->global->SOCIETE_USEPREFIX)) $rowspan++;
if (! empty($object->client)) $rowspan++; if (! empty($object->client)) $rowspan++;
if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire)) $rowspan++; if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire)) $rowspan++;
if (! empty($conf->global->MAIN_MODULE_BARCODE)) $rowspan++; if (! empty($conf->barcode->enabled)) $rowspan++;
if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++; if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
$htmllogobar=''; $htmllogobar='';
if ($showlogo || $showbarcode) if ($showlogo || $showbarcode)
@ -1514,7 +1514,7 @@ else
} }
// Barcode // Barcode
if (! empty($conf->global->MAIN_MODULE_BARCODE)) if (! empty($conf->barcode->enabled))
{ {
print '<tr><td>'; print '<tr><td>';
print $langs->trans('Gencod').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">'.$object->barcode; print $langs->trans('Gencod').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">'.$object->barcode;