Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…
Browse files Browse the repository at this point in the history
…evelop
  • Loading branch information
eldy committed Dec 23, 2024
2 parents 6c33f97 + 58f641a commit b21b4e8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Definition:

As the Developer:

1. Check you agree with the terms of the [DCO - Developer's Certificate of Origin](https://github.com/Dolibarr/dolibarr/DCO)
1. Check you agree with the terms of the [DCO - Developer's Certificate of Origin](https://github.com/Dolibarr/dolibarr/blob/develop/DCO)
2. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr).
3. Clone your fork.
4. Choose a branch(See the [Branches](#branches) section below).
Expand Down
2 changes: 1 addition & 1 deletion htdocs/product/list.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
$search_accountancy_code_buy_export = GETPOST("search_accountancy_code_buy_export", 'alpha');
$search_import_key = GETPOST("search_import_key", 'alpha');
$search_finished = GETPOST("search_finished");
$search_units = GETPOST('search_units', 'alpha');
$search_units = GETPOST('search_units', 'int');
$type = GETPOST("type", 'alpha');

// Show/hide child product variants
Expand Down
2 changes: 1 addition & 1 deletion htdocs/ticket/class/ticket.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -3192,7 +3192,7 @@ public function load_board($user, $mode)
while ($obj = $this->db->fetch_object($resql)) {
$response->nbtodo++;
if ($mode == 'opened') {
$datelimit = $this->db->jdate($obj->datec) + $delay_warning;
$datelimit = (int) $this->db->jdate($obj->datec) + (int) $delay_warning;
if ($datelimit < $now) {
//$response->nbtodolate++;
}
Expand Down

0 comments on commit b21b4e8

Please sign in to comment.