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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

Browse Source 
develop

Conflicts:
	htdocs/core/lib/ticket.lib.php
This commit is contained in:
Laurent Destailleur 2019-11-04 20:37:49 +01:00
commit c276659acd
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -883,8 +883,8 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
/**
* getTicketActionCommEcmList
*
* @param ActionComm $object
* @return array Array of documents in index table
* @param ActionComm $object Object ActionComm
* @return array Array of documents in index table
*/
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/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) . ', ';