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

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-01-28 16:35:12 +01:00
commit 77747ac2a3
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
7 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/card.php
View File

@ -4560,7 +4560,7 @@ elseif ($id > 0 || ! empty($ref))
}
else
{
print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInAccounting") . '">' . $langs->trans('Modify') . '</span></div>';
print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseDispatchedInBookkeeping") . '">' . $langs->trans('Modify') . '</span></div>';
}
}

3
htdocs/core/modules/expensereport/mod_expensereport_jade.php
View File

@ -44,7 +44,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
/**
* @var string Nom du modele
* @deprecated
* @see name
* @see $name
*/
public $nom='Jade';
@ -154,7 +154,6 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
endif;
$ref_number_int = ($newref+1)-1;
$update_number_int = true;
$user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);

4
htdocs/langs/en_ZA/main.lang
View File

@ -7,8 +7,8 @@ SeparatorThousand=,
FormatDateShort=%Y/%m/%d
FormatDateShortInput=%Y/%m/%d
FormatDateShortJava=yyy/MM/dd
FormatDateShortJavaInput=yyyy/MM/yy
FormatDateShortJQuery=yy/mm/yy
FormatDateShortJavaInput=yyyy/MM/dd
FormatDateShortJQuery=yy/mm/dd
FormatDateShortJQueryInput=yy/mm/dd
FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M

1
htdocs/modulebuilder/template/myobject_list.php
View File

@ -446,6 +446,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
print '</tr>'."\n";

2
htdocs/public/payment/paymentok.php
View File

@ -663,7 +663,7 @@ if ($ispaymentok)
$result=$paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
if ($result < 0)
{
$postactionmessages[] = $paiement->error.' '.joint("<br>\n", $paiement->errors);
$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
$ispostactionok = -1;
$error++;
}

5
htdocs/societe/checkvat/checkVatPopup.php
View File

@ -40,8 +40,7 @@ $conf->dol_hide_leftmenu=1;
llxHeader('', $langs->trans("VATIntraCheckableOnEUSite"));
print '<div>';
print '<div>';
print '<div class="vatcheckarea" style="margin-bottom: 10px">';
print load_fiche_titre($langs->trans("VATIntraCheckableOnEUSite"), '', 'title_setup');
@ -174,6 +173,8 @@ if ($messagetoshow)
print nl2br($messagetoshow);
}
print '</div>';
// End of page
llxFooter();
$db->close();

17
htdocs/societe/paymentmodes.php
View File

@ -832,6 +832,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
print '<td align="center">'.$langs->trans('Default').'</td>';
print '<td>'.$langs->trans('Note').'</td>';
print '<td>'.$langs->trans('DateModification').'</td>';
// Hook fields
$parameters=array('arrayfields'=>array(),'param'=>'','sortfield'=>'','sortorder'=>'', 'linetype'=>'stripetitle');
$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
print "<td></td>";
print "</tr>\n";
@ -846,7 +851,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
$companypaymentmodetemp = new CompanyPaymentMode($db);
$sql='SELECT rowid FROM '.MAIN_DB_PREFIX."societe_rib";
$sql.=" WHERE type in ('card', 'paypal')";
$sql.=" WHERE type in ('card')";
$sql.=" AND fk_soc = ".$object->id;
$sql.=" AND status = ".$servicestatus;
@ -917,6 +922,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
print '<td>';
print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
print '</td>';
// Fields from hook
$parameters=array('arrayfields'=>array(), 'obj'=>$obj, 'linetype'=>'stripecard');
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
print '<td align="right" class="nowraponall">';
if ($user->rights->societe->creer)
{
@ -1042,6 +1052,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
//var_dump($src);
print '';
print '</td>';
// Fields from hook
$parameters=array('arrayfields'=>array(), 'stripesource'=>$src, 'linetype'=>'stripecardremoteonly');
$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
print '<td align="right" class="nowraponall">';
if ($user->rights->societe->creer)
{