Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-28 20:31:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,255 Commits 36 Branches 191 Tags
eaee252a5db81592d643954e63b509d7372895ea
Commit Graph

905 Commits

Author SHA1 Message Date
Laurent Destailleur
57664c5a26 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
 2018-05-29 12:47:42 +02:00
Frédéric FRANCE
d986909109 loadlangs 2018-05-26 23:52:52 +02:00
Laurent Destailleur
bf81b755f9 Fix state code for payment from indonesia 2018-05-25 16:21:13 +02:00
Laurent Destailleur
37dcfe4a46 FIX button to pay still visible when amount null used 2018-05-25 16:00:23 +02:00
Laurent Destailleur
4c9d3d9679 Code comment 2018-05-25 15:58:45 +02:00
Laurent Destailleur
53b5733fb4 Fix test 2018-05-12 13:40:53 +02:00
Laurent Destailleur
63ed5dcccc Fix securekey for new online payment form 2018-05-12 11:23:40 +02:00
Laurent Destailleur
39aef07c6b FIX Only voters can send comments in public survey page 2018-04-25 17:14:18 +02:00
Laurent Destailleur
32511422ab Fix PSR2 2018-04-22 20:08:29 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Regis Houssin
8977a9b7aa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ticket

Conflicts:
	htdocs/public/ticketsup/create_ticket.php
	htdocs/public/ticketsup/list.php
 2018-04-19 16:42:00 +02:00
Laurent Destailleur
555c5f29e1 Ticket debug 2018-04-19 16:04:08 +02:00
Regis Houssin
5b79b76685 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ticket

Conflicts:
	htdocs/core/class/html.formticketsup.class.php
 2018-04-19 15:58:14 +02:00
Laurent Destailleur
0358e0f29f Debug ticketsup 2018-04-19 15:11:26 +02:00
Laurent Destailleur
8acc752195 Debug ticket module 2018-04-19 14:44:21 +02:00
Regis Houssin
a4cd087df0 Fix: some bugs 2018-04-18 10:30:03 +02:00
Regis Houssin
d6680b982a Fix: file not physically removed 2018-04-18 09:42:29 +02:00
Laurent Destailleur
9e50bbb9b1 standardize code 2018-04-15 16:35:18 +02:00
Laurent Destailleur
b68cded9c4 Clean code 2018-04-13 13:11:07 +02:00
Laurent Destailleur
fbae4429b7 Clean code for better extrafields management 2018-04-13 12:52:23 +02:00
Laurent Destailleur
ce402abda2 Debut ticket module 2018-04-12 23:33:38 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +02:00
Laurent Destailleur
0bf4381226 NEW The field "visible" on extrafield can accept expression as condition 2018-04-10 15:39:11 +02:00
Laurent Destailleur
d46a8eb8f0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/company.php
 2018-04-07 12:30:30 +02:00
Laurent Destailleur
35d2f0e441 Fix no lose entry when error on survey comment submission 2018-04-06 19:42:59 +02:00
Laurent Destailleur
c50b772b11 Clean duplicate code for payment page. Redirect on common page. 2018-03-25 19:15:55 +02:00
Laurent Destailleur
e7edf41e19 More complete error message 2018-03-25 15:21:32 +02:00
Laurent Destailleur
53dde8dc0c Fix confirmation email for membership payment 2018-03-25 15:00:43 +02:00
Laurent Destailleur
c864dbd515 Save Stripe customer id when using online member subscription 2018-03-23 23:59:35 +01:00
Laurent Destailleur
c7e93a5a3b Serious enhancement in auto subscription for member module 2018-03-23 22:49:08 +01:00
Laurent Destailleur
53edb86ffb Make sending of email for member module ok with new email template archi 2018-03-23 19:35:25 +01:00
Laurent Destailleur
35938b1942 NEW Variable __ONLINE_PAYMENT_URL__ available in email templates 2018-03-21 20:06:22 +01:00
Laurent Destailleur
ff0ad94035 Stripe customer info are linked to thirdparty too on payment for member 
module.
 2018-03-21 11:45:35 +01:00
Laurent Destailleur
9aa4a90543 NEW Stripe online payments reuse the same stripe customer account 2018-03-19 10:57:19 +01:00
Laurent Destailleur
8e72ddc89b FIX missing email of customer in stripe info payments 2018-03-19 10:18:03 +01:00
Laurent Destailleur
3c8c5102c3 Rename var to avoid conflicts 2018-03-14 23:37:14 +01:00
ptibogxiv
e62df03681 Fix delete customer stripe with new database 2018-03-14 08:59:05 +01:00
Laurent Destailleur
7b864aeaec Fix regression with live box 2018-03-12 21:29:03 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
Laurent Destailleur
d1fbf2a80e Dolibarrize 2018-03-11 23:07:57 +01:00
Laurent Destailleur
0f4f844ab5 Merge pull request #8346 from hregis/develop_api 
Fix: travis
 2018-03-11 18:16:23 +01:00
Regis Houssin
af6f7f6773 Fix: travis 2018-03-11 17:44:47 +01:00
jfefe
3b814ebba2 Try to fix phpunit test (br tag isuue) 2018-03-11 16:54:39 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
5b0dd0e31b Try to fix regression 2018-03-11 01:23:06 +01:00
Laurent Destailleur
0389664b1e Fix php code 2018-03-10 23:50:41 +01:00
Laurent Destailleur
3a8c216ab6 Merge branch 'develop' into ptibogxiv-stripe 2018-03-10 22:05:18 +01:00
ptibogxiv
dd15dc56dd Update and fix 
prepare integration for more callback support
 2018-03-10 14:34:10 +01:00