Commit Graph

2807 Commits

Author SHA1 Message Date
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
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
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
Eric Seigne
9a2ce53517 add stamp and signature in pictowithouttext list 2022-11-30 23:41:32 +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
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
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
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
Christian Foellmann
5c135b59eb require missing signture.lib.php 2022-08-31 15:51:37 +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
4e678c5065 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-22 13:02:51 +02:00
Sylvain Legrand
e9181815e8 Update functions.lib.php 2022-08-17 08:02:55 +02:00
Sylvain Legrand
6a27df53f9 Improve settings for phone number (Madagascar) 2022-08-16 20:15:04 +02:00
Sylvain Legrand
f26b0f917f Improve french phone settings (international numbering) 2022-08-14 16:31:34 +02:00
Laurent Destailleur
61f1595f8c Fix look and feel v15 2022-07-08 11:21:54 +02:00
Florian HENRY
9d20e602d1 fix: remove warning GETPOST 2022-06-22 14:28:33 +02:00
Laurent Destailleur
62d2084237 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 12:49:49 +02:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00
Laurent Destailleur
1dd2ce0399 Merge pull request #21024 from atm-john/15.0_fix_btn_confirm_url
Fix btn confirm url
2022-05-25 16:56:54 +02:00
John BOTELLA
e07827a0be Fix btn confirm url 2022-05-25 10:03:08 +02:00
John BOTELLA
9d31d6448c Fix btn confirm url 2022-05-25 09:59:45 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
2022-05-24 16:31:45 +02:00
Quentin VIAL-GOUTEYRON
a2fe72225f NEW : hook for dol_format_address 2022-05-20 10:06:28 +02:00
Laurent Destailleur
ef18456724 Fix regression in dol_eval 2022-05-09 21:56:21 +02:00
Laurent Destailleur
f21e3364dd Code comment 2022-03-29 14:27:22 +02:00
Laurent Destailleur
b3f0681d7c Fix price2num when $langs not defined 2022-03-29 10:22:03 +02:00
Gauthier PC portable 024
4731ce9f1d FIX : allow all maths classical operators in custom groups accountancy report 2022-03-16 16:40:08 +01:00
Laurent Destailleur
149f3e6517 Fix for #20372 2022-03-16 16:01:03 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
3e1580475c Fix phpunit 2022-03-01 19:05:33 +01:00
Laurent Destailleur
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
2022-02-28 22:30:17 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Laurent Destailleur
b013c9a15f Fix duplicate div 2022-02-17 20:37:39 +01:00
Laurent Destailleur
5d90a00728 Debug v15 2022-02-14 12:27:35 +01:00