';
$texte.= '';
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 6e588aed098..c01fa9d2e09 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2005-2015 Regis Houssin
+/* Copyright (C) 2005-2008 Laurent Destailleur
+ * Copyright (C) 2005-2015 Regis Houssin
*
* 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
@@ -18,33 +18,46 @@
*/
/**
- * \file htdocs/core/modules/facture/mod_facture_terre.php
- * \ingroup facture
- * \brief File containing class for numbering module Terre
+ * \file htdocs/core/modules/facture/mod_facture_terre.php
+ * \ingroup facture
+ * \brief File containing class for numbering module Terre
*/
require_once DOL_DOCUMENT_ROOT .'/core/modules/facture/modules_facture.php';
-/** \class mod_facture_terre
- * \brief Classe du modele de numerotation de reference de facture Terre
+/**
+ * \class mod_facture_terre
+ * \brief Classe du modele de numerotation de reference de facture Terre
*/
class mod_facture_terre extends ModeleNumRefFactures
{
- /**
- * Dolibarr version of the loaded document
- * @public string
+ /**
+ * Dolibarr version of the loaded document 'development', 'experimental', 'dolibarr'
+ * @var string
*/
- public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+ public $version = 'dolibarr';
- public $prefixinvoice='FA';
+ /**
+ * Prefix for invoices
+ * @var string
+ */
+ public $prefixinvoice='FA';
- public $prefixcreditnote='AV';
+ /**
+ * Prefix for credit note
+ * @var string
+ */
+ public $prefixcreditnote='AV';
- public $prefixdeposit='AC';
+ /**
+ * Prefix for deposit
+ * @var string
+ */
+ public $prefixdeposit='AC';
- /**
- * @var string Error code (or message)
- */
- public $error='';
+ /**
+ * @var string Error code (or message)
+ */
+ public $error='';
/**
@@ -162,7 +175,7 @@ class mod_facture_terre extends ModeleNumRefFactures
/**
* Return next value not used or last value used
*
- * @param Societe $objsoc Object third party
+ * @param Societe $objsoc Object third party
* @param Facture $invoice Object invoice
* @param string $mode 'next' for next value or 'last' for last value
* @return string Value
@@ -234,10 +247,10 @@ class mod_facture_terre extends ModeleNumRefFactures
/**
* Return next free value
*
- * @param Societe $objsoc Object third party
- * @param string $objforref Object for number to search
- * @param string $mode 'next' for next value or 'last' for last value
- * @return string Next free value
+ * @param Societe $objsoc Object third party
+ * @param string $objforref Object for number to search
+ * @param string $mode 'next' for next value or 'last' for last value
+ * @return string Next free value
*/
public function getNumRef($objsoc, $objforref, $mode = 'next')
{
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 0616c2a0680..7ed17228967 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -117,12 +117,12 @@ print '';
print '';
-print '
";
$db->free($resql);
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 8762f763da7..efcd418cbc1 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2019 Laurent Destailleur
+/* Copyright (C) 2019 Thibault FOUCART
+ * Copyright (C) 2019 Laurent Destailleur
*
* 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
@@ -58,7 +58,7 @@ class Donations extends DolibarrApi
*
* @param int $id ID of order
* @return array|mixed data without useless information
- *
+ *
* @throws RestException
*/
public function get($id)
@@ -89,13 +89,13 @@ class Donations extends DolibarrApi
*
* Get a list of donations
*
- * @param string $sortfield Sort field
- * @param string $sortorder Sort order
- * @param int $limit Limit for list
- * @param int $page Page number
- * @param string $thirdparty_ids Thirdparty ids to filter orders of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
- * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
- * @return array Array of order objects
+ * @param string $sortfield Sort field
+ * @param string $sortorder Sort order
+ * @param int $limit Limit for list
+ * @param int $page Page number
+ * @param string $thirdparty_ids Thirdparty ids to filter orders of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
+ * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+ * @return array Array of order objects
*
* @throws RestException
*/
@@ -177,8 +177,8 @@ class Donations extends DolibarrApi
public function post($request_data = null)
{
if (! DolibarrApiAccess::$user->rights->don->creer) {
- throw new RestException(401, "Insuffisant rights");
- }
+ throw new RestException(401, "Insuffisant rights");
+ }
// Check mandatory fields
$result = $this->_validate($request_data);
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 6f238c97d1b..d632f316a25 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -1,7 +1,7 @@
- * Copyright (C) 2004-2015 Laurent Destailleur
- * Copyright (C) 2005-2012 Regis Houssin
+/* Copyright (C) 2001-2002 Rodolphe Quiedeville
+ * Copyright (C) 2004-2015 Laurent Destailleur
+ * Copyright (C) 2005-2012 Regis Houssin
*
* 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
@@ -126,7 +126,7 @@ foreach ($listofstatus as $status)
if ($conf->use_javascript_ajax)
{
- print '
';
+ print '
';
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$dolgraph = new DolGraph();
@@ -143,9 +143,9 @@ if ($conf->use_javascript_ajax)
print '
";
- print '';
+ print "";
+ print '';
print "\n";
$db->free($resql);
}
else
{
- dol_print_error($db);
+ dol_print_error($db);
}
llxFooter();
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 43e329f3d08..bbf2163b9af 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -1,5 +1,6 @@
+/* Copyright (C) 2015 Alexandre Spangaro
+ * Copyright (C) 2019 Frédéric 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
@@ -216,9 +217,9 @@ if ($resql)
print '
';
print '
';
print '
'.$langs->trans('Donation').'
';
- print '
'.$langs->trans('ExpectedToPay').'
';
- print '
'.$langs->trans('Status').'
';
- print '
'.$langs->trans('PayedByThisPayment').'
';
+ print '
'.$langs->trans('ExpectedToPay').'
';
+ print '
'.$langs->trans('Status').'
';
+ print '
'.$langs->trans('PayedByThisPayment').'
';
print "
\n";
if ($num > 0)
@@ -234,14 +235,14 @@ if ($resql)
print $don->getNomUrl(1);
print "\n";
// Expected to pay
- print '
'.price($objp->d_amount).'
';
+ print '
'.price($objp->d_amount).'
';
// Status
- print '
'.$don->getLibStatut(4, $objp->amount).'
';
+ print '
'.$don->getLibStatut(4, $objp->amount).'
';
// Amount payed
- print '
'.price($objp->amount).'
';
+ print '
'.price($objp->amount).'
';
print "\n";
- if ($objp->paid == 1) // If at least one invoice is paid, disable delete
- {
+ if ($objp->paid == 1) {
+ // If at least one invoice is paid, disable delete
$disable_delete = 1;
}
$total = $total + $objp->amount;
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 640a94ff729..0172765b19c 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -35,8 +35,7 @@ $amounts = array();
// Security check
$socid=0;
-if ($user->societe_id > 0)
-{
+if ($user->societe_id > 0) {
$socid = $user->societe_id;
}
@@ -244,10 +243,10 @@ if (GETPOST('action', 'aZ09') == 'create')
print '
';
if ($mesg) { print $mesg; }
else {
print $px1->show();
@@ -323,8 +323,8 @@ dol_fiche_end();
// TODO USe code similar to commande/stats/index.php instead of this one.
/*
print '
';
-print '
'.$langs->trans("Year").'
';
-print '
'.$langs->trans("NbOfSendings").'
';
+print '
'.$langs->trans("Year").'
';
+print '
'.$langs->trans("NbOfSendings").'
';
$sql = "SELECT count(*) as nb, date_format(date_expedition,'%Y') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."expedition";
@@ -343,7 +343,7 @@ if ($resql)
$nbproduct = $row[0];
$year = $row[1];
print "
';
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 0c8f8717aea..462115f6cf7 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2016 Laurent Destailleur
+/* Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2016 Laurent Destailleur
*
* 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
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 41784fa57b5..bbb5ef58c36 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -160,7 +160,7 @@ if ($resql)
print '
';
// Nb of sending products for this line of order
$qtyAlreadyShipped = (! empty($object->expeditions[$objp->rowid])?$object->expeditions[$objp->rowid]:0);
print $qtyAlreadyShipped;
print '
';
if ($year) print ''.$year.'';
else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
print '
';
- print '
'.$val['nb'].'
';
- /*print '
'.price(price2num($val['total'],'MT'),1).'
';
- print '
'.price(price2num($val['avg'],'MT'),1).'
';*/
+ print '
'.$val['nb'].'
';
+ /*print '
'.price(price2num($val['total'],'MT'),1).'
';
+ print '
'.price(price2num($val['avg'],'MT'),1).'
';*/
print '
';
$oldyear=$year;
}
@@ -307,7 +307,7 @@ print '
';
// Show graphs
-print '
';
+print '
';
if ($mesg) { print $mesg; }
else {
print $px1->show();
@@ -329,8 +329,8 @@ dol_fiche_end();
// TODO USe code similar to commande/stats/index.php instead of this one.
/*
print '
';
-print '
'.$langs->trans("Year").'
';
-print '
'.$langs->trans("NbOfSendings").'
';
+print '
'.$langs->trans("Year").'
';
+print '
'.$langs->trans("NbOfSendings").'
';
$sql = "SELECT count(*) as nb, date_format(date_expedition,'%Y') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."expedition";
@@ -349,7 +349,7 @@ if ($resql)
$nbproduct = $row[0];
$year = $row[1];
print "
';
$i++;
}
}
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 7f00effc574..5c448198980 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2004-2009 Laurent Destailleur
+/* Copyright (C) 2001-2003 Rodolphe Quiedeville
+ * Copyright (C) 2004-2009 Laurent Destailleur
*
* 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
@@ -53,22 +53,21 @@ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=expeditionstats&file=expediti
$px = new DolGraph();
$mesg = $px->isGraphKo();
-if (! $mesg)
-{
+if (! $mesg) {
$px->SetData($data);
$px->SetMaxValue($px->GetCeilMaxValue());
$px->SetWidth($WIDTH);
$px->SetHeight($HEIGHT);
- $px->SetYLabel($langs->trans("NbOfOrders"));
+ $px->SetYLabel($langs->trans("NbOfSendings"));
$px->SetShading(3);
- $px->SetHorizTickIncrement(1);
- $px->SetPrecisionY(0);
+ $px->SetHorizTickIncrement(1);
+ $px->SetPrecisionY(0);
$px->draw($filename, $fileurl);
}
print '
';
-print '
Nombre d expedition par mois
';
-print '
';
+print '
'.$langs->trans("NbOfSendingsByMonth").'
';
+print '
';
print $px->show();
print '
';
print '
';
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index f1eb3289b99..5bfc81c642a 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2014 Marcos García
+/* Copyright (C) 2012 Regis Houssin
+ * Copyright (C) 2014 Marcos García
*
* 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
@@ -49,14 +49,14 @@ foreach($linkedObjectBlock as $key => $objectlink)
@@ -236,7 +236,7 @@ else
print "";
print ' ';
-
+
$i++;
}
}
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index a543066a670..07af448aedd 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -1,6 +1,7 @@
- * Copyright (C) 2008-2009 Regis Houssin
+/* Copyright (C) 2008-2016 Laurent Destailleur
+ * Copyright (C) 2008-2009 Regis Houssin
+ * Copyright (C) 2019 Frédéric 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
@@ -17,9 +18,9 @@
*/
/**
- * \file htdocs/ftp/index.php
- * \ingroup ftp
- * \brief Main page for FTP section area
+ * \file htdocs/ftp/index.php
+ * \ingroup ftp
+ * \brief Main page for FTP section area
*/
require '../main.inc.php';
@@ -453,13 +454,13 @@ else
print '
';
@@ -394,14 +394,14 @@ if ($id && ! GETPOSTISSET('search_employee'))
if (! empty($user->rights->holiday->read_all)) // Can see all
{
if (GETPOSTISSET('search_employee')) $search_employee=GETPOST('search_employee', 'int');
- print '
\n";
$listhalfday=array('morning'=>$langs->trans("Morning"),"afternoon"=>$langs->trans("Afternoon"));
// If we ask a dedicated card and not allow to see it, we forc on user.
-if ($id && empty($user->rights->holiday->read_all) && ! in_array($id, $childids))
-{
+if ($id && empty($user->rights->holiday->read_all) && ! in_array($id, $childids)) {
$langs->load("errors");
print '
';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
$selected=0;
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 4cfa375fe76..98db1318aa7 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -1,7 +1,7 @@
- * Copyright (C) 2011 François Legastelois
- * Copyright (C) 2018 Frédéric France
+/* Copyright (C) 2007-2010 Laurent Destailleur
+ * Copyright (C) 2011 François Legastelois
+ * Copyright (C) 2018-2019 Frédéric 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
@@ -110,12 +110,12 @@ print '
';
}
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 f877c193750..4b6a511d0e5 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
@@ -242,3 +242,6 @@ ALTER TABLE llx_facturedet_rec ADD COLUMN fk_user_modif integer;
ALTER TABLE llx_expensereport_det MODIFY COLUMN value_unit double(24,8) NOT NULL;
ALTER TABLE llx_expensereport_det ADD COLUMN subprice double(24,8) DEFAULT 0 NOT NULL after qty;
+ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_parent (fk_product_parent);
+ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_child (fk_product_child);
+
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination.key.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination.key.sql
new file mode 100644
index 00000000000..770429d0524
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination.key.sql
@@ -0,0 +1,20 @@
+-- ============================================================================
+-- Copyright (C) 2019 Laurent Destailleur
+--
+-- 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 .
+--
+-- ============================================================================
+
+ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_parent (fk_product_parent);
+ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_child (fk_product_child);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 33cad2ca38e..846b20a26fa 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1285,7 +1285,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
{
print ''."\n";
print ''."\n";
- if (! empty($conf->global->MAIN_USE_FONT_AWESOME_5))
+ if (empty($conf->global->MAIN_DISABLE_FONT_AWESOME_5))
{
print ''."\n";
print ''."\n";
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index be644a1f2e4..dfe8f681985 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -35,9 +35,12 @@ $backtopage = GETPOST('backtopage', 'alpha');
/*
* Actions
*/
-if ($action=="update"){
- $res1=dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_README', GETPOST('MODULEBUILDER_SPECIFIC_README'), 'chaine', 0, '', $conf->entity);
- if ($res1 < 0) {
+if ($action=="update")
+{
+ $res1=dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_README', GETPOST('MODULEBUILDER_SPECIFIC_README', 'none'), 'chaine', 0, '', $conf->entity);
+ $res2=dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTOR', GETPOST('MODULEBUILDER_ASCIIDOCTOR', 'nohtml'), 'chaine', 0, '', $conf->entity);
+ $res3=dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTORPDF', GETPOST('MODULEBUILDER_ASCIIDOCTORPDF', 'nohtml'), 'chaine', 0, '', $conf->entity);
+ if ($res1 < 0 || $res2 < 0 || $res3 < 0) {
setEventMessages('ErrorFailedToSaveDate', null, 'errors');
$db->rollback();
}
@@ -81,10 +84,7 @@ $form = new Form($db);
llxHeader('', $langs->trans("ModulebuilderSetup"));
-$linkback = '';
-if (GETPOST('withtab', 'alpha')) {
- $linkback = '' . $langs->trans("BackToModuleList") . '';
-}
+$linkback = '' . $langs->trans("BackToModuleList") . '';
print '