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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-02-02 18:26:15 +01:00
commit 3db0a98594
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formfile.class.php
View File

@ -1417,7 +1417,7 @@ class FormFile
} else { } else {
print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">'; print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
} }
print '<img class="photo maxwidth200 shadow valignmiddle" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">'; print '<img class="photo maxwidth200 shadow valignmiddle" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '20' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
print '</a>'; print '</a>';
} else { } else {
print '&nbsp;'; print '&nbsp;';

3
htdocs/core/lib/company.lib.php
View File

@ -201,8 +201,7 @@ function societe_prepare_head(Societe $object)
$foundonexternalonlinesystem = 0; $foundonexternalonlinesystem = 0;
$langs->load("banks"); $langs->load("banks");
//$title = $langs->trans("BankAccounts"); $title = $langs->trans("PaymentModes");
$title = $langs->trans("PaymentInformation");
if (!empty($conf->stripe->enabled)) { if (!empty($conf->stripe->enabled)) {
//$langs->load("stripe"); //$langs->load("stripe");

13
htdocs/langs/en_US/bills.lang
View File

@ -81,13 +81,14 @@ PaymentsReports=Payments reports
PaymentsAlreadyDone=Payments already done PaymentsAlreadyDone=Payments already done
PaymentsBackAlreadyDone=Refunds already done PaymentsBackAlreadyDone=Refunds already done
PaymentRule=Payment rule PaymentRule=Payment rule
PaymentMode=Payment Type PaymentMode=Payment method
DefaultPaymentMode=Default Payment Type PaymentModes=Payment methods
DefaultPaymentMode=Default Payment method
DefaultBankAccount=Default Bank Account DefaultBankAccount=Default Bank Account
IdPaymentMode=Payment Type (id) IdPaymentMode=Payment method (id)
CodePaymentMode=Payment Type (code) CodePaymentMode=Payment method (code)
LabelPaymentMode=Payment Type (label) LabelPaymentMode=Payment method (label)
PaymentModeShort=Payment Type PaymentModeShort=Payment method
PaymentTerm=Payment Term PaymentTerm=Payment Term
PaymentConditions=Payment Terms PaymentConditions=Payment Terms
PaymentConditionsShort=Payment Terms PaymentConditionsShort=Payment Terms