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

Automated merge from 18.0 to 19.0 by tool pullmerge.sh

Browse source
This commit is contained in:
Laurent Destailleur 2026-06-19 03:34:19 +02:00
commit d7e92bcd50
5 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
htdocs/admin/dict.php
View file

@ -2155,8 +2155,8 @@ if ($id > 0) {
}
print '</td>';
}
if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
if ($action == 'edit' && ($rowid == (isset($obj->rowid) ? $obj->rowid : $obj->code))) {
$tmpaction = 'edit';
$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
@ -2169,7 +2169,7 @@ if ($id > 0) {
}
print '<td colspan="3" class="center">';
print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
print '<div name="'.(isset($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
print '<input type="hidden" name="rowid" value="'.dol_escape_htmltag($rowid).'">';
if (!is_null($withentity)) {

40
htdocs/comm/remx.php
View file

@ -461,12 +461,12 @@ if ($socid > 0) {
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
}
print '<td class="right">'.$langs->trans("VATRate").'</td>';
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
}
print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
@ -523,12 +523,12 @@ if ($socid > 0) {
print '<td class="right nowraponall amount">'.price($obj->amount_ht).'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right nowraponall amount">'.price($obj->multicurrency_amount_ht).'</td>';
}
print '<td class="right nowraponall">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
print '<td class="right nowraponall amount">'.price($obj->amount_ttc).'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right nowraponall amount">'.price($obj->multicurrency_amount_ttc).'</td>';
}
print '<td class="tdoverflowmax100">';
@ -554,7 +554,7 @@ if ($socid > 0) {
}
} else {
$colspan = 8;
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
$colspan += 2;
}
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
@ -614,12 +614,12 @@ if ($socid > 0) {
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
}
print '<td class="right">'.$langs->trans("VATRate").'</td>';
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
}
print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
@ -671,12 +671,12 @@ if ($socid > 0) {
}
print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
print '<td class="right nowraponall amount">'.price($obj->amount_ht).'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right nowraponall amount">'.price($obj->multicurrency_amount_ht).'</td>';
}
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
print '<td class="right nowraponall amount">'.price($obj->amount_ttc).'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right nowraponall amount">'.price($obj->multicurrency_amount_ttc).'</td>';
}
print '<td class="tdoverflowmax100">';
@ -701,7 +701,7 @@ if ($socid > 0) {
}
} else {
$colspan = 8;
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
$colspan += 2;
}
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
@ -795,12 +795,12 @@ if ($socid > 0) {
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
}
print '<td class="right">'.$langs->trans("VATRate").'</td>';
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
}
print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
@ -876,12 +876,12 @@ if ($socid > 0) {
}
print '</td>';
print '<td class="right nowraponall amount">'.price($obj->amount_ht).'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right nowraponall amount">'.price($obj->multicurrency_amount_ht).'</td>';
}
print '<td class="right nowraponall">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
print '<td class="right nowraponall amount">'.price($obj->amount_ttc).'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
}
print '<td class="tdoverflowmax100">';
@ -894,7 +894,7 @@ if ($socid > 0) {
}
} else {
$colspan = 8;
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
$colspan += 2;
}
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
@ -965,12 +965,12 @@ if ($socid > 0) {
print '<td>'.$langs->trans("ReasonDiscount").'</td>';
print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
print '<td class="right">'.$langs->trans("AmountHT").'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
}
print '<td class="right">'.$langs->trans("VATRate").'</td>';
print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
}
print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
@ -1046,12 +1046,12 @@ if ($socid > 0) {
}
print '</td>';
print '<td class="right nowraponall amount">'.price($obj->amount_ht).'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right nowraponall amount">'.price($obj->multicurrency_amount_ht).'</td>';
}
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
print '<td class="right nowraponall amount">'.price($obj->amount_ttc).'</td>';
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
print '<td class="right nowraponall amount">'.price($obj->multicurrency_amount_ttc).'</td>';
}
print '<td class="tdoverflowmax100">';
@ -1065,7 +1065,7 @@ if ($socid > 0) {
}
} else {
$colspan = 8;
if (isModEnabled('multicompany')) {
if (isModEnabled('multicurrency')) {
$colspan += 2;
}
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';

2
htdocs/core/modules/modSociete.class.php
View file

@ -93,7 +93,7 @@ class modSociete extends DolibarrModules
$this->const[$r][0] = "SOCIETE_FISCAL_MONTH_START";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "0";
$this->const[$r][2] = "1";
$this->const[$r][3] = "Enter the month number of the first month of the fiscal year, e. g. 9 for September";
$this->const[$r][4] = 0;
$r++;

4
htdocs/fichinter/card.php
View file

@ -1082,7 +1082,9 @@ if ($action == 'create') {
}
print '<table class="border centpercent">';
print '<tr><td class="fieldrequired">'.$langs->trans("ThirdParty").'</td><td>';
print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
$filter = '((s.client:IN:'.Societe::CUSTOMER.', '.Societe::PROSPECT.', '.Societe::CUSTOMER_AND_PROSPECT.') AND (s.status:=:1))';
print $form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
print '</td></tr>';
print '</table>';

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

@ -489,7 +489,7 @@ ALTER TABLE llx_partnership ADD COLUMN email_partnership varchar(64) after fk_me
ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_statut (statut);
ALTER TABLE fk_product_price_product DROP FOREIGN KEY fk_product_price_product;
ALTER TABLE llx_product_price DROP FOREIGN KEY fk_product_price_product;
ALTER TABLE llx_societe_rib ADD COLUMN ext_payment_site varchar(128);
@ -679,7 +679,7 @@ ALTER TABLE llx_product_lot_extrafields CHANGE COLUMN tms tms timestamp DEFAULT
ALTER TABLE llx_product_lot CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_product_price_by_qty CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_product_price CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_product_stock_entrepot CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_product_warehouse_properties CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_product_stock CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_projet_extrafields CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
ALTER TABLE llx_projet CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
@ -721,3 +721,6 @@ ALTER TABLE llx_user CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP O
ALTER TABLE llx_salary_extrafields CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
-- 15.0 -> 16.0 rename llx_advtargetemailing to llx_mailing_advtarget
ALTER TABLE llx_mailing_advtarget CHANGE COLUMN tms tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
-- 3.6 -> 3.7 typo on llx_adherents ('end with s') and varchar is 128
ALTER TABLE llx_adherent MODIFY COLUMN societe VARCHAR(128);