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

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

Browse source
This commit is contained in:
Laurent Destailleur 2023-08-07 20:04:02 +02:00
commit d51da409fe
6 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
htdocs/compta/facture/class/facture-rec.class.php
View file

@ -657,15 +657,6 @@ class FactureRec extends CommonInvoice
$this->lines = array();
// Retrieve all extrafield for line
// fetch optionals attributes and labels
/*if (!is_object($extrafields)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields = new ExtraFields($this->db);
}
$extrafields->fetch_name_optionals_label($this->table_element_line, true);
*/
dol_syslog('FactureRec::fetch_lines', LOG_DEBUG);
$sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx, ';
@ -2123,6 +2114,7 @@ class FactureLigneRec extends CommonInvoiceLine
public $fk_fournprice; // For backward compatibility
public $rang;
//public $situation_percent; // Not supported on recurring invoice line
public $desc;
public $description;

2
htdocs/compta/facture/class/facture.class.php
View file

@ -1074,7 +1074,7 @@ class Facture extends CommonInvoice
$buyprice,
$_facrec->lines[$i]->label,
empty($_facrec->lines[$i]->array_options) ?null:$_facrec->lines[$i]->array_options,
$_facrec->lines[$i]->situation_percent,
100, // situation percent is undefined on recurring invoice lines
'',
$_facrec->lines[$i]->fk_unit,
$_facrec->lines[$i]->multicurrency_subprice,

2
htdocs/core/tpl/filemanager.tpl.php
View file

@ -208,7 +208,7 @@ if ($action == 'confirmconvertimgwebp') {
$param = '';
if (!empty($sortfield)) $param .= '&sortfield='.urlencode($sortfield);
if (!empty($sortorder)) $param .= '&sortorder='.urlencode($sortorder);
print $form->formconfirm($_SERVER["PHP_SELF"].($param ? '?'.$param : ''), empty($file) ? $langs->trans('ConfirmImgWebpCreation') : $langs->trans('ConfirmChosenImgWebpCreation'), empty($file) ? $langs->trans('ConfirmGenerateImgWebp') : $langs->trans('ConfirmGenerateChosenImgWebp'), 'convertimgwebp', $formquestion, "yes", 1);
print $form->formconfirm($_SERVER["PHP_SELF"].($param ? '?'.$param : ''), empty($file) ? $langs->trans('ConfirmImgWebpCreation') : $langs->trans('ConfirmChosenImgWebpCreation'), empty($file) ? $langs->trans('ConfirmGenerateImgWebp') : $langs->trans('ConfirmGenerateChosenImgWebp', basename($file)), 'convertimgwebp', $formquestion, "yes", 1);
$action = 'file_manager';
}

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

@ -106,6 +106,12 @@ ALTER TABLE llx_bordereau_cheque ADD COLUMN type VARCHAR(6) DEFAULT 'CHQ';
-- Element time
ALTER TABLE llx_projet_task_time RENAME TO llx_element_time;
-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
-- VMYSQL4.1 update llx_element_time set task_date = NULL where DATE(STR_TO_DATE(task_date, '%Y-%m-%d')) IS NULL;
-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
-- VMYSQL4.1 update llx_element_time set task_date = NULL where DATE(STR_TO_DATE(task_date, '%Y-%m-%d')) IS NULL;
ALTER TABLE llx_element_time CHANGE COLUMN fk_task fk_element integer NOT NULL;
ALTER TABLE llx_element_time CHANGE COLUMN task_date element_date date;
ALTER TABLE llx_element_time CHANGE COLUMN task_datehour element_datehour datetime;

4
htdocs/install/mysql/migration/repair.sql
View file

@ -54,6 +54,10 @@
-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
-- VMYSQL4.1 update llx_facture set date_pointoftax = NULL where DATE(STR_TO_DATE(date_pointoftax, '%Y-%m-%d')) IS NULL;
-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES';
-- VMYSQL4.1 update llx_element_time set task_date = NULL where DATE(STR_TO_DATE(task_date, '%Y-%m-%d')) IS NULL;
-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE';
-- VMYSQL4.1 update llx_element_time set task_date = NULL where DATE(STR_TO_DATE(task_date, '%Y-%m-%d')) IS NULL;
-- Requests to clean corrupted data

2
htdocs/langs/en_US/ecm.lang
View file

@ -48,7 +48,7 @@ GenerateImgWebp=Duplicate all images with another version with .webp format
ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
ConfirmImgWebpCreation=Confirm all images duplication
GenerateChosenImgWebp=Duplicate chosen image with another version with .webp format
ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image
ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
ConfirmChosenImgWebpCreation=Confirm chosen images duplication
SucessConvertImgWebp=Images successfully duplicated
SucessConvertChosenImgWebp=Chosen image successfully duplicated