lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
101,975 Commits 43 Branches 150 Tags 886 MiB
27f7ef5270
Commit Graph

1712 Commits

Author SHA1 Message Date
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
58fa0740c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/errors.lang
 2021-08-22 01:41:18 +02:00
Laurent Destailleur
e6fa070c84 Fix phpcs 2021-08-22 01:21:31 +02:00
Laurent Destailleur
49f6a634d0 Fix output of error message. br is no more encoded 2021-08-21 15:00:47 +02:00
Laurent Destailleur
17213ae65d More error messages on paypal payment. 2021-08-21 12:37:28 +02:00
Laurent Destailleur
cb2c7d1485 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 17:00:00 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Florian HENRY
510cf36bbd Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-30 09:26:55 +02:00
Laurent Destailleur
047c575d61 Fix some errors on ticket module 2021-07-30 01:42:52 +02:00
Laurent Destailleur
593e84906b FIX bad closing div on error message 2021-07-30 01:16:04 +02:00
Florian HENRY
ae5bb956ac fix invoice in stand registration pb 2021-07-29 17:18:05 +02:00
Laurent Destailleur
ddf067e9de
Merge pull request #17801 from nicolas-eoxia/fix_process_payment_with_online_link_order 
NEW : Auto create invoice for payment done on an order with online payment link of order
 2021-07-14 14:05:13 +02:00
Laurent Destailleur
b2425c2a9d
Update paymentok.php 2021-07-14 14:04:44 +02:00
ATM john
1a330e0b88 Fix dialog BTN and add doc 2021-07-14 00:02:55 +02:00
Laurent Destailleur
c23f46af9b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 15:35:39 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00
Florian HENRY
03f8557aaf fix template email 2021-07-05 15:36:41 +02:00
Florian HENRY
cb2c10551b on goign 2021-07-05 15:17:21 +02:00
Florian HENRY
783257706c fix: payment ok should trigger PAYMENTONLINE_PAYMENT_OK even on custom object 2021-07-02 10:53:51 +02:00
stickler-ci
b102dc619f Fixing style errors. 2021-07-01 10:15:55 +00:00
Nicolas Domenech
5c0086790e
Merge branch 'develop' into fix_process_payment_with_online_link_order 2021-07-01 12:13:59 +02:00
Nicolas
3e6eeeb977 fix : remove comments 2021-07-01 11:59:00 +02:00
Nicolas
9b71f1e16b fix : move check if invoice module is enabled into paymentok.php 2021-07-01 11:55:06 +02:00
Laurent Destailleur
edb4cf4130 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	README.md
	htdocs/filefunc.inc.php
 2021-06-19 20:05:25 +02:00
Laurent Destailleur
5d6b26ddb7 Fix css 2021-06-19 19:45:13 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
dc6512e5af
Merge pull request #17940 from Hystepik/develop#3 
Fix #17907 : import of the undefined function
 2021-06-15 22:00:17 +02:00
Frédéric FRANCE
f79e16e3b1
replace recruitement by recruitment 2021-06-15 19:08:08 +02:00
lmarcouiller
674bd53b32 Fix #17907 : import of the undefined function 2021-06-15 16:11:25 +02:00
Laurent Destailleur
465ee6e643 Fix security check on public pages 2021-06-13 20:37:53 +02:00
Laurent Destailleur
3eea92c6e6 Clean code 2021-06-13 20:36:12 +02:00
Laurent Destailleur
6f97a551ef Clean code 2021-06-13 20:32:11 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
693ac3eab6 Code comment 2021-06-10 16:38:09 +02:00
Laurent Destailleur
c0c773dd1d css 2021-06-10 11:32:09 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
facf594b2d FIX Date of invoice generated from membership must be current date 2021-06-08 16:01:26 +02:00
Laurent Destailleur
beca3c8ad3 Debug v14 2021-06-07 01:51:56 +02:00
Laurent Destailleur
d6cbb9007f Debug ticket form to add a local file 2021-06-07 01:43:24 +02:00
Laurent Destailleur
5d063ab880 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-05 01:11:16 +02:00
Laurent Destailleur
f0118183c8 Clean code 2021-06-05 01:11:05 +02:00
Laurent Destailleur
246cb09ba5
Update newpayment.php 2021-06-05 00:56:28 +02:00
Laurent Destailleur
420bf440ef
Update newpayment.php 2021-06-05 00:53:07 +02:00
daraelmin
c94946b934
Fix #17743 - token was hashed with membersubscription 
#Fix #17743 - token was hashed with membersubscription

for retro-compatibility we must try to hash token wth both "membre" ans "membersubscription" to verify unique secure key d'or member
 2021-06-04 23:14:31 +02:00
Laurent Destailleur
f55be9fd3a
Merge pull request #17689 from DorianVabre/dev_EventOrganizer_suggest 
new: working on conference or booth object and event type #FoundationFunding
 2021-06-04 13:12:32 +02:00
Laurent Destailleur
402d90554a Clean code 2021-06-04 10:04:56 +02:00
Nicolas
e46faacac1 FIX : Add process payment with online link order 2021-06-02 18:11:47 +02:00
Laurent Destailleur
5a5fa1edbb Fix regression amount was always empty. 2021-05-27 11:57:17 +02:00