Skip to content
Merged

20.0 #16

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
25ea797
Fix not default template for BOM
eldy Sep 30, 2024
83cf2c8
FIX OAuth generation of token for Microsoft, Stripe and Generic
eldy Oct 1, 2024
4361da7
Fix responsive
eldy Oct 2, 2024
8bdd3fe
Fix error
eldy Oct 2, 2024
b5730db
Fix error
eldy Oct 2, 2024
11ea0ad
Fix fatal error with bad parameters
eldy Oct 2, 2024
c5eb24e
Trans
eldy Oct 2, 2024
03c974d
trans
eldy Oct 2, 2024
50d2613
Fix use of OAUTH for SMTP use with Microsoft
eldy Oct 2, 2024
b37773c
Fix mutitenant MS oauth
eldy Oct 2, 2024
52616db
Fix mutitenant MS oauth refresh
eldy Oct 2, 2024
22944a2
Code comment
eldy Oct 3, 2024
554f9da
Fix CSS
eldy Oct 3, 2024
877a6f6
FIX#31237 (#31239)
alsoft10 Oct 3, 2024
e56a1d9
Doc
eldy Oct 3, 2024
0676a5e
Fix a fix has been lsot by merge
eldy Oct 3, 2024
0674754
Restore regression
eldy Oct 3, 2024
59004c6
FIX Revert storing of ticket files into event dir, too many troubles.
eldy Oct 3, 2024
e1a2435
css
eldy Oct 3, 2024
0367450
css
eldy Oct 3, 2024
5d58a33
Fix tz array (#31240)
SylvainLegrand Oct 3, 2024
90a5589
fix: php warning (#31244)
FHenry Oct 3, 2024
32bad61
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 3, 2024
2d9399d
Fix phan
eldy Oct 3, 2024
3798957
Avoid warning
eldy Oct 3, 2024
28084d8
Fix error management
eldy Oct 3, 2024
e07c04c
fix precommit (#31235)
frederic34 Oct 3, 2024
97005cd
Fix warning
eldy Oct 3, 2024
20d66a6
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 3, 2024
6a09e7c
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
eldy Oct 3, 2024
37c5500
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 3, 2024
a333af2
fix missing token for links (#31225)
thersane-john Oct 3, 2024
86e34d8
Fix typo
eldy Oct 3, 2024
7cdc96e
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 3, 2024
b85b826
FIX#31241 (#31245)
alsoft10 Oct 3, 2024
a272d92
Fix $ in key (#31215)
thersane-john Oct 3, 2024
88b488c
Fix for better compatibility
eldy Oct 3, 2024
6f6a87c
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 3, 2024
e412dbb
Merge manually fix of #31217 + other fix for use by external modules
eldy Oct 3, 2024
a6c93a5
Update windows-ci.yml for branch 20.0 (#31258)
frederic34 Oct 3, 2024
eebb16c
Redice cyclomatic complexity
eldy Oct 3, 2024
1498874
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 3, 2024
9af212a
Update ticket.class.php Bug-fix Issue #31206 (#31208)
cbeasley-sbb Oct 3, 2024
bb69cd7
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
eldy Oct 3, 2024
f09ef5d
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 3, 2024
4c695be
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 3, 2024
d31baf0
(Re)store mariadb setup executable from/to cache (#31263)
mdeweerd Oct 4, 2024
7ba663b
Fix php 8 warnings (#31254)
thersane-john Oct 4, 2024
f287d10
Use <= 0 instead of ! because delete method returns -1 or 1 (#31268)
atm-irvine Oct 4, 2024
934d291
fix: action/card.php do not display priority field if hidden conf not…
FHenry Oct 4, 2024
fe6a50e
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 4, 2024
6b26467
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 4, 2024
63f6d0a
Fix: Number of decimals for stock values ignores configuration (#31285)
priojk Oct 6, 2024
d8a9804
Flow: Setup mariadb after restoring cache (#31274)
mdeweerd Oct 6, 2024
63d4b5e
FIX Backport fix fatal error on price with some truncating setup
eldy Oct 6, 2024
0811ff5
FIX dolFICalculatePaymentReference for Finland in functions_fi.lib.ph…
mikko80 Oct 7, 2024
3391d3d
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
eldy Oct 7, 2024
40965b6
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
eldy Oct 7, 2024
94ed718
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
eldy Oct 7, 2024
b07cc82
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
eldy Oct 7, 2024
081d3fa
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 7, 2024
f5262ce
Prepare 20.0.1
eldy Oct 7, 2024
728ca6a
Prepare 20.0.1
eldy Oct 7, 2024
7faa9ba
Fix 20.0 Action buttion url autocomplete (button dropdown part04) (#3…
thersane-john Oct 7, 2024
21eb8e5
Fix detection of text browser with w3m
eldy Oct 8, 2024
efe6571
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 8, 2024
14dec51
FIX Vat code is lost when updating lines in POS
eldy Oct 8, 2024
1f5f38a
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 8, 2024
67156d0
Fix phpunit
eldy Oct 8, 2024
ee4776d
Fix: Grand total correction (#31303)
fmarcet Oct 8, 2024
46671ad
Fix css
eldy Oct 9, 2024
37e9d4b
FIX #31015
eldy Oct 9, 2024
aa849f5
FIX default visiblity
eldy Oct 11, 2024
add1b28
fix: when tobill field is displayes SQL Error (#31358)
FHenry Oct 11, 2024
727003e
FIX Picto menu not visible
eldy Oct 11, 2024
20e022a
Fix log
eldy Oct 11, 2024
8e5cabe
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 12, 2024
185d7f4
Fix output
eldy Oct 13, 2024
0ec6ec9
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
eldy Oct 13, 2024
21c1c02
FIX #31360 delete contact when using pgsql.
eldy Oct 13, 2024
523d472
ci: Automatically determine version for upgrade sequence (#31344)
mdeweerd Oct 13, 2024
8aea1a8
fix translation (#31377)
frederic34 Oct 13, 2024
959392f
FIX Clear of option THEME_ELDY_USEBORDERONTABLE
eldy Oct 13, 2024
e465530
FIX CSS
eldy Oct 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions htdocs/categories/class/api_categories.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ public function delete($id)
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}

if (!$this->category->delete(DolibarrApiAccess::$user)) {
throw new RestException(401, 'error when delete category');
if ($this->category->delete(DolibarrApiAccess::$user) <= 0) {
throw new RestException(500, 'Error when delete category : ' . $this->category->error);
}

return array(
Expand Down
1 change: 1 addition & 0 deletions htdocs/core/lib/functions.lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -6127,6 +6127,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
if (dol_strlen($decpart) > $nbdecimal) {
$nbdecimal = dol_strlen($decpart);
}

// If nbdecimal is higher than max to show
$nbdecimalmaxshown = (int) str_replace('...', '', getDolGlobalString('MAIN_MAX_DECIMALS_SHOWN'));
if ($trunc && $nbdecimal > $nbdecimalmaxshown) {
Expand Down
14 changes: 12 additions & 2 deletions htdocs/societe/class/api_contacts.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public function put($id, $request_data = null)
* Delete contact
*
* @param int $id Contact ID
* @return integer
* @return array[]
*/
public function delete($id)
{
Expand All @@ -389,7 +389,17 @@ public function delete($id)
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$this->contact->oldcopy = clone $this->contact;
return $this->contact->delete(DolibarrApiAccess::$user);

if ($this->contact->delete(DolibarrApiAccess::$user) <= 0) {
throw new RestException(500, 'Error when delete contact ' . $this->contact->error);
}

return array(
'success' => array(
'code' => 200,
'message' => 'Contact deleted'
)
);
}

/**
Expand Down