Commit Graph

65179 Commits

Author SHA1 Message Date
florian HENRY
63fb53159c fix scrunitizer 2018-03-10 01:12:47 +01:00
florian HENRY
8e84b733dc fix scrutinizer 2018-03-10 00:13:41 +01:00
Laurent Destailleur
a7e0fdba49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-09 23:44:21 +01:00
Laurent Destailleur
c1d148458b Fix migration 2018-03-09 23:44:00 +01:00
Laurent Destailleur
f3058955f0
Merge pull request #8319 from atm-alexis/FIX_module_builder_include_cache
FIX include cache issue in module builder
2018-03-09 23:07:07 +01:00
Laurent Destailleur
20ec269d4d
Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink
7.0 betterthirdpartylink
2018-03-09 23:03:23 +01:00
Alexis Algoud
1d69d8e51e add function_exist 2018-03-09 23:03:23 +01:00
Laurent Destailleur
4895587f02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-09 23:00:04 +01:00
Laurent Destailleur
9efea6e30e Fix var not defined 2018-03-09 22:59:44 +01:00
Alexis Algoud
42aa7a25f9 FIX include cache issue 2018-03-09 22:54:45 +01:00
Laurent Destailleur
cc7ac2a0da
Merge pull request #8313 from atm-florian/7.0_fix8241
7.0 fix8241
2018-03-09 22:47:43 +01:00
Laurent Destailleur
40d04482b0 Fix set time 2018-03-09 22:45:16 +01:00
Laurent Destailleur
4d885310c7
Merge pull request #8311 from inoveaconseil/patch-1
Fix set time limit to 0
2018-03-09 22:41:15 +01:00
Laurent Destailleur
b8e724a4d7
Merge pull request #8310 from atm-florian/7.0_fix_invoicelist
fix add "late" invoice into "save last search/backtolist" feature
2018-03-09 22:37:55 +01:00
Laurent Destailleur
d8d13a7348
Merge branch 'develop' into 7.0_fix_invoicelist 2018-03-09 22:37:20 +01:00
florian HENRY
a34709c112 fix better thirdparty link 2018-03-09 22:36:00 +01:00
Laurent Destailleur
6ff3ac82c6
Merge pull request #8309 from ATM-Marc/NEW_syslog_file_autoclean
NEW: syslog file autoclean
2018-03-09 22:34:30 +01:00
Laurent Destailleur
d858426b7b
Update modSyslog.class.php 2018-03-09 22:33:39 +01:00
Laurent Destailleur
b5fd4c005c
Merge pull request #8307 from hregis/develop_api
Fix: REST API must be enabled for all entities
2018-03-09 21:26:44 +01:00
Laurent Destailleur
18dc1768a4
Merge pull request #8304 from hregis/develop_dict
Fix: use code instead id
2018-03-09 19:43:56 +01:00
florian HENRY
bb8525614c better fix 2018-03-09 19:37:39 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e better space 2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9 FIX #8232 2018-03-09 19:10:52 +01:00
Inovea Conseil
d763bfcbf1
Fix set time limit to 0
If the dolibarr was installed on a pc and not on server or in the doliwamp.
2018-03-09 17:56:49 +01:00
florian HENRY
164ca682d5 fix add "late" invoice into "save last search/backtolist" feature 2018-03-09 17:23:43 +01:00
Marc de Lima Lucio
d6b4bc14e4 NEW: syslog file autoclean 2018-03-09 16:52:06 +01:00
Regis Houssin
3eeeaf2d2d Fix: REST API must be enabled for all entities 2018-03-09 12:54:34 +01:00
Regis Houssin
f4f81482e7 Fix: add todo if you use the good id by entities 2018-03-09 09:39:57 +01:00
Regis Houssin
ea175cd6c1 Fix: compatibility with multicompany dictionnary sharing 2018-03-09 09:37:23 +01:00
Regis Houssin
82057b3523 Fix: use code instead id 2018-03-09 08:11:02 +01:00
Laurent Destailleur
b68b66edcb Fix phpcs 2018-03-08 23:16:55 +01:00
Laurent Destailleur
3ad95e46c0 Fix phpunit 2018-03-08 22:40:42 +01:00
Laurent Destailleur
9f42e1b172 Prepare code to introduce different payment modes than BAN 2018-03-08 22:33:40 +01:00
Laurent Destailleur
489dde4db4 Prepare database to store payment modes of customers 2018-03-08 22:26:42 +01:00
Laurent Destailleur
7a277a8d2b Debug list of charges. Compatible with the metadata FULLTAG used by
dolibarr native online payment page.
2018-03-08 21:32:52 +01:00
Laurent Destailleur
2cd0122d34 Fix phpcs 2018-03-08 20:59:23 +01:00
Laurent Destailleur
b7557db30a Merge 2018-03-08 20:53:44 +01:00
Laurent Destailleur
ad96229ec4 Fix not visible template selector for supplier order/invoice emails
Conflicts:
	htdocs/fourn/facture/card.php
2018-03-08 20:52:25 +01:00
Laurent Destailleur
e983e0709f Fix not visible template selector for supplier order/invoice emails 2018-03-08 20:49:37 +01:00
Laurent Destailleur
65aa5953f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-08 20:36:07 +01:00
Laurent Destailleur
bf1bada435 Contact tab after main tab 2018-03-08 20:35:50 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
e0af4f8489 Trans 2018-03-08 19:58:11 +01:00
Laurent Destailleur
b07fdafa65 Trans 2018-03-08 19:57:22 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
Laurent Destailleur
88e47e11a4 Fix rename file 2018-03-08 17:44:51 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Laurent Destailleur
af9fff4f83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/class/html.formfile.class.php
2018-03-08 16:33:51 +01:00