Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

47 Commits

Author SHA1 Message Date
florian HENRY
f0a32a2dea fix : remove comment on commit 2018-08-09 20:41:15 +02: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
0b316c3980 Attach invoice on email subscription confirmation 2018-03-08 15:01:34 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
 2018-03-06 09:20:45 +01:00
Laurent Destailleur
2f9f4d0675 WIP Create payment of member subscription with paypal 2018-03-05 21:46:24 +01:00
Laurent Destailleur
0b3e2e92e2 Revert "Fix SQL error when creating subscription" 
This reverts commit d422fc8a11.
 2018-03-05 16:13:32 +01:00
Laurent Destailleur
d422fc8a11 Fix SQL error when creating subscription 2018-03-05 16:09:26 +01:00
Laurent Destailleur
184c773301 Fix error management 2018-03-05 15:43:48 +01:00
Laurent Destailleur
ae59ca43cc Fix sort of subscriptions 2018-01-10 13:02:05 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
 2017-10-13 22:01:56 +02:00
Laurent Destailleur
d59d7887bb Update subscription.php 2017-10-11 11:42:39 +02:00
Laurent Destailleur
1b04c4beb7 Merge branch '6.0' into 6.0_bug2 2017-10-11 11:37:38 +02:00
Regis Houssin
f2ad205538 Fix: wrong copy/paste ! 2017-10-11 07:36:02 +02:00
Regis Houssin
6d5c2bf7b2 Fix: check if module bank activated 
Conflicts:
	htdocs/adherents/subscription.php
 2017-10-11 07:35:44 +02:00
Regis Houssin
913a5d1df2 Fix: if module is not activated, functionality of module is deactivated! 2017-10-11 07:27:27 +02:00
Alexandre SPANGARO
2a76cc6f54 Fix : missing class AccountingJournal in subscription member page when accountancy not activated 2017-10-10 06:34:16 +02:00
Regis Houssin
86c301f197 Fix: uniformize parameters 2017-10-09 15:49:10 +02:00
Regis Houssin
f2d9288db5 NEW add company alias name when create company from member 2017-10-09 12:38:44 +02:00
Laurent Destailleur
f2e0ff0d30 Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict 2017-10-03 17:25:01 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Regis Houssin
e65b21a3bf Fix: change the parameter value of dol_getIdFromCode 2017-10-02 11:59:17 +02:00
Regis Houssin
9823d6622c Fix: use default $shared value 2017-09-27 17:40:02 +02:00
Regis Houssin
a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-14 12:07:19 +02:00
Laurent Destailleur
627dd15b44 Suggested link for online payment use the generic link 2017-09-12 12:18:26 +02:00
Regis Houssin
8e8f94df11 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture-rec.class.php
 2017-08-30 19:33:23 +02:00
Laurent Destailleur
bf1f60b31e Merge 2017-08-23 17:14:29 +02:00
Laurent Destailleur
947acfffe2 FIX #7173 2017-08-23 16:53:29 +02:00
Regis Houssin
c8bd11660d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-07-18 15:23:43 +02:00
Alexandre SPANGARO
4c84c97bb6 Fix #7169 : Unknown column 'ba.accountancy_journal' in member's subcription 2017-07-17 05:58:27 +02:00
Regis Houssin
3445c9d329 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/lib/functions.lib.php
 2017-06-11 06:27:49 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
82560b9126 Look and feel v6 2017-05-22 10:58:20 +02:00
Alexandre SPANGARO
16a41242d3 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-05-08 06:39:14 +02:00
Laurent Destailleur
f70ee73747 Merge pull request #6716 from rassakali/patch-1 
NEW Add hook into subscriptions
 2017-05-04 09:36:01 +02:00
Alexandre SPANGARO
c3fe1c963a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-22 06:33:31 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
rassakali
f68c408dbc Update subscription.php 
Fix issue #6694
 2017-04-15 08:35:23 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
philippe grand
b0f2d2310b Update code using new css class 2017-04-12 10:28:05 +02:00
Alexandre SPANGARO
942b58efaf New : Integration of Stripe 2017-02-22 06:33:52 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
9fd48df839 Fix minor bug on subscription pages 2016-12-17 19:21:48 +01:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00