Laurent Destailleur
41d82b0ffa
Enable pgsql test
2017-06-19 18:52:13 +02:00
Laurent Destailleur
3c73b426d7
Fix migration. Must make reload only on last version step.
2017-06-19 18:32:18 +02:00
Laurent Destailleur
0071632a06
Test
2017-06-19 17:38:52 +02:00
Laurent Destailleur
ec890ff816
Test
2017-06-19 17:31:58 +02:00
Laurent Destailleur
5bb717e319
Test
2017-06-19 17:00:56 +02:00
Laurent Destailleur
758d8cef23
Test
2017-06-19 16:55:15 +02:00
Laurent Destailleur
6fe96b322a
Fix PHPCS
2017-06-19 16:18:07 +02:00
Laurent Destailleur
6fdc279fd3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-19 15:38:01 +02:00
Laurent Destailleur
8f6e756249
Fix PHPCS
2017-06-19 15:37:22 +02:00
Laurent Destailleur
3d247abe79
Test #7029 without switching to trustry for the moment.
2017-06-19 15:30:55 +02:00
Laurent Destailleur
c775e2530a
Merge pull request #7025 from hregis/develop_bug_restapi
...
New: add extrafields API REST
2017-06-19 15:21:48 +02:00
Laurent Destailleur
8595cbc16d
Merge pull request #7034 from inoveaconseil/patch-6
...
Add import fields for societe rib
2017-06-19 15:12:53 +02:00
Laurent Destailleur
43b97f02c3
Merge pull request #7033 from hregis/develop_bug2
...
Fix: for avoid warning
2017-06-19 15:11:49 +02:00
Laurent Destailleur
c8b4ab87cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-19 15:08:10 +02:00
Laurent Destailleur
241ec01adf
FIX #7031 missing change column "state_id" since dolibarr 3.5 !!
2017-06-19 15:07:55 +02:00
Laurent Destailleur
cffb368bbd
Merge pull request #7030 from aspangaro/6.0-fec3
...
Fix : Accountancy - Debug and add information in database
2017-06-19 15:02:30 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Laurent Destailleur
287e727e71
Fix detection of relative URL
2017-06-19 13:47:25 +02:00
Laurent Destailleur
a2ca6d5ef9
Add warning in log if conf file setup not correct
2017-06-19 12:50:13 +02:00
Inovea Conseil
85efe6ef74
Add import fields for societe rib
...
Add import fields for rib account, this fields are used in a new external module bankwire for supplier invoice.
But we must copy the translation of banks.lang in bills.lang are there an other solution ?
2017-06-19 11:32:11 +02:00
Laurent Destailleur
5f187f851f
Fix doc
2017-06-19 10:34:22 +02:00
Regis Houssin
d2371946ba
Fix: for avoid warning
2017-06-19 09:50:13 +02:00
Laurent Destailleur
f0df9b8d23
Update package file
2017-06-19 05:06:50 +02:00
Laurent Destailleur
4ba6dc86cc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-19 04:15:46 +02:00
Laurent Destailleur
4c55700157
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-06-19 04:15:20 +02:00
Laurent Destailleur
71641c5743
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-06-19 04:14:07 +02:00
Laurent Destailleur
ebc18cd2d4
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-06-19 04:13:24 +02:00
Laurent Destailleur
d0d9de37f4
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
2017-06-19 04:05:40 +02:00
Laurent Destailleur
1bfdc7438a
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7
2017-06-19 04:03:26 +02:00
Regis Houssin
9352ecca1f
Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context
2017-06-19 04:01:34 +02:00
Laurent Destailleur
caf48f32c4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-19 03:01:01 +02:00
Laurent Destailleur
43f25b49a1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-06-19 03:00:29 +02:00
Laurent Destailleur
5cd5986211
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-06-19 02:59:49 +02:00
Laurent Destailleur
39419bb411
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-06-19 02:59:16 +02:00
Laurent Destailleur
774c624687
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
2017-06-19 02:58:44 +02:00
Laurent Destailleur
b331176bf7
Fix bad data
2017-06-19 02:58:09 +02:00
Laurent Destailleur
52eeeebac9
Fix bad data in sql dump
2017-06-19 02:57:49 +02:00
Laurent Destailleur
5439390461
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7
2017-06-19 02:57:12 +02:00
Laurent Destailleur
6fc4dacd42
Fix migration opensurvey
2017-06-19 02:55:33 +02:00
Laurent Destailleur
8d84277e8c
Complete repair script
2017-06-19 02:18:04 +02:00
Laurent Destailleur
a1f08be479
Fix phpcs
2017-06-18 22:21:42 +02:00
Alexandre SPANGARO
e9b6afd2aa
Add last session coding - Add temporaly ledger
2017-06-18 22:17:32 +02:00
Laurent Destailleur
996ec4926b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/lib/files.lib.php
htdocs/don/card.php
2017-06-18 22:16:34 +02:00
Alexandre SPANGARO
a4de12dd8d
Merge remote-tracking branch 'uptream/develop' into 6.0-fec3
2017-06-18 22:15:36 +02:00
Laurent Destailleur
317ab64d7c
Fix escapement
2017-06-18 22:03:25 +02:00
Laurent Destailleur
f3a5975cf8
Fix sql injection
2017-06-18 21:58:56 +02:00
Laurent Destailleur
8debefa8ad
Fix php sanitazing
2017-06-18 21:53:06 +02:00
Laurent Destailleur
0ef507ae7f
Fix rename of file to remove .noexe extension.
2017-06-18 21:52:51 +02:00
Laurent Destailleur
819656bd89
Fix security: Check _SERVER["QUERY_STRING"] is escaped.
2017-06-18 21:27:49 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
