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

1889 Commits

Author SHA1 Message Date
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Quentin-Seekness
0c915dc052
FIX: Can't create new attendee 
Field date_subscription is mandatory when creating a new attendee.
 2021-10-26 09:54:08 +02:00
Maxime Kohlhaas
00b617d17f Fix #18961 : no_email field has been replaced by mailing_unsubscribe table 2021-10-23 22:22:45 +02:00
Laurent Destailleur
622304126e Fix phpcs 2021-10-22 16:35:23 +02:00
Laurent Destailleur
da4ecb46b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-21 22:32:10 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
265f3d0ab0 Fix css 2021-10-19 20:03:59 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
252c910962 Debug feature for proposal signature 2021-10-18 20:46:28 +02:00
Laurent Destailleur
297580ed11
Merge pull request #19011 from Hystepik/develop#2 
NEW: Online proposal signature
 2021-10-18 19:41:58 +02:00
Laurent Destailleur
2262646391 Standardize name of page 2021-10-18 16:04:49 +02:00
Laurent Destailleur
c98f28ffc8 Clean code 2021-10-18 15:57:33 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +02:00
lmarcouiller
a324f74d88 update newonlinesign.php with border 2021-10-18 15:35:15 +02:00
lmarcouiller
0c2cf9980d NEW: online propal signature 2021-10-18 14:28:30 +02:00
Laurent Destailleur
51f342c81a Clean code 2021-10-18 12:20:51 +02:00
Laurent Destailleur
11230ebf7f Clean code 2021-10-18 12:05:40 +02:00
lmarcouiller
9eb8dadfd9 WIP : signature of propal 2021-10-15 16:58:59 +02:00
Laurent Destailleur
0865916fe2 Init page for public subscription 2021-10-15 10:43:27 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
5463a02887 Debug v14 2021-10-06 21:59:10 +02:00
Laurent Destailleur
6cb690e678 Debug v14 2021-10-06 21:56:48 +02:00
Laurent Destailleur
8fe37b20c0 Debug v14 2021-10-06 21:54:04 +02:00
Laurent Destailleur
2a5e654544 Debug v14 2021-10-06 21:47:46 +02:00
Laurent Destailleur
f95b0c3033 Debug 2021-10-06 21:43:30 +02:00
Alexandre SPANGARO
f6a8082f16 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 10:01:37 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
97d912d553 Add more information about private or public poll. 2021-09-21 17:17:38 +02:00
Laurent Destailleur
09fff2150e Fix: avoid to add line for event registration twice into invoice 2021-09-21 15:30:34 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
0bf213acac Code comment 2021-09-18 13:25:12 +02:00
Laurent Destailleur
2810315dc5 Fix payment of registration of event 2021-09-18 13:19:29 +02:00
Laurent Destailleur
5fa62f25fa Fix registration of attendee 2021-09-18 12:39:26 +02:00
Laurent Destailleur
ceb368abd4 Fix message 2021-09-18 12:29:35 +02:00
Laurent Destailleur
dafc7d2617 Fix bad position of picto 2021-09-18 11:34:15 +02:00
Laurent Destailleur
ddcb4c149a css 2021-09-18 11:32:58 +02:00
Laurent Destailleur
0c67185dcf Add note on registration 2021-09-18 11:03:15 +02:00
Laurent Destailleur
c052a50d75 Fix phpcs 2021-09-17 10:32:19 +02:00
Laurent Destailleur
0c0ef7b683 Debug module event organization 2021-09-16 20:56:14 +02:00
Laurent Destailleur
16331ce87b Better detection of company 2021-09-16 18:53:00 +02:00
Laurent Destailleur
bfe305dc47 Debug event organization module 2021-09-16 18:16:25 +02:00
Laurent Destailleur
424ddcb218 Fix page of payment 2021-09-16 16:37:20 +02:00
Laurent Destailleur
253f01edcb Fix page of payment 2021-09-16 16:33:51 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
2b340579a1 Fix look 2021-09-15 21:12:16 +02:00
Laurent Destailleur
0ab399aa37 Fix try to find the thirdparty from contacts too. 2021-09-15 20:46:48 +02:00
Laurent Destailleur
5aaf8ff8f3 Fix sql 2021-09-15 19:58:55 +02:00
Laurent Destailleur
801bf83334 Css v14 2021-09-15 19:48:43 +02:00
Laurent Destailleur
eab4014f20 Rename url 2021-09-15 19:42:07 +02:00
Laurent Destailleur
29d9771b80 Code comment 2021-09-15 19:39:22 +02:00
Laurent Destailleur
4a2d3a55d4 FIX Selection of type "people" for membership must hide the company 2021-09-15 19:33:30 +02:00
Laurent Destailleur
3f2f6c3ed3 Fix online registration 2021-09-14 21:12:11 +02:00
Alexandre SPANGARO
d32ab42654 Merge remote-tracking branch 'upstream/develop' into 15a14 2021-09-10 16:59:31 +02:00
Alexandre SPANGARO
26d5ccee61 NEW Survey - Add a clickable link in email send 2021-09-10 16:58:29 +02:00
Laurent Destailleur
11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/langs/en_US/admin.lang
 2021-09-10 11:40:45 +02:00
Laurent Destailleur
4939cc9911 Fix trans 2021-09-10 11:04:59 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
f5903c9b02 Debug organizedeventregistration module 2021-09-08 02:17:00 +02:00
Laurent Destailleur
880ac07661 Debug organizedeventregistration module 2021-09-08 01:41:59 +02:00
Laurent Destailleur
07d48e627e Debug event organization module 2021-09-07 23:19:16 +02:00
Laurent Destailleur
f54e4690e6 Debug event organization module 2021-09-07 18:13:55 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Florian HENRY
628c715878 ok for prod 2021-09-03 16:39:10 +02:00
Florian HENRY
96f9f8ae98 work on event 2021-09-03 15:40:33 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
Laurent Destailleur
72131110e7 Fix protect public pages 2021-08-31 18:03:37 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
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
daraelmin
29f98041e6
conditiion always wrong when on following link 2021-08-25 08:48:42 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +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
Laurent Destailleur
531dee31fd Fix securekey 2021-05-27 11:16:23 +02:00
Dorian Vabre
12d10adc17 Merge branch 'dev_EventOrganizer_suggest' of github.com:DorianVabre/dolibarr into dev_EventOrganizer_suggest 2021-05-21 16:02:22 +02:00
Dorian Vabre
fe272d3292 wip name of contact to add on ics file 2021-05-21 16:01:44 +02:00
stickler-ci
6f050fc23a Fixing style errors. 2021-05-20 15:48:04 +00:00
Dorian Vabre
83555da795 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 17:26:07 +02:00
Dorian Vabre
720a368b29 link ics ok (todo: add name of speaker) 2021-05-20 17:24:27 +02:00
Dorian Vabre
ab4ae85eb8 fix: getpost exportagenda apha to alpha 2021-05-20 16:33:04 +02:00
Dorian Vabre
df81ac8622 wip 2021-05-20 16:30:49 +02:00
Dorian Vabre
307ab92bc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganizer_suggest 2021-05-20 16:13:42 +02:00
Dorian Vabre
c85b75924f wip on adding a filter for the ics file + fix on class name 2021-05-10 16:57:48 +02:00
Dorian Vabre
f6956d6a62 using validate() function instead of settStatut(1) to validate an attendee 2021-05-10 15:58:54 +02:00
Dorian Vabre
7d0c3dcf6d transition done from cookies to session 2021-05-10 15:50:29 +02:00
Dorian Vabre
d71dc37a75 fix 2021-05-10 15:39:39 +02:00
Dorian Vabre
ee4e8dd99f cookies to session transition 2021-05-10 15:37:25 +02:00
Dorian Vabre
c5dc20b9dc opti 2021-05-10 15:31:52 +02:00
Dorian Vabre
0e62edfd42 fix error on fetching thirdparty when there is none 2021-05-10 12:47:09 +02:00
Dorian Vabre
0dce9ee359 now using correct email templates after booth/conf suggestion 2021-05-10 10:22:45 +02:00
Dorian Vabre
d86b393d60 useless line removed 2021-05-10 09:54:26 +02:00
Dorian Vabre
058bef1a79 clean viewandvote page 2021-05-07 17:20:36 +02:00
Dorian Vabre
05bbb3dbf6 improved welcome msg on suggestbooth/conf pages 2021-05-07 16:39:03 +02:00
Dorian Vabre
c48234409b added copyright 2021-05-07 16:15:13 +02:00
Dorian Vabre
d344ce5e08 clean viewandvote page 2021-05-07 15:59:25 +02:00
Dorian Vabre
dfd3742d91 fix on label on payment page 2021-05-07 15:33:00 +02:00