Commit Graph

76756 Commits

Author SHA1 Message Date
Laurent Destailleur
fcf3ec3f0e Fix software is uncountable noun 2019-06-30 14:01:02 +02:00
Laurent Destailleur
0d6900f870 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	build/makepack-dolibarr.pl
2019-06-29 23:26:55 +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
2cefe638ef Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/compta/prelevement/factures.php
2019-06-29 23:24:04 +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
09d420307d Fix error "fatal: ni ceci ni aucun de ses répertoires parents n'est un
dépôt git : .git"
2019-06-29 23:16:07 +02:00
Laurent Destailleur
e9c6a10bdd Fix phpcs 2019-06-29 18:35:36 +02:00
Laurent Destailleur
72084f4684 Fix protected 2019-06-29 16:49:32 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
8aebcc45b2 Fix message to not show sometimes 2019-06-29 01:54:38 +02:00
Laurent Destailleur
97827f5172 Fix print 2019-06-29 01:44:49 +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
a33071d779 FIX #11421 2019-06-28 12:52:35 +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
Laurent Destailleur
63284e0f24 Trans 2019-06-27 19:42:22 +02:00
Laurent Destailleur
c7db76f05a Trans 2019-06-27 19:38:53 +02:00
Laurent Destailleur
ab1f0aba93 Fix trans 2019-06-27 19:28:40 +02:00
Maxime Kohlhaas
fc1d4704a5 Fix invoice list filter on withdrawal card 2019-06-27 17:33:47 +02:00
Laurent Destailleur
8c6485fa20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	ChangeLog
	htdocs/compta/facture/card.php
2019-06-27 13:56:33 +02:00
Laurent Destailleur
abbc9062ef Merge 2019-06-27 13:54:31 +02:00
Laurent Destailleur
7f9b407c37 Sync transifex 2019-06-27 13:52:46 +02:00
Laurent Destailleur
fa986e311d Merge 2019-06-27 13:45:21 +02:00
Laurent Destailleur
84e4def180 Transifex sync 2019-06-27 13:39:54 +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
7c73004171 Fix trans 2019-06-26 13:14:16 +02:00
Laurent Destailleur
a68d9fc5e6 Fix css 2019-06-25 23:31:29 +02:00
Laurent Destailleur
f2ea78f2ec Removed useless files 2019-06-25 23:26:55 +02:00
Laurent Destailleur
9b9070dbf8 Removed useless files 2019-06-25 23:26:34 +02:00
Laurent Destailleur
3988a73d7c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-25 23:21:36 +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
7a0962a393 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/modules/modAccounting.class.php
2019-06-25 23:13:55 +02:00
Laurent Destailleur
6790930283 Add info on signature generator 2019-06-25 23:11:49 +02:00
Laurent Destailleur
83f5b23ade Doc 2019-06-25 22:39:04 +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
fc574946b1 Fix import of ledger 2019-06-25 22:23:51 +02:00