Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
frederic34
2013-02-22 09:01:27 +01:00
parent de4bc7f39d 4f1c4f0365
commit 751488e291
4 changed files with 3 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@@ -1247,7 +1247,7 @@ if ($action == 'create')
else
{
print '<td colspan="2">';
print $form->select_company('','socid','s.client = 1',1);
print $form->select_company('','socid','s.client = 1 OR s.client = 2 OR s.client = 3',1);
print '</td>';
}
print '</tr>'."\n";

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

@@ -168,7 +168,6 @@ abstract class ActionsCardCommon
}
$this->object->client = $_POST["client"];
$this->object->fournisseur = $_POST["fournisseur"];
$this->object->fournisseur_categorie = $_POST["fournisseur_categorie"];
$this->object->commercial_id = $_POST["commercial_id"];
$this->object->default_lang = $_POST["default_lang"];
@@ -488,7 +487,6 @@ abstract class ActionsCardCommon
$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

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

@@ -143,7 +143,8 @@ class Societe extends CommonObject
var $array_options;
var $oldcopy;
/**
* Constructor
*
@@ -242,9 +243,6 @@ class Societe extends CommonObject
$this->add_commercial($user, $user->id);
}
// si le fournisseur est classe on l'ajoute
$this->AddFournisseurInCategory($this->fournisseur_categorie);
if ($ret >= 0)
{
// Appel des triggers
@@ -610,9 +608,6 @@ class Societe extends CommonObject
}
}
// Si le fournisseur est classe on l'ajoute
$this->AddFournisseurInCategory($this->fournisseur_categorie);
// Actions on extra fields (by external module or standard code)
// FIXME le hook fait double emploi avec le trigger !!
$hookmanager->initHooks(array('thirdpartydao'));

34
htdocs/societe/soc.php
View File

@@ -162,7 +162,6 @@ if (empty($reshook))
$object->client = GETPOST('client');
$object->fournisseur = GETPOST('fournisseur');
$object->fournisseur_categorie = GETPOST('fournisseur_categorie');
$object->commercial_id = GETPOST('commercial_id');
$object->default_lang = GETPOST('default_lang');
@@ -794,23 +793,6 @@ else
print $form->textwithpicto('',$s,1);
print '</td></tr></table>';
print '</td></tr>';
// Category
/* This must be set into category tab, like for customer category
if ($object->fournisseur)
{
$load = $object->LoadSupplierCateg();
if ( $load == 0)
{
if (count($object->SupplierCategories) > 0)
{
print '<tr>';
print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
print $form->selectarray("fournisseur_categorie",$object->SupplierCategories,GETPOST('fournisseur_categorie'),1);
print '</td></tr>';
}
}
}*/
}
// Status
@@ -1256,22 +1238,6 @@ else
print '</td></tr></table>';
print '</td></tr>';
// Category
if (! empty($conf->categorie->enabled) && $object->fournisseur)
{
$load = $object->LoadSupplierCateg();
if ( $load == 0)
{
if (count($object->SupplierCategories) > 0)
{
print '<tr>';
print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">';
print $form->selectarray("fournisseur_categorie",$object->SupplierCategories,'',1);
print '</td></tr>';
}
}
}
}
// Barcode