Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
This commit is contained in:
commit
fba2a97ab6
16 changed files with 111 additions and 67 deletions
|
|
@ -1300,8 +1300,8 @@ if ($mode == 'marketplace') {
|
|||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table summary="list_of_modules" class="noborder centpercent">'."\n";
|
||||
print '<tr class="liste_titre">'."\n";
|
||||
print '<td colspan="2" class="hideonsmartphone">'.$form->textwithpicto($langs->trans("ModuleProviderSites"), $langs->trans("WebSiteDesc")).'</td>';
|
||||
print '<td>';
|
||||
print '<td colspan="2">'.$form->textwithpicto($langs->trans("ModuleProviderSites"), $langs->trans("WebSiteDesc")).'</td>';
|
||||
print '<td class="hideonsmartphone">';
|
||||
print '</td>';
|
||||
print '<td></td>';
|
||||
print '</tr>';
|
||||
|
|
@ -1416,8 +1416,9 @@ if ($mode == 'marketplace') {
|
|||
print $remotestore->getPagination();
|
||||
print '</form>';
|
||||
|
||||
print '</div></div>';
|
||||
print '</div>';
|
||||
print '<div class="clearboth"></div>';
|
||||
print '</div>';
|
||||
?>
|
||||
<?php if (!empty($categories_tree)) { ?>
|
||||
<div id="category-tree-left" class="paddingtop">
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@ class ExternalModules
|
|||
} elseif ($this->versionCompare($product["dolibarr_min"], $dolibarrversiontouse) <= 0) {
|
||||
if (!empty($product["dolibarr_max"]) && $product["dolibarr_max"] != 'auto' && $product["dolibarr_max"] != 'unknown' && $this->versionCompare($product["dolibarr_max"], $dolibarrversiontouse) >= 0) {
|
||||
//compatible
|
||||
$version = '<span class="compatible">'.$langs->trans(
|
||||
$version = '<span class="compatible hideonsmartphone">'.$langs->trans(
|
||||
'CompatibleUpTo',
|
||||
$dolibarrversiontouse,
|
||||
$product["dolibarr_min"],
|
||||
|
|
@ -543,7 +543,7 @@ class ExternalModules
|
|||
$compatible = '';
|
||||
} else {
|
||||
// never compatible, module expired
|
||||
$version = '<span class="warning hideonsmartphone">'.$langs->trans(
|
||||
$version = '<span class="warning">'.$langs->trans(
|
||||
'NotCompatible',
|
||||
$dolibarrversiontouse,
|
||||
$product["dolibarr_min"],
|
||||
|
|
@ -574,7 +574,7 @@ class ExternalModules
|
|||
}
|
||||
|
||||
// Output the line
|
||||
$html .= '<tr class="app oddeven nohover '.dol_escape_htmltag($compatible).'">';
|
||||
$html .= '<tr class="'.(getDolOptimizeSmallScreen() ? 'app' : 'app app2').' oddeven nohover '.dol_escape_htmltag($compatible).'">';
|
||||
|
||||
// Logo
|
||||
$html .= '<td class="center width150"><div class="newAppParent">';
|
||||
|
|
@ -585,17 +585,17 @@ class ExternalModules
|
|||
$html .= '<td class="margeCote minwidth500imp"><h2 class="appTitle">';
|
||||
$html .= dolPrintHTML(dol_string_nohtmltag(ucfirst($product["label"])));
|
||||
if (!empty($product['author']) && $product['author'] != 'unkownauthor') {
|
||||
$html .= '<small> - '.img_picto('', 'company', 'class="pictofixedwidth"');
|
||||
$html .= '<span class="small"> - '.img_picto('', 'company', 'class="pictofixedwidth"');
|
||||
if (!empty($product['author_url'])) {
|
||||
$html .= '<a href="'.$product['author_url'].'" target="_blank">'.$product['author'].'</a>';
|
||||
} else {
|
||||
$html .= $product['author'];
|
||||
}
|
||||
$html .= '</small>';
|
||||
$html .= '</span>';
|
||||
}
|
||||
$html .= '<br><small>';
|
||||
$html .= '<br><span class="small">';
|
||||
$html .= $version; // Version Dolibarr. No dol_escape_htmltag, it is already escape html
|
||||
$html .= '</small>';
|
||||
$html .= '</span>';
|
||||
$html .= '</h2>';
|
||||
|
||||
$html .= '<small class="appDateCreation appRef"> ';
|
||||
|
|
@ -632,21 +632,32 @@ class ExternalModules
|
|||
$html .= '<div class="storedesc">'.dolPrintHTML(dol_string_nohtmltag($product["description"])).'</div>';
|
||||
$html .= '</td>';
|
||||
|
||||
if (getDolOptimizeSmallScreen()) {
|
||||
$html .= '</tr><tr class="app2 oddeven nohover borderbottom '.dol_escape_htmltag($compatible).'">';
|
||||
}
|
||||
|
||||
// Price - do not load if display none
|
||||
$html .= '<td class="margeCote center amount">';
|
||||
$html .= '<td class="margeCote center amount'.(getDolOptimizeSmallScreen() ? ' left" colspan="2"' : '"').'>';
|
||||
$html .= $price;
|
||||
$html .= '</td>';
|
||||
|
||||
if (!getDolOptimizeSmallScreen()) {
|
||||
$html .= '</td>';
|
||||
$html .= '<td class="margeCote nowraponall">';
|
||||
}
|
||||
|
||||
// Links
|
||||
$html .= '<td class="margeCote nowraponall">'.$download_link.'</td>';
|
||||
$html .= $download_link;
|
||||
$html .= '</td>';
|
||||
|
||||
$html .= '</tr>';
|
||||
}
|
||||
|
||||
if (empty($this->products)) {
|
||||
$html .= '<tr class=""><td colspan="3" class="center">';
|
||||
$html .= '<br><br>';
|
||||
$colspan = (getDolOptimizeSmallScreen() ? 1 : 3);
|
||||
$langs->load("website");
|
||||
|
||||
$html .= '<tr class=""><td colspan="'.$colspan.'" class="center">';
|
||||
$html .= '<br><br>';
|
||||
$html .= $langs->trans("noResultsWereFound").'...';
|
||||
$html .= '<br><br>';
|
||||
$html .= '</td></tr>';
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ div.divsearchfield {
|
|||
tr.app {
|
||||
height: 200px;
|
||||
}
|
||||
tr.app td {
|
||||
tr.app2 td {
|
||||
border-bottom: 1px solid #888;
|
||||
}
|
||||
div#newsDoli.tabBar {
|
||||
|
|
|
|||
|
|
@ -833,10 +833,7 @@ if ($action == 'create') { // aaa
|
|||
}
|
||||
$htmltext .= '</span></i>';
|
||||
|
||||
|
||||
$availablelink = $form->textwithpicto('<span class="opacitymedium hideonsmartphone small">'.$langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'helpclickable', '', 0, 2, 'availvar');
|
||||
//print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
|
||||
|
||||
$availablelink = '<span class="opacitymedium hideonsmartphone small">'.$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'helpclickable', '', 0, 2, 'availvar').'</span>';
|
||||
|
||||
// Print mail form
|
||||
print load_fiche_titre($langs->trans("NewMailing"), $availablelink, 'object_email');
|
||||
|
|
@ -1387,8 +1384,10 @@ if ($action == 'create') { // aaa
|
|||
}
|
||||
$htmltext .= '</span></i>';
|
||||
|
||||
$availablelink = '<span class="opacitymedium hideonsmartphone">'.$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'helpclickable', '', 0, 3, 'emailsubstitionhelp').'</span>';
|
||||
|
||||
// Print mail content
|
||||
print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto('<span class="opacitymedium hideonsmartphone">'.$langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'helpclickable', '', 0, 3, 'emailsubstitionhelp'), 'generic');
|
||||
print load_fiche_titre($langs->trans("EMail"), $availablelink, 'generic');
|
||||
|
||||
print dol_get_fiche_head([], '', '', -1);
|
||||
|
||||
|
|
@ -1598,8 +1597,10 @@ if ($action == 'create') { // aaa
|
|||
}
|
||||
$htmltext .= '</span></i>';
|
||||
|
||||
$availablelink = '<span class="opacitymedium small">'.$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'helpclickable', '', 0, 2, 'emailsubstitionhelp').'</span>';
|
||||
|
||||
// Print mail content
|
||||
print load_fiche_titre($langs->trans("EMail"), '<span class="opacitymedium small">'.$form->textwithpicto($langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'generic');
|
||||
print load_fiche_titre($langs->trans("EMail"), $availablelink, 'generic');
|
||||
|
||||
print dol_get_fiche_head([], '', '', -1);
|
||||
|
||||
|
|
|
|||
|
|
@ -258,8 +258,8 @@ $arrayfields = array(
|
|||
'f.date_valid' => array('label' => "DateValidation", 'checked' => '0', 'position' => 22),
|
||||
'f.date_lim_reglement' => array('label' => "DateDue", 'checked' => '1', 'position' => 25),
|
||||
'f.date_closing' => array('label' => "DateClosing", 'checked' => '0', 'position' => 30),
|
||||
'p.ref' => array('label' => "ProjectRef", 'langfile' => 'projects', 'checked' => '1', 'enabled' => (!isModEnabled('project') ? '0' : '1'), 'position' => 40),
|
||||
'p.title' => array('label' => "ProjectLabel", 'langfile' => 'projects', 'checked' => '0', 'enabled' => (!isModEnabled('project') ? '0' : '1'), 'position' => 41),
|
||||
'p.ref' => array('label' => "ProjectRef", 'langfile' => 'projects', 'checked' => '1', 'enabled' => (isModEnabled('project') ? '1' : '0'), 'position' => 40),
|
||||
'p.title' => array('label' => "ProjectLabel", 'langfile' => 'projects', 'checked' => '0', 'enabled' => (isModEnabled('project') ? '1' : '0'), 'position' => 41),
|
||||
's.nom' => array('label' => "ThirdParty", 'checked' => '1', 'position' => 50),
|
||||
's.name_alias' => array('label' => "AliasNameShort", 'checked' => '-1', 'position' => 51),
|
||||
's.code_client' => array('label' => "CustomerCodeShort", 'checked' => '-1', 'position' => 52),
|
||||
|
|
@ -270,7 +270,7 @@ $arrayfields = array(
|
|||
'country.code_iso' => array('label' => "Country", 'checked' => '0', 'position' => 70),
|
||||
'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 75),
|
||||
'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => '1', 'position' => 80),
|
||||
'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => '1', 'position' => 85),
|
||||
'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => '0', 'position' => 85),
|
||||
'ba.label' => array('label' => "DefaultBankAccount", 'langfile' => 'banks', 'checked' => '0', 'enabled' => (isModEnabled('bank')?'1':'0'), 'position' => 192),
|
||||
'f.fk_input_reason' => array('label' => "Source", 'checked' => 0, 'enabled' => 1, 'position' => 88),
|
||||
'f.module_source' => array('label' => "POSModule", 'langfile' => 'cashdesk', 'checked' => ($contextpage == 'poslist' ? '1' : '0'), 'enabled' => "(isModEnabled('cashdesk') || isModEnabled('takepos') || getDolGlobalInt('INVOICE_SHOW_POS'))", 'position' => 90),
|
||||
|
|
@ -295,7 +295,7 @@ $arrayfields = array(
|
|||
'total_mark_rate' => array('label' => 'MarkRate', 'langfile' => 'margins', 'checked' => '0', 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARK_RATES') ? '0' : '1')),
|
||||
'f.datec' => array('label' => "DateCreation", 'checked' => '0', 'position' => 500),
|
||||
'f.tms' => array('type' => 'timestamp', 'label' => 'DateModificationShort', 'enabled' => '1', 'visible' => -1, 'notnull' => 1, 'position' => 502),
|
||||
'u.login' => array('label' => "UserAuthor", 'checked' => '1', 'visible' => -1, 'position' => 504),
|
||||
'u.login' => array('label' => "UserAuthor", 'checked' => '0', 'visible' => -1, 'position' => 504),
|
||||
'sale_representative' => array('label' => "SaleRepresentativesOfThirdParty", 'checked' => '0', 'position' => 506),
|
||||
//'f.fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>506),
|
||||
//'f.fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-1, 'notnull'=>-1, 'position'=>508),
|
||||
|
|
|
|||
|
|
@ -431,11 +431,12 @@ if ($action == 'new') {
|
|||
print '<div class="nowrapfordate">';
|
||||
print $form->selectDate($search_date_start, 'search_date_start_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('From'));
|
||||
print '</div>';
|
||||
print '<div class="nowrapfordate">';
|
||||
print '<div class="nowrapfordate marginleftonly">';
|
||||
print $form->selectDate($search_date_end, 'search_date_end_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('to'));
|
||||
print '</div>';
|
||||
print '</td></tr>';
|
||||
print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
|
||||
print img_picto('', 'account', 'class="pictofixedwidth"');
|
||||
$form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1);
|
||||
print '</td></tr>';
|
||||
print '</table>';
|
||||
|
|
@ -450,7 +451,7 @@ if ($action == 'new') {
|
|||
}
|
||||
print '</div>';
|
||||
print '</form>';
|
||||
print '<br>';
|
||||
print '<br><br>';
|
||||
print '<br>';
|
||||
|
||||
$sql = "SELECT ba.rowid as bid, ba.label,";
|
||||
|
|
@ -528,11 +529,20 @@ if ($action == 'new') {
|
|||
print '<input type="hidden" name="type" value="'.$type.'">';
|
||||
print '<input type="hidden" name="accountid" value="'.$bid.'">';
|
||||
|
||||
print_fiche_titre($account_label, '', '');
|
||||
|
||||
$moreforfilter = '';
|
||||
print '<div class="div-table-responsive-no-min">';
|
||||
print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
|
||||
|
||||
print '<tr class="liste_titre">';
|
||||
if ($conf->main_checkbox_left_column) {
|
||||
print '<td class="center">'.$langs->trans("Select")."<br>";
|
||||
if ($conf->use_javascript_ajax) {
|
||||
print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
|
||||
}
|
||||
print '</td>';
|
||||
}
|
||||
print '<td>';
|
||||
if ($type == 'CHQ') {
|
||||
print $langs->trans("DateChequeReceived");
|
||||
|
|
@ -546,47 +556,51 @@ if ($action == 'new') {
|
|||
print '<td class="right">'.$langs->trans("Amount")."</td>\n";
|
||||
print '<td class="center">'.$langs->trans("Payment")."</td>\n";
|
||||
print '<td class="center">'.$langs->trans("LineRecord")."</td>\n";
|
||||
print '<td class="center">'.$langs->trans("Select")."<br>";
|
||||
if ($conf->use_javascript_ajax) {
|
||||
print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
|
||||
if (empty($conf->main_checkbox_left_column)) {
|
||||
print '<td class="center">'.$langs->trans("Select")."<br>";
|
||||
if ($conf->use_javascript_ajax) {
|
||||
print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
|
||||
}
|
||||
print '</td>';
|
||||
}
|
||||
print '</td>';
|
||||
print "</tr>\n";
|
||||
|
||||
if (count($lines[$bid])) {
|
||||
foreach ($lines[$bid] as $lid => $value) {
|
||||
print '<tr class="oddeven">';
|
||||
if ($conf->main_checkbox_left_column) {
|
||||
print '<td class="center">';
|
||||
print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
|
||||
print '</td>';
|
||||
}
|
||||
print '<td>'.dol_print_date($value["paymentdate"], 'day').'</td>';
|
||||
print '<td>'.$value["numero"]."</td>\n";
|
||||
print '<td>'.$value["emetteur"]."</td>\n";
|
||||
print '<td>'.$value["banque"]."</td>\n";
|
||||
print '<td class="right"><span class="amount">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</span></td>';
|
||||
print '<td>'.dolPrintHTML($value["numero"])."</td>\n";
|
||||
print '<td class="tdoverflowmax125" title="'.dolPrintHTML($value["emetteur"]).'">'.dolPrintHTML($value["emetteur"])."</td>\n";
|
||||
print '<td>'.dolPrintHTML($value["banque"])."</td>\n";
|
||||
print '<td class="right nowraponall"><span class="amount">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</span></td>';
|
||||
|
||||
// Link to payment
|
||||
print '<td class="center">';
|
||||
print '<td class="center nowraponall">';
|
||||
$paymentstatic->id = $value["paymentid"];
|
||||
$paymentstatic->ref = $value["paymentref"];
|
||||
$paymentstatic->date = $value["paymentdate"];
|
||||
if ($paymentstatic->id) {
|
||||
print $paymentstatic->getNomUrl(1);
|
||||
} else {
|
||||
print ' ';
|
||||
}
|
||||
print '</td>';
|
||||
// Link to bank transaction
|
||||
print '<td class="center">';
|
||||
print '<td class="center nowraponall">';
|
||||
$accountlinestatic->id = $value["id"];
|
||||
$accountlinestatic->ref = $value["ref"];
|
||||
if ($accountlinestatic->id > 0) {
|
||||
print $accountlinestatic->getNomUrl(1);
|
||||
} else {
|
||||
print ' ';
|
||||
}
|
||||
print '</td>';
|
||||
|
||||
print '<td class="center">';
|
||||
print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
|
||||
print '</td>';
|
||||
if (empty($conf->main_checkbox_left_column)) {
|
||||
print '<td class="center">';
|
||||
print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
|
||||
print '</td>';
|
||||
}
|
||||
print '</tr>';
|
||||
}
|
||||
}
|
||||
|
|
@ -595,9 +609,9 @@ if ($action == 'new') {
|
|||
|
||||
print '<div class="tabsAction">';
|
||||
if ($user->hasRight('banque', 'cheque')) {
|
||||
print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn', $account_label).'">';
|
||||
print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn').'">';
|
||||
} else {
|
||||
print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn', $account_label).'</a>';
|
||||
print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn').'</a>';
|
||||
}
|
||||
print '</div><br>';
|
||||
print '</form>';
|
||||
|
|
|
|||
|
|
@ -34,12 +34,6 @@
|
|||
|
||||
// Load Dolibarr environment
|
||||
require '../../main.inc.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
|
||||
|
||||
/**
|
||||
* @var Conf $conf
|
||||
* @var DoliDB $db
|
||||
|
|
@ -47,6 +41,11 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
|
|||
* @var Translate $langs
|
||||
* @var User $user
|
||||
*/
|
||||
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
|
||||
|
||||
// Load translation files required by the page
|
||||
$langs->loadLangs(array('bills', 'banks', 'compta', 'companies'));
|
||||
|
|
|
|||
|
|
@ -1039,7 +1039,7 @@ class FormFile
|
|||
$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
|
||||
|
||||
$out .= '<a href="'.$fulllink.'" target="_blank" rel="noopener">'.img_picto($langs->trans("FileSharedViaALink"), 'globe').'</a> ';
|
||||
$out .= '<input type="text" class="quatrevingtpercentminusx width75 nopadding small" id="downloadlink'.$file['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
$out .= '<input type="text" class="quatrevingtpercentminusx width75 nopadding small downloadexternallink" id="downloadlink'.$file['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
$out .= ajax_autoselect('downloadlink'.$file['rowid']);
|
||||
} else {
|
||||
//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
|
||||
|
|
@ -1651,7 +1651,7 @@ class FormFile
|
|||
|
||||
print '<!-- shared link -->';
|
||||
print '<a href="'.$fulllink.'" target="_blank" rel="noopener">'.img_picto($langs->trans("FileSharedViaALink"), 'globe').'</a> ';
|
||||
print '<input type="text" class="centpercentminusx minwidth50imp nopadding small" id="downloadlink'.$filearray[$key]['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
print '<input type="text" class="centpercentminusx minwidth50imp nopadding small downloadexternallink" id="downloadlink'.$filearray[$key]['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
} else {
|
||||
//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
|
||||
}
|
||||
|
|
@ -2178,7 +2178,7 @@ class FormFile
|
|||
|
||||
print '<!-- shared link -->';
|
||||
print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
|
||||
print '<input type="text" class="quatrevingtpercent width100 nopadding nopadding small" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
print '<input type="text" class="quatrevingtpercent width100 nopadding nopadding small downloadexternallink" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
}
|
||||
//if (!empty($useinecm) && $useinecm != 6) print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
|
||||
//if ($forcedownload) print '&attachment=1';
|
||||
|
|
@ -2355,7 +2355,7 @@ class FormFile
|
|||
$fulllink = $urlwithroot.'/document.php?type=link&hashp=' . $link->share;
|
||||
|
||||
print '<a href="'.$fulllink.'" target="_blank" rel="noopener">'.img_picto($langs->trans("FileSharedViaALink"), 'globe').'</a> ';
|
||||
print '<input type="text" class="centpercentminusx minwidth200imp nopadding small" id="downloadlink'.$link->id.'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("LinkSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
print '<input type="text" class="centpercentminusx minwidth200imp nopadding small downloadexternallink" id="downloadlink'.$link->id.'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("LinkSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
}
|
||||
print '</td>';
|
||||
print '<td class="right">';
|
||||
|
|
|
|||
|
|
@ -580,7 +580,7 @@ function cleanSerialize(expr) {
|
|||
*/
|
||||
function confirmDolibarr(msg, id, popupWidth = 400, popupHeight = 300, disableCancelButton = 0) {
|
||||
let alink = document.getElementById(id);
|
||||
let title = '<?php echo dol_escape_js($langs->trans("Note")); ?>';
|
||||
let title = '<?php echo dol_escape_js($langs->transnoentitiesnoconv("Note")); ?>';
|
||||
|
||||
if (alink.getAttribute("data-alreadyclicked") === "1") {
|
||||
return true;
|
||||
|
|
@ -590,11 +590,11 @@ function confirmDolibarr(msg, id, popupWidth = 400, popupHeight = 300, disableCa
|
|||
|
||||
let buttons = {};
|
||||
if (disableCancelButton === 0) {
|
||||
buttons['<?php echo dol_escape_js($langs->trans("Cancel")); ?>'] = function () {
|
||||
buttons['<?php echo dol_escape_js($langs->transnoentitiesnoconv("Cancel")); ?>'] = function () {
|
||||
$(this).dialog("close");
|
||||
};
|
||||
}
|
||||
buttons['<?php echo dol_escape_js($langs->trans("OK")); ?>'] = function () {
|
||||
buttons['<?php echo dol_escape_js($langs->transnoentitiesnoconv("Confirm")); ?>'] = function () {
|
||||
console.log("We click OK"); $(this).dialog("close"); alink.setAttribute("data-alreadyclicked", "1"); alink.click(); return false;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -325,6 +325,17 @@ function getDolCurrency()
|
|||
return (string) $conf->currency;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return if render must be optimized for small screen
|
||||
*
|
||||
* @return string Value returned
|
||||
*/
|
||||
function getDolOptimizeSmallScreen()
|
||||
{
|
||||
global $conf;
|
||||
return (string) $conf->dol_optimize_smallscreen;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the current entity
|
||||
*
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ if (!empty($object->share)) {
|
|||
|
||||
print img_picto('', 'globe').' ';
|
||||
if ($action != 'edit') {
|
||||
print '<input type="text" class="maxquatrevingtpercent widthcentpercentminusxx nopadding small" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
print '<input type="text" class="maxquatrevingtpercent widthcentpercentminusxx nopadding small downloadexternallink" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'" spellcheck="false">';
|
||||
} else {
|
||||
print $fulllink;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ $arrayfields = array(
|
|||
'f.label' => array('label' => "Label", 'checked' => '0', 'position' => 20),
|
||||
'f.datef' => array('label' => "DateInvoice", 'checked' => '1', 'position' => 25),
|
||||
'f.date_lim_reglement' => array('label' => "DateDue", 'checked' => '1', 'position' => 27),
|
||||
'p.ref' => array('label' => "ProjectRef", 'checked' => '0', 'position' => 30),
|
||||
'p.ref' => array('label' => "ProjectRef", 'checked' => '1', 'position' => 30, 'enabled' => (isModEnabled('project') ? '1' : '0')),
|
||||
's.nom' => array('label' => "ThirdParty", 'checked' => '1', 'position' => 41),
|
||||
's.name_alias' => array('label' => "AliasNameShort", 'checked' => '0', 'position' => 42),
|
||||
's.town' => array('label' => "Town", 'checked' => '-1', 'position' => 43),
|
||||
|
|
@ -217,8 +217,8 @@ $arrayfields = array(
|
|||
'country.code_iso' => array('label' => "Country", 'checked' => '0', 'position' => 46),
|
||||
'typent.code' => array('label' => "ThirdPartyType", 'checked' => $checkedtypetiers, 'position' => 48),
|
||||
'f.vat_reverse_charge' => array('label' => "VATReverseCharge", 'checked' => '0', 'position' => 49, 'enabled' => (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE') ? '1' : '0')),
|
||||
'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => '1', 'position' => 52),
|
||||
'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => '1', 'position' => 50),
|
||||
'f.fk_mode_reglement' => array('label' => "PaymentMode", 'checked' => '0', 'position' => 52),
|
||||
'f.fk_cond_reglement' => array('label' => "PaymentConditionsShort", 'checked' => '0', 'position' => 50),
|
||||
'ba.label' => array('label' => "BankAccount", 'langfile' => 'banks', 'checked' => '0', 'enabled' => (string) (int) (isModEnabled('bank')), 'position' => 192),
|
||||
'f.total_ht' => array('label' => "AmountHT", 'checked' => '1', 'position' => 105),
|
||||
'f.total_vat' => array('label' => "AmountVAT", 'checked' => '0', 'position' => 110),
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ LastCheckReceiptShort=Latest %s deposit slips
|
|||
LastPaymentForDepositShort=Latest %s %s deposit slips
|
||||
NewCheckReceipt=New discount
|
||||
NewCheckDeposit=New deposit slip
|
||||
NewCheckDepositOn=Create receipt for deposit on account: %s
|
||||
NewCheckDepositOn=Create cheque deposit slip
|
||||
NoWaitingChecks=No checks awaiting deposit.
|
||||
NoWaitingPaymentForDeposit=No %s payment awaiting deposit.
|
||||
DateChequeReceived=Check receiving date
|
||||
|
|
|
|||
|
|
@ -334,6 +334,9 @@ input[type="text"]:not(.input-icon-security, .input-icon-user, .input-icon-passw
|
|||
input[type="password"]:not(.input-icon-security, .input-icon-user, .input-icon-password) {
|
||||
height: 28px;
|
||||
}
|
||||
input.downloadexternallink {
|
||||
padding-left: 3px;
|
||||
}
|
||||
.input-icon-user, .input-icon-password {
|
||||
padding-right: 28px !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ $colorbacklinepair2 = '252,252,252'; // line pair
|
|||
$colorbacklinepairhover = '240,242,249'; // line hover
|
||||
$colorbacklinepairchecked = '240,242,249'; // line checked
|
||||
$colorbacklinebreak = '248,247,244'; // line break
|
||||
$colortexttitlenotab = '35,135,140'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
|
||||
$colortexttitlenotab = '0,135,160'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
|
||||
$colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80 #875a7b green=0,123,140, violet: 0,50,120
|
||||
$colortexttitle = '40, 40, 60';
|
||||
$colortexttitlelink = '10, 20, 100';
|
||||
|
|
|
|||
|
|
@ -563,6 +563,10 @@ input {
|
|||
.tableforfield input{
|
||||
padding: 2px;
|
||||
}
|
||||
input.downloadexternallink {
|
||||
padding-left: 3px;
|
||||
}
|
||||
|
||||
.refidno input {
|
||||
margin-top: 0 !important;
|
||||
padding: 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue