'."\n";
//print ajax_constantonoff('AGENDA_USE_EVENT_TYPE'); Do not use ajax here, we need to reload page to change other combo list
if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
@@ -355,7 +355,7 @@ print '
';
print $form->textwithpicto('', $htmltooltip, 1, 0);
if ($conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file) // If module is the one used, we show existing errors
@@ -244,7 +244,7 @@ print '';
print '
';
$disabled='';
if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled=' disabled="disabled"';
print '';
@@ -385,7 +385,7 @@ if ($result)
print '
';
// Actions
- print '
';
+ print '
';
if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
{
print ''.img_edit().'';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 788f600a549..11134f70194 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -88,7 +88,7 @@ $hookmanager->initHooks(array('admin'));
// Put here declaration of dictionaries properties
// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,24,28,17,35,36,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,26,37,0,25,0);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,24,28,17,35,36,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,37,0,25,0);
// Name of SQL tables of dictionaries
$tabname=array();
@@ -1180,7 +1180,7 @@ if ($id)
}
if ($id == 4) print '
';
$form = new Form($db);
@@ -87,9 +87,9 @@ $form = new Form($db);
print '
';
print '
'.$langs->trans("ECMAutoTree").'
';
-print '
';
+print '
';
-print '
';
+print '
';
if ($conf->use_javascript_ajax)
{
print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 755d44d42ba..e8dbc07654c 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -412,7 +412,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
print '
'."\n";
@@ -450,10 +450,10 @@ while ($i < min($num, $limit))
$cssforfield='';
if (in_array($val['type'], array('date','datetime','timestamp'))) $cssforfield.=($cssforfield?' ':'').'center';
elseif ($key == 'status') $cssforfield.=($cssforfield?' ':'').'center';
-
+
if (in_array($val['type'], array('timestamp'))) $cssforfield.=($cssforfield?' ':'').'nowrap';
elseif ($key == 'ref') $cssforfield.=($cssforfield?' ':'').'nowrap';
-
+
if (! empty($arrayfields['t.'.$key]['checked']))
{
print 'executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
- print '
';
+ 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/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index aa0dd0978d9..e284d4b4834 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -154,6 +154,13 @@ if ($mode == 'setup' && $user->admin)
$urltodelete='';
$urltocheckperms='';
}
+ elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
+ {
+ $OAUTH_SERVICENAME='StripeLive';
+ $urltorenew=$urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+ $urltodelete='';
+ $urltocheckperms='';
+ }
else
{
$urltorenew='';
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index f723d13d540..8b7c061dc64 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -1,5 +1,6 @@
+ * Copyright (C) 2019 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
@@ -96,7 +97,7 @@ dol_fiche_head($head, 'setup', '', 0, 'user');
print ' ';
-$arrayofsocialnetworks=array('jabber'=>'Jabber', 'skype'=>'Skype', 'twitter'=>'Twitter', 'facebook'=>'Facebook');
+$arrayofsocialnetworks=array('jabber'=>'Jabber', 'skype'=>'Skype', 'twitter'=>'Twitter', 'facebook'=>'Facebook', 'linkedin'=>'LinkedIn');
foreach($arrayofsocialnetworks as $snkey => $snlabel) {
$consttocheck = 'SOCIALNETWORKS_'.strtoupper($snkey);
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 4a1fb7eea1a..2e934211970 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -409,12 +409,12 @@ print '
';
+ }
+ else
+ {
+ print ' '.$langs->trans("NothingToSetup");
+ }
+}
+
+
+// Page end
+dol_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
new file mode 100644
index 00000000000..ea5ba91c715
--- /dev/null
+++ b/htdocs/bom/bom_card.php
@@ -0,0 +1,471 @@
+
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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 bom_card.php
+ * \ingroup bom
+ * \brief Page to create/edit/view bom
+ */
+
+//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Do not create database handler $db
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Do not load object $user
+//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); // Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION')) define('NOSCANGETFORINJECTION','1'); // Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1'); // Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1'); // Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); // Do not load ajax.lib.php library
+//if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK')) define('NOIPCHECK','1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT")) define('MAIN_LANG_DEFAULT','auto'); // Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule'); // Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN")) define('NOREDIRECTBYMAINTOLOGIN',1); // The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP")) define('FORCECSP','none'); // Disable all Content Security Policies
+
+
+// Load Dolibarr environment
+$res=0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php";
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (! $res && file_exists("../main.inc.php")) $res=@include "../main.inc.php";
+if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php";
+if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php";
+if (! $res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+dol_include_once('/bom/class/bom.class.php');
+dol_include_once('/bom/lib/bom_bom.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("bom@bom","other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'bomcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object=new BillOfMaterials($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction=$conf->bom->dir_output . '/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('bomcard', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all=trim(GETPOST("search_all", 'alpha'));
+$search=array();
+foreach($object->fields as $key => $val)
+{
+ if (GETPOST('search_'.$key, 'alpha')) $search[$key]=GETPOST('search_'.$key, 'alpha');
+}
+
+if (empty($action) && empty($id) && empty($ref)) $action='view';
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Security check - Protection if external user
+//if ($user->societe_id > 0) access_forbidden();
+//if ($user->societe_id > 0) $socid = $user->societe_id;
+//$isdraft = (($object->statut == BillOfMaterials::STATUS_DRAFT) ? 1 : 0);
+//$result = restrictedArea($user, 'bom', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+
+/*
+ * Actions
+ *
+ * Put here all code to do according to value of "action" parameter
+ */
+
+$parameters=array();
+$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 (empty($reshook))
+{
+ $error=0;
+
+ $permissiontoadd = $user->rights->bom->write;
+ $permissiontodelete = $user->rights->bom->delete || ($permissiontoadd && $object->status == 0);
+ $backurlforlist = dol_buildpath('/bom/bom_list.php', 1);
+ if (empty($backtopage)) {
+ if (empty($id)) $backtopage = $backurlforlist;
+ else $backtopage = dol_buildpath('/bom/bom_card.php', 1).($id > 0 ? $id : '__ID__');
+ }
+ $triggermodname = 'BILLOFMATERIALS_BILLOFMATERIALS_MODIFY'; // Name of trigger action code to execute when we modify record
+
+ // Actions cancel, add, update, delete or clone
+ include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+ // Actions when linking object each other
+ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
+
+ // Actions when printing a doc from card
+ include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+ // Actions to send emails
+ $trigger_name='BILLOFMATERIALS_SENTBYMAIL';
+ $autocopy='MAIN_MAIL_AUTOCOPY_BILLOFMATERIALS_TO';
+ $trackid='bom'.$object->id;
+ include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form=new Form($db);
+$formfile=new FormFile($db);
+
+llxHeader('', 'BillOfMaterials', '');
+
+// Example : Adding jquery code
+print '';
+
+
+// Part to create
+if ($action == 'create')
+{
+ print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("BillOfMaterials")));
+
+ print '';
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+ print load_fiche_titre($langs->trans("BillOfMaterials"));
+
+ print '';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+ $res = $object->fetch_optionals();
+
+ $head = bomPrepareHead($object);
+ dol_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom@bom');
+
+ $formconfirm = '';
+
+ // Confirmation to delete
+ if ($action == 'delete')
+ {
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), 'confirm_delete', '', 0, 1);
+ }
+
+ // Clone confirmation
+ if ($action == 'clone') {
+ // Create an array for form
+ $formquestion = array();
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneBillOfMaterials'), $langs->trans('ConfirmCloneBillOfMaterials', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+ }
+
+ // Confirmation of action xxxx
+ if ($action == 'xxx')
+ {
+ $formquestion=array();
+ /*
+ $forcecombo=0;
+ if ($conf->browser->name == 'ie') $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+ $formquestion = array(
+ // 'text' => $langs->trans("ConfirmClone"),
+ // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+ // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+ // array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+ );
+ */
+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+ }
+
+ // Call Hook formConfirm
+ $parameters = array('lineid' => $lineid);
+ $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ if (empty($reshook)) $formconfirm.=$hookmanager->resPrint;
+ elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint;
+
+ // Print form confirm
+ print $formconfirm;
+
+
+ // Object card
+ // ------------------------------------------------------------
+ $linkback = '' . $langs->trans("BackToList") . '';
+
+ $morehtmlref='
'."\n";
+ }
+
+
+ // Select mail models is same action as presend
+ if (GETPOST('modelselected')) {
+ $action = 'presend';
+ }
+
+ if ($action != 'presend')
+ {
+ print '
';
+ print ''; // ancre
+
+ // Documents
+ /*$objref = dol_sanitizeFileName($object->ref);
+ $relativepath = $comref . '/' . $comref . '.pdf';
+ $filedir = $conf->bom->dir_output . '/' . $objref;
+ $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+ $genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
+ $delallowed = $user->rights->bom->create; // If you can create/edit, you can remove a file on card
+ print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+ */
+
+ // Show links to link elements
+ $linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
+ $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+ print '
';
+
+ $MAXEVENT = 10;
+
+ $morehtmlright = '';
+ $morehtmlright.= $langs->trans("SeeAll");
+ $morehtmlright.= '';
+
+ // List of actions on element
+ include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+ $formactions = new FormActions($db);
+ $somethingshown = $formactions->showactions($object, 'bom', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+
+ print '
';
+ }
+
+ //Select mail models is same action as presend
+ /*
+ if (GETPOST('modelselected')) $action = 'presend';
+
+ // Presend form
+ $modelmail='inventory';
+ $defaulttopic='InformationMessage';
+ $diroutput = $conf->product->dir_output.'/inventory';
+ $trackid = 'stockinv'.$object->id;
+
+ include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+ */
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
new file mode 100644
index 00000000000..0b1d55d7584
--- /dev/null
+++ b/htdocs/bom/bom_document.php
@@ -0,0 +1,166 @@
+
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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 bom_document.php
+ * \ingroup bom
+ * \brief Tab for documents linked to BillOfMaterials
+ */
+
+// Load Dolibarr environment
+$res=0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php";
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (! $res && file_exists("../main.inc.php")) $res=@include "../main.inc.php";
+if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php";
+if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php";
+if (! $res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+dol_include_once('/bom/class/bom.class.php');
+dol_include_once('/bom/lib/bom_bom.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("bom@bom","companies","other","mails"));
+
+
+$action=GETPOST('action', 'aZ09');
+$confirm=GETPOST('confirm', 'alpha');
+$id=(GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Security check - Protection if external user
+//if ($user->societe_id > 0) access_forbidden();
+//if ($user->societe_id > 0) $socid = $user->societe_id;
+//$result = restrictedArea($user, 'bom', $id);
+
+// Get parameters
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object=new BillOfMaterials($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction=$conf->bom->dir_output . '/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('bomdocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('bom');
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/bom/" . dol_sanitizeFileName($object->id);
+if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/bom/" . dol_sanitizeFileName($object->ref);
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title=$langs->trans("BillOfMaterials").' - '.$langs->trans("Files");
+$help_url='';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+if ($object->id)
+{
+ /*
+ * Show tabs
+ */
+ $head = bomPrepareHead($object);
+
+ dol_fiche_head($head, 'document', $langs->trans("BillOfMaterials"), -1, 'bom@bom');
+
+
+ // Build file list
+ $filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
+ $totalsize=0;
+ foreach($filearray as $key => $file)
+ {
+ $totalsize+=$file['size'];
+ }
+
+ // Object card
+ // ------------------------------------------------------------
+ $linkback = '' . $langs->trans("BackToList") . '';
+
+ dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+ print '
';
+
+ print '';
+ print '
';
+
+ // Number of files
+ print '
'.$langs->trans("NbOfAttachedFiles").'
'.count($filearray).'
';
+
+ // Total size
+ print '
'.$langs->trans("TotalSizeOfAttachedFiles").'
'.$totalsize.' '.$langs->trans("bytes").'
';
+
+ print '
';
+
+ print '
';
+
+ dol_fiche_end();
+
+ $modulepart = 'bom';
+ //$permission = $user->rights->bom->create;
+ $permission = 1;
+ //$permtoedit = $user->rights->bom->create;
+ $permtoedit = 1;
+ $param = '&id=' . $object->id;
+
+ //$relativepathwithnofile='bom/' . dol_sanitizeFileName($object->id).'/';
+ $relativepathwithnofile='bom/' . dol_sanitizeFileName($object->ref).'/';
+
+ include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+}
+else
+{
+ accessforbidden('', 0, 0);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
new file mode 100644
index 00000000000..4785d0c4598
--- /dev/null
+++ b/htdocs/bom/bom_list.php
@@ -0,0 +1,596 @@
+
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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 bom_list.php
+ * \ingroup bom
+ * \brief List page for bom
+ */
+
+//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Do not create database handler $db
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Do not load object $user
+//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); // Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION')) define('NOSCANGETFORINJECTION','1'); // Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION','1'); // Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); // Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK','1'); // Do not check style html tag into posted data
+//if (! defined('NOIPCHECK')) define('NOIPCHECK','1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); // Do not load ajax.lib.php library
+//if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session)
+//if (! defined("MAIN_LANG_DEFAULT")) define('MAIN_LANG_DEFAULT','auto'); // Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule'); // Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN")) define('NOREDIRECTBYMAINTOLOGIN',1); // The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("XFRAMEOPTIONS_ALLOWALL")) define('XFRAMEOPTIONS_ALLOWALL',1); // Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
+
+// Load Dolibarr environment
+$res=0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php";
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (! $res && file_exists("../main.inc.php")) $res=@include "../main.inc.php";
+if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php";
+if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php";
+if (! $res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+dol_include_once('/bom/class/bom.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("bom@bom", "other"));
+
+$action = GETPOST('action', 'aZ09')?GETPOST('action', 'aZ09'):'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage= GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'bomlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+//if (! $sortfield) $sortfield="p.date_fin";
+//if (! $sortorder) $sortorder="DESC";
+
+// Initialize technical objects
+$object = new BillOfMaterials($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->bom->dir_output . '/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('bomlist')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('bom'); // Load $extrafields->attributes['bom']
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (! $sortfield) $sortfield="t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+if (! $sortorder) $sortorder="ASC";
+
+// Security check
+$socid=0;
+if ($user->societe_id > 0) // Protection if external user
+{
+ //$socid = $user->societe_id;
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'bom', $id, '');
+
+// Initialize array of search criterias
+$search_all=trim(GETPOST("search_all", 'alpha'));
+$search=array();
+foreach($object->fields as $key => $val)
+{
+ if (GETPOST('search_'.$key, 'alpha')) $search[$key]=GETPOST('search_'.$key, 'alpha');
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach($object->fields as $key => $val)
+{
+ if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+}
+
+// Definition of fields for list
+$arrayfields=array();
+foreach($object->fields as $key => $val)
+{
+ // If $val['visible']==0, then we never show the field
+ if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+}
+// Extra fields
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
+{
+ foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+ {
+ if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+ $arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+ }
+}
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$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 (empty($reshook))
+{
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') ||GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+ {
+ foreach($object->fields as $key => $val)
+ {
+ $search[$key]='';
+ }
+ $toselect='';
+ $search_array_options=array();
+ }
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+ || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
+ {
+ $massaction=''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+ }
+
+ // Mass actions
+ $objectclass='BillOfMaterials';
+ $objectlabel='BillOfMaterials';
+ $permtoread = $user->rights->bom->read;
+ $permtodelete = $user->rights->bom->delete;
+ $uploaddir = $conf->bom->dir_output;
+ include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+
+$now=dol_now();
+
+//$help_url="EN:Module_BillOfMaterials|FR:Module_BillOfMaterials_FR|ES:Módulo_BillOfMaterials";
+$help_url='';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("BillOfMaterialss"));
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+foreach($object->fields as $key => $val)
+{
+ $sql.='t.'.$key.', ';
+}
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label']))
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql=preg_replace('/, $/', '', $sql);
+$sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity($object->element).")";
+else $sql.=" WHERE 1 = 1";
+foreach($search as $key => $val)
+{
+ if ($key == 'status' && $search[$key] == -1) continue;
+ $mode_search=(($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))?1:0);
+ if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+}
+if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
+/* If a group by is required
+$sql.= " GROUP BY "
+foreach($object->fields as $key => $val)
+{
+ $sql.='t.'.$key.', ';
+}
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters); // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql=preg_replace('/, $/','', $sql);
+*/
+
+$sql.=$db->order($sortfield, $sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+ $resql = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($resql);
+ if (($page * $limit) > $nbtotalofrecords) // if total of record found is smaller than page * limit, goto and load page 0
+ {
+ $page = 0;
+ $offset = 0;
+ }
+}
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
+{
+ $num = $nbtotalofrecords;
+}
+else
+{
+ $sql.= $db->plimit($limit+1, $offset);
+
+ $resql=$db->query($sql);
+ if (! $resql)
+ {
+ dol_print_error($db);
+ exit;
+ }
+
+ $num = $db->num_rows($resql);
+}
+
+// Direct jump if only one record found
+if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+{
+ $obj = $db->fetch_object($resql);
+ $id = $obj->rowid;
+ header("Location: ".dol_buildpath('/bom/bom_card.php', 1).'?id='.$id);
+ exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+print '';
+
+$arrayofselected=is_array($toselect)?$toselect:array();
+
+$param='';
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+foreach($search as $key => $val)
+{
+ $param.= '&search_'.$key.'='.urlencode($search[$key]);
+}
+if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+// List of mass actions available
+$arrayofmassactions = array(
+ //'presend'=>$langs->trans("SendByMail"),
+ //'builddoc'=>$langs->trans("PDFMerge"),
+);
+if ($user->rights->bom->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+print ''."\n";
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
+{
+ $hidegeneratedfilelistifempty=1;
+ if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty=0;
+
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+ $formfile = new FormFile($db);
+
+ // Show list of available documents
+ $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+ $urlsource.=str_replace('&', '&', $param);
+
+ $filedir=$diroutputmassaction;
+ $genallowed=$user->rights->bom->read;
+ $delallowed=$user->rights->bom->create;
+
+ print $formfile->showdocuments('massfilesarea_bom', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
new file mode 100644
index 00000000000..6166b6f23d1
--- /dev/null
+++ b/htdocs/bom/bom_note.php
@@ -0,0 +1,164 @@
+
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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 bom_note.php
+ * \ingroup bom
+ * \brief Car with notes on BillOfMaterials
+ */
+
+// Load Dolibarr environment
+$res=0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (! $res && ! empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res=@include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp=empty($_SERVER['SCRIPT_FILENAME'])?'':$_SERVER['SCRIPT_FILENAME'];$tmp2=realpath(__FILE__); $i=strlen($tmp)-1; $j=strlen($tmp2)-1;
+while($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i]==$tmp2[$j]) { $i--; $j--; }
+if (! $res && $i > 0 && file_exists(substr($tmp, 0, ($i+1))."/main.inc.php")) $res=@include substr($tmp, 0, ($i+1))."/main.inc.php";
+if (! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i+1)))."/main.inc.php")) $res=@include dirname(substr($tmp, 0, ($i+1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (! $res && file_exists("../main.inc.php")) $res=@include "../main.inc.php";
+if (! $res && file_exists("../../main.inc.php")) $res=@include "../../main.inc.php";
+if (! $res && file_exists("../../../main.inc.php")) $res=@include "../../../main.inc.php";
+if (! $res) die("Include of main fails");
+
+dol_include_once('/bom/class/bom.class.php');
+dol_include_once('/bom/lib/bom_bom.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("bom@bom","companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object=new BillOfMaterials($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction=$conf->bom->dir_output . '/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('bomnote','globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('bom');
+
+// Security check - Protection if external user
+//if ($user->societe_id > 0) access_forbidden();
+//if ($user->societe_id > 0) $socid = $user->societe_id;
+//$result = restrictedArea($user, 'bom', $id);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || ! empty($ref)) $upload_dir = $conf->bom->multidir_output[$object->entity] . "/" . $object->id;
+
+$permissionnote=1;
+//$permissionnote=$user->rights->bom->creer; // Used by the include of actions_setnotes.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url='';
+llxHeader('', $langs->trans('BillOfMaterials'), $help_url);
+
+if ($id > 0 || ! empty($ref))
+{
+ $object->fetch_thirdparty();
+
+ $head = bomPrepareHead($object);
+
+ dol_fiche_head($head, 'note', $langs->trans("BillOfMaterials"), -1, 'bom@bom');
+
+ // Object card
+ // ------------------------------------------------------------
+ $linkback = '' . $langs->trans("BackToList") . '';
+
+ $morehtmlref='
';
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/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 6c6a8447c5a..ac4d17e4c49 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -496,7 +496,7 @@ if (empty($numref))
}
print '
';
if (! $i) $totalarray['nbfield']++;
}
if (! empty($arrayfields['cd.subprice']['checked']))
{
- print '
';
+ print '
';
print price($obj->subprice);
print '
';
if (! $i) $totalarray['nbfield']++;
@@ -698,7 +698,7 @@ while ($i < min($num, $limit))
// Status
if (! empty($arrayfields['status']['checked']))
{
- print '
';
+ print '
';
if ($obj->cstatut == 0) // If contract is draft, we say line is also draft
{
print $contractstatic->LibStatut(0, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
@@ -735,9 +735,9 @@ if (isset($totalarray['displaytotalline'])) {
if ($num < $limit && empty($offset)) print '
';
$userstatic->id=isset($val['fk_user_c'])?$val['fk_user_c']:0;
$userstatic->lastname=isset($val['login_c'])?$val['login_c']:0;
$htmltooltip=''.$langs->trans("ECMSection").': '.$val['label'].' ';
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 9f7a457e238..c3cdbcef412 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -28,18 +28,18 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_graph_orders_supplier_permonth extends ModeleBoxes
{
- var $boxcode="orderssupplierpermonth";
- var $boximg="object_order";
- var $boxlabel="BoxSuppliersOrdersPerMonth";
- var $depends = array("fournisseur");
+ public $boxcode="orderssupplierpermonth";
+ public $boximg="object_order";
+ public $boxlabel="BoxSuppliersOrdersPerMonth";
+ public $depends = array("fournisseur");
- /**
+ /**
* @var DoliDB Database handler.
*/
public $db;
- var $info_box_head = array();
- var $info_box_contents = array();
+ public $info_box_head = array();
+ public $info_box_contents = array();
/**
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index c8c3d9c94b6..e041c0ab197 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2011 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2005-2012 Maxime Kohlhaas
- * Copyright (C) 2015 Frederic France
+ * Copyright (C) 2015-2019 Frédéric France
* Copyright (C) 2015 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
@@ -117,6 +117,8 @@ class box_produits_alerte_stock extends ModeleBoxes
while ($line < $num) {
$objp = $db->fetch_object($result);
$datem=$db->jdate($objp->tms);
+ $price = '';
+ $price_base_type = '';
// Multilangs
if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index f08586ba9b0..f03915b7b2a 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -89,21 +89,17 @@ class box_project extends ModeleBoxes
include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
$projectstatic = new Project($this->db);
- $socid=$user->societe_id;
+ $socid=0;
+ //if ($user->societe_id > 0) $socid = $user->societe_id; // For external user, no check is done on company because readability is managed by public status of project and assignement.
- // Get list of project id allowed to user (in a string list separated by coma)
+ // Get list of project id allowed to user (in a string list separated by coma)
$projectsListId='';
if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut, p.public";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
- if($user->socid) $sql.= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=p.fk_soc";
- $sql.= " WHERE p.entity IN (".getEntity('project').')';
- if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
- if ($user->socid) $sql.= " AND s.rowid = ".$user->socid;
- $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
- if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
- if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND ((s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id.") OR (s.rowid IS NULL))";
+ $sql.= " WHERE p.fk_statut = 1"; // Only open projects
+ if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
$sql.= " ORDER BY p.datec DESC";
//$sql.= $db->plimit($max, 0);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 98d7e720628..c1b483efe8c 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -570,7 +570,7 @@ abstract class CommonDocGenerator
'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
);
- // Units
+ // Units
if ($conf->global->PRODUCT_USE_UNITS)
{
$resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
@@ -882,7 +882,7 @@ abstract class CommonDocGenerator
// Sorting
- uasort ($this->cols, array( $this, 'columnSort' ));
+ uasort($this->cols, array($this, 'columnSort'));
// Positionning
$curX = $this->page_largeur-$this->marge_droite; // start from right
@@ -945,10 +945,10 @@ abstract class CommonDocGenerator
}
/**
- * get column content width from column key
+ * get column content width from column key
*
- * @param string $colKey the column key
- * @return float width in mm
+ * @param string $colKey the column key
+ * @return float width in mm
*/
function getColumnContentWidth($colKey)
{
@@ -1025,13 +1025,13 @@ abstract class CommonDocGenerator
/**
- * print standard column content
+ * print standard column content
*
- * @param PDF $pdf pdf object
- * @param float $curY curent Y position
- * @param string $colKey the column key
- * @param string $columnText column text
- * @return int new rank on success and -1 on error
+ * @param PDF $pdf pdf object
+ * @param float $curY curent Y position
+ * @param string $colKey the column key
+ * @param string $columnText column text
+ * @return int new rank on success and -1 on error
*/
function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
{
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1f86d60598c..98b9d93580a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -672,6 +672,8 @@ abstract class CommonObject
$outdone++;
if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
$outdone++;
+ if ($this->linkedin) $out.=dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+ $outdone++;
}
$out.='';
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 2a92d14c7b9..7fd9258ddd7 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -936,7 +936,7 @@ class DolGraph
$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-','.'))));
$this->stringtoshow =''."\n";
- if (! empty($this->title)) $this->stringtoshow.='
'.$this->title.'
';
+ if (! empty($this->title)) $this->stringtoshow.='
'.$this->title.'
';
if (! empty($this->shownographyet))
{
$this->stringtoshow.='';
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 5c9797a2407..63172d17566 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -303,17 +303,6 @@ class EmailSenderProfile extends CommonObject
return $result;
}
- /**
- * Return link to download file from a direct external access
- *
- * @param int $withpicto Add download picto into link
- * @return string HTML link to file
- */
- function getDirectExternalLink($withpicto = 0)
- {
- return 'todo';
- }
-
/**
* Retourne le libelle du status d'un user (actif, inactif)
*
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 921878aef73..c23f40a0283 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -9,7 +9,7 @@
* Copyright (C) 2015 Charles-Fr BENKE
* Copyright (C) 2016 Raphaël Doursenaud
* Copyright (C) 2017 Nicolas ZABOURI
- * Copyright (C) 2018 Frédéric France
+ * 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
@@ -42,84 +42,138 @@ class ExtraFields
*/
public $db;
- // type of element (for what object is the extrafield)
- // @deprecated
- var $attribute_elementtype;
- // Array with type of the extra field
- // @deprecated
- var $attribute_type;
- // Array with label of extra field
- // @deprecated
- var $attribute_label;
- // Array with size of extra field
- // @deprecated
- var $attribute_size;
- // array with list of possible values for some types of extra fields
- // @deprecated
- var $attribute_choice;
- // Array to store compute formula for computed fields
- // @deprecated
- var $attribute_computed;
- // Array to store default value
- // @deprecated
- var $attribute_default;
- // Array to store if attribute is unique or not
- // @deprecated
- var $attribute_unique;
- // Array to store if attribute is required or not
- // @deprecated
- var $attribute_required;
- // Array to store parameters of attribute (used in select type)
- // @deprecated
- var $attribute_param;
- // Array to store position of attribute
- // @deprecated
- var $attribute_pos;
- // Array to store if attribute is editable regardless of the document status
- // @deprecated
- var $attribute_alwayseditable;
- // Array to store permission to check
- // @deprecated
- var $attribute_perms;
- // Array to store language file to translate label of values
- // @deprecated
- var $attribute_langfile;
- // Array to store if field is visible by default on list
- // @deprecated
- var $attribute_list;
+ /**
+ * @var string type of element (for what object is the extrafield)
+ * @deprecated
+ */
+ public $attribute_elementtype;
- // New array to store extrafields definition
- var $attributes;
+ /**
+ * @var array Array with type of the extra field
+ * @deprecated
+ */
+ public $attribute_type;
+
+ /**
+ * @var array Array with label of extra field
+ * @deprecated
+ */
+ public $attribute_label;
+
+ /**
+ * @var array Array with size of extra field
+ * @deprecated
+ */
+ public $attribute_size;
+
+ /**
+ * @var array Array with list of possible values for some types of extra fields
+ * @deprecated
+ */
+ public $attribute_choice;
+
+ /**
+ * @var array Array to store compute formula for computed fields
+ * @deprecated
+ */
+ public $attribute_computed;
+
+ /**
+ * @var array Array to store default value
+ * @deprecated
+ */
+ public $attribute_default;
+
+ /**
+ * @var array Array to store if attribute is unique or not
+ * @deprecated
+ */
+ public $attribute_unique;
+
+ /**
+ * @var array Array to store if attribute is required or not
+ * @deprecated
+ */
+ public $attribute_required;
+
+ /**
+ * @var array Array to store parameters of attribute (used in select type)
+ * @deprecated
+ */
+ public $attribute_param;
+
+ /**
+ * @var array Array to store position of attribute
+ * @deprecated
+ */
+ public $attribute_pos;
+
+ /**
+ * @var array Array to store if attribute is editable regardless of the document status
+ * @deprecated
+ */
+ public $attribute_alwayseditable;
+
+ /**
+ * @var array Array to store permission to check
+ * @deprecated
+ */
+ public $attribute_perms;
+
+ /**
+ * @var array Array to store language file to translate label of values
+ * @deprecated
+ */
+ public $attribute_langfile;
+
+ /**
+ * @var array Array to store if field is visible by default on list
+ * @deprecated
+ */
+ public $attribute_list;
+
+ /**
+ * @var array New array to store extrafields definition
+ */
+ public $attributes;
/**
* @var string Error code (or message)
*/
public $error='';
- var $errno;
+ /**
+ * @var string[] Array of Error code (or message)
+ */
+ public $errors = array();
+
+ /**
+ * @var string DB Error number
+ */
+ public $errno;
public static $type2label=array(
- 'varchar'=>'String',
- 'text'=>'TextLong',
- 'html'=>'HtmlText',
- 'int'=>'Int',
- 'double'=>'Float',
- 'date'=>'Date',
- 'datetime'=>'DateAndTime',
- 'boolean'=>'Boolean',
- 'price'=>'ExtrafieldPrice',
- 'phone'=>'ExtrafieldPhone',
- 'mail'=>'ExtrafieldMail',
- 'url'=>'ExtrafieldUrl',
- 'password' => 'ExtrafieldPassword',
- 'select' => 'ExtrafieldSelect',
- 'sellist' => 'ExtrafieldSelectList',
- 'radio' => 'ExtrafieldRadio',
- 'checkbox' => 'ExtrafieldCheckBox',
- 'chkbxlst' => 'ExtrafieldCheckBoxFromList',
- 'link' => 'ExtrafieldLink',
- 'separate' => 'ExtrafieldSeparator',
+ 'varchar'=>'String',
+ 'text'=>'TextLong',
+ 'html'=>'HtmlText',
+ 'int'=>'Int',
+ 'double'=>'Float',
+ 'date'=>'Date',
+ 'datetime'=>'DateAndTime',
+ 'boolean'=>'Boolean',
+ 'price'=>'ExtrafieldPrice',
+ 'phone'=>'ExtrafieldPhone',
+ 'mail'=>'ExtrafieldMail',
+ 'url'=>'ExtrafieldUrl',
+ 'password' => 'ExtrafieldPassword',
+ 'select' => 'ExtrafieldSelect',
+ 'sellist' => 'ExtrafieldSelectList',
+ 'radio' => 'ExtrafieldRadio',
+ 'checkbox' => 'ExtrafieldCheckBox',
+ 'chkbxlst' => 'ExtrafieldCheckBoxFromList',
+ 'link' => 'ExtrafieldLink',
+ 'separate' => 'ExtrafieldSeparator',
);
@@ -131,7 +185,8 @@ class ExtraFields
function __construct($db)
{
$this->db = $db;
- $this->error = array();
+ $this->error = '';
+ $this->errors = array();
$this->attributes = array();
// For old usage
@@ -430,6 +485,7 @@ class ExtraFields
if ($result < 0)
{
$this->error=$this->db->lasterror();
+ $this->errors[]=$this->db->lasterror();
$error++;
}
@@ -450,6 +506,7 @@ class ExtraFields
if ($result < 0)
{
$this->error=$this->db->lasterror();
+ $this->errors[]=$this->db->lasterror();
$error++;
}
}
@@ -1885,7 +1942,7 @@ class ExtraFields
/**
* Fill array_options property of object by extrafields value (using for data sent by forms)
*
- * @param array $extralabels $array of extrafields (@deprecated)
+ * @param array $extralabels Deprecated $array of extrafields
* @param object $object Object
* @param string $onlykey Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
* @return int 1 if array_options set, 0 if no value, -1 if error (field required missing for example)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 647460e049c..ce5c27f3b8c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2266,7 +2266,7 @@ class Form
$objp->remise_percent = $objp2->remise_percent;
$objp->remise = $objp2->remise;
- $this->constructProductListOption($objp, $opt, $optJson, 0, $selected, $hidepriceinlabel);
+ $this->constructProductListOption($objp, $opt, $optJson, 0, $selected, $hidepriceinlabel, $filterkey);
$j++;
@@ -2293,7 +2293,7 @@ class Form
$objp->price_ttc = price2num($objp->price_ttc, 'MU');
}
}
- $this->constructProductListOption($objp, $opt, $optJson, $price_level, $selected, $hidepriceinlabel);
+ $this->constructProductListOption($objp, $opt, $optJson, $price_level, $selected, $hidepriceinlabel, $filterkey);
// Add new entry
// "key" value of json key array is used by jQuery automatically as selected value
// "label" value of json key array is used by jQuery automatically as text for combo box
@@ -2318,7 +2318,8 @@ class Form
}
/**
- * constructProductListOption
+ * constructProductListOption.
+ * This define value for &$opt and &$optJson.
*
* @param resultset $objp Resultset of fetch
* @param string $opt Option (var used for returned value in string option format)
@@ -2326,11 +2327,12 @@ class Form
* @param int $price_level Price level
* @param string $selected Preselected value
* @param int $hidepriceinlabel Hide price in label
+ * @param string $filterkey Filter key to highlight
* @return void
*/
- private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel = 0)
+ private function constructProductListOption(&$objp, &$opt, &$optJson, $price_level, $selected, $hidepriceinlabel = 0, $filterkey = '')
{
- global $langs,$conf,$user,$db;
+ global $langs, $conf, $user, $db;
$outkey='';
$outval='';
@@ -2368,7 +2370,7 @@ class Form
{
$opt.= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';
}
- if (! empty($conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock))
+ if (! empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))
{
if ($objp->stock > 0) $opt.= ' class="product_line_stock_ok"';
elseif ($objp->stock <= 0) $opt.= ' class="product_line_stock_too_low"';
@@ -2509,14 +2511,38 @@ class Form
$outtva_tx=$objp->tva_tx;
}
- if (! empty($conf->stock->enabled) && isset($objp->stock) && $objp->fk_product_type == 0)
+ if (! empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))
{
$opt.= ' - '.$langs->trans("Stock").':'.$objp->stock;
if ($objp->stock > 0) {
- $outval.= ' - '.$langs->transnoentities("Stock").':'.$objp->stock.'';
+ $outval.= ' - ';
}elseif ($objp->stock <= 0) {
- $outval.= ' - '.$langs->transnoentities("Stock").':'.$objp->stock.'';
+ $outval.= ' - ';
+ }
+ $outval.= $langs->transnoentities("Stock").':'.$objp->stock;
+ $outval.= '';
+ if (! empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) // Warning, this option may slow down combo list generation
+ {
+ $langs->load("stocks");
+
+ $tmpproduct=new Product($this->db);
+ $tmpproduct->fetch($objp->rowid);
+ $tmpproduct->load_virtual_stock();
+ $virtualstock = $tmpproduct->stock_theorique;
+
+ $opt.= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;
+
+ $outval.=' - '.$langs->transnoentities("VirtualStock").':';
+ if ($virtualstock > 0) {
+ $outval.= ' - ';
+ }elseif ($virtualstock <= 0) {
+ $outval.= ' - ';
+ }
+ $outval.=$virtualstock;
+ $outval.='';
+
+ unset($tmpproduct);
}
}
@@ -3656,6 +3682,75 @@ class Form
return $num;
}
+ /**
+ * Return a HTML select list of establishment
+ *
+ * @param string $selected Id establishment pre-selected
+ * @param string $htmlname Name of select zone
+ * @param int $statut Status of searched establishment (0=open, 1=closed, 2=both)
+ * @param string $filtre To filter list
+ * @param int $useempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+ * @param string $moreattrib To add more attribute on select
+ * @return int <0 if error, Num of establishment found if OK (0, 1, 2, ...)
+ */
+ function selectEstablishments($selected = '', $htmlname = 'entity', $statut = 0, $filtre = '', $useempty = 0, $moreattrib = '')
+ {
+ // phpcs:enable
+ global $langs, $conf;
+
+ $langs->load("admin");
+ $num = 0;
+
+ $sql = "SELECT rowid, name, fk_country, status, entity";
+ $sql.= " FROM ".MAIN_DB_PREFIX."establishment";
+ $sql.= " WHERE 1=1";
+ if ($statut != 2) $sql.= " AND status = '".$statut."'";
+ if ($filtre) $sql.=" AND ".$filtre;
+ $sql.= " ORDER BY name";
+
+ dol_syslog(get_class($this)."::select_establishment", LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if ($result)
+ {
+ $num = $this->db->num_rows($result);
+ $i = 0;
+ if ($num)
+ {
+ print '";
+ }
+ else
+ {
+ if ($statut == 0) print ''.$langs->trans("NoActiveEstablishmentDefined").'';
+ else print ''.$langs->trans("NoEstablishmentFound").'';
+ }
+ }
+ else {
+ dol_print_error($this->db);
+ }
+ }
+
/**
* Display form to select bank account
*
@@ -4729,7 +4824,7 @@ class Form
$out='';
$out.= '
";
@@ -271,7 +286,7 @@ class FormFile
* @param string $modulesubdir Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
* @param string $filedir Directory to scan
* @param string $urlsource Url of origin page (for return)
- * @param int $genallowed Generation is allowed (1/0 or array list of templates)
+ * @param int|string[] $genallowed Generation is allowed (1/0 or array list of templates)
* @param int $delallowed Remove is allowed (1/0)
* @param string $modelselected Model to preselect by default
* @param integer $allowgenifempty Allow generation even if list of template ($genallowed) is empty (show however a warning)
@@ -1202,8 +1217,6 @@ class FormFile
}
// Preview link
if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
- // Public share link
- //if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload;
print "
\n";
@@ -1280,7 +1293,7 @@ class FormFile
$fulllink=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:'');
print img_picto($langs->trans("FileSharedViaALink"), 'object_globe.png').' ';
- print '';
+ print '';
}
else
{
@@ -1551,22 +1564,14 @@ class FormFile
$id=0; $ref=''; $label='';
// To show ref or specific information according to view to show (defined by $module)
- if ($modulepart == 'company') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'invoice') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } } // $ref may be also id with old supplier invoices
- if ($modulepart == 'propal') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'supplier_proposal') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'order') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'order_supplier') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'contract') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'product') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id=(isset($reg[1])?$reg[1]:''); }
- if ($modulepart == 'project') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:'');}
- if ($modulepart == 'fichinter') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:'');}
- if ($modulepart == 'user') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id=(isset($reg[1])?$reg[1]:'');}
- if ($modulepart == 'expensereport') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:'');}
- if ($modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id=(isset($reg[1])?$reg[1]:'');}
-
+ if ($modulepart == 'company' || $modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id=(isset($reg[1])?$reg[1]:''); }
+ elseif ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:''); if (is_numeric($ref)) { $id=$ref; $ref=''; } } // $ref may be also id with old supplier invoices
+ elseif ($modulepart == 'user' || $modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id=(isset($reg[1])?$reg[1]:''); }
+ elseif (in_array($modulepart, array('invoice', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'project', 'fichinter', 'expensereport')))
+ {
+ preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref=(isset($reg[1])?$reg[1]:'');
+ }
+
if (! $id && ! $ref) continue;
$found=0;
if (! empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
@@ -1722,7 +1727,7 @@ class FormFile
print '
';
print '
';
-print_liste_field_titre(
+ print_liste_field_titre(
$langs->trans("Links"),
$_SERVER['PHP_SELF'],
"name",
@@ -1732,7 +1737,7 @@ print_liste_field_titre(
$sortfield,
$sortorder
);
-print_liste_field_titre(
+ print_liste_field_titre(
"",
"",
"",
@@ -1740,7 +1745,7 @@ print_liste_field_titre(
"",
'class="right"'
);
-print_liste_field_titre(
+ print_liste_field_titre(
$langs->trans("Date"),
$_SERVER['PHP_SELF'],
"date",
@@ -1750,7 +1755,7 @@ print_liste_field_titre(
$sortfield,
$sortorder
);
-print_liste_field_titre(
+ print_liste_field_titre(
'',
$_SERVER['PHP_SELF'],
"",
@@ -1827,7 +1832,7 @@ print_liste_field_titre(
* @param array $file Array with data of file. Example: array('name'=>...)
* @param string $modulepart propal, facture, facture_fourn, ...
* @param string $relativepath Relative path of docs
- * @param string $ruleforpicto Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)
+ * @param integer $ruleforpicto Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)
* @param string $param More param on http links
* @return string $out Output string with HTML
*/
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 752d2406ea4..1159c74dc8d 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -4,7 +4,7 @@
* Copyright (C) 2010-2011 Juanjo Menent
* Copyright (C) 2015-2017 Marcos García
* Copyright (C) 2015-2017 Nicolas ZABOURI
- * Copyright (C) 2018 Frédéric France
+ * 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
@@ -228,9 +228,9 @@ class FormMail extends Form
if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
if ($keytodelete >= 0)
{
- unset ($listofpaths[$keytodelete]);
- unset ($listofnames[$keytodelete]);
- unset ($listofmimes[$keytodelete]);
+ unset($listofpaths[$keytodelete]);
+ unset($listofnames[$keytodelete]);
+ unset($listofmimes[$keytodelete]);
$_SESSION["listofpaths".$keytoavoidconflict]=join(';', $listofpaths);
$_SESSION["listofnames".$keytoavoidconflict]=join(';', $listofnames);
$_SESSION["listofmimes".$keytoavoidconflict]=join(';', $listofmimes);
@@ -455,7 +455,7 @@ class FormMail extends Form
}
if (! empty($this->withsubstit)) // Unset or set ->withsubstit=0 to disable this.
{
- $out.= '
';
+ $out.= '
';
//$out.='
';
if (is_numeric($this->withsubstit)) $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // Old usage
else $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $helpforsubstitution, 1, 'help', '', 0, 2, 'substittooltip'); // New usage
@@ -1140,7 +1140,7 @@ class FormMail extends Form
* @param int $id Id of template to find, or -1 for first found with position 0, or 0 for first found whatever is position (priority order depends on lang provided or not) or -2 for exact match with label (no answer if not found)
* @param int $active 1=Only active template, 0=Only disabled, -1=All
* @param string $label Label of template
- * @return ModelMail One instance of ModelMail
+ * @return ModelMail|integer One instance of ModelMail or -1 if error
*/
public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')
{
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index cce12ae5f8b..5aecb6efc71 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -223,16 +223,16 @@ class FormMargin
print '
';
print '
';
print '
'.$langs->trans('Margins').'
';
- print '
'.$langs->trans('SellingPrice').'
';
+ print '
'.$langs->trans('SellingPrice').'
';
if ($conf->global->MARGIN_TYPE == "1")
- print '
'.$langs->trans('BuyingPrice').'
';
+ print '
'.$langs->trans('BuyingPrice').'
';
else
- print '
'.$langs->trans('CostPrice').'
';
- print '
'.$langs->trans('Margin').'
';
+ print '
'.$langs->trans('CostPrice').'
';
+ print '
'.$langs->trans('Margin').'
';
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print '
'.$langs->trans('MarginRate').'
';
+ print '
'.$langs->trans('MarginRate').'
';
if (! empty($conf->global->DISPLAY_MARK_RATES))
- print '
';
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 4b03886a714..cdbf35dc32b 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1,6 +1,7 @@
- * Copyright (C) 2016 Christophe Battarel
+/* Copyright (C) 2013-2015 Jean-François FERRY
+ * Copyright (C) 2016 Christophe Battarel
+ * 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
@@ -291,17 +292,17 @@ class FormTicket
// Type
print '
';
// Notify thirdparty at creation
@@ -532,7 +533,7 @@ class FormTicket
* @param string $morecss More CSS
* @return void
*/
- public function selectAnalyticCodesTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
+ public function selectGroupTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
{
global $langs, $user;
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index f59ad79c430..695464f536f 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -655,7 +655,7 @@ class SMTPs
$_retVal = true;
// if we have a path...
- if ( ! empty ($_strConfigPath) )
+ if ( ! empty($_strConfigPath) )
{
// If the path is not valid, this will NOT generate an error,
// it will simply return false.
@@ -989,7 +989,7 @@ class SMTPs
$aryHost = $this->_msgRecipients;
// Only run this if we have something
- if ( !empty ($_addrList))
+ if ( !empty($_addrList))
{
// $_addrList can be a STRING or an array
if ( is_string($_addrList) )
@@ -1409,7 +1409,7 @@ class SMTPs
// If we have ZERO, we have a problem
if( $keyCount === 0 )
- die ("Sorry, no content");
+ die("Sorry, no content");
// If we have ONE, we can use the simple format
elseif( $keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
index f7df05acdde..81f536f5228 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
@@ -101,7 +101,7 @@ oListManager.GetFileRowHtml = function( fileName, fileUrl, fileSize )
sLink +
fileName +
'<\/a>' +
- '<\/td>
';
// Author of event
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d94862cf842..1f120efcd60 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2981,7 +2981,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
if (empty($srconly) && in_array($pictowithoutext, array(
'bank', 'close_title', 'delete', 'edit', 'ellipsis-h', 'filter', 'grip', 'grip_title', 'list', 'listlight', 'off', 'on', 'play', 'playdisabled', 'printer', 'resize',
'note', 'sign-out', 'split', 'switch_off', 'switch_on', 'unlink', 'uparrow', '1downarrow', '1uparrow',
- 'jabber','skype','twitter','facebook'
+ 'jabber','skype','twitter','facebook','linkedin'
)
)) {
$fa='fa';
@@ -3081,7 +3081,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
elseif ($pictowithoutext == 'jabber') {
$fakey = 'fa-comment-o';
}
- elseif ($pictowithoutext == 'skype') {
+ elseif (in_array($pictowithoutext, array('skype', 'twitter', 'facebook', 'linkedin'))) {
$fakey = 'fa-'.$pictowithoutext;
if (! empty($conf->global->MAIN_USE_FONT_AWESOME_5)) $fa = 'fab';
}
@@ -6610,12 +6610,12 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
$temp = array();
foreach(array_keys($array) as $key) $temp[$key]=$array[$key][$index];
- if (!$natsort) ($order=='asc') ? asort($temp) : arsort($temp);
- else
- {
- ($case_sensitive) ? natsort($temp) : natcasesort($temp);
- if($order!='asc') $temp=array_reverse($temp, true);
- }
+ if (! $natsort) {
+ ($order=='asc') ? asort($temp) : arsort($temp);
+ } else {
+ ($case_sensitive) ? natsort($temp) : natcasesort($temp);
+ if($order!='asc') $temp=array_reverse($temp, true);
+ }
$sorted = array();
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 61dae6d0a5c..dd557fa0a51 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -2017,30 +2017,30 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
/**
* Get an array with properties of an element
*
- * @param string $element_type Element type: 'action', 'facture', 'project_task' or 'object@modulext'...
- * @return array (module, classpath, element, subelement, classfile, classname)
+ * @param string $element_type Element type: 'action', 'facture', 'project_task' or 'object@modulext'...
+ * @return array (module, classpath, element, subelement, classfile, classname)
*/
function getElementProperties($element_type)
{
// Parse element/subelement (ex: project_task)
- $module = $element = $subelement = $element_type;
+ $module = $element_type;
+ $element = $element_type;
+ $subelement = $element_type;
// If we ask an resource form external module (instead of default path)
- if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs))
- {
+ if (preg_match('/^([^@]+)@([^@]+)$/i', $element_type, $regs)) {
$element = $subelement = $regs[1];
- $module = $regs[2];
+ $module = $regs[2];
}
//print ' 1. element : '.$element.' - module : '.$module .' ';
- if ( preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
- {
+ if ( preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {
$module = $element = $regs[1];
$subelement = $regs[2];
}
// For compat
- if($element_type == "action") {
+ if ($element_type == "action") {
$classpath = 'comm/action/class';
$subelement = 'Actioncomm';
$module = 'agenda';
@@ -2049,13 +2049,13 @@ function getElementProperties($element_type)
// To work with non standard path
if ($element_type == 'facture' || $element_type == 'invoice') {
$classpath = 'compta/facture/class';
- $module='facture';
- $subelement='facture';
+ $module ='facture';
+ $subelement = 'facture';
}
if ($element_type == 'commande' || $element_type == 'order') {
$classpath = 'commande/class';
- $module='commande';
- $subelement='commande';
+ $module = 'commande';
+ $subelement = 'commande';
}
if ($element_type == 'propal') {
$classpath = 'comm/propal/class';
@@ -2142,8 +2142,7 @@ function getElementProperties($element_type)
*/
function fetchObjectByElement($element_id, $element_type, $element_ref = '')
{
- global $conf;
- global $db,$conf;
+ global $conf, $db;
$element_prop = getElementProperties($element_type);
if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)
@@ -2359,6 +2358,9 @@ function getModuleDirForApiClass($module)
elseif ($module == 'adherent' || $module == 'members' || $module == 'memberstypes' || $module == 'subscriptions') {
$moduledirforclass = 'adherents';
}
+ elseif ($module == 'don' || $module == 'donations') {
+ $moduledirforclass = 'don';
+ }
elseif ($module == 'banque' || $module == 'bankaccounts') {
$moduledirforclass = 'compta/bank';
}
@@ -2369,7 +2371,7 @@ function getModuleDirForApiClass($module)
$moduledirforclass = 'commande';
}
elseif ($module == 'shipments') {
- $moduledirforclass = 'expedition';
+ $moduledirforclass = 'expedition';
}
elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') {
$moduledirforclass = 'compta/facture';
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 7f4d44f73f6..6481604ff64 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -38,10 +38,10 @@ function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
global $conf;
$num = str_replace(array(',', ' '), '', trim($num));
- if(! $num) {
+ if (! $num) {
return false;
}
- if($centimes && strlen($num) == 1) {
+ if ($centimes && strlen($num) == 1) {
$num = $num*10;
}
$TNum = explode('.', $num);
@@ -151,7 +151,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
if ($numero >= 1000000000001)
return -1;
// Get 2 decimals to cents, another functions round or truncate
- $strnumber = number_format ($numero, 10);
+ $strnumber = number_format($numero, 10);
$len=strlen($strnumber);
for ($i=0; $i<$len; $i++)
{
@@ -187,7 +187,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
$numero = $numero - $DdMMillon * 10000000000;
$UdMMillon = (int) ($numero / 1000000000);
$numero = $numero - $UdMMillon * 1000000000;
- $entexto .= hundreds2text ($CdMMillon, $DdMMillon, $UdMMillon);
+ $entexto .= hundreds2text($CdMMillon, $DdMMillon, $UdMMillon);
$entexto .= " MIL ";
}
if ($number >= 1000000){
@@ -197,7 +197,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
$numero = $numero - $DdMILLON * 10000000;
$udMILLON = (int) ($numero / 1000000);
$numero = $numero - $udMILLON * 1000000;
- $entexto .= hundreds2text ($CdMILLON, $DdMILLON, $udMILLON);
+ $entexto .= hundreds2text($CdMILLON, $DdMILLON, $udMILLON);
if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON==1)
$entexto .= " MILLÓN ";
else
@@ -210,7 +210,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
$numero = $numero - $ddm * 10000;
$udm = (int) ($numero / 1000);
$numero = $numero - $udm * 1000;
- $entexto .= hundreds2text ($cdm, $ddm, $udm);
+ $entexto .= hundreds2text($cdm, $ddm, $udm);
if ($cdm || $ddm || $udm)
$entexto .= " MIL ";
}
@@ -218,7 +218,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
$numero = $numero - $c * 100;
$d = (int) ($numero / 10);
$u = (int) $numero - $d * 10;
- $entexto .= hundreds2text ($c, $d, $u);
+ $entexto .= hundreds2text($c, $d, $u);
if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number>1000000)
$entexto .= " DE";
$entexto .= " PESOS ".$parte_decimal." / 100 M.N.";
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 69da66fa99c..9a78e7a3dbf 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -78,6 +78,11 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
curl_setopt($ch, CURLOPT_POST, 1); // POST
curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // Setting param x=a&y=z as POST fields
}
+ elseif ($postorget == 'POSTALREADYFORMATED')
+ {
+ curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); // HTTP request is 'POST' but param string is taken as it is
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $param); // param = content of post, like a xml string
+ }
elseif ($postorget == 'PUT')
{
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index b5c0ee813c9..fd51506bd01 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -257,7 +257,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2462__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_expensereport', 2451__+MAX_llx_menu__, '/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuExpenseReportAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 54, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2463__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product', 2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 55, __ENTITY__);
- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export', 2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
+ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export', 2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
+ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2465__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure', 2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
-- Accounting period
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
-- Binding
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 1c20a019eae..2e15586b4cd 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -143,6 +143,25 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
$menu->add('/product/index.php?mainmenu=products&leftmenu=', $chaine, 0, $showmode, $atarget, "products", '', 30, $id, $idsel, $classname);
}
+ // MRP
+ $tmpentry = array(
+ 'enabled'=>(! empty($conf->bom->enabled) || ! empty($conf->mrp->enabled)),
+ 'perms'=>(! empty($user->rights->bom->read) || ! empty($user->rights->mrp->read)),
+ 'module'=>'bom|mrp',
+ );
+ $showmode=isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
+ if ($showmode)
+ {
+ $classname="";
+ if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
+ else $classname = 'class="tmenu"';
+ $idsel='products';
+
+ $chaine=$langs->trans("TMenuMRP");
+
+ $menu->add('/bom/bom_list.php?mainmenu=mrp&leftmenu=', $chaine, 0, $showmode, $atarget, "bom", '', 30, $id, $idsel, $classname);
+ }
+
// Projects
$tmpentry=array('enabled'=>(! empty($conf->projet->enabled)),
'perms'=>(! empty($user->rights->projet->lire)),
@@ -1058,6 +1077,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
}
$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 55);
$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);
+ $newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_closure', 70);
// Fiscal year
if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
@@ -1443,6 +1463,20 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
}
}
+ /*
+ * Menu PRODUCTS-SERVICES MRP
+ */
+ if ($mainmenu == 'mrp')
+ {
+ // BOM
+ if (! empty($conf->bom->enabled) || ! empty($conf->mrp->enabled))
+ {
+ $newmenu->add("", $langs->trans("BOM"), 0, $user->rights->service->lire, '', $mainmenu, 'service');
+ $newmenu->add("/bom/bom_card.php?leftmenu=bom&action=create", $langs->trans("NewBom"), 1, $user->rights->bom->write);
+ $newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read);
+ }
+ }
+
/*
* Menu PROJECTS
*/
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index a1a7d13a5ed..98f86e9a596 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -36,14 +36,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
class pdf_ban extends ModeleBankAccountDoc
{
/**
- * Issuer
- * @var Societe
+ * @var Societe Issuer
*/
public $emetteur;
/**
- * Dolibarr version of the loaded document
- * @public string
+ * @var string Dolibarr version of the loaded document
*/
public $version = 'development';
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 4196022b854..14f3c1fc862 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -53,8 +53,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
public $phpmin = array(5, 4);
/**
- * Dolibarr version of the loaded document
- * @public string
+ * @var string Dolibarr version of the loaded document
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 74ab8b04fc9..1f77537ceb5 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -45,14 +45,14 @@ class doc_generic_contract_odt extends ModelePDFContract
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
- */
+ */
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index 2fa786f096e..558ffe44e0a 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -47,14 +47,14 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
- */
+ */
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 615b44b81bf..03ebe71e88d 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -61,14 +61,14 @@ class pdf_standard extends ModeleExpenseReport
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 136f75f56cf..c5405d9c3a9 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -46,14 +46,14 @@ class doc_generic_invoice_odt extends ModelePDFFactures
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index d11c24bd6c2..3eb5905ccd2 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -69,14 +69,14 @@ class pdf_crabe extends ModelePDFFactures
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 9dde0a49566..174f34bfb4b 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -76,7 +76,7 @@ class pdf_sponge extends ModelePDFFactures
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'development';
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index e2c27fd293c..91a4ff6d332 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -59,14 +59,14 @@ class pdf_soleil extends ModelePDFFicheinter
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index b34c5ae87ab..e8e5a6f9205 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -60,14 +60,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index d170675aa81..fc2c173d90c 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -418,6 +418,6 @@ class modAgenda extends DolibarrModules
$this->export_sql_end[$r] .=' WHERE ac.entity IN ('.getEntity('agenda').')';
if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)';
if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id);
- $this->export_sql_end[$r] .=' ORDER BY ac.datep';
+ $this->export_sql_order[$r] .=' ORDER BY ac.datep';
}
}
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
new file mode 100644
index 00000000000..d9b27b729e3
--- /dev/null
+++ b/htdocs/core/modules/modBom.class.php
@@ -0,0 +1,374 @@
+
+ * Copyright (C) 2018 Nicolas ZABOURI
+ * Copyright (C) 2019 Maxime Kohlhaas
+ *
+ * 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 .
+ */
+
+/**
+ * \defgroup bom Module Bom
+ * \brief Bom module descriptor.
+ *
+ * \file htdocs/bom/core/modules/modBom.class.php
+ * \ingroup bom
+ * \brief Description and activation file for module Bom
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ * Description and activation class for module Bom
+ */
+class modBom extends DolibarrModules
+{
+ /**
+ * Constructor. Define names, constants, directories, boxes, permissions
+ *
+ * @param DoliDB $db Database handler
+ */
+ public function __construct($db)
+ {
+ global $langs,$conf;
+
+ $this->db = $db;
+
+ // Id for module (must be unique).
+ // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+ $this->numero = 650; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve id number for your module
+ // Key text used to identify module (for permissions, menus, etc...)
+ $this->rights_class = 'bom';
+
+ // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+ // It is used to group modules by family in module setup page
+ $this->family = "products";
+ // Module position in the family on 2 digits ('01', '10', '20', ...)
+ $this->module_position = '90';
+ // Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+ //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+
+ // Module label (no space allowed), used if translation string 'ModuleBomName' not found (Bom is name of module).
+ $this->name = preg_replace('/^mod/i', '', get_class($this));
+ // Module description, used if translation string 'ModuleBomDesc' not found (Bom is name of module).
+ $this->description = "Bill of Materials (BOM) definitions for Manufacturing Resource Planning";
+ // Used only if file README.md and README-LL.md not found.
+ $this->descriptionlong = "Bill of Materials definitions. They can be used to make Manufacturing Resource Planning";
+
+ // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+ $this->version = 'experimental';
+
+ //Url to the file with your last numberversion of this module
+ //$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+ // Key used in llx_const table to save module status enabled/disabled (where BILLOFMATERIALS is value of property name of module in uppercase)
+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+ // Name of image file used for this module.
+ // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+ // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+ $this->picto='generic';
+
+ // Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+ $this->module_parts = array(
+ /*
+ 'triggers' => 1, // Set this to 1 if module has its own trigger directory (core/triggers)
+ 'login' => 0, // Set this to 1 if module has its own login method file (core/login)
+ 'substitutions' => 1, // Set this to 1 if module has its own substitution function file (core/substitutions)
+ 'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus)
+ 'theme' => 0, // Set this to 1 if module has its own theme directory (theme)
+ 'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
+ 'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode)
+ 'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx)
+ 'css' => array('/bom/css/bom.css.php'), // Set this to relative path of css file if module has its own css file
+ 'js' => array('/bom/js/bom.js.php'), // Set this to relative path of js file if module must load a js on all pages
+ 'hooks' => array('data'=>array('hookcontext1','hookcontext2'), 'entity'=>'0'), // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
+ 'moduleforexternal' => 0 // Set this to 1 if feature of module are opened to external users
+ */
+ );
+
+ // Data directories to create when module is enabled.
+ // Example: this->dirs = array("/bom/temp","/bom/subdir");
+ $this->dirs = array("/bom/temp");
+
+ // Config pages. Put here list of php page, stored into bom/admin directory, to use to setup module.
+ $this->config_page_url = array("setup.php@bom");
+
+ // Dependencies
+ $this->hidden = false; // A condition to hide module
+ $this->depends = array('modProduct'); // List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+ $this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+ $this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+ $this->langfiles = array("bom@bom");
+ //$this->phpmin = array(5,4); // Minimum version of PHP required by module
+ $this->need_dolibarr_version = array(9,0); // Minimum version of Dolibarr required by module
+ $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+ $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+ //$this->automatic_activation = array('FR'=>'BomWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+ //$this->always_enabled = true; // If true, can't be disabled
+
+ // Constants
+ // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+ // Example: $this->const=array(0=>array('BILLOFMATERIALS_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+ // 1=>array('BILLOFMATERIALS_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+ // );
+ $this->const = array(
+ //1=>array('BILLOFMATERIALS_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+ );
+
+ // Some keys to add into the overwriting translation tables
+ /*$this->overwrite_translation = array(
+ 'en_US:ParentCompany'=>'Parent company or reseller',
+ 'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
+ )*/
+
+ if (! isset($conf->bom) || ! isset($conf->bom->enabled))
+ {
+ $conf->bom=new stdClass();
+ $conf->bom->enabled=0;
+ }
+
+
+ // Array to add new pages in new tabs
+ $this->tabs = array();
+ // Example:
+ // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@bom:$user->rights->bom->read:/bom/mynewtab1.php?id=__ID__'); // To add a new tab identified by code tabname1
+ // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@bom:$user->rights->othermodule->read:/bom/mynewtab2.php?id=__ID__', // To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+ // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove'); // To remove an existing tab identified by code tabname
+ //
+ // Where objecttype can be
+ // 'categories_x' to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+ // 'contact' to add a tab in contact view
+ // 'contract' to add a tab in contract view
+ // 'group' to add a tab in group view
+ // 'intervention' to add a tab in intervention view
+ // 'invoice' to add a tab in customer invoice view
+ // 'invoice_supplier' to add a tab in supplier invoice view
+ // 'member' to add a tab in fundation member view
+ // 'opensurveypoll' to add a tab in opensurvey poll view
+ // 'order' to add a tab in customer order view
+ // 'order_supplier' to add a tab in supplier order view
+ // 'payment' to add a tab in payment view
+ // 'payment_supplier' to add a tab in supplier payment view
+ // 'product' to add a tab in product view
+ // 'propal' to add a tab in propal view
+ // 'project' to add a tab in project view
+ // 'stock' to add a tab in stock view
+ // 'thirdparty' to add a tab in third party view
+ // 'user' to add a tab in user view
+
+
+ // Dictionaries
+ $this->dictionaries=array();
+ /* Example:
+ $this->dictionaries=array(
+ 'langs'=>'mylangfile@bom',
+ 'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"), // List of tables we want to see into dictonnary editor
+ 'tablib'=>array("Table1","Table2","Table3"), // Label of tables
+ 'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'), // Request to select fields
+ 'tabsqlsort'=>array("label ASC","label ASC","label ASC"), // Sort order
+ 'tabfield'=>array("code,label","code,label","code,label"), // List of fields (result of select to show dictionary)
+ 'tabfieldvalue'=>array("code,label","code,label","code,label"), // List of fields (list of fields to edit a record)
+ 'tabfieldinsert'=>array("code,label","code,label","code,label"), // List of fields (list of fields for insert)
+ 'tabrowid'=>array("rowid","rowid","rowid"), // Name of columns with primary key (try to always name it 'rowid')
+ 'tabcond'=>array($conf->bom->enabled,$conf->bom->enabled,$conf->bom->enabled) // Condition to show each dictionary
+ );
+ */
+
+
+ // Boxes/Widgets
+ // Add here list of php file(s) stored in bom/core/boxes that contains class to show a widget.
+ $this->boxes = array(
+ //0=>array('file'=>'bomwidget1.php@bom','note'=>'Widget provided by Bom','enabledbydefaulton'=>'Home'),
+ //1=>array('file'=>'bomwidget2.php@bom','note'=>'Widget provided by Bom'),
+ //2=>array('file'=>'bomwidget3.php@bom','note'=>'Widget provided by Bom')
+ );
+
+
+ // Cronjobs (List of cron jobs entries to add when module is enabled)
+ // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+ $this->cronjobs = array(
+ //0=>array('label'=>'MyJob label', 'jobtype'=>'method', 'class'=>'/bom/class/bom.class.php', 'objectname'=>'Bom', 'method'=>'doScheduledJob', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->bom->enabled', 'priority'=>50)
+ );
+ // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->bom->enabled', 'priority'=>50),
+ // 1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->bom->enabled', 'priority'=>50)
+ // );
+
+
+ // Permissions
+ $this->rights = array(); // Permission array used by this module
+
+ $r=0;
+ $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+ $this->rights[$r][1] = 'Read bom of Bom'; // Permission label
+ $this->rights[$r][3] = 1; // Permission by default for new user (0/1)
+ $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->bom->level1->level2)
+ $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->bom->level1->level2)
+
+ $r++;
+ $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+ $this->rights[$r][1] = 'Create/Update bom of Bom'; // Permission label
+ $this->rights[$r][3] = 1; // Permission by default for new user (0/1)
+ $this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->bom->level1->level2)
+ $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->bom->level1->level2)
+
+ $r++;
+ $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+ $this->rights[$r][1] = 'Delete bom of Bom'; // Permission label
+ $this->rights[$r][3] = 1; // Permission by default for new user (0/1)
+ $this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->bom->level1->level2)
+ $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->bom->level1->level2)
+
+
+ // Main menu entries
+ $this->menu = array(); // List of menus to add
+ $r=0;
+
+ // Add here entries to declare new menus
+
+ /* BEGIN MODULEBUILDER TOPMENU */
+ /*$this->menu[$r++]=array('fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ 'type'=>'top', // This is a Top menu entry
+ 'titre'=>'Bom',
+ 'mainmenu'=>'bom',
+ 'leftmenu'=>'',
+ 'url'=>'/bom/bom_list.php',
+ 'langs'=>'bom@bom', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'position'=>1000+$r,
+ 'enabled'=>'$conf->bom->enabled', // Define condition to show or hide menu entry. Use '$conf->bom->enabled' if entry must be visible if module is enabled.
+ 'perms'=>'1', // Use 'perms'=>'$user->rights->bom->level1->level2' if you want your menu with a permission rules
+ 'target'=>'',
+ 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+ */
+ /* END MODULEBUILDER TOPMENU */
+
+ /* BEGIN MODULEBUILDER LEFTMENU BILLOFMATERIALS
+ $this->menu[$r++]=array( 'fk_menu'=>'fk_mainmenu=bom', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ 'type'=>'left', // This is a Left menu entry
+ 'titre'=>'List Bom',
+ 'mainmenu'=>'bom',
+ 'leftmenu'=>'bom_bom_list',
+ 'url'=>'/bom/bom_list.php',
+ 'langs'=>'bom@bom', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'position'=>1000+$r,
+ 'enabled'=>'$conf->bom->enabled', // Define condition to show or hide menu entry. Use '$conf->bom->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+ 'perms'=>'1', // Use 'perms'=>'$user->rights->bom->level1->level2' if you want your menu with a permission rules
+ 'target'=>'',
+ 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+ $this->menu[$r++]=array( 'fk_menu'=>'fk_mainmenu=bom,fk_leftmenu=bom', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ 'type'=>'left', // This is a Left menu entry
+ 'titre'=>'New Bom',
+ 'mainmenu'=>'bom',
+ 'leftmenu'=>'bom_bom_new',
+ 'url'=>'/bom/bom_page.php?action=create',
+ 'langs'=>'bom@bom', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'position'=>1000+$r,
+ 'enabled'=>'$conf->bom->enabled', // Define condition to show or hide menu entry. Use '$conf->bom->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+ 'perms'=>'1', // Use 'perms'=>'$user->rights->bom->level1->level2' if you want your menu with a permission rules
+ 'target'=>'',
+ 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+ */
+ /*
+ $this->menu[$r++]=array(
+ 'fk_menu'=>'fk_mainmenu=bom', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ 'type'=>'left', // This is a Left menu entry
+ 'titre'=>'List Bom',
+ 'mainmenu'=>'bom',
+ 'leftmenu'=>'bom_bom',
+ 'url'=>'/bom/bom_list.php',
+ 'langs'=>'bom@bom', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'position'=>1100+$r,
+ 'enabled'=>'$conf->bom->enabled', // Define condition to show or hide menu entry. Use '$conf->bom->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+ 'perms'=>'1', // Use 'perms'=>'$user->rights->bom->level1->level2' if you want your menu with a permission rules
+ 'target'=>'',
+ 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+ $this->menu[$r++]=array(
+ 'fk_menu'=>'fk_mainmenu=bom,fk_leftmenu=bom_bom', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ 'type'=>'left', // This is a Left menu entry
+ 'titre'=>'New Bom',
+ 'mainmenu'=>'bom',
+ 'leftmenu'=>'bom_bom',
+ 'url'=>'/bom/bom_card.php?action=create',
+ 'langs'=>'bom@bom', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'position'=>1100+$r,
+ 'enabled'=>'$conf->bom->enabled', // Define condition to show or hide menu entry. Use '$conf->bom->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+ 'perms'=>'1', // Use 'perms'=>'$user->rights->bom->level1->level2' if you want your menu with a permission rules
+ 'target'=>'',
+ 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+ */
+ /* END MODULEBUILDER LEFTMENU BILLOFMATERIALS */
+
+
+ // Exports
+ $r=1;
+
+ /* BEGIN MODULEBUILDER EXPORT BILLOFMATERIALS */
+ /*
+ $langs->load("bom@bom");
+ $this->export_code[$r]=$this->rights_class.'_'.$r;
+ $this->export_label[$r]='BomLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+ $this->export_icon[$r]='bom@bom';
+ $keyforclass = 'Bom'; $keyforclassfile='/mymobule/class/bom.class.php'; $keyforelement='bom';
+ include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+ $keyforselect='bom'; $keyforaliasextra='extra'; $keyforelement='bom';
+ include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+ //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+ $this->export_sql_start[$r]='SELECT DISTINCT ';
+ $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'bom as t';
+ $this->export_sql_end[$r] .=' WHERE 1 = 1';
+ $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('bom').')';
+ $r++; */
+ /* END MODULEBUILDER EXPORT BILLOFMATERIALS */
+ }
+
+ /**
+ * Function called when module is enabled.
+ * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+ * It also creates data directories
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ public function init($options = '')
+ {
+ $result=$this->_load_tables('/bom/sql/');
+ if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+
+ // Create extrafields
+ include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+ $extrafields = new ExtraFields($this->db);
+
+ //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1, 3, 'thirdparty', 0, 0, '', '', 1, '', 0, 0, '', '', 'bom@bom', '$conf->bom->enabled');
+ //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project', 0, 0, '', '', 1, '', 0, 0, '', '', 'bom@bom', '$conf->bom->enabled');
+ //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'bom@bom', '$conf->bom->enabled');
+ //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select', 1, 3, 'thirdparty', 0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'bom@bom', '$conf->bom->enabled');
+ //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text', 1, 10, 'user', 0, 0, '', '', 1, '', 0, 0, '', '', 'bom@bom', '$conf->bom->enabled');
+
+ $sql = array();
+
+ return $this->_init($sql, $options);
+ }
+
+ /**
+ * Function called when module is disabled.
+ * Remove from database constants, boxes and permissions from Dolibarr database.
+ * Data directories are not deleted
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ public function remove($options = '')
+ {
+ $sql = array();
+
+ return $this->_remove($sql, $options);
+ }
+}
diff --git a/htdocs/core/modules/modIFTTT.class.php b/htdocs/core/modules/modIFTTT.class.php
new file mode 100644
index 00000000000..55739978715
--- /dev/null
+++ b/htdocs/core/modules/modIFTTT.class.php
@@ -0,0 +1,251 @@
+
+ *
+ * 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 .
+ */
+
+/**
+ * \defgroup ifttt Module IFTTT
+ * \brief Descriptor file for IFTTT module
+ * \file htdocs/core/modules/modIFTTT.class.php
+ * \ingroup ifttt
+ * \brief Description and activation file for module IFTTT
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ * Description and activation class for module IFTTT
+ */
+class modIFTTT extends DolibarrModules
+{
+ /**
+ * Constructor. Define names, constants, directories, boxes, permissions
+ *
+ * @param DoliDB $db Database handler
+ */
+ function __construct($db)
+ {
+ global $langs,$conf;
+
+ $this->db = $db;
+
+ // Id for module (must be unique).
+ // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+ $this->numero = 2620;
+ // Key text used to identify module (for permissions, menus, etc...)
+ $this->rights_class = 'ifttt';
+
+ // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+ // It is used to group modules in module setup page
+ $this->family = "interface";
+ // 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));
+ // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+ $this->description = "IFTTT interface";
+ // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+ $this->version = 'development';
+ // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+ $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+ // Can be enabled / disabled only in the main company with superadmin account
+ $this->core_enabled = 1;
+ // Name of image file used for this module.
+ // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+ // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+ $this->picto='technic';
+
+ $this->module_parts = array();
+
+ // Data directories to create when module is enabled.
+ // Example: this->dirs = array("/api/temp");
+ $this->dirs = array();
+
+ // Config pages. Put here list of php page, stored into api/admin directory, to use to setup module.
+ $this->config_page_url = array("index.php@ifttt");
+
+ // Dependencies
+ $this->hidden = false; // A condition to hide module
+ $this->depends = array(); // List of modules id that must be enabled if this module is enabled
+ $this->requiredby = array(); // List of modules id to disable if this one is disabled
+ $this->conflictwith = array(); // List of modules id this module is in conflict with
+ $this->phpmin = array(5,4); // Minimum version of PHP required by module
+ $this->langfiles = array("other");
+
+ // Constants
+ // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+ // Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+ // 1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+ // );
+ $this->const = array();
+
+ // Array to add new pages in new tabs
+ // Example: $this->tabs = array('objecttype:+tabname1:Title1:mylangfile@api:$user->rights->ifttt->read:/api/mynewtab1.php?id=__ID__', // To add a new tab identified by code tabname1
+ // 'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@api:$user->rights->othermodule->read:/api/mynewtab2.php?id=__ID__', // To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+ // 'objecttype:-tabname:NU:conditiontoremove'); // To remove an existing tab identified by code tabname
+ // where objecttype can be
+ // 'categories_x' to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+ // 'contact' to add a tab in contact view
+ // 'contract' to add a tab in contract view
+ // 'group' to add a tab in group view
+ // 'intervention' to add a tab in intervention view
+ // 'invoice' to add a tab in customer invoice view
+ // 'invoice_supplier' to add a tab in supplier invoice view
+ // 'member' to add a tab in fundation member view
+ // 'opensurveypoll' to add a tab in opensurvey poll view
+ // 'order' to add a tab in customer order view
+ // 'order_supplier' to add a tab in supplier order view
+ // 'payment' to add a tab in payment view
+ // 'payment_supplier' to add a tab in supplier payment view
+ // 'product' to add a tab in product view
+ // 'propal' to add a tab in propal view
+ // 'project' to add a tab in project view
+ // 'stock' to add a tab in stock view
+ // 'thirdparty' to add a tab in third party view
+ // 'user' to add a tab in user view
+ $this->tabs = array();
+
+ // Dictionaries
+ if (! isset($conf->ifttt->enabled))
+ {
+ $conf->ifttt=new stdClass();
+ $conf->ifttt->enabled=0;
+ }
+ $this->dictionaries=array();
+
+ // Boxes
+ // Add here list of php file(s) stored in core/boxes that contains class to show a box.
+ $this->boxes = array(); // List of boxes
+ // Example:
+ //$this->boxes=array(array(0=>array('file'=>'myboxa.php','note'=>'','enabledbydefaulton'=>'Home'),1=>array('file'=>'myboxb.php','note'=>''),2=>array('file'=>'myboxc.php','note'=>'')););
+
+ // Permissions
+ $this->rights = array(); // Permission array used by this module
+ $r=0;
+
+ // Add here list of permission defined by an id, a label, a boolean and two constant strings.
+ // Example:
+ // $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+ // $this->rights[$r][1] = 'Permision label'; // Permission label
+ // $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+ // $this->rights[$r][4] = 'level1'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+ // $this->rights[$r][5] = 'level2'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+ // $r++;
+
+
+ // Main menu entries
+ $this->menu = array(); // List of menus to add
+ $r=0;
+
+ // Add here entries to declare new menus
+ //
+ // Example to declare a new Top Menu entry and its Left menu entry:
+ // $this->menu[$r]=array( 'fk_menu'=>0, // Put 0 if this is a top menu
+ // 'type'=>'top', // This is a Top menu entry
+ // 'titre'=>'Api top menu',
+ // 'mainmenu'=>'api',
+ // 'leftmenu'=>'api',
+ // 'url'=>'/api/pagetop.php',
+ // 'langs'=>'mylangfile@api', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ // 'position'=>100,
+ // 'enabled'=>'$conf->ifttt->enabled', // Define condition to show or hide menu entry. Use '$conf->ifttt->enabled' if entry must be visible if module is enabled.
+ // 'perms'=>'1', // Use 'perms'=>'$user->rights->ifttt->level1->level2' if you want your menu with a permission rules
+ // 'target'=>'',
+ // 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+ // $r++;
+ //
+ // Example to declare a Left Menu entry into an existing Top menu entry:
+ // $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=xxx', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ // 'type'=>'left', // This is a Left menu entry
+ // 'titre'=>'Api left menu',
+ // 'mainmenu'=>'xxx',
+ // 'leftmenu'=>'api',
+ // 'url'=>'/api/pagelevel2.php',
+ // 'langs'=>'mylangfile@api', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ // 'position'=>100,
+ // 'enabled'=>'$conf->ifttt->enabled', // Define condition to show or hide menu entry. Use '$conf->ifttt->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+ // 'perms'=>'1', // Use 'perms'=>'$user->rights->ifttt->level1->level2' if you want your menu with a permission rules
+ // 'target'=>'',
+ // 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+ // $r++;
+
+
+ // Exports
+ $r=1;
+
+ // Example:
+ // $this->export_code[$r]=$this->rights_class.'_'.$r;
+ // $this->export_label[$r]='CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+ // $this->export_enabled[$r]='1'; // Condition to show export in list (ie: '$user->id==3'). Set to 1 to always show when module is enabled.
+ // $this->export_permission[$r]=array(array("facture","facture","export"));
+ // $this->export_fields_array[$r]=array(
+ // 's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone',
+ // 's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode',
+ // 's.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.datec'=>"InvoiceDateCreation",
+ // 'f.datef'=>"DateInvoice",'f.total'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus',
+ // 'f.note'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.price'=>"LineUnitPrice",'fd.tva_tx'=>"LineVATRate",
+ // 'fd.qty'=>"LineQty",'fd.total_ht'=>"LineTotalHT",'fd.total_tva'=>"LineTotalTVA",'fd.total_ttc'=>"LineTotalTTC",'fd.date_start'=>"DateStart",
+ // 'fd.date_end'=>"DateEnd",'fd.fk_product'=>'ProductId','p.ref'=>'ProductRef'
+ //);
+ // $this->export_entities_array[$r]=array(
+ // 's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company',
+ // 's.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company',
+ // 'f.rowid'=>"invoice",'f.ref'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total'=>"invoice",'f.total_ttc'=>"invoice",'f.tva'=>"invoice",
+ // 'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.price'=>"invoice_line",
+ // 'fd.total_ht'=>"invoice_line",'fd.total_tva'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",
+ // 'fd.date_start'=>"invoice_line",'fd.date_end'=>"invoice_line",'fd.fk_product'=>'product','p.ref'=>'product'
+ //);
+ // $this->export_sql_start[$r]='SELECT DISTINCT ';
+ // $this->export_sql_end[$r] =' FROM ('.MAIN_DB_PREFIX.'facture as f, '.MAIN_DB_PREFIX.'facturedet as fd, '.MAIN_DB_PREFIX.'societe as s)';
+ // $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+ // $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
+ // $this->export_sql_order[$r] .=' ORDER BY s.nom';
+ // $r++;
+ }
+
+ /**
+ * Function called when module is enabled.
+ * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+ * It also creates data directories
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ function init($options = '')
+ {
+ $sql = array();
+
+ $result=$this->_load_tables('/ifttt/sql/');
+
+ return $this->_init($sql, $options);
+ }
+
+ /**
+ * Function called when module is disabled.
+ * Remove from database constants, boxes and permissions from Dolibarr database.
+ * Data directories are not deleted.
+ *
+ * @param string $options Options when enabling module ('', 'noboxes')
+ * @return int 1 if OK, 0 if KO
+ */
+ function remove($options = '')
+ {
+ // Remove old constants with entity fields different of 0
+ $sql = array(
+ "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('MAIN_MODULE_IFTTT', 1),
+ "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = ".$this->db->encrypt('IFTTT_PRODUCTION_MODE', 1)
+ );
+
+ return $this->_remove($sql, $options);
+ }
+}
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index e08def907a1..e6deef76144 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -231,23 +231,9 @@ class modTicket extends DolibarrModules
'titre' => 'List',
'mainmenu' => 'ticket',
'leftmenu' => 'ticketlist',
- 'url' => '/ticket/list.php',
- 'langs' => 'ticket',
- 'position' => 103,
- 'enabled' => '$conf->ticket->enabled',
- 'perms' => '$user->rights->ticket->read',
- 'target' => '',
- 'user' => 2);
- $r++;
-
- $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticketlist',
- 'type' => 'left',
- 'titre' => 'MenuListNonClosed',
- 'mainmenu' => 'ticket',
- 'leftmenu' => 'ticketlist',
'url' => '/ticket/list.php?search_fk_status=non_closed',
'langs' => 'ticket',
- 'position' => 104,
+ 'position' => 103,
'enabled' => '$conf->ticket->enabled',
'perms' => '$user->rights->ticket->read',
'target' => '',
@@ -259,7 +245,7 @@ class modTicket extends DolibarrModules
'titre' => 'MenuTicketMyAssign',
'mainmenu' => 'ticket',
'leftmenu' => 'ticketmy',
- 'url' => '/ticket/list.php?mode=my_assign',
+ 'url' => '/ticket/list.php?mode=mine&search_fk_status=non_closed',
'langs' => 'ticket',
'position' => 105,
'enabled' => '$conf->ticket->enabled',
@@ -268,19 +254,6 @@ class modTicket extends DolibarrModules
'user' => 0);
$r++;
- $this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticketmy',
- 'type' => 'left',
- 'titre' => 'MenuTicketMyAssignNonClosed',
- 'mainmenu' => 'ticket',
- 'url' => '/ticket/list.php?mode=my_assign&search_fk_status=non_closed',
- 'langs' => 'ticket',
- 'position' => 106,
- 'enabled' => '$conf->ticket->enabled',
- 'perms' => '$user->rights->ticket->read',
- 'target' => '',
- 'user' => 0);
- $r++;
-
$this->menu[$r] = array('fk_menu' => 'fk_mainmenu=ticket,fk_leftmenu=ticket',
'type' => 'left',
'titre' => 'Statistics',
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
new file mode 100644
index 00000000000..cf2c2418092
--- /dev/null
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -0,0 +1,179 @@
+
+ *
+ * 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/modules/oauth/stripe_oauthcallback.php
+ * \ingroup oauth
+ * \brief Page to get oauth callback
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+use OAuth\Common\Storage\DoliStorage;
+use OAuth\Common\Consumer\Credentials;
+use OAuth\OAuth2\Service\GitHub;
+
+// Define $urlwithroot
+$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
+
+
+
+$action = GETPOST('action', 'alpha');
+$backtourl = GETPOST('backtourl', 'alpha');
+
+
+/**
+ * Create a new instance of the URI class with the current URI, stripping the query string
+ */
+$uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
+//$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
+//$currentUri->setQuery('');
+$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/stripe_oauthcallback.php');
+
+
+/**
+ * Load the credential for the service
+ */
+
+/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+$serviceFactory = new \OAuth\ServiceFactory();
+$httpClient = new \OAuth\Common\Http\Client\CurlClient();
+// TODO Set options for proxy and timeout
+// $params=array('CURLXXX'=>value, ...)
+//$httpClient->setCurlParameters($params);
+$serviceFactory->setHttpClient($httpClient);
+
+// Dolibarr storage
+$storage = new DoliStorage($db, $conf);
+
+// Setup the credentials for the requests
+$credentials = new Credentials(
+ $conf->global->OAUTH_STRIPE_TEST_ID,
+ $conf->global->STRIPE_LIVE_SECRET_KEY,
+ $currentUri->getAbsoluteUri()
+);
+
+$requestedpermissionsarray=array();
+if (GETPOST('state')) $requestedpermissionsarray=explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+/*if ($action != 'delete' && empty($requestedpermissionsarray))
+{
+ print 'Error, parameter state is not defined';
+ exit;
+}*/
+//var_dump($requestedpermissionsarray);exit;
+
+// Instantiate the Api service using the credentials, http client and storage mechanism for the token
+/** @var $apiService Service */
+//$apiService = $serviceFactory->createService('StripeTest', $credentials, $storage, $requestedpermissionsarray);
+
+$sql="INSERT INTO ".MAIN_DB_PREFIX."oauth_token set service='StripeLive', entity=".$conf->entity;
+$db->query($sql);
+
+// access type needed to have oauth provider refreshing token
+//$apiService->setAccessType('offline');
+
+$langs->load("oauth");
+
+
+/*
+ * Actions
+ */
+
+
+if ($action == 'delete')
+{
+ $storage->clearToken('StripeLive');
+
+ setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+
+ header('Location: ' . $backtourl);
+ exit();
+}
+
+if (! empty($_GET['code'])) // We are coming from oauth provider page
+{
+ // We should have
+ //$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
+
+ dol_syslog("We are coming from the oauth provider page");
+ //llxHeader('',$langs->trans("OAuthSetup"));
+
+ //$linkback=''.$langs->trans("BackToModuleList").'';
+ //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+
+ //dol_fiche_head();
+ // retrieve the CSRF state parameter
+ $state = isset($_GET['state']) ? $_GET['state'] : null;
+ //print '
';
+
+ // This was a callback request from service, get the token
+ try {
+ //var_dump($_GET['code']);
+ //var_dump($state);
+ //var_dump($apiService); // OAuth\OAuth2\Service\GitHub
+
+ //$token = $apiService->requestAccessToken($_GET['code'], $state);
+ $token = $apiService->requestAccessToken($_GET['code']);
+ // Github is a service that does not need state to be stored.
+ // Into constructor of GitHub, the call
+ // parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
+ // has not the ending parameter to true like the Google class constructor.
+
+ setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
+
+ $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+ unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+
+ header('Location: ' . $backtourl);
+ exit();
+ } catch (Exception $e) {
+ print $e->getMessage();
+ }
+}
+else // If entry on page with no parameter, we arrive here
+{
+ $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+
+ // This may create record into oauth_state before the header redirect.
+ // Creation of record with state in this tables depend on the Provider used (see its constructor).
+ if (GETPOST('state'))
+ {
+ $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
+ }
+ else
+ {
+ //$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
+ //https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
+ $url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_LIVE_ID.'&scope=read_write';
+ }
+
+ // we go on oauth provider authorization page
+ header('Location: ' . $url);
+ exit();
+}
+
+
+/*
+ * View
+ */
+
+// No view at all, just actions
+
+$db->close();
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index ed50ebaa870..d061fc33b7d 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -1,6 +1,6 @@
+ * Copyright (C) 2014-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
@@ -95,7 +95,7 @@ class printing_printgcp extends PrintingDriver
$storage = new DoliStorage($this->db, $this->conf);
//$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
// Setup the credentials for the requests
- $credentials = new Credentials(
+ $credentials = new Credentials(
$this->google_id,
$this->google_secret,
$urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
@@ -234,6 +234,7 @@ class printing_printgcp extends PrintingDriver
*/
public function getlistAvailablePrinters()
{
+ $ret = array();
// Token storage
$storage = new DoliStorage($this->db, $this->conf);
// Setup the credentials for the requests
@@ -335,8 +336,9 @@ class printing_printgcp extends PrintingDriver
return $error;
}
}
+ } else {
+ dol_print_error($this->db);
}
- else dol_print_error($this->db);
$ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
$this->error = 'PRINTGCP: '.$ret['errormessage'];
@@ -358,7 +360,7 @@ class printing_printgcp extends PrintingDriver
public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
{
// Check if printer id
- if(empty($printerid)) {
+ if (empty($printerid)) {
return array('status' =>0, 'errorcode' =>'','errormessage'=>'No provided printer ID');
}
// Open the file which needs to be print
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index f713b3a2a53..048c0e06846 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -44,14 +44,14 @@ class doc_generic_product_odt extends ModelePDFProduct
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index d3a37ffa6b0..d5bfd453322 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -57,14 +57,14 @@ class pdf_standard extends ModelePDFProduct
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 22003125439..e1c54a13a35 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -61,14 +61,14 @@ class doc_generic_project_odt extends ModelePDFProjects
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 0fd2385b9c2..8b05da32e37 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -59,14 +59,14 @@ class pdf_baleine extends ModelePDFProjects
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 7620b923b9d..4af8e8d1e32 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -38,23 +38,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_proposal_odt extends ModelePDFPropales
{
- /**
- * Issuer
- * @var Company object that emits
- */
- public $emetteur;
-
- /**
- * @var array() Minimum version of PHP required by module.
- * e.g.: PHP ≥ 5.4 = array(5, 4)
- */
- public $phpmin = array(5, 4);
-
- /**
- * Dolibarr version of the loaded document
- * @public string
+ /**
+ * @var Company Issuer object that emits
*/
- public $version = 'dolibarr';
+ public $emetteur;
+
+ /**
+ * @var array Minimum version of PHP required by module.
+ * e.g.: PHP ≥ 5.4 = array(5, 4)
+ */
+ public $phpmin = array(5, 4);
+
+ /**
+ * @var string Dolibarr version of the loaded document
+ */
+ public $version = 'dolibarr';
/**
@@ -369,7 +367,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
// Open and load template
require_once ODTPHP_PATH.'odf.php';
try {
- $odfHandler = new odf(
+ $odfHandler = new odf(
$srctemplatepath,
array(
'PATH_TO_TMP' => $conf->propal->multidir_temp[$object->entity],
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index bb0ffdd786a..fd254490ec1 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -67,14 +67,14 @@ class pdf_azur extends ModelePDFPropales
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index c88852ea610..936309fb6d8 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -41,22 +41,25 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
*/
class pdf_cyan extends ModelePDFPropales
{
- public $db;
+ /**
+ * @var DoliDb Database handler
+ */
+ public $db;
public $name;
public $description;
public $update_main_doc_field; // Save the name of generated file as the main doc when generating a doc with this template
public $type;
- public $phpmin = array(4,3,0); // Minimum version of PHP required by module
+ public $phpmin = array(5, 4); // Minimum version of PHP required by module
public $version = 'development';
public $page_largeur;
public $page_hauteur;
public $format;
public $marge_gauche;
- public $marge_droite;
- public $marge_haute;
- public $marge_basse;
+ public $marge_droite;
+ public $marge_haute;
+ public $marge_basse;
public $emetteur; // Objet societe qui emet
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index fb93998ef84..fdd2a92d15b 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -1,20 +1,21 @@
-*
-* 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 .
-* or see http://www.gnu.org/
-*/
+/* Copyright (C) 2018 Quentin Vial-Gouteyron
+ * 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
+ * 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 .
+ * or see http://www.gnu.org/
+ */
/**
* \file htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -35,10 +36,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_reception_odt extends ModelePdfReception
{
- var $emetteur; // Objet societe qui emet
+ /**
+ * @var Company Issuer object that emits
+ */
+ public $emetteur; // Objet societe qui emet
- var $phpmin = array(5,2,0); // Minimum version of PHP required by module
- var $version = 'dolibarr';
+ /**
+ * @var array Minimum version of PHP required by module.
+ * e.g.: PHP ≥ 5.4 = array(5, 4)
+ */
+ public $phpmin = array(5, 4); // Minimum version of PHP required by module
+
+ /**
+ * @var string Dolibarr version of the loaded document
+ */
+ public $version = 'dolibarr';
/**
@@ -300,7 +312,7 @@ class doc_generic_reception_odt extends ModelePdfReception
'__FROM_EMAIL__' => $this->emetteur->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
- '__TOTAL_VAT__' => $object->total_vat
+ '__TOTAL_VAT__' => $object->total_tva
);
complete_substitutions_array($substitutionarray, $langs, $object);
// Call the ODTSubstitution hook
@@ -318,7 +330,7 @@ class doc_generic_reception_odt extends ModelePdfReception
// Open and load template
require_once ODTPHP_PATH.'odf.php';
try {
- $odfHandler = new odf(
+ $odfHandler = new odf(
$srctemplatepath,
array(
'PATH_TO_TMP' => $conf->reception->dir_temp,
@@ -343,10 +355,9 @@ class doc_generic_reception_odt extends ModelePdfReception
// Make substitutions into odt of freetext
try {
$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
- }
- catch(OdfException $e)
- {
- }
+ } catch(OdfException $e) {
+ dol_syslog($e->getMessage(), LOG_INFO);
+ }
// Make substitutions into odt of user info
$tmparray=$this->get_substitutionarray_user($user, $outputlangs);
@@ -364,9 +375,8 @@ class doc_generic_reception_odt extends ModelePdfReception
{
$odfHandler->setVars($key, $value, true, 'UTF-8');
}
- }
- catch(OdfException $e)
- {
+ } catch(OdfException $e) {
+ dol_syslog($e->getMessage(), LOG_INFO);
}
}
// Make substitutions into odt of mysoc
@@ -385,9 +395,8 @@ class doc_generic_reception_odt extends ModelePdfReception
{
$odfHandler->setVars($key, $value, true, 'UTF-8');
}
- }
- catch(OdfException $e)
- {
+ } catch(OdfException $e) {
+ dol_syslog($e->getMessage(), LOG_INFO);
}
}
// Make substitutions into odt of thirdparty
@@ -404,9 +413,8 @@ class doc_generic_reception_odt extends ModelePdfReception
{
$odfHandler->setVars($key, $value, true, 'UTF-8');
}
- }
- catch(OdfException $e)
- {
+ } catch(OdfException $e) {
+ dol_syslog($e->getMessage(), LOG_INFO);
}
}
// Replace tags of object + external modules
@@ -427,9 +435,8 @@ class doc_generic_reception_odt extends ModelePdfReception
{
$odfHandler->setVars($key, $value, true, 'UTF-8');
}
- }
- catch(OdfException $e)
- {
+ } catch(OdfException $e) {
+ dol_syslog($e->getMessage(), LOG_INFO);
}
}
// Replace tags of lines
@@ -445,15 +452,12 @@ class doc_generic_reception_odt extends ModelePdfReception
$reshook=$hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
foreach($tmparray as $key => $val)
{
- try
- {
+ try {
$listlines->setVars($key, $val, true, 'UTF-8');
- }
- catch(OdfException $e)
- {
- }
- catch(SegmentException $e)
- {
+ } catch(OdfException $e) {
+ dol_syslog($e->getMessage(), LOG_INFO);
+ } catch(SegmentException $e) {
+ dol_syslog($e->getMessage(), LOG_INFO);
}
}
$listlines->merge();
@@ -473,9 +477,8 @@ class doc_generic_reception_odt extends ModelePdfReception
{
try {
$odfHandler->setVars($key, $value, true, 'UTF-8');
- }
- catch(OdfException $e)
- {
+ } catch(OdfException $e) {
+ dol_syslog($e->getMessage(), LOG_INFO);
}
}
@@ -487,7 +490,7 @@ class doc_generic_reception_odt extends ModelePdfReception
if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
try {
$odfHandler->exportAsAttachedPDF($file);
- }catch (Exception $e){
+ } catch (Exception $e){
$this->error=$e->getMessage();
return -1;
}
@@ -495,7 +498,7 @@ class doc_generic_reception_odt extends ModelePdfReception
else {
try {
$odfHandler->saveToDisk($file);
- }catch (Exception $e){
+ } catch (Exception $e){
$this->error=$e->getMessage();
return -1;
}
diff --git a/htdocs/core/modules/reception/modules_reception.php b/htdocs/core/modules/reception/modules_reception.php
index 234b620ce38..62e2434d9ac 100644
--- a/htdocs/core/modules/reception/modules_reception.php
+++ b/htdocs/core/modules/reception/modules_reception.php
@@ -29,7 +29,7 @@
*/
abstract class ModelePdfReception extends CommonDocGenerator
{
- var $error='';
+ public $error='';
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 4ded1d5391a..1b5707330da 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -43,7 +43,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index c28751e9074..c5bc5f53c8e 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -43,15 +43,15 @@ class doc_generic_stock_odt extends ModelePDFStock
*/
public $emetteur;
- /**
- * @var array() Minimum version of PHP required by module.
- * e.g.: PHP ≥ 5.4 = array(5, 4)
- */
+ /**
+ * @var array Minimum version of PHP required by module.
+ * e.g.: PHP ≥ 5.4 = array(5, 4)
+ */
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index c2ddf01aa3d..c46799b6e41 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -57,14 +57,14 @@ class pdf_standard extends ModelePDFStock
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
index 5ad967e1e13..495dd3a6ef8 100644
--- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
@@ -58,14 +58,14 @@ class pdf_stdmovement extends ModelePDFMovement
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
@@ -105,8 +105,7 @@ class pdf_stdmovement extends ModelePDFMovement
public $marge_basse;
/**
- * Issuer
- * @var Societe
+ * @var Societe Issuer
*/
public $emetteur;
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 4e2b32463fb..2d2164ebeb1 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -58,14 +58,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 73d22e88d50..a95440ad42f 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -62,14 +62,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index ec217c6a961..87b4791524e 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -59,14 +59,14 @@ class pdf_standard extends ModelePDFSuppliersPayments
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index f30b696db67..27163ac32db 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -45,14 +45,14 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 95b7b41341b..faad9b8d66a 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -59,14 +59,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
public $type;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
*/
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 9e018a4d6c6..b58c327e1bc 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -37,21 +37,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
class doc_generic_user_odt extends ModelePDFUser
{
/**
- * Issuer
- * @var Societe
+ * @var Societe Issuer
*/
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
- */
+ */
public $phpmin = array(5, 4);
/**
- * Dolibarr version of the loaded document
- * @public string
- */
+ * Dolibarr version of the loaded document
+ * @var string
+ */
public $version = 'dolibarr';
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index c14a1953042..2dfd2cfcfee 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -45,14 +45,14 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
public $emetteur;
/**
- * @var array() Minimum version of PHP required by module.
+ * @var array Minimum version of PHP required by module.
* e.g.: PHP ≥ 5.4 = array(5, 4)
- */
+ */
public $phpmin = array(5, 4);
/**
* Dolibarr version of the loaded document
- * @public string
+ * @var string
*/
public $version = 'dolibarr';
@@ -67,7 +67,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
global $conf, $langs, $mysoc;
// Load translation files required by the page
- $langs->loadLangs(array("main","companies"));
+ $langs->loadLangs(array("main","companies"));
$this->db = $db;
$this->name = "ODT templates";
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index dadfff3e62e..2c351996632 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -541,7 +541,7 @@ print '';
- echo $dialog;
- if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
- echo '
';
diff --git a/htdocs/ifttt/README.md b/htdocs/ifttt/README.md
new file mode 100644
index 00000000000..581853f80c6
--- /dev/null
+++ b/htdocs/ifttt/README.md
@@ -0,0 +1,7 @@
+API REST
+========
+
+## Integrate your ERP with any other applications using IFTTT
+
+This module provides the triggers and services to make Dolibarr compatible with IFTTT Services.
+
diff --git a/htdocs/ifttt/admin/index.php b/htdocs/ifttt/admin/index.php
new file mode 100644
index 00000000000..d6eb777109b
--- /dev/null
+++ b/htdocs/ifttt/admin/index.php
@@ -0,0 +1,131 @@
+
+ * Copyright (C) 2005-2016 Laurent Destailleur
+ * Copyright (C) 2011 Juanjo Menent
+ * Copyright (C) 2012-2018 Regis Houssin
+ * Copyright (C) 2015 Jean-François Ferry
+ *
+ * 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/ifttt/admin/index.php
+ * \ingroup api
+ * \brief Page to setup IFTTT module
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+// Load translation files required by the page
+$langs->load("admin");
+
+if (! $user->admin)
+ accessforbidden();
+
+$action=GETPOST('action', 'aZ09');
+
+
+if ($action == 'setproductionmode')
+{
+ $status = GETPOST('status', 'alpha');
+
+ if (dolibarr_set_const($db, 'IFTTT_PRODUCTION_MODE', $status, 'chaine', 0, '', 0) > 0)
+ {
+ header("Location: ".$_SERVER["PHP_SELF"]);
+ exit;
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+}
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$linkback=''.$langs->trans("BackToModuleList").'';
+print load_fiche_titre($langs->trans("IFTTTSetup"), $linkback, 'title_setup');
+
+print $langs->trans("IFTTTDesc")." \n";
+print " \n";
+
+//print '
\n";
@@ -798,11 +799,11 @@ SCRIPT;
// Supplier ref
if ($user->rights->produit->creer || $user->rights->service->creer) // change required right here
{
- print '
';
if (!empty($productfourn->supplier_reputation) && !empty($object->reputations[$productfourn->supplier_reputation])) {
print $object->reputations[$productfourn->supplier_reputation];
}
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 91d6f3f4681..950f4d47b5f 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -4,7 +4,8 @@
* Copyright (C) 2005-2014 Regis Houssin
* Copyright (C) 2014-2016 Charlie BENKE
* Copyright (C) 2015 Jean-François Ferry
- * Copyright (C) 2019 Pierre Ardoin
+ * Copyright (C) 2019 Pierre Ardoin
+ * 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
@@ -21,7 +22,7 @@
*/
/**
- * \file htdocs/product/index.php
+ * \file htdocs/product/index.php
* \ingroup product
* \brief Homepage products and services
*/
@@ -142,31 +143,31 @@ print '
';
$sql = "SELECT c.label, count(*) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie_product as cs";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
@@ -258,7 +259,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
}
}
print '
';
if (preg_match('/([^a-z]+)[a-z]$/i', $obj->duration))
{
@@ -842,7 +884,7 @@ if ($resql)
// Number of buy prices
if (! empty($arrayfields['p.numbuyprice']['checked']))
{
- print '
';
+ print '
';
if ($obj->tobuy)
{
if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0)
@@ -857,7 +899,7 @@ if ($resql)
// WAP
if (! empty($arrayfields['p.pmp']['checked']))
{
- 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/product/popuprop.php b/htdocs/product/popuprop.php
index 897763f4d91..8efbf7667ba 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -163,7 +163,7 @@ print "
';
@@ -920,13 +920,15 @@ if ($resql)
if (! empty($arrayfields['p.label']['checked']))
print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
if (! empty($arrayfields['m.batch']['checked']))
- print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['pl.eatby']['checked']))
- print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
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['e.ref']['checked']))
- print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder); // We are on a specific warehouse card, no filter on other should be possible
+ print_liste_field_titre($arrayfields['pl.sellby']['label'], $_SERVER["PHP_SELF"], 'pl.sellby', '', $param, '', $sortfield, $sortorder, 'center ');
+ if (! empty($arrayfields['e.ref']['checked'])) {
+ // We are on a specific warehouse card, no filter on other should be possible
+ print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, "", $sortfield, $sortorder);
+ }
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']))
@@ -934,13 +936,13 @@ if ($resql)
if (! empty($arrayfields['m.label']['checked']))
print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['m.type_mouvement']['checked']))
- print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
if (! empty($arrayfields['origin']['checked']))
print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
if (! empty($arrayfields['m.value']['checked']))
- print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
if (! empty($arrayfields['m.price']['checked']))
- print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, 'align="right"', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -949,16 +951,19 @@ if ($resql)
$parameters=array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['m.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- if (! empty($arrayfields['m.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+ if (! empty($arrayfields['m.datec']['checked'])) {
+ print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ if (! empty($arrayfields['m.tms']['checked'])) {
+ print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ }
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "\n";
$arrayofuniqueproduct=array();
- while ($i < min($num, $limit))
- {
+ while ($i < min($num, $limit)) {
$objp = $db->fetch_object($resql);
$userstatic->id=$objp->fk_user_author;
@@ -984,7 +989,7 @@ if ($resql)
$warehousestatic->lieu=$objp->lieu;
$arrayofuniqueproduct[$objp->rowid]=$objp->produit;
- if(!empty($objp->fk_origin)) {
+ if (!empty($objp->fk_origin)) {
$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
} else {
$origin = '';
@@ -994,7 +999,8 @@ if ($resql)
// Id movement
if (! empty($arrayfields['m.rowid']['checked']))
{
- print '
'.$objp->mid.'
'; // This is primary not movement id
+ // This is primary not movement id
+ print '
'.$objp->mid.'
';
}
if (! empty($arrayfields['m.datem']['checked']))
{
@@ -1028,11 +1034,11 @@ if ($resql)
}
if (! empty($arrayfields['pl.eatby']['checked']))
{
- print '
'. dol_print_date($objp->eatby, 'day') .'
';
+ print '
'. dol_print_date($objp->eatby, 'day') .'
';
}
if (! empty($arrayfields['pl.sellby']['checked']))
{
- print '
'. dol_print_date($objp->sellby, 'day') .'
';
+ print '
'. dol_print_date($objp->sellby, 'day') .'
';
}
// Warehouse
if (! empty($arrayfields['e.ref']['checked']))
@@ -1071,16 +1077,16 @@ if ($resql)
// Type of movement
switch($objp->type_mouvement) {
case "0":
- print '
';
@@ -1100,12 +1106,12 @@ if ($resql)
if (! empty($arrayfields['m.price']['checked']))
{
// Price
- print '
';
+ print '
';
if ($objp->price != 0) print price($objp->price);
print '
';
}
// Action column
- print '
';
+ 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;
@@ -1130,8 +1136,7 @@ if ($resql)
print " ";
$productidselected=0;
- foreach ($arrayofuniqueproduct as $key => $val)
- {
+ foreach ($arrayofuniqueproduct as $key => $val) {
$productidselected=$key;
$productlabelselected=$val;
}
@@ -1143,17 +1148,17 @@ if ($resql)
//print '
';
+ //print '';
}
}
else
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 0eff40ddd72..6c3f5b6b7ce 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -4,6 +4,7 @@
* Copyright (C) 2005-2014 Regis Houssin
* Copyright (C) 2015 Juanjo Menent
* Copyright (C) 2018 Ferran Marcet
+ * 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
@@ -403,28 +404,6 @@ if ($action == "transfert_stock" && ! $cancel)
}
-/*
- * Build document
- */
-/* The builddoc action for object of a movement must be on the movement card
-// Actions to build doc
-$upload_dir = $conf->stock->dir_output;
-$permissioncreate = $user->rights->stock->creer;
-include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-*/
-
-if (empty($reshook) && $action != 'remove_file')
-{
- $objectclass='MouvementStock';
- $objectlabel='Movements';
- $permtoread = $user->rights->stock->lire;
- $permtodelete = $user->rights->stock->supprimer;
- $uploaddir = $conf->stock->dir_output;
- include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-}
-
-
-
/*
* View
*/
@@ -768,7 +747,7 @@ if ($resql)
if (! empty($arrayfields['m.rowid']['checked']))
{
// Ref
- print '
';
+ print '
';
print '';
print '
';
}
@@ -786,36 +765,36 @@ if ($resql)
if (! empty($arrayfields['p.ref']['checked']))
{
// Product Ref
- print '
';
@@ -1082,12 +1096,12 @@ if ($resql)
if (! empty($arrayfields['m.price']['checked']))
{
// Price
- print '
';
+ print '
';
if ($objp->price != 0) print price($objp->price);
print '
';
}
// Action column
- print '
';
+ 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;
@@ -1125,14 +1139,14 @@ if ($resql)
//print '
';
print img_picto($langs->trans("Tranfer"), 'uparrow', 'class="hideonsmartphone"') . ' ';
print 'id . '">' . $langs->trans("TransferStock") . '';
// Disabled, because edition of stock content must use the "Correct stock menu".
// Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ...
//print 'id.'#'.$pdluo->id.'">';
//print img_edit().'
';
}
else
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 54243e3c853..7105470032c 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -1,6 +1,7 @@
- * Copyright (C) 2018 Ferran Marcet
+/* Copyright (C) 2007-2016 Laurent Destailleur
+ * Copyright (C) 2018 Ferran Marcet
+ * 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,10 +18,10 @@
*/
/**
- * \file product/stock/productlot_list.php
- * \ingroup stock
- * \brief This file is an example of a php page
- * Initialy built by build_class_from_table on 2016-05-17 12:22
+ * \file product/stock/productlot_list.php
+ * \ingroup stock
+ * \brief This file is an example of a php page
+ * Initialy built by build_class_from_table on 2016-05-17 12:22
*/
require '../../main.inc.php';
@@ -34,10 +35,10 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
$langs->loadLangs(array('stocks', 'productbatch', 'other', 'users'));
// Get parameters
-$id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');
+$action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
-$myparam = GETPOST('myparam', 'alpha');
+$myparam = GETPOST('myparam', 'alpha');
$toselect = GETPOST('toselect', 'array');
@@ -362,12 +363,12 @@ if ($resql)
/*if (! empty($arrayfields['u.statut']['checked']))
{
// Status
- print '
';
if (! $i) $totalarray['nbfield']++;
@@ -482,11 +489,11 @@ if ($resql)
if (! empty($arrayfields['u.statut']['checked']))
{
$userstatic->statut=$obj->statut;
- print '
'.$userstatic->getLibStatut(3).'
';
+ print '
'.$userstatic->getLibStatut(3).'
';
}*/
// Action column
- print '
';
+ 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;
@@ -514,9 +521,9 @@ if ($resql)
if ($num < $limit && empty($offset)) print '
';
}
print '';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 829df2a076a..7bd080b15bf 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -4,6 +4,7 @@
* Copyright (C) 2014 Regis Houssin
* Copyright (C) 2016 Juanjo Menent
* Copyright (C) 2016 ATM Consulting
+ * 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
@@ -534,11 +535,11 @@ print '
';
if (!empty($conf->service->enabled) && $type == 1) print '
';
print '';
}
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 40119d91c65..617d40b5232 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2013 Cédric Salvador
* Copyright (C) 2014 Regis Houssin
- * Copyright (C) 2018 Frédéric France
+ * 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
@@ -198,7 +198,7 @@ if ($resql)
'
';
// By default, we can edit only tasks we are assigned to
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index a293c8ee451..ca4663bd43e 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -309,17 +309,17 @@ print '';
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;
@@ -925,8 +925,8 @@ if (isset($totalarray['totaloppfield']) || isset($totalarray['totalbudgetfield']
if ($num < $limit && empty($offset)) 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;
@@ -821,9 +821,9 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
if ($num < $limit && empty($offset)) 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/reception/stats/index.php b/htdocs/reception/stats/index.php
index b4034588218..94e77c3c4b5 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -255,7 +255,7 @@ print '
';
if ($year) print ''.$year.'';
else print $langs->trans("ValidationDateNotDefinedEvenIfReceptionValidated");
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;
}
@@ -306,7 +306,7 @@ print '
';
// Show graphs
-print '
';
+print '
';
if ($mesg) { print $mesg; }
else {
print $px1->show();
@@ -328,8 +328,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("NbOfReceptions").'
';
+print '
'.$langs->trans("Year").'
';
+print '
'.$langs->trans("NbOfReceptions").'
';
$sql = "SELECT count(*) as nb, date_format(date_reception,'%Y') as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."reception";
@@ -348,7 +348,7 @@ if ($resql)
$nbproduct = $row[0];
$year = $row[1];
print "
element != 'order_supplier') {
@@ -66,11 +66,11 @@ if (count($linkedObjectBlock) > 1)
trans("Total"); ?>
-
-
-
-
-
+
+
+
+
+
+ * 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
@@ -85,7 +86,7 @@ class FormResource
$resourcestat = new Dolresource($this->db);
- $resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, $offset, $filter);
+ $resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, 0, $filter);
if ($outputmode != 2)
{
@@ -194,17 +195,17 @@ class FormResource
if ($empty && empty($arraytypes['code'])) continue;
if ($format == 0) print '';
}
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 8e850004669..800c5edcb06 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -226,18 +226,18 @@ if (! empty($arrayfields['ty.label']['checked']))
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Action column
-print '
';
$sql = "SELECT c.label, count(*) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
@@ -249,7 +249,7 @@ if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHS
}
}
print '
';
- print '
'.$langs->trans("Total").'
';
+ print '
'.$langs->trans("Total").'
';
print $total;
print '
';
print '
';
@@ -321,7 +321,7 @@ if ($result)
print $thirdparty_static->getNomUrl(1);
print "\n";
// Type
- print '
';
+ print '
';
if ($thirdparty_static->client==1 || $thirdparty_static->client==3)
{
$thirdparty_static->name=$langs->trans("Customer");
@@ -341,10 +341,10 @@ if ($result)
}
print '
';
if (! $i) $totalarray['nbfield']++;
@@ -1227,7 +1227,7 @@ while ($i < min($num, $limit))
// Status
if (! empty($arrayfields['s.status']['checked']))
{
- print '
'.$companystatic->getLibStatut(3).'
';
+ print '
'.$companystatic->getLibStatut(3).'
';
if (! $i) $totalarray['nbfield']++;
}
if (! empty($arrayfields['s.import_key']['checked']))
@@ -1239,7 +1239,7 @@ while ($i < min($num, $limit))
}
// Action column
- print '
';
+ 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/societe/notify/card.php b/htdocs/societe/notify/card.php
index 47f25172e59..59c43551f41 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -260,7 +260,7 @@ if ($result > 0)
$type=array('email'=>$langs->trans("EMail"));
print $form->selectarray("typeid", $type);
print '
';
- print '
';
+ print '
';
print '';
}
else
@@ -348,7 +348,7 @@ if ($result > 0)
if ($obj->type == 'email') print $langs->trans("Email");
if ($obj->type == 'sms') print $langs->trans("SMS");
print '
';
}
else
@@ -272,22 +273,42 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // What is this for ?
print '';
}
-// Minimal amount for force 3Dsecure if it's optionnal
+// Activate Payment Request API
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // TODO Not used by current code
+{
+ 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;
@@ -845,9 +845,9 @@ if ($resql)
if ($num < $limit && empty($offset)) print '