2
0
forked from Wavyzz/dolibarr
Commit Graph

10416 Commits

Author SHA1 Message Date
Laurent Destailleur
265aeb76e6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/expensereport/class/expensereport.class.php
2022-01-07 15:48:13 +01:00
Laurent Destailleur
5ee74d7c07 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-01-07 15:45:51 +01:00
Laurent Destailleur
1541e20870 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/utils.class.php
2022-01-07 15:43:28 +01:00
Laurent Destailleur
53709cf509 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/utils.class.php
2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e FIX avoid infinite loop on dump with popen 2022-01-07 15:35:33 +01:00
Laurent Destailleur
144a56d073 Clean code 2022-01-06 18:12:02 +01:00
Laurent Destailleur
26e8496c46 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/card.php
2022-01-06 16:15:58 +01:00
Laurent Destailleur
aee61cb470 Update ldap.class.php 2022-01-06 16:02:47 +01:00
Laurent Destailleur
718771fcf5 Merge pull request #19743 from andreubisquerra/develop
Add dol_value_currentdate tag to TakePOS printer template
2022-01-06 10:41:45 +01:00
Laurent Destailleur
1f36a31fe9 Fix css 2022-01-05 16:21:44 +01:00
Quentin VIAL-GOUTEYRON
446ba2a416 FIX stickler 2022-01-05 15:33:05 +01:00
Quentin VIAL-GOUTEYRON
7a4b0e38cd NEW : Contact filter project list 2022-01-05 14:35:11 +01:00
Laurent Destailleur
2aa3d60997 Debug v15 2022-01-05 14:04:02 +01:00
Laurent Destailleur
3581dda876 Fix trans 2022-01-05 09:43:51 +01:00
andreubisquerra
0c86ca6081 Add dol_value_currentdate tag to TakePOS template 2022-01-04 22:14:02 +01:00
Laurent Destailleur
0189d92139 Some country need qr code for legal issues. Add a hook to allow this. 2022-01-04 20:44:17 +01:00
Laurent Destailleur
0046cbbece Fix phpunit 2022-01-04 15:13:04 +01:00
Laurent Destailleur
1d80b8394a Debug v15 2022-01-04 12:56:08 +01:00
John BOTELLA
70a1975ad2 Merge branch 'develop' into new_convert_setup_to_new_setup 2022-01-03 21:53:45 +01:00
Laurent Destailleur
a49af456ce Debug page customreports.php 2022-01-03 04:47:17 +01:00
Laurent Destailleur
f7871be6cd Debug v15 2022-01-03 03:06:18 +01:00
Vincent de Grandpré
6a52b967f4 Permettre de sortir de la fonction de connexion après authentification. 2022-01-02 16:37:07 -05:00
Laurent Destailleur
0c82577fc5 Look and feel v15 2022-01-02 19:04:12 +01:00
Laurent Destailleur
084a404870 Debug v15 2022-01-02 18:33:57 +01:00
Laurent Destailleur
3d8de7790c Fix restore color if we cancel color selection 2022-01-02 16:34:46 +01:00
Laurent Destailleur
adec35d4b1 Debug v15 2022-01-02 15:46:28 +01:00
Laurent Destailleur
3774eae510 Responsive 2022-01-02 15:08:46 +01:00
Laurent Destailleur
b41fdb6ec9 Fix tool for generic to sql filters. Must not be saved into api files. 2022-01-01 21:46:16 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Laurent Destailleur
cd8613e9db Merge pull request #19704 from atm-john/fix_validate_methode_call
Fix wrong method call
2021-12-30 12:46:12 +01:00
John BOTELLA
e20d669e34 Fix : prevent fatal error 2021-12-28 19:08:47 +01:00
John BOTELLA
9af621c6f8 Fix scrutinizerh 2021-12-28 18:43:04 +01:00
John BOTELLA
019b10c9eb Fix wrong method call 2021-12-28 18:27:29 +01:00
John BOTELLA
e9e100410a Fix empty value 2021-12-28 14:51:19 +01:00
John BOTELLA
817a9594ae Convert setup of situation invoice to new setup system + fix size 2021-12-28 14:32:57 +01:00
Laurent Destailleur
3fc0205d0b Fix responsive 2021-12-25 12:44:46 +01:00
Laurent Destailleur
4eb9a7625a Fix notification setup page. 2021-12-23 15:12:35 +01:00
Laurent Destailleur
d3b429bef6 Merge pull request #19663 from frederic34/patch-1
add url in receipt printer options
2021-12-21 15:52:25 +01:00
Laurent Destailleur
e2ee74f8e0 Clean code 2021-12-21 15:46:42 +01:00
Laurent Destailleur
bb436e556d Fix warnings 2021-12-21 15:23:56 +01:00
Laurent Destailleur
e3bb837313 Fix doxygen 2021-12-21 14:58:34 +01:00
Laurent Destailleur
55562eb1d8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formadmin.class.php
2021-12-21 14:36:38 +01:00
Frédéric FRANCE
214feeb1f3 Update dolreceiptprinter.class.php 2021-12-21 10:05:06 +01:00
Frédéric FRANCE
520c296626 add url in receipt printer options 2021-12-20 16:04:32 +01:00
Laurent Destailleur
13b17fa0da FIX #19564 2021-12-19 20:28:27 +01:00
Laurent Destailleur
626cd24305 Clean code for #19639 2021-12-19 17:05:57 +01:00
Laurent Destailleur
ee3246bf65 Trans 2021-12-19 16:02:28 +01:00
Laurent Destailleur
19afcbbc40 css 2021-12-19 15:59:34 +01:00
Laurent Destailleur
015bc9ebca Fix mode 2021-12-19 03:45:36 +01:00