lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,607 Commits 43 Branches 150 Tags 886 MiB
ef95be1ed7
Commit Graph

69607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018 
New branch 11 09 2018
 2018-09-12 18:15:03 +02:00
Laurent Destailleur
1ad8a3e190
Merge pull request #9466 from ptibogxiv/patch-58 
Fix status display in transaction.php
 2018-09-12 18:14:46 +02:00
Laurent Destailleur
b5d866f4d5
Merge pull request #9444 from frederic34/patch-11 
Completely comment unused code
 2018-09-12 18:14:22 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
b341cb9245 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2018-09-12 18:11:51 +02:00
Laurent Destailleur
a3968b86df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-12 18:05:47 +02:00
Laurent Destailleur
3662ebe3a3 Fix syntax error 2018-09-12 18:05:20 +02:00
Laurent Destailleur
58731a15ea Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:04:43 +02:00
Laurent Destailleur
a3881bfbce NEW hidden constant to be able to use a thirdparty for donation 2018-09-12 18:04:33 +02:00
Laurent Destailleur
aa1efa7812
Merge pull request #9482 from frederic34/patch-19 
View build status for 6 to dev
 2018-09-12 18:02:20 +02:00
Laurent Destailleur
2974ea72c4 Fix sql error 2018-09-12 17:45:38 +02:00
Laurent Destailleur
10becd2046
Merge pull request #9483 from ptibogxiv/patch-54 
New donation module
 2018-09-12 17:34:21 +02:00
Laurent Destailleur
eb242d58f2
Merge pull request #9469 from atm-ph/fix_7.0_classname_colht 
Fix classname liencolht to linecolht
 2018-09-12 17:30:36 +02:00
Laurent Destailleur
da37302dc2
Merge pull request #9437 from grandoc/new_branch_08_09_2018 
New branch 08 09 2018
 2018-09-12 17:29:33 +02:00
Laurent Destailleur
bdcbc71ce9
Merge pull request #9443 from frederic34/patch-10 
Completely comment unused code
 2018-09-12 17:28:29 +02:00
Laurent Destailleur
f61afbab71
Merge pull request #9442 from frederic34/patch-9 
completely comment unused code
 2018-09-12 17:27:48 +02:00
ptibogxiv
50e40669bf
use thirdparty 2018-09-12 17:24:11 +02:00
Laurent Destailleur
77d7c97750 Fix typo 2018-09-12 17:18:27 +02:00
Frédéric FRANCE
c293603789
Update README.md 2018-09-12 17:05:45 +02:00