Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 00:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,517 Commits 36 Branches 190 Tags
9a192e443e6d5fc0e61fbd65f4a0b80185a08536
Commit Graph

2984 Commits

Author SHA1 Message Date
Laurent Destailleur
9a192e443e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-19 19:05:47 +01:00
Laurent Destailleur
249a6ea9a9 Remove warning 2023-03-19 14:49:54 +01:00
Laurent Destailleur
d3f679f2b1 Fix sql regression 2023-03-19 12:54:11 +01:00
Laurent Destailleur
502badad4b Better error management 2023-03-19 11:32:46 +01:00
Laurent Destailleur
6e17c0c961 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-03-18 10:51:07 +01:00
Laurent Destailleur
b81cb7e963 Merge pull request #24070 from Daviid-P/ignore_localtaxes_if_localtax_type_zero 
Ignore localtaxes if localtax1_type or localtax2_type is 0
 2023-03-18 10:48:23 +01:00
Laurent Destailleur
91cf865583 Update functions.lib.php 2023-03-18 10:41:07 +01:00
David Pareja Rodriguez
927d0a2fa1 ORDER BY rowid 2023-03-13 11:16:37 +01:00
Laurent Destailleur
3300905599 Fix add a protection against bad param of dol_eval 2023-03-13 11:15:46 +01:00
Laurent Destailleur
ade0592a9b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-13 10:23:52 +01:00
noec764
353d451e5a Correct dolForgeCriteriaCallback 2023-03-10 15:48:26 +01:00
David Pareja Rodriguez
590373a620 Forgot to loop on the results 2023-02-28 13:33:52 +01:00
David Pareja Rodriguez
b191330a79 Ignore localtaxes if localtax1_type or localtax2_type is 0 2023-02-28 13:24:11 +01:00
Laurent Destailleur
393f3a9480 Merge pull request #23811 from evarisk-theo/FIX-clicktodial-backtopage 
FIX: fatal error on clicktodial backtopage
 2023-02-09 15:40:28 +01:00
Laurent Destailleur
3dc8937ad3 Provide an object for computed extrafields 2023-02-07 00:11:33 +01:00
Théo David
394c3f847c FIX clicktodial backtopage 2023-02-06 17:03:51 +01:00
Laurent Destailleur
2da8c1d9bc Fix rounding 2023-01-10 11:33:17 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
Alexandre SPANGARO
a107c81bf1 Merge branch '14.0' into 14p42 2022-12-06 04:53:10 +01:00
Alexandre SPANGARO
89b10b0dfb Fix css 2022-12-06 04:48:04 +01:00
Laurent Destailleur
9b5fc20308 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-01 17:46:13 +01:00
Eric Seigne
9a2ce53517 add stamp and signature in pictowithouttext list 2022-11-30 23:41:32 +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
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
1ec862b491 Merge pull request #22982 from inovea-conseil/fix_19877 
FIX#19877
 2022-11-25 23:41:18 +01:00
Mathieu
023bc7d20e FIX#19877 2022-11-25 22:29:44 +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
Florian HENRY
85aa9f7481 FIX: base64_decode shloud be forbiden in dol_eval 2022-11-16 09:32:14 +01:00
Laurent Destailleur
ccaa23121e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-15 13:57:23 +02:00
Laurent Destailleur
7387e535ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-15 13:51:50 +02:00
Ferran Marcet
1aa2427fd2 Fix: Not load project title when sending email from project 2022-10-10 11:26:20 +02:00
Laurent Destailleur
8fdf4876d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-06 15:39:10 +02:00
Laurent Destailleur
9125ac61a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-10-06 15:33:59 +02:00
ksar
a72fff4a5d FIX #22241 2022-10-05 16:39:26 +02:00
Laurent Destailleur
013d136bf7 FIX @ must be allowed into dol_eval 2022-10-04 13:57:42 +02:00
Laurent Destailleur
318d78e3b6 Doc 2022-09-25 15:03:36 +02:00
Laurent Destailleur
877c57f6b8 Merge pull request #22281 from atm-lena/16.0_FIX_getunitFromCode_AddFilterType 
Function getUnitFromCode : add filter by type of unit
 2022-09-25 14:19:33 +02:00
Laurent Destailleur
2b3f6cc173 Fix compatibility with PHP 8.1 and Psotgresql 2022-09-20 21:16:00 +02:00
atm-lena
1c14c61064 Function getUnitFromCode : add filter by type of unit 2022-09-15 11:55:08 +02:00
Regis Houssin
e7ea57d183 FIX avoid warning (php7+) 2022-09-11 19:22:51 +02:00
Christian Foellmann
5c135b59eb require missing signture.lib.php 2022-08-31 15:51:37 +02:00
Christian Foellmann
dabb52d26f require missing signture.lib.php 2022-08-30 09:10:43 +02:00
Regis Houssin
68994752cd FIX multiple php8 compatibility 2022-08-26 11:08:39 +02:00
Laurent Destailleur
0d693d723a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/propal/class/api_proposals.class.php
 2022-08-25 14:31:47 +02:00
Laurent Destailleur
a4c0177db0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/user/bank.php
 2022-08-25 14:29:09 +02:00
Laurent Destailleur
fd8313702b Merge pull request #21755 from SylvainLegrand/PR_improve_phone_settings_for_france 
Improve french phone settings (international numbering)
 2022-08-22 14:16:56 +02:00
Laurent Destailleur
1be8746a78 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-22 13:03:39 +02:00
Laurent Destailleur
4e678c5065 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-22 13:02:51 +02:00