Laurent Destailleur
|
fb69f23bba
|
Fix phpunit
|
2019-07-04 12:10:29 +02:00 |
|
Laurent Destailleur
|
80bbc2577e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-04 12:09:26 +02:00 |
|
Laurent Destailleur
|
b065cbc6f8
|
FIX #11446
|
2019-07-04 12:09:04 +02:00 |
|
Laurent Destailleur
|
3d0a5d9f00
|
Merge pull request #11442 from atm-john/9.0_Fix_column_price_display
Fix column price display
|
2019-07-04 10:50:35 +02:00 |
|
Laurent Destailleur
|
576fbfae52
|
Merge pull request #11450 from sbraz/form
Fix missing form end tag in prelevement
|
2019-07-04 10:46:24 +02:00 |
|
Laurent Destailleur
|
27ba3408b4
|
Fix code comment
|
2019-07-04 02:01:55 +02:00 |
|
Laurent Destailleur
|
95b6f03bf5
|
Code comment
|
2019-07-04 01:58:25 +02:00 |
|
Louis Sautier
|
818a8c7d59
|
Fix missing form end tag in prelevement
|
2019-07-03 10:46:32 +02:00 |
|
John Botella
|
0288338364
|
Fix column price display
|
2019-07-02 14:38:09 +02:00 |
|
Laurent Destailleur
|
46f590f0be
|
Add column iplastlogin and ippreviouslogin
|
2019-07-01 15:44:34 +02:00 |
|
Laurent Destailleur
|
1b1c302e5d
|
Update readme
|
2019-07-01 13:32:21 +02:00 |
|
Laurent Destailleur
|
c9477f5c4f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2019-07-01 13:29:33 +02:00 |
|
Laurent Destailleur
|
edd4d0751b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/filefunc.inc.php
|
2019-07-01 13:28:44 +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
|
0259cde0da
|
Typo
|
2019-07-01 13:26:45 +02:00 |
|
Laurent Destailleur
|
511b21ca9c
|
Fix for doliwamp
10.0.0
|
2019-07-01 00:22:28 +02:00 |
|
Laurent Destailleur
|
46ced373be
|
Fix for doliwamp
|
2019-06-30 23:52:28 +02:00 |
|
Laurent Destailleur
|
8f5b575b19
|
Fix missing php-intl is not blocking (not working on windows)
|
2019-06-30 16:19:26 +02:00 |
|
Laurent Destailleur
|
a992690c43
|
Fix missing php-intl
|
2019-06-30 14:49:51 +02:00 |
|
Laurent Destailleur
|
b31297b712
|
Add comment for microsoft edge
|
2019-06-30 14:45:36 +02:00 |
|
Laurent Destailleur
|
fcf3ec3f0e
|
Fix software is uncountable noun
|
2019-06-30 14:01:02 +02:00 |
|
Laurent Destailleur
|
8919eaebab
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-29 23:27:15 +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
9.0.4
|
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
8.0.6
|
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
|
3461a61cbf
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-29 18:35:54 +02:00 |
|
Laurent Destailleur
|
e9c6a10bdd
|
Fix phpcs
|
2019-06-29 18:35:36 +02:00 |
|
Laurent Destailleur
|
b177787f0a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
htdocs/product/class/product.class.php
|
2019-06-29 18:28:51 +02:00 |
|
Laurent Destailleur
|
72084f4684
|
Fix protected
|
2019-06-29 16:49:32 +02:00 |
|
Laurent Destailleur
|
ce990ff41d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-29 16:46:25 +02:00 |
|
Laurent Destailleur
|
7de92070d7
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
|
2019-06-29 16:46:16 +02:00 |
|
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 |
|
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 |
|
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 |
|