From 284627b693413a8251f11981bd407060b1d162c2 Mon Sep 17 00:00:00 2001
From: trekmorris <78349579+trekmorris@users.noreply.github.com>
Date: Fri, 16 Jul 2021 23:55:29 +0800
Subject: [PATCH 01/18] Update opensurvey.lang manually
This file is not auto sync from transifex . So update it manually .
---
htdocs/langs/zh_TW/opensurvey.lang | 120 ++++++++++++++---------------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/htdocs/langs/zh_TW/opensurvey.lang b/htdocs/langs/zh_TW/opensurvey.lang
index 51a4283c721..ff927bfc863 100644
--- a/htdocs/langs/zh_TW/opensurvey.lang
+++ b/htdocs/langs/zh_TW/opensurvey.lang
@@ -1,61 +1,61 @@
# Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=極限日期
-NbOfSurveys=Number of polls
-NbOfVoters=No. of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format: - empty, - "8h", "8H" or "8:00" to give a meeting's start hour, - "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour, - "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+Survey=調查
+Surveys=調查
+OrganizeYourMeetingEasily=輕鬆組織會議和調查。首先選擇調查的類型...
+NewSurvey=新調查
+OpenSurveyArea=調查區
+AddACommentForPoll=您可以在調查中加入評論...
+AddComment=增加評論
+CreatePoll=建立調查
+PollTitle=調查標題
+ToReceiveEMailForEachVote=每次投票都會收到一封電子郵件
+TypeDate=日期類型
+TypeClassic=標準類型
+OpenSurveyStep2=在空閒日中選擇日期（灰色）。所選的日期為綠色。您可以通過再次點擊來取消先前選擇的日期
+RemoveAllDays=全部刪除
+CopyHoursOfFirstDay=複制第一天的時間
+RemoveAllHours=刪除所有時間
+SelectedDays=已選擇的日子
+TheBestChoice=目前最好的選擇是
+TheBestChoices=目前最好的選擇是
+with=與
+OpenSurveyHowTo=如果您同意在此次調查中投票，則必須給出自己的名字，選擇最適合您的值，並使用該行末尾的加號按鈕進行驗證。
+CommentsOfVoters=投票人的評論
+ConfirmRemovalOfPoll=您確定要刪除此調查（以及所有投票）嗎？
+RemovePoll=刪除調查
+UrlForSurvey=調查的直接網址
+PollOnChoice=您正在建立多項選擇的調查。首先為您的調查輸入所有可能的選擇：
+CreateSurveyDate=建立日期調查
+CreateSurveyStandard=建立標準調查
+CheckBox=簡易勾選框
+YesNoList=清單（空/是/否）
+PourContreList=清單（空/支持/反對）
+AddNewColumn=增加新欄位
+TitleChoice=選擇標籤
+ExportSpreadsheet=匯出結果表格
+ExpireDate=調查截止日
+NbOfSurveys=投票次數
+NbOfVoters=投票人數
+SurveyResults=結果
+PollAdminDesc=您可以使用“編輯”按鈕更改此民意調查的所有投票行。您也可以使用%s刪除列或行。您也可以使用%s增加新列。
+5MoreChoices=再多5個選項
+Against=反對
+YouAreInivitedToVote=您被邀請參加此項調查
+VoteNameAlreadyExists=此名稱已用於此調查
+AddADate=增加日期
+AddStartHour=增加開始時間
+AddEndHour=增加結束時間
+votes=投票
+NoCommentYet=尚未有此調查的評論
+CanComment=投票者可以在調查中發表評論
+CanSeeOthersVote=投票者可以看到其他人的投票
+SelectDayDesc=對於每個選定的日期，您可以依照以下格式選擇是否選擇開會時間： -空的 -“ 8h”，“ 8H”或“ 8:00”指定會議的開始時間， -“ 8-11”，“ 8h-11h”，“ 8H-11H”或“ 8：00-11：00”給出會議的開始和結束時間， -同樣的用“ 8h15-11h15”，“ 8H15-11H15”或“ 8：15-11：15”表示，但要加上分鐘。
+BackToCurrentMonth=回到目前月份
+ErrorOpenSurveyFillFirstSection=您尚未填寫建立調查的第一部分
+ErrorOpenSurveyOneChoice=輸入至少一個選項
+ErrorInsertingComment=插入您的評論時出錯
+MoreChoices=為投票者輸入更多選項
+SurveyExpiredInfo=投票已關閉或投票已到期。
+EmailSomeoneVoted=%s已填滿一行。\n您可以在以下連結找到您的調查：\n%s
+ShowSurvey=顯示調查
+UserMustBeSameThanUserUsedToVote=您必須已投票並使用與投票時相同的用戶名來發表評論
From 922354f36616288ea69d066206d4c775b4c43e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
Date: Tue, 20 Jul 2021 18:19:27 +0200
Subject: [PATCH 02/18] Update projects.php
---
htdocs/projet/ajax/projects.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index 0036ae64353..a852ab6bad8 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -63,7 +63,7 @@ if (!GETPOST('mode', 'aZ09') || GETPOST('mode', 'aZ09') != 'gettasks') {
// Mode to get list of tasks
if (GETPOST('mode', 'aZ09') == 'gettasks') {
$formproject = new FormProjets($db);
- $formproject->selectTasks((!empty($$socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOST('projectid', 'int'), '');
+ $formproject->selectTasks((!empty($socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOST('projectid', 'int'), '');
return;
}
From e93a362a0d585374260be696f91420d922672d4e Mon Sep 17 00:00:00 2001
From: Florian HENRY
Date: Fri, 23 Jul 2021 18:33:18 +0200
Subject: [PATCH 03/18] fix: since be62c2f7 commit selectlist from formconfirm
were behind the form confirm
---
htdocs/core/class/html.form.class.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1213c070acc..56316475ab7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1182,7 +1182,7 @@ class Form
// mode 1
$urloption = 'htmlname='.urlencode($htmlname).'&outjson=1&filter='.urlencode($filter).($showtype ? '&showtype='.urlencode($showtype) : '');
$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
- $out .= '';
+ $out .= '';
if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
elseif ($hidelabel > 1) {
$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
@@ -6052,7 +6052,7 @@ class Form
$urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.'&filter='.urlencode($objecttmp->filter);
// Activate the auto complete using ajax call.
$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
- $out .= '';
+ $out .= '';
if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
$out .= '';
}
From bbd84fd13ec2241348d31246125f286c364192d2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO
Date: Mon, 26 Jul 2021 04:08:05 +0200
Subject: [PATCH 04/18] FIX: Missing column Date validation in ledger &
subledger
---
.../accountancy/bookkeeping/listbyaccount.php | 56 ++++++++++++++++-
.../bookkeeping/listbysubaccount.php | 63 ++++++++++++++++---
2 files changed, 108 insertions(+), 11 deletions(-)
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 98c3f14191b..c8364c35ee5 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2016 Neil Orley
* Copyright (C) 2013-2016 Olivier Geffroy
* Copyright (C) 2013-2020 Florian Henry
- * Copyright (C) 2013-2020 Alexandre Spangaro
+ * Copyright (C) 2013-2021 Alexandre Spangaro
* Copyright (C) 2018 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
@@ -56,6 +56,14 @@ $search_date_export_endmonth = GETPOST('search_date_export_endmonth', 'int');
$search_date_export_endday = GETPOST('search_date_export_endday', 'int');
$search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
$search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
+$search_date_validation_startyear = GETPOST('search_date_validation_startyear', 'int');
+$search_date_validation_startmonth = GETPOST('search_date_validation_startmonth', 'int');
+$search_date_validation_startday = GETPOST('search_date_validation_startday', 'int');
+$search_date_validation_endyear = GETPOST('search_date_validation_endyear', 'int');
+$search_date_validation_endmonth = GETPOST('search_date_validation_endmonth', 'int');
+$search_date_validation_endday = GETPOST('search_date_validation_endday', 'int');
+$search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
+$search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
$search_accountancy_code = GETPOST("search_accountancy_code");
$search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -81,7 +89,7 @@ if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_
}
// Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -144,6 +152,7 @@ $arrayfields = array(
't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
+ 't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
);
if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
@@ -221,6 +230,14 @@ if (empty($reshook)) {
$search_date_export_endyear = '';
$search_date_export_endmonth = '';
$search_date_export_endday = '';
+ $search_date_validation_start = '';
+ $search_date_validation_end = '';
+ $search_date_validation_startyear = '';
+ $search_date_validation_startmonth = '';
+ $search_date_validation_startday = '';
+ $search_date_validation_endyear = '';
+ $search_date_validation_endmonth = '';
+ $search_date_validation_endday = '';
$search_debit = '';
$search_credit = '';
$search_lettering_code = '';
@@ -301,6 +318,14 @@ if (empty($reshook)) {
$filter['t.date_export<='] = $search_date_export_end;
$param .= '&search_date_export_endmonth='.$search_date_export_endmonth.'&search_date_export_endday='.$search_date_export_endday.'&search_date_export_endyear='.$search_date_export_endyear;
}
+ if (!empty($search_date_validation_start)) {
+ $filter['t.date_validated>='] = $search_date_validation_start;
+ $param .= '&search_date_validation_startmonth='.$search_date_validation_startmonth.'&search_date_validation_startday='.$search_date_validation_startday.'&search_date_validation_startyear='.$search_date_validation_startyear;
+ }
+ if (!empty($search_date_validation_end)) {
+ $filter['t.date_validated<='] = $search_date_validation_end;
+ $param .= '&search_date_validation_endmonth='.$search_date_validation_endmonth.'&search_date_validation_endday='.$search_date_validation_endday.'&search_date_validation_endyear='.$search_date_validation_endyear;
+ }
}
if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
@@ -564,6 +589,17 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
print '';
print '';
}
+// Date validation
+if (!empty($arrayfields['t.date_validated']['checked'])) {
+ print '