| ' . $langs->trans("Account") . ' | ';
print $formventilation->select_account($objp->fk_code_ventilation, 'codeventil', 1);
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 049e1d44687..31b1ae6701c 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2013-2016 Alexandre Spangaro
+ * Copyright (C) 2013-2017 Alexandre Spangaro
* Copyright (C) 2014-2015 Ari Elbaz (elarifr)
* Copyright (C) 2013-2016 Florian Henry
* Copyright (C) 2014 Juanjo Menent
@@ -148,7 +148,7 @@ print '';
-
-
// Part to create
if ($action == 'create')
{
@@ -335,19 +317,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print $formconfirm;
}
- print ''."\n";
$linkback = '' . $langs->trans("BackToList") . '';
- // Ref
- print '| ' . $langs->trans('Batch') . ' | ';
- print '';
- print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'batch');
- print ' | ';
- print ' ';
+ dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'batch');
+
+ print '';
+ print ' ';
+
+ print ' '."\n";
// Product
- print '| '.$langs->trans("Product").' | ';
+ print ' | | '.$langs->trans("Product").' | ';
$producttmp = new Product($db);
$producttmp->fetch($object->fk_product);
print $producttmp->getNomUrl(1, 'stock');
@@ -356,7 +337,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Eat by
print ' | | ';
print $form->editfieldkey($langs->trans('Eatby'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
- print ' | ';
+ print ' | ';
print $form->editfieldval($langs->trans('Eatby'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
print ' | ';
print ' ';
@@ -364,7 +345,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Sell by
print '| ';
print $form->editfieldkey($langs->trans('Sellby'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
- print ' | ';
+ print ' | ';
print $form->editfieldval($langs->trans('Sellby'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
print ' | ';
print ' ';
@@ -375,6 +356,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print ' ';
+ print ' '.$langs->trans("ThirdParty").' | ';
}
-print ''.$langs->trans("PlannedWorkload").' | ';
-print ''.$langs->trans("ProgressDeclared").' | ';
-print ''.$langs->trans("TimeSpent").' | ';
-if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' | ';
-else print ''.$langs->trans("TimeSpentByUser").' | ';
+print ''.$langs->trans("PlannedWorkload").' | ';
+print ''.$langs->trans("ProgressDeclared").' | ';
+print ''.$langs->trans("TimeSpent").' | ';
+if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' | ';
+else print ''.$langs->trans("TimeSpentByUser").' | ';
print ''.$langs->trans("HourStart").' | ';
print ''.$langs->trans("Duration").' | ';
print ''.$langs->trans("Note").' | ';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 9a34913b2f5..fb2f3f1c752 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -262,7 +262,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
// Redirect to avoid submit twice on back
- header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:''));
+ header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:''));
exit;
}
}
@@ -408,17 +408,17 @@ if (! empty($conf->global->PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY))
{
print ''.$langs->trans("ThirdParty").' | ';
}
-print ''.$langs->trans("PlannedWorkload").' | ';
-print ''.$langs->trans("ProgressDeclared").' | ';
-print ''.$langs->trans("TimeSpent").' | ';
-if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' | ';
-else print ''.$langs->trans("TimeSpentByUser").' | ';
+print ''.$langs->trans("PlannedWorkload").' | ';
+print ''.$langs->trans("ProgressDeclared").' | ';
+print ''.$langs->trans("TimeSpent").' | ';
+if ($usertoprocess->id == $user->id) print ''.$langs->trans("TimeSpentByYou").' | ';
+else print ''.$langs->trans("TimeSpentByUser").' | ';
$startday=dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']);
for($i=0;$i<7;$i++)
{
- print ''.dol_print_date($startday + ($i * 3600 * 24), '%a').'
'.dol_print_date($startday + ($i * 3600 * 24), 'dayreduceformat').' | ';
+ print ''.dol_print_date($startday + ($i * 3600 * 24), '%a').'
'.dol_print_date($startday + ($i * 3600 * 24), 'dayreduceformat').' | ';
}
print ' | ';
print "\n";
@@ -460,13 +460,13 @@ if (count($tasksarray) > 0)
print '
| '.$langs->trans("Total").' |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
';
}
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 661272631bc..f69b54cffdc 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -591,6 +591,7 @@ if ($action == 'create' && $user->rights->projet->creer)
// Categories
print '| '.$langs->trans("Categories").' | ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
+ $arrayselected=GETPOST('categories', 'array');
print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%');
print " | ";
}
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index b80547c6d00..c280f7aea55 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -3,7 +3,7 @@
* Copyright (C) 2005-2016 Laurent Destailleur
* Copyright (C) 2005-2010 Regis Houssin
* Copyright (C) 2013 Florian Henry
- * Copyright (C) 2014-2015 Marcos García
+ * Copyright (C) 2014-2017 Marcos García
* Copyright (C) 2017 Ferran Marcet
*
* This program is free software; you can redistribute it and/or modify
@@ -1737,16 +1737,19 @@ class Project extends CommonObject
*/
function load_state_board()
{
- global $conf;
+ global $user;
$this->nb=array();
- $sql = "SELECT count(u.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."projet as u";
+ $sql = "SELECT count(p.rowid) as nb";
+ $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql.= " WHERE";
- //$sql.= " WHERE u.fk_statut > 0";
- //$sql.= " AND employee != 0";
- $sql.= " u.entity IN (".getEntity('projet', 1).")";
+ $sql.= " p.entity IN (".getEntity('projet', 1).")";
+ if (! $user->rights->projet->all->lire)
+ {
+ $projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
+ $sql .= "AND p.rowid IN (".$projectsListId.")";
+ }
$resql=$this->db->query($sql);
if ($resql)
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index a39c05c8999..fea4093e175 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -680,7 +680,9 @@ foreach ($listofreferent as $key => $value)
{
$addform.='';
if ($testnew) $addform.=' '.($buttonnew?$langs->trans($buttonnew):$langs->trans("Create")).'';
- else $addform.=' '.($buttonnew?$langs->trans($buttonnew):$langs->trans("Create")).'';
+ elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
+ $addform.=' '.($buttonnew?$langs->trans($buttonnew):$langs->trans("Create")).'';
+ }
$addform.=' ';
}
@@ -1041,7 +1043,7 @@ foreach ($listofreferent as $key => $value)
print ' ';
if (empty($value['disableamount']))
{
- if (! empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
+ if ($tablename != 'projet_task' || ! empty($conf->salaries->enabled)) print ''.$langs->trans("TotalHT").' : '.price($total_ht);
}
print ' | ';
//if (empty($value['disableamount']) && ! in_array($tablename, array('projet_task'))) print ' '.$langs->trans("TotalTTC").' : '.price($total_ttc).' | ';
@@ -1049,8 +1051,7 @@ foreach ($listofreferent as $key => $value)
print ' ';
if (empty($value['disableamount']))
{
-
- if (! empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
+ if ($tablename != 'projet_task' || ! empty($conf->salaries->enabled)) print $langs->trans("TotalTTC").' : '.price($total_ttc);
}
print ' | ';
print ' | ';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 68077621771..dadc199d146 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -196,6 +196,7 @@ $title=$langs->trans("Projects");
if ($search_user == $user->id) $title=$langs->trans("MyProjects");
// Get list of project id allowed to user (in a string list separated by coma)
+$projectsListId='';
if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1,$socid);
// Get id of types of contacts for projects (This list never contains a lot of elements)
@@ -245,7 +246,7 @@ if ($search_user > 0)
$sql.= " WHERE p.entity IN (".getEntity('project',1).')';
if (! $user->rights->projet->all->lire) $sql.= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
-if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+if ($socid) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$db->escape($search_categ);
if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index d2a244f9444..32f57f73c25 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -18,8 +18,8 @@
*/
/**
- * \file htdocs/product/ajax/company.php
- * \brief File to return Ajax response on product list request
+ * \file htdocs/societe/ajax/company.php
+ * \brief File to return Ajax response on thirdparty list request
*/
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
@@ -33,15 +33,11 @@ if (empty($_GET['keysearch']) && ! defined('NOREQUIREHTML')) define('NOREQUIREH
require '../../main.inc.php';
$htmlname=GETPOST('htmlname','alpha');
-$socid=GETPOST('socid','int');
-$type=GETPOST('type','int');
-$mode=GETPOST('mode','int');
-$status=((GETPOST('status','int') >= 0) ? GETPOST('status','int') : -1);
+$filter=GETPOST('filter','alpha');
$outjson=(GETPOST('outjson','int') ? GETPOST('outjson','int') : 0);
-$price_level=GETPOST('price_level','int');
$action=GETPOST('action', 'alpha');
$id=GETPOST('id', 'int');
-$price_by_qty_rowid=GETPOST('pbq', 'int');
+
/*
* View
@@ -49,7 +45,7 @@ $price_by_qty_rowid=GETPOST('pbq', 'int');
//print ''."\n";
-dol_syslog(join(',',$_GET));
+dol_syslog(join(',', $_GET));
//print_r($_GET);
if (! empty($action) && $action == 'fetch' && ! empty($id))
@@ -63,8 +59,11 @@ if (! empty($action) && $action == 'fetch' && ! empty($id))
if ($ret > 0)
{
$outname=$object->name;
-
- $outjson = array('name'=>$outname);
+ $outlabel = '';
+ $outdesc = '';
+ $outtype = $object->type;
+
+ $outjson = array('ref' => $outref,'name' => $outname,'desc' => $outdesc,'type' => $outtype);
}
echo json_encode($outjson);
@@ -73,7 +72,7 @@ else
{
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
- $langs->load("products");
+ $langs->load("companies");
$langs->load("main");
top_httphead();
@@ -90,14 +89,7 @@ else
$searchkey=(GETPOST($id)?GETPOST($id):(GETPOST($htmlname)?GETPOST($htmlname):''));
$form = new Form($db);
- if (empty($mode) || $mode == 'customer')
- {
- $arrayresult=$form->select_company_html($socid,$htmlname,"client IN (1,3)",0,0,0,null,$searchkey,$outjson);
- }
- elseif ($mode == 'supplier')
- {
- $arrayresult=$form->select_company_html($socid,$htmlname,"fournisseur=1",0,0,0,null,$searchkey,$outjson);
- }
+ $arrayresult=$form->select_thirdparty_list(0,$htmlname,$filter,1,0,0,null,$searchkey,$outjson);
$db->close();
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index d758d9ac3f4..de50799e430 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -318,7 +318,7 @@ class Contacts extends DolibarrApi
*/
function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
$categories = new Categories();
- return $categories->getListForItem('contact', $sortfield, $sortorder, $limit, $page, $id);
+ return $categories->getListForItem($sortfield, $sortorder, $limit, $page, 'contact', $id);
}
/**
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index cedd30c5209..f8e96d82e47 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -267,7 +267,7 @@ class Thirdparties extends DolibarrApi
*/
function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0) {
$categories = new Categories();
- return $categories->getListForItem('customer', $sortfield, $sortorder, $limit, $page, $id);
+ return $categories->getListForItem($sortfield, $sortorder, $limit, $page, 'customer', $id);
}
/**
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 4a0be451c45..393d3a1fad4 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -41,6 +41,7 @@ $langs->load("customers");
$langs->load("suppliers");
$langs->load("bills");
$langs->load("compta");
+$langs->load('commercial');
// Security check
$socid = GETPOST('socid','int');
@@ -167,7 +168,7 @@ $arrayfields=array(
's.idprof4'=>array('label'=>$langs->trans("ProfId4Short"), 'checked'=>$checkedprofid4),
's.idprof5'=>array('label'=>$langs->trans("ProfId5Short"), 'checked'=>$checkedprofid5),
's.idprof6'=>array('label'=>$langs->trans("ProfId6Short"), 'checked'=>$checkedprofid6),
- 'customerorsupplier'=>array('label'=>'Nature', 'checked'=>1),
+ 'customerorsupplier'=>array('label'=>$langs->trans('Nature'), 'checked'=>1),
's.fk_prospectlevel'=>array('label'=>$langs->trans("ProspectLevelShort"), 'checked'=>$checkprospectlevel),
's.fk_stcomm'=>array('label'=>$langs->trans("StatusProsp"), 'checked'=>$checkstcomm),
's.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
@@ -613,7 +614,7 @@ if (! empty($arrayfields['s.ape']['checked'])) print_liste_field_titr
if (! empty($arrayfields['s.idprof4']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$param,'class="nowrap"',$sortfield,$sortorder);
if (! empty($arrayfields['s.idprof5']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof5","",$param,'class="nowrap"',$sortfield,$sortorder);
if (! empty($arrayfields['s.idprof6']['checked'])) print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof6","",$param,'class="nowrap"',$sortfield,$sortorder);
-if (! empty($arrayfields['customerorsupplier']['checked'])) print_liste_field_titre(''); // type of customer
+if (! empty($arrayfields['customerorsupplier']['checked'])) print_liste_field_titre($arrayfields['customerorsupplier']['label']); // type of customer
if (! empty($arrayfields['s.fk_prospectlevel']['checked'])) print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'],$_SERVER["PHP_SELF"],"s.fk_prospectlevel","",$param,'align="center"',$sortfield,$sortorder);
if (! empty($arrayfields['s.fk_stcomm']['checked'])) print_liste_field_titre($arrayfields['s.fk_stcomm']['label'],$_SERVER["PHP_SELF"],"s.fk_stcomm","",$param,'align="center"',$sortfield,$sortorder);
// Extra fields
@@ -624,7 +625,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
if (! empty($arrayfields["ef.".$key]['checked']))
{
$align=$extrafields->getAlignFlag($key);
- print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
}
}
}
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 4d3e32e326f..122c5282a40 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -358,14 +358,16 @@ if ($socid && $action != 'edit' && $action != "create")
print load_fiche_titre($langs->trans("DefaultRIB"), '', '');
+ print ' ';
print ' ';
+
print ' ';
print '| '.$langs->trans("LabelRIB").' | ';
- print ''.$account->label.' | ';
+ print ''.$account->label.' | ';
print '| '.$langs->trans("BankName").' | ';
- print ''.$account->bank.' | ';
+ print ''.$account->bank.' | ';
// Show fields of bank account
foreach($account->getFieldsToShow(1) as $val)
@@ -406,24 +408,24 @@ if ($socid && $action != 'edit' && $action != "create")
}
print '| '.$langs->trans($val).' | ';
- print ''.$content.' | ';
+ print ''.$content.' | ';
print ' ';
}
- print '| '.$langs->trans("BankAccountDomiciliation").' | ';
+ print ' | | '.$langs->trans("BankAccountDomiciliation").' | ';
print $account->domiciliation;
print " | \n";
- print '| '.$langs->trans("BankAccountOwner").' | ';
+ print ' | | '.$langs->trans("BankAccountOwner").' | ';
print $account->proprio;
print " | \n";
- print '| '.$langs->trans("BankAccountOwnerAddress").' | ';
+ print ' | | '.$langs->trans("BankAccountOwnerAddress").' | ';
print $account->owner_address;
print " | \n";
print ' ';
-
+ print ' ';
print ' ';
@@ -610,7 +612,7 @@ if ($socid && $action != 'edit' && $action != "create")
{
$colspan=8;
if (! empty($conf->prelevement->enabled)) $colspan+=2;
- print ' | '.$langs->trans("NoBANRecord").' | ';
+ print ' | '.$langs->trans("NoBANRecord").' | ';
}
print ' ';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 3da099390ac..b5bda51b4ba 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -123,15 +123,14 @@ if (empty($reshook))
$soc_origin_id = GETPOST('soc_origin', 'int');
$soc_origin = new Societe($db);
- if ($soc_origin_id < 1)
+ if ($soc_origin_id <= 0)
{
$langs->load('errors');
$langs->load('companies');
- setEventMessages($langs->trans('ErrorProdIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
+ setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->trans('MergeOriginThirdparty')), null, 'errors');
}
else
{
-
if (!$errors && $soc_origin->fetch($soc_origin_id) < 1)
{
setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
@@ -140,8 +139,44 @@ if (empty($reshook))
if (!$errors)
{
+ // TODO Move the merge function into class of object.
+
$db->begin();
+ // Recopy some data
+ $object->client = $object->client | $soc_origin->client;
+ $object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
+ $listofproperties=array(
+ 'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode', 'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
+ 'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
+ 'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
+ 'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
+ 'model_pdf', 'fk_projet'
+ );
+ foreach ($listofproperties as $property)
+ {
+ if (empty($object->$property)) $object->$property = $soc_origin->$property;
+ }
+
+ // Concat some data
+ $listofproperties=array(
+ 'note_public', 'note_private'
+ );
+ foreach ($listofproperties as $property)
+ {
+ $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+ }
+
+ // Merge extrafields
+ foreach ($soc_origin->array_options as $key => $val)
+ {
+ if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+ }
+
+ // TODO Merge categories
+ $object->update($object->id, $user);
+
+ // Move links
$objects = array(
'Adherent' => '/adherents/class/adherent.class.php',
'Societe' => '/societe/class/societe.class.php',
@@ -159,6 +194,7 @@ if (empty($reshook))
'Fichinter' => '/fichinter/class/fichinter.class.php',
'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
+ 'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
'Livraison' => '/livraison/class/livraison.class.php',
'Product' => '/product/class/product.class.php',
@@ -451,6 +487,7 @@ if (empty($reshook))
if (empty($object->fournisseur)) $object->code_fournisseur='';
$result = $object->create($user);
+
if ($result >= 0)
{
if ($object->particulier)
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e02a512f327..ea0ecc12f89 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -354,7 +354,7 @@ if (empty($reshook))
$array_options = $lines[$i]->array_options;
}
- $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options);
+ $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->ref_fourn, $lines[$i]->fk_unit);
if ($result > 0) {
$lineid = $result;
@@ -633,7 +633,8 @@ if (empty($reshook))
$buyingprice,
$label,
$array_options,
- $ref_fourn
+ $ref_fourn,
+ $fk_unit
);
//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;
}
@@ -683,7 +684,7 @@ if (empty($reshook))
$price_base_type = 'HT';
}
- $result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_fourn);
+ $result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $ref_fourn, $fk_unit);
//$result = $object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end, $array_options, $fk_unit);
}
@@ -826,7 +827,8 @@ if (empty($reshook))
if (! $error) {
$db->begin();
$ref_fourn = GETPOST('fourn_ref');
- $result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $array_options, $ref_fourn);
+ $fk_unit = GETPOST('units');
+ $result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $array_options, $ref_fourn, $fk_unit);
if ($result >= 0) {
$db->commit();
@@ -1040,6 +1042,17 @@ if ($action == 'create')
$objectsrc->fetch_optionals($originid);
$object->array_options = $objectsrc->array_options;
+ if (!empty($conf->multicurrency->enabled))
+ {
+ if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
+ if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) $currency_tx = $objectsrc->multicurrency_tx;
+ }
+ }
+ else
+ {
+ $cond_reglement_id = $soc->cond_reglement_supplier_id;
+ $mode_reglement_id = $soc->mode_reglement_supplier_id;
+ if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
}
$object = new SupplierProposal($db);
@@ -1076,12 +1089,12 @@ if ($action == 'create')
// Terms of payment
print '| ' . $langs->trans('PaymentConditionsShort') . ' | ';
- $form->select_conditions_paiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $soc->cond_reglement_id, 'cond_reglement_id', -1, 1);
+ $form->select_conditions_paiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
print ' | ';
// Mode of payment
print '| ' . $langs->trans('PaymentMode') . ' | ';
- $form->select_types_paiements(GETPOST('mode_reglement_id') > 0 ? GETPOST('mode_reglement_id') : $soc->mode_reglement_id, 'mode_reglement_id');
+ $form->select_types_paiements(GETPOST('mode_reglement_id') > 0 ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');
print ' | ';
// Bank Account
@@ -1149,7 +1162,6 @@ if ($action == 'create')
print '';
print '| '.fieldLabel('Currency','multicurrency_code').' | ';
print '';
- $currency_code = (!empty($soc->multicurrency_code) ? $soc->multicurrency_code : ($object->multicurrency_code ? $object->multicurrency_code : $conf->currency));
print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
print ' | ';
}
@@ -1196,6 +1208,13 @@ if ($action == 'create')
print '| ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' | ' . price($objectsrc->total_localtax2) . " | ";
}
print '| ' . $langs->trans('TotalTTC') . ' | ' . price($objectsrc->total_ttc) . " | ";
+
+ if (!empty($conf->multicurrency->enabled))
+ {
+ print '| ' . $langs->trans('MulticurrencyTotalHT') . ' | ' . price($objectsrc->multicurrency_total_ht) . ' | ';
+ print '| ' . $langs->trans('MulticurrencyTotalVAT') . ' | ' . price($objectsrc->multicurrency_total_tva) . " | ";
+ print '| ' . $langs->trans('MulticurrencyTotalTTC') . ' | ' . price($objectsrc->multicurrency_total_ttc) . " | ";
+ }
}
print "\n";
@@ -1491,14 +1510,22 @@ if ($action == 'create')
print '';
print ' | ';
- if ($action == 'editmulticurrencyrate') {
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
+ if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
+ if($action == 'actualizemulticurrencyrate') {
+ list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+ }
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'multicurrency_tx', $object->multicurrency_code);
} else {
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+ if($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+ print '';
+ }
}
print ' |
';
}
@@ -1881,7 +1908,7 @@ if ($action == 'create')
$formmail->withtocc = $liste;
$formmail->withtoccc = (! empty($conf->global->MAIN_EMAIL_USECCC) ? $conf->global->MAIN_EMAIL_USECCC : false);
- $formmail->withtopic = $outputlangs->trans('SendAskRef', '__ASKREF__');
+ $formmail->withtopic = $outputlangs->trans('SendAskRef', '__SUPPLIERPROPREF__');
$formmail->withfile = 2;
$formmail->withbody = 1;
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 53e7bf8ad34..85bba0ad6e6 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -355,11 +355,12 @@ class SupplierProposal extends CommonObject
* @param string $label ???
* @param array $array_option extrafields array
* @param string $ref_fourn Supplier price reference
+ * @param int $fk_unit Id of the unit to use.
* @return int >0 if OK, <0 if KO
*
* @see add_product
*/
- function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='')
+ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$array_option=0, $ref_fourn='', $fk_unit='')
{
global $mysoc;
@@ -460,6 +461,7 @@ class SupplierProposal extends CommonObject
$this->line->product_type=$type;
$this->line->special_code=$special_code;
$this->line->fk_parent_line=$fk_parent_line;
+ $this->line->fk_unit=$fk_unit;
$this->line->ref_fourn = $this->db->escape($ref_fourn);
@@ -546,9 +548,10 @@ class SupplierProposal extends CommonObject
* @param int $type 0/1=Product/service
* @param array $array_option extrafields array
* @param string $ref_fourn Supplier price reference
+ * @param int $fk_unit Id of the unit to use.
* @return int 0 if OK, <0 if KO
*/
- function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $array_option=0, $ref_fourn='')
+ function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $array_option=0, $ref_fourn='', $fk_unit='')
{
global $conf,$user,$langs, $mysoc;
@@ -634,7 +637,8 @@ class SupplierProposal extends CommonObject
$this->line->special_code = $special_code;
$this->line->fk_parent_line = $fk_parent_line;
$this->line->skip_update_total = $skip_update_total;
- $this->line->ref_fourn = $ref_fourn;
+ $this->line->ref_fourn = $ref_fourn;
+ $this->line->fk_unit = $fk_unit;
// infos marge
if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
@@ -1195,7 +1199,7 @@ class SupplierProposal extends CommonObject
$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
$sql.= ' d.ref_fourn as ref_produit_fourn,';
- $sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc';
+ $sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
$sql.= " WHERE d.fk_supplier_proposal = ".$this->id;
@@ -1261,6 +1265,7 @@ class SupplierProposal extends CommonObject
$line->multicurrency_total_ht = $objp->multicurrency_total_ht;
$line->multicurrency_total_tva = $objp->multicurrency_total_tva;
$line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
+ $line->fk_unit = $objp->fk_unit;
$this->lines[$i] = $line;
@@ -2429,7 +2434,7 @@ class SupplierProposal extends CommonObject
$sql.= ' pt.product_type, pt.rang, pt.fk_parent_line,';
$sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
$sql.= ' p.description as product_desc, pt.ref_fourn as ref_produit_fourn';
- $sql.= ' ,pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc';
+ $sql.= ' ,pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
$sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
$sql.= ' WHERE pt.fk_supplier_proposal = '.$this->id;
@@ -2484,6 +2489,7 @@ class SupplierProposal extends CommonObject
$this->lines[$i]->multicurrency_total_ht = $obj->multicurrency_total_ht;
$this->lines[$i]->multicurrency_total_tva = $obj->multicurrency_total_tva;
$this->lines[$i]->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
+ $this->lines[$i]->fk_unit = $obj->fk_unit;
$i++;
}
@@ -2532,6 +2538,24 @@ class SupplierProposal extends CommonObject
return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
}
+
+ /**
+ * Function used to replace a thirdparty id with another one.
+ *
+ * @param DoliDB $db Database handler
+ * @param int $origin_id Old thirdparty id
+ * @param int $dest_id New thirdparty id
+ * @return bool
+ */
+ public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+ {
+ $tables = array(
+ 'supplier_proposal'
+ );
+
+ return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+ }
+
}
@@ -2539,7 +2563,7 @@ class SupplierProposal extends CommonObject
* \class SupplierProposalLine
* \brief Class to manage supplier_proposal lines
*/
-class SupplierProposalLine extends CommonObject
+class SupplierProposalLine extends CommonObjectLine
{
var $db;
var $error;
@@ -2675,7 +2699,7 @@ class SupplierProposalLine extends CommonObject
$sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
$sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
$sql.= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
- $sql.= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc';
+ $sql.= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc, pd.fk_unit';
$sql.= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
$sql.= ' WHERE pd.rowid = '.$rowid;
@@ -2731,6 +2755,7 @@ class SupplierProposalLine extends CommonObject
$this->multicurrency_total_ht = $objp->multicurrency_total_ht;
$this->multicurrency_total_tva = $objp->multicurrency_total_tva;
$this->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
+ $this->fk_unit = $objp->fk_unit;
$this->db->free($result);
}
@@ -2769,7 +2794,8 @@ class SupplierProposalLine extends CommonObject
if (empty($this->special_code)) $this->special_code=0;
if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-
+ if (empty($this->fk_unit)) $this->fk_unit=0;
+
if (empty($this->pa_ht)) $this->pa_ht=0;
// if buy price not defined, define buyprice as configured in margin admin
@@ -2798,7 +2824,7 @@ class SupplierProposalLine extends CommonObject
$sql.= ' info_bits, ';
$sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
$sql.= ' ref_fourn';
- $sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc)';
+ $sql.= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
$sql.= " VALUES (".$this->fk_supplier_proposal.",";
$sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").",";
$sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").",";
@@ -2831,7 +2857,8 @@ class SupplierProposalLine extends CommonObject
$sql.= ", ".$this->multicurrency_total_ht;
$sql.= ", ".$this->multicurrency_total_tva;
$sql.= ", ".$this->multicurrency_total_ttc;
- $sql.= ')';
+ $sql.= ", ".$this->fk_unit;
+ $sql.= ')';
dol_syslog(get_class($this).'::insert', LOG_DEBUG);
$resql=$this->db->query($sql);
@@ -2951,7 +2978,8 @@ class SupplierProposalLine extends CommonObject
if (empty($this->special_code)) $this->special_code=0;
if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
-
+ if (empty($this->fk_unit)) $this->fk_unit=0;
+
if (empty($this->pa_ht)) $this->pa_ht=0;
// if buy price not defined, define buyprice as configured in margin admin
@@ -3005,8 +3033,9 @@ class SupplierProposalLine extends CommonObject
$sql.= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
$sql.= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
$sql.= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+ $sql.= " , fk_unit=".$this->fk_unit;
- $sql.= " WHERE rowid = ".$this->rowid;
+ $sql.= " WHERE rowid = ".$this->rowid;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql=$this->db->query($sql);
diff --git a/htdocs/theme/eldy/img/object_bookmark.png b/htdocs/theme/eldy/img/object_bookmark.png
index 39109ef5ee6..42f702a584c 100644
Binary files a/htdocs/theme/eldy/img/object_bookmark.png and b/htdocs/theme/eldy/img/object_bookmark.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5d03c087f06..966493861c8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2742,11 +2742,12 @@ div.pagination li.paginationafterarrows {
}
*/
+
/* Set the color for hover lines */
.odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover, .box_pair:hover, .box_impair:hover
{
- background: rgb() !important;
+ background-color: rgb() !important;
}
@@ -2757,10 +2758,10 @@ div.pagination li.paginationafterarrows {
color: #202020;
min-height: 18px; /* seems to not be used */
- background: #;
+ background-color: #;
}
#GanttChartDIV {
- background: #;
+ background-color: #;
}
.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
@@ -2776,13 +2777,14 @@ table.dataTable tr.odd {
}
/* For no hover style */
-table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td {
+table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td, form.nohover, form.nohover:hover {
background-color: # !important;
}
tr.nohoverpair td {
background-color: # !important;
}
+
table.dataTable td {
padding: 5px 2px 5px 3px !important;
}
@@ -2971,8 +2973,15 @@ div.tabBar .noborder {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- width: 110px;
+ width: 115px;
}
+@media only screen and (max-width: 767px)
+{
+ .boxstats {
+ width: 100px;
+ }
+}
+
.boxstats:hover {
box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
}
diff --git a/htdocs/theme/md/img/object_bookmark.png b/htdocs/theme/md/img/object_bookmark.png
index 39109ef5ee6..42f702a584c 100644
Binary files a/htdocs/theme/md/img/object_bookmark.png and b/htdocs/theme/md/img/object_bookmark.png differ
diff --git a/htdocs/theme/md/img/object_multicurrency.png b/htdocs/theme/md/img/object_multicurrency.png
new file mode 100644
index 00000000000..51896a4c051
Binary files /dev/null and b/htdocs/theme/md/img/object_multicurrency.png differ
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index df3e374b565..c2d76f9d9d0 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2648,7 +2648,7 @@ table.dataTable tr.odd {
}
/* For no hover style */
-table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td {
+table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td, form.nohover, form.nohover:hover {
background-color: # !important;
}
tr.nohoverpair td {
@@ -2854,7 +2854,13 @@ div .tdtop {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- width: 110px;
+ width: 115px;
+}
+@media only screen and (max-width: 767px)
+{
+ .boxstats {
+ width: 100px;
+ }
}
.boxstats:hover {
box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 62efff2f88f..b0ed84801a6 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -153,7 +153,11 @@ $head=user_prepare_head($object);
dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
-$linkback = '