Commit Graph

76355 Commits

Author SHA1 Message Date
Laurent Destailleur
f713deb0a8 Fix sql syntax error 2019-06-07 22:55:51 +02:00
Laurent Destailleur
0099c1f602 Fix missing date 2019-06-07 22:55:18 +02:00
Laurent Destailleur
e862f4c81d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 22:53:38 +02:00
Laurent Destailleur
0a903da5dc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
2019-06-07 22:53:30 +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
Laurent Destailleur
99ad8d5fb4
Merge pull request #11305 from fappels/develop_stock_performance
FIX stock movement does not need virtual stock.
2019-06-07 18:08:35 +02:00
Laurent Destailleur
4c44378049 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 16:56:39 +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
58f85ae988
Merge pull request #11304 from joseplluis/patch-6
FIX Hide disabled fields in product list
2019-06-07 15:22:36 +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
Laurent Destailleur
22d98c0ccb
Merge pull request #11300 from ptibogxiv/patch-185
FIX contact default list with adding job/function
2019-06-07 15:15:52 +02:00
ptibogxiv
63e205c23f FIX term of lang for explicit date in subscription list 2019-06-07 15:15:05 +02:00
Laurent Destailleur
ffb61034d5
Merge pull request #11299 from ptibogxiv/patch-184
FIX term of lang for explicit date in subscription list
2019-06-07 15:14:09 +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
e606092376
Merge pull request #11311 from OPEN-DSI/fix-expedition-fecth-date-valid
Fix fetch date valid in expedition object
2019-06-07 15:08:29 +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
235a65e7a8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 14:21:11 +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
Lionel VESSILLER
f9d12f9397 Fix fetch date valid in expedition object 2019-06-07 10:55:46 +02:00
Laurent Destailleur
a0a0c2207b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 01:29:55 +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
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
Francis Appels
2e0539efa7 Fix stock mouvement does not need virtual stock. 2019-06-05 19:06:58 +02:00
Josep Lluís
7b4843ca0b
Fix Hide disabled fields
Hide disabled fields in product list
2019-06-05 17:48:48 +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
florian HENRY
c5afc3131f fix variable name 2019-06-05 15:59:35 +02:00