Commit Graph

76342 Commits

Author SHA1 Message Date
Laurent Destailleur
91a4e8bc0a Merge 2019-06-12 12:09:56 +02:00
Laurent Destailleur
6d5637c389 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/actions_massactions.inc.php
2019-06-12 12:03:46 +02:00
Laurent Destailleur
afe1ec633b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:21 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Laurent Destailleur
1b6b471cb7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:43 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab FIX #11316 2019-06-12 10:05:53 +02:00
Laurent Destailleur
8f612bc1b2
Merge pull request #11314 from atm-maxime/fix_missing_hookparam
Fix missing massaction hook params
2019-06-12 09:21:15 +02:00
Laurent Destailleur
2ac8723ce9 Code comment 2019-06-11 21:02:41 +02:00
Laurent Destailleur
a72e36cd01 Fix show version removed from left menu 2019-06-10 20:05:49 +02:00
Maxime Kohlhaas
0ce2c2aab5 Fix missing massaction hook params 2019-06-10 10:11:26 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
2019-06-07 22:58:58 +02:00
Laurent Destailleur
49646663a1 Fix link on invoice 2019-06-07 22:47:15 +02:00
Laurent Destailleur
91a5547362
Merge pull request #11307 from frederic34/patch-7
Warning: A non-numeric value encountered
2019-06-07 18:11:09 +02:00
Laurent Destailleur
b36f80ab2e
Merge pull request #11306 from frederic34/patch-6
Parameter must be array or object that implements Countable
2019-06-07 18:10:03 +02:00
Laurent Destailleur
b73d287953
Update agenda.lib.php 2019-06-07 18:09:43 +02:00
Francis Appels
2ecde139f0 Fix stock mouvement does not need virtual stock. 2019-06-07 18:09:03 +02:00
Laurent Destailleur
73326cfbf9 Removed bad commited files 2019-06-07 16:56:08 +02:00
Josep Lluís
bb0313a1a4 Fix Hide disabled fields
Hide disabled fields in product list
2019-06-07 15:23:20 +02:00
Laurent Destailleur
0edd94c4f8
Merge pull request #11303 from atm-florian/10.0
fix various little stuff from scrutinizer (undeclared vriable, misspelling variable, mistype declaration)
2019-06-07 15:21:30 +02:00
Laurent Destailleur
ed2d9435db
Update project.class.php 2019-06-07 15:21:15 +02:00
ptibogxiv
63e205c23f FIX term of lang for explicit date in subscription list 2019-06-07 15:15:05 +02:00
Laurent Destailleur
4ed7e281c5
Merge pull request #11301 from frederic34/patch-5
avoid warning with php 7.2
2019-06-07 15:08:49 +02:00
Laurent Destailleur
63d9e963b8
Merge pull request #11310 from atm-josselin/FIX_display_intervention_model_button
Display the intervention button only in develop mode
2019-06-07 15:08:07 +02:00
Laurent Destailleur
2e201abac0
Merge pull request #11308 from atm-maxime/8.0
Fix multicurrency setup page
2019-06-07 15:07:42 +02:00
Laurent Destailleur
1520ca9646 Fix buttons for payments 2019-06-07 13:51:53 +02:00
Laurent Destailleur
9314bb4667 Fix missing statement descriptor 2019-06-07 13:07:19 +02:00
Laurent Destailleur
9511a66681 Integrate the new Stripe checkout with STRIPE_USE_NEW_CHECKOUT=1 2019-06-07 12:41:37 +02:00
Laurent Destailleur
dc479a5377 FIX Create stripe intent only if Stripe was selected. This reduce also
duplicate code.
FIX Free payment when using paymentintent architecture.
2019-06-07 11:29:59 +02:00
Laurent Destailleur
eb0d04f304 Code comment 2019-06-07 11:24:35 +02:00
Laurent Destailleur
3d8910d327 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-06-06 19:19:05 +02:00
Laurent Destailleur
deb9ac25a8 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-06-06 19:08:26 +02:00
Laurent Destailleur
3ff154c1d0 Fix sql error 2019-06-06 19:05:47 +02:00
Laurent Destailleur
e5754519cb Fix doxygen 2019-06-06 18:57:57 +02:00
Laurent Destailleur
20a388e8d7 Fix init of module 2019-06-06 18:55:24 +02:00
atm-josselin
c8ab7dee45 Display the intervention button only in develop mode 2019-06-06 16:34:44 +02:00
florian HENRY
beb2a0131c fix travis 2019-06-06 16:11:12 +02:00
Maxime Kohlhaas
9c7c1ddceb Fix multicurrency setup page 2019-06-06 11:20:10 +02:00
Frédéric FRANCE
ad95b66842
Warning: A non-numeric value encountered 2019-06-06 10:12:01 +02:00
Frédéric FRANCE
f11db8396a
Parameter must be array or object that implements Countable
warning with php 7.2
2019-06-06 09:49:32 +02:00
florian HENRY
21f6daae2a fix scrunitizer 2019-06-05 17:38:10 +02:00
florian HENRY
d98ce172ad multicurrency:fix display error message on failed update 2019-06-05 17:26:37 +02:00
florian HENRY
f2171d466b fix variable name 2019-06-05 17:05:26 +02:00
florian HENRY
acad2e633b fix scrutinzer 2019-06-05 16:34:32 +02:00
florian HENRY
3927a74d6b fix scrunitizer 2019-06-05 16:30:22 +02:00
florian HENRY
e1392466cf Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2019-06-05 16:10:20 +02:00
florian HENRY
1cf38fa635 fix scrutinizer 2019-06-05 16:08:04 +02:00
florian HENRY
45270786f9 fix scrutinizer 2019-06-05 16:06:55 +02:00
florian HENRY
18d7e15a23 fix scrutinizer 2019-06-05 16:03:42 +02:00
florian HENRY
d77de256ce fix scrutinizer 2019-06-05 16:01:02 +02:00