@@ -221,9 +221,7 @@ llxHeader("",$langs->trans("Categories"),$helpurl);
if ($user->rights->categorie->creer)
{
- /*
- * Fiche en mode creation
- */
+ // Create or add
if ($action == 'create' || $_POST["addcat"] == 'addcat')
{
dol_set_focus('#label');
@@ -246,7 +244,7 @@ if ($user->rights->categorie->creer)
// Ref
print '';
- print ''.$langs->trans("Ref").' '.$langs->trans("Ref").' ';
// Description
@@ -263,7 +261,8 @@ if ($user->rights->categorie->creer)
// Parent category
print ''.$langs->trans("AddIn").' ';
- print $form->select_all_categories($type, $catorigin);
+ print $form->select_all_categories($type, $catorigin, 'parent');
+ print ajax_combobox('parent');
print ' ';
- print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty');
+ print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
// reload page to retrieve customer informations
if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f837119730c..a10de641ea1 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1477,7 +1477,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print ' ';
} else {
print '';
- print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 'SelectThirdParty');
+ print $form->select_company('', 'socid', 's.client = 1 OR s.client = 3', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
// reload page to retrieve customer informations
if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
{
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 8967e22a160..ed9f8906804 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -76,7 +76,7 @@ if ($mode == 'customer')
if ($mode == 'supplier')
{
$title=$langs->trans("OrdersStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
- $dir=$conf->fournisseur->dir_output.'/commande/temp';
+ $dir=$conf->fournisseur->commande->dir_temp;
}
llxHeader('', $title);
@@ -322,7 +322,7 @@ foreach ($data as $val)
while (! empty($year) && $oldyear > $year+1)
{ // If we have empty year
$oldyear--;
-
+
print ' ';
print '0?'&userid='.$userid:'').'">'.$oldyear.' 0 ';
@@ -334,7 +334,7 @@ foreach ($data as $val)
print ' ';
}
-
+
print '';
print '0?'&userid='.$userid:'').'">'.$year.' '.$val['nb'].' ';
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 45cbbfe3a46..6043a7cbec5 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -492,14 +492,14 @@ if (! empty($conf->salaries->enabled))
} else {
$column = 'p.datep';
}
-
+
$subtotal_ht = 0;
$subtotal_ttc = 0;
$sql = "SELECT p.label as nom, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
$sql.= " WHERE p.entity = ".$conf->entity;
$sql.= " GROUP BY p.label, dm";
-
+
dol_syslog("get social salaries payments");
$result=$db->query($sql);
if ($result)
@@ -512,13 +512,13 @@ if (! empty($conf->salaries->enabled))
while ($i < $num)
{
$obj = $db->fetch_object($result);
-
+
if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
$decaiss[$obj->dm] += $obj->amount;
-
+
if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
$decaiss_ttc[$obj->dm] += $obj->amount;
-
+
$i++;
}
}
@@ -568,7 +568,7 @@ if (! empty($conf->expensereport->enabled))
{
if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
$decaiss[$obj->dm] += $obj->amount_ht;
-
+
if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
@@ -588,7 +588,7 @@ if (! empty($conf->don->enabled))
{
$subtotal_ht = 0;
$subtotal_ttc = 0;
-
+
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."don as p";
@@ -617,13 +617,13 @@ if (! empty($conf->don->enabled))
while ($i < $num)
{
$obj = $db->fetch_object($result);
-
+
if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
$encaiss[$obj->dm] += $obj->amount;
-
+
if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
$encaiss_ttc[$obj->dm] += $obj->amount;
-
+
$i++;
}
}
@@ -671,7 +671,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
{
$mois_modulo = $mois;
if($mois>12) {$mois_modulo = $mois-12;}
-
+
print ' ';
print "".dol_print_date(dol_mktime(12,0,0,$mois_modulo,1,$annee),"%B")." ";
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
@@ -680,7 +680,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
if($mois>12) {$annee_decalage=$annee+1;}
$case = strftime("%Y-%m",dol_mktime(12,0,0,$mois_modulo,1,$annee_decalage));
- print ' ';
+ print ' ';
if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
{
print ''.price(price2num($decaiss_ttc[$case],'MT')).' ';
@@ -689,7 +689,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
}
print " ";
- print ' ';
+ print ' ';
//if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
if (isset($encaiss_ttc[$case]))
{
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 22b26983bcc..a273443ef7c 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -275,7 +275,7 @@ class Fiscalyear extends CommonObject
if ($mode == 5)
{
if ($statut==0 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut4');
- if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut8');
+ if ($statut==1 && ! empty($this->statuts_short[$statut])) return $langs->trans($this->statuts_short[$statut]).' '.img_picto($langs->trans($this->statuts_short[$statut]),'statut6');
}
}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 7c8efcc8328..1a19d0da776 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -995,7 +995,7 @@ class Form
unset($societetmp);
}
// mode 1
- $urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter;
+ $urloption='htmlname='.$htmlname.'&outjson=1&filter='.$filter.($showtype?'&showtype='.$showtype:'');
$out.= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
$out.='