Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
046f32df44 Work on nblignes -> nblines 2019-06-29 16:29:32 +02:00
Laurent Destailleur
b37f55d13a Add log 2019-06-29 16:06:40 +02:00
Philippe GRAND
bebd219e5a translations 2019-06-29 10:30:26 +02:00
Philippe GRAND
bd43e90c2b translations 2019-06-29 10:28:29 +02:00
Philippe GRAND
59424f228e translations 2019-06-29 10:21:26 +02:00
Philippe GRAND
05e9885ba7 translations 2019-06-29 10:18:45 +02:00
Philippe GRAND
ecc4d4227b translations 2019-06-29 10:14:46 +02:00
Philippe GRAND
837c1aca35 translation 2019-06-29 09:48:52 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
d71330c00b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +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
John Botella
75b55ac5d6 fix travis recommendations 2019-06-28 16:10:41 +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
c0ba22fc6c
Merge pull request #11406 from ptibogxiv/patch-194
NEW Can load multilang translation in same step than fetch_lines
2019-06-28 14:04:06 +02:00
Laurent Destailleur
276b0db8a9
Merge pull request #11414 from grandoc/new_branch_27_06_2019
New branch 27 06 2019
2019-06-28 13:39:40 +02:00
Laurent Destailleur
cd024da628
Merge branch 'develop' into new_branch_27_06_2019 2019-06-28 13:39:27 +02:00
Laurent Destailleur
a65d3d039d
Merge pull request #11420 from fbosman/develop
Fix #11331 Bug: extrafields type double wrong length
2019-06-28 12:56:46 +02:00
Laurent Destailleur
ff7ae5ef20
Update extrafields.class.php 2019-06-28 12:56:31 +02:00
Laurent Destailleur
511be75fca
Update actions_extrafields.inc.php 2019-06-28 12:55:19 +02:00
Laurent Destailleur
a33071d779 FIX #11421 2019-06-28 12:52:35 +02:00
Laurent Destailleur
039aafc1f5
Merge pull request #11409 from aspangaro/11.0_hook_generalledger
NEW: Accountancy - Add hook bookkeepinglist on general ledger
2019-06-28 12:42:46 +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
1930277257
Merge pull request #11410 from ptibogxiv/patch-195
Fix qty to negative if refund
2019-06-28 12:38:06 +02:00
Laurent Destailleur
0725ce0e3f
Update consumption.php 2019-06-28 12:37:44 +02:00
Laurent Destailleur
1b33952028
Update facture.php 2019-06-28 12:37:22 +02:00
Laurent Destailleur
2926bf4158 code comment 2019-06-28 12:35:25 +02:00
VESSILLER
f4978e9473 FIX/NEW - Force mandatory order method 2019-06-28 10:58:31 +02:00
fbosman
f44203775a
Update extrafields.class.php 2019-06-28 07:10:28 +02:00
fbosman
af83d8836a
Update actions_extrafields.inc.php 2019-06-28 07:06:19 +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
ad53289a19 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-27 20:13:51 +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
VESSILLER
e6ee1e7041 FIX Force order method in order supplier before making order 2019-06-27 14:21:38 +02:00
Laurent Destailleur
6136dd6e7c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-27 13:57:08 +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
Juanjo Menent
875bb42474 Merge remote-tracking branch 'upstream/develop' into develop 2019-06-27 11:02:48 +02:00
Philippe GRAND
2c237b8420 translations 2019-06-27 09:51:48 +02:00
Philippe GRAND
5a4ba837cc translations 2019-06-27 09:47:00 +02:00
Philippe GRAND
6e8d86fb4a translations 2019-06-27 09:43:50 +02:00
Philippe GRAND
f1e40b4b22 translations 2019-06-27 09:31:42 +02:00