Commit Graph

29193 Commits

Author SHA1 Message Date
Laurent Destailleur
7e11677117 Fix: Add token to the url logout 2021-12-31 14:33:12 +01:00
Laurent Destailleur
9c50cfeb62 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modBom.class.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
2021-12-30 19:18:41 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2021-12-30 19:03:46 +01:00
Laurent Destailleur
108df3726a Fix php syntax 2021-12-30 18:46:26 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
2021-12-30 17:57:45 +01:00
Laurent Destailleur
ebb7aa7494 Merge pull request #19693 from grandoc/new_branch_27_12_2021
fix : units were not displayed
2021-12-30 13:19:25 +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
Laurent Destailleur
706581a227 Merge pull request #19706 from atm-john/fix_scrutinizer_comments
Fix : scrutinizer comments
2021-12-30 12:42:08 +01:00
Laurent Destailleur
c288b0d02a Merge pull request #19711 from dolibarr95/patch-58
Update functions.lib.php
2021-12-30 12:40:52 +01:00
Laurent Destailleur
2435ef4f66 Merge pull request #19712 from atm-maxime/fix_boxes_css_amount
Fix missing amount css class on boxes
2021-12-30 12:39:34 +01:00
Anthony Berton
78861c1743 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2021-12-29 19:21:03 +01:00
Maxime Kohlhaas
873adb3cb1 Fix : add missing resource stats on stat box 2021-12-29 13:57:22 +01:00
Maxime Kohlhaas
ac7fb65d04 Fix missing amount css class on boxes 2021-12-29 13:43:18 +01:00
dolibarr95
2676427ec4 Update functions.lib.php
#19709
2021-12-29 13:24:23 +01:00
John BOTELLA
0f587a37e2 fix missing var definition 2021-12-28 19:36:44 +01:00
John BOTELLA
5449d57d26 fix variable does not seem to be defined for all execution 2021-12-28 19:19:51 +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
Maxime Kohlhaas
706ee8ce62 Fix #19662 : mysql8 user creation in 2 steps 2021-12-28 16:26:21 +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
Maxime Kohlhaas
0e9b707801 Fix #19249 : wrong payment cond and mode on mass order billing 2021-12-28 11:57:26 +01:00
Philippe GRAND
f8884d2c86 fix : units were not displayed 2021-12-27 15:00:05 +01:00
Laurent Destailleur
27134a1f91 Fix position of menu 2021-12-26 15:44:04 +01:00
Laurent Destailleur
2e2e1b90e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-26 15:41:25 +01:00
Laurent Destailleur
a7ef4991fd Fix position of menu 2021-12-26 15:41:09 +01:00
Laurent Destailleur
7edba34107 Debug and secure the signature feature 2021-12-25 17:08:40 +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
3490dc3228 Update functions.lib.php 2021-12-21 16:31:28 +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
2de5db83a9 Fix iban_prefix 2021-12-21 14:51:57 +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
Laurent Destailleur
084f298836 Fix regression. The entity for bank is in table itself not into a parent 2021-12-21 14:34:47 +01:00
Laurent Destailleur
bb6bf2f743 Fix replacement of ICS on sepa mandate 2021-12-21 11:45:42 +01:00
Laurent Destailleur
8e4077eedf Fix ics on sepa mandate template 2021-12-21 11:25:19 +01:00
Frédéric FRANCE
214feeb1f3 Update dolreceiptprinter.class.php 2021-12-21 10:05:06 +01:00
Laurent Destailleur
af8d022b92 Fix link of module bookmarks 2021-12-21 02:49:10 +01:00
Frédéric FRANCE
520c296626 add url in receipt printer options 2021-12-20 16:04:32 +01:00
Ferran Marcet
2b7c3be511 Replace sql operator 2021-12-20 12:34:46 +01:00
Ferran Marcet
aa3f473ebc Merge branch '13.0up' into 13.0 2021-12-20 12:32:43 +01:00
Christian Foellmann
03d4317302 add hook 'menuDropdownQuickaddItems' to manipulate dropdown menu 2021-12-20 10:20:14 +01:00
Christian Foellmann
6bbbd99be9 use any available fontawesome icon in picto 2021-12-20 08:06:05 +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