Commit graph

141182 commits

Author SHA1 Message Date
Laurent Destailleur
e2b3b6360f
Merge pull request #32686 from mdeweerd/fix/phpunit.win
FIX ci: Remove exit from SocieteTest, include company.lib in Societe.class.php which uses getCountry
2025-01-16 18:45:45 +01:00
Laurent Destailleur (aka Eldy)
619392e25a Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 17:58:18 +01:00
Laurent Destailleur (aka Eldy)
8b788773cd Fix transfer in accountancy when general account was empty to -1 2025-01-16 17:54:56 +01:00
MDW
eadf4c9f59
Qual: Remove var_dump and exit from SocieteTest 2025-01-16 17:32:05 +01:00
MDW
7c31549f71
FIX societe.class.php uses getCountry, provided by company.lib
# FIX Societe.class.php uses getCountry, provided by company.lib

Include company.lib.php in societe.class.php.
The SocieteTest.php test failed when run independently on windows.
2025-01-16 17:32:04 +01:00
Laurent Destailleur (aka Eldy)
5dca2a2d41 Debug v21 - Fix export in accountancy 2025-01-16 17:31:44 +01:00
Laurent Destailleur (aka Eldy)
9979f64ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 17:29:03 +01:00
Laurent Destailleur (aka Eldy)
f97b2f44cd Debug v21 - Fix export in accountancy 2025-01-16 17:27:22 +01:00
Laurent Destailleur
e09c2c62df
Merge pull request #32648 from hregis/fix_dev_multicompany_compatibility
FIX the rules for rowid (fk_pays+'1') is no longer used (Multicompany)
2025-01-16 15:41:14 +01:00
Laurent Destailleur
b831d5070a
Merge pull request #32676 from mdeweerd/fix/21.0_precommit
Qual: Fix ci (pre-commit) Exclude/fix shellcheck notices
2025-01-16 15:35:36 +01:00
Laurent Destailleur (aka Eldy)
84d982cdfb Fix js warning 2025-01-16 15:35:17 +01:00
Laurent Destailleur (aka Eldy)
a233abdcc5 Fix sql error 2025-01-16 15:33:00 +01:00
Laurent Destailleur (aka Eldy)
5e7ed6ba6d Try better fix for js warning 2025-01-16 15:32:08 +01:00
Laurent Destailleur (aka Eldy)
70a476a830 Fix js warning 2025-01-16 15:24:09 +01:00
Laurent Destailleur (aka Eldy)
4acacc2e9f Debug v21 - fix js warnings 2025-01-16 15:19:36 +01:00
Laurent Destailleur
b3f4ac5c9e
Merge branch '21.0' into fix/21.0_precommit 2025-01-16 15:00:04 +01:00
Laurent Destailleur (aka Eldy)
3bb748a4ee Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 14:48:33 +01:00
Alexandre Janniaux
63c991413e api_thirdparties: fix num_rows typo
$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.

But the call was not written properly and both were mixed up in commit
25741a618e which used $db->num_rows, and
then fixed in 72c443868c which used
$db->num_rows($result) where suited, except this location.
2025-01-16 14:48:08 +01:00
Alexandre Janniaux
eaa51fed7b accounting: fix num_rows without call from $db
$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.
2025-01-16 14:47:59 +01:00
Laurent Destailleur (aka Eldy)
e607fc8792 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-16 14:47:18 +01:00
Laurent Destailleur (aka Eldy)
d85c39e77b Fix CI 2025-01-16 14:47:03 +01:00
Laurent Destailleur
2d29c0a09f
Merge pull request #32684 from BenjaminFlr/accessibility
ENH: accessibility on ticket admin page
2025-01-16 14:38:32 +01:00
Laurent Destailleur
0bf729f143
Merge pull request #32675 from alexandre-janniaux/accounting-num_rows_leftovers
FIX: accounting: fix num_rows without call from $db
2025-01-16 14:36:27 +01:00
Laurent Destailleur
e4a7b286b2
Merge pull request #32677 from alexandre-janniaux/apithirdparties-num_rows-leftovers
FIX: api_thirdparties: fix num_rows typo
2025-01-16 14:35:42 +01:00
Laurent Destailleur
a578d9455a
Merge pull request #32681 from aspangaro/21css
Remove inappropriate <td>
2025-01-16 14:35:18 +01:00
Laurent Destailleur
2fdd327c51
Merge branch '21.0' into fix/21.0_precommit 2025-01-16 14:34:34 +01:00
Laurent Destailleur
72ef34f698
Merge branch 'develop' into accounting-num_rows_leftovers 2025-01-16 14:33:36 +01:00
Laurent Destailleur (aka Eldy)
3c2f6739d1 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 14:06:23 +01:00
Laurent Destailleur (aka Eldy)
6f26816185 Migration 2025-01-16 14:02:43 +01:00
Laurent Destailleur (aka Eldy)
2ae7549563 Debug v21 2025-01-16 14:02:08 +01:00
Laurent Destailleur (aka Eldy)
683f4f931e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 13:06:43 +01:00
Laurent Destailleur (aka Eldy)
b41584de08 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-16 12:09:36 +01:00
Benjamin Falière
05a7c16422 ENH: accessibility on ticket admin page 2025-01-16 12:09:27 +01:00
Laurent Destailleur (aka Eldy)
c01e3faea4 Update eclipse rules 2025-01-16 12:09:13 +01:00
Alexandre SPANGARO
5403293409 Remove inappropriate <td> 2025-01-16 06:19:22 +01:00
Laurent Destailleur (aka Eldy)
162b3b1d82 Debug v21 2025-01-16 05:13:34 +01:00
Laurent Destailleur (aka Eldy)
a82da1cc6c Must be able to force lang 2025-01-16 02:55:00 +01:00
Laurent Destailleur (aka Eldy)
f88cfae08f Debug v21 2025-01-16 02:50:23 +01:00
Laurent Destailleur (aka Eldy)
0f0617f8f8 Debug v21 2025-01-16 02:09:34 +01:00
Laurent Destailleur (aka Eldy)
a41fe4637d Debug v21 2025-01-16 01:58:13 +01:00
Laurent Destailleur (aka Eldy)
16b28e4d16 Debug v21 2025-01-15 21:19:18 +01:00
Alexandre Janniaux
d5584f4e32 api_thirdparties: fix num_rows typo
$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.

But the call was not written properly and both were mixed up in commit
25741a618e which used $db->num_rows, and
then fixed in 72c443868c which used
$db->num_rows($result) where suited, except this location.
2025-01-15 20:09:25 +01:00
MDW
4d1cc9c2a1
Qual: Fix ci (pre-commit) Exclude/fix shellcheck notices 2025-01-15 20:08:43 +01:00
Alexandre Janniaux
f757f9c4cc accounting: fix num_rows without call from $db
$res->num_rows will not work on PostgreSQL. $db->num_rows() must be used
instead to execute the correct procedure depending on the database
backend.
2025-01-15 20:03:28 +01:00
Laurent Destailleur
ece1317824
Merge pull request #32668 from mdeweerd/qual/flow-precommit-shellcheck
Qual: Fix ci (pre-commit) Exclude/fix shellcheck notices
2025-01-15 18:02:42 +01:00
MDW
ac35daf08f
Qual: Fix whitespace 2025-01-15 14:54:33 +01:00
MDW
fffa47723f
Qual: Fix ci (pre-commit) Exclude/fix shellcheck notices 2025-01-15 14:37:24 +01:00
Laurent Destailleur
55b96e085e
Merge pull request #32659 from atm-quentin/FIX/32460/DBPrefix
FIX Issue #32460 db prefix for module builder
2025-01-15 14:19:49 +01:00
Laurent Destailleur
2d641d7537
Merge pull request #32657 from rycks/develop_hook_for_vat_rates
add a hook on vat rate
2025-01-15 14:19:19 +01:00
Laurent Destailleur
acf1430bed
Update html.form.class.php 2025-01-15 14:18:22 +01:00