Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
86,494 Commits 36 Branches 189 Tags
aee6fce9f85d38cfe2a05af77eea7d30a62ea1b3
Commit Graph

658 Commits

Author SHA1 Message Date
Laurent Destailleur
7a17bbacb9 Can force lang during import 2020-05-24 18:04:08 +02:00
Laurent Destailleur
e2f0f0d71d Add exclude id 2020-05-24 12:11:39 +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