vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Florian HENRY 2023-06-09 12:18:08 +02:00
commit 50da00a120
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
htdocs/install/mysql/migration/17.0.0-18.0.0.sql
View file

@ -460,3 +460,9 @@ insert into llx_c_invoice_subtype (entity, fk_country, code, label, active) VALU
ALTER TABLE llx_partnership ADD COLUMN email_partnership varchar(64) after fk_member;
ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_statut (statut);
-- Drop the composite unique index that exists on llx_actioncomm to rebuild a new one without unique feature.
-- The old design introduced a deadlock over traffic intense Dolibarr instance.
-- VMYSQL4.1 DROP INDEX uk_actioncomm_ref on llx_table;
-- VPGSQL8.2 DROP INDEX uk_actioncomm_ref;
ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref (ref, entity);

2
htdocs/install/mysql/tables/llx_actioncomm.key.sql
View file

@ -29,4 +29,4 @@ ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_recurid (recurid);
ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref_ext (ref_ext);
ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_percent (percent);
ALTER TABLE llx_actioncomm ADD UNIQUE INDEX uk_actioncomm_ref (ref, entity);
ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref (ref, entity);

12
htdocs/public/users/view.php
View file

@ -207,15 +207,25 @@ $arrayofcss = array();
$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
llxHeader($head, $object->getFullName($langs).' - '.$langs->trans("PublicVirtualCard"), '', '', 0, 0, '', '', '', 'onlinepaymentbody'.(GETPOST('mode')=='preview' ? ' scalepreview cursorpointer virtualcardpreview' : ''), $replacemainarea, 1, 1);
print '
<style>
@media (prefers-color-scheme: dark) {
form {
background-color: #CCC !important;
}
}
</style>
';
print '<span id="dolpaymentspan"></span>'."\n";
print '<div class="center">'."\n";
print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
print '<input type="hidden" name="action" value="dosubmit">'."\n";
print '<input type="hidden" name="securekey" value="'.$securekey.'">'."\n";
print '<input type="hidden" name="entity" value="'.$entity.'" />';
print "\n";
print '<!-- Form to view job -->'."\n";
// Output html code for logo
print '<div class="backgreypublicpayment">';