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

New: Change preselected value when creating a third party to save clicks.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-10-09 11:30:32 +00:00
parent b05373a5bc
commit 1891932ac8
2 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/societe/class/societe.class.php
View File

@ -181,6 +181,8 @@ class Societe extends CommonObject
$this->error = $langs->trans("ErrorBadEMail",$this->email); $this->error = $langs->trans("ErrorBadEMail",$this->email);
return -1; return -1;
} }
if (empty($this->client)) $this->client=0;
if (empty($this->fournisseur)) $this->fournisseur=0;
$this->db->begin(); $this->db->begin();

71
htdocs/societe/soc.php
View File

@ -558,11 +558,12 @@ else
/* /*
* Company Fact creation mode * Company Fact creation mode
*/ */
if ($_GET["type"]=='f') { $soc->fournisseur=1; } //if ($_GET["type"]=='cp') { $soc->client=3; }
if ($_GET["type"]!='f') $soc->client=3;
if ($_GET["type"]=='c') { $soc->client=1; } if ($_GET["type"]=='c') { $soc->client=1; }
if ($_GET["type"]=='p') { $soc->client=2; } if ($_GET["type"]=='p') { $soc->client=2; }
if ($_GET["type"]=='cp') { $soc->client=3; } if ($conf->fournisseur->enabled && ($_GET["type"]=='f' || $_GET["type"]=='')) { $soc->fournisseur=1; }
if ($_REQUEST["private"]==1) { $soc->particulier=1; } if ($_REQUEST["private"]==1) { $soc->particulier=1; }
$soc->nom=$_POST["nom"]; $soc->nom=$_POST["nom"];
$soc->prenom=$_POST["prenom"]; $soc->prenom=$_POST["prenom"];
@ -717,37 +718,39 @@ else
print '</td></tr>'; print '</td></tr>';
// Supplier if ($conf->fournisseur->enabled)
print '<tr>';
print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
print $form->selectyesno("fournisseur",$soc->fournisseur,1);
print '</td>';
print '<td>'.$langs->trans('SupplierCode').'</td><td>';
print '<table class="nobordernopadding"><tr><td>';
$tmpcode=$soc->code_fournisseur;
if ($modCodeFournisseur->code_auto) $tmpcode=$modCodeFournisseur->getNextValue($soc,1);
print '<input type="text" name="code_fournisseur" size="16" value="'.$tmpcode.'" maxlength="15">';
print '</td><td>';
$s=$modCodeFournisseur->getToolTip($langs,$soc,1);
print $form->textwithpicto('',$s,1);
print '</td></tr></table>';
print '</td></tr>';
// Category
if ($soc->fournisseur)
{ {
$load = $soc->LoadSupplierCateg(); // Supplier
if ( $load == 0) print '<tr>';
{ print '<td><span class="fieldrequired">'.$langs->trans('Supplier').'</span></td><td>';
if (sizeof($soc->SupplierCategories) > 0) print $form->selectyesno("fournisseur",$soc->fournisseur,1);
{ print '</td>';
print '<tr>'; print '<td>'.$langs->trans('SupplierCode').'</td><td>';
print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">'; print '<table class="nobordernopadding"><tr><td>';
print $form->selectarray("fournisseur_categorie",$soc->SupplierCategories,$_POST["fournisseur_categorie"],1); $tmpcode=$soc->code_fournisseur;
print '</td></tr>'; if ($modCodeFournisseur->code_auto) $tmpcode=$modCodeFournisseur->getNextValue($soc,1);
} print '<input type="text" name="code_fournisseur" size="16" value="'.$tmpcode.'" maxlength="15">';
} print '</td><td>';
$s=$modCodeFournisseur->getToolTip($langs,$soc,1);
print $form->textwithpicto('',$s,1);
print '</td></tr></table>';
print '</td></tr>';
// Category
if ($soc->fournisseur)
{
$load = $soc->LoadSupplierCateg();
if ( $load == 0)
{
if (sizeof($soc->SupplierCategories) > 0)
{
print '<tr>';
print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
print $form->selectarray("fournisseur_categorie",$soc->SupplierCategories,$_POST["fournisseur_categorie"],1);
print '</td></tr>';
}
}
}
} }
// Barcode // Barcode