lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-21 14:44:07 +01:00
commit fa9d195ede
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/migration/12.0.0-13.0.0.sql
View File

@ -552,3 +552,6 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_scheduled_jobs.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_scheduled_jobs.php' AND entity = 1); -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_scheduled_jobs.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_scheduled_jobs.php' AND entity = 1);
ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64); ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
ALTER TABLE llx_projet ADD COLUMN fk_opp_status_end integer DEFAULT NULL;

1
htdocs/install/mysql/tables/llx_projet.sql
View File

@ -35,6 +35,7 @@ create table llx_projet
fk_statut integer DEFAULT 0 NOT NULL, -- open or close fk_statut integer DEFAULT 0 NOT NULL, -- open or close
fk_opp_status integer DEFAULT NULL, -- if project is used to manage opportunities fk_opp_status integer DEFAULT NULL, -- if project is used to manage opportunities
opp_percent double(5,2), opp_percent double(5,2),
fk_opp_status_end integer DEFAULT NULL, -- if project is used to manage opportunities (the opportunity status the project has when set to lose)
date_close datetime DEFAULT NULL, date_close datetime DEFAULT NULL,
fk_user_close integer DEFAULT NULL, fk_user_close integer DEFAULT NULL,
note_private text, note_private text,

4
htdocs/salaries/list.php
View File

@ -154,9 +154,7 @@ if (empty($reshook))
// Mass actions // Mass actions
$objectclass = 'PaymentSalary'; $objectclass = 'PaymentSalary';
$objectlabel = 'SalariesPayments'; $objectlabel = 'SalariesPayments';
$permissiontoread = $user->rights->salaries->read; $uploaddir = $conf->salaries->dir_output;
$permissiontodelete = $user->rights->salaries->delete;
$uploaddir = $conf->bom->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
// Validate records // Validate records