Commit Graph

1051 Commits

Author SHA1 Message Date
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
ptibogxiv
bfa7478568
FIX compatibility for multicompany (stripeconnect or not)
TODO: more test and create fee with stripe callback
2018-03-09 14:40:20 +01:00
ptibogxiv
a2fd2bc3f3
FIX entity
TO DO: save stripe account in multicompany mode and without stripe connect in theadmin of stripe module because stripe doesn't send custom field for all request
RISK: confusion and error in payment and transfert bank without this
2018-03-09 00:03:44 +01:00
ptibogxiv
432aa50812
Update ipn.php 2018-03-08 20:08:43 +01:00
ptibogxiv
415332c22a
ADD IPN/Webhook for stripe
TODO: optimise code and uncustomize of ptibogxiv.net but good and fonctionnal for test
2018-03-08 20:05:40 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Laurent Destailleur
0b316c3980 Attach invoice on email subscription confirmation 2018-03-08 15:01:34 +01:00
Laurent Destailleur
7a7c4b8f14 Fix invalid url 2018-03-08 14:41:13 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
Laurent Destailleur
0cfa19ee09 NEW Online payment of invoice and subscription record the payment
automatically.
2018-03-06 00:12:23 +01:00
Laurent Destailleur
2f9f4d0675 WIP Create payment of member subscription with paypal 2018-03-05 21:46:24 +01:00
Laurent Destailleur
667db35e75 Better form for subscription 2018-03-05 17:44:38 +01:00
ptibogxiv
136b5c4431
New introduce stripeconnect mode 2018-03-05 17:26:03 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned)
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Laurent Destailleur
d8b2d1f8c2 Add example of test credit card 2018-03-04 12:11:28 +01:00
Laurent Destailleur
f545d2a134 NEW Can add filter actiontype and notactiontype on event ical export 2018-02-28 20:06:28 +01:00
Laurent Destailleur
dd204947b8 CSS 2018-02-25 11:00:50 +01:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
354fc4edd0 Fix: amount into form must be numeric without format 2018-02-04 23:06:37 +01:00
Laurent Destailleur
be874f0b1d Fix fulltag 2018-01-30 11:24:02 +01:00
Laurent Destailleur
acf92da12d Fix option MEMBER_NEWFORM_AMOUNT 2018-01-30 10:43:24 +01:00
Laurent Destailleur
424e8a3139 Fix price format in payment pages 2018-01-29 12:10:06 +01:00
Laurent Destailleur
3c4ed55179 Fix css 2018-01-29 11:32:56 +01:00
Laurent Destailleur
716d44a610 Fix price in member public form 2018-01-29 11:22:02 +01:00
Laurent Destailleur
c41374220e Fix css 2018-01-29 11:13:18 +01:00
Laurent Destailleur
9d0a0ed867 Fix demo 2018-01-19 12:55:03 +01:00
Laurent Destailleur
4034122169 Fix usage of PAYMENT_SECURITY_TOKEN 2018-01-17 18:00:05 +01:00
Laurent Destailleur
1f2d275ef2 Fix conditions of some fields 2018-01-13 17:21:56 +01:00
Laurent Destailleur
ca14dd790b Fix module website 2018-01-02 22:58:37 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
01a41237bf CSS 2017-11-11 14:20:08 +01:00
Laurent Destailleur
b74399abf6 Code comment 2017-10-30 02:56:40 +01:00
Laurent Destailleur
39506df4dd Add business_vat_id in stripe payment 2017-10-30 02:33:54 +01:00
Laurent Destailleur
bbe1c9c494 NEW Can download PDF document from the payment page 2017-10-30 00:45:47 +01:00
Laurent Destailleur
b9ca66943f Try to introduce param forcesandbox to test online payment easier 2017-10-28 16:32:19 +02:00
Laurent Destailleur
5f5cbec1cf Debug module website 2017-10-26 13:09:11 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
9c45e86a1c Introduce main_doc into table of objects to know what is main doc.
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
f8eca95c82 Better param desc 2017-10-12 02:59:00 +02:00
Laurent Destailleur
3dbd7e600f Fix param desc 2017-10-12 02:47:53 +02:00
Laurent Destailleur
4a93b709ad Add param desc on payment link 2017-10-12 02:46:49 +02:00
Laurent Destailleur
41716281ed Fix demo 2017-10-07 11:44:07 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
296e678c1b Solve url too long with paybox 2017-09-21 12:02:46 +02:00
Laurent Destailleur
0eb416d4af Fix removal of a file 2017-09-20 20:41:40 +02:00
Laurent Destailleur
2f317c5834 Debug online payment using unique form 2017-09-20 19:34:14 +02:00
Laurent Destailleur
577c64cc37 WIP work on param download on payment page 2017-09-20 17:23:36 +02:00
Laurent Destailleur
1d6213ea7d Add picto for cheque payment 2017-09-20 15:29:47 +02:00
Laurent Destailleur
e02c220c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/commande/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/card.php
	htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Laurent Destailleur
84359a0078 Fix maxlength of fields 2017-09-14 16:42:04 +02:00
Laurent Destailleur
fb634725df Merge #7266 2017-09-14 15:21:13 +02:00
Laurent Destailleur
0744b5d91b Fix typo
Conflicts:
	htdocs/public/payment/newpayment.php
2017-09-12 19:06:47 +02:00
Laurent Destailleur
725600e000 Fix typo 2017-09-12 18:37:54 +02:00
Laurent Destailleur
fcf82f1163 Enhancement into setup of member module 2017-09-12 11:17:23 +02:00
Laurent Destailleur
07b040a8eb Save space 2017-09-11 16:31:44 +02:00
Laurent Destailleur
9f1e349506 Add hidden option message ONLINE_PAYMENT_MESSAGE_FORMIFVAT 2017-09-10 22:24:26 +02:00
Laurent Destailleur
026f9d8e2a Can set a dedicated message on payment forms 2017-09-09 10:54:30 +02:00
Laurent Destailleur
c7537732d2 NEW Can set a dedicated message on payment forms 2017-09-09 10:03:09 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Ferran Marcet
9fa85a5831 Fix: Credit card field showing too small 2017-09-06 12:14:42 +02:00
Ferran Marcet
016ed12c11 Fix: Credit card field showing too small 2017-09-06 12:09:07 +02:00
Laurent Destailleur
55691bfbc2 Work on generic payment module 2017-09-01 19:37:34 +02:00
Laurent Destailleur
796684713f Work on generic payment module 2017-09-01 18:49:55 +02:00
Laurent Destailleur
30eefb34aa Fix payment suffix 2017-09-01 18:03:26 +02:00
Laurent Destailleur
9146bb336e Work on merging all payment modes in one page 2017-08-31 03:34:57 +02:00
Laurent Destailleur
2e6a211577 Clean code 2017-08-21 04:17:28 +02:00
Laurent Destailleur
ddd60d1cd2 Fix error counting in cron 2017-08-03 11:23:23 +02:00
Laurent Destailleur
166e6cb68b Fix error counting in cron 2017-08-03 11:22:37 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
b6a7ce6822 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-01 10:22:37 +02:00
Laurent Destailleur
beaa5279ac Merge pull request #7197 from hregis/6.0_cron
Fix: add possibility to force entity id
2017-07-31 02:22:54 +02:00
Laurent Destailleur
80f096a9d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-31 02:09:15 +02:00
Laurent Destailleur
1897e3cbad Some fix for better compatibility 2017-07-30 20:43:18 +02:00
Laurent Destailleur
b0e62f9d24 Enhance image replacement 2017-07-28 17:17:40 +02:00
Regis Houssin
566bc555eb Fix: add possibility to force entity id 2017-07-24 15:41:22 +02:00
Laurent Destailleur
28254655e9 Debug module website 2017-07-21 02:30:02 +02:00
Laurent Destailleur
5318e513c1 Debug module website 2017-07-21 02:29:24 +02:00
Laurent Destailleur
3b8f60f90e Fix pb of recursive include in website module 2017-07-20 16:49:20 +02:00
Laurent Destailleur
0ee93fb00c Fix conflict between option login and logina and logint in agenda export 2017-07-04 10:29:38 +02:00
Laurent Destailleur
9e26e6b0a3 Fix bad value for ref of old contracts 2017-07-03 11:42:17 +02:00
Laurent Destailleur
8a96260892 Fix amount not filled into email confirmation 2017-07-03 01:57:28 +02:00
Laurent Destailleur
565de9bc8d Debug module website 2017-07-02 23:38:19 +02:00
Laurent Destailleur
4f72bd35db Fix too much code into the NOREQUIREDB 2017-07-02 13:18:23 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6 Escape hml tags 2017-06-18 19:42:59 +02:00
Laurent Destailleur
cde0da6e12 Fix responsive 2017-06-18 12:48:58 +02:00
Laurent Destailleur
c0f46834cb Fix demo links 2017-06-13 13:22:05 +02:00
Laurent Destailleur
20f1bb76cb Fix memu under disabled entries, when using smartphone 2017-06-10 16:13:37 +02:00
Laurent Destailleur
b6af1f7e6e Fix responsive design 2017-06-10 15:21:49 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Laurent Destailleur
0458b7d38f Fix css subscription form 2017-06-09 17:29:34 +02:00
Laurent Destailleur
1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
985a9ed8d3 FIX Redirect to payment page from member subscription page failed if a
unique security key was defined.
2017-06-09 12:12:12 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Laurent Destailleur
5e29817910 Init of the onlinesign 2017-06-02 20:17:08 +02:00
Laurent Destailleur
5c58ed8ca7 Add a better error message when payment link is not valid. 2017-06-02 09:13:04 +02:00
Laurent Destailleur
d0f01085d8 Add more information on stripe payment 2017-05-29 02:44:14 +02:00
Laurent Destailleur
67b3e3da99 FIX #6784 2017-05-23 15:51:39 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
b3245fb455 NEW Include an hourglass icon when we click on online payment button 2017-05-15 10:27:21 +02:00
Laurent Destailleur
caae7e4171 NEW It's easier to switch between sandbox and live for paypal 2017-05-14 17:05:13 +02:00
Laurent Destailleur
998254d9c6 Finish rewrite and debug of module Stripe. 2017-05-14 16:17:23 +02:00
Laurent Destailleur
9b550ae178 Fix migration of accountancy_journal from char to num. 2017-05-14 12:54:26 +02:00
Laurent Destailleur
9e4e72baee Enhance module stripe 2017-05-14 05:26:19 +02:00
Laurent Destailleur
0ed4b607b2 Standardize code for payment 2017-05-13 22:17:39 +02:00
Laurent Destailleur
955c9f4217 Standardize the way online payments are working.
Removed the trigger file of PAYPAL module that stored data that was not
used by Dolibarr. The trigger event still exists, but if an external
module need action on it, it must provides itself its trigger file.
2017-05-13 21:10:56 +02:00
Laurent Destailleur
57ba598b15 Merge pull request #6771 from aspangaro/6.0-stripe
New : Module Stripe
2017-05-13 19:55:29 +02:00
Laurent Destailleur
71833f5987 Standardize code 2017-05-13 17:04:46 +02:00
Laurent Destailleur
54088f38fb Code standardization on online payment code 2017-05-13 14:03:09 +02:00
Laurent Destailleur
30cf3f2bda Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Dinclaux
fb561bae1b Fix recurring invoices generation when using the cron url 2017-05-10 00:58:48 +11:00
Alexandre SPANGARO
b05d2c50e8 Add mode live 2017-05-08 06:52:30 +02:00
Alexandre SPANGARO
ce62736e6b Correct link and renamed checkout by newpayment 2017-04-29 07:57:36 +02:00
Alexandre SPANGARO
d73374cc5b Uniformize link to stripe.lib 2017-04-29 07:34:30 +02:00
Alexandre SPANGARO
586ea54bfc Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-29 07:05:02 +02:00
Alexandre SPANGARO
47089a4d55 Modle Stripe : Work in progress 2017-04-29 07:04:34 +02:00
Laurent Destailleur
fbdfbed02c Add code to prepare a generic payment solution 2017-04-23 03:01:09 +02:00
Alexandre SPANGARO
fed6d71d8a Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-04-17 06:51:02 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
guillaume-uH57J9
199067e4b8 members/new.php : non-public by default
in the form, disable public by default, to be consistent with class Adherent's default value
2017-04-09 22:00:19 +02:00
Laurent Destailleur
43e59772e4 Merge pull request #6606 from fappels/develop_add_jqmigrate
Develop add jQuery-migrate
2017-03-31 17:48:01 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
fappels
527fa27fb7 Add jquery-migrate to handle jquery 3.0 removes 2017-03-29 11:18:03 +02:00
Laurent Destailleur
6bf61c677f FIX #6586 Introduce processing status 2017-03-28 13:20:31 +02:00
Alexandre SPANGARO
05e50e1027 Merge remote-tracking branch 'uptream/develop' into 6.0-stripe 2017-02-28 05:52:43 +01:00
Laurent Destailleur
bf591f5f91 Work on module website 2017-02-24 21:13:40 +01:00
Alexandre SPANGARO
942b58efaf New : Integration of Stripe 2017-02-22 06:33:52 +01:00
Laurent Destailleur
d5b10a18b7 Debug module variant 2017-02-08 12:52:31 +01:00
Laurent Destailleur
ffedf1fd57 New demo page 2017-02-03 16:02:37 +01:00
Laurent Destailleur
a0251a262a The demo has its own CSS file. 2017-02-03 15:34:09 +01:00
Laurent Destailleur
bd812a0bef NEW new demo entry page 2017-02-03 14:48:16 +01:00
Laurent Destailleur
9b37b52f45 Fix css 2017-02-01 20:55:30 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
aspangaro
cd39b1c6f0 Fix: Field comments not registered in new member public form & presentation 2016-12-08 00:12:54 +01:00
Laurent Destailleur
33139dd57a Fix missing translation of page "disabled" and "offline". 2016-12-02 17:49:39 +01:00
Laurent Destailleur
e6fb118155 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-11-26 15:52:17 +01:00
Laurent Destailleur
a8c3ce4e55 FIX A form should not be inside a table. Create javascript troubles. 2016-11-26 12:21:50 +01:00
Laurent Destailleur
5b49b7bca0 FIX #6010 2016-11-22 21:06:44 +01:00
Laurent Destailleur
6d70d39bbd NEW Add type "url" as possible extrafield. 2016-11-08 17:21:26 +01:00
Laurent Destailleur
4cdd8e96d7 Fix for emulated jmobile 2016-11-08 15:55:44 +01:00
Laurent Destailleur
03ebe769d7 Clean sources from not used libraries. 2016-10-05 00:38:17 +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
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
72aacb81ae NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:13:52 +02:00
Laurent Destailleur
ac509d6565 FIX #2991 2016-09-12 02:47:36 +02:00
Laurent Destailleur
b81de6b383 Fix wrapping with jmobile 2016-08-24 20:23:06 +02:00
Laurent Destailleur
ba8c2dbf9f Fix order of module for demo. 2016-08-17 11:39:11 +02:00
Laurent Destailleur
fb3f6972eb Work on module website
Conflicts:
	htdocs/websites/index.php
2016-08-08 18:29:24 +02:00
Laurent Destailleur
44b02f1d6c Hide module cron 2016-07-30 20:59:06 +02:00
Laurent Destailleur
b165a31c0d Fix old module to disable 2016-07-30 20:55:20 +02:00
Laurent Destailleur
8ada144f6e Fix demo 2016-07-30 20:53:00 +02:00