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

Fix: hide supplier fields if supplier module is disabled

Browse Source
This commit is contained in:
Regis Houssin 2010-11-04 10:58:40 +00:00
parent 6cd0fc074f
commit 0df44a7787
3 changed files with 59 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
htdocs/societe/canvas/actions_card_common.class.php
View File

@ -68,6 +68,29 @@ class ActionsCardCommon
{ {
$this->tpl[$key] = $value; $this->tpl[$key] = $value;
} }
if ($action == 'create')
{
if ($conf->use_javascript_ajax)
{
$this->tpl['ajax_selecttype'] = "\n".'<script type="text/javascript" language="javascript">
jQuery(document).ready(function () {
jQuery("#radiocompany").click(function() {
document.formsoc.action.value="create";
document.formsoc.canvas.value="default";
document.formsoc.private.value=0;
document.formsoc.submit();
});
jQuery("#radioprivate").click(function() {
document.formsoc.action.value="create";
document.formsoc.canvas.value="individual";
document.formsoc.private.value=1;
document.formsoc.submit();
});
});
</script>'."\n";
}
}
if ($action == 'create' || $action == 'edit') if ($action == 'create' || $action == 'edit')
{ {
@ -97,19 +120,6 @@ class ActionsCardCommon
// We verified if the tag prefix is used // We verified if the tag prefix is used
if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed(); if ($modCodeClient->code_auto) $this->tpl['prefix_customercode'] = $modCodeClient->verif_prefixIsUsed();
// Load object modCodeFournisseur
$module=$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON;
if (! $module) $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
{
$module = substr($module, 0, dol_strlen($module)-4);
}
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
$modCodeFournisseur = new $module;
$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
// We verified if the tag prefix is used
if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
// TODO create a function // TODO create a function
$this->tpl['select_customertype'] = '<select class="flat" name="client">'; $this->tpl['select_customertype'] = '<select class="flat" name="client">';
$this->tpl['select_customertype'].= '<option value="2"'.($this->object->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>'; $this->tpl['select_customertype'].= '<option value="2"'.($this->object->client==2?' selected="selected"':'').'>'.$langs->trans('Prospect').'</option>';
@ -124,18 +134,36 @@ class ActionsCardCommon
$this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable(); $this->tpl['ismodifiable_customercode'] = $this->object->codeclient_modifiable();
$s=$modCodeClient->getToolTip($langs,$this->object,0); $s=$modCodeClient->getToolTip($langs,$this->object,0);
$this->tpl['help_customercode'] = $form->textwithpicto('',$s,1); $this->tpl['help_customercode'] = $form->textwithpicto('',$s,1);
// Supplier if ($conf->fournisseur->enabled)
$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1); {
$this->tpl['suppliercode'] = $this->object->code_fournisseur; $this->tpl['supplier_enabled'] = 1;
if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable(); // Load object modCodeFournisseur
$s=$modCodeFournisseur->getToolTip($langs,$this->object,1); $module=$conf->global->SOCIETE_CODEFOURNISSEUR_ADDON;
$this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1); if (! $module) $module=$conf->global->SOCIETE_CODECLIENT_ADDON;
if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
$this->object->LoadSupplierCateg(); {
$this->tpl['suppliercategory'] = $this->object->SupplierCategories; $module = substr($module, 0, dol_strlen($module)-4);
$this->tpl['select_suppliercategory'] = $form->selectarray("fournisseur_categorie",$this->object->SupplierCategories,$_POST["fournisseur_categorie"],1); }
require_once(DOL_DOCUMENT_ROOT ."/includes/modules/societe/".$module.".php");
$modCodeFournisseur = new $module;
$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
// We verified if the tag prefix is used
if ($modCodeFournisseur->code_auto) $this->tpl['prefix_suppliercode'] = $modCodeFournisseur->verif_prefixIsUsed();
// Supplier
$this->tpl['yn_supplier'] = $form->selectyesno("fournisseur",$this->object->fournisseur,1);
$this->tpl['suppliercode'] = $this->object->code_fournisseur;
if ((!$this->object->code_fournisseur || $this->object->code_fournisseur == -1) && $modCodeFournisseur->code_auto) $this->tpl['suppliercode'] = $modCodeFournisseur->getNextValue($this->object,1);
$this->tpl['ismodifiable_suppliercode'] = $this->object->codefournisseur_modifiable();
$s=$modCodeFournisseur->getToolTip($langs,$this->object,1);
$this->tpl['help_suppliercode'] = $form->textwithpicto('',$s,1);
$this->object->LoadSupplierCateg();
$this->tpl['suppliercategory'] = $this->object->SupplierCategories;
$this->tpl['select_suppliercategory'] = $form->selectarray("fournisseur_categorie",$this->object->SupplierCategories,$_POST["fournisseur_categorie"],1);
}
// Zip // Zip
$this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->cp,'zipcode',array('town','selectpays_id','departement_id'),6); $this->tpl['select_zip'] = $formcompany->select_ziptown($this->object->cp,'zipcode',array('town','selectpays_id','departement_id'),6);

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

@ -22,23 +22,7 @@
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE -->
<?php if ($conf->use_javascript_ajax) { ?> <?php if ($conf->use_javascript_ajax) { ?>
<script type="text/javascript" language="javascript"> <?php echo $this->control->tpl['ajax_selecttype']; ?>
jQuery(document).ready(function () {
jQuery("#radiocompany").click(function() {
document.formsoc.action.value="create";
document.formsoc.canvas.value="default";
document.formsoc.private.value=0;
document.formsoc.submit();
});
jQuery("#radioprivate").click(function() {
document.formsoc.action.value="create";
document.formsoc.canvas.value="individual";
document.formsoc.private.value=1;
document.formsoc.submit();
});
});
</script>
<br> <br>
<?php echo $langs->trans("ThirdPartyType") ?>: &nbsp; <?php echo $langs->trans("ThirdPartyType") ?>: &nbsp;
<input type="radio" id="radiocompany" class="flat" name="private" value="0"'<?php echo (! $_REQUEST["private"]?' checked="true"':''); ?>> <input type="radio" id="radiocompany" class="flat" name="private" value="0"'<?php echo (! $_REQUEST["private"]?' checked="true"':''); ?>>
@ -83,6 +67,7 @@ jQuery(document).ready(function () {
</td> </td>
</tr> </tr>
<?php if ($this->control->tpl['supplier_enabled']) { ?>
<tr> <tr>
<td><span class="fieldrequired"><?php echo $langs->trans('Supplier'); ?></span></td> <td><span class="fieldrequired"><?php echo $langs->trans('Supplier'); ?></span></td>
<td><?php echo $this->control->tpl['yn_supplier']; ?></td> <td><?php echo $this->control->tpl['yn_supplier']; ?></td>
@ -97,9 +82,7 @@ jQuery(document).ready(function () {
</td> </td>
</tr> </tr>
<?php <?php if (sizeof($this->control->tpl['suppliercategory']) > 0) { ?>
if ($this->control->tpl['fournisseur']) {
if (sizeof($this->control->tpl['suppliercategory']) > 0) { ?>
<tr> <tr>
<td><?php echo $langs->trans('SupplierCategory'); ?></td> <td><?php echo $langs->trans('SupplierCategory'); ?></td>
<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td> <td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>

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

@ -22,23 +22,7 @@
<!-- BEGIN PHP TEMPLATE --> <!-- BEGIN PHP TEMPLATE -->
<?php if ($conf->use_javascript_ajax) { ?> <?php if ($conf->use_javascript_ajax) { ?>
<script type="text/javascript" language="javascript"> <?php echo $this->control->tpl['ajax_selecttype']; ?>
jQuery(document).ready(function () {
jQuery("#radiocompany").click(function() {
document.formsoc.action.value="create";
document.formsoc.canvas.value="default";
document.formsoc.private.value=0;
document.formsoc.submit();
});
jQuery("#radioprivate").click(function() {
document.formsoc.action.value="create";
document.formsoc.canvas.value="individual";
document.formsoc.private.value=1;
document.formsoc.submit();
});
});
</script>
<br> <br>
<?php echo $langs->trans("ThirdPartyType") ?>: &nbsp; <?php echo $langs->trans("ThirdPartyType") ?>: &nbsp;
<input type="radio" id="radiocompany" class="flat" name="private" value="0"'<?php echo (! $_REQUEST["private"]?' checked="true"':''); ?>> <input type="radio" id="radiocompany" class="flat" name="private" value="0"'<?php echo (! $_REQUEST["private"]?' checked="true"':''); ?>>
@ -95,6 +79,7 @@ jQuery(document).ready(function () {
</td> </td>
</tr> </tr>
<?php if ($this->control->tpl['supplier_enabled']) { ?>
<tr> <tr>
<td><span class="fieldrequired"><?php echo $langs->trans('Supplier'); ?></span></td> <td><span class="fieldrequired"><?php echo $langs->trans('Supplier'); ?></span></td>
<td><?php echo $this->control->tpl['yn_supplier']; ?></td> <td><?php echo $this->control->tpl['yn_supplier']; ?></td>
@ -109,9 +94,7 @@ jQuery(document).ready(function () {
</td> </td>
</tr> </tr>
<?php <?php if (sizeof($this->control->tpl['suppliercategory']) > 0) { ?>
if ($this->control->tpl['fournisseur']) {
if (sizeof($this->control->tpl['suppliercategory']) > 0) { ?>
<tr> <tr>
<td><?php echo $langs->trans('SupplierCategory'); ?></td> <td><?php echo $langs->trans('SupplierCategory'); ?></td>
<td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td> <td colspan="3"><?php echo $this->control->tpl['select_suppliercategory']; ?></td>