Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur 2024-03-16 13:38:52 +01:00
parent e9e6803d37
commit 3d02ca0fdc
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/contact/card.php
View File

@ -52,7 +52,8 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
// Load translation files required by the page
$langs->loadLangs(array('companies', 'users', 'other', 'commercial'));
$mesg = ''; $error = 0; $errors = array();
$error = 0;
$errors = array();
// Get parameters
$action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');

4
htdocs/core/class/notify.class.php
View File

@ -491,7 +491,7 @@ class Notify
$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
$object_type = 'facture';
$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceCancelled", $link);
$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceCanceled", $link);
break;
case 'BILL_VALIDATE':
$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
@ -509,7 +509,7 @@ class Notify
$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
$object_type = 'order';
$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderCancelled", $link);
$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderCanceled", $link);
break;
case 'ORDER_VALIDATE':
$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';

6
htdocs/core/photos_resize.php
View File

@ -560,11 +560,11 @@ if (!empty($conf->use_javascript_ajax)) {
if (empty($conf->dol_no_mouse_hover)) {
print '<div style="border: 1px solid #888888; width: '.$widthforcrop.'px;">';
print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.urlencode($modulepart).'&entity='.((int) $object->entity).'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
print '</div>';
print '</div><br>';
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).($num ? '&num='.$num : '').'" method="POST">';
print '<form action="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).($num ? '&num='.urlencode($num) : '').'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="backtourl" value="'.$backtourl.'">';
print '
@ -608,7 +608,7 @@ jQuery(document).ready(function() {
console.log("We click on submitcrop");
var idClicked = e.target.id;
if (parseInt(jQuery(\'#w\').val())) return true;
alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Dimension"))).'\');
alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"))).'\');
return false;
});
});

4
htdocs/langs/en_US/companies.lang
View File

@ -6,7 +6,7 @@ ErrorSetACountryFirst=Set the country first
SelectThirdParty=Select a third party
ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
DeleteContact=Delete a contact/address
ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
ConfirmDeleteContact=Are you sure you want to delete this contact?
MenuNewThirdParty=New Third Party
MenuNewCustomer=New Customer
MenuNewProspect=New Prospect
@ -527,4 +527,4 @@ HideSocialNetworks=Hide social networks
ExternalSystemID=External system ID
IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
AADEWebserviceCredentials=AADE Webservice Credentials
ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side

1
htdocs/langs/en_US/main.lang
View File

@ -562,7 +562,6 @@ New=New
Discount=Discount
Unknown=Unknown
General=General
Dimensions=Dimensions
Size=Size
OriginalSize=Original size
RotateImage=Rotate 90°

2
htdocs/langs/en_US/other.lang
View File

@ -207,6 +207,7 @@ EMailTextInterventionValidated=The intervention %s has been validated.
EMailTextInterventionClosed=The intervention %s has been closed.
EMailTextInvoiceValidated=Invoice %s has been validated.
EMailTextInvoicePayed=Invoice %s has been paid.
EMailTextInvoiceCanceled=Invoice %s has been canceled.
EMailTextProposalValidated=Proposal %s has been validated.
EMailTextProposalClosedSigned=Proposal %s has been closed signed.
EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
@ -214,6 +215,7 @@ EMailTextProposalClosedRefused=Proposal %s has been closed refused.
EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
EMailTextOrderValidated=Order %s has been validated.
EMailTextOrderClose=Order %s has been delivered.
EMailTextOrderCanceled=Order %s has been canceled.
EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
EMailTextSupplierOrderValidatedBy=Purchase order %s has been recorded by %s.
EMailTextSupplierOrderSubmittedBy=Purchase order %s has been submitted by %s.

3
htdocs/langs/en_US/users.lang
View File

@ -134,5 +134,4 @@ UserPublicPageDesc=You can enable a virtual card for this user. An url with the
EnablePublicVirtualCard=Enable the user's virtual business card
UserEnabledDisabled=User status changed: %s
AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
ConfirmDeleteContact= Are you sure that you want delete this contact ?
ContactDeleted= Contact has been delete successfully
ContactDeleted=Contact has been delete successfully

18
htdocs/projet/admin/project.php
View File

@ -842,16 +842,14 @@ print '<input type="submit" class="button small reposition" name="PROJECT_TIMESH
print '</td>';
print '</tr>';
$key = 'PROJECT_DISPLAY_LINKED_BY_CONTACT';
echo '<tr class="oddeven">',
'<td class="left">',
$form->textwithpicto($langs->transnoentities($key), $langs->transnoentities($key . '_help')),
'</td>',
'<td class="right" colspan="2">',
ajax_constantonoff($key),
'</td>',
'</tr>';
print '<tr class="oddeven">';
print '<td class="left">';
print $form->textwithpicto($langs->transnoentities('PROJECT_DISPLAY_LINKED_BY_CONTACT'), $langs->transnoentities('PROJECT_DISPLAY_LINKED_BY_CONTACT_help'));
print '</td>';
print '<td class="right" colspan="2">';
print ajax_constantonoff('PROJECT_DISPLAY_LINKED_BY_CONTACT');
print '</td>';
print '</tr>';
print '</table>';
print '</div>';

3
htdocs/societe/contact.php
View File

@ -60,7 +60,8 @@ if (isModEnabled('notification')) {
$langs->load("mails");
}
$mesg = ''; $error = 0; $errors = array();
$error = 0;
$errors = array();
// Get parameters