Laurent Destailleur
|
eeab635c8e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-19 11:16:43 +01:00 |
|
Laurent Destailleur
|
2a8056b075
|
Merge pull request #10881 from frederic34/patch-5
phpcs fix
|
2019-03-19 11:15:16 +01:00 |
|
Laurent Destailleur
|
b10690ce88
|
Merge pull request #10874 from grandoc/translation
translation
|
2019-03-19 11:14:40 +01:00 |
|
Laurent Destailleur
|
661f95d780
|
Merge pull request #10873 from grandoc/new_branch_18_03_2019
New branch 18 03 2019
|
2019-03-19 11:13:39 +01:00 |
|
Laurent Destailleur
|
9a92ce678f
|
Merge pull request #10875 from ptibogxiv/patch-142
Use common function to select duration on service (using mesuring unit table)
|
2019-03-19 11:13:07 +01:00 |
|
Laurent Destailleur
|
bfaaa7983e
|
Merge pull request #10872 from frederic34/patch-4
Update index.php
|
2019-03-19 11:11:53 +01:00 |
|
Laurent Destailleur
|
fccd2f00e0
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-19 10:43:59 +01:00 |
|
Laurent Destailleur
|
cb9f30ceeb
|
Look and feel v10
|
2019-03-19 10:36:37 +01:00 |
|
Laurent Destailleur
|
4b363a2006
|
Merge pull request #10871 from frederic34/patch-2
Usage of ELSE IF is discouraged; use ELSEIF instead
|
2019-03-19 10:31:58 +01:00 |
|
Laurent Destailleur
|
6bead00260
|
Better text
|
2019-03-19 10:27:36 +01:00 |
|
Laurent Destailleur
|
3f62098b81
|
Add hours in date
|
2019-03-19 10:14:13 +01:00 |
|
Frédéric FRANCE
|
03cd321aeb
|
phpcs fix
|
2019-03-18 20:18:38 +01:00 |
|
Philippe GRAND
|
5a48cd2f6a
|
translation
|
2019-03-18 14:01:03 +01:00 |
|
ptibogxiv
|
8657ff034b
|
Update card.php
|
2019-03-18 13:48:16 +01:00 |
|
Philippe GRAND
|
c13a1dbc63
|
translation
|
2019-03-18 13:45:24 +01:00 |
|
Philippe GRAND
|
0f03b16313
|
translation
|
2019-03-18 12:46:32 +01:00 |
|
Philippe Grand
|
4935aa2fe4
|
Update adherent.class.php
|
2019-03-18 12:25:35 +01:00 |
|
Philippe Grand
|
2a91629e57
|
Update accountingaccount.class.php
|
2019-03-18 12:24:52 +01:00 |
|
Philippe Grand
|
7942903548
|
Update actioncomm.class.php
|
2019-03-18 12:24:16 +01:00 |
|
Philippe GRAND
|
609dc5360b
|
add comments
|
2019-03-18 12:19:56 +01:00 |
|
Philippe GRAND
|
76a4792cd2
|
Merge remote-tracking branch 'upstream/develop' into new_branch_18_03_2019
|
2019-03-18 12:11:57 +01:00 |
|
Frédéric FRANCE
|
03785aa53f
|
Update index.php
|
2019-03-18 11:45:54 +01:00 |
|
Frédéric FRANCE
|
135df4b3ce
|
Usage of ELSE IF is discouraged; use ELSEIF instead
|
2019-03-18 11:24:56 +01:00 |
|
Laurent Destailleur
|
ad3b0b1a62
|
Removed deprecated function function test_sql_and_script_inject that was
replaced with testSqlAndScriptInject
|
2019-03-18 11:19:16 +01:00 |
|
Laurent Destailleur
|
23252ed646
|
Add a test to avoid SQL non compatible with postgresql
|
2019-03-18 11:10:37 +01:00 |
|
Laurent Destailleur
|
76ae53c517
|
Merge pull request #10869 from atm-ph/develop_pgsql
Fix postgreSQL migration
|
2019-03-18 11:06:10 +01:00 |
|
Laurent Destailleur
|
de554750e4
|
Merge pull request #10802 from altatof/propindex
Harmonize propal index pages
|
2019-03-18 10:56:10 +01:00 |
|
Laurent Destailleur
|
22d61cd44d
|
Update index.php
|
2019-03-18 10:55:44 +01:00 |
|
Laurent Destailleur
|
7adba419fc
|
Update index.php
|
2019-03-18 10:54:45 +01:00 |
|
Laurent Destailleur
|
d8c1a50291
|
Update index.php
|
2019-03-18 10:53:58 +01:00 |
|
atm-ph
|
466a5e2e81
|
Fix postgreSQL migration
|
2019-03-18 10:47:56 +01:00 |
|
Laurent Destailleur
|
e3dd62ed72
|
Fix type
|
2019-03-18 10:26:36 +01:00 |
|
Laurent Destailleur
|
f3cf3482fa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/projet/element.php
|
2019-03-18 10:23:14 +01:00 |
|
Philippe GRAND
|
905f7cf8dd
|
add comments
|
2019-03-18 10:22:20 +01:00 |
|
Philippe GRAND
|
c98f3ae4b3
|
add comments
|
2019-03-18 10:20:24 +01:00 |
|
Laurent Destailleur
|
34034787af
|
FIX problem with sign of various payment in project preview
|
2019-03-18 10:16:08 +01:00 |
|
Philippe GRAND
|
198cf4af2f
|
add comments
|
2019-03-18 10:06:22 +01:00 |
|
Laurent Destailleur
|
227f5f8f92
|
Code is cleaner
|
2019-03-18 09:08:53 +01:00 |
|
Laurent Destailleur
|
e4ed5999eb
|
Merge pull request #10867 from aspangaro/9.0_various
FIX: Error with various & salary payment on project
|
2019-03-18 09:00:26 +01:00 |
|
Laurent Destailleur
|
bb8845ac41
|
Merge pull request #10865 from atm-maxime/new_box_birthdays
NEW Widget birthdays of the month
|
2019-03-18 08:56:58 +01:00 |
|
Laurent Destailleur
|
7f6833788e
|
Merge pull request #10863 from grandoc/new_branch_17_03_2019
update with html5 compliant code
|
2019-03-18 08:55:31 +01:00 |
|
Laurent Destailleur
|
e93b3a2d3e
|
Merge pull request #10862 from frederic34/patch-5
phpcs fix
|
2019-03-18 08:54:27 +01:00 |
|
Laurent Destailleur
|
ecaff05af4
|
Merge pull request #10861 from frederic34/patch-4
phpcs fix
|
2019-03-18 08:54:18 +01:00 |
|
Laurent Destailleur
|
d7b90ce5b7
|
Merge pull request #10860 from frederic34/patch-2
phpcs fix
|
2019-03-18 08:54:11 +01:00 |
|
Alexandre SPANGARO
|
350f77db2b
|
FIX: Error with various & salary payment on project
|
2019-03-17 23:00:13 +01:00 |
|
Laurent Destailleur
|
b3dc6d7d1d
|
NEW Generation of doc by modulebuilder can include README and CHANGELOG
|
2019-03-17 19:33:25 +01:00 |
|
Maxime Kohlhaas
|
e090cd6f87
|
New box birthdays of the month
|
2019-03-17 16:55:26 +01:00 |
|
Laurent Destailleur
|
39b9ca2397
|
Work on documentation generation by modulebuilder
|
2019-03-17 15:45:50 +01:00 |
|
Philippe Grand
|
18c90763f4
|
Update test_arrays.php
|
2019-03-17 10:33:34 +01:00 |
|
Philippe GRAND
|
60e8c3d7e3
|
update with html5 compliant code
|
2019-03-17 10:30:16 +01:00 |
|