*
* This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
$langs->load("products");
$langs->load("suppliers");
$langs->load("bills");
+// Charges ????
+if (! empty($conf->margin->enabled)) $langs->load("margins");
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index bfff310636f..32ad23eafbe 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -195,6 +195,23 @@ if ($action == 'setprofid')
}
}
+//Activate ProfId
+if ($action == 'setprofidmandatory')
+{
+ $status = GETPOST('status','alpha');
+
+ $idprof="SOCIETE_IDPROF".$value."_MANDATORY";
+ if (dolibarr_set_const($db, $idprof,$status,'chaine',0,'',$conf->entity) > 0)
+ {
+ header("Location: ".$_SERVER["PHP_SELF"]);
+ exit;
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+}
+
/*
* View
@@ -522,6 +539,7 @@ print '';
print '| '.$langs->trans("Name").' | ';
print ''.$langs->trans("Description").' | ';
print ''.$langs->trans("MustBeUnique").' | ';
+print ''.$langs->trans("MustBeMandatory").' | ';
print "
\n";
$profid[0][0]=$langs->trans("ProfId1");
@@ -532,6 +550,10 @@ $profid[2][0]=$langs->trans("ProfId3");
$profid[2][1]=$langs->transcountry('ProfId3', $mysoc->country_code);
$profid[3][0]=$langs->trans("ProfId4");
$profid[3][1]=$langs->transcountry('ProfId4', $mysoc->country_code);
+$profid[4][0]=$langs->trans("ProfId5");
+$profid[4][1]=$langs->transcountry('ProfId5', $mysoc->country_code);
+$profid[5][0]=$langs->trans("ProfId6");
+$profid[5][1]=$langs->transcountry('ProfId6', $mysoc->country_code);
$var = true;
$i=0;
@@ -539,42 +561,47 @@ $i=0;
$nbofloop=count($profid);
while ($i < $nbofloop)
{
- $var = !$var;
-
- print '';
- print '| '.$profid[$i][0]." | \n";
- print $profid[$i][1];
- print ' | ';
-
- switch($i)
+ if ($profid[$i][1]!='-')
{
- case 0:
- $verif=(empty($conf->global->SOCIETE_IDPROF1_UNIQUE)?false:true);
- break;
- case 1:
- $verif=(empty($conf->global->SOCIETE_IDPROF2_UNIQUE)?false:true);
- break;
- case 2:
- $verif=(empty($conf->global->SOCIETE_IDPROF3_UNIQUE)?false:true);
- break;
- case 3:
- $verif=(empty($conf->global->SOCIETE_IDPROF4_UNIQUE)?false:true);
- break;
+ $var = !$var;
+
+ print '
';
+ print '| '.$profid[$i][0]." | \n";
+ print $profid[$i][1];
+ print ' | ';
+
+ $idprof_unique ='SOCIETE_IDPROF'.($i+1).'_UNIQUE';
+ $idprof_mandatory ='SOCIETE_IDPROF'.($i+1).'_MANDATORY';
+ $verif=(empty($conf->global->$idprof_unique)?false:true);
+ $mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
+
+ if ($verif)
+ {
+ print '';
+ print img_picto($langs->trans("Activated"),'switch_on');
+ print ' | ';
+ }
+ else
+ {
+ print '';
+ print img_picto($langs->trans("Disabled"),'switch_off');
+ print ' | ';
+ }
+
+ if ($mandatory)
+ {
+ print '';
+ print img_picto($langs->trans("Activated"),'switch_on');
+ print ' | ';
+ }
+ else
+ {
+ print '';
+ print img_picto($langs->trans("Disabled"),'switch_off');
+ print ' | ';
+ }
+ print "
\n";
}
-
- if ($verif)
- {
- print '';
- print img_picto($langs->trans("Activated"),'switch_on');
- print ' | ';
- }
- else
- {
- print '';
- print img_picto($langs->trans("Disabled"),'switch_off');
- print ' | ';
- }
- print "\n";
$i++;
}
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 45caee823b1..26c453607ec 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005 Eric Seigne
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2008 Patrick Raguin
- * Copyright (C) 2010-2011 Juanjo Menent
+ * Copyright (C) 2010-2012 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -202,9 +202,18 @@ if (empty($reshook))
$error++; $errors[] = $langs->trans("ErrorSupplierModuleNotEnabled");
$action = ($action=='add'?'create':'edit');
}
+
+ // We set country_id, country_code and country for the selected country
+ $object->country_id=GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
+ if ($object->country_id)
+ {
+ $tmparray=getCountry($object->country_id,'all');
+ $object->country_code=$tmparray['code'];
+ $object->country=$tmparray['label'];
+ }
- // Check for duplicate prof id
- for ($i = 1; $i < 3; $i++)
+ // Check for duplicate or mandatory prof id
+ for ($i = 1; $i < 5; $i++)
{
$slabel="idprof".$i;
$_POST[$slabel]=trim($_POST[$slabel]);
@@ -218,8 +227,18 @@ if (empty($reshook))
$action = ($action=='add'?'create':'edit');
}
}
+
+ $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+ if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
+ {
+ $langs->load("errors");
+ $error++;
+ $errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $object->country_code));
+ $action = ($action=='add'?'create':'edit');
+ }
}
}
+
if (! $error)
{
if ($action == 'add')
@@ -293,7 +312,7 @@ if (empty($reshook))
// Gestion du logo de la société
}
else
- {
+ {
$error=$object->error; $errors=$object->errors;
}
@@ -834,7 +853,13 @@ else
if ($idprof!='-')
{
if (($j % 2) == 0) print '';
- print '| '.$idprof.' | ';
+
+ $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+ if(empty($conf->global->$idprof_mandatory))
+ print ' | '.$idprof.' | ';
+ else
+ print ' | '.$idprof.' | ';
+
$key='idprof'.$i;
print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
print ' | ';
@@ -1271,7 +1296,13 @@ else
if ($idprof!='-')
{
if (($j % 2) == 0) print '
';
- print '| '.$idprof.' | ';
+
+ $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+ if(empty($conf->global->$idprof_mandatory))
+ print ' | '.$idprof.' | ';
+ else
+ print ' | '.$idprof.' | ';
+
$key='idprof'.$i;
print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
print ' | ';