Automated merge from 21.0 to 22.0 by tool pullmerge.sh
This commit is contained in:
commit
b243f14db6
5 changed files with 32 additions and 25 deletions
|
|
@ -469,12 +469,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>';
|
||||
|
|
@ -531,12 +531,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">';
|
||||
|
|
@ -562,7 +562,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>';
|
||||
|
|
@ -622,12 +622,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>';
|
||||
|
|
@ -679,12 +679,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">';
|
||||
|
|
@ -709,7 +709,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>';
|
||||
|
|
@ -803,12 +803,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>';
|
||||
|
|
@ -884,12 +884,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">';
|
||||
|
|
@ -902,7 +902,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>';
|
||||
|
|
@ -973,12 +973,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>';
|
||||
|
|
@ -1054,12 +1054,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">';
|
||||
|
|
@ -1073,7 +1073,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>';
|
||||
|
|
|
|||
|
|
@ -95,7 +95,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++;
|
||||
|
|
|
|||
|
|
@ -1165,8 +1165,10 @@ 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, array(), 0, 'minwidth300');
|
||||
print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&customer=3&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
|
||||
$filter = '(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>';
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -234,3 +234,5 @@ UPDATE llx_menu SET url = CONCAT(url, '&mode=init') WHERE fk_mainmenu = 'ticket'
|
|||
|
||||
-- VMYSQL4.1 ALTER TABLE llx_asset_depreciation_options_economic MODIFY COLUMN accelerated_depreciation_option boolean DEFAULT false;
|
||||
-- VPGSQL8.2 ALTER TABLE llx_asset ALTER COLUMN llx_asset_depreciation_options_economic DROP DEFAULT, ALTER COLUMN llx_asset_depreciation_options_economic TYPE boolean USING llx_asset_depreciation_options_economic::integer <> 0, ALTER COLUMN llx_asset_depreciation_options_economic SET DEFAULT false;
|
||||
|
||||
ALTER TABLE llx_adherent MODIFY COLUMN societe VARCHAR(128);
|
||||
|
|
|
|||
Loading…
Reference in a new issue