';
print '';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 61546b39061..dae1fe109ca 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2002 Rodolphe Quiedeville
* Copyright (C) 2004-2007 Laurent Destailleur
* Copyright (C) 2016 Frédéric France
+ * Copyright (C) 2017 Alexandre Spangaro
*
* 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
@@ -52,6 +53,7 @@ class ChargeSociales extends CommonObject
var $date_modification;
var $date_validation;
var $fk_account;
+ var $fk_project;
/**
@@ -75,7 +77,7 @@ class ChargeSociales extends CommonObject
function fetch($id, $ref='')
{
$sql = "SELECT cs.rowid, cs.date_ech";
- $sql.= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.paye, cs.periode, cs.import_key";
+ $sql.= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
$sql.= ", cs.fk_account, cs.fk_mode_reglement";
$sql.= ", c.libelle";
$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
@@ -93,20 +95,21 @@ class ChargeSociales extends CommonObject
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
- $this->ref = $obj->rowid;
- $this->date_ech = $this->db->jdate($obj->date_ech);
- $this->lib = $obj->lib;
- $this->type = $obj->fk_type;
- $this->type_libelle = $obj->libelle;
- $this->fk_account = $obj->fk_account;
- $this->mode_reglement_id = $obj->fk_mode_reglement;
- $this->mode_reglement_code = $obj->mode_reglement_code;
- $this->mode_reglement = $obj->mode_reglement_libelle;
- $this->amount = $obj->amount;
- $this->paye = $obj->paye;
- $this->periode = $this->db->jdate($obj->periode);
- $this->import_key = $this->import_key;
+ $this->id = $obj->rowid;
+ $this->ref = $obj->rowid;
+ $this->date_ech = $this->db->jdate($obj->date_ech);
+ $this->lib = $obj->lib;
+ $this->type = $obj->fk_type;
+ $this->type_libelle = $obj->libelle;
+ $this->fk_account = $obj->fk_account;
+ $this->mode_reglement_id = $obj->fk_mode_reglement;
+ $this->mode_reglement_code = $obj->mode_reglement_code;
+ $this->mode_reglement = $obj->mode_reglement_libelle;
+ $this->amount = $obj->amount;
+ $this->fk_project = $obj->fk_project;
+ $this->paye = $obj->paye;
+ $this->periode = $this->db->jdate($obj->periode);
+ $this->import_key = $this->import_key;
$this->db->free($resql);
@@ -166,13 +169,15 @@ class ChargeSociales extends CommonObject
$this->db->begin();
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, entity, fk_user_author, date_creation)";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
$sql.= " VALUES (".$this->type;
$sql.= ", ".($this->fk_account>0?$this->fk_account:'NULL');
$sql.= ", ".($this->mode_reglement_id>0?"'".$this->mode_reglement_id."'":"NULL");
$sql.= ", '".$this->db->escape($this->lib)."'";
- $sql.= ", '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."'";
+ $sql.= ", '".$this->db->idate($this->date_ech)."'";
+ $sql.= ", '".$this->db->idate($this->periode)."'";
$sql.= ", '".price2num($newamount)."'";
+ $sql.= ", ".($this->fk_project>0?$this->fk_project:'NULL');
$sql.= ", ".$conf->entity;
$sql.= ", ".$user->id;
$sql.= ", '".$this->db->idate($now)."'";
@@ -283,6 +288,7 @@ class ChargeSociales extends CommonObject
$sql.= ", date_ech='".$this->db->idate($this->date_ech)."'";
$sql.= ", periode='".$this->db->idate($this->periode)."'";
$sql.= ", amount='".price2num($this->amount,'MT')."'";
+ $sql.= ", fk_projet='".$this->db->escape($this->fk_project)."'";
$sql.= ", fk_user_modif=".$user->id;
$sql.= " WHERE rowid=".$this->id;
@@ -302,7 +308,7 @@ class ChargeSociales extends CommonObject
}
/**
- * Enter description here ...
+ * Calculate amount remaining to pay by year
*
* @param int $year Year
* @return number
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index be4d9231c5f..7826747769b 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -73,7 +73,10 @@ if ($boxorder && $zone != '' && $userid > 0)
if ($result > 0)
{
$langs->load("boxes");
- setEventMessages($langs->trans("BoxAdded"), null);
+ if (! GETPOST('closing'))
+ {
+ setEventMessages($langs->trans("BoxAdded"), null);
+ }
}
}
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index c406ada6fa5..b6d38d17b53 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -110,14 +110,14 @@ class box_actions extends ModeleBoxes
$label = empty($objp->label)?$objp->type_label:$objp->label;
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $actionstatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''),
'asis' => 1,
);
@@ -128,7 +128,7 @@ class box_actions extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => ($objp->percentage>= 0?$objp->percentage.'%':''),
);
@@ -149,7 +149,7 @@ class box_actions extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 34666507488..96a451f70f8 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -148,19 +148,19 @@ class box_activity extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $langs->trans("Bills")." ".$facturestatic->LibStatut(1,$data[$j]->fk_statut,0)." ".$data[$j]->annee,
);
$this->info_box_contents[$line][2] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(1,$data[$j]->fk_statut,0),
'text' => $data[$j]->nb,
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
);
$this->info_box_contents[$line][3] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency)
);
@@ -230,19 +230,19 @@ class box_activity extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $langs->trans("Bills")." ".$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
);
$this->info_box_contents[$line][2] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => $data[$j]->nb,
'tooltip' => $langs->trans('Bills').' '.$facturestatic->LibStatut(0,$data[$j]->fk_statut,0),
'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills",
);
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
);
$totalMnt += $objp->Mnttot;
@@ -260,7 +260,7 @@ class box_activity extends ModeleBoxes
);
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'maxlength'=>500, 'text' => ($db->error().' sql='.$sql),
);
}
@@ -323,12 +323,12 @@ class box_activity extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' =>$langs->trans("Orders")." ".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
);
$this->info_box_contents[$line][2] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => $data[$j]->nb,
'tooltip' => $langs->trans("Orders")." ".$commandestatic->LibStatut($data[$j]->fk_statut,0,0),
'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&leftmenu=orders&viewstatut=".$data[$j]->fk_statut,
@@ -336,7 +336,7 @@ class box_activity extends ModeleBoxes
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
);
$totalMnt += $data[$j]->Mnttot;
@@ -413,12 +413,12 @@ class box_activity extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut,0),
);
$this->info_box_contents[$line][2] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => $data[$j]->nb,
'tooltip' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut,0),
'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&viewstatut=".$data[$j]->fk_statut,
@@ -426,7 +426,7 @@ class box_activity extends ModeleBoxes
$totalnb += $data[$j]->nb;
$this->info_box_contents[$line][3] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
);
$totalMnt += $data[$j]->Mnttot;
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index e99a0b30387..b6df56f52a2 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -94,7 +94,7 @@ class box_bookmarks extends ModeleBoxes
'target' => $objp->target?'newtab':'',
);
$this->info_box_contents[$line][1] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $objp->title,
'url' => $objp->url,
'tooltip' => $objp->title,
@@ -117,7 +117,7 @@ class box_bookmarks extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 307dcc7cbfd..0649d43a049 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -117,13 +117,13 @@ class box_clients extends ModeleBoxes
$thirdpartystatic->logo = $objp->logo;
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $thirdpartystatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => dol_print_date($datem, "day")
);
@@ -140,7 +140,7 @@ class box_clients extends ModeleBoxes
$db->free($result);
}
else {
- $this->info_box_contents[0][0] = array( 'td' => 'align="left"',
+ $this->info_box_contents[0][0] = array( 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql));
}
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 7653206333d..fe460f7d512 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -115,33 +115,33 @@ class box_commandes extends ModeleBoxes
$societestatic->logo = $objp->logo;
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $commandestatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $societestatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
if (! empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => (($objp->fk_user_valid > 0)?$userstatic->getNomUrl(1):''),
'asis' => 1,
);
}
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => dol_print_date($date,'day'),
);
@@ -158,7 +158,7 @@ class box_commandes extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index a1c3625e78c..2372a31f035 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -111,18 +111,18 @@ class box_comptes extends ModeleBoxes
$solde_total[$objp->currency_code] += $solde;
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $account_static->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $objp->number,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => price($solde, 0, $langs, 0, -1, -1, $objp->currency_code)
);
@@ -151,14 +151,14 @@ class box_comptes extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 45963af9bb1..d6c38a9fce8 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -110,19 +110,19 @@ class box_contacts extends ModeleBoxes
$societestatic->fournisseur = $objp->fournisseur;
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $contactstatic->getNomUrl(1),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => ($objp->fk_soc > 0 ? $societestatic->getNomUrl(1) : ''),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => dol_print_date($datem, "day"),
);
@@ -144,7 +144,7 @@ class box_contacts extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index fe864e1df16..cd436f3eb85 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -106,25 +106,25 @@ class box_contracts extends ModeleBoxes
// if ($objp->fk_statut == 1 && $dateterm < ($now - $conf->contrat->cloture->warning_delay)) { $late = img_warning($langs->trans("Late")); }
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $contractstatic->getNomUrl(1),
'text2'=> $late,
'asis'=>1
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
'text' => $thirdpartytmp->getNomUrl(1),
'asis'=>1
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => dol_print_date($datec,'day'),
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right" class="nowrap"',
+ 'td' => 'class="nowrap right"',
'text' => $contractstatic->getLibStatut(6),
'asis'=>1,
);
@@ -141,14 +141,14 @@ class box_contracts extends ModeleBoxes
$db->free($resql);
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
}
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index dbe71a6ca41..71b643665b3 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -163,7 +163,7 @@ class box_external_rss extends ModeleBoxes
);
$this->info_box_contents[$line][1] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $title,
'url' => $href,
'tooltip' => $tooltip,
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 22a90929a0b..b7c9dfa0e91 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -122,25 +122,25 @@ class box_factures extends ModeleBoxes
}
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $facturestatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $societestatic->getNomUrl(1, '', 40),
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="right"',
+ 'td' => 'class="right"',
'text' => dol_print_date($date,'day'),
);
@@ -161,7 +161,7 @@ class box_factures extends ModeleBoxes
$db->free($result);
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'maxlength'=>500,
'text' => ($db->error().' sql='.$sql),
);
@@ -169,7 +169,7 @@ class box_factures extends ModeleBoxes
} else {
$this->info_box_contents[0][0] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $langs->trans("ReadPermissionNotAllowed"),
);
}
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index b43d9cfc47b..4f88d99bb09 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -122,32 +122,32 @@ class box_factures_fourn extends ModeleBoxes
}
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $facturestatic->getNomUrl(1),
'text2'=> $late,
'asis' => 1,
);
$this->info_box_contents[$line][] = array(
- 'td' => 'align="left"',
+ 'td' => '',
'text' => $objp->ref_supplier,
'tooltip' => $langs->trans('SupplierInvoice').': '.($objp->ref?$objp->ref:$objp->facid).'';
- if ($showempty) $sellist.= ' '; // Without , strange move of screen when switching value
if ($showallnone) $sellist.= '--'.$langs->trans("OnlyOpportunitiesShort").'-- ';
if ($showallnone) $sellist.= '--'.$langs->trans("OpenedOpportunitiesShort").'-- ';
if ($showallnone) $sellist.= '--'.$langs->trans("NotAnOpportunityShort").'-- ';
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index ab38cdf378c..28623f780a5 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -195,7 +195,7 @@ interface Database
* Execute a SQL request and return the resultset
*
* @param string $query SQL query string
- * @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
+ * @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
* Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
* @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
* @return resource Resultset of answer
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index bb704ba5c2e..8ec0713b01a 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -116,8 +116,9 @@ function length_accountg($account)
if ($account < 0 || empty($account)) return '';
+ if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+
$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
-
if (! empty($g)) {
// Clean parameters
$i = strlen($account);
@@ -150,8 +151,9 @@ function length_accounta($accounta)
if ($accounta < 0 || empty($accounta)) return '';
+ if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+
$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
-
if (! empty($a)) {
// Clean parameters
$i = strlen($accounta);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 2e809fa6c3b..caa469daa65 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -531,10 +531,13 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
print "\n";
print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,'');
+ print '';
print "\n".'
';
- $sql = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status";
+ $sql = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
+ $sql .= ", cls.code as opp_status_code";
$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
$sql .= " WHERE p.fk_soc = ".$object->id;
$sql .= " ORDER BY p.dateo DESC";
@@ -544,8 +547,14 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
$num = $db->num_rows($result);
print '';
- print ''.$langs->trans("Ref").' '.$langs->trans("Name").' '.$langs->trans("DateStart").' '.$langs->trans("DateEnd").' ';
- print ''.$langs->trans("Status").' ';
+ print ''.$langs->trans("Ref").' ';
+ print ''.$langs->trans("Name").' ';
+ print ''.$langs->trans("DateStart").' ';
+ print ''.$langs->trans("DateEnd").' ';
+ print ''.$langs->trans("OpportunityAmountShort").' ';
+ print ''.$langs->trans("OpportunityStatusShort").' ';
+ print ''.$langs->trans("OpportunityProbabilityShort").' ';
+ print ''.$langs->trans("Status").' ';
print ' ';
if ($num > 0)
@@ -574,9 +583,24 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
// Label
print ''.$obj->title.' ';
// Date start
- print ''.dol_print_date($db->jdate($obj->do),"day").' ';
+ print ''.dol_print_date($db->jdate($obj->do),"day").' ';
// Date end
- print ''.dol_print_date($db->jdate($obj->de),"day").' ';
+ print ''.dol_print_date($db->jdate($obj->de),"day").' ';
+ // Opp amount
+ print '';
+ if ($obj->opp_status_code)
+ {
+ print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+ }
+ print ' ';
+ // Opp status
+ print '';
+ if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code);
+ print ' ';
+ // Opp percent
+ print '';
+ if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
+ print ' ';
// Status
print ''.$projecttmp->getLibStatut(5).' ';
@@ -597,7 +621,8 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
dol_print_error($db);
}
print "
";
-
+ print '
'.$form->showbarcode($object).'
';
- if ($object->element == 'societe' && ! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
- $morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
+
+ if ($object->element == 'societe')
+ {
+ if (! empty($conf->use_javascript_ajax) && $user->rights->societe->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
+ {
+ $morehtmlstatus.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
+ }
}
elseif ($object->element == 'product')
{
@@ -1099,9 +1105,9 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
if ($object->element == 'product' || $object->element == 'bank_account')
{
- if(! empty($object->label)) $morehtmlref.=''.$object->label.'
';
+ if (! empty($object->label)) $morehtmlref.=''.$object->label.'
';
}
-
+
if ($object->element != 'product' && $object->element != 'bookmark')
{
$morehtmlref.='';
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index ee162bd9cc8..daf82b2f995 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -47,7 +47,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
{
dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest);
- // If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
+ // If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko
$table = MAIN_DB_PREFIX."user";
$usernamecol1 = 'login';
$usernamecol2 = 'email';
@@ -59,6 +59,9 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=
if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
$sql.=' AND statut = 1';
+ // Required to first found the user into entity, then the superadmin.
+ // For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
+ $sql.=' ORDER BY entity DESC';
$resql=$db->query($sql);
if ($resql)
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 3e3ec91dd60..96f0dca04fa 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -588,9 +588,9 @@ class ImportCsv extends ModeleImports
{
$updatedone = false;
$insertdone = false;
- if(!empty($updatekeys)) {
+ if (!empty($updatekeys)) {
// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
- if(empty($lastinsertid)) {
+ if (empty($lastinsertid)) {
$sqlSelect = 'SELECT rowid FROM '.$tablename;
$data = array_combine($listfields, $listvalues);
@@ -627,7 +627,7 @@ class ImportCsv extends ModeleImports
}
}
- if(!empty($lastinsertid)) {
+ if (!empty($lastinsertid)) {
// Build SQL UPDATE request
$sqlstart = 'UPDATE '.$tablename;
@@ -660,7 +660,7 @@ class ImportCsv extends ModeleImports
}
// Update not done, we do insert
- if(!$error && !$updatedone) {
+ if (!$error && !$updatedone) {
// Build SQL INSERT request
$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
@@ -679,10 +679,10 @@ class ImportCsv extends ModeleImports
if ($sql)
{
$resql=$this->db->query($sql);
- $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
if ($resql)
{
- $insertdone = true;
+ $last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
+ $insertdone = true;
}
else
{
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index f69cb1b5331..26dd397c913 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -32,7 +32,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
/**
* Class to describe and enable module Donation
*/
-class modDon extends DolibarrModules
+class modDon extends DolibarrModules
{
/**
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index c29c77b8f24..72c90ca7a6d 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -44,7 +44,7 @@ class modNotification extends DolibarrModules
$this->family = "technic";
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = preg_replace('/^mod/i','',get_class($this));
- $this->description = "Gestion des notifications (par mail) sur evenement Dolibarr";
+ $this->description = "EMail notifications (push) on business Dolibarr events";
$this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->special = 1;
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 3772b44c9fc..e0aa28ce2d6 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -239,6 +239,23 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
global->MAIN_EASTER_EGG_COMMITSTRIP)) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+ if (substr($langs->defaultlang,0,2)=='fr') {
+ $resgetcommitstrip = getURLContent("http://www.commitstrip.com/fr/feed/");
+ } else {
+ $resgetcommitstrip = getURLContent("http://www.commitstrip.com/en/feed/");
+ }
+ if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200')
+ {
+ $xml = simplexml_load_string($resgetcommitstrip['content']);
+ $little = $xml->channel->item[0]->children('content',true);
+ print $little->encoded;
+ }
+}
+
?>
';
+$out = ' 0)?' class="amountalreadypaid"':'').'>' . price($totalpaye) . '
-- Copyright (C) 2005-2009 Regis Houssin
+-- Copyright (C) 2017 Alexandre Spangaro
--
-- 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
@@ -19,23 +20,24 @@
create table llx_chargesociales
(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- date_ech datetime NOT NULL, -- date echeance
- libelle varchar(80) NOT NULL,
- entity integer DEFAULT 1 NOT NULL, -- multi company id
- tms timestamp,
- date_creation datetime, -- date de creation
- date_valid datetime, -- date de validation
- fk_user_author integer, -- user making creation
- fk_user_modif integer, -- user making last change
- fk_user_valid integer, -- user validating
- fk_type integer NOT NULL,
- fk_account integer, -- bank account
- fk_mode_reglement integer, -- mode de reglement
- amount real default 0 NOT NULL,
- paye smallint default 0 NOT NULL,
- periode date,
- import_key varchar(14)
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ date_ech datetime NOT NULL, -- date echeance
+ libelle varchar(80) NOT NULL,
+ entity integer DEFAULT 1 NOT NULL, -- multi company id
+ tms timestamp,
+ date_creation datetime, -- date de creation
+ date_valid datetime, -- date de validation
+ fk_user_author integer, -- user making creation
+ fk_user_modif integer, -- user making last change
+ fk_user_valid integer, -- user validating
+ fk_type integer NOT NULL,
+ fk_account integer, -- bank account
+ fk_mode_reglement integer, -- mode de reglement
+ amount real default 0 NOT NULL,
+ paye smallint default 0 NOT NULL,
+ periode date,
+ fk_projet integer DEFAULT NULL,
+ import_key varchar(14)
)ENGINE=innodb;
--
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index f51493c2763..d8313e2a11b 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -105,9 +105,9 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding don
ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
-ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disabled by default. If set to on, you must also set the 2 following parameters (or it is ignored)
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
+ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero.
BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
ACCOUNTING_SELL_JOURNAL=Sell journal
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index baa0b6872f4..a608875a752 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -13,7 +13,7 @@ MenuNewPrivateIndividual=New private individual
NewCompany=New company (prospect, customer, supplier)
NewThirdParty=New third party (prospect, customer, supplier)
CreateDolibarrThirdPartySupplier=Create a third party (supplier)
-CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyOnly=Create third party
CreateThirdPartyAndContact=Create a third party + a child contact
ProspectionArea=Prospection area
IdThirdParty=Id third party
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index eca26d337c2..aa5f2195a56 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -56,6 +56,7 @@ MenuTaxAndDividends=Taxes and dividends
MenuSocialContributions=Social/fiscal taxes
MenuNewSocialContribution=New social/fiscal tax
NewSocialContribution=New social/fiscal tax
+AddSocialContribution=Add social/fiscal tax
ContributionsToPay=Social/fiscal taxes to pay
AccountancyTreasuryArea=Accountancy/Treasury area
NewPayment=New payment
@@ -205,3 +206,4 @@ ImportDataset_tax_contrib=Social/fiscal taxes
ImportDataset_tax_vat=Vat payments
ErrorBankAccountNotFound=Error: Bank account not found
FiscalPeriod=Accounting period
+ListSocialContributionAssociatedProject=List of social contributions associated with the project
diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index b45a70dff72..927aab2abf4 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -44,6 +44,7 @@ GoToInterest=%s will go towards INTEREST
GoToPrincipal=%s will go towards PRINCIPAL
YouWillSpend=You will spend %s in year %s
ListLoanAssociatedProject=List of loan associated with the project
+AddLoan=Create loan
# Admin
ConfigLoan=Configuration of the module loan
LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 88bc6d834aa..7d23700f983 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -62,16 +62,19 @@ DeStockOnShipment=Decrease real stocks on shipping validation
DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving
+ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receipt of goods
OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
DispatchVerb=Dispatch
StockLimitShort=Limit for alert
StockLimit=Stock limit for alert
PhysicalStock=Physical stock
RealStock=Real Stock
+RealStockDesc=Physical or real stock is the stock you currently have into your internal warehouses/emplacements.
+RealStockWillAutomaticallyWhen=The real stock will automatically change according to this rules (see stock module setup to change this):
VirtualStock=Virtual stock
+VirtualStockDesc=Virtual stock is the stock you will get once all opened pending actions that affect stocks will be closed (supplier order received, customer order shipped, ...)
IdWarehouse=Id warehouse
DescWareHouse=Description warehouse
LieuWareHouse=Localisation warehouse
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 471aa7e3e6d..01285f09417 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -126,10 +126,7 @@ $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl on pl.fk_product = p.rowi
if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_product as cp";
$sql.= " WHERE p.entity IN (".getEntity('product', 1).")";
if ($search_categ) $sql.= " AND p.rowid = cp.fk_product"; // Join for the needed table to filter by categ
-if ($sall)
-{
- $sql.= " AND (p.ref LIKE '%".$db->escape($sall)."%' OR p.label LIKE '%".$db->escape($sall)."%' OR p.description LIKE '%".$db->escape($sall)."%' OR p.note LIKE '%".$db->escape($sall)."%')";
-}
+if ($sall) $sql.=natural_search(array('p.ref','p.label','p.description','p.note'), $sall);
// if the type is not 1, we show all products (type = 0,2,3)
if (dol_strlen($type))
{
@@ -163,6 +160,12 @@ $sql.= " pb.batch, pb.eatby, pb.sellby,";
$sql.= " pl.eatby, pl.sellby";
if ($toolowstock) $sql.= " HAVING SUM(".$db->ifsql('ps.reel IS NULL', '0', 'ps.reel').") < p.seuil_stock_alerte"; // Not used yet
$sql.= $db->order($sortfield,$sortorder);
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+ $result = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($result);
+}
$sql.= $db->plimit($limit + 1, $offset);
$resql = $db->query($sql);
@@ -193,11 +196,11 @@ if ($resql)
if ($sref || $snom || $sall || GETPOST('search'))
{
- print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num, 0, 'title_products');
+ print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_products');
}
else
{
- print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num, 0, 'title_products');
+ print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":""), $sortfield, $sortorder,'',$num, $nbtotalofrecords, 'title_products');
}
if (! empty($catid))
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index e6631d4b716..c90af069fda 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -277,7 +277,7 @@ class MouvementStock extends CommonObject
// Check if stock is enough when qty is < 0
// Note that qty should be > 0 with type 0 or 3, < 0 with type 1 or 2.
- if ($qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER))
+ if ($movestock && $qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER))
{
if (! empty($conf->productbatch->enabled) && $product->hasbatch() && ! $skip_batch)
{
@@ -292,6 +292,7 @@ class MouvementStock extends CommonObject
}
if (! $foundforbatch || $qtyisnotenough)
{
+ $langs->load("stocks");
$this->error = $langs->trans('qtyToTranferLotIsNotEnough');
$this->errors[] = $langs->trans('qtyToTranferLotIsNotEnough');
$this->db->rollback();
@@ -302,6 +303,7 @@ class MouvementStock extends CommonObject
{
if (empty($product->stock_warehouse[$entrepot_id]->real) || $product->stock_warehouse[$entrepot_id]->real < abs($qty))
{
+ $langs->load("stocks");
$this->error = $langs->trans('qtyToTranferIsNotEnough');
$this->errors[] = $langs->trans('qtyToTranferIsNotEnough');
$this->db->rollback();
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 0d92afe96e0..f28f3fd00d3 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -438,6 +438,35 @@ class Productlot extends CommonObject
}
}
+
+ /**
+ * Return label of status of object
+ *
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+ * @return string Label of status
+ */
+ function getLibStatut($mode=0)
+ {
+ return $this->LibStatut(0,$mode);
+ }
+
+ /**
+ * Return label of a given status
+ *
+ * @param int $statut Status
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+ * @return string Label of status
+ */
+ function LibStatut($statut,$mode=0)
+ {
+ global $langs;
+
+ //$langs->load('stocks');
+
+ return '';
+ }
+
+
/**
* Return a link to the a lot card (with optionaly the picto)
* Use this->id,this->lastname, this->firstname
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index d23dca08282..d2ba81db86c 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -95,7 +95,7 @@ $arrayfields=array(
'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(! empty($conf->productbatch->enabled))),
'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'enabled'=>(! empty($conf->productbatch->enabled))),
'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(! empty($conf->productbatch->enabled))),
- 'm.warehouse'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(! $id > 0)), // If we are on specific warehouse, we hide it
+ 'e.label'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(! $id > 0)), // If we are on specific warehouse, we hide it
'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
'm.label'=>array('label'=>$langs->trans("LabelMovement"), 'checked'=>1),
@@ -665,6 +665,7 @@ if ($resql)
if ($search_inventorycode) $param.='&search_inventorycode='.urlencode($search_inventorycode);
if ($search_product_ref) $param.='&search_product_ref='.urlencode($search_product_ref);
if ($search_product) $param.='&search_product='.urlencode($search_product);
+ if ($search_batch) $param.='&search_batch='.urlencode($search_batch);
if ($search_warehouse > 0) $param.='&search_warehouse='.urlencode($search_warehouse);
if (!empty($sref)) $param.='&sref='.urlencode($sref); // FIXME $sref is not defined
if (!empty($snom)) $param.='&snom='.urlencode($snom); // FIXME $snom is not defined
@@ -735,7 +736,7 @@ if ($resql)
if (! empty($arrayfields['m.batch']['checked'])) print_liste_field_titre($arrayfields['m.batch']['label'],$_SERVER["PHP_SELF"],'m.batch','',$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['pl.eatby']['checked'])) print_liste_field_titre($arrayfields['pl.eatby']['label'],$_SERVER["PHP_SELF"],'pl.eatby','',$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['pl.sellby']['checked'])) print_liste_field_titre($arrayfields['pl.sellby']['label'],$_SERVER["PHP_SELF"],'pl.sellby','',$param,'align="center"',$sortfield,$sortorder);
- if (! empty($arrayfields['m.warehouse']['checked'])) print_liste_field_titre($arrayfields['m.warehouse']['label'],$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder); // We are on a specific warehouse card, no filter on other should be possible
+ if (! empty($arrayfields['e.label']['checked'])) print_liste_field_titre($arrayfields['e.label']['label'],$_SERVER["PHP_SELF"], "e.label","",$param,"",$sortfield,$sortorder); // We are on a specific warehouse card, no filter on other should be possible
if (! empty($arrayfields['m.fk_user_author']['checked'])) print_liste_field_titre($arrayfields['m.fk_user_author']['label'],$_SERVER["PHP_SELF"], "m.fk_user_author","",$param,"",$sortfield,$sortorder);
if (! empty($arrayfields['m.inventorycode']['checked'])) print_liste_field_titre($arrayfields['m.inventorycode']['label'],$_SERVER["PHP_SELF"], "m.inventorycode","",$param,"",$sortfield,$sortorder);
if (! empty($arrayfields['m.label']['checked'])) print_liste_field_titre($arrayfields['m.label']['label'],$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder);
@@ -799,7 +800,7 @@ if ($resql)
// Batch
if (! empty($arrayfields['m.batch']['checked']))
{
- print '';
//print ' '. dol_print_date($objp->sellby,'day') .' ';
}
// Warehouse
- if (! empty($arrayfields['m.warehouse']['checked']))
+ if (! empty($arrayfields['e.label']['checked']))
{
print '';
print $warehousestatic->getNomUrl(1);
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 14cd07ec817..f12316591d0 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -110,7 +110,7 @@ $parameters=array('id'=>$id, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-if($action == 'addlimitstockwarehouse') {
+if ($action == 'addlimitstockwarehouse') {
$seuil_stock_alerte = GETPOST('seuil_stock_alerte');
$desiredstock = GETPOST('desiredstock');
@@ -625,7 +625,8 @@ if ($id > 0 || $ref)
print ' ';
// Real stock
- $text_stock_options = '';
+ $text_stock_options = $langs->trans("RealStockDesc").''.$langs->trans("StockDiffPhysicTeoric").': '.$langs->trans("VirtualStock").' ';
- print "".(empty($stocktheo)?0:$stocktheo);
+ print ' ';
+ print $form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc"));
+ print ' ';
+ print "";
+ //print (empty($stocktheo)?0:$stocktheo);
+ print $form->textwithpicto((empty($stocktheo)?0:$stocktheo), $helpondiff);
if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
print ' ';
print '';
- print $langs->trans("StockDiffPhysicTeoric");
- print ' ';
- print '';
-
- $found=0;
- // Number of customer orders running
- if (! empty($conf->commande->enabled))
- {
- if ($found) print ' '."\n";
$linkback = '' . $langs->trans("BackToList") . ' ';
- // Ref
- print '' . $langs->trans('Batch') . ' ';
- print '';
- print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'batch');
- print ' ';
- print '';
+ print '
';
+
+ print '
'."\n";
// Product
- print ''.$langs->trans("Product").' ';
+ print ' '.$langs->trans("Product").' ';
$producttmp = new Product($db);
$producttmp->fetch($object->fk_product);
print $producttmp->getNomUrl(1, 'stock');
@@ -356,7 +337,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Eat by
print ' ';
print $form->editfieldkey($langs->trans('Eatby'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
- print ' ';
+ print ' ';
print $form->editfieldval($langs->trans('Eatby'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
print ' ';
print '';
print $form->editfieldkey($langs->trans('Sellby'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
- print ' ';
+ print ' ';
print $form->editfieldval($langs->trans('Sellby'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
print ' ';
print '
';
+ print '
';
print $langs->trans('Warehouse').' '.$formproduct->selectWarehouses($fk_entrepot, 'fk_entrepot', '', 1);
@@ -433,10 +438,11 @@ print '
';
print ' ';
print '' . $langs->trans('AlertOnly') . ' ';
-print ' ';
+print '' . $langs->trans('Draft') . ' ';
print ' ';
print '';
$searchpitco=$form->showFilterAndCheckAddButtons(0);
@@ -567,7 +574,12 @@ while ($i < ($limit ? min($num, $limit) : $num))
}
// Force call prod->load_stats_xxx to choose status to count (otherwise it is loaded by load_stock function)
- $result=$prod->load_stats_commande_fournisseur(0,'1,2,3,4');
+ if(isset($draftchecked)){
+ $result=$prod->load_stats_commande_fournisseur(0,'0,1,2,3,4');
+ }else {
+ $result=$prod->load_stats_commande_fournisseur(0,'1,2,3,4');
+ }
+
$result=$prod->load_stats_reception(0,'4');
//print $prod->stats_commande_fournisseur['qty'].'
';
if ($num > $conf->liste_limit)
{
- if ($sref || $snom || $sall || $salert || GETPOST('search', 'alpha'))
+ if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alpha'))
{
$filters = '&sref=' . $sref . '&snom=' . $snom;
$filters .= '&sall=' . $sall;
$filters .= '&salert=' . $salert;
+ $filters .= '&draftorder=' . $draftorder;
$filters .= '&mode=' . $mode;
$filters .= '&fk_supplier=' . $fk_supplier;
$filters .= '&fk_entrepot=' . $fk_entrepot;
@@ -670,6 +683,7 @@ if ($num > $conf->liste_limit)
$filters .= '&fourn_id=' . $fourn_id;
$filters .= (isset($type)? '&type=' . $type : '');
$filters .= '&salert=' . $salert;
+ $filters .= '&draftorder=' . $draftorder;
$filters .= '&mode=' . $mode;
$filters .= '&fk_supplier=' . $fk_supplier;
$filters .= '&fk_entrepot=' . $fk_entrepot;
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 757407a6692..28fd3dfadea 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -21,12 +21,14 @@
element == 'product') $productref = $object->ref;
$langs->load("productbatch");
- if (empty($id)) $id = $object->id;
+
+ if (empty($id)) $id = $object->id;
print '
-
-
-
+
';
+ }
+ else
+ {
if ($action === 'delete') {
if ($prodcomb->fetch($valueid) > 0) {
@@ -565,7 +583,22 @@ if (! empty($id) || ! empty($ref)) {
@@ -582,35 +615,48 @@ if (! empty($id) || ! empty($ref)) {
trans('OnBuy') ?>
- fetch($currcomb->fk_product_child); ?>
- >
- getNomUrl(1) ?>
-
- fetchByFkCombination($currcomb->id);
- $iMax = count($productCombination2ValuePairs);
-
- for ($i = 0; $i < $iMax; $i++) {
- echo dol_htmlentities($productCombination2ValuePairs[$i]);
-
- if ($i !== ($iMax - 1)) {
- echo ', ';
- }
- } ?>
-
- variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?>
- variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?>
- getLibStatut(2, 0) ?>
- getLibStatut(2, 1) ?>
-
-
-
-
+ fetch($currcomb->fk_product_child);
+ ?>
+ >
+ getNomUrl(1) ?>
+
+ fetchByFkCombination($currcomb->id);
+ $iMax = count($productCombination2ValuePairs);
+
+ for ($i = 0; $i < $iMax; $i++) {
+ echo dol_htmlentities($productCombination2ValuePairs[$i]);
+
+ if ($i !== ($iMax - 1)) {
+ echo ', ';
+ }
+ } ?>
+
+ variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?>
+ variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight') ?>
+ getLibStatut(2, 0) ?>
+ getLibStatut(2, 1) ?>
+
+
+
+ '.$langs->trans("None").'
@@ -618,17 +664,6 @@ if (! empty($id) || ! empty($ref)) {
';
- print ' ';
- print '';
-
}
}