lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,327 Commits 43 Branches 150 Tags 886 MiB
40683720a3
Commit Graph

25807 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Regis Houssin
8df90a1f54 FIX missing service access right 2021-10-29 08:28:41 +02:00
Frédéric FRANCE
787cef4440
fix warnings 2021-10-28 20:34:05 +02:00
Laurent Destailleur
ffc07efb64 Look and feel v15 2021-10-28 14:28:24 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
f033e91cb0 phpcs 2021-10-28 11:03:27 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +02:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Florian HENRY
46119c99a2 fix: warning dol_print_date setTimeStamp when time empty 2021-10-27 09:23:54 +02:00
Laurent Destailleur
4bde20dd8d Can make update during import of members 2021-10-27 09:23:03 +02:00
Laurent Destailleur
f12c709ec1 Fix checkbox 2021-10-27 03:09:12 +02:00
Laurent Destailleur
e85548d470 Fix look and feel v14 2021-10-27 03:06:50 +02:00
stickler-ci
6fd08bc5ef Fixing style errors. 2021-10-26 14:56:56 +00:00
atm-greg
406089ef0c FIX restrictedArea for payment delete 2021-10-26 16:47:16 +02:00
fr69400
761ec7b790 Update functions.lib.php 2021-10-26 16:45:40 +02:00
fr69400
e4b3dda7f0 Update functions.lib.php 
FIX : Duplicate entry in array
FIX : Unasigned variable
FIX : Type mismatch
FIX : Wrong variable
 2021-10-26 15:27:12 +02:00
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
2436f0967b Fix translation of Nature of member in import. 2021-10-26 14:37:15 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
 2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Florian HENRY
cfd88cb6e5 fix scrutinizer error 2021-10-25 21:50:27 +02:00