2
0
forked from Wavyzz/dolibarr
Commit Graph

25892 Commits

Author SHA1 Message Date
ATM john
dd8d4e9e98 Fix missing return status 2021-11-04 12:10:19 +01:00
Ferran Marcet
3f426abc29 Qual: If hidden option BANK_CAN_RECONCILIATE_CASHACCOUNT is activated, show Account Statements tab on Cash Accounts 2021-11-04 10:56:55 +01:00
Florian HENRY
054d98b942 fix ref 2021-11-03 16:31:35 +01:00
Florian HENRY
a4c4732d5d NEW: for developpers add hook for moreHTMLRef in dol_banner_tab 2021-11-03 16:18:03 +01:00
daraelmin
d334fe1292 Fix Bad count of subscription by year
If
2021-11-03 13:12:33 +01:00
Anthony Berton
5bb6185e64 add_substitution 2021-11-02 12:37:39 +01:00
Frédéric FRANCE
d7c0d87aeb Update mod_facture_fournisseur_tulip.php 2021-11-01 13:35:25 +01:00
Frédéric FRANCE
18918d4e9d Update actions_addupdatedelete.inc.php 2021-11-01 13:34:13 +01:00
Frédéric FRANCE
55243dedb6 fix typo 2021-11-01 13:32:19 +01:00
Frédéric FRANCE
b992deb084 fix warnings 2021-11-01 09:44:43 +01:00
Frédéric FRANCE
cb8e1ce8f0 fix warning 2021-11-01 09:20:22 +01:00
Laurent Destailleur
7d07da527d Debug v15 2021-11-01 03:30:22 +01:00
Laurent Destailleur
3e1fa44657 Fix phpdoc 2021-11-01 03:23:38 +01:00
Laurent Destailleur
6acc8a6582 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/ldap.class.php
2021-11-01 03:17:51 +01:00
Laurent Destailleur
7dcd98b9bb Merge pull request #19234 from hregis/fix_see_ldap_connected_server
FIX show connected server if we have a primary and secondary ldap server
2021-11-01 02:46:28 +01:00
Laurent Destailleur
1b336456ce Code comment 2021-11-01 02:44:14 +01:00
Laurent Destailleur
d4348b8e53 Merge pull request #19264 from frederic34/patch-1
fix warning
2021-11-01 02:35:48 +01:00
Laurent Destailleur
6480425130 Merge pull request #19269 from frederic34/patch-8
fix unknown function
2021-11-01 02:31:59 +01:00
Frédéric FRANCE
75eff571d9 fix unknown function 2021-10-31 22:27:39 +01:00
Frédéric FRANCE
270ddfda1f fix scrutinizer 2021-10-31 22:24:25 +01:00
Frédéric FRANCE
7d60cddaac fix warning
same test at line 65
2021-10-31 19:36:31 +01:00
Laurent Destailleur
d21278b0ef Merge branch 'develop' into fix_php8 2021-10-31 17:54:32 +01:00
Laurent Destailleur
40683720a3 Merge pull request #19182 from frederic34/propallist
fix warnings in propal list
2021-10-31 17:51:52 +01:00
Laurent Destailleur
6a4344af8a Merge pull request #19187 from frederic34/patch-8
fix warning
2021-10-31 17:51:16 +01:00
Laurent Destailleur
ae103f20ca Merge pull request #19204 from FHenry/fix_introduced_scrutinizer
Fix introduced scrutinizer
2021-10-31 17:37:31 +01:00
Laurent Destailleur
efa8b7943e Merge 2021-10-31 17:22:40 +01:00
Laurent Destailleur
bea85db413 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 17:20:09 +01:00
Laurent Destailleur
0e4c113e7f Fix phpcs 2021-10-31 17:11:23 +01:00
Laurent Destailleur
42b043feef Merge pull request #19213 from atm-greg/FIX_restrictedArea_for_payment_delete
FIX restrictedArea for payment delete
2021-10-31 17:06:47 +01:00
Laurent Destailleur
682ad98918 Update security.lib.php 2021-10-31 17:06:37 +01:00
Laurent Destailleur
e79dd52c9c Merge pull request #19212 from fr69400/develop
[minor] Fix some warning
2021-10-31 17:04:47 +01:00
Laurent Destailleur
fb6a1d1f51 FIX #19210 2021-10-31 16:59:48 +01:00
Laurent Destailleur
a635dc6df3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/bookmarks/card.php
2021-10-31 16:50:34 +01:00
Laurent Destailleur
51b0758263 Merge pull request #19219 from FHenry/14_fix_warning
fix: warning dol_print_date setTimeStamp when time empty
2021-10-31 16:49:13 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
f989b145af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 15:59:23 +01:00
Laurent Destailleur
4f2cd2ba18 FIx #19227 2021-10-31 15:59:03 +01:00
Laurent Destailleur
82e7c4b237 Merge pull request #19244 from hregis/fix_missing_access_right
FIX missing service access right
2021-10-31 15:15:33 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
2021-10-31 14:33:44 +01:00
Laurent Destailleur
27d9ee9fc0 Merge pull request #19240 from frederic34/patch-15
fix warnings
2021-10-31 13:56:54 +01:00
Laurent Destailleur
7232e38dbe Merge pull request #19248 from fmarcet/12.0
Fix: Import don't work if extrafield is separator
2021-10-31 13:54:31 +01:00
Laurent Destailleur
ed9f0c4ad9 Fix labels 2021-10-31 13:42:08 +01:00
Alexandre SPANGARO
70ed633171 Update label perms 2021-10-31 07:23:34 +01:00
Alexandre SPANGARO
3242400855 Clean module HRM 2021-10-31 06:26:41 +01:00
Alexandre SPANGARO
54b81312b5 FIX Ticket - Duplicate field project when we create ticket from project 2021-10-30 22:49:32 +02:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Laurent Destailleur
be6b1e29ad Add logs 2021-10-29 13:32:32 +02:00
Ferran Marcet
1336d3e791 Fix: Import don't work if extrafield is separator 2021-10-29 12:25:50 +02:00