lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86,034 Commits 43 Branches 150 Tags 886 MiB
10af669719
Commit Graph

86034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
10af669719 Fix missing autoincrement 2020-05-01 22:14:09 +02:00
Laurent Destailleur
b74a4c6995 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-01 22:00:11 +02:00
Laurent Destailleur
75dd5f268f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/sendings.lib.php
 2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Laurent Destailleur
8ed100ca87
Merge pull request #13776 from ATM-Consulting/9.0_backport_FIX_document_export 
FIX Several pb in export of documents
 2020-05-01 20:48:15 +02:00
Laurent Destailleur
14a81eea5f
Merge pull request #13781 from nervo/reindent-module-template 
Reindent module template
 2020-05-01 20:45:47 +02:00
Laurent Destailleur
cb48011b17
Merge pull request #13780 from nervo/psr-2-noncompliance 
PSR-2 Noncompliance
 2020-05-01 20:43:30 +02:00
Laurent Destailleur
c1b530f58f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/get_menudiv.php
 2020-05-01 15:56:01 +02:00
Laurent Destailleur
1c7873b4f4 FIX Sanitizing menu parameter 2020-05-01 15:53:56 +02:00
nervo
ba0ca3f7f7 Reindent module template 2020-05-01 08:40:55 +02:00
nervo
bc32b75fd2 PSR-2 Noncompliance 2020-05-01 08:13:03 +02:00
Laurent Destailleur
625c7216a9 Can show date of validation in list 2020-04-30 19:51:24 +02:00
Laurent Destailleur
e4edd143c5 Fix field name 2020-04-30 19:41:46 +02:00
Laurent Destailleur
c27b3c5966 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2020-04-30 18:49:20 +02:00
Laurent Destailleur
4c27ae6530 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/facture/card.php
 2020-04-30 18:47:18 +02:00
Laurent Destailleur
b1495e12ce FIX A variable was erased by a temporary variable 2020-04-30 18:45:00 +02:00
Laurent Destailleur
5948d385a3 Look and feel v12 2020-04-30 14:46:49 +02:00
Laurent Destailleur
82ace4b4ef FIX Several pb in export of documents 
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
 2020-04-30 11:52:30 +02:00
Laurent Destailleur
6d79eed8c1 Fix colspan alignement 2020-04-29 20:36:14 +02:00
Laurent Destailleur
6ec6a4465a FIX Setup of thirdparty or contact for external users 2020-04-29 20:21:17 +02:00
Laurent Destailleur
908e5d7f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/api/class/api_setup.class.php
 2020-04-29 18:05:01 +02:00
Laurent Destailleur
84bca036c9 FIX Link missing into email of some notification 2020-04-29 18:03:28 +02:00
Laurent Destailleur
f8dfe886ac Fix css 2020-04-28 20:52:24 +02:00
Laurent Destailleur
293034dd89 css 2020-04-28 19:47:31 +02:00
Laurent Destailleur
a7815e0aac css 2020-04-28 19:44:32 +02:00
Laurent Destailleur
e68f51c4cd csss 2020-04-28 19:42:39 +02:00
Laurent Destailleur
4d22baabfe CSS 2020-04-28 19:40:25 +02:00
Laurent Destailleur
a0c013d87b Fix missing link 
Conflicts:
	htdocs/core/class/notify.class.php
 2020-04-28 19:18:31 +02:00
Laurent Destailleur
66b33573ef Fix menu 2020-04-28 18:30:38 +02:00
Laurent Destailleur
93a894df5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-28 18:08:37 +02:00
Laurent Destailleur
483935493c Fix look and feel 2020-04-28 18:08:26 +02:00
Laurent Destailleur
478bd60ad2
Merge pull request #13760 from ptibogxiv/patch-336 
FIX files download by API/entity
 2020-04-28 18:01:42 +02:00
Laurent Destailleur
6990bef6a2
Merge pull request #13764 from Tim-Otte/fixProjectTaskListStatusSearch 
Fixed project task list search
 2020-04-28 18:01:10 +02:00
Laurent Destailleur
aa9ee060d5 Look and feel v12 2020-04-28 17:34:11 +02:00
Laurent Destailleur
c22e13b138 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:27:51 +02:00
Laurent Destailleur
a8740352af FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:27:42 +02:00
Laurent Destailleur
91523b4b64 FIX Can switch from double to price type for extrafields 
Conflicts:
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
 2020-04-28 14:27:22 +02:00
Laurent Destailleur
dd3a5949c0 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:25:07 +02:00
Laurent Destailleur
2b00ae9e92 FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:22:52 +02:00
Laurent Destailleur
7a73915e92 FIX Can switch from double to price type for extrafields 2020-04-28 14:22:13 +02:00
Tim Otte
947609fc12 Minor fix 2020-04-28 12:59:15 +02:00
Tim Otte
afbd73b946
Merge pull request #3 from Dolibarr/develop 
Merging changes from Dolibarr
 2020-04-28 12:42:05 +02:00
Tim Otte
4a8173f498 Fixed search_projectstatus to allow default values 2020-04-28 12:40:10 +02:00
Laurent Destailleur
72c8397e36 css 2020-04-28 11:24:13 +02:00
Laurent Destailleur
a40c2fdbfc Debug v12 2020-04-28 02:58:33 +02:00
Laurent Destailleur
fb8bdefbaa Look and feel v12 2020-04-28 02:10:26 +02:00
Laurent Destailleur
52fc149faa Fix permissions 2020-04-28 01:04:37 +02:00