lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
101,916 Commits 43 Branches 150 Tags 886 MiB
406089ef0c
Commit Graph

101916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
atm-greg
406089ef0c FIX restrictedArea for payment delete 2021-10-26 16:47:16 +02:00
Laurent Destailleur
7cd09eb649 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 16:34:25 +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
fcdfd370ba Fix css 2021-10-26 14:31:55 +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
Laurent Destailleur
181991ee47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-26 13:10:23 +02:00
Laurent Destailleur
d82cbf6636 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-26 13:09:15 +02:00
Laurent Destailleur
e87e354bd5 Fix: can't reset country of origin 2021-10-26 13:08:22 +02:00
Laurent Destailleur
cffee1df4b Fix phpcs 2021-10-25 22:09:21 +02:00
Laurent Destailleur
02f8ac4cbc Fix error phpunit 2021-10-25 21:49:25 +02:00
Laurent Destailleur
678e23b13a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-25 13:05:22 +02:00
Laurent Destailleur
1106198c05 css 2021-10-25 12:34:12 +02:00
Laurent Destailleur
4ab759b067 Fix check/uncheck of ping 2021-10-24 14:23:35 +02:00
Laurent Destailleur
ad3297b0ef Use of MAIN_FIRST_PING_OK_ID = 'disabled' works when forcing reinstall. 2021-10-24 14:01:38 +02:00
Laurent Destailleur
d3f630e4b5 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0 2021-10-24 13:06:41 +02:00
Laurent Destailleur
dc32350ee7 Code comment 2021-10-24 13:02:45 +02:00
Laurent Destailleur
58b2365f8a
Merge pull request #19176 from atm-maxime/fix_ecm_autotree 
Fix #8716 : tasks were not shown in ecm auto tree
 2021-10-24 12:35:43 +02:00
Maxime Kohlhaas
6abd4cc120 Fix #8716 : tasks were not shown in ecm auto tree 2021-10-24 11:38:45 +02:00
Laurent Destailleur
664eafd810
Merge pull request #19168 from atm-maxime/fix_massmovments 
Fix #18916 : mass stock movements not displayed if error while adding line
 2021-10-24 00:44:39 +02:00
Laurent Destailleur
66a732c005
Merge pull request #19167 from atm-maxime/fix_currency_sync 
Fix #18922 : multicurrency sync in http with good currencylayer url
 2021-10-24 00:44:19 +02:00
Laurent Destailleur
c8bcd01a10
Merge pull request #19162 from atm-maxime/fix_no_mail_in_now_unsubscribe 
Fix #18961 : no_email field has been replaced by mailing_unsubscribe table
 2021-10-24 00:42:48 +02:00
Maxime Kohlhaas
0a2c950401 Fix #18916 : mass stock movements not displayed if error while adding line 2021-10-24 00:31:57 +02:00
Maxime Kohlhaas
983e28691b Use a subselect instead of a join 2021-10-24 00:02:55 +02:00
Laurent Destailleur
4ab59eebf3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:27 +02:00
Laurent Destailleur
fc29aa7d3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:00 +02:00
Laurent Destailleur
1750e385a9
Merge pull request #19164 from tiaris/14.0_bug18934 
FIX #18934 on-registration in the extrafieldsline database for deliveries
 2021-10-23 23:57:23 +02:00
Maxime Kohlhaas
77c716565e Fix #18922 : multicurrency sync in http with good currencylayer url 2021-10-23 23:42:06 +02:00
stickler-ci
53e9da4748 Fixing style errors. 2021-10-23 20:37:07 +00:00
Maxime Kohlhaas
29950a6afa Replace != by <> in SQL requests 2021-10-23 22:27:29 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +02:00
Jean
b027db49b5 FIX #18934 
Non-registration in the extrafieldsline database for deliveries
 2021-10-23 22:21:50 +02:00
Laurent Destailleur
c75db78cea
Merge pull request #19125 from atm-maxime/fix_recuitment_list_sql_error 
Fix #19083 : wrong field list in sql request
 2021-10-23 11:38:51 +02:00
Laurent Destailleur
b70f52a615
Merge pull request #19126 from atm-maxime/fix_product_api_subproducts 
Fix #19070 : Api subproducts was returning false
 2021-10-23 11:35:29 +02:00
Laurent Destailleur
b4d241a12b
Merge pull request #19135 from hregis/fix_wrong_position_of_error_message 
FIX wrong position of error message
 2021-10-23 11:22:39 +02:00
Regis Houssin
452a8cfe18 FIX wrong position of error message 2021-10-23 10:27:24 +02:00
Maxime Kohlhaas
604052d1a1 Fix #19070 : Api subproducts was returning false 2021-10-23 02:28:53 +02:00
Maxime Kohlhaas
5275d3cd48 Fix #19083 : wrong field list in sql request 2021-10-23 02:20:06 +02:00
Laurent Destailleur
67f5ef913e
Merge pull request #19037 from aspangaro/14p24 
FIX Accountancy simplified - Salaries are not present in report
 2021-10-22 22:54:23 +02:00
Laurent Destailleur
fc0c4295bd
Merge pull request #19118 from atm-florianm/FIX_12.0_tcpdf_issue_315_roman_numeral_bomb_vulnerability 
FIX tcpdf roman numeral rendering bomb, cf. tecnickom/TCPDF PR 315
 2021-10-22 19:10:13 +02:00
Laurent Destailleur
a90afd3180
Merge pull request #19106 from atm-lena/14.0_FIX_Issue_18711_HolidayValidateFiles 
Validate Holiday : keep files
 2021-10-22 19:03:15 +02:00
atm-florian
17773f8414 FIX tcpdf vulnerability to roman numeral bomb, cf. tecnickom/TCPDF issue #315 2021-10-22 18:26:23 +02:00
Laurent Destailleur
bede1116a8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-22 15:42:32 +02:00
Laurent Destailleur
b5929fb7c4 Fix phpcs 2021-10-22 15:42:18 +02:00
stickler-ci
87b4805bc0 Fixing style errors. 2021-10-22 13:35:30 +00:00
atm-lena
fa21b27ced Validate Holiday : keep files 2021-10-22 15:27:16 +02:00
Laurent Destailleur
6c9cddaa9c
Merge pull request #19092 from rfranks-securenet/14.0 
Fixed ref_ext missing from supplier invoice in REST API
 2021-10-22 14:24:36 +02:00
rfranks-securenet
7ba8cad2aa
Merge branch 'Dolibarr:14.0' into 14.0 2021-10-22 10:42:00 +01:00
Laurent Destailleur
e4a757ff9e
Merge pull request #19086 from FHenry/14_fix_various_warning 
fix: fix various php warning
 2021-10-22 11:39:48 +02:00