Commit Graph

75933 Commits

Author SHA1 Message Date
Laurent Destailleur
26d4875f8f Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-18 02:26:40 +02:00
Laurent Destailleur
b33d0fcb26
Merge pull request #11201 from homer8173/develop
missing file on bom
2019-05-18 02:24:59 +02:00
Laurent Destailleur
a850c7aede Fix if setup not complete 2019-05-18 02:22:23 +02:00
Laurent Destailleur
d4f356c8f6
Merge pull request #11200 from atm-maxime/fix_project_beluga
Fix project beluga order status
2019-05-18 02:16:50 +02:00
Laurent Destailleur
c6af18b240 Remove infosin debug too dangerous for security 2019-05-18 01:38:42 +02:00
Laurent Destailleur
9e38f3122d Update for pgsql 2019-05-18 01:26:44 +02:00
Norbert Penel / OSCSS
26fd2ee99d missing file on bom
agenda was not here
2019-05-18 01:14:35 +02:00
Laurent Destailleur
a44c454a18 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 01:13:34 +02:00
Laurent Destailleur
bf6dc0ab20 Update changelog 2019-05-18 01:13:29 +02:00
Maxime Kohlhaas
095fd2769a Fix project beluga order status 2019-05-18 01:11:34 +02:00
Laurent Destailleur
92dbc3ec1f
Merge pull request #11199 from atm-maxime/fix_resource_deletefile
Fix resource delete with attached file
2019-05-18 00:59:35 +02:00
Laurent Destailleur
b5187db6d0
Merge pull request #11198 from atm-maxime/fix_api_varname
Fix varnames in invoice api
2019-05-18 00:59:03 +02:00
Laurent Destailleur
68118e55dc
Update api_invoices.class.php 2019-05-18 00:58:43 +02:00
Laurent Destailleur
30d91994b8
Merge pull request #11197 from homer8173/develop
fix modulebuilder & takepos
2019-05-18 00:56:49 +02:00
Laurent Destailleur
950b963762
Merge pull request #11196 from inoveaconseil/FIX#11045
FIX #11045
2019-05-18 00:55:38 +02:00
Laurent Destailleur
8fc5fdd1c7
Update myobject_card.php 2019-05-18 00:54:41 +02:00
Laurent Destailleur
51f9067a11
Merge pull request #11194 from inoveaconseil/FIX11160
FIX #11160
2019-05-18 00:50:33 +02:00
Laurent Destailleur
590ee589c1
Merge pull request #11192 from atm-maxime/fix_usertab_hr
Fix : display hr tab on user if rights to read all
2019-05-18 00:48:06 +02:00
Maxime Kohlhaas
aed71be7f1 Fix resource delete with attached file 2019-05-18 00:47:32 +02:00
Laurent Destailleur
c50a3c4a78
Merge pull request #11190 from atm-florian/develop
add info into change log
2019-05-18 00:47:24 +02:00
Laurent Destailleur
051308c679
Update eldy_menu.php 2019-05-18 00:46:32 +02:00
Laurent Destailleur
1b29992443
Merge pull request #11186 from inoveaconseil/Fixsyntax
Fix syntax of path
2019-05-18 00:45:52 +02:00
florian HENRY
0c3500fc5d fix : #10562 2019-05-18 00:45:41 +02:00
Maxime Kohlhaas
1af69d4c8f Fix varnames in invoice api 2019-05-18 00:40:29 +02:00
Norbert Penel / OSCSS
f569785e85 fix modulebuilder
tms mustn't have a not null
2019-05-18 00:39:31 +02:00
Norbert Penel / OSCSS
cf207aa545 FIX new takepos error messages
the terminal number implementation must be used on global conf key
2019-05-18 00:29:32 +02:00
Norbert Penel / OSCSS
5ddf16685f fix missing traduction on societe
a translation key was missing
2019-05-18 00:25:46 +02:00
Norbert Penel / OSCSS
13b75e35a0 FIx tms field made with modulebuilder
all new module appear to have a bug on tms, no data can be inserted due to tms default value that can't be null
2019-05-18 00:20:44 +02:00
Nicolas ZABOURI
9ab718ec5e FIX #11045 2019-05-18 00:19:06 +02:00
Norbert Penel
45e19d2c68
Merge pull request #6 from Dolibarr/develop
update
2019-05-18 00:17:52 +02:00
Nicolas ZABOURI
cf45bbb698 FIX #11160 2019-05-17 23:50:57 +02:00
florian HENRY
fcfabd40af fix missing cell into perms screen 2019-05-17 18:10:40 +02:00
Maxime Kohlhaas
2a2f0557cf Fix : display hr tab on user if rights to read all 2019-05-17 17:07:38 +02:00
florian HENRY
6cf01b034b add info into change log 2019-05-17 16:37:24 +02:00
Nicolas ZABOURI
022093a059 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-05-17 16:15:26 +02:00
Laurent Destailleur
e95acc9a81 Add warning if missing module 2019-05-17 13:19:22 +02:00
Nicolas ZABOURI
1f789fa266 FIX syntax 2019-05-17 11:24:24 +02:00
Nicolas ZABOURI
974c0d1d37 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-05-17 11:22:47 +02:00
Norbert Penel
105ec153d4
Merge pull request #5 from Dolibarr/develop
update dev
2019-05-17 09:00:56 +02:00
Laurent Destailleur
8bcc7cb370 Fix creation of duplicate payment intents 2019-05-17 00:26:39 +02:00
Laurent Destailleur
ae3a20d6ff FIX compatibility with intent payment_modes 2019-05-17 00:10:44 +02:00
Laurent Destailleur
52c1f42734 Debug payment with stripe Intent 2019-05-16 23:11:49 +02:00
Laurent Destailleur
fa5c5a3336 Update Stripe API to 6.35 2019-05-16 21:41:14 +02:00
Laurent Destailleur
ced2c7383a
Merge pull request #11178 from aspangaro/10.0_openconcerto
NEW Accountancy Add OpenConcerto export format
2019-05-16 21:24:14 +02:00
Laurent Destailleur
b8cb21e452
Merge pull request #11177 from javierybar/master
Simplify terminal variables in Takepos
2019-05-16 21:23:15 +02:00
Laurent Destailleur
d10d5554cc
Merge pull request #11174 from fappels/clean_10_beta
Clean code and fix phpcs
2019-05-16 21:21:59 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta 2019-05-16 21:21:51 +02:00
Laurent Destailleur
0d6841dacb
Merge pull request #11176 from aspangaro/10.0_FEC
FIX FEC Remove useless field 'validated'
2019-05-16 21:20:20 +02:00
Laurent Destailleur
53b7f3fe92
Merge pull request #11173 from aspangaro/10.0_accountancy_cat
NEW Add accoutancy sell intra and export in product import
2019-05-16 21:14:46 +02:00