2
0
forked from Wavyzz/dolibarr
Commit Graph

111947 Commits

Author SHA1 Message Date
Laurent Destailleur
fa34ea3dc5 Merge pull request #22997 from SylvainLegrand/fix_#21357
Fix #21357
2022-11-26 10:57:18 +01:00
Laurent Destailleur
c8e5ca9691 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-26 01:54:53 +01:00
Laurent Destailleur
096bd39ae7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:54:17 +01:00
Laurent Destailleur
860f2414c4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-26 01:46:37 +01:00
Laurent Destailleur
63541d1515 Fix phpcs 2022-11-26 01:45:58 +01:00
Laurent Destailleur
a6bec59e98 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-26 01:22:12 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
2022-11-26 01:21:51 +01:00
Laurent Destailleur
1921d427e9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:14:09 +01:00
Laurent Destailleur
85e9ac1e40 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-26 01:13:58 +01:00
Laurent Destailleur
659bee1c94 Merge pull request #22985 from rycks/14_fix_debian_build_package
fix #20894: debian package (compress options)
2022-11-26 00:47:11 +01:00
Sylvain Legrand
6768697497 Fix #21357 2022-11-26 00:13:15 +01:00
Laurent Destailleur
1ec862b491 Merge pull request #22982 from inovea-conseil/fix_19877
FIX#19877
2022-11-25 23:41:18 +01:00
Laurent Destailleur
42d09f597c Merge pull request #22980 from inovea-conseil/FIX#19828
FIX#19828
2022-11-25 23:36:28 +01:00
Laurent Destailleur
ac13768395 Merge pull request #22987 from bafbes/patch-3
FIX for #22952
2022-11-25 23:15:51 +01:00
stickler-ci
1d0f329ac5 Fixing style errors. 2022-11-25 22:15:01 +00:00
Bahfir Abbes
cbf103ef74 FIX for #22882 2022-11-25 22:58:51 +01:00
Eric Seigne
67288f1373 fix #20894: debian package (compress options) 2022-11-25 22:56:48 +01:00
Mathieu
023bc7d20e FIX#19877 2022-11-25 22:29:44 +01:00
IC-Ilies
b5ab1f612c FIX#19828 2022-11-25 22:29:35 +01:00
Laurent Destailleur
f42f083d10 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-25 22:20:58 +01:00
Laurent Destailleur
2ce4e1d125 Merge pull request #22978 from ATM-Nicolas/fix_bankaccount_api
FIX : Bankaccounts API fetch with 'id' and 'socid'
2022-11-25 22:18:02 +01:00
ATM-Nicolas
3475e55b80 FIX : Bankaccounts API fetch with 'id' and 'socid' 2022-11-25 22:11:17 +01:00
Laurent Destailleur
03485a2f73 Merge pull request #22680 from OPEN-DSI/14.0_fix_start_cron_in_multientities_with_verif_test_condition
FIX: Fix the position of the verification condition of the test field in case of multi entities
2022-11-25 16:34:27 +01:00
Laurent Destailleur
ba0e7a9744 Merge pull request #22966 from noec764/14_FIX_Use_Hook_Resprints
FIX:  use addMoreActionsButton hook resprints
2022-11-25 15:32:00 +01:00
Laurent Destailleur
317530fc8b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-25 12:49:30 +01:00
Laurent Destailleur
45be6dd25b Prepare 16.0.3 2022-11-25 12:48:26 +01:00
Laurent Destailleur
acff0e23e5 Merge pull request #22965 from nicolas-eoxia/fix_selectTask_morecss_option
fix: can't use parameter morcss in select task because parameter is o…
2022-11-25 12:36:08 +01:00
stickler-ci
ec156ddf84 Fixing style errors. 2022-11-25 11:26:31 +00:00
Noé Courtier
043b2e9ea3 FIX: copy same behaviour in other accountancy files 2022-11-25 12:18:32 +01:00
Nicolas Domenech
f2f58e434e fix: can't use parameter morcss in select task because parameter is overwrite 2022-11-25 12:16:34 +01:00
Noé Courtier
2ada053855 FIX: Use the Hook addMoreActionsButtons resPrint 2022-11-25 11:44:34 +01:00
Laurent Destailleur
ca1eeb0c14 Merge pull request #22954 from atm-maxime/fix_expedition_stats
Fix expedition stats abstract method
2022-11-25 09:26:00 +01:00
Maxime Kohlhaas
834d30b9d0 Fix expedition stats abstract method 2022-11-24 23:21:23 +01:00
Laurent Destailleur
dd50854b05 Fix log 2022-11-23 18:58:17 +01:00
Laurent Destailleur
4d11b5db31 Fix error management 2022-11-23 18:52:43 +01:00
Laurent Destailleur
459961711e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 17:01:29 +01:00
Laurent Destailleur
1a8dbd75ea Fix update socialnetworks 2022-11-23 16:59:40 +01:00
Laurent Destailleur
39d8e44b3d Merge pull request #22885 from alsoft10/16.0
BUG FIXED #22883
2022-11-23 12:38:59 +01:00
Laurent Destailleur
795895e18f Merge pull request #22936 from Easya-Solutions/14.0_fix-get-next-value-year-on-one-digit
FIX compute next value when year is on one digit for reset counter
2022-11-23 12:33:27 +01:00
Laurent Destailleur
97863440cb Merge pull request #22937 from atm-gauthier/FIX_total_invoice_on_show_objects_linked_bloc
FIX : $sign is useless
2022-11-23 12:27:50 +01:00
Laurent Destailleur
fb3bbee0a3 Merge pull request #22938 from Daviid-P/15.0
FIX Broken Permissions check, $object is null.
2022-11-23 12:22:21 +01:00
Laurent Destailleur
9a0b10bf9f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:34 +01:00
Laurent Destailleur
207f56ff64 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:21 +01:00
Laurent Destailleur
2f0880020c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-23 12:02:25 +01:00
Laurent Destailleur
9ee4c73036 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-23 11:58:59 +01:00
Laurent Destailleur
c9930ee6ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-23 11:58:46 +01:00
David Pareja Rodriguez
05e850dbfc FIX Broken Permissions check, $object is null.
This code was probably copy&paste'd from `htdocs/compta/prelevement/card.php` where the `$object` variable exists.

On `htdocs/compta/prelevement/line.php` `$object` is not defined, and `$type` come from the `$type = GETPOST('type', 'aZ09');` which ends up being overwritten with null.
2022-11-23 11:58:21 +01:00
Gauthier PC portable 024
b77f63bc5c FIX : $sign is useless 2022-11-23 11:24:29 +01:00
VESSILLER
ed2a9a22e8 FIX compute next value when year is on one digit for reset counter 2022-11-23 08:36:20 +01:00
Laurent Destailleur
a59bdfba0c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-23 00:00:47 +01:00