| ' . $langs->trans('Type') . ' | ';
print '' . "\n";
@@ -2981,6 +2938,23 @@ if ($action == 'create')
// Replacement
if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT))
{
+ // Type de facture
+ $facids = $facturestatic->list_replacable_invoices($soc->id);
+ if ($facids < 0) {
+ dol_print_error($db, $facturestatic);
+ exit();
+ }
+ $options = "";
+ foreach ($facids as $facparam)
+ {
+ $options .= ' ';
+ }
+
print '';
print ' ';
$tmp=' global->INVOICE_DISABLE_CREDIT_NOTE))
{
+ // Show link for credit note
+ $facids=$facturestatic->list_qualified_avoir_invoices($soc->id);
+ if ($facids < 0)
+ {
+ dol_print_error($db, $facturestatic);
+ exit;
+ }
+ $optionsav = "";
+ $newinvoice_static = new Facture($db);
+ foreach ($facids as $key => $valarray)
+ {
+ $newinvoice_static->id = $key;
+ $newinvoice_static->ref = $valarray ['ref'];
+ $newinvoice_static->statut = $valarray ['status'];
+ $newinvoice_static->type = $valarray ['type'];
+ $newinvoice_static->paye = $valarray ['paye'];
+
+ $optionsav .= ' ';
+ }
+
print ' ';
$tmp='
+ * Copyright (C) 2005-2009 Regis Houssin
+ * Copyright (C) 2012 Raphaël Doursenaud
+ * Copyright (C) 2015 Frederic France
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/core/boxes/box_supplier_orders.php
+ * \ingroup fournisseurs
+ * \brief Module that generates the latest supplier orders box
+ */
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
+
+/**
+ * Class that manages the box showing latest supplier orders
+ */
+class box_supplier_orders_awaiting_reception extends ModeleBoxes
+{
+
+ public $boxcode = "supplierordersawaitingreception";
+ public $boximg = "object_order";
+ public $boxlabel="BoxLatestSupplierOrdersAwaitingReception";
+ public $depends = array("fournisseur");
+
+ /**
+ * @var DoliDB Database handler.
+ */
+ public $db;
+
+ public $param;
+ public $info_box_head = array();
+ public $info_box_contents = array();
+
+
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ * @param string $param More parameters
+ */
+ public function __construct($db, $param)
+ {
+ global $user;
+
+ $this->db = $db;
+
+ $this->hidden = ! ($user->rights->fournisseur->commande->lire);
+ }
+
+ /**
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
+ */
+ public function loadBox($max = 5)
+ {
+ global $conf, $user, $langs, $db;
+ $langs->loadLangs(array("boxes", "sendings"));
+
+ $this->max = $max;
+
+ include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+ $supplierorderstatic=new CommandeFournisseur($db);
+ include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+ $thirdpartytmp = new Fournisseur($db);
+
+ $this->info_box_head = array('text' => $langs->trans("BoxTitleSupplierOrdersAwaitingReception", $max));
+
+ if ($user->rights->fournisseur->commande->lire)
+ {
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
+ $sql.= " s.code_client, s.code_fournisseur,";
+ $sql.= " s.logo,";
+ $sql.= " c.rowid, c.ref, c.tms, c.date_commande, c.date_livraison, ";
+ $sql.= " c.total_ht,";
+ $sql.= " c.tva as total_tva,";
+ $sql.= " c.total_ttc,";
+ $sql.= " c.fk_statut";
+ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql.= " WHERE c.fk_soc = s.rowid";
+ $sql.= " AND c.entity = ".$conf->entity;
+
+ $sql.= " AND c.fk_statut = ".CommandeFournisseur::STATUS_ORDERSENT;
+ if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+ if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
+ if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql.= " ORDER BY c.date_commande DESC, c.ref DESC ";
+ else $sql.= " ORDER BY c.date_livraison ASC, c.fk_statut ASC ";
+ $sql.= $db->plimit($max, 0);
+
+ $result = $db->query($sql);
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+
+ $line = 0;
+ while ($line < $num) {
+ $objp = $db->fetch_object($result);
+ $date=$db->jdate($objp->date_commande);
+ $date_livraison=$db->jdate($objp->date_livraison);
+ $datem=$db->jdate($objp->tms);
+
+ $supplierorderstatic->date_livraison = $date_livraison;
+ $supplierorderstatic->statut = $objp->fk_statut;
+
+ $supplierorderstatic->id = $objp->rowid;
+ $supplierorderstatic->ref = $objp->ref;
+
+ $thirdpartytmp->id = $objp->socid;
+ $thirdpartytmp->name = $objp->name;
+ $thirdpartytmp->fournisseur = 1;
+ $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
+ $thirdpartytmp->logo = $objp->logo;
+
+ $this->info_box_contents[$line][] = array(
+ 'td' => '',
+ 'text' => $supplierorderstatic->getNomUrl(1),
+ 'asis' => 1
+ );
+
+ $this->info_box_contents[$line][] = array(
+ 'td' => '',
+ 'text' => $thirdpartytmp->getNomUrl(1, 'supplier'),
+ 'asis' => 1,
+ );
+
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="right nowrap"',
+ 'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
+ );
+
+ $delayIcon = '';
+ if ($supplierorderstatic->hasDelay()) {
+ $delayIcon = img_warning($langs->trans("Late"));
+ }
+
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="right"',
+ 'text' => $delayIcon.' '. dol_print_date($date_livraison, 'day').'',
+ 'asis' => 1
+ );
+
+ $line++;
+ }
+
+ if ($num == 0)
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="center"',
+ 'text' => $langs->trans("NoSupplierOrder"),
+ );
+
+ $db->free($result);
+ } else {
+ $this->info_box_contents[0][] = array(
+ 'td' => '',
+ 'maxlength'=>500,
+ 'text' => ($db->error().' sql='.$sql),
+ );
+ }
+ }
+ else
+ {
+ $this->info_box_contents[0][] = array(
+ 'td' => 'class="nohover opacitymedium left"',
+ 'text' => $langs->trans("ReadPermissionNotAllowed")
+ );
+ }
+ }
+
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @param int $nooutput No print, only return string
+ * @return string
+ */
+ public function showBox($head = null, $contents = null, $nooutput = 0)
+ {
+ return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+ }
+}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 5f26365c2a8..8b6998bdb22 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1277,7 +1277,7 @@ class ExtraFields
// Several field into label (eq table:code|libelle:rowid)
$notrans = false;
$fields_label = explode('|', $InfoFieldList[1]);
- if (is_array($fields_label)) {
+ if (is_array($fields_label) && count($fields_label) > 1) {
$notrans = true;
foreach ($fields_label as $field_toshow) {
$labeltoshow .= $obj->$field_toshow . ' ';
@@ -1291,27 +1291,16 @@ class ExtraFields
if (!$notrans) {
foreach ($fields_label as $field_toshow) {
$translabel = $langs->trans($obj->$field_toshow);
- if ($translabel != $obj->$field_toshow) {
- $labeltoshow = dol_trunc($translabel, 18) . ' ';
- } else {
- $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
- }
+ $labeltoshow = dol_trunc($translabel, 18) . ' ';
}
}
$out .= '';
} else {
if (!$notrans) {
$translabel = $langs->trans($obj->{$InfoFieldList[1]});
- if ($translabel != $obj->{$InfoFieldList[1]}) {
- $labeltoshow = dol_trunc($translabel, 18);
- } else {
- $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
- }
+ $labeltoshow = dol_trunc($translabel, 18);
}
if (empty($labeltoshow)) $labeltoshow = '(not defined)';
- if ($value == $obj->rowid) {
- $out .= '';
- }
if (!empty($InfoFieldList[3]) && $parentField) {
$parent = $parentName . ':' . $obj->{$parentField};
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6af56039370..df7753501e4 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2064,6 +2064,11 @@ class Form
$out='';
$outarray=array();
+ // Units
+ if ($conf->global->PRODUCT_USE_UNITS) {
+ $langs->load('other');
+ }
+
$warehouseStatusArray = array();
if (! empty($warehouseStatus))
{
@@ -2114,8 +2119,8 @@ class Form
}
// Units
if (! empty($conf->global->PRODUCT_USE_UNITS)) {
- $sql .= ', u.label as unit_long, u.short_label as unit_short';
- $selectFields .= ', unit_long, unit_short';
+ $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
+ $selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
}
// Multilang : we add translation
@@ -2408,6 +2413,42 @@ class Form
$outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration, 0, dol_strlen($objp->duration)-1):'';
$outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration, -1):'';
+ // Units
+ $outvalUnits = '';
+ if ($conf->global->PRODUCT_USE_UNITS) {
+ if (!empty($objp->unit_short)) {
+ $outvalUnits .= ' - ' . $objp->unit_short;
+ }
+ if (!empty($objp->weight) && $objp->weight_units!==null) {
+ $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
+ $outvalUnits .= ' - ' . $unitToShow;
+ }
+ if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units!==null) {
+ $unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuring_units_string($objp->length_units, 'size');
+ $outvalUnits .= ' - ' . $unitToShow;
+ }
+ if (!empty($objp->surface) && $objp->surface_units!==null) {
+ $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
+ $outvalUnits .= ' - ' . $unitToShow;
+ }
+ if (!empty($objp->volume) && $objp->volume_units!==null) {
+ $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
+ $outvalUnits .= ' - ' . $unitToShow;
+ }
+ if ($outdurationvalue && $outdurationunit) {
+ $da = array(
+ 'h' => $langs->trans('Hour'),
+ 'd' => $langs->trans('Day'),
+ 'w' => $langs->trans('Week'),
+ 'm' => $langs->trans('Month'),
+ 'y' => $langs->trans('Year')
+ );
+ if (isset($da[$outdurationunit])) {
+ $outvalUnits .= ' - ' . $outdurationvalue . ' ' . $langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
+ }
+ }
+ }
+
$opt = '\n";
$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>price2num($outprice_ht), 'price_ttc'=>price2num($outprice_ttc), 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit);
}
@@ -2679,16 +2708,28 @@ class Form
$outarray=array();
$langs->load('stocks');
+ // Units
+ if ($conf->global->PRODUCT_USE_UNITS) {
+ $langs->load('other');
+ }
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, p.fk_product_type,";
$sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
$sql.= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
$sql.= " pfp.supplier_reputation";
+ // Units
+ if ($conf->global->PRODUCT_USE_UNITS) {
+ $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
+ }
if (! empty($conf->barcode->enabled)) $sql.= " ,pfp.barcode";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
+ // Units
+ if ($conf->global->PRODUCT_USE_UNITS) {
+ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_units u ON u.rowid = p.fk_unit";
+ }
$sql.= " WHERE p.entity IN (".getEntity('product').")";
$sql.= " AND p.tobuy = 1";
if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$this->db->escape($filtertype);
@@ -2749,6 +2790,42 @@ class Form
$outdurationvalue=$outtype == Product::TYPE_SERVICE?substr($objp->duration, 0, dol_strlen($objp->duration)-1):'';
$outdurationunit=$outtype == Product::TYPE_SERVICE?substr($objp->duration, -1):'';
+ // Units
+ $outvalUnits = '';
+ if ($conf->global->PRODUCT_USE_UNITS) {
+ if (!empty($objp->unit_short)) {
+ $outvalUnits .= ' - ' . $objp->unit_short;
+ }
+ if (!empty($objp->weight) && $objp->weight_units!==null) {
+ $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
+ $outvalUnits .= ' - ' . $unitToShow;
+ }
+ if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units!==null) {
+ $unitToShow = $objp->length . ' x ' . $objp->width . ' x ' . $objp->height . ' ' . measuring_units_string($objp->length_units, 'size');
+ $outvalUnits .= ' - ' . $unitToShow;
+ }
+ if (!empty($objp->surface) && $objp->surface_units!==null) {
+ $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
+ $outvalUnits .= ' - ' . $unitToShow;
+ }
+ if (!empty($objp->volume) && $objp->volume_units!==null) {
+ $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
+ $outvalUnits .= ' - ' . $unitToShow;
+ }
+ if ($outdurationvalue && $outdurationunit) {
+ $da = array(
+ 'h' => $langs->trans('Hour'),
+ 'd' => $langs->trans('Day'),
+ 'w' => $langs->trans('Week'),
+ 'm' => $langs->trans('Month'),
+ 'y' => $langs->trans('Year')
+ );
+ if (isset($da[$outdurationunit])) {
+ $outvalUnits .= ' - ' . $outdurationvalue . ' ' . $langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
+ }
+ }
+ }
+
$opt = '\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 44e038eef48..a807fc14684 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3015,9 +3015,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
if (empty($srconly) && in_array($pictowithoutext, array(
'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'note', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
- 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow',
+ 'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', '1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
'jabber','skype','twitter','facebook','linkedin',
- 'chevron-left','chevron-right','chevron-down','chevron-top'
+ 'chevron-left','chevron-right','chevron-down','chevron-top'
)
)) {
$fa='fa';
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 0553fe3a1fa..3cc418f7d36 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -126,6 +126,7 @@ class modFournisseur extends DolibarrModules
3=>array('file'=>'box_factures_fourn_imp.php','enabledbydefaulton'=>'Home'),
4=>array('file'=>'box_factures_fourn.php','enabledbydefaulton'=>'Home'),
5=>array('file'=>'box_supplier_orders.php','enabledbydefaulton'=>'Home'),
+ 6=>array('file'=>'box_supplier_orders_awaiting_reception.php','enabledbydefaulton'=>'Home'),
);
// Permissions
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 1d7e30e7e6c..9741aff1123 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -383,6 +383,11 @@ class pdf_beluga extends ModelePDFProjects
'lang'=>'agenda')
);
+ $hookmanager->initHooks(array('completeListOfReferent'));
+ $hookmanager->executeHooks('completeListOfReferent', ['listofreferent'=>$listofreferent], $object, $action);
+ if(!empty($hookmanager->resArray)) {
+ $listofreferent = array_merge($listofreferent, $hookmanager->resArray);
+ }
foreach ($listofreferent as $key => $value)
{
@@ -392,17 +397,13 @@ class pdf_beluga extends ModelePDFProjects
$datefieldname=$value['datefieldname'];
$qualified=$value['test'];
$langstoload=$value['lang'];
+ $projectField=isset($value['project_field']) ? $value['project_field'] : 'fk_projet';
$langs->load($langstoload);
if (! $qualified) continue;
//var_dump("$key, $tablename, $datefieldname, $dates, $datee");
- $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
-
- if ($key == 'agenda')
- {
-// var_dump($elementarray);
- }
+ $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, $projectField);
$num = count($elementarray);
if ($num >= 0)
@@ -416,7 +417,7 @@ class pdf_beluga extends ModelePDFProjects
$pdf->SetXY($this->posxref, $curY);
$pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L');
- $selectList = $formproject->select_element($tablename, $project->thirdparty->id);
+ $selectList = $formproject->select_element($tablename, $project->thirdparty->id, '', -2, $projectField);
$nexY = $pdf->GetY() + 1;
$curY = $nexY;
$pdf->SetXY($this->posxref, $curY);
@@ -591,9 +592,9 @@ class pdf_beluga extends ModelePDFProjects
// Amount without tax
if (empty($value['disableamount'])) {
$pdf->SetXY($this->posxamountht, $curY);
- $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($element->total_ht) : ' '), 1, 'R');
+ $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($element->total_ht) : ''), 1, 'R');
$pdf->SetXY($this->posxamountttc, $curY);
- $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($element->total_ttc) : ' '), 1, 'R');
+ $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($element->total_ttc) : ''), 1, 'R');
} else {
$pdf->SetXY($this->posxamountht, $curY);
if ($key == 'agenda')
@@ -630,9 +631,9 @@ class pdf_beluga extends ModelePDFProjects
$pdf->SetXY($this->posxref, $curY);
$pdf->MultiCell($this->posxamountttc - $this->posxref, 3, "TOTAL", 1, 'L');
$pdf->SetXY($this->posxamountht, $curY);
- $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($total_ht) : ' '), 1, 'R');
+ $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($total_ht) : ''), 1, 'R');
$pdf->SetXY($this->posxamountttc, $curY);
- $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($total_ttc) : ' '), 1, 'R');
+ $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($total_ttc) : ''), 1, 'R');
$pdf->SetXY($this->posxstatut, $curY);
$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Nb") . " " . $num, 1, 'L');
}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index ea18f58e161..132eb650f4e 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2038,27 +2038,28 @@ elseif ($id || $ref)
print '
';
print '';
- print ' ';
+ print '';
+ print '';
print '';
// Adds a line numbering column
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
- print '| | ';
+ print ' | ';
}
// Product/Service
- print ''.$langs->trans("Products").' | ';
+ print ''.$langs->trans("Products").' | ';
// Qty
- print ''.$langs->trans("QtyOrdered").' | ';
+ print ''.$langs->trans("QtyOrdered").' | ';
if ($origin && $origin_id > 0)
{
- print ''.$langs->trans("QtyInOtherShipments").' | ';
+ print ''.$langs->trans("QtyInOtherShipments").' | ';
}
if ($action == 'editline')
{
$editColspan = 3;
if (empty($conf->stock->enabled)) $editColspan--;
if (empty($conf->productbatch->enabled)) $editColspan--;
- print '';
+ print ' | ';
if ($object->statut <= 1)
{
print $langs->trans("QtyToShip").' - ';
@@ -2081,24 +2082,24 @@ elseif ($id || $ref)
{
if ($object->statut <= 1)
{
- print ' | '.$langs->trans("QtyToShip").' | ';
+ print ''.$langs->trans("QtyToShip").' | ';
}
else
{
- print ''.$langs->trans("QtyShipped").' | ';
+ print ''.$langs->trans("QtyShipped").' | ';
}
if (! empty($conf->stock->enabled))
{
- print ''.$langs->trans("WarehouseSource").' | ';
+ print ''.$langs->trans("WarehouseSource").' | ';
}
if (! empty($conf->productbatch->enabled))
{
- print ''.$langs->trans("Batch").' | ';
+ print ''.$langs->trans("Batch").' | ';
}
}
- print ''.$langs->trans("CalculatedWeight").' | ';
- print ''.$langs->trans("CalculatedVolume").' | ';
+ print ''.$langs->trans("CalculatedWeight").' | ';
+ print ''.$langs->trans("CalculatedVolume").' | ';
//print ''.$langs->trans("Size").' | ';
if ($object->statut == 0)
{
@@ -2106,7 +2107,7 @@ elseif ($id || $ref)
print ' | ';
}
print " \n";
-
+ print '';
$var=false;
if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
@@ -2166,6 +2167,7 @@ elseif ($id || $ref)
//var_dump($alreadysent);
}
+ print '';
// Loop on each product to send/sent
for ($i = 0 ; $i < $num_prod ; $i++)
{
@@ -2176,12 +2178,12 @@ elseif ($id || $ref)
if(empty($reshook))
{
print ''; // id of order line
- print '';
+ print ' ';
// #
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
- print '| '.($i+1).' | ';
+ print ''.($i+1).' | ';
}
// Predefined product or service
@@ -2197,7 +2199,7 @@ elseif ($id || $ref)
else
$label = (! empty($lines[$i]->label)?$lines[$i]->label:$lines[$i]->product_label);
- print '';
+ print ' | ';
// Show product and description
$product_static->type=$lines[$i]->fk_product_type;
@@ -2217,7 +2219,7 @@ elseif ($id || $ref)
}
else
{
- print " | ";
+ print ' | ';
if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
else $text = img_object($langs->trans('Product'), 'product');
@@ -2233,12 +2235,12 @@ elseif ($id || $ref)
}
// Qty ordered
- print ' | '.$lines[$i]->qty_asked.' | ';
+ print ''.$lines[$i]->qty_asked.' | ';
// Qty in other shipments (with shipment and warehouse used)
if ($origin && $origin_id > 0)
{
- print '';
+ print ' | ';
foreach ($alreadysent as $key => $val)
{
if ($lines[$i]->fk_origin_line == $key)
@@ -2352,12 +2354,12 @@ elseif ($id || $ref)
else
{
// Qty to ship or shipped
- print ' | '.$lines[$i]->qty_shipped.' | ';
+ print ''.$lines[$i]->qty_shipped.' | ';
// Warehouse source
if (! empty($conf->stock->enabled))
{
- print '';
+ print ' | ';
if ($lines[$i]->entrepot_id > 0)
{
$entrepot = new Entrepot($db);
@@ -2387,7 +2389,7 @@ elseif ($id || $ref)
if (isset($lines[$i]->detail_batch))
{
print '';
- print ' | ';
+ print ' | ';
if ($lines[$i]->product_tobatch)
{
$detail = '';
@@ -2407,19 +2409,19 @@ elseif ($id || $ref)
}
print ' | ';
} else {
- print ' | ';
+ print ' | ';
}
}
}
// Weight
- print '';
+ print ' | ';
if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->weight_units, "weight");
else print ' ';
print ' | ';
// Volume
- print '';
+ print ' | ';
if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuring_units_string($lines[$i]->volume_units, "volume");
else print ' ';
print ' | ';
@@ -2475,6 +2477,7 @@ elseif ($id || $ref)
// TODO Show also lines ordered but not delivered
print " \n";
+ print '';
print '';
}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 64c7ca73b7b..b3e81247f90 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2804,9 +2804,10 @@ class CommandeFournisseur extends CommonOrder
* Load indicators for dashboard (this->nbtodo and this->nbtodolate)
*
* @param User $user Objet user
+ * @param int $mode "opened", "awaiting" for orders awaiting reception
* @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
*/
- public function load_board($user)
+ public function load_board($user, $mode = 'opened')
{
// phpcs:enable
global $conf, $langs;
@@ -2822,7 +2823,12 @@ class CommandeFournisseur extends CommonOrder
$clause = " AND";
}
$sql.= $clause." c.entity = ".$conf->entity;
- $sql.= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
+ if($mode==='awaiting'){
+ $sql.= " AND c.fk_statut = ".self::STATUS_ORDERSENT;
+ }
+ else{
+ $sql.= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
+ }
if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
$resql=$this->db->query($sql);
@@ -2834,9 +2840,15 @@ class CommandeFournisseur extends CommonOrder
$response->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
$response->label=$langs->trans("SuppliersOrdersToProcess");
$response->labelShort=$langs->trans("Opened");
- $response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3&mainmenu=commercial&leftmenu=orders_suppliers';
+ $response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2&mainmenu=commercial&leftmenu=orders_suppliers';
$response->img=img_object('', "order");
+ if($mode==='awaiting'){
+ $response->label=$langs->trans("SuppliersOrdersAwaitingReception");
+ $response->labelShort=$langs->trans("AwaitingReception");
+ $response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=3&mainmenu=commercial&leftmenu=orders_suppliers';
+ }
+
while ($obj=$this->db->fetch_object($resql))
{
$response->nbtodo++;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ae042b4c4b8..db5b87e590f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -10,6 +10,7 @@
* Copyright (C) 2014-2016 Marcos García
* Copyright (C) 2016-2017 Alexandre Spangaro
* Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2019 Ferran Marcet
*
* 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
@@ -1765,49 +1766,6 @@ if ($action == 'create')
print '| '.$langs->trans('RefSupplier').' | | ';
print ' ';
- // Type invoice
- $facids = $facturestatic->list_replacable_supplier_invoices($societe->id);
- if ($facids < 0) {
- dol_print_error($db, $facturestatic);
- exit();
- }
- $options = "";
- foreach ($facids as $facparam)
- {
- $options .= '';
- }
-
- // Show link for credit note
- $facids=$facturestatic->list_qualified_avoir_supplier_invoices($societe->id);
- if ($facids < 0)
- {
- dol_print_error($db, $facturestatic);
- exit;
- }
- $optionsav = "";
- $newinvoice_static = new FactureFournisseur($db);
- foreach ($facids as $key => $valarray)
- {
- $newinvoice_static->id = $key;
- $newinvoice_static->ref = $valarray ['ref'];
- $newinvoice_static->statut = $valarray ['status'];
- $newinvoice_static->type = $valarray ['type'];
- $newinvoice_static->paye = $valarray ['paye'];
-
- $optionsav .= '';
- }
-
print '| '.$langs->trans('Type').' | ';
print '' . "\n";
@@ -1860,6 +1818,23 @@ if ($action == 'create')
// Replacement
if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT))
{
+ // Type invoice
+ $facids = $facturestatic->list_replacable_supplier_invoices($societe->id);
+ if ($facids < 0) {
+ dol_print_error($db, $facturestatic);
+ exit();
+ }
+ $options = "";
+ foreach ($facids as $facparam)
+ {
+ $options .= ' ';
+ }
+
print '';
print ' ';
$tmp=' global->INVOICE_DISABLE_CREDIT_NOTE))
{
+ // Show link for credit note
+ $facids=$facturestatic->list_qualified_avoir_supplier_invoices($societe->id);
+ if ($facids < 0)
+ {
+ dol_print_error($db, $facturestatic);
+ exit;
+ }
+ $optionsav = "";
+ $newinvoice_static = new FactureFournisseur($db);
+ foreach ($facids as $key => $valarray)
+ {
+ $newinvoice_static->id = $key;
+ $newinvoice_static->ref = $valarray ['ref'];
+ $newinvoice_static->statut = $valarray ['status'];
+ $newinvoice_static->type = $valarray ['type'];
+ $newinvoice_static->paye = $valarray ['paye'];
+
+ $optionsav .= ' ';
+ }
+
print ' ';
$tmp='global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
$board = new CommandeFournisseur($db);
- $dashboardlines[$board->element] = $board->load_board($user);
+ $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
+ $dashboardlines[$board->element . '_awaiting'] = $board->load_board($user, 'awaiting');
}
// Number of services enabled (delayed)
@@ -541,7 +542,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
'groupName' => 'SuppliersOrders',
'globalStatsKey' => 'supplier_orders',
'stats' =>
- array('order_supplier'),
+ array('order_supplier_opened', 'order_supplier_awaiting'),
),
'invoice_supplier' =>
array(
diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index ac98c8adbc4..35454810005 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -96,7 +96,7 @@ ALTER TABLE llx_adherent ADD gender VARCHAR(10);
ALTER TABLE llx_adherent_type ADD morphy VARCHAR(3);
ALTER TABLE llx_subscription ADD fk_type integer;
-UPDATE llx_subscription as s SET fk_type = (SELECT fk_adherent_type FROM llx_adherent as a where a.rowid = s.fk_adherent) where fk_type IS NULL;
+UPDATE llx_subscription as s SET fk_type = (SELECT fk_adherent_type FROM llx_adherent as a where a.rowid = s.fk_adherent) where fk_type IS NULL;
-- Add url_id into unique index of bank_url
ALTER TABLE llx_bank_url DROP INDEX uk_bank_url;
@@ -219,17 +219,17 @@ CREATE TABLE llx_bom_bom(
description text,
note_public text,
note_private text,
- fk_product integer,
+ fk_product integer,
qty double(24,8),
efficiency double(8,4),
- date_creation datetime NOT NULL,
- tms timestamp,
+ date_creation datetime NOT NULL,
+ tms timestamp,
date_valid datetime,
fk_user_creat integer NOT NULL,
fk_user_modif integer,
fk_user_valid integer,
import_key varchar(14),
- status integer NOT NULL
+ status integer NOT NULL
-- END MODULEBUILDER FIELDS
) ENGINE=innodb;
@@ -248,12 +248,12 @@ create table llx_bom_bom_extrafields
CREATE TABLE llx_bom_bomline(
-- BEGIN MODULEBUILDER FIELDS
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
- fk_bom integer NOT NULL,
+ fk_bom integer NOT NULL,
fk_product integer NOT NULL,
- fk_bom_child integer NULL,
- description text,
+ fk_bom_child integer NULL,
+ description text,
import_key varchar(14),
- qty double(24,8) NOT NULL,
+ qty double(24,8) NOT NULL,
efficiency double(8,4) NOT NULL DEFAULT 1,
position integer NOT NULL
-- END MODULEBUILDER FIELDS
@@ -337,23 +337,23 @@ create table llx_reception
entity integer DEFAULT 1 NOT NULL, -- multi company id
fk_soc integer NOT NULL,
fk_projet integer DEFAULT NULL,
-
+
ref_ext varchar(30), -- reference into an external system (not used by dolibarr)
ref_int varchar(30), -- reference into an internal system (used by dolibarr to store extern id like paypal info)
ref_supplier varchar(30), -- customer number
-
+
date_creation datetime, -- date de creation
fk_user_author integer, -- author of creation
fk_user_modif integer, -- author of last change
date_valid datetime, -- date de validation
fk_user_valid integer, -- valideur
date_delivery datetime DEFAULT NULL, -- date planned of delivery
- date_reception datetime,
+ date_reception datetime,
fk_shipping_method integer,
tracking_number varchar(50),
fk_statut smallint DEFAULT 0, -- 0 = draft, 1 = validated, 2 = billed or closed depending on WORKFLOW_BILL_ON_SHIPMENT option
billed smallint DEFAULT 0,
-
+
height float, -- height
width float, -- with
size_units integer, -- unit of all sizes (height, width, depth)
@@ -365,7 +365,7 @@ create table llx_reception
model_pdf varchar(255),
fk_incoterms integer, -- for incoterms
location_incoterms varchar(255), -- for incoterms
-
+
import_key varchar(14),
extraparams varchar(255) -- for other parameters with json format
)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index b1ab8e41fbc..3cf7ea24493 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -34,6 +34,7 @@ BoxTitleLastFicheInter=Latest %s modified interventions
BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
BoxTitleCurrentAccounts=Open Accounts: balances
+BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
BoxMyLastBookmarks=Bookmarks: latest %s
BoxOldestExpiredServices=Oldest active expired services
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 25859ce11d8..a010a64b907 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -25,6 +25,8 @@ OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
+SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
+AwaitingReception=Awaiting reception
StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Draft
StatusOrderValidatedShort=Validated
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 093a1c3ab1e..afc1d89538c 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -844,6 +844,12 @@ class Livraison extends CommonObject
elseif ($statut==0) return $langs->trans($this->statuts[$statut]);
elseif ($statut==1) return $langs->trans($this->statuts[$statut]);
}
+ elseif ($mode == 3)
+ {
+ if ($statut==-1) return img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5');
+ if ($statut==0) return img_picto($langs->trans('StatusDeliveryDraft'), 'statut0');
+ if ($statut==1) return img_picto($langs->trans('StatusDeliveryValidated'), 'statut4');
+ }
elseif ($mode == 4)
{
if ($statut==-1) return img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5').' '.$langs->trans('StatusDeliveryCanceled');
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5fd79e96c23..ce8b1d6027e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -750,7 +750,7 @@ if (! defined('NOLOGIN'))
$_SESSION['lastsearch_contextpage_'.$relativepathstring]=$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
}
- if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 1)
+ if (! empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)
{
$_SESSION['lastsearch_page_'.$relativepathstring]=$_SESSION['lastsearch_page_tmp_'.$relativepathstring];
unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
@@ -2273,7 +2273,7 @@ if (! function_exists("llxFooter"))
unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
if (! empty($contextpage)) $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]=$contextpage;
- if (! empty($page) && $page > 1) $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
+ if (! empty($page) && $page > 0) $_SESSION['lastsearch_page_tmp_'.$relativepathstring]=$page;
if (! empty($limit) && $limit != $conf->limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring]=$limit;
unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index e356226dd2f..56d5b4bea74 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -243,6 +243,7 @@ class FormProduct
$out='';
if (empty($conf->global->ENTREPOT_EXTRA_STATUS)) $filterstatus = '';
+ if (!empty($fk_product)) $this->cache_warehouses = array();
$this->loadWarehouses($fk_product, '', $filterstatus, true, $exclude, $stockMin, $orderBy);
$nbofwarehouses=count($this->cache_warehouses);
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 42644f24098..cf77a8ea63c 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -491,6 +491,13 @@ if ($id > 0 || $ref)
{
print '';
}
+ // Units
+ if ($conf->global->PRODUCT_USE_UNITS) {
+ $unit = $object->getLabelOfUnit();
+ if ($unit !== '') {
+ print ' ' . $langs->trans($unit);
+ }
+ }
print ' | ';
// Vat rate
@@ -778,11 +785,11 @@ SCRIPT;
$num = count($product_fourn_list);
if (($num + ($offset * $limit)) < $nbtotalofrecords) $num++;
- print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVER ['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit, 1);
+ print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit, 1);
// Suppliers list title
print '';
- print ' ';
+ print '';
$param="&id=".$object->id;
@@ -851,6 +858,13 @@ SCRIPT;
// Quantity
print '| ';
print $productfourn->fourn_qty;
+ // Units
+ if ($conf->global->PRODUCT_USE_UNITS) {
+ $unit = $object->getLabelOfUnit();
+ if ($unit !== '') {
+ print ' ' . $langs->trans($unit);
+ }
+ }
print ' | ';
// VAT rate
|