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

New: Prefix on third party is not used by default. Hidden option SOCIETE_USEPREFIX can restore old feature.

Browse Source
This commit is contained in:
Regis Houssin 2011-01-29 18:46:56 +00:00
parent ddf1b2763b
commit 4e0cca5593
6 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,8 +48,10 @@
<tr> <tr>
<td><span class="fieldrequired"><?php echo $langs->trans('Name'); ?></span></td> <td><span class="fieldrequired"><?php echo $langs->trans('Name'); ?></span></td>
<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td> <td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
<td><?php echo $langs->trans('Prefix'); ?></td> <td><?php echo $langs->trans('Prefix'); ?></td>
<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td> <td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
<?php } ?>
</tr> </tr>
<tr> <tr>

4
htdocs/societe/canvas/default/tpl/card_edit.tpl.php
View File

@ -39,10 +39,11 @@
<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td> <td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
</tr> </tr>
<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
<tr> <tr>
<td><?php echo $langs->trans("Prefix"); ?></td> <td><?php echo $langs->trans("Prefix"); ?></td>
<td colspan="3"> <td colspan="3">
<?php if (($this->tpl['prefix_customercode'] || $this->tpl['prefix_suppliercode']) && $this->control->tpl['prefix_comm']) { ?> <?php if (($this->control->tpl['prefix_customercode'] || $this->control->tpl['prefix_suppliercode']) && $this->control->tpl['prefix_comm']) { ?>
<input type="hidden" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"> <input type="hidden" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>">
<?php echo $this->control->tpl['prefix_comm']; ?> <?php echo $this->control->tpl['prefix_comm']; ?>
<?php } else { ?> <?php } else { ?>
@ -50,6 +51,7 @@
<?php } ?> <?php } ?>
</td> </td>
</tr> </tr>
<?php } ?>
<tr> <tr>
<td width="25%"><span class="fieldrequired"><?php echo $langs->trans('ProspectCustomer'); ?></span></td> <td width="25%"><span class="fieldrequired"><?php echo $langs->trans('ProspectCustomer'); ?></span></td>

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

@ -33,10 +33,12 @@
<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td> <td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
</tr> </tr>
<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
<tr> <tr>
<td><?php echo $langs->trans('Prefix'); ?></td> <td><?php echo $langs->trans('Prefix'); ?></td>
<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td> <td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
</tr> </tr>
<?php } ?>
<?php if ($this->control->tpl['client']) { ?> <?php if ($this->control->tpl['client']) { ?>
<tr> <tr>

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

@ -48,8 +48,10 @@
<tr> <tr>
<td><span class="fieldrequired"><?php echo $langs->trans('LastName'); ?></span></td> <td><span class="fieldrequired"><?php echo $langs->trans('LastName'); ?></span></td>
<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td> <td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
<td><?php echo $langs->trans('Prefix'); ?></td> <td><?php echo $langs->trans('Prefix'); ?></td>
<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td> <td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
<?php } ?>
</tr> </tr>
<tr> <tr>

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

@ -40,10 +40,11 @@
<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td> <td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
</tr> </tr>
<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
<tr> <tr>
<td><?php echo $langs->trans("Prefix"); ?></td> <td><?php echo $langs->trans("Prefix"); ?></td>
<td colspan="3"> <td colspan="3">
<?php if (($this->tpl['prefix_customercode'] || $this->tpl['prefix_suppliercode']) && $this->control->tpl['prefix_comm']) { ?> <?php if (($this->control->tpl['prefix_customercode'] || $this->control->tpl['prefix_suppliercode']) && $this->control->tpl['prefix_comm']) { ?>
<input type="hidden" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"> <input type="hidden" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>">
<?php echo $this->control->tpl['prefix_comm']; ?> <?php echo $this->control->tpl['prefix_comm']; ?>
<?php } else { ?> <?php } else { ?>
@ -51,6 +52,7 @@
<?php } ?> <?php } ?>
</td> </td>
</tr> </tr>
<?php } ?>
<tr> <tr>
<td width="25%"><span class="fieldrequired"><?php echo $langs->trans('ProspectCustomer'); ?></span></td> <td width="25%"><span class="fieldrequired"><?php echo $langs->trans('ProspectCustomer'); ?></span></td>

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

@ -33,10 +33,12 @@
<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td> <td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
</tr> </tr>
<?php if (! empty($conf->global->SOCIETE_USEPREFIX)) { ?>
<tr> <tr>
<td><?php echo $langs->trans('Prefix'); ?></td> <td><?php echo $langs->trans('Prefix'); ?></td>
<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td> <td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
</tr> </tr>
<?php } ?>
<?php if ($this->control->tpl['client']) { ?> <?php if ($this->control->tpl['client']) { ?>
<tr> <tr>