lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12303 from frederic34/patch-2

Browse Source 
css
This commit is contained in:
Laurent Destailleur 2019-11-04 20:31:02 +01:00 committed by GitHub
commit 0347d82660
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/ticket.lib.php
View File

@ -834,7 +834,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
$filePath = DOL_DATA_ROOT . '/'. $doc->filepath . '/'. $doc->filename;
$mime = dol_mimetype($filePath);
$file = $actionstatic->id.'/'.$doc->filename;
$thumb = $actionstatic->id.'/thumbs/'.substr($doc->filename, 0, strrpos($doc->filename,'.')).'_mini'.substr($doc->filename, strrpos($doc->filename,'.'));
$thumb = $actionstatic->id.'/thumbs/'.substr($doc->filename, 0, strrpos($doc->filename, '.')).'_mini'.substr($doc->filename, strrpos($doc->filename, '.'));
$doclink = dol_buildpath('document.php', 1).'?modulepart=actions&attachment=0&file='.urlencode($file).'&entity='.$conf->entity;
$viewlink = dol_buildpath('viewimage.php', 1).'?modulepart=actions&file='.urlencode($thumb).'&entity='.$conf->entity;
@ -881,7 +881,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
/**
* @var $object ActionComm
* @var ActionComm $object ActionComm
* @return array
*/
function getTicketActionCommEcmList($object)

4
htdocs/imports/index.php
View File

@ -54,6 +54,7 @@ print '<br>';
// List of import set
/*
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Module").'</td>';
@ -84,6 +85,7 @@ else
print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoImportableData").'</td></tr>';
}
print '</table>';
print '</div>';
print '<br>';
*/
@ -107,6 +109,7 @@ print '<br>';
// List of available import format
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("AvailableFormats").'</td>';
@ -130,6 +133,7 @@ foreach($liste as $key)
}
print '</table>';
print '</div>';
//print '</div></div></div>';

1
htdocs/product/class/product.class.php
View File

@ -2093,7 +2093,6 @@ class Product extends CommonObject
$resql = $this->db->query($sql);
if ($resql) {
unset($this->oldcopy);
if ($this->db->num_rows($resql) > 0) {

3
htdocs/product/fournisseurs.php
View File

@ -269,7 +269,6 @@ if (empty($reshook))
$resql = $db->query("SELECT * FROM " . MAIN_DB_PREFIX . "product_fournisseur_price_extrafields WHERE fk_object = " . $object->product_fourn_price_id);
// Insert a new extrafields row, if none exists
if ($db->num_rows($resql) != 1) {
$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_fournisseur_price_extrafields (fk_object, ";
foreach ($extrafield_values as $key => $value) {
$sql .= str_replace('options_', '', $key) . ', ';
@ -291,7 +290,7 @@ if (empty($reshook))
// Execute the sql command from above
$db->query($sql);
$newprice = price2num(GETPOST("price", "alpha"));
if ($conf->multicurrency->enabled)