Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function
2018-09-13 11:13:32 +02:00
ptibogxiv
2ed0a72db5
Fix currency display in transaction.php
2018-09-13 11:10:58 +02:00
ptibogxiv
c620c64391
Fix currency display charge.php
2018-09-13 11:06:18 +02:00
Philippe GRAND
be3468241f
Standardize and update code
2018-09-13 10:55:05 +02:00
Philippe GRAND
ffad80eef6
Standardize and update code
2018-09-13 09:45:07 +02:00
Frédéric FRANCE
2c3e9e92b4
Update expedition.class.php
2018-09-12 22:59:15 +02:00
Frédéric FRANCE
05fc484d42
Update loan.class.php
2018-09-12 22:53:09 +02:00
Frédéric FRANCE
a128ea821e
Completely comment unused code
2018-09-12 22:49:32 +02:00
Frédéric FRANCE
c38239b6f9
Update don.class.php
2018-09-12 22:43:14 +02:00
Laurent Destailleur
ca85356b45
Merge pull request #9427 from frederic34/patch-6
...
deprecate Form::select_date
2018-09-12 22:07:23 +02:00
Laurent Destailleur
0b02673ba5
Merge pull request #9487 from frederic34/patch-5
...
Update categorie.class.php
2018-09-12 22:03:18 +02:00
Laurent Destailleur
b5b4410e75
Duplicate delete
2018-09-12 22:02:50 +02:00
Laurent Destailleur
b4264ee0a0
Use font awesome for sort image
2018-09-12 21:57:32 +02:00
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
