';
}
if (! empty($arrayfields['d.firstname']['checked']))
{
- print '
';
+ print '
';
print '
';
}
if (! empty($arrayfields['d.lastname']['checked']))
{
- print '
';
+ print '
';
print '
';
}
if (! empty($arrayfields['d.gender']['checked']))
@@ -463,17 +463,17 @@ if (! empty($arrayfields['d.gender']['checked']))
}
if (! empty($arrayfields['d.company']['checked']))
{
- print '
';
+ print '
';
print '
';
}
if (! empty($arrayfields['d.login']['checked']))
{
- print '
';
+ print '
';
print '
';
}
if (! empty($arrayfields['d.morphy']['checked']))
{
- print '
';
+ print '
';
print '
';
}
if (! empty($arrayfields['t.libelle']['checked']))
@@ -486,18 +486,18 @@ if (! empty($arrayfields['t.libelle']['checked']))
if (! empty($arrayfields['d.address']['checked']))
{
- print '
';
+ print '
';
print '
';
}
if (! empty($arrayfields['d.zip']['checked']))
{
- print '
';
+ print '
';
print '
';
}
if (! empty($arrayfields['d.town']['checked']))
{
- print '
';
+ print '
';
print '
';
}
// State
@@ -510,38 +510,38 @@ if (! empty($arrayfields['state.nom']['checked']))
// Country
if (! empty($arrayfields['country.code_iso']['checked']))
{
- print '
';
if (! $i) $totalarray['nbfield']++;
@@ -848,7 +848,7 @@ while ($i < min($num, $limit))
if (! $i) $totalarray['nbfield']++;
}
// 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/adherents/note.php b/htdocs/adherents/note.php
index 0acd98a9ead..b3e18f543be 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -93,7 +93,7 @@ if ($id)
// Morphy
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/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 622d20f7d42..e85eed336fb 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -44,8 +44,8 @@ foreach($linkedObjectBlock as $key => $objectlink)
';
if ($user->rights->adherent->creer)
{
print ''.img_edit().'';
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 1ab783474b8..894706576b5 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2008-2019 Laurent Destailleur
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -36,7 +36,8 @@ $action = GETPOST('action', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
$arrayofparameters=array(
- 'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
+ 'DAV_ALLOW_PRIVATE_DIR'=>array('css'=>'minwidth200', 'enabled'=>2),
+ 'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>$conf->ecm->enabled)
);
@@ -84,7 +85,11 @@ if ($action == 'edit')
print '
';
print "\n";
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index c2559e0e2bf..8e4334c6214 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -207,7 +207,7 @@ else
print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'title_setup');
-print $langs->trans("DefaultValuesDesc")." \n";
+print ''.$langs->trans("DefaultValuesDesc")." \n";
print " \n";
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 541262b2bf5..ae4fde1876b 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -4,7 +4,7 @@
* Copyright (C) 2004 Benoit Mortier
* Copyright (C) 2005-2017 Regis Houssin
* Copyright (C) 2010-2016 Juanjo Menent
- * Copyright (C) 2011-2015 Philippe Grand
+ * Copyright (C) 2011-2019 Philippe Grand
* Copyright (C) 2011 Remy Younes
* Copyright (C) 2012-2015 Marcos García
* Copyright (C) 2012 Christophe Battarel
@@ -370,7 +370,7 @@ $tabfieldinsert[35]= "label";
$tabfieldinsert[36]= "range_ik,fk_c_exp_tax_cat";
$tabfieldinsert[37]= "code,label,short_label,unit_type,scale";
-// Nom du rowid si le champ n'est pas de type autoincrement
+// Rowid name if the field is not autoincrement type
// Example: "" if id field is "rowid" and has autoincrement on
// "nameoffield" if id field is not "rowid" or has not autoincrement on
$tabrowid=array();
@@ -703,12 +703,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
$_POST["code"]=preg_replace('/\s/', '', $_POST["code"]);
}
- // Si verif ok et action add, on ajoute la ligne
+ // If check ok and action add, add the line
if ($ok && GETPOST('actionadd'))
{
if ($tabrowid[$id])
{
- // Recupere id libre pour insertion
+ // Get free id for insert
$newid=0;
$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
$result = $db->query($sql);
@@ -771,7 +771,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
}
}
- // Si verif ok et action modify, on modifie la ligne
+ // If verif ok and action modify, modify the line
if ($ok && GETPOST('actionmodify'))
{
if ($tabrowid[$id]) { $rowidcol=$tabrowid[$id]; }
@@ -1382,7 +1382,7 @@ if ($id)
$withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit');
}
- print '
';
+ print '
';
print '';
print '';
print '';
@@ -1549,7 +1549,7 @@ if ($id)
$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
}
elseif ($fieldlist[$field]=='localtax1' || $fieldlist[$field]=='localtax2') {
- $align="center";
+ $class="center";
}
elseif ($fieldlist[$field]=='localtax1_type') {
if ($obj->localtax1 != 0)
@@ -1644,14 +1644,14 @@ if ($id)
// Only activated on country dictionary
if ($id == 4)
{
- print '
';
+ print '
';
if ($iserasable) print ''.$actl[$obj->favorite].'';
else print $langs->trans("AlwaysActive");
print '
';
}
// Active
- print '
';
+ print '
';
if ($canbedisabled) print ''.$actl[$obj->active].'';
else
{
@@ -1669,7 +1669,7 @@ if ($id)
// Delete link
if ($iserasable)
{
- print '
';
+ print '
';
if ($user->admin) print ''.img_delete().'';
//else print ''.img_delete().''; // Some dictionary can be edited by other profile than admin
print '
';
print $form->textwithpicto('', $htmltooltip, 1, 0);
if ($conf->global->FACTURE_ADDON.'.php' == $file) // If module is the one used, we show existing errors
@@ -472,10 +472,10 @@ print '
';
print '
';
print '
'.$langs->trans("Name").'
';
print '
'.$langs->trans("Description").'
';
-print '
'.$langs->trans("Status").'
';
-print '
'.$langs->trans("Default").'
';
-print '
'.$langs->trans("ShortInfo").'
';
-print '
'.$langs->trans("Preview").'
';
+print '
'.$langs->trans("Status").'
';
+print '
'.$langs->trans("Default").'
';
+print '
'.$langs->trans("ShortInfo").'
';
+print '
'.$langs->trans("Preview").'
';
print "
\n";
clearstatcache();
@@ -528,7 +528,7 @@ foreach ($dirmodels as $reldir)
// Active
if (in_array($name, $def))
{
- print '
'."\n";
+ foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type = 1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type = 1;
+ }
- foreach ($x_both[$thirdparty_id]['coll']['detail'] as $index => $fields) {
- // Define type
- // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
- $type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
- // Try to enhance type detection using date_start and date_end for free lines where type
- // was not saved.
- if (!empty($fields['ddate_start'])) {
- $type=1;
- }
- if (!empty($fields['ddate_end'])) {
- $type=1;
- }
+ print '
';
+
+ // Ref
+ print '
' . $fields['link'] . '
';
+
+ // Invoice date
+ print '
' . dol_print_date($fields['datef'], 'day') . '
';
+
+ // Payment date
+ if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+ print '
' . dol_print_date($fields['datep'], 'day') . '
';
+ } else {
+ print '
';
+ }
+
+ // Rate
+ print '
' . $fields['drate'] . '
';
+
+ // Description
+ print '
';
+ if ($fields['pid']) {
+ $product_static->id = $fields['pid'];
+ $product_static->ref = $fields['pref'];
+ $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) {
+ print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+ }
+ } else {
+ if ($type) {
+ $text = img_object($langs->trans('Service'), 'service');
+ } else {
+ $text = img_object($langs->trans('Product'), 'product');
+ }
+ if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+ if ($reg[1] == 'DEPOSIT') {
+ $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+ } elseif ($reg[1] == 'CREDIT_NOTE') {
+ $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+ } else {
+ $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+ }
+ }
+ print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+
+ // Show range
+ print_date_range($fields['ddate_start'], $fields['ddate_end']);
+ }
+ print '
';
+
+ // Total HT
+ if ($modetax != 1) {
+ print '
' . "\n";
+
+ foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index => $fields) {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type = 1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type = 1;
+ }
- print '
';
+ print '
';
- // Ref
- print '
'.$fields['link'].'
';
+ // Ref
+ print '
' . $fields['link'] . '
';
- // Invoice date
- print '
' . dol_print_date($fields['datef'], 'day') . '
';
+ // Invoice date
+ print '
' . dol_print_date($fields['datef'], 'day') . '
';
- // Payment date
- if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '
' . dol_print_date($fields['datep'], 'day') . '
';
- else print '
';
+ // Payment date
+ if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+ print '
' . dol_print_date($fields['datep'], 'day') . '
';
+ } else {
+ print '
';
+ }
- // Rate
- print '
' . $fields['drate'] . '
';
+ // Company name
+ print '
' . $fields['company_link'] . '
';
- // Description
- print '
';
- if ($fields['pid'])
- {
- $product_static->id=$fields['pid'];
- $product_static->ref=$fields['pref'];
- $product_static->type=$fields['dtype']; // We force with the type of line to have type how line is registered
- print $product_static->getNomUrl(1);
- if (dol_string_nohtmltag($fields['descr'])) {
- print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
- }
- }
- else
- {
- if ($type) {
- $text = img_object($langs->trans('Service'), 'service');
- } else {
- $text = img_object($langs->trans('Product'), 'product');
- }
- if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
- if ($reg[1]=='DEPOSIT') {
- $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
- } elseif ($reg[1]=='CREDIT_NOTE') {
- $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
- } else {
- $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
- }
- }
- print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+ // Description
+ print '
';
+ if ($fields['pid']) {
+ $product_static->id = $fields['pid'];
+ $product_static->ref = $fields['pref'];
+ $product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+ print $product_static->getNomUrl(1);
+ if (dol_string_nohtmltag($fields['descr'])) {
+ print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+ }
+ } else {
+ if ($type) {
+ $text = img_object($langs->trans('Service'), 'service');
+ } else {
+ $text = img_object($langs->trans('Product'), 'product');
+ }
+ if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+ if ($reg[1] == 'DEPOSIT') {
+ $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+ } elseif ($reg[1] == 'CREDIT_NOTE') {
+ $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+ } else {
+ $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+ }
+ }
+ print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
- // Show range
- print_date_range($fields['ddate_start'], $fields['ddate_end']);
- }
- print '
';
+ // Show range
+ print_date_range($fields['ddate_start'], $fields['ddate_end']);
+ }
+ print '';
- // Total HT
- if ($modetax != 1)
- {
- print '
'."\n";
-
- foreach ($x_both[$thirdparty_id]['paye']['detail'] as $index=>$fields) {
- // Define type
- // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
- $type=(isset($fields['dtype'])?$fields['dtype']:$fields['ptype']);
- // Try to enhance type detection using date_start and date_end for free lines where type
- // was not saved.
- if (!empty($fields['ddate_start'])) {
- $type=1;
- }
- if (!empty($fields['ddate_end'])) {
- $type=1;
- }
-
-
- print '
';
-
- // Ref
- print '
'.$fields['link'].'
';
-
- // Invoice date
- print '
' . dol_print_date($fields['datef'], 'day') . '
';
-
- // Payment date
- if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '
' . dol_print_date($fields['datep'], 'day') . '
';
- else print '
';
-
- // Company name
- print '
' . $fields['company_link'] . '
';
-
- // Description
- print '
';
- if ($fields['pid'])
- {
- $product_static->id=$fields['pid'];
- $product_static->ref=$fields['pref'];
- $product_static->type=$fields['dtype']; // We force with the type of line to have type how line is registered
- print $product_static->getNomUrl(1);
- if (dol_string_nohtmltag($fields['descr'])) {
- print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
- }
- }
- else
- {
- if ($type) {
- $text = img_object($langs->trans('Service'), 'service');
- } else {
- $text = img_object($langs->trans('Product'), 'product');
- }
- if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
- if ($reg[1]=='DEPOSIT') {
- $fields['descr']=$langs->transnoentitiesnoconv('Deposit');
- } elseif ($reg[1]=='CREDIT_NOTE') {
- $fields['descr']=$langs->transnoentitiesnoconv('CreditNote');
- } else {
- $fields['descr']=$langs->transnoentitiesnoconv($reg[1]);
- }
- }
- print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
-
- // Show range
- print_date_range($fields['ddate_start'], $fields['ddate_end']);
- }
- print '
';
-
- // Total HT
- if ($modetax != 1)
- {
- print '
';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 371be10adbd..b60852f205b 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -3,6 +3,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur
* Copyright (C) 2005-2010 Regis Houssin
* Copyright (C) 2016-2018 Ferran Marcet
+ * Copyright (C) 2019 Nicolas ZABOURI
*
* 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
@@ -279,7 +280,7 @@ if ($resql)
$newcardbutton='';
if ($user->rights->expedition->creer)
{
- $newcardbutton=''.$langs->trans('NewSending').'';
+ $newcardbutton=''.$langs->trans('NewSending').'';
$newcardbutton.= '';
$newcardbutton.= '';
}
@@ -623,6 +624,10 @@ if ($resql)
$i++;
}
+ $parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+ $reshook=$hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+
print "
';
//print ''.$langs->trans("AttachTheNewLineToTheDocument").' ';
$modulepart='expensereport';$maxheightmini=48;
@@ -2316,8 +2404,7 @@ else
$fileinfo = pathinfo($file['name']);
if (image_format_supported($file['name']) > 0)
{
- $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
- //if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+ $minifile=getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case however) than original
//print $file['path'].'/'.$minifile.' ';
$urlforhref=getAdvancedPreviewUrl($modulepart, $fileinfo['relativename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity)?$object->entity:$conf->entity));
if (empty($urlforhref)) {
@@ -2326,10 +2413,57 @@ else
} else {
print '';
}
- print '';
+ print '
';
@@ -2424,6 +2561,9 @@ else
print ''; // We must be able to enter decimal qty
print '';
+ // Picture
+ print '
';
+
if ($action != 'editline')
{
print '
';
@@ -2649,7 +2789,6 @@ if (GETPOST('modelselected', 'alpha')) {
if ($action != 'presend')
{
-
/*
* Generate documents
*/
@@ -2669,11 +2808,15 @@ if ($action != 'presend')
$somethingshown = $formfile->numoffiles;
}
+ // Disabled for expensereport, there is no thirdparty on expensereport, so nothing to define the list of other object we can suggest to link to
+ /*
if ($action != 'create' && $action != 'edit' && ($id || $ref))
{
$linktoelem = $form->showLinkToObjectBlock($object, null, array('expensereport'));
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
}
+ */
+
print '
';
// List of actions on element
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 0bc5c533f9e..b60a8a68b49 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -971,7 +971,7 @@ class ExpenseReport extends CommonObject
$this->lines=array();
$sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date, de.rang,';
- $sql.= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_c_exp_tax_cat, de.fk_projet as fk_project, de.tva_tx,';
+ $sql.= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_c_exp_tax_cat, de.fk_projet as fk_project, de.tva_tx, de.fk_ecm_files,';
$sql.= ' de.total_ht, de.total_tva, de.total_ttc,';
$sql.= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
$sql.= ' p.ref as ref_projet, p.title as title_projet';
@@ -1010,8 +1010,9 @@ class ExpenseReport extends CommonObject
$deplig->fk_expensereport = $objp->fk_expensereport;
$deplig->fk_c_type_fees = $objp->fk_c_type_fees;
$deplig->fk_c_exp_tax_cat = $objp->fk_c_exp_tax_cat;
- $deplig->fk_projet = $objp->fk_project;
+ $deplig->fk_projet = $objp->fk_project; // deprecated
$deplig->fk_project = $objp->fk_project;
+ $deplig->fk_ecm_files = $objp->fk_ecm_files;
$deplig->total_ht = $objp->total_ht;
$deplig->total_tva = $objp->total_tva;
@@ -1687,20 +1688,21 @@ class ExpenseReport extends CommonObject
/**
* addline
*
- * @param float $qty Qty
- * @param double $up Value init
- * @param int $fk_c_type_fees Type payment
- * @param string $vatrate Vat rate (Can be '10' or '10 (ABC)')
- * @param string $date Date
- * @param string $comments Description
- * @param int $fk_project Project id
- * @param int $fk_c_exp_tax_cat Car category id
- * @param int $type Type line
- * @return int <0 if KO, >0 if OK
+ * @param float $qty Qty
+ * @param double $up Value init
+ * @param int $fk_c_type_fees Type payment
+ * @param string $vatrate Vat rate (Can be '10' or '10 (ABC)')
+ * @param string $date Date
+ * @param string $comments Description
+ * @param int $fk_project Project id
+ * @param int $fk_c_exp_tax_cat Car category id
+ * @param int $type Type line
+ * @param int $fk_ecm_files Id of ECM file to link to this expensereport line
+ * @return int <0 if KO, >0 if OK
*/
- public function addline($qty = 0, $up = 0, $fk_c_type_fees = 0, $vatrate = 0, $date = '', $comments = '', $fk_project = 0, $fk_c_exp_tax_cat = 0, $type = 0)
+ public function addline($qty = 0, $up = 0, $fk_c_type_fees = 0, $vatrate = 0, $date = '', $comments = '', $fk_project = 0, $fk_c_exp_tax_cat = 0, $type = 0, $fk_ecm_files = 0)
{
- global $conf,$langs,$mysoc;
+ global $conf, $langs, $mysoc;
dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
@@ -1750,7 +1752,10 @@ class ExpenseReport extends CommonObject
$this->line->fk_c_type_fees = $fk_c_type_fees;
$this->line->fk_c_exp_tax_cat = $fk_c_exp_tax_cat;
$this->line->comments = $comments;
- $this->line->fk_projet = $fk_project;
+ $this->line->fk_projet = $fk_project; // deprecated
+ $this->line->fk_project = $fk_project;
+
+ $this->line->fk_ecm_files = $fk_ecm_files;
$this->applyOffset();
$this->checkRules($type, $seller);
@@ -2497,6 +2502,12 @@ class ExpenseReportLine
public $total_tva;
public $total_ttc;
+ /**
+ * @var int ID into llx_ecm_files table to link line to attached file
+ */
+ public $fk_ecm_files;
+
+
/**
* Constructor
*
@@ -2516,7 +2527,7 @@ class ExpenseReportLine
public function fetch($rowid)
{
$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_c_exp_tax_cat, fde.fk_projet as fk_project, fde.date,';
- $sql.= ' fde.tva_tx as vatrate, fde.vat_src_code, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
+ $sql.= ' fde.tva_tx as vatrate, fde.vat_src_code, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc, fde.fk_ecm_files,';
$sql.= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
$sql.= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
@@ -2531,8 +2542,8 @@ class ExpenseReportLine
$objp = $this->db->fetch_object($result);
$this->rowid = $objp->rowid;
- $this->id = $obj->rowid;
- $this->ref = $obj->ref;
+ $this->id = $objp->rowid;
+ $this->ref = $objp->ref;
$this->fk_expensereport = $objp->fk_expensereport;
$this->comments = $objp->comments;
$this->qty = $objp->qty;
@@ -2552,6 +2563,7 @@ class ExpenseReportLine
$this->total_ht = $objp->total_ht;
$this->total_tva = $objp->total_tva;
$this->total_ttc = $objp->total_ttc;
+ $this->fk_ecm_files = $objp->fk_ecm_files;
$this->db->free($result);
} else {
@@ -2585,7 +2597,7 @@ class ExpenseReportLine
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'expensereport_det';
$sql.= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
- $sql.= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat)';
+ $sql.= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat, fk_ecm_files)';
$sql.= " VALUES (".$this->db->escape($this->fk_expensereport).",";
$sql.= " ".$this->db->escape($this->fk_c_type_fees).",";
$sql.= " ".$this->db->escape($this->fk_project>0?$this->fk_project:($this->fk_projet>0?$this->fk_projet:'null')).",";
@@ -2599,7 +2611,8 @@ class ExpenseReportLine
$sql.= " ".$this->db->escape($this->total_ttc).",";
$sql.= "'".$this->db->idate($this->date)."',";
$sql.= " '".$this->db->escape($this->rule_warning_message)."',";
- $sql.= " ".$this->db->escape($this->fk_c_exp_tax_cat);
+ $sql.= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
+ $sql.= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
$sql.= ")";
$resql=$this->db->query($sql);
@@ -2645,7 +2658,7 @@ class ExpenseReportLine
* @param ExpenseReportRule $rule object rule to check
* @param int $fk_user user author id
* @param string $mode day|EX_DAY / month|EX_MON / year|EX_YEA to get amount
- * @return amount Amount
+ * @return float Amount
*/
public function getExpAmount(ExpenseReportRule $rule, $fk_user, $mode = 'day')
{
@@ -2682,7 +2695,7 @@ class ExpenseReportLine
}
/**
- * update
+ * Update line
*
* @param User $user User
* @return int <0 if KO, >0 if OK
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index b1be48ffc76..f5295118bda 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -114,7 +114,7 @@ if ($object->id)
print '
';
print '';
- print '
';
+ print '
';
$linkback = ''.$langs->trans("BackToList").'';
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index c221baf7d65..242b60920fe 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -455,7 +455,7 @@ if ($resql)
$newcardbutton='';
if ($user->rights->expensereport->creer)
{
- $newcardbutton=''.$langs->trans('NewTrip').'';
+ $newcardbutton=''.$langs->trans('NewTrip').'';
$newcardbutton.= '';
$newcardbutton.= '';
}
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 98b1f4552a0..83208ffa020 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -52,11 +52,11 @@ if (count($export->array_export_code))
{
if ($user->rights->export->creer)
{
- print ''.$langs->trans("NewExport").'';
+ print ''.$langs->trans("NewExport").'';
}
else
{
- print ''.$langs->trans("NewExport").'';
+ print ''.$langs->trans("NewExport").'';
}
}
print '';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index d9434d018c3..47e7dd48589 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -948,7 +948,7 @@ if ($action == 'create')
$numprojet=$formproject->select_projects($soc->id, $projectid, 'projectid');
if ($numprojet==0)
{
- print ' '.$langs->trans("AddProject").' ';
+ print ' '.$langs->trans("AddProject").'';
}
print '';
}
@@ -961,7 +961,7 @@ if ($action == 'create')
$numcontrat=$formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1);
if ($numcontrat==0)
{
- print ' '.$langs->trans("AddContract").' ';
+ print ' '.$langs->trans("AddContract").'';
}
print '';
}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 43cd79bfe70..46d898253da 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -5,8 +5,8 @@
* Copyright (C) 2011-2013 Juanjo Menent
* Copyright (C) 2015 Marcos García
* Copyright (C) 2015 Charlie Benke
- * Copyright (C) 2018 Nicolas ZABOURI
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018 Nicolas ZABOURI
+ * Copyright (C) 2018 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
@@ -69,12 +69,26 @@ class Fichinter extends CommonObject
public $socid; // Id client
public $author;
- public $datec;
+
+ /**
+ * Date creation record (datec)
+ *
+ * @var integer
+ */
+ public $datec;
+
public $datev;
public $dateo;
public $datee;
public $datet;
- public $datem;
+
+ /**
+ * Date modification record (tms)
+ *
+ * @var integer
+ */
+ public $datem;
+
public $duration;
public $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
@@ -445,35 +459,56 @@ class Fichinter extends CommonObject
* Set status to draft
*
* @param User $user User that set draft
- * @return int <0 if KO, >0 if OK
+ * @return int <0 if KO, >0 if OK
*/
public function setDraft($user)
{
global $langs, $conf;
- if ($this->statut != 0)
+ $error=0;
+
+ // Protection
+ if ($this->statut <= self::STATUS_DRAFT)
{
- $this->db->begin();
+ return 0;
+ }
- $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
- $sql.= " SET fk_statut = 0";
- $sql.= " WHERE rowid = ".$this->id;
- $sql.= " AND entity = ".$conf->entity;
+ dol_syslog(get_class($this)."::setDraft", LOG_DEBUG);
- dol_syslog("Fichinter::setDraft", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $this->db->commit();
- return 1;
- }
- else
- {
- $this->db->rollback();
- $this->error=$this->db->lasterror();
- return -1;
+ $this->db->begin();
+
+ $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
+ $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
+ $sql.= " WHERE rowid = ".$this->id;
+
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if (!$error) {
+ $this->oldcopy = clone $this;
+ }
+
+ if (!$error) {
+ // Call trigger
+ $result=$this->call_trigger('FICHINTER_UNVALIDATE', $user);
+ if ($result < 0) $error++;
+ }
+
+ if (!$error) {
+ $this->statut=self::STATUS_DRAFT;
+ $this->db->commit();
+ return 1;
+ } else {
+ $this->db->rollback();
+ return -1;
}
}
+ else
+ {
+ $this->db->rollback();
+ $this->error=$this->db->lasterror();
+ return -1;
+ }
}
/**
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index a23eab2ae2c..d5aed88079a 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -154,7 +154,7 @@ if ($object->id)
print '
';
print '';
- print '
';
+ print '
';
print '
'.$langs->trans("NbOfAttachedFiles").'
'.count($filearray).'
';
print '
'.$langs->trans("TotalSizeOfAttachedFiles").'
'.dol_print_size($totalsize, 1, 1).'
';
print '
';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index c105d06a852..2a24f1f31ea 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -293,7 +293,7 @@ if ($resql)
$newcardbutton='';
if ($user->rights->ficheinter->creer)
{
- $newcardbutton=''.$langs->trans('NewIntervention').'';
+ $newcardbutton=''.$langs->trans('NewIntervention').'';
$newcardbutton.= '';
$newcardbutton.= '';
}
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index ae17cdecd46..2c6580be662 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -90,7 +90,7 @@ if (empty($reshook))
$mesg=join(',', $object->errors);
}
}
- // conditions de reglement
+ // terms of the settlement
if ($action == 'setconditions' && $user->rights->societe->creer)
{
$object->fetch($id);
@@ -225,7 +225,7 @@ if ($object->id > 0)
print $object->tva_intra;
print '';
- // Conditions de reglement par defaut
+ // Default terms of the settlement
$langs->load('bills');
$form = new Form($db);
print '
';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 5f7789e72f5..3573484f7c7 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1543,6 +1543,11 @@ class CommandeFournisseur extends CommonOrder
return -1;
}
if ($type < 0) return -1;
+ if ($date_start && $date_end && $date_start > $date_end) {
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorStartDateGreaterEnd');
+ return -1;
+ }
$this->db->begin();
@@ -2470,7 +2475,7 @@ class CommandeFournisseur extends CommonOrder
*/
public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $notrigger = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
{
- global $mysoc, $conf;
+ global $mysoc, $conf, $langs;
dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -2478,8 +2483,6 @@ class CommandeFournisseur extends CommonOrder
if ($this->brouillon)
{
- $this->db->begin();
-
// Clean parameters
if (empty($qty)) $qty=0;
if (empty($info_bits)) $info_bits=0;
@@ -2500,6 +2503,13 @@ class CommandeFournisseur extends CommonOrder
// Check parameters
if ($type < 0) return -1;
+ if ($date_start && $date_end && $date_start > $date_end) {
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorStartDateGreaterEnd');
+ return -1;
+ }
+
+ $this->db->begin();
// Calcul du total TTC et de la TVA pour la ligne a partir de
// qty, pu, remise_percent et txtva
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 4450ee611f8..703b90cc831 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -5,7 +5,7 @@
* Copyright (C) 2005 Marc Barilley
* Copyright (C) 2005-2012 Regis Houssin
* Copyright (C) 2010-2017 Juanjo Menent
- * Copyright (C) 2013-2018 Philippe Grand
+ * Copyright (C) 2013-2019 Philippe Grand
* Copyright (C) 2013 Florian Henry
* Copyright (C) 2014-2016 Marcos García
* Copyright (C) 2015 Bahfir Abbes
@@ -113,10 +113,35 @@ class FactureFournisseur extends CommonInvoice
public $author;
public $libelle;
- public $datec; // Creation date
- public $tms; // Last update date
- public $date; // Invoice date
- public $date_echeance; // Max payment date
+
+ /**
+ * Date creation record (datec)
+ *
+ * @var integer
+ */
+ public $datec;
+
+ /**
+ * Date modification record (tms)
+ *
+ * @var integer
+ */
+ public $tms;
+
+ /**
+ * Invoice date (date)
+ *
+ * @var integer
+ */
+ public $date;
+
+ /**
+ * Max payment date (date_echeance)
+ *
+ * @var integer
+ */
+ public $date_echeance;
+
public $amount=0;
public $remise=0;
public $tva=0;
@@ -1471,16 +1496,22 @@ class FactureFournisseur extends CommonInvoice
return 0;
}
+ dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
+
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
- $sql.= " SET fk_statut = 0";
+ $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
$sql.= " WHERE rowid = ".$this->id;
- dol_syslog(get_class($this)."::set_draft", LOG_DEBUG);
$result=$this->db->query($sql);
if ($result)
{
+ if (! $error)
+ {
+ $this->oldcopy= clone $this;
+ }
+
// Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
if ($result >= 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
{
@@ -1585,6 +1616,12 @@ class FactureFournisseur extends CommonInvoice
if (!preg_match('/\((.*)\)/', $txtva)) {
$txtva = price2num($txtva); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
}
+
+ if ($date_start && $date_end && $date_start > $date_end) {
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorStartDateGreaterEnd');
+ return -1;
+ }
$this->db->begin();
@@ -1806,7 +1843,7 @@ class FactureFournisseur extends CommonInvoice
*/
public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = false, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
{
- global $mysoc;
+ global $mysoc, $langs;
dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$notrigger,$date_start,$date_end,$fk_unit,$pu_ht_devise,$ref_supplier", LOG_DEBUG);
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -1818,6 +1855,12 @@ class FactureFournisseur extends CommonInvoice
// Check parameters
//if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
if ($type < 0) return -1;
+
+ if ($date_start && $date_end && $date_start > $date_end) {
+ $langs->load("errors");
+ $this->error=$langs->trans('ErrorStartDateGreaterEnd');
+ return -1;
+ }
// Clean parameters
if (empty($vatrate)) $vatrate=0;
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index bdf480ccfc4..7fc1b990c09 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -200,6 +200,69 @@ if (empty($reshook))
if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
}
+ // Edit Thirdparty
+ if (! empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $user->rights->fournisseur->commande->creer && $object->statut == CommandeFournisseur::STATUS_DRAFT)
+ {
+ $new_socid = GETPOST('new_socid', 'int');
+ if(! empty($new_socid) && $new_socid != $object->thirdparty->id) {
+ $db->begin();
+
+ // Update supplier
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
+ $sql .= ' SET fk_soc='.$new_socid;
+ $sql.= ' WHERE fk_soc='.$object->thirdparty->id;
+ $sql.= ' AND rowid='.$object->id;
+
+ $res = $db->query($sql);
+
+ if(! $res) $db->rollback();
+ else {
+ $db->commit();
+
+ // Replace prices for each lines by new supplier prices
+ foreach($object->lines as $l) {
+ $sql = 'SELECT price, unitprice, tva_tx, ref_fourn';
+ $sql.= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
+ $sql.= ' WHERE fk_product='.$l->fk_product;
+ $sql.= ' AND fk_soc='.$new_socid;
+ $sql.= ' ORDER BY unitprice ASC';
+
+ $resql = $db->query($sql);
+ if($resql) {
+ $num_row = $db->num_rows($resql);
+ if(empty($num_row)) {
+ // No product price for this supplier !
+ $l->subprice = 0;
+ $l->total_ht = 0;
+ $l->total_tva = 0;
+ $l->total_ttc = 0;
+ $l->ref_supplier = '';
+ $l->update();
+ }
+ else {
+ // No need for loop to keep best supplier price
+ $obj = $db->fetch_object($resql);
+ $l->subprice = $obj->unitprice;
+ $l->total_ht = $obj->price;
+ $l->tva_tx = $obj->tva_tx;
+ $l->total_tva = $l->total_ht * ($obj->tva_tx/100);
+ $l->total_ttc = $l->total_ht + $l->total_tva;
+ $l->ref_supplier = $obj->ref_fourn;
+ $l->update();
+ }
+ }
+ else {
+ dol_print_error($db);
+ }
+ $db->free($resql);
+ }
+ $object->update_price();
+ }
+ }
+ header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
+ exit;
+ }
+
if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer)
{
$result = $object->set_remise($user, $_POST['remise_percent']);
@@ -404,7 +467,7 @@ if (empty($reshook))
$desc = $productsupplier->desc_supplier;
} else $desc = $productsupplier->description;
- if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->CHANGE_ORDER_CONCAT_DESCRIPTION));
+ if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
$type = $productsupplier->type;
$price_base_type = ($productsupplier->fourn_price_base_type?$productsupplier->fourn_price_base_type:'HT');
@@ -1496,7 +1559,7 @@ if ($action=='create')
});
';
}
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").'';
}
print '
';
@@ -1558,7 +1621,7 @@ if ($action=='create')
$langs->load('projects');
print '
';
}
+ $parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+ $reshook=$hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+
print "
';
-/*
+
// Define $urlwithroot
$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -106,26 +113,13 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain
// Show message
$message='';
-$url=$urlwithroot.'/api/index.php/login?login=auserlogin&password=thepassword[&reset=1]';
-$message.=$langs->trans("UrlToGetKeyToUseAPIs").': ';
+$url=$urlwithroot.'/ifttt/index.php?securekey='.$conf->global->IFTTT_DOLIBARR_ENDPOINT_SECUREKEY;
+$message.=$langs->trans("UrlForIFTTT").': ';
$message.=img_picto('', 'object_globe.png').' '.$url;
print $message;
print ' ';
print ' ';
-// Explorer
-print ''.$langs->trans("ApiExporerIs").': ';
-if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/explorer'))
-{
- $url=DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
- print img_picto('', 'object_globe.png').' '.$url." \n";
-}
-else
-{
- print $langs->trans("NotAvailableWithThisDistribution");
-}
-
-*/
llxFooter();
$db->close();
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index b493534f772..6ccb0adcf44 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -92,7 +92,7 @@ if (count($import->array_import_code))
{
//if ($user->rights->import->run)
//{
- print ''.$langs->trans("NewImport").'';
+ print ''.$langs->trans("NewImport").'';
//}
//else
//{
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 4928bfe7856..34d903a0da7 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -9,6 +9,7 @@
-- Copyright (C) 2012 Sebastian Neuwert
-- Copyright (C) 2012 Ricardo Schluter
-- Copyright (C) 2015 Ferran Marcet
+-- Copyright (C) 2019~ Lao Tian <281388879@qq.com>
--
-- 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
@@ -352,3 +353,39 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (25
-- Regions Slovenia (rowid country=202)
INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ('202', '20203', 'SI03', NULL, 'East Slovenia');
INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ('202', '20204', 'SI04', NULL, 'West Slovenia');
+
+-- Regions China (rowid country=9)
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,901, '京',0,'北京市');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,902, '津',0,'天津市');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,903, '沪',0,'上海市');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,904, '渝',0,'重庆市');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,905, '冀',0,'河北省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,906, '晋',0,'山西省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,907, '辽',0,'辽宁省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,908, '吉',0,'吉林省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,909, '黑',0,'黑龙江省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,910, '苏',0,'江苏省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,911, '浙',0,'浙江省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,912, '皖',0,'安徽省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,913, '闽',0,'福建省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,914, '赣',0,'江西省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,915, '鲁',0,'山东省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,916, '豫',0,'河南省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,917, '鄂',0,'湖北省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,918, '湘',0,'湖南省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,919, '粤',0,'广东省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,920, '琼',0,'海南省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,921, '川',0,'四川省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,922, '贵',0,'贵州省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,923, '云',0,'云南省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,924, '陕',0,'陕西省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,925, '甘',0,'甘肃省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,926, '青',0,'青海省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,927, '台',0,'台湾省');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,928, '蒙',0,'内蒙古自治区');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,929, '桂',0,'广西壮族自治区');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,930, '藏',0,'西藏自治区');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,931, '宁',0,'宁夏回族自治区');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,932, '新',0,'新疆维吾尔自治区');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,933, '港',0,'香港特别行政区');
+insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,934, '澳',0,'澳门特别行政区');
diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index 219deef6dc2..f75c618612d 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -189,7 +189,7 @@ ALTER TABLE llx_socpeople ADD COLUMN linkedin varchar(255) after whatsapp;
ALTER TABLE llx_adherent ADD COLUMN linkedin varchar(255) after whatsapp;
ALTER TABLE llx_user ADD COLUMN linkedin varchar(255) after whatsapp;
-ALTER TABLE llx_expensereport_det ADD COLUMN fk_expensereport_line integer DEFAULT NULL;
+ALTER TABLE llx_expensereport_det ADD COLUMN fk_ecm_files integer DEFAULT NULL;
CREATE TABLE llx_bom_bom(
@@ -271,3 +271,7 @@ ALTER TABLE llx_expensereport_det ADD COLUMN subprice double(24,8) DEFAULT 0 NOT
ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_parent (fk_product_parent);
ALTER TABLE llx_product_attribute_combination ADD INDEX idx_product_att_com_product_child (fk_product_child);
+ALTER TABLE llx_product ADD COLUMN fk_project integer DEFAULT NULL;
+ALTER TABLE llx_product ADD INDEX idx_product_fk_project (fk_project);
+
+ALTER TABLE llx_actioncomm ADD COLUMN calling_duration integer;
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
index 6312fa5785f..e4071e5500a 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
@@ -19,7 +19,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
fk_emailcollector INTEGER NOT NULL,
type varchar(128) NOT NULL,
- rulevalue varchar(255) NULL,
+ rulevalue varchar(128) NULL,
date_creation datetime NOT NULL,
tms timestamp NOT NULL,
fk_user_creat integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expensereport_det.sql b/htdocs/install/mysql/tables/llx_expensereport_det.sql
index c87d26c94a8..75d503ac181 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_det.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_det.sql
@@ -51,7 +51,7 @@ CREATE TABLE llx_expensereport_det
multicurrency_total_tva double(24,8) DEFAULT 0,
multicurrency_total_ttc double(24,8) DEFAULT 0,
fk_facture integer DEFAULT 0, -- ID of customer invoice line if expense is rebilled to a customer
- fk_expensereport_line integer DEFAULT NULL, -- ID of ECM file that is source document of expense report
+ fk_ecm_files integer DEFAULT NULL, -- ID of ECM file that is source document of expense report
fk_code_ventilation integer DEFAULT 0,
rang integer DEFAULT 0, -- position of line
import_key varchar(14),
diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql
index d339f2082ee..bd48aa99cd4 100644
--- a/htdocs/install/mysql/tables/llx_product.key.sql
+++ b/htdocs/install/mysql/tables/llx_product.key.sql
@@ -30,6 +30,7 @@ ALTER TABLE llx_product ADD INDEX idx_product_seuil_stock_alerte (seuil_stock_al
ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country);
ALTER TABLE llx_product ADD INDEX idx_product_fk_user_author (fk_user_author);
ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type);
+ALTER TABLE llx_product ADD INDEX idx_product_fk_project (fk_project);
ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 8569c6e28d2..fb6e4cf5f1a 100755
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -94,5 +94,6 @@ create table llx_product
fk_price_expression integer, -- Link to the rule for dynamic price calculation
desiredstock integer DEFAULT 0,
fk_unit integer DEFAULT NULL,
- price_autogen tinyint DEFAULT 0
+ price_autogen tinyint DEFAULT 0,
+ fk_project integer DEFAULT NULL -- Used when product was generated by a project or is specifif to a project
)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6719b35f795..709e2267405 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -481,9 +481,11 @@ FilesAttachedToEmail=Attach file
SendEmailsReminders=Send agenda reminders by emails
davDescription=Setup a WebDAV server
DAVSetup=Setup of module DAV
-DAV_ALLOW_PUBLIC_DIR=Enable the public directory (WebDAV directory - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The WebDAV public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the private directory (root directory of the DMS/ECM module - login required)
+DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
+DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
+DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
+DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
+DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
# Modules
Module0Name=Users & Groups
@@ -1053,8 +1055,8 @@ Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=%s -> %s Basic parameters used to customize the default behavior of Dolibarr (e.g for country-related features).
-SetupDescription4=%s -> %s Dolibarr ERP/CRM is a collection of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+SetupDescription3=%s -> %s Basic parameters used to customize the default behavior of your application (e.g for country-related features).
+SetupDescription4=%s -> %s This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
SetupDescription5=Other Setup menu entries manage optional parameters.
LogEvents=Security audit events
Audit=Audit
@@ -1837,7 +1839,7 @@ XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (f
RecordEvent=Record email event
CreateLeadAndThirdParty=Create lead (and third party if necessary)
CodeLastResult=Result code of last collect
-NbOfEmailsInInbox=Number of email in source directory
+NbOfEmailsInInbox=Number of emails in source directory
LoadThirdPartyFromName=Load third party from name (load only)
LoadThirdPartyFromNameOrCreate=Load third party from name (create if not found)
WithDolTrackingID=Dolibarr Tracking ID found
@@ -1848,7 +1850,6 @@ ECMAutoTree=Show automatic ECM tree
OperationParamDesc=Define values to use for action, or how to extract values. For example: VALUE:abc REGEX:SUBJECT:([^\s]*) REGEX:BODY:My company name is\s([^\s]*)
OpeningHours=Opening hours
OpeningHoursDesc=Enter here the regular opening hours of your company.
-##### Resource ####
ResourceSetup=Configuration of Resource module
UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
DisabledResourceLinkUser=Disable feature to link a resource to users
@@ -1871,4 +1872,6 @@ LogsLinesNumber=Number of lines to show on logs tab
UseDebugBar=Use the debug bar
DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
\ No newline at end of file
+DebugBarModuleActivated=Module debugbar is activated and slows dramaticaly the interface
+EXPORTS_SHARE_MODELS=Export models are share with everybody
+ExportSetup=Setup of module Export
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 0934b4c1e46..8aa6d8ffb52 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -550,4 +550,4 @@ AutoFillDateFromShort=Set start date
AutoFillDateTo=Set end date for service line with next invoice date
AutoFillDateToShort=Set end date
MaxNumberOfGenerationReached=Max number of gen. reached
-BILL_DELETEInDolibarr=Invoice deleted
+BILL_DELETEInDolibarr=Invoice deleted
\ No newline at end of file
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 83939e94187..dc6ae7dc02e 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -50,9 +50,14 @@ TheoricalAmount=Theorical amount
RealAmount=Real amount
CashFenceDone=Cash fence done for the period
NbOfInvoices=Nb of invoices
-Paymentnumpad=Payment Num Pad
+Paymentnumpad=Type of Pad to enter payment
Numberspad=Numbers Pad
-BillsCoinsPad=Bills and Coins Pad
+BillsCoinsPad=Coins and banknotes Pad
DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
\ No newline at end of file
+OrderNotes=Order Notes
+CashDeskBankAccountFor=Default account to use for payments in
+NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
+TicketVatGrouped=Group VAT by rate in tickets
+AutoPrintTickets=Automatically print tickets
+EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
\ No newline at end of file
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 9a75ef1a950..7931f6ec3b6 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -97,8 +97,6 @@ LocalTax2IsUsedES= IRPF is used
LocalTax2IsNotUsedES= IRPF is not used
LocalTax1ES=RE
LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
WrongCustomerCode=Customer code invalid
WrongSupplierCode=Vendor code invalid
CustomerCodeModel=Customer code model
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 5e1e8fcd32e..6f12bd4ca37 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -218,7 +218,8 @@ ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text
ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
# Warnings
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
+WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningEnableYourModulesApplications=Click here to enable your modules and applications
WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir.
WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 6638a4c1a04..54c86a1589c 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -402,6 +402,7 @@ LT1ES=RE
LT2ES=IRPF
LT1IN=CGST
LT2IN=SGST
+LT1GC=Additionnal cents
VATRate=Tax Rate
VATCode=Tax Rate code
VATNPR=Tax Rate NPR
@@ -964,4 +965,5 @@ SelectAThirdPartyFirst=Select a third party first...
YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
Inventory=Inventory
AnalyticCode=Analytic code
-TMenuMRP=MRP
\ No newline at end of file
+TMenuMRP=MRP
+ShowMoreInfos=Show More Infos
\ No newline at end of file
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index c10f57aec43..8e2d57a03fc 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -104,4 +104,9 @@ ContentCantBeEmpty=Content of file can't be empty
WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
CLIDesc=You can generate here some command line scripts you want to provide with your module.
CLIFile=CLI File
-NoCLIFile=No CLI files
\ No newline at end of file
+NoCLIFile=No CLI files
+UseSpecificEditorName = Use a specific editor name
+UseSpecificEditorURL = Use a specific editor URL
+UseSpecificFamily = Use a specific family
+UseSpecificAuthor = Use a specific author
+UseSpecificVersion = Use a specific initial version
\ No newline at end of file
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 325297b6d1f..3304ab3b3ef 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -39,9 +39,10 @@ ServicesOnSellAndOnBuy=Services for sale and for purchase
LastModifiedProductsAndServices=Last %s modified products/services
LastRecordedProducts=Latest %s recorded products
LastRecordedServices=Latest %s recorded services
-CardProduct0=Product card
-CardProduct1=Service card
+CardProduct0=Product
+CardProduct1=Service
Stock=Stock
+MenuStocks=Stocks
Stocks=Stocks and location (warehouse) of products
Movements=Movements
Sell=Sell
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 4f395925cdd..df0563383c0 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -57,6 +57,8 @@ NewTimeSpent=Time spent
MyTimeSpent=My time spent
BillTime=Bill the time spent
BillTimeShort=Bill time
+TimeToBill=Time not billed
+TimeBilled=Time billed
Tasks=Tasks
Task=Task
TaskDateStart=Task start date
@@ -114,7 +116,7 @@ ConfirmCloseAProject=Are you sure you want to close this project?
AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
ReOpenAProject=Open project
ConfirmReOpenAProject=Are you sure you want to re-open this project?
-ProjectContact=Project contacts
+ProjectContact=Contacts of project
TaskContact=Task contacts
ActionsOnProject=Events on project
YouAreNotContactOfProject=You are not a contact of this private project
@@ -123,7 +125,7 @@ DeleteATimeSpent=Delete time spent
ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
DoNotShowMyTasksOnly=See also tasks not assigned to me
ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Contacts task
+TaskRessourceLinks=Contacts of task
ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
NoTasks=No tasks for this project
LinkedToAnotherCompany=Linked to other third party
@@ -237,8 +239,7 @@ ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to
NewTaskRefSuggested=Task ref already used, a new task ref is required
TimeSpentInvoiced=Time spent billed
TimeSpentForInvoice=Time spent
-GenerateInvoice=Generate invoice
OneLinePerUser=One line per user
ServiceToUseOnLines=Service to use on lines
InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project and plan to generate invoice(s) from the timesheet to invoice the customer of project.
\ No newline at end of file
+ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets).
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index f588b04a751..44c978784a4 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -49,3 +49,7 @@ AmountAtEndOfPeriod=Montant en fin de période (jour, mois ou année)
TheoricalAmount=Montant théorique
RealAmount=Montant réel
CashFenceDone=Clôture de caisse faite pour la période
+CashDeskBankAccountFor=Compte utilisé pour les paiements en
+NoPaimementModesDefined=Pas de mode de paiement défini dans la configuration de TakePOS
+TicketVatGrouped=Grouper la TVA par taux dans les tickets
+AutoPrintTickets=Imprimet les tickets automatiquement
\ No newline at end of file
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 1c9d6f97a01..bb2b69f63f2 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -743,7 +743,7 @@ if ($id > 0)
$staytopay = $object->capital - $totalpaid;
print '
\n";
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 2fb58d6132c..e4b51c2429a 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -116,7 +116,7 @@ if ($resql)
$newcardbutton='';
if ($user->rights->loan->write)
{
- $newcardbutton=''.$langs->trans('NewLoan').'';
+ $newcardbutton=''.$langs->trans('NewLoan').'';
$newcardbutton.= '';
$newcardbutton.= '';
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 109d0f5f1fe..805fdc90d19 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -194,7 +194,7 @@ if (! empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6)
set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
}
-// Include the conf.php and functions.lib.php
+// Include the conf.php and functions.lib.php. This defined the constants like DOL_DOCUMENT_ROOT, DOL_DATA_ROOT, DOL_URL_ROOT...
require_once 'filefunc.inc.php';
// If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
@@ -242,12 +242,24 @@ if (! defined('NOSESSION'))
}*/
}
-// Init the 5 global objects, this include will make the new and set properties for: $conf, $db, $langs, $user, $mysoc
+// Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
require_once 'master.inc.php';
// Activate end of page function
register_shutdown_function('dol_shutdown');
+// Load debugbar
+if (! empty($conf->debugbar->enabled))
+{
+ global $debugbar;
+ include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
+ $debugbar = new DolibarrDebugBar();
+ $renderer = $debugbar->getRenderer();
+ $conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();
+
+ $debugbar['time']->startMeasure('pageaftermaster', 'Page generation (after environment init)');
+}
+
// Detection browser
if (isset($_SERVER["HTTP_USER_AGENT"]))
{
@@ -1582,7 +1594,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
}
}
- print '
';
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 4813aee6dd4..0e80c0ba4ac 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2018 Nicolas ZABOURI
+ * Copyright (C) 2018-2019 Nicolas ZABOURI
*
* 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
@@ -191,6 +191,14 @@ if ($dirins && $action == 'initmodule' && $modulename)
'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email?' <'.$user->email.'>':'')
);
+ if($conf->global->MAIN_FEATURES_LEVEL >= 2){
+ if(!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME)) $arrayreplacement['Editor name'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME;
+ if(!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL)) $arrayreplacement['https://www.example.com'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL;
+ if(!empty($conf->global->MODULEBUILDER_SPECIFIC_AUTHOR)) $arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR;
+ if(!empty($conf->global->MODULEBUILDER_SPECIFIC_VERSION)) $arrayreplacement['1.0'] = $conf->global->MODULEBUILDER_SPECIFIC_VERSION;
+ if(!empty($conf->global->MODULEBUILDER_SPECIFIC_FAMILY)) $arrayreplacement['other'] = $conf->global->MODULEBUILDER_SPECIFIC_FAMILY;
+ }
+
$result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
//var_dump($result);
if ($result < 0)
@@ -1238,7 +1246,7 @@ $head = array();
$h=0;
$head[$h][0] = $_SERVER["PHP_SELF"].'?module=initmodule';
-$head[$h][1] = $langs->trans("NewModule").'';
+$head[$h][1] = ''.$langs->trans("NewModule").'';
$head[$h][2] = 'initmodule';
$h++;
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index f8b1e83d6b6..0d073dca768 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2018 Nicolas ZABOURI
+ * Copyright (C) 2018-2019 Nicolas ZABOURI
* Copyright (C) 2019 Frédéric France
* Copyright (C) ---Put here your own copyright and developer email---
*
@@ -17,7 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-
/**
* \defgroup mymodule Module MyModule
* \brief MyModule module descriptor.
@@ -27,8 +26,6 @@
* \brief Description and activation file for module MyModule
*/
include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
-
-
/**
* Description and activation class for module MyModule
*/
@@ -42,15 +39,12 @@ class modMyModule extends DolibarrModules
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 = 500000; // 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 = 'mymodule';
-
// 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 = "other";
@@ -58,20 +52,16 @@ class modMyModule extends DolibarrModules
$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 'ModuleMyModuleName' not found (MyModule is name of module).
$this->name = preg_replace('/^mod/i', '', get_class($this));
// Module description, used if translation string 'ModuleMyModuleDesc' not found (MyModule is name of module).
$this->description = "MyModuleDescription";
// Used only if file README.md and README-LL.md not found.
$this->descriptionlong = "MyModule description (Long)";
-
$this->editor_name = 'Editor name';
$this->editor_url = 'https://www.example.com';
-
// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
$this->version = '1.0';
-
//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 MYMODULE is value of property name of module in uppercase)
@@ -80,15 +70,14 @@ class modMyModule extends DolibarrModules
// 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(
// Set this to 1 if module has its own trigger directory (core/triggers)
- 'triggers' => 1,
+ 'triggers' => 0,
// Set this to 1 if module has its own login method file (core/login)
'login' => 0,
// Set this to 1 if module has its own substitution function file (core/substitutions)
- 'substitutions' => 1,
+ 'substitutions' => 0,
// Set this to 1 if module has its own menus handler directory (core/menus)
'menus' => 0,
// Set this to 1 if module overwrite template dir (core/tpl)
@@ -101,31 +90,28 @@ class modMyModule extends DolibarrModules
'theme' => 0,
// Set this to relative path of css file if module has its own css file
'css' => array(
- '/mymodule/css/mymodule.css.php',
+ // '/mymodule/css/mymodule.css.php',
),
// Set this to relative path of js file if module must load a js on all pages
'js' => array(
- '/mymodule/js/mymodule.js.php',
+ // '/mymodule/js/mymodule.js.php',
),
// 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'
'hooks' => array(
- 'data' => array(
- 'hookcontext1',
- 'hookcontext2',
- ),
- 'entity' => '0',
+ // 'data' => array(
+ // 'hookcontext1',
+ // 'hookcontext2',
+ // ),
+ // 'entity' => '0',
),
// Set this to 1 if feature of module are opened to external users
'moduleforexternal' => 0,
);
-
// Data directories to create when module is enabled.
// Example: this->dirs = array("/mymodule/temp","/mymodule/subdir");
$this->dirs = array("/mymodule/temp");
-
// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
$this->config_page_url = array("setup.php@mymodule");
-
// Dependencies
// A condition to hide module
$this->hidden = false;
@@ -140,28 +126,23 @@ class modMyModule extends DolibarrModules
$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'=>'MyModuleWasAutomaticallyActivatedBecauseOfYourCountryChoice');
//$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(1 => array('MYMODULE_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
// 2 => array('MYMODULE_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
// );
$this->const = array(
- 1 => array('MYMODULE_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
+ // 1 => array('MYMODULE_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->mymodule) || ! isset($conf->mymodule->enabled)) {
$conf->mymodule=new stdClass();
$conf->mymodule->enabled=0;
}
-
-
// Array to add new pages in new tabs
$this->tabs = array();
// Example:
@@ -189,8 +170,6 @@ class modMyModule extends DolibarrModules
// '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:
@@ -216,76 +195,63 @@ class modMyModule extends DolibarrModules
'tabcond'=>array($conf->mymodule->enabled,$conf->mymodule->enabled,$conf->mymodule->enabled)
);
*/
-
-
// Boxes/Widgets
// Add here list of php file(s) stored in mymodule/core/boxes that contains class to show a widget.
$this->boxes = array(
- 0 => array(
- 'file' => 'mymodulewidget1.php@mymodule',
- 'note' => 'Widget provided by MyModule',
- 'enabledbydefaulton' => 'Home',
- ),
+ // 0 => array(
+ // 'file' => 'mymodulewidget1.php@mymodule',
+ // 'note' => 'Widget provided by MyModule',
+ // 'enabledbydefaulton' => 'Home',
+ // ),
//1=>array('file'=>'mymodulewidget2.php@mymodule','note'=>'Widget provided by MyModule'),
//2=>array('file'=>'mymodulewidget3.php@mymodule','note'=>'Widget provided by MyModule')
);
-
-
// 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' => '/mymodule/class/myobject.class.php',
- 'objectname' => 'MyObject',
- 'method' => 'doScheduledJob',
- 'parameters' => '',
- 'comment' => 'Comment',
- 'frequency' => 2,
- 'unitfrequency' => 3600,
- 'status' => 0,
- 'test' => '$conf->mymodule->enabled',
- 'priority' => 50,
- ),
+ // 0 => array(
+ // 'label' => 'MyJob label',
+ // 'jobtype' => 'method',
+ // 'class' => '/mymodule/class/myobject.class.php',
+ // 'objectname' => 'MyObject',
+ // 'method' => 'doScheduledJob',
+ // 'parameters' => '',
+ // 'comment' => 'Comment',
+ // 'frequency' => 2,
+ // 'unitfrequency' => 3600,
+ // 'status' => 0,
+ // 'test' => '$conf->mymodule->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->mymodule->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->mymodule->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 myobject of MyModule'; // 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->mymodule->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-
$r++;
$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
$this->rights[$r][1] = 'Create/Update myobject of MyModule'; // 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->mymodule->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mymodule->level1->level2)
-
$r++;
$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
$this->rights[$r][1] = 'Delete myobject of MyModule'; // 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->mymodule->level1->level2)
$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mymodule->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
@@ -301,9 +267,7 @@ class modMyModule extends DolibarrModules
'target'=>'',
'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
);
-
/* END MODULEBUILDER TOPMENU */
-
/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
$this->menu[$r++]=array(
'fk_menu'=>'fk_mainmenu=mymodule', // '' 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
@@ -334,11 +298,8 @@ class modMyModule extends DolibarrModules
'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
);
END MODULEBUILDER LEFTMENU MYOBJECT */
-
-
// Exports
$r=1;
-
/* BEGIN MODULEBUILDER EXPORT MYOBJECT */
/*
$langs->load("mymodule@mymodule");
@@ -357,7 +318,6 @@ class modMyModule extends DolibarrModules
$r++; */
/* END MODULEBUILDER EXPORT MYOBJECT */
}
-
/**
* Function called when module is enabled.
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
@@ -370,22 +330,17 @@ class modMyModule extends DolibarrModules
{
$result=$this->_load_tables('/mymodule/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, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->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, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text', 1, 10, 'user', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled');
-
$sql = array();
-
return $this->_init($sql, $options);
}
-
/**
* Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database.
@@ -397,7 +352,6 @@ class modMyModule extends DolibarrModules
public function remove($options = '')
{
$sql = array();
-
return $this->_remove($sql, $options);
}
-}
+}
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 35c60248ccf..8e0a8e08bff 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -350,13 +350,13 @@ print '';
$newcardbutton='';
//if ($user->rights->mymodule->creer)
//{
- $newcardbutton=''.$langs->trans('New').'';
+ $newcardbutton=''.$langs->trans('New').'';
$newcardbutton.= '';
$newcardbutton.= '';
//}
//else
//{
-// $newcardbutton=''.$langs->trans('New');
+// $newcardbutton=''.$langs->trans('New').';
// $newcardbutton.= '';
// $newcardbutton.= '';
//}
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 713ade2f736..498717385c2 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -245,13 +245,13 @@ print '';
$newcardbutton='';
if (! empty($user->rights->opensurvey->write))
{
- $newcardbutton=''.$langs->trans('NewSurvey').'';
+ $newcardbutton=''.$langs->trans('NewSurvey').'';
$newcardbutton.= '';
$newcardbutton.= '';
}
else
{
- $newcardbutton=''.$langs->trans('NewSurvey');
+ $newcardbutton=''.$langs->trans('NewSurvey').'';
$newcardbutton.= '';
$newcardbutton.= '';
}
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 961faf742cd..0d6a0f05174 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -176,11 +176,11 @@ if ($id > 0 || $ref)
{
if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
{
- $morehtmlcenter.=''.$langs->trans("AddAction").'';
+ $morehtmlcenter.=''.$langs->trans("AddAction").'';
}
else
{
- $morehtmlcenter.=''.$langs->trans("AddAction").'';
+ $morehtmlcenter.=''.$langs->trans("AddAction").'';
}
}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index f186c1d21da..cb7d40d3c7a 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4062,7 +4062,8 @@ class Product extends CommonObject
$linkend='';
$result.=$linkstart;
- if ($withpicto) {
+ if ($withpicto)
+ {
if ($this->type == Product::TYPE_PRODUCT) { $result.=(img_object(($notooltip?'':$label), 'product', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
}
if ($this->type == Product::TYPE_SERVICE) { $result.=(img_object(($notooltip?'':$label), 'service', ($notooltip?'class="paddinright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
@@ -4151,11 +4152,11 @@ class Product extends CommonObject
{
// phpcs:enable
global $conf, $langs;
-
+
$langs->load('products');
if (! empty($conf->productbatch->enabled)) { $langs->load("productbatch");
}
-
+
if ($type == 2) {
switch ($mode)
{
@@ -4177,9 +4178,9 @@ class Product extends CommonObject
return dolGetStatus($langs->trans('Unknown'));
}
}
-
+
$statuttrans=empty($status)?'status5':'status4';
-
+
if($status == 0){
// $type 0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
if($type==0){
@@ -4210,8 +4211,8 @@ class Product extends CommonObject
$labelstatutShort = $langs->trans('ProductStatusOnBatchShort');
}
}
-
-
+
+
if($mode>6){
return dolGetStatus($langs->trans('Unknown'), '', '', 'status0', 0);
}
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 9c2f45c0159..94db650a519 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -223,7 +223,7 @@ if ($object->id)
print '
';
print '';
- print '
';
+ print '
';
print '
'.$langs->trans("NbOfAttachedFiles").'
'.count($filearray).'
';
print '
'.$langs->trans("TotalSizeOfAttachedFiles").'
'.dol_print_size($totalsize, 1, 1).'
';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index d7b6fc14cf5..b02295c94e3 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -435,7 +435,7 @@ if ($resql)
{
$label='NewProduct';
if($type == Product::TYPE_SERVICE) $label='NewService';
- $newcardbutton=''.$langs->trans($label).'';
+ $newcardbutton=''.$langs->trans($label).'';
$newcardbutton.= '';
$newcardbutton.= '';
}
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 0738d421c3c..4b753e71838 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1280,9 +1280,6 @@ if ($action == 'edit_price' && $object->getRights()->creer)
$parameters=array('colspan' => 2);
$reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- $parameters=array('colspan' => 2);
- $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-
print '
';
dol_fiche_end();
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 31bbfa4b701..442748ae935 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -115,8 +115,6 @@ $helpurl='EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
$form=new Form($db);
$htmlother=new FormOther($db);
-$title=$langs->trans("ProductsAndServices");
-
$sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,';
$sql.= ' p.fk_product_type, p.tms as datem,';
$sql.= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
@@ -191,22 +189,22 @@ if ($resql)
} else {
$texte = $langs->trans("ProductsAndServices");
}
- $texte.=' ('.$langs->trans("Stocks").')';
+ $texte.=' ('.$langs->trans("MenuStocks").')';
$param='';
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
- if ($sall) $param.="&sall=".$sall;
- if ($tosell) $param.="&tosell=".$tosell;
- if ($tobuy) $param.="&tobuy=".$tobuy;
- if ($type) $param.="&type=".$type;
- if ($fourn_id) $param.="&fourn_id=".$fourn_id;
- if ($snom) $param.="&snom=".$snom;
- if ($sref) $param.="&sref=".$sref;
- if ($search_sale) $param.="&search_sale=".$search_sale;
- if ($search_categ) $param.="&search_categ=".$search_categ;
- if ($toolowstock) $param.="&toolowstock=".$toolowstock;
- if ($sbarcode) $param.="&sbarcode=".$sbarcode;
- if ($catid) $param.="&catid=".$catid;
+ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+ if ($sall) $param.="&sall=".urlencode($sall);
+ if ($tosell) $param.="&tosell=".urlencode($tosell);
+ if ($tobuy) $param.="&tobuy=".urlencode($tobuy);
+ if ($type) $param.="&type=".urlencode($type);
+ if ($fourn_id) $param.="&fourn_id=".urlencode($fourn_id);
+ if ($snom) $param.="&snom=".urlencode($snom);
+ if ($sref) $param.="&sref=".urlencode($sref);
+ if ($search_sale) $param.="&search_sale=".urlencode($search_sale);
+ if ($search_categ) $param.="&search_categ=".urlencode($search_categ);
+ if ($toolowstock) $param.="&toolowstock=".urlencode($toolowstock);
+ if ($sbarcode) $param.="&sbarcode=".urlencode($sbarcode);
+ if ($catid) $param.="&catid=".urlencode($catid);
llxHeader("", $texte, $helpurl);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 7db2dffc7db..e36312e196c 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -134,7 +134,7 @@ if ($result)
$newcardbutton='';
if ($user->rights->stock->creer)
{
- $newcardbutton=''.$langs->trans('MenuNewWarehouse').'';
+ $newcardbutton=''.$langs->trans('MenuNewWarehouse').'';
$newcardbutton.= '';
$newcardbutton.= '';
}
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 362359f0999..d55d8651642 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -556,7 +556,7 @@ if ($action == 'create' && $user->rights->projet->creer)
print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
}
else print $text;
- print ' '.$langs->trans("AddThirdParty").' ';
+ print ' '.$langs->trans("AddThirdParty").'';
print '';
}
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 02bf2679b1b..5786b390a09 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -378,7 +378,7 @@ class Project extends CommonObject
if (file_exists($olddir))
{
include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
- $res=dol_move($olddir, $newdir);
+ $res=@rename($olddir, $newdir);
if (! $res)
{
$langs->load("errors");
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index cedcc590387..73d3603ea25 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -729,10 +729,11 @@ class Task extends CommonObject
* @param string $morewherefilter Add more filter into where SQL request (must start with ' AND ...')
* @param string $filteronprojuser Filter on user that is a contact of project
* @param string $filterontaskuser Filter on user assigned to task
- * @param array $extrafields Show additional column from project or task
+ * @param array $extrafields Show additional column from project or task
+ * @param int $includebilltime Calculate also the time to bill and billed
* @return array Array of tasks
*/
- public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields=array())
+ public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields=array(), $includebilltime = 0)
{
global $conf;
@@ -743,24 +744,25 @@ class Task extends CommonObject
// List of tasks (does not care about permissions. Filtering will be done later)
$sql = "SELECT ";
if ($filteronprojuser > 0 || $filterontaskuser > 0) $sql.= " DISTINCT"; // We may get several time the same record if user has several roles on same project/task
- $sql.= " p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus,";
+ $sql.= " p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut as projectstatus, p.bill_time,";
$sql.= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut as status,";
$sql.= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang,";
- $sql.= " s.rowid as thirdparty_id, s.nom as thirdparty_name, s.email as thirdparty_email";
+ $sql.= " s.rowid as thirdparty_id, s.nom as thirdparty_name, s.email as thirdparty_email,";
+ $sql.= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
+ if (!empty($extrafields->attributes['projet']['label']))
+ {
+ foreach ($extrafields->attributes['projet']['label'] as $key => $val) $sql.=($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key.' as options_'.$key : '');
+ }
+ if (!empty($extrafields->attributes['projet_task']['label']))
+ {
+ foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) $sql.=($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key.' as options_'.$key : '');
+ }
+ if ($includebilltime)
+ {
+ $sql.=", SUM(tt.task_duration * ".$this->db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.task_duration * ".$this->db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
+ }
- $sql.= ", p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount, p.bill_time ";
-
- if (!empty($extrafields->attributes['projet']['label']))
- {
- foreach ($extrafields->attributes['projet']['label'] as $key => $val) $sql.=($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key.' as options_'.$key : '');
- }
-
- if (!empty($extrafields->attributes['projet_task']['label']))
- {
- foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) $sql.=($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key.' as options_'.$key : '');
- }
-
- $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+ $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_extrafields as efp ON (p.rowid = efp.fk_object)";
@@ -772,6 +774,10 @@ class Task extends CommonObject
$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
}
$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+ if ($includebilltime)
+ {
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
+ }
if ($filterontaskuser > 0)
{
$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
@@ -791,12 +797,20 @@ class Task extends CommonObject
if ($filterontaskuser > 0)
{
$sql.= ", ".MAIN_DB_PREFIX."projet_task as t";
+ if ($includebilltime)
+ {
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
+ }
$sql.= ", ".MAIN_DB_PREFIX."element_contact as ec2";
$sql.= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
}
else
{
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
+ if ($includebilltime)
+ {
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as tt ON tt.fk_task = t.rowid";
+ }
}
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
$sql.= " WHERE p.entity IN (".getEntity('project').")";
@@ -827,6 +841,24 @@ class Task extends CommonObject
if ($filteronproj) $sql.= natural_search(array("p.ref", "p.title"), $filteronproj);
if ($filteronprojstatus && $filteronprojstatus != '-1') $sql.= " AND p.fk_statut IN (".$filteronprojstatus.")";
if ($morewherefilter) $sql.=$morewherefilter;
+ if ($includebilltime)
+ {
+ $sql.=" GROUP BY p.rowid, p.ref, p.title, p.public, p.fk_statut, p.bill_time,";
+ $sql.=" t.datec, t.dateo, t.datee, t.tms,";
+ $sql.=" t.rowid, t.ref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut,";
+ $sql.=" t.dateo, t.datee, t.planned_workload, t.rang,";
+ $sql.=" s.rowid, s.nom, s.email,";
+ $sql.=" p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
+ if (!empty($extrafields->attributes['projet']['label']))
+ {
+ foreach ($extrafields->attributes['projet']['label'] as $key => $val) $sql.=($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key : '');
+ }
+ if (!empty($extrafields->attributes['projet_task']['label']))
+ {
+ foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) $sql.=($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key : '');
+ }
+ }
+
$sql.= " ORDER BY p.ref, t.rang, t.dateo";
//print $sql;exit;
@@ -867,12 +899,17 @@ class Task extends CommonObject
$tasks[$i]->projectref = $obj->ref;
$tasks[$i]->projectlabel = $obj->plabel;
$tasks[$i]->projectstatus = $obj->projectstatus;
+ $tasks[$i]->bill_time = $obj->bill_time;
$tasks[$i]->label = $obj->label;
$tasks[$i]->description = $obj->description;
$tasks[$i]->fk_parent = $obj->fk_task_parent; // deprecated
$tasks[$i]->fk_task_parent = $obj->fk_task_parent;
$tasks[$i]->duration = $obj->duration_effective;
$tasks[$i]->planned_workload= $obj->planned_workload;
+
+ $tasks[$i]->tobill = $obj->tobill;
+ $tasks[$i]->billed = $obj->billed;
+
$tasks[$i]->progress = $obj->progress;
$tasks[$i]->fk_statut = $obj->status;
$tasks[$i]->public = $obj->public;
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 95d5e3dd229..8bed0a87adc 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -180,7 +180,7 @@ if ($id > 0 || ! empty($ref))
print '
';
diff --git a/htdocs/public/ifttt/index.php b/htdocs/public/ifttt/index.php
new file mode 100644
index 00000000000..a879dc1d41f
--- /dev/null
+++ b/htdocs/public/ifttt/index.php
@@ -0,0 +1,88 @@
+
+ *
+ * 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/public/ifttt/index.php
+ * \ingroup ifttt
+ * \brief Page to IFTTT endpoint agenda
+ * http://127.0.0.1/dolibarr/public/ifttt/index.php?securekey=...
+ */
+
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (! defined('NOLOGIN')) define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (! defined('NOCSRFCHECK')) define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+
+// This is a wrapper, so header is empty
+
+/**
+ * Header function
+ *
+ * @return void
+ */
+function llxHeaderVierge()
+{
+ print 'IFTTT API';
+}
+/**
+ * Footer function
+ *
+ * @return void
+ */
+function llxFooterVierge()
+{
+ print '';
+}
+
+
+require '../../main.inc.php';
+
+// Security check
+if (empty($conf->ifttt->enabled)) accessforbidden('', 0, 0, 1);
+
+// Check config
+if (empty($conf->global->IFTTT_DOLIBARR_ENDPOINT_SECUREKEY))
+{
+ $user->getrights();
+
+ llxHeaderVierge();
+ print '
';
@@ -250,7 +275,7 @@ class Dolistore
// free or pay ?
if ($product->price > 0) {
- $price = '