mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-08 00:52:01 +01:00
Merge branch 'Dolibarr:develop' into patch-8
This commit is contained in:
thibdrev
8
.github/workflows/phpstan.yml
vendored
8
.github/workflows/phpstan.yml
vendored
@@ -44,7 +44,8 @@ jobs:
|
||||
|
||||
# Restore old cache
|
||||
- name: Restore phpstan cache
|
||||
uses: actions/cache/restore@v3
|
||||
id: cache
|
||||
uses: actions/cache/restore@v4
|
||||
with:
|
||||
path: ./.github/tmp
|
||||
key: "phpstan-cache-${{ matrix.php-version }}-${{ github.run_id }}"
|
||||
@@ -55,13 +56,14 @@ jobs:
|
||||
|
||||
# Run PHPStan
|
||||
- name: Run PHPStan
|
||||
id: phpstan
|
||||
run: phpstan -vvv analyse --error-format=checkstyle --memory-limit 4G -a build/phpstan/bootstrap_action.php -c phpstan.neon | cs2pr --graceful-warnings
|
||||
# continue-on-error: true
|
||||
|
||||
# Save cache
|
||||
- name: "Save phpstan cache"
|
||||
uses: actions/cache/save@v3
|
||||
if: always()
|
||||
uses: actions/cache/save@v4
|
||||
if: ${{ success() || ( ! cancelled() && steps.cache.outputs.cache-hit != 'true' ) }}
|
||||
with:
|
||||
path: ./.github/tmp
|
||||
key: "phpstan-cache-${{ matrix.php-version }}-${{ github.run_id }}"
|
||||
|
||||
8
.github/workflows/pre-commit.yml
vendored
8
.github/workflows/pre-commit.yml
vendored
@@ -27,7 +27,7 @@ jobs:
|
||||
python-version: '3.11'
|
||||
- run: python -m pip install pre-commit regex
|
||||
# Restore previous cache of precommit
|
||||
- uses: actions/cache/restore@v3
|
||||
- uses: actions/cache/restore@v4
|
||||
with:
|
||||
path: ~/.cache/pre-commit/
|
||||
key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||
@@ -54,8 +54,8 @@ jobs:
|
||||
notices-as-warnings: true # optional
|
||||
prepend-filename: true # optional
|
||||
# Save the precommit cache
|
||||
- uses: actions/cache/save@v3
|
||||
if: ${{ always() }}
|
||||
- uses: actions/cache/save@v4
|
||||
if: ${{ ! cancelled() }}
|
||||
with:
|
||||
path: ~/.cache/pre-commit/
|
||||
key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml')
|
||||
@@ -63,7 +63,7 @@ jobs:
|
||||
# Upload result log files of precommit into the Artifact shared store
|
||||
- name: Provide log as artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
if: ${{ always() }}
|
||||
if: ${{ ! cancelled() }}
|
||||
with:
|
||||
name: precommit-logs
|
||||
path: |
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
README (English)
|
||||
--------------------------------
|
||||
|
||||
This directory contains ruleset files to use to develop Dolibarr EPR & CRM.
|
||||
This directory contains ruleset files to use to develop Dolibarr ERP & CRM.
|
||||
|
||||
To install/upgrade phpcs:
|
||||
> sudo pear upgrade PHP_CodeSniffer
|
||||
@@ -17,5 +17,4 @@ To fix with phpcbf:
|
||||
|
||||
Note with Eclipse: You must setup the PTI plugin of Eclipse into PHPCodeSniffer menu with:
|
||||
* tab value to 4
|
||||
* path of code sniffer standard to dev/codesniffer
|
||||
|
||||
* path of code sniffer standard to dev/codesniffer
|
||||
|
||||
@@ -559,6 +559,7 @@ class Cronjob extends CommonObject
|
||||
$sql .= " t.fk_user_mod,";
|
||||
$sql .= " t.note as note_private,";
|
||||
$sql .= " t.nbrun,";
|
||||
$sql .= " t.maxrun,";
|
||||
$sql .= " t.libname,";
|
||||
$sql .= " t.test";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."cronjob as t";
|
||||
@@ -595,45 +596,46 @@ class Cronjob extends CommonObject
|
||||
|
||||
if ($num) {
|
||||
while ($i < $num) {
|
||||
$line = new Cronjobline();
|
||||
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
$cronjob_obj = new Cronjob($this->db);
|
||||
|
||||
$line->id = $obj->rowid;
|
||||
$line->ref = $obj->rowid;
|
||||
$line->entity = $obj->entity;
|
||||
$line->tms = $this->db->jdate($obj->tms);
|
||||
$line->datec = $this->db->jdate($obj->datec);
|
||||
$line->label = $obj->label;
|
||||
$line->jobtype = $obj->jobtype;
|
||||
$line->command = $obj->command;
|
||||
$line->classesname = $obj->classesname;
|
||||
$line->objectname = $obj->objectname;
|
||||
$line->methodename = $obj->methodename;
|
||||
$line->params = $obj->params;
|
||||
$line->md5params = $obj->md5params;
|
||||
$line->module_name = $obj->module_name;
|
||||
$line->priority = $obj->priority;
|
||||
$line->datelastrun = $this->db->jdate($obj->datelastrun);
|
||||
$line->datenextrun = $this->db->jdate($obj->datenextrun);
|
||||
$line->dateend = $this->db->jdate($obj->dateend);
|
||||
$line->datestart = $this->db->jdate($obj->datestart);
|
||||
$line->lastresult = $obj->lastresult;
|
||||
$line->datelastresult = $this->db->jdate($obj->datelastresult);
|
||||
$line->lastoutput = $obj->lastoutput;
|
||||
$line->unitfrequency = $obj->unitfrequency;
|
||||
$line->frequency = $obj->frequency;
|
||||
$line->status = $obj->status;
|
||||
$line->processing = $obj->processing;
|
||||
$line->pid = $obj->pid;
|
||||
$line->email_alert = $obj->email_alert;
|
||||
$line->fk_user_author = $obj->fk_user_author;
|
||||
$line->fk_user_mod = $obj->fk_user_mod;
|
||||
$line->note_private = $obj->note_private;
|
||||
$line->nbrun = $obj->nbrun;
|
||||
$line->libname = $obj->libname;
|
||||
$line->test = $obj->test;
|
||||
$this->lines[] = $line;
|
||||
$cronjob_obj->id = $obj->rowid;
|
||||
$cronjob_obj->ref = $obj->rowid;
|
||||
$cronjob_obj->entity = $obj->entity;
|
||||
$cronjob_obj->tms = $this->db->jdate($obj->tms);
|
||||
$cronjob_obj->datec = $this->db->jdate($obj->datec);
|
||||
$cronjob_obj->label = $obj->label;
|
||||
$cronjob_obj->jobtype = $obj->jobtype;
|
||||
$cronjob_obj->command = $obj->command;
|
||||
$cronjob_obj->classesname = $obj->classesname;
|
||||
$cronjob_obj->objectname = $obj->objectname;
|
||||
$cronjob_obj->methodename = $obj->methodename;
|
||||
$cronjob_obj->params = $obj->params;
|
||||
$cronjob_obj->md5params = $obj->md5params;
|
||||
$cronjob_obj->module_name = $obj->module_name;
|
||||
$cronjob_obj->priority = $obj->priority;
|
||||
$cronjob_obj->datelastrun = $this->db->jdate($obj->datelastrun);
|
||||
$cronjob_obj->datenextrun = $this->db->jdate($obj->datenextrun);
|
||||
$cronjob_obj->dateend = $this->db->jdate($obj->dateend);
|
||||
$cronjob_obj->datestart = $this->db->jdate($obj->datestart);
|
||||
$cronjob_obj->lastresult = $obj->lastresult;
|
||||
$cronjob_obj->lastoutput = $obj->lastoutput;
|
||||
$cronjob_obj->datelastresult = $this->db->jdate($obj->datelastresult);
|
||||
$cronjob_obj->unitfrequency = $obj->unitfrequency;
|
||||
$cronjob_obj->frequency = $obj->frequency;
|
||||
$cronjob_obj->status = $obj->status;
|
||||
$cronjob_obj->processing = $obj->processing;
|
||||
$cronjob_obj->pid = $obj->pid;
|
||||
$cronjob_obj->email_alert = $obj->email_alert;
|
||||
$cronjob_obj->fk_user_author = $obj->fk_user_author;
|
||||
$cronjob_obj->fk_user_mod = $obj->fk_user_mod;
|
||||
$cronjob_obj->note_private = $obj->note_private;
|
||||
$cronjob_obj->nbrun = $obj->nbrun;
|
||||
$cronjob_obj->maxrun = $obj->maxrun;
|
||||
$cronjob_obj->libname = $obj->libname;
|
||||
$cronjob_obj->test = $obj->test;
|
||||
|
||||
$this->lines[] = $cronjob_obj;
|
||||
|
||||
$i++;
|
||||
}
|
||||
@@ -1572,76 +1574,9 @@ class Cronjob extends CommonObject
|
||||
|
||||
|
||||
/**
|
||||
* Crob Job line class
|
||||
* Crob Job line class
|
||||
* @TODO Deprecated, to delete very soon
|
||||
*/
|
||||
class Cronjobline
|
||||
class Cronjobline extends Cronjob
|
||||
{
|
||||
/**
|
||||
* @var int ID
|
||||
*/
|
||||
public $id;
|
||||
|
||||
public $entity;
|
||||
|
||||
/**
|
||||
* @var string Ref
|
||||
*/
|
||||
public $ref;
|
||||
|
||||
public $tms = '';
|
||||
public $datec = '';
|
||||
|
||||
/**
|
||||
* @var string Cron Job Line label
|
||||
*/
|
||||
public $label;
|
||||
|
||||
public $jobtype;
|
||||
public $command;
|
||||
public $classesname;
|
||||
public $objectname;
|
||||
public $methodename;
|
||||
public $params;
|
||||
public $md5params;
|
||||
public $module_name;
|
||||
public $priority;
|
||||
public $datelastrun = '';
|
||||
public $datenextrun = '';
|
||||
public $dateend = '';
|
||||
public $datestart = '';
|
||||
public $datelastresult = '';
|
||||
public $lastresult = '';
|
||||
public $lastoutput;
|
||||
public $unitfrequency;
|
||||
public $frequency;
|
||||
public $processing;
|
||||
|
||||
/**
|
||||
* @var int Status
|
||||
*/
|
||||
public $status;
|
||||
|
||||
/**
|
||||
* @var int ID
|
||||
*/
|
||||
public $fk_user_author;
|
||||
|
||||
/**
|
||||
* @var int ID
|
||||
*/
|
||||
public $fk_user_mod;
|
||||
|
||||
public $note;
|
||||
public $note_private;
|
||||
public $nbrun;
|
||||
public $libname;
|
||||
public $test;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
@@ -760,7 +760,7 @@ if (empty($reshook)) {
|
||||
} elseif ($action == 'add' && $usercancreate) {
|
||||
// Insert new invoice in database
|
||||
if ($socid > 0) {
|
||||
$object->socid = GETPOST('socid', 'int');
|
||||
$object->socid = GETPOSTINT('socid');
|
||||
}
|
||||
$selectedLines = GETPOST('toselect', 'array');
|
||||
|
||||
|
||||
@@ -185,4 +185,4 @@ EvenUnsubscribe=Include opt-out emails
|
||||
EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
|
||||
XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
|
||||
helpWithAi=Add instructions
|
||||
YouCanMakeSomeInstructionForEmail=You Can Make Some Instruction For your Email (Exemple: generate image in email template...)
|
||||
YouCanMakeSomeInstructionForEmail=You can add some instructions for your email (Example: generate image in email template...)
|
||||
|
||||
@@ -374,7 +374,7 @@ class Dolresource extends CommonObject
|
||||
$error++;
|
||||
}
|
||||
}
|
||||
}diction
|
||||
}
|
||||
}
|
||||
|
||||
if (!$error) {
|
||||
|
||||
Reference in New Issue
Block a user