69736 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Destailleur	765d8ec1fe	Better description	2018-09-12 21:33:48 +02:00
Laurent Destailleur	f46a137e25	Better description	2018-09-12 21:32:58 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Laurent Destailleur	c5e30b61c0	Fix translation	2018-09-12 21:25:14 +02:00
Laurent Destailleur	963d5eeddf	Merge pull request #9387 from frederic34/camelCaps2 ... start changing phpcs:ignore	2018-09-12 21:14:34 +02:00
Laurent Destailleur	b1d9846969	Merge pull request #9486 from grandoc/new_branch_12_09_2018 ... New branch 12 09 2018	2018-09-12 21:13:32 +02:00
Laurent Destailleur	b978c4114c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 21:12:27 +02:00
Laurent Destailleur	b3dec042b5	Fix translation	2018-09-12 21:12:15 +02:00
Frédéric FRANCE	04d3c7f43b	Update categorie.class.php	2018-09-12 21:07:54 +02:00
Laurent Destailleur	3dca02d25b	Fix translation	2018-09-12 21:07:34 +02:00
Laurent Destailleur	9d9e2bc3e3	Merge pull request #9405 from fmarcet/develop ... NEW: Highlight lines on lists when they are checked	2018-09-12 20:50:42 +02:00
Frédéric FRANCE	ce76a2e714	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 20:21:35 +02:00
Laurent Destailleur	c7d7480395	Merge pull request #9312 from grandoc/develop ... Update and standardize code	2018-09-12 19:51:34 +02:00
Laurent Destailleur	056ef802e4	Fix syntax error	2018-09-12 19:49:57 +02:00
ptibogxiv	ef4659c518	add capture option in payment function ... Conflicts: htdocs/stripe/class/stripe.class.php	2018-09-12 19:47:04 +02:00
Laurent Destailleur	b7eeaa952c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-09-12 19:41:02 +02:00
Laurent Destailleur	72f359fdc7	Revert "add capture option in payment function" ... This reverts commit 849b7154a7.	2018-09-12 19:40:43 +02:00
Philippe GRAND	06cde1c35f	Standardize and update code	2018-09-12 19:32:30 +02:00
Philippe GRAND	04017367f9	Standardize and update code	2018-09-12 19:24:45 +02:00
Philippe GRAND	44734785b1	Merge remote-tracking branch 'upstream/develop' into develop	2018-09-12 19:17:14 +02:00
Laurent Destailleur	82580cadf6	Merge pull request #9458 from frederic34/patch-17 ... Update account.class.php	2018-09-12 19:07:19 +02:00
Laurent Destailleur	163bc55e4a	Merge pull request #9468 from jmarsac/numericextrafields9464 ... Convert localized numeric extrafields value before inserting/updating	2018-09-12 19:06:43 +02:00
Laurent Destailleur	7d726f9734	Merge pull request #9457 from frederic34/selectbarcodetype ... Selectbarcodetype	2018-09-12 19:02:41 +02:00
ias-ceo	fece67b629	use correct resultset	2018-09-12 19:00:19 +02:00
Laurent Destailleur	cb174c3d1a	Merge pull request #9455 from IAS-SYSTEMS-CSC/develop ... Fix : use correct resultset	2018-09-12 18:59:45 +02:00
Laurent Destailleur	ed2d215e19	Merge pull request #9467 from ptibogxiv/patch-59 ... update status display in charge list	2018-09-12 18:56:03 +02:00
Laurent Destailleur	71e4378bd2	Update charge.php ... Charges can be done on different stripe account, even if doli thirdparty is same (if thirdparty has changed it stripe account). So keeping it in list seems usefull.	2018-09-12 18:51:03 +02:00
Laurent Destailleur	9efa3816c3	Update charge.php	2018-09-12 18:47:00 +02:00
Laurent Destailleur	23096354e0	Merge pull request #9463 from ptibogxiv/patch-57 ... add capture option in payment function	2018-09-12 18:38:10 +02:00
Laurent Destailleur	88192d1bae	Merge pull request #9456 from frederic34/stripeuser ... add stripe user for actions	2018-09-12 18:37:31 +02:00
Laurent Destailleur	fb71edd35a	Update ipn.php	2018-09-12 18:37:24 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Laurent Destailleur	e89ff94d74	Update stripe.lang	2018-09-12 18:35:47 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	358bc7ab1b	Merge pull request #9454 from frederic34/patch-16 ... Update dolreceiptprinter.class.php	2018-09-12 18:28:10 +02:00
Laurent Destailleur	58ba1c3496	Merge pull request #9451 from hregis/7.0_price ... FIX better compatibility with multicompany	2018-09-12 18:27:50 +02:00
Laurent Destailleur	e3a00c5dcd	Merge pull request #9450 from frederic34/patch-15 ... Update accountancycategory.class.php	2018-09-12 18:25:54 +02:00
Laurent Destailleur	1d209722a8	Merge pull request #9445 from frederic34/patch-13 ... typo	2018-09-12 18:25:39 +02:00
Laurent Destailleur	ad54159c85	Merge pull request #9485 from frederic34/patch-9 ... remove superfluous space	2018-09-12 18:25:17 +02:00
Laurent Destailleur	e0613e04db	Merge pull request #9446 from frederic34/patch-14 ... Update myobject.class.php	2018-09-12 18:24:55 +02:00
Laurent Destailleur	de8496773d	Merge pull request #9441 from grandoc/new_branch_09_09_2018 ... New branch 09 09 2018	2018-09-12 18:24:34 +02:00
Laurent Destailleur	6291f18179	Merge pull request #9440 from frederic34/patch-5 ... Upper Lower Casing	2018-09-12 18:24:02 +02:00
Frédéric FRANCE	6c17edd1d1	remove superfluous space	2018-09-12 18:23:58 +02:00
Laurent Destailleur	3bf296c9cf	Merge pull request #9448 from frederic34/loadfichetitre ... remove deprecated	2018-09-12 18:23:24 +02:00
Laurent Destailleur	a57e82a300	Merge pull request #9479 from atm-quentin/FIX_character_bill_list ... FIX character making error on bill list	2018-09-12 18:22:07 +02:00
Laurent Destailleur	64d99dd302	Merge pull request #9459 from frederic34/patch-18 ... Completely comment unused code	2018-09-12 18:21:51 +02:00
Laurent Destailleur	0bf42085db	Merge pull request #9484 from Dolibarr/revert-9453-patch-56 ... Revert "V8 style"	2018-09-12 18:21:29 +02:00
ptibogxiv	79dd5e84d2	V8 style	2018-09-12 18:21:06 +02:00
Laurent Destailleur	88e76b6127	Revert "V8 style"	2018-09-12 18:19:12 +02:00
Laurent Destailleur	71e8d4c728	Merge pull request #9453 from ptibogxiv/patch-56 ... V8 style	2018-09-12 18:18:45 +02:00