lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,845 Commits 43 Branches 150 Tags 886 MiB
ee0a65e7fa
Commit Graph

72845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/action/card.php
 2019-07-04 12:22:40 +02:00
Laurent Destailleur
f8de11492e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:25 +02:00
Laurent Destailleur
bc309ace38 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-04 12:21:16 +02:00
Laurent Destailleur
a9dfca70cf
Merge pull request #11452 from atm-florianm/FIX_minor_spelling_issues 
FIX: minor spelling issues
 2019-07-04 12:19:26 +02:00
Laurent Destailleur
554c76e232
Merge pull request #11451 from fmarcet/8.0 
FIX: When saving an action it didn't save the label based on the type of event
 2019-07-04 12:18:08 +02:00
Laurent Destailleur
2035cbaee1
Merge pull request #11440 from atm-maxime/7.0 
Fix wrong column for filters on invoice template list
 2019-07-04 10:46:49 +02:00
atm-florian.m
3e53a06b2e minor spelling issues 2019-07-03 16:17:47 +02:00
Ferran Marcet
433835860c FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized 2019-07-03 13:12:41 +02:00
Laurent Destailleur
9d50c67208 FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export 2019-07-02 18:06:51 +02:00
Maxime Kohlhaas
6b43c325c7 Fix wrong column for filters on invoice template list 2019-07-02 10:53:47 +02:00
Laurent Destailleur
ef27e32f53 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:27:57 +02:00
Laurent Destailleur
3abaecfd77 Prepare 8.0.7 2019-07-01 13:27:18 +02:00
Laurent Destailleur
6537faa35e Fix merge 2019-06-29 23:26:14 +02:00
Laurent Destailleur
0aeb27ba97 Fix merge 2019-06-29 23:25:07 +02:00
Laurent Destailleur
fb42333b3e Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-06-29 23:20:07 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
fdc958a172 Fix launch of ISCC.ex if not into path 2019-06-29 23:17:36 +02:00
Laurent Destailleur
854bbf8405 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-28 14:09:00 +02:00
Laurent Destailleur
58a7640dc3
Merge pull request #11417 from atm-maxime/7.0 
Fix invoice list filter on withdrawal card
 2019-06-28 12:41:13 +02:00
Laurent Destailleur
a8837f5645
Merge pull request #11413 from atm-quentin/FIX_ending_slash 
FIX ending slash
 2019-06-27 20:23:22 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +02:00
Laurent Destailleur
abbc9062ef Merge 2019-06-27 13:54:31 +02:00
Laurent Destailleur
fa986e311d Merge 2019-06-27 13:45:21 +02:00
Laurent Destailleur
d69b20311b FIX If the replacement invoice has been deleted we can reopen 2019-06-27 01:13:46 +02:00
Laurent Destailleur
be695a8e1a Fix link for situations 2019-06-27 00:51:03 +02:00
Laurent Destailleur
244d21bd2b Fix trans 2019-06-27 00:45:17 +02:00
Laurent Destailleur
12d3a7021f Prepare 8.0.5 2019-06-26 18:50:31 +02:00
atm-quentin
49db277368 FIX ending slash 2019-06-26 16:42:14 +02:00
Laurent Destailleur
f2ea78f2ec Removed useless files 2019-06-25 23:26:55 +02:00
Laurent Destailleur
70319031ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-25 23:21:10 +02:00
Laurent Destailleur
07fb930a79 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-25 23:20:27 +02:00
Laurent Destailleur
e1ee079254 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-06-25 23:20:07 +02:00
Laurent Destailleur
c5572e0176 Add info on signature generator 2019-06-25 23:19:00 +02:00
Laurent Destailleur
162498d2f8 Add info on signature generator 2019-06-25 23:18:20 +02:00
Laurent Destailleur
1ae9d94de9 Add info on signature generator 2019-06-25 23:15:30 +02:00
Laurent Destailleur
6790930283 Add info on signature generator 2019-06-25 23:11:49 +02:00
Laurent Destailleur
d5479cd9ae Fix import of ledger 2019-06-25 22:37:13 +02:00
Laurent Destailleur
ad725b3bb0 Doc 2019-06-25 22:27:35 +02:00
Laurent Destailleur
20471c54e1 Fix import code (regex of data imported + import of constant) 
Conflicts:
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2019-06-25 22:27:00 +02:00
Laurent Destailleur
d41850c7cd Fix purge of old files 2019-06-25 20:02:14 +02:00
Laurent Destailleur
4696d35bcb Fix we need to keep temp dir 2019-06-25 19:02:24 +02:00
Laurent Destailleur
1277e36179 Prepare 9.0.4 2019-06-25 13:30:18 +02:00
Laurent Destailleur
c9883eecd2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/fichinter/list.php
 2019-06-25 13:23:19 +02:00
Laurent Destailleur
144f2a5159 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fichinter/list.php
 2019-06-25 13:15:57 +02:00
Laurent Destailleur
de3ec5682c
Merge pull request #11403 from fmarcet/7.0 
FIX: Not showing Contract and Project columns on ficheinter list
 2019-06-25 13:07:03 +02:00
Ferran Marcet
7f127989b2 FIX: Not showing Contract and Project columns on ficheinter list 2019-06-25 09:55:34 +02:00
Laurent Destailleur
d85ec982e5 Fix do not output log in arhived log for draft documents 2019-06-24 23:39:44 +02:00
Laurent Destailleur
862e20e820 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:37:29 +02:00
Laurent Destailleur
ae1ad80994 Fix count 2019-06-24 16:32:42 +02:00
Laurent Destailleur
70f19b3a3d Fix counter of record 2019-06-24 16:31:56 +02:00