Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

838 Commits

Author SHA1 Message Date
Laurent Destailleur
a06a5d0f65 Fix lang file not loaded 2023-01-13 11:09:06 +01:00
Laurent Destailleur
ba6374e6be Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-03 15:31:00 +01:00
Laurent Destailleur
8d4e973e00 Fix warnings 2023-01-03 15:29:49 +01:00
Laurent Destailleur
e977a95cc7 Fix warning 2022-12-31 13:23:09 +01:00
Laurent Destailleur
6d5aa62400 Fix delay between emails 2022-12-13 15:25:52 +01:00
Laurent Destailleur
8c6f3719c3 Fix delay between emails 2022-12-13 15:22:59 +01:00
Laurent Destailleur
c62c7e3805 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
 2022-11-26 01:43:09 +01:00
Laurent Destailleur
b231bcb64a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
 2022-11-26 01:21:51 +01:00
Laurent Destailleur
f42f083d10 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-25 22:20:58 +01:00
Frédéric FRANCE
754881a6ef strftime is deprecated in php 8.1 2022-10-31 10:42:40 +01:00
Laurent Destailleur
41175b73ee NEW add option --force on CLI cron_run_jobs.php 
This allow to execute cron even if date is not yeat reached
 2022-10-29 12:57:14 +02:00
Laurent Destailleur
40d1833154 Prepare support of --force option on crons 2022-10-29 12:19:41 +02:00
kkhelifa
d25c16bf77 FIX: Fix the position of the verification condition of the test field in case of multi entities 2022-10-26 12:14:53 +02:00
Laurent Destailleur
5b22eeab31 Fix support of inline src data 2022-10-23 20:45:27 +02:00
Frédéric France
63195e0ca3 fix license 2022-09-07 20:21:01 +02:00
Laurent Destailleur
66c27139e1 Fix php8 2022-07-25 19:21:14 +02:00
Laurent Destailleur
0aa69e534e Fix: Must add a context for cli execution of hooks 2022-06-14 15:07:01 +02:00
Laurent Destailleur
afd9787e99 Help debug cron 2022-06-03 11:52:39 +02:00
Laurent Destailleur
71cf137da4 Fix code for cli must be similar to same code for gui version. 2022-01-11 13:32:32 +01:00
Laurent Destailleur
2d2698a518 Update doc 2021-11-22 11:19:49 +01:00
Laurent Destailleur
5d4cf586d6 Fix duplicate call 2021-11-07 17:51:30 +01:00
Frédéric FRANCE
3579d2f4b1
doxygen 2021-10-21 12:25:46 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
lvessiller
90be175c50 FIX load tranlate array after setting lang 2021-10-08 16:20:51 +02:00
lvessiller
1efc2eda69 FIX reload user lang 2021-10-08 11:54:38 +02:00
Alexandre SPANGARO
e68d9dc73c NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 22:02:56 +02:00
Laurent Destailleur
3fadd5cda5 NEW Add $dolibarr_main_db_readonly in conf.php for readonly access. 2021-07-09 19:37:12 +02:00
lmarcouiller
06c1817930 Update mailing-send script and mailling card 2021-05-12 09:21:28 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Laurent Destailleur
14baec95dc Clean code 2021-04-26 15:44:24 +02:00
Laurent Destailleur
61c7c64d19 Removed useless files 2021-04-12 15:39:55 +02:00
UT from dolibit
763de11e4c
Create index.html 2021-04-05 19:37:29 +02:00
UT from dolibit
769ce71650
Create index.html 2021-04-02 21:04:53 +02:00
Laurent Destailleur
23b49c2138
Merge pull request #17045 from dolibit-ut/patch-200 
Update linphone.sh
 2021-03-31 13:38:03 +02:00
UT from dolibit
0c2230cb03
Update linphone.sh 2021-03-30 22:28:31 +02:00
UT from dolibit
dd4c941f47
Update ekiga.sh 2021-03-30 22:27:33 +02:00
stickler-ci
06cabb35ec Fixing style errors. 2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
f731545af4 NEW: ldap: filter search on usergroups 2021-03-05 11:14:21 +01:00
Frédéric FRANCE
63dad7f25c
add new rule 2021-03-01 00:22:36 +01:00
daraelmin
58ae1aeb08
FIX #16285 warning undefine array key in cron_run_job.php 2021-02-15 20:38:59 +01:00
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
2d8ca513d6 Fix param 'all' 2021-01-19 12:55:24 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
2e04aa4e03 Fix warning 2021-01-05 11:29:40 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
3cdcaa70d8 Fix warning 2021-01-03 14:29:22 +01:00
Laurent Destailleur
a3a7069c9c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:43:42 +01:00
Laurent Destailleur
821ef72d48 Fix warnings 2021-01-02 17:43:02 +01:00
Frédéric FRANCE
1620ab3118
societe_id to socid 2020-12-30 20:47:57 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
 2020-12-24 13:05:17 +01:00
Laurent Destailleur
3abceadb86 Add info 2020-12-24 13:02:45 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
3b55eb1d82 FIX master must be after session_start but dol_getprefix must be before 
and after filefunc.inc.php.
 2020-12-05 13:26:58 +01:00
Laurent Destailleur
040d22ef0a Fix phpcs 2020-12-04 01:59:47 +01:00
Laurent Destailleur
333d5fe1ca Debug script to clean emails 2020-12-03 17:45:38 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
42d88b6e62 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-26 16:20:21 +01:00
Laurent Destailleur
dfa161ca30 Fix property 2020-11-26 16:19:45 +01:00
Laurent Destailleur
f29ed4b045 Fix limit to send emails 2020-11-19 17:49:23 +01:00
Laurent Destailleur
1708874306
Merge branch 'develop' into develop 2020-11-18 18:16:29 +01:00
Laurent Destailleur
fd50f27d5d Removed temporary warning 2020-11-14 00:52:13 +01:00
lmarcouiller
304e4ac8e6 FIX : #15373 Reset invalid email script 2020-11-13 11:07:35 +01:00
lmarcouiller
a1f26f2b55 FIX :15373 Reset invalid email script 2020-11-13 11:03:49 +01:00
lmarcouiller
fc786d165c FIX : #15373 Reset invalid email script 2020-11-13 10:56:12 +01:00
lmarcouiller
e9d837c02d New: Reset invalid email script 2020-11-12 17:22:33 +01:00
lmarcouiller
7272f64177 New: Reset invalid email script 2020-11-12 17:15:26 +01:00
Laurent Destailleur
d9beced0e3 Add skeleton of script to clean email database 2020-11-12 12:09:36 +01:00
Laurent Destailleur
31fcf12643 Add script reset-invalid-emails.php 2020-11-12 12:03:43 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
32ff76178e FIX #15168 2020-10-27 01:44:00 +01:00
Laurent Destailleur
f7fc89a9d2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 19:46:59 +02:00
Laurent Destailleur
f0892b08b8 Fix limit 2020-06-06 19:46:28 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
7a17bbacb9 Can force lang during import 2020-05-24 18:04:08 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
e2f0f0d71d Add exclude id 2020-05-24 12:11:39 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
def53338de
add new rule 2020-05-21 09:07:10 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
 2020-05-18 15:54:39 +02:00
Laurent Destailleur
45345440a4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:50:36 +02:00
Laurent Destailleur
18a19dafe5
Update cron_run_jobs.php 2020-05-18 15:01:29 +02:00
Maxime Kohlhaas
54af917afb Fix cron globals reload, missing mysoc and langs 2020-05-16 20:13:47 +02:00
Laurent Destailleur
fbbb898d52 Better log 2020-05-10 18:31:55 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
233a7f1022 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-05 12:24:27 +02:00
Laurent Destailleur
9bbedce3d6 Fix phpcs 2020-04-05 12:23:58 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00
Laurent Destailleur
50790a7f36 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/filefunc.inc.php
 2020-04-05 03:44:06 +02:00
Laurent Destailleur
d0c4af5855 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-05 03:42:05 +02:00
Laurent Destailleur
9307e3821f Fix import_key was erased after update 2020-04-04 18:35:40 +02:00
Laurent Destailleur
c22a6ad98c Add sections intro and content 2020-04-04 18:18:58 +02:00
gauthier
04564e83ea FIX : picture migration script from doli 9.0 2020-03-31 10:31:18 +02:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
glu000
61deab41f9 Fix #13394 2020-03-22 20:17:52 +01:00
Laurent Destailleur
cd0b0111e1
Merge pull request #13395 from glu000/develop 
Fix #13394
 2020-03-22 20:16:59 +01:00
Laurent Destailleur
198914f91d Rename file 2020-03-21 19:20:33 +01:00
glu000
0746d70071 Merge remote-tracking branch 'upstream/develop' into develop 2020-03-21 18:17:18 +01:00
glu000
16c4e3a5b0 Fix #13394 2020-03-21 17:55:10 +01:00
Laurent Destailleur
7370268b13 Tool to regenerate files 2020-03-21 11:04:33 +01:00
Laurent Destailleur
a2f9f72973 Enhance website module 2020-03-20 18:58:45 +01:00
Laurent Destailleur
aa1f601528 FIX Backto link 2020-03-20 16:30:45 +01:00
Laurent Destailleur
4e007fe94c Import jommla news 2020-03-20 15:12:50 +01:00
Laurent Destailleur
6f636d6d69 NEW Add field author public alias for blog post on website module 2020-03-12 20:50:36 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
ea0fd546c7 Fix phpcs 2020-03-11 19:37:43 +01:00
Laurent Destailleur
58643d2dad WIP 2020-03-11 17:56:47 +01:00
Laurent Destailleur
65fbc24b36 Work on migration script 2020-03-11 14:53:06 +01:00
Laurent Destailleur
7b170ff4e6 Work on migrate script 2020-03-10 16:23:55 +01:00
Km
a2d6fbf3d8
Use native --convert-to feature to convert to pdf 
We last office release we can use their native feature

* https://ask.libreoffice.org/en/question/2641/convert-to-command-line-parameter/
* https://stackoverflow.com/questions/30349542/command-libreoffice-headless-convert-to-pdf-test-docx-outdir-pdf-is-not
 2019-12-30 17:25:54 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Laurent Destailleur
e921bf4acb
Merge pull request #12593 from frederic34/patch-7 
$key is overwriting a variable from outer foreach loop
 2019-12-03 13:17:42 +01:00
Laurent Destailleur
c692650430 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 15:23:40 +01:00
Frédéric FRANCE
36bb4eece9
$key is overwriting a variable from outer foreach loop 2019-12-01 20:34:05 +01:00
Nicolas
13577d8d48 FIX #12473 2019-11-30 19:52:06 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
67cb432cfb
cut long lines 2019-10-02 23:10:33 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
7154ecb80b Fix reload of conf in cron script 2019-06-24 13:56:10 +02:00
Laurent Destailleur
84d7154106 Fix phpcs 2019-05-29 10:03:18 +02:00
Laurent Destailleur
848b8f9bc4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/cron/cron_run_jobs.php
	htdocs/public/payment/newpayment.php
	scripts/cron/cron_run_jobs.php
 2019-05-27 19:01:28 +02:00
Laurent Destailleur
7964bb12ce FIX Use of cron with multicompany 2019-05-27 18:13:33 +02:00
Laurent Destailleur
bb86428663 Fix line too long 2019-05-21 16:20:30 +02:00
Laurent Destailleur
399ffb2dcc Fix phpcs 2019-05-16 14:38:01 +02:00
Laurent Destailleur
379c6e1bb1 Removed deprecated scripts 2019-05-15 16:33:38 +02:00
Laurent Destailleur
a9b3748006 __DIR__ was not replaced into scripts dir 2019-05-15 13:20:02 +02:00
Laurent Destailleur
585e604ac4 Add a message to avoid using wrong script file 2019-03-11 18:02:03 +01:00
Laurent Destailleur
f2de44ce51 Clean code 2019-03-11 01:11:39 +01:00
Laurent Destailleur
9e28db4202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
 2019-02-06 00:51:10 +01:00
Laurent Destailleur
db50ef39e7 FIX Translation not loaded by scheduled jobs 2019-02-05 20:32:14 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
655aad8c41 update with html5 compliant code 2019-01-21 10:14:14 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
atm-quentin
6d088e45ee FIX missing getEntity 0 in scripts directory 2018-12-14 16:29:47 +01:00