Commit Graph

1889 Commits

Author SHA1 Message Date
Laurent Destailleur
4a582485b9 Debug module ticket 2019-03-04 19:19:09 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
ee3dd016e7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-27 14:47:23 +01:00
Laurent Destailleur
10e3badb0a Fix closing tr 2019-02-27 14:46:23 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
Laurent Destailleur
df5dbd4110 Fix bad ip 2019-02-14 21:10:49 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
456a76cb11 Fix suffix 2019-02-12 01:11:37 +01:00
Laurent Destailleur
f0e56abac7 NEW Module ticket is available as a stable module 2019-02-11 19:16:37 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
7c82b416ae
fix phpcs public/payment/newpayment.php 2019-02-05 20:56:34 +01:00
Laurent Destailleur
d49dd8d593 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-05 15:16:44 +01:00
Laurent Destailleur
fbed22050d fix syntax error 2019-02-05 14:33:36 +01:00
Laurent Destailleur
4de122d1d4 Fix date format 2019-02-05 14:33:03 +01:00
Laurent Destailleur
e3d0cb1637 Fix css 2019-02-05 14:32:23 +01:00
Laurent Destailleur
541f6e537e Fix link to pay membership renewal 2019-02-05 14:05:39 +01:00
Laurent Destailleur
e5827f77cb Fix link to pay membership renewal 2019-02-05 14:03:35 +01:00
Laurent Destailleur
6d09c85231 Fix missing button 2019-02-05 14:01:32 +01:00
Laurent Destailleur
d6501d996c Missing trans 2019-02-05 13:56:55 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
77747ac2a3
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-28 16:35:12 +01:00
Laurent Destailleur
273c396fb9 Fix bad function 2019-01-28 02:47:03 +01:00
Laurent Destailleur
31f4513a7e Fix bad function 2019-01-28 02:46:31 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
1e79781cba Clean parameters 2019-01-08 11:54:08 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
fc3fcc5455 FIX CVE-2018-19993 2018-12-22 16:59:30 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
57c41bac56 Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52 FIX Mandatory field feature should works on textarea 2018-12-15 18:11:40 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
d0fd00c4e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-11 18:15:13 +01:00
Laurent Destailleur
4aff0b6471 Fix opensurvey 2018-12-11 10:52:59 +01:00
Laurent Destailleur
b47e7b2267 Work on new unsubscribe process 2018-12-11 09:49:46 +01:00
Laurent Destailleur
b27ec54379 A better way to manage unsubscribed emails 2018-12-10 14:35:33 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
Juanjo Menent
7d4553179d Fix #9929 2018-12-01 15:48:46 +01:00
ptibogxiv
e8bdb580ab
Fix trans 2018-11-29 14:00:27 +01:00
Laurent Destailleur
163bc3784e
Merge pull request #10076 from ptibogxiv/patch-96
Fix retrieve Donation newpayment.php
2018-11-29 11:14:33 +01:00
Philippe GRAND
8722ccef82 fix typo error 2018-11-26 14:35:29 +01:00
ptibogxiv
d401974028
Fix retrieve Donation newpayment.php 2018-11-24 15:33:48 +01:00
Laurent Destailleur
b5d1a34080
Update newpayment.php 2018-11-24 11:08:05 +01:00
ptibogxiv
e8ba8814cd
Update newpayment.php 2018-11-23 12:45:37 +01:00
ptibogxiv
6a232a8754
Update newpayment.php 2018-11-23 12:27:24 +01:00
ptibogxiv
1cc6763950
Fix order billed online payment 2018-11-23 11:40:38 +01:00
Laurent Destailleur
966a0b7ec7 Fix message content and language 2018-11-20 20:13:16 +01:00
Alexandre SPANGARO
cf0c4a5ce0 Add in public area 2018-11-18 22:03:32 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
c988e2e681 Fix phpcs 2018-11-05 10:44:37 +01:00
Laurent Destailleur
ccf6554f76
Merge pull request #9941 from ptibogxiv/patch-87
Fix various fix cmail, payout, const, connect
2018-11-05 09:38:41 +01:00
ptibogxiv
d5a910841f
Fix various fix cmail, payout, const, connect 2018-11-01 23:20:28 +01:00
ptibogxiv
b34f781686
Fix ext_payment_site 2018-11-01 23:04:10 +01:00
ptibogxiv
263e8ed4af
Fix payout 2018-11-01 20:45:08 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
1d80e16ad1
Merge pull request #9831 from frederic34/payment
payments
2018-10-24 03:25:01 +02:00
Frédéric FRANCE
85a94ec577
Update view.php 2018-10-22 22:40:18 +02:00
Frédéric FRANCE
fbc5ce623e
payments 2018-10-20 17:17:21 +02:00
Laurent Destailleur
58240c8f1c
Merge pull request #9767 from ptibogxiv/patch-74
NEW Save external payment IDs into table of payment
2018-10-16 20:32:23 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
ptibogxiv
00f839e8b4
add external modepayment in payment 2018-10-16 16:57:16 +02:00
Laurent Destailleur
b0569de166 Work on multilang support 2018-10-14 18:44:29 +02:00
Laurent Destailleur
1e635cff1b Fix new stripe API 2018-10-12 21:00:33 +02:00
Laurent Destailleur
d8edb1f6b8 Fix regression in online payment 2018-10-12 20:28:26 +02:00
Laurent Destailleur
6a363fd1ab API Stripe 2018-09-24 2018-10-12 19:26:00 +02:00
Laurent Destailleur
fcf62744d7 Add ref in description 2018-10-10 16:23:00 +02:00
Laurent Destailleur
1204fb1e74 Fix online payments use id instead of ref into TAG 2018-10-10 16:16:17 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
b1289632e0 CSS 2018-10-10 01:27:31 +02:00
Laurent Destailleur
506ba30d5a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-06 20:54:14 +02:00
Laurent Destailleur
a7d26409c7 FIX trackid into email sent from member module. 2018-10-06 20:51:35 +02:00
Laurent Destailleur
3e49935eac Fix online payment 2018-10-06 15:48:47 +02:00
Laurent Destailleur
36b75031f5
Merge pull request #9681 from ptibogxiv/patch-70
Fix metadata for charge.php
2018-10-06 12:44:16 +02:00
Laurent Destailleur
5045bbc3bd
Update newpayment.php 2018-10-06 12:44:06 +02:00
Laurent Destailleur
835ca4e4a5
Update newpayment.php 2018-10-06 12:42:14 +02:00
Laurent Destailleur
429b078708 Typo 2018-10-05 13:42:30 +02:00
ptibogxiv
0e83863d45
Add save or not source functionnality 2018-10-04 20:32:49 +02:00
ptibogxiv
f5966e6303
Update newpayment.php 2018-10-04 19:29:52 +02:00
Laurent Destailleur
571bc86836
Update newpayment.php 2018-10-04 19:03:18 +02:00
Laurent Destailleur
31916c94f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/pdf.lib.php
2018-10-04 17:56:56 +02:00
Laurent Destailleur
7a94f4fc00 Add more logs 2018-10-04 11:34:46 +02:00
ptibogxiv
762abf7060
Update newpayment.php 2018-10-04 10:59:06 +02:00
ptibogxiv
d36dda37e6
Fix metadata for charge.php
Fix for dol_id, dol_type
2018-10-04 10:56:29 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
Frédéric FRANCE
20e245108f
clean html donateur_code.php 2018-09-17 13:12:04 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Laurent Destailleur
b3dec042b5 Fix translation 2018-09-12 21:12:15 +02:00
Laurent Destailleur
056ef802e4 Fix syntax error 2018-09-12 19:49:57 +02:00
Laurent Destailleur
88192d1bae
Merge pull request #9456 from frederic34/stripeuser
add stripe user for actions
2018-09-12 18:37:31 +02:00
Laurent Destailleur
fb71edd35a
Update ipn.php 2018-09-12 18:37:24 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
48ae4de47b FIX Add paypal error message in alert email 2018-09-12 16:11:10 +02:00
Laurent Destailleur
016bc6851b Fix generation of tpl 2018-09-10 23:37:51 +02:00
Frédéric FRANCE
afdf87603b
add stripe user for actions 2018-09-10 20:50:10 +02:00
Frédéric FRANCE
5f1b3fbc12
add stripe user for actions 2018-09-10 20:18:16 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
4a7ea33008
replace select_date 2018-09-09 08:02:26 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Laurent Destailleur
392f31abbd FIX invert mime type and name 2018-09-04 00:21:48 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
2018-09-03 14:06:51 +02:00
Laurent Destailleur
1249e597d4 Fix test param $id 2018-09-03 11:56:05 +02:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
2018-09-02 15:48:26 +02:00
Laurent Destailleur
ada6d2c963 More logs 2018-09-01 17:27:14 +02:00
Laurent Destailleur
32baec1c9a Fix logs 2018-09-01 17:10:47 +02:00
Laurent Destailleur
c17233a409 More logs 2018-09-01 16:51:40 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
fc5ebc8099
Merge pull request #9340 from ptibogxiv/patch-49
Fix image if multicompany + no login in onlinesign
2018-09-01 12:32:38 +02:00
Laurent Destailleur
cbe89af8f3
Merge pull request #9339 from ptibogxiv/patch-48
add logo with multicompany
2018-09-01 12:31:56 +02:00
Laurent Destailleur
ae36469166 FIX #9337 2018-09-01 12:28:36 +02:00
Laurent Destailleur
59a27085fd
Merge pull request #9336 from ptibogxiv/patch-45
fix multicompany in public ticket page
2018-09-01 12:20:06 +02:00
Laurent Destailleur
bb22d5e083
Merge pull request #9341 from ptibogxiv/patch-50
header/footer uniformization in ticket public page
2018-09-01 12:19:18 +02:00
Laurent Destailleur
9b8be2f7db
Merge pull request #9343 from frederic34/patch-13
Create index.html
2018-09-01 12:07:54 +02:00
Laurent Destailleur
b89f69df79
Merge pull request #9345 from frederic34/patch-15
Create index.html
2018-09-01 12:07:20 +02:00
Frédéric FRANCE
663745b787
Create index.html 2018-08-30 08:09:03 +02:00
Frédéric FRANCE
82302e5516
Create index.html 2018-08-30 08:08:01 +02:00
Frédéric FRANCE
f34455291f
Create index.html 2018-08-30 08:06:46 +02:00
ptibogxiv
7a6df60cb0
header/footer uniformization in ticket public page 2018-08-30 02:38:50 +02:00
ptibogxiv
fc804d8eeb
Fix image if multicompany + no login in onlinesign 2018-08-30 02:37:11 +02:00
ptibogxiv
d2859276b5
add logo with multicompany
this fix push entity to viewimage.php
2018-08-30 02:35:42 +02:00
ptibogxiv
9cf67c4d5f
fix multicompany in public ticket page 2018-08-30 01:13:06 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Philippe GRAND
a31ad5af3d standardize code 2018-08-17 17:55:00 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Frédéric FRANCE
2bb4c30aac
remove superfluous space 2018-08-14 15:59:15 +02:00
Frédéric FRANCE
c0478cb42f
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-14 15:54:40 +02:00
Frédéric FRANCE
5146ab9177
trim 2018-08-14 15:34:44 +02:00
Laurent Destailleur
fa4a12be41
Merge pull request #9208 from ptibogxiv/patch-33
fix connect mode for v8 release
2018-08-13 23:56:42 +02:00
ptibogxiv
d0666a9583
Fix incorrect entity 2018-08-13 14:34:54 +02:00
ptibogxiv
c6adeabb55
Fix dolibarr_set_const 2018-08-13 12:22:51 +02:00
Frédéric FRANCE
5d0d8d10fc
remove superfluous spaces 2018-08-13 09:00:22 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Frédéric FRANCE
69321c47be
correct space 2018-08-07 17:11:41 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
ptibogxiv
e84018ac15
Fix 3D secure
convett to dolibarr standard stripe payment metadata
2018-08-06 19:21:12 +02:00
ptibogxiv
e926efe022
fix connect mode for v8 release 2018-08-06 12:39:50 +02:00
Philippe GRAND
094fc6b699 Standardize 2018-08-06 11:53:33 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
Include and co are statements
2018-08-02 11:03:44 +02:00
Philippe GRAND
4eacad52f2 Clean and update code 2018-07-27 10:06:56 +02:00
Frédéric FRANCE
c991a4d204
trim trailing 2018-07-26 18:05:20 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Philippe GRAND
efa6ad0659 Clean and update code 2018-07-25 19:05:40 +02:00
Laurent Destailleur
b992c4b260
Merge pull request #9117 from frederic34/patch-11
remove commented log
2018-07-24 17:37:46 +02:00
Laurent Destailleur
f419964c76 Fix Debug website module 2018-07-20 15:01:50 +02:00
Frédéric FRANCE
1a58a40f77
remove commented log 2018-07-17 16:48:34 +02:00
Laurent Destailleur
67a831ad5f
Merge pull request #9045 from hregis/8.0_multicompany
Fix: check if multicompany object exists
2018-07-06 14:23:59 +02:00
Laurent Destailleur
05ed721a8c Fix name of constant for module TICKET 2018-07-06 13:09:07 +02:00
Maxime Kohlhaas
badcbd78d8 Rename ticketsup public directory 2018-07-05 15:20:38 +02:00
Regis Houssin
0bb7f84f87 Fix: check if multicompany object exists 2018-07-03 14:11:00 +02:00
Laurent Destailleur
9eaca045e4 Fix default message with online payment link must be hidden when no
online payment mode exists.
2018-06-27 11:34:40 +02:00
Laurent Destailleur
c0d4715bdb Clean code 2018-06-15 16:29:26 +02:00
Laurent Destailleur
79cbdf7fd1 Code comment 2018-06-15 15:29:19 +02:00
Laurent Destailleur
25d656025a Fix use of alternative aliases is ok now 2018-06-14 16:33:11 +02:00
Laurent Destailleur
4313e41580 Start to fix pb with 3DS 2018-06-12 13:47:28 +02:00
Laurent Destailleur
5ea1890f0c Fix payments on contract line 2018-06-06 10:28:53 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
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
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
Laurent Destailleur
04e814d1a6 Update demo 2016-07-30 20:51:22 +02:00
Laurent Destailleur
d7bc30fc4e Prepare DoliWamp 4.0 2016-07-06 23:18:01 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
8ffe7097a4 Prepare responsive fixes 2016-06-09 01:33:26 +02:00
Laurent Destailleur
82745d32df NEW Survey system has now a status like other objects. You can close or
reopen a survey.
2016-05-07 17:12:31 +02:00
Laurent Destailleur
25dfa0c5b9 Work on website 2016-05-07 16:38:32 +02:00
Laurent Destailleur
5823055cdf Work on website module. 2016-05-01 21:19:29 +02:00
Laurent Destailleur
f59f3032c6 NEW: Rename path for generic medias files into '/medias' instead of
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
Laurent Destailleur
83644dcb93 Fix errors reported by scrutinizer 2016-04-09 15:38:15 +02:00
Florian HENRY
371e593da3 better includes externel library 2016-03-18 10:56:55 +01:00
Florian HENRY
28391a4e4d Last version of JQuery 1.12 and DataTables Componenent with working
export Excel,CVS,PDF, etc..
2016-03-15 11:57:53 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
Laurent Destailleur
a6fcab96e3 Better contrast in thumb of demo page 2016-03-08 10:03:51 +01:00
Laurent Destailleur
15ecf98bcb Fix responsive on smartphone 2016-03-05 02:11:20 +01:00
Laurent Destailleur
7a1af17585 FIX Responsive of demo selection page was not working 2016-03-05 01:40:52 +01:00
Laurent Destailleur
90ce3e6309 FIX Responsive of demo selection page was not working 2016-03-05 01:39:22 +01:00
Laurent Destailleur
9b41e11a1e NEW Can select dynamicaly number of lines to show on page 2016-02-10 20:48:18 +01:00
Laurent Destailleur
475cc24e13 NEW Can edit next execution date of a cron job. 2016-01-31 15:37:23 +01:00
Laurent Destailleur
8d46a56dac Work on CMS module 2016-01-24 21:17:11 +01:00
Laurent Destailleur
20f1455090 FIX #4314 2016-01-08 15:45:23 +01:00
Laurent Destailleur
2259cf2340 Merge remote-tracking branch 'origin/3.8' into develop 2016-01-08 14:49:00 +01:00
Marcos García de La Fuente
ae2295d019 Improvement suggested by @eldy 2016-01-03 15:10:22 +01:00
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
2016-01-02 12:27:08 +01:00
Marcos García de La Fuente
039039bb00 FIX #3798 #2519 Cron jobs would never be executed 2015-12-28 15:17:53 +01:00
Laurent Destailleur
6905842794 Update list of module in demo with new 3.8 modules 2015-12-27 20:31:39 +01:00
philippe grand
8e8c6b1534 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-12-21 14:22:45 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
philippe grand
7a33e2983d [Qual] Uniformize code 2015-12-20 10:36:20 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit *
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
2015-12-16 19:38:40 +01:00
Laurent Destailleur
40269c3c70 Fix Remove syntax warnings 2015-12-15 09:43:39 +01:00
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Juanjo Menent
59b3124d7d Merge pull request #3938 from marcosgdf/fr-3876
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
2015-11-08 11:20:36 +01:00
Laurent Destailleur
57e162d7f8 The component selectAjaxArray can return javascript part into a global
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
2015-11-07 15:46:06 +01:00
Marcos García de La Fuente
75b4cb4727 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2 2015-11-07 14:37:47 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
fmarcet
ba4f306c83 FIX: Avoid changing the state to a thirdparty who shouldn't be
contacted anymore
2015-11-02 11:52:58 +01:00
frederic34
22d1cf860c Add translation 2015-10-31 22:09:50 +01:00
Laurent Destailleur
5c4ac0bf62 NEW Merge all left menu search boxes into one. 2015-10-26 12:18:22 +01:00
Laurent Destailleur
71da059ef0 NEW Add a new widget $form->selectArrayAjax() to use combo list with
content coming from an Ajax URL.
2015-10-26 11:23:31 +01:00
Laurent Destailleur
81580f75b9 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture.php
2015-10-18 21:22:42 +02:00
Laurent Destailleur
c64c1a0201 FIX If no end date is set on survey, we should be able to vote. 2015-10-18 20:11:26 +02:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php
2015-10-10 18:56:28 +02:00
Laurent Destailleur
61d739635e Uniformize code and css for tables. Filters must be implemented
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
Laurent Destailleur
cfc70c7f92 Smaller image 2015-10-08 23:55:15 +02:00
Laurent Destailleur
0d799402d0 Work on image for "no photo" with better resolution 2015-10-08 23:50:17 +02:00
philippe grand
0841feda47 syntax error 2015-10-08 09:40:00 +02:00
Florian HENRY
c9d8e041d5 FIX : New adherent from, always redirect on entity 2015-10-05 15:20:55 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Laurent Destailleur
71ccdb5cfb FIX Payment form for paypal and paybox was not centered. 2015-09-30 19:37:41 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
fd90ac517f Add ignore file 2015-09-21 15:43:37 +02:00
Laurent Destailleur
c0ef8baa9d A better error message 2015-09-21 15:38:17 +02:00
jfefe
bf4fe91197 FIX #3548 : API not working after removing Composer 2015-09-17 20:48:57 +02:00
Laurent Destailleur
06d19a5a40 Work on a new widget 2015-09-12 11:33:22 +02:00
Raphaël Doursenaud
97f91d0ef9 Fix #3440 Only search core modules in main path
Removed duplicated code and used common dolGetModulesDirs() function
2015-09-05 12:37:43 +02:00
Raphaël Doursenaud
321094ab42 Install Restler framework from composer 2015-09-04 19:06:02 +02:00
Florian HENRY
82e9bf6b68 add test on test arrays with show/hide column 2015-07-21 09:38:43 +02:00
Florian HENRY
0394c9d594 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-07-20 08:32:07 +02:00
Florian HENRY
798b7924b5 Fix test_arrays 2015-07-20 08:30:50 +02:00
Laurent Destailleur
0402a1661c Fix: Sending email must be done after payment ok is shown and trigger
has been ran.
2015-07-19 14:40:18 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Raphaël Doursenaud
b508dce3ff Fix: jquery path 2015-07-06 16:48:10 +02:00
Laurent Destailleur
d5a4a98c22 FIX #3138 - Too much visible thing when access is denied on public pages 2015-07-04 14:56:43 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
jfefe
80a6afc577 Add htaccess example for API usage 2015-06-15 14:11:53 +02:00
jfefe
00125d1060 Add option to set production mode to API 2015-06-15 14:11:43 +02:00
jfefe
da0fac2ac6 Minor fix into rest API : use implemented method name 2015-06-15 13:25:02 +02:00
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
35dd069ec9 Fix #2994 2015-06-08 18:17:13 +02:00
Laurent Destailleur
b61f7dda0b Merge pull request #2990 from GPCsolutions/dolibarr-2985
Make default avatar images public to allow Gravatar proxying
2015-06-08 17:53:37 +02:00
Laurent Destailleur
9e1dd42b56 Fix #2986 2015-06-08 17:38:33 +02:00
Laurent Destailleur
5d4bbc457a Fix #2987 Removed deprecated page 2015-06-08 17:30:15 +02:00
Raphaël Doursenaud
4aee11e54b Make default avatar images public to allow Gravatar proxying
Fix #2985
2015-06-08 17:23:02 +02:00
Laurent Destailleur
df1dfcbd8a NEW Can filter proposal on a tag of a product
Enhance also the prototype test_arrays to include select form before
table.
2015-06-08 15:07:37 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
Laurent Destailleur
b7cf070d2d Fix phpcs 2015-06-05 18:43:14 +02:00
Laurent Destailleur
eebb93f435 Merge pull request #2940 from GPCsolutions/restapireview
Fixed some coding style issues
2015-06-05 15:55:15 +02:00
Laurent Destailleur
5e2d9efa07 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:02:50 +02:00
Raphaël Doursenaud
9b747a12aa Fixed some coding style issues 2015-06-02 15:13:52 +02:00
Laurent Destailleur
390c7d8e65 Fix link to prospect with filter on commercial status
Enhance natural_search method to allow to search on several ids.
2015-05-22 15:19:27 +02:00
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Laurent Destailleur
f0a1b7984f More complete test pages 2015-05-18 08:59:25 +02:00
Laurent Destailleur
c89c883d7d Fix the new navigation style. 2015-05-17 19:37:37 +02:00
Laurent Destailleur
372ad4924b Add print_barre_liste into prototype. 2015-05-17 18:34:52 +02:00
Laurent Destailleur
1b03e348d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/bank/annuel.php
2015-05-16 02:53:36 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest
Add new core module : REST API
2015-05-12 19:39:37 +02:00
jfefe
125a34cb34 Fix PHPCS 2015-05-12 16:42:35 +02:00
Laurent Destailleur
5bac040a9a Enhance prototype for select 2015-05-10 21:21:29 +02:00
Juanjo Menent
e07cebd50b Merge pull request #2793 from GPCsolutions/htmlfixes
HTML fixes
2015-05-09 13:58:43 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
040df3c922 Change low level access verification to a better high level one 2015-05-07 10:32:20 +02:00
jfefe
24bf614061 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-05-06 01:00:11 +02:00
jfefe
5f62d2b13e Add API class for invoice 2015-05-05 12:42:57 +02:00
jfefe
638c534211 Modify API explorer settings to memorize api key 2015-05-05 12:42:56 +02:00
jfefe
0e4a06799d Add API class for categories 2015-05-05 12:42:55 +02:00
jfefe
7e0357dcf9 FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
jfefe
53f480708f Merge branch 'develop' into api_restler 2015-05-03 23:43:13 +02:00
Laurent Destailleur
c485b1fe30 Fix When generation of doc is required and generator not provided, we
take first entry found.
2015-05-03 20:07:16 +02:00
jfefe
60d6cc5806 Modify search of API classes for module
A module can now bring several API classes.
By example, thirdparty module can have api_thirdparty.class.php for thirdparty and api_contact.class.php for contacts.

Classes must be named <Object>API (ie ThirdpartyApi or ContactApi)
2015-05-03 19:43:49 +02:00
jfefe
fa494369b8 New : API key authentication
One key is stored by user when login API method is called. Each API request must have api_key parameter
2015-05-02 23:54:35 +02:00
jfefe
8027759304 Work on authentication 2015-05-02 18:14:51 +02:00
jfefe
65ff78f61a Don't expose API if module disabled 2015-05-02 15:31:21 +02:00
jfefe
23e423404b Add API htaccess file for Apache webserver 2015-05-02 15:25:48 +02:00
jfefe
d406830e06 NEW : add an explorer for REST API consultation & documentation 2015-05-01 16:13:58 +02:00
jfefe
30c901c266 Begin REST API implementation with thirdparty classes and methods needed.
Work in progress !
2015-05-01 16:12:30 +02:00
Laurent Destailleur
b619c64770 Fix #2713 2015-04-27 20:24:02 +02:00
Laurent Destailleur
2e05a4f1be Fix #2713 2015-04-27 03:21:55 +02:00
Laurent Destailleur
d5afff4388 Fix warnings when submitting a vote for a survey 2015-04-12 11:42:49 +02:00
aspangaro
d897139f25 Module member: move field note in note_private 2015-04-03 06:54:08 +02:00
aspangaro
6a0916b3fa Correct path 2015-03-26 21:03:56 +01:00
aspangaro
be0ab4c9b4 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-23 06:58:25 +01:00
Laurent Destailleur
2632b8e25b Update test page to prepare datatables architecture. 2015-03-22 21:26:13 +01:00
Laurent Destailleur
1a1959b52c Fix: Solve conflict with imgup and imgdown class use for sort fields and
to drag and drop lines.
2015-03-22 21:18:25 +01:00
aspangaro
c9d31dab3a Move module Dons in htdocs->donations 2015-03-19 05:41:13 +01:00
Laurent Destailleur
60a6d8789f Merge remote-tracking branch 'origin/3.7' into develop 2015-03-04 01:14:27 +01:00
Laurent Destailleur
7050ef6176 Fix parameter notolderthan was not effective 2015-03-02 17:56:37 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
aspangaro
c1069eea47 FIXED: Update licence to GPLv3 2015-02-23 22:04:01 +01:00
frederic34
925aa2039b Tooltip and cache for boxes 2015-01-23 10:51:12 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
e3f3956bed Sec: Bad security test 2015-01-14 19:11:56 +01:00
Laurent Destailleur
1d1970b5a1 Sec: Bad security test 2015-01-14 19:10:48 +01:00
Laurent Destailleur
fc78d632d3 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
Laurent Destailleur
48818ed2fd Fixed: Quick solution to solve problem of unknown payment amount for
online subscription.
2015-01-04 15:40:01 +01:00
Laurent Destailleur
ec0c7476fb Work on select2 prototype. 2014-12-07 23:51:36 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
aspangaro
ef991e6c5d HTML5 - <center> is deprecated - Need CSS - continue working 2014-11-24 06:43:15 +01:00
Laurent Destailleur
1c1e2ed246 Better comment 2014-11-23 13:19:28 +01:00
Laurent Destailleur
76b8ff9416 Fix: css 2014-11-20 11:34:43 +01:00
Laurent Destailleur
d4ad7236e5 Clean old code for multiselect (replaced with select2 plugin). 2014-11-16 00:46:27 +01:00
Laurent Destailleur
a46a6cccaf Fix: Screen page tests. Page tests are now ok with 3.7. 2014-11-15 00:57:31 +01:00
Laurent Destailleur
a3ab22e27d Fix: css 2014-11-15 00:16:59 +01:00
Laurent Destailleur
8d964e03d2 Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into
AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php
2014-10-30 18:19:13 +01:00
Raphaël Doursenaud
f01e76f686 Removed unmaintaned OScommerce module 2014-09-29 15:22:48 +02:00
aspangaro
7a9ce455d9 Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +02:00
Juanjo Menent
dc46d59d68 Fix: Unsubscribe emailing not working 2014-09-01 18:26:24 +02:00
Laurent Destailleur
1c39e7ecbd Fix: Bad param 2014-08-01 17:11:18 +02:00
Laurent Destailleur
bcd441cc1e Fix: Bad url for cron
Fix: must use html syntax, not xml
2014-07-28 20:30:31 +02:00
Laurent Destailleur
709bf20deb Work on prootype for using datatable. 2014-07-27 20:31:11 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Laurent Destailleur
4c3c62515d Fix: Confusion between is_int and is_numeric. 2014-06-09 15:21:20 +02:00
Florian HENRY
77a9d4eb71 Start fix [ bug #1437 ] Securitu Issue
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
2014-06-09 12:34:10 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
3122944ab7 Fix: Email html format was missing br. 2014-05-07 10:05:32 +02:00
Laurent Destailleur
63100c9c06 Properties "civilite_id" were renamed into "civility_id". 2014-05-05 00:23:09 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
b117ea83be Fix: missing trans
Fix: detection of html content
2014-04-25 16:45:14 +02:00
Laurent Destailleur
76b5659d4c Optimize for small screen 2014-04-22 00:04:31 +02:00
Laurent Destailleur
918de2d0a1 Fix: Payment detail are not visible. 2014-04-11 19:20:11 +02:00
Laurent Destailleur
b77e068a72 New: More information into email confirm for paybox payment. 2014-04-06 15:01:45 +02:00
Laurent Destailleur
2be6b2ecf7 Fix: var not initialized 2014-04-06 14:53:42 +02:00
Laurent Destailleur
6cb39ea3dc Fix: Missing message keys 2014-04-06 14:49:04 +02:00
Laurent Destailleur
d595b96c8e New: Paypal return for subscription show more information and direct
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
2014-04-06 14:22:08 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
2014-03-31 00:44:45 +02:00
Laurent Destailleur
61f649e1ae Fix: When select_date is called with '' as preselected date,
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
2014-03-29 04:26:44 +01:00
Gregory DAVID
3a053e3fed Donne la possibilité de faire un filtrage sur les agenda en fonction du numéro de projet passé en GET : &project=XX 2014-02-07 18:08:25 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
3efd44fd28 Fix: Enabled in dev mode only 2014-01-26 23:23:36 +01:00
Laurent Destailleur
1bdeb171c7 Fix: Missing class 2014-01-26 01:33:16 +01:00
Laurent Destailleur
bc51065ff1 New: For paypal payment confirmation, send email ok only if payment is
confirmed. Otherwise send ko email.
2014-01-07 17:35:33 +01:00
Laurent Destailleur
58bc3b1457 New: For paypal payment confirmation, send email ok only if payment is
confirmed. Otherwise send ko email.
2014-01-07 17:34:25 +01:00
Laurent Destailleur
267716b557 Just a space between default message and setup message 2014-01-07 16:53:07 +01:00
Laurent Destailleur
6e5f3b8bdd Fix: entity into public pages not set at correct place 2014-01-07 16:29:25 +01:00
Laurent Destailleur
1df18f1e93 Fix: Function GETPOST not found 2014-01-07 16:11:08 +01:00
Laurent Destailleur
9a6f22a86e Fix: W3C no form into table.
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
2014-01-05 15:46:39 +01:00
Laurent Destailleur
e142bd252d Fix: disable code making jmobile crazy. 2013-12-31 10:48:15 +01:00
Laurent Destailleur
5cd6c05384 Fix: Uniformize amounts 2013-12-14 00:31:29 +01:00
Laurent Destailleur
c51fa7048c Fix: text must not be encoded when provided as data of a function. 2013-12-13 21:12:18 +01:00
Laurent Destailleur
adf55408a4 Fix: Bad parameter that duplicate info. 2013-12-07 03:23:14 +01:00
Laurent Destailleur
6c7e173bba Fix: jmobile broken with css tagtable, tagtr and tagtd 2013-12-02 22:31:02 +01:00
Laurent Destailleur
2b63fd67b5 Minor fix in cron feature 2013-11-18 11:42:28 +01:00
Maxime Kohlhaas
2b74f03eb6 Fix : column name changed 2013-11-08 16:24:03 +01:00
Laurent Destailleur
c81bb60384 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/public/cron/cron_run_jobs.php
2013-10-27 02:33:03 +02:00
Laurent Destailleur
656bf480ac Fix: look with jmobile 2013-10-27 00:04:57 +02:00
Laurent Destailleur
e34ff88bc0 Fix: more complete prototype page 2013-10-26 21:17:18 +02:00
Laurent Destailleur
ec576c91cc Enhance prototype for tables 2013-10-21 13:43:31 +02:00
Laurent Destailleur
bd06ee1abe Prototyping for other table outputs (div or datatable) 2013-10-17 18:37:08 +02:00
jfefe
ef4d3e4666 Fix : use GETPOST function into CRON module 2013-10-15 21:07:11 +02:00
Laurent Destailleur
065c87d81c Qual: uniformize code: property ->tel on objects is now ->phone
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
9da5f7f47a Qual: Doxygen 2013-08-22 16:49:23 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
e234d5342d Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Florian Henry
4d3738410e update no_email column on unsubcribe link for contact 2013-07-30 15:18:19 +02:00
Laurent Destailleur
f12680e7c4 Save page with some test and prototypes. 2013-06-30 22:11:25 +02:00
Laurent Destailleur
2d0a85d6f8 New: Add option to send email when paypal or paybox payment is done. 2013-06-25 13:19:44 +02:00
Laurent Destailleur
7f3a06127a Fix: Bad regex 2013-06-24 19:55:23 +02:00
Regis Houssin
4cd6ae6bbd Fix: convert lines delimiters 2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
ec2e3db450 New: Switch cron module to status stable. Thanks to everybody to test
this new module and debug it.
2013-06-23 22:21:21 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
7d2f904174 Fix: Option MEMBER_PAYONLINE_SENDEMAIL was not working 2013-06-09 12:47:44 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/core/class/infobox.class.php
2013-06-04 22:59:28 +02:00
Laurent Destailleur
b1a280de32 Fix: error message 2013-06-03 23:11:36 +02:00
Laurent Destailleur
8fe45b1af6 Manifest usage is useless for a dynamic application like dolibarr. 2013-05-21 14:41:11 +02:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
2013-05-02 17:41:10 +02:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
fhenry
b9f7d4c302 Fix bug on invoice extrafield type date 2013-04-26 12:20:15 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
56a0f70ad3 Fix: margin disabled into demo for foundation 2013-04-19 10:33:25 +02:00
Laurent Destailleur
a4073dddd4 Doxygen llxHeader and llxFooter. 2013-04-15 15:43:25 +02:00
Laurent Destailleur
0e073038ad Fix: Check on correct security key 2013-04-14 20:59:16 +02:00
Laurent Destailleur
f028cce39d Qual: More log 2013-04-14 20:43:38 +02:00
Laurent Destailleur
de9f100968 Fix: check read feature 2013-04-14 20:34:31 +02:00
Laurent Destailleur
3cec5bfc40 doxygen 2013-04-14 11:22:00 +02:00
Laurent Destailleur
b86eba7f34 doxygen 2013-04-14 10:50:33 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
fhenry
2440513007 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/opensurvey/fonctions.php
	htdocs/opensurvey/public/choix_date.php
	htdocs/opensurvey/public/create_survey.php
	htdocs/opensurvey/public/exportcsv.php
	htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
2013-04-11 10:04:27 +02:00
Laurent Destailleur
76c180aaaf Fix: encoding at wrong place 2013-04-10 23:13:55 +02:00
Laurent Destailleur
d570aa02d4 Fix: bad url 2013-04-10 23:11:21 +02:00
Laurent Destailleur
3bcd506e73 Fix: demo modules list 2013-04-10 23:06:38 +02:00
fhenry
98ddd02a32 Qual : PHP Code_Sniffer 2013-04-10 19:55:21 +02:00
Laurent Destailleur
ba93a4bfe2 Fix: Codesniffer 2013-04-10 12:20:45 +02:00
Laurent Destailleur
25ec7eed6d New: Can send email to warn when payment for subscription is payed. 2013-04-06 16:14:28 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
c3589e9785 Some debug into cron module:
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
2013-03-23 19:23:17 +01:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00
Grand Philippe
e1baf806b9 change birth instead of naiss 2013-03-13 22:17:03 +01:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
b43fffafa9 Fix: Regression after renaming of fields 2013-03-08 01:31:45 +01:00
Laurent Destailleur
1d76b3153e Start to work onto payment return 2013-02-28 17:37:07 +01:00
Grand Philippe
44dee53350 english language standardization 2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
4f9f32eb3e english language standardization 2013-02-23 16:37:17 +01:00
Grand Philippe
9400d9897a english standardization 2013-02-23 10:35:46 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Laurent Destailleur
fa2e9cbd4f Exclude external modules 2013-01-24 10:06:39 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Cedric GROSS
ff3231045b Fix: A better fix for escaping data: escape for database must be done
during sql request forging. Also renamed tag to tag.

Merge:
Security fix emailing read and
unsubscribe

unsubscribe can lead to email disclosure

Conflicts:
	htdocs/public/emailing/mailing-unsubscribe.php
2013-01-04 18:08:34 +01:00
Laurent Destailleur
86645d8be9 Fix: Field birthday must be hidden for moral members 2013-01-04 00:23:46 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
1722d58196 Fix: Selection of choice in demo page 2012-12-28 22:05:36 +01:00
Laurent Destailleur
5cf07a214c Fix: Close db at wrong place 2012-12-16 19:42:58 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Regis Houssin
5f41174cfa Fix: bad path for photo and uniformize code 2012-12-13 11:42:59 +01:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Laurent Destailleur
2c2465ffad Comment to make test 2012-12-12 13:14:28 +01:00
Laurent Destailleur
caf897cfa7 Clean code to help debug pb with payment methods. 2012-12-12 01:49:23 +01:00
Laurent Destailleur
e53f6a383d Fix: Removed a hard coded error code. 2012-11-20 11:23:34 +01:00
fhenry
e12999bcfd Correct fix 2012-11-06 15:39:47 +01:00
fhenry
3651b8895e Fix bug on mass mailling unsubsscribe fonctionnality 2012-11-06 14:21:17 +01:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Laurent Destailleur
29b4e1f57a Removed not available module from demo 2012-09-13 09:19:45 +02:00
Laurent Destailleur
41078019dd Make demo of foundation at end 2012-09-12 17:24:39 +02:00
Laurent Destailleur
0cf89eac08 Doxygen 2012-09-08 02:17:08 +02:00
Regis Houssin
ee1cf819f7 Fix: mass convert line delimiters 2012-09-07 17:23:16 +02:00
Laurent Destailleur
26b05212c7 Fix: Missing include 2012-08-28 09:33:43 +02:00
Laurent Destailleur
bdaaa1d038 New: [ task #494 ] Send an email to foundation when a new member has
auto-subscribed
2012-08-26 22:33:27 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
cc4d5ff8d8 Removed the use of duplicated key translations
Nature is now being used instead of MorPhy
UserTitle is now being used instead of Civility
VATIntraVeryShort was being used were not necessary
2012-08-15 18:55:32 +02:00
Marcos García
3e1e508bf3 Fixed bug #485
Merged patch from J. Fernando Lagrange (lowmemory)
https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144
2012-08-14 09:57:03 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
57c8797459 Fix: Subscription must use company name when type is "moral" 2012-05-28 22:09:36 +02:00
Laurent Destailleur
0cbe83aaed Fix: W3C 2012-05-16 12:33:10 +02:00
Laurent Destailleur
5541c2b693 Fix: Exclude nltechno modules from demo 2012-05-13 19:13:41 +02:00
Regis Houssin
fb2cd3d842 Fix: more compatibility with multicompany 2012-05-09 12:45:19 +02:00
Regis Houssin
12b6d6c0ef Fix: MultiCompany compatibility for public page 2012-05-04 13:21:00 +02:00
FHenry
5ed77c8d40 Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to
MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation
2012-04-22 11:19:04 +02:00
Laurent Destailleur
2670f356f1 Fix: no mainmenu nor leftmenu into public pages 2012-04-18 13:04:05 +02:00
Laurent Destailleur
9114fec4ed Doxygen 2012-04-16 12:01:32 +02:00
Laurent Destailleur
0438bee3e2 Fix: Bad name 2012-04-05 21:03:47 +02:00
Laurent Destailleur
befaf655aa Fix: Disable feature by default. Need option MAIN_SOCIETE_UNSUBSCRIBE to
enable because feature is a security hole.
2012-04-05 21:02:00 +02:00
FHenry
6d9d0c60e2 . 2012-04-05 16:50:00 +02:00
Laurent Destailleur
5e4af76585 Fix: Add cache directive for all export types 2012-04-04 17:42:50 +02:00
FHenry
5bfff3920f Module e-maillling : Correctif et evolution Accusé de lecture et
desinscription
2012-04-04 15:23:32 +02:00
FHenry
872f580b37 Just comment and Log change 2012-04-03 23:03:26 +08:00
Laurent Destailleur
2eced65db9 Fix: Use cache only if we ask it 2012-04-03 16:41:39 +02:00
Raphaël Doursenaud
55fbbc85a5 Agenda export: Tweaked HTTP headers for Google Agenda import 2012-04-03 17:27:48 +08:00
Laurent Destailleur
5ba7d88c36 Fix: Error when url is too long 2012-04-02 13:28:22 +02:00
Laurent Destailleur
96b369e9db Fix: Duplicate fields 2012-04-02 13:10:22 +02:00
Laurent Destailleur
58e35b307c New: Add option MEMBER_MIN_AMOUNT to force subscription never lower than
value
2012-04-02 12:32:55 +02:00
Laurent Destailleur
12b580a979 Update the about page. 2012-03-10 13:52:08 +01:00
Laurent Destailleur
6059cc64cf Trans 2012-03-10 13:39:17 +01:00
Laurent Destailleur
708561b51a Qual: Move hard coded styles into CSS id/class. 2012-03-10 01:07:35 +01:00
Regis Houssin
727a18fde5 Fix: use new default variable 2012-03-08 14:17:08 +01:00
Regis Houssin
a56a3946a4 Fix: clean parameters 2012-03-07 14:21:49 +01:00
Laurent Destailleur
e45bbb622a Fix: Some fix and uniformize code for extra parameters. 2012-03-04 01:09:39 +01:00
Regis Houssin
9301def08d Fix: rename method 2012-03-02 15:03:14 +01:00
FHenry
0cf4619682 Emailing campaign- unsubcribe and use of md5 tag 2012-03-01 14:51:07 +01:00
Regis Houssin
ffc492ba1f Fix: security 2012-02-28 19:18:24 +01:00
Regis Houssin
8f9b9987ff Fix: Multiple directory traversal vulnerabilities with document.php 2012-02-27 17:02:56 +01:00
FHenry
229176ea65 Read Receipt in module emailing 2012-02-22 20:49:55 +01:00
Laurent Destailleur
f0af1258e3 Fix: Autosubmit form is working again 2012-02-19 01:46:00 +01:00
Regis Houssin
5d89d5d734 Fix: add warning message for sandbox mode 2012-02-16 11:52:38 +01:00
Laurent Destailleur
f161d185b3 Update demo profiles 2012-02-11 01:48:27 +01:00
Laurent Destailleur
4909504b0a Work to add new demo profiles 2012-01-27 12:19:37 +01:00
Laurent Destailleur
491d3dd5b0 Always disable module mailmanspip on demo. 2012-01-26 00:19:27 +01:00
Laurent Destailleur
f32733b1df Move NumberWord module translation into module. 2012-01-25 23:16:17 +01:00
Laurent Destailleur
47c83603f4 Qual: normalize code 2012-01-22 20:33:45 +01:00
Laurent Destailleur
72ef573190 Fix: Bad currency 2012-01-19 23:15:44 +01:00
Laurent Destailleur
d9aa0c4b28 Qual: Normalize field names 2012-01-19 22:20:28 +01:00
Laurent Destailleur
2d67802938 Doxygen 2012-01-08 00:52:07 +01:00
Laurent Destailleur
be0d4dbac1 Doxygen 2012-01-04 14:12:00 +01:00
Laurent Destailleur
7688e44b2a Uniformize field country_id, country_code, country 2011-12-29 18:34:56 +01:00
Laurent Destailleur
c2348ef600 Uniformize field country_id, country_code, country 2011-12-29 18:07:41 +01:00
Laurent Destailleur
c1658da5d8 Fix: Removed deprecated attributes 2011-12-05 01:03:17 +01:00
Laurent Destailleur
e6f3599847 Qual: Some code cleaning 2011-12-04 22:25:49 +01:00
Laurent Destailleur
f3191e0979 New: Add product desc into paypal payment page 2011-11-30 18:48:04 +01:00
Laurent Destailleur
0316aebee8 Fix: Can use paypal several time for same member 2011-11-30 15:14:46 +01:00
Laurent Destailleur
839781dfbe Qual: Removed a TODO by renaming all ->monnaie into ->currency 2011-11-23 14:55:36 +01:00
Laurent Destailleur
afaae396a4 Fix: Form to create member online 2011-11-20 02:10:55 +01:00
Regis Houssin
f0c327c070 Fix: uniform code
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Regis Houssin
dea1210c2d Fix: edit in place datepicker more stable 2011-10-28 19:31:42 +02:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
Regis Houssin
c65238b773 [task #216] Move lib in core directory 2011-10-24 10:45:06 +02:00
Laurent Destailleur
43bd6e1ea8 Fix: Removed deprecated function 2011-10-22 15:55:08 +02:00
Laurent Destailleur
c6a380d5b6 New: Mutualize footer code 2011-10-18 16:40:44 +02:00
Laurent Destailleur
f1e36331ea New: Add webservice user 2011-10-18 16:26:40 +02:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Regis Houssin
b50f9867e8 Fix: include security.lib.php by default 2011-09-06 07:41:14 +00:00
Regis Houssin
6d8584f5ca Fix: Use the source in the hash to avoid duplicates if the references are identical
Fix: Use sha1 + md5 for more security
2011-09-06 06:28:18 +00:00
Laurent Destailleur
ac5b36a797 Fix: Bad link 2011-09-05 21:37:05 +00:00
Laurent Destailleur
225560dbb4 Doxygen 2011-09-05 11:24:50 +00:00
Laurent Destailleur
3e0afcd8fc Fix: Bad link 2011-09-05 21:37:05 +00:00
Laurent Destailleur
02a94a0c82 Fix: Bad alignement 2011-09-05 11:16:01 +00:00
Laurent Destailleur
78efe00c81 Fix: Bad link 2011-09-05 21:37:05 +00:00
Juanjo Menent
6f41f0473c Add russian prod id 2011-09-05 13:31:59 +00:00
Laurent Destailleur
4c3ae34e3f Fix: Bad link 2011-09-05 21:37:05 +00:00
Juanjo Menent
b002c80040 Add russian prod id 2011-09-05 13:31:59 +00:00
Laurent Destailleur
26715e4997 Fix: Bad link 2011-09-05 21:37:05 +00:00
Laurent Destailleur
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Laurent Destailleur
f47e80dca1 Fix: W3C 2011-08-31 14:55:54 +00:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Laurent Destailleur
9f663d5677 Qual: Clean code 2011-08-20 15:11:31 +00:00
Laurent Destailleur
048eab3eb8 Fix: Bad doxygen description 2011-08-08 16:00:16 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Laurent Destailleur
91c7a14fa4 Fix: Message for payment forms 2011-07-13 12:03:30 +00:00
Laurent Destailleur
b08fda6181 Fix: Message for payment forms 2011-07-13 12:00:18 +00:00
Laurent Destailleur
bf93cd6466 Fix: Message for payment forms 2011-07-13 11:56:36 +00:00
Laurent Destailleur
3349c2bfef Fix: Direct payment from autosubscribe form was showing wrong text. 2011-07-13 11:42:39 +00:00
Laurent Destailleur
fb92986d65 Fix: Message for payment forms 2011-07-13 11:14:43 +00:00
Laurent Destailleur
f977b315bf Fix: Only one message 2011-07-13 10:22:54 +00:00
Regis Houssin
f5c414ec4b Fix: regression 2011-07-08 18:19:31 +00:00
Regis Houssin
7d05be543b Fix: regression 2011-07-08 18:08:27 +00:00
Regis Houssin
704993fbdf New: add Paypal IPN
Todo: add translation
2011-07-08 08:30:49 +00:00
Laurent Destailleur
6c5919b2fd Check parameters 2011-07-05 08:33:34 +00:00
Laurent Destailleur
6582b4df4a Translate submit form 2011-07-05 08:29:53 +00:00
Laurent Destailleur
7f083a0be3 Work on specific code to allow online subscription 2011-07-03 18:30:48 +00:00
Laurent Destailleur
f70ffc0faf Work on specific code to allow online subscription 2011-07-03 17:46:16 +00:00
Laurent Destailleur
4cbc9b3855 Work on specific code to allow online subscription 2011-07-03 17:45:33 +00:00
Laurent Destailleur
743a9b2aae Work on specific code to allow online subscription 2011-07-03 17:38:52 +00:00
Laurent Destailleur
efb7e24f5a New: Can edit options of autosubscribe form for member module 2011-07-03 17:24:54 +00:00
Laurent Destailleur
a6d17032c3 New: Can edit options of autosubscribe form for member module 2011-07-03 17:23:12 +00:00
Laurent Destailleur
e626d331a0 New: Can edit options of autosubscribe form for member module 2011-07-03 16:55:31 +00:00
Laurent Destailleur
503ff66100 New: Can edit options of autosubscribe form for member module 2011-07-03 16:00:18 +00:00
Laurent Destailleur
c4d244d5ce New: Enhance form to post a new member 2011-06-26 21:51:34 +00:00
Laurent Destailleur
63ae96c421 New: Enhance form to post a new member 2011-06-26 19:29:39 +00:00
Laurent Destailleur
096145d465 New: Enhance form to post a new member 2011-06-26 18:53:17 +00:00
Laurent Destailleur
4d65503352 New: Enhance form to post a new member 2011-06-26 18:53:16 +00:00
Laurent Destailleur
67dd5c16ba Removed useless field 2011-06-26 12:34:54 +00:00
Juanjo Menent
56f03a6f9c Add option ADHERENT_LOGIN_NOT_REQUIRED 2011-06-22 08:11:46 +00:00
Regis Houssin
433667b6c6 Fix: create a standalone class 2011-06-20 10:23:51 +00:00
Regis Houssin
3dfeabb35b Fix: bugfix 2011-06-20 06:58:42 +00:00
Laurent Destailleur
6ceea92eea New: Member module use generic extrafields feature. 2011-06-19 14:27:06 +00:00
Juanjo Menent
8245733e17 Missing trad 2011-06-17 16:22:25 +00:00
Juanjo Menent
c3b293a9bf Missing trad 2011-06-17 16:11:12 +00:00
Juanjo Menent
8a133a8348 Missing trad 2011-06-17 15:52:05 +00:00
Regis Houssin
9428c5d6ae Works on enhancement of paypal module
New: add triggers for post treatment
New: possibility to add payment link to email
2011-06-17 10:30:23 +00:00
Regis Houssin
2b70e828fa Works on enhancement of paypal module
New: add triggers for post treatment
New: possibility to add payment link to email
2011-06-17 10:21:21 +00:00
Laurent Destailleur
8231a6276b Conflict with id 2011-05-24 08:31:55 +00:00
Laurent Destailleur
f4ff252b2e Exclude concatpdf 2011-05-24 08:15:07 +00:00
Regis Houssin
b6be7472c3 Works on enhancement of paypal module 2011-05-04 08:39:17 +00:00
Regis Houssin
8c571546a5 New: add function dol_hash 2011-05-03 10:53:44 +00:00
Regis Houssin
3dbd183e66 Fix: use "securekey" instead "token"
Fix: check secure key if defined
2011-05-03 10:19:47 +00:00
Regis Houssin
10b536603a Works on enhancement of paypal module 2011-05-02 17:08:50 +00:00
Laurent Destailleur
179eaa05c4 Add more log 2011-04-17 09:46:50 +00:00
Laurent Destailleur
48f28a1ab8 Fix: Date conversion 2011-04-10 23:02:54 +00:00
Laurent Destailleur
011f1db637 Update demo modules 2011-03-28 08:12:16 +00:00
Laurent Destailleur
f376663bd3 Fix: Bad variable 2011-03-13 16:21:56 +00:00
Laurent Destailleur
2148060cec Fix: Bad url 2011-03-12 16:36:45 +00:00
Laurent Destailleur
e9e159b27f Fix: Module not disabled 2011-02-25 19:02:28 +00:00
Laurent Destailleur
3d9e7c732c Fix: Module not disabled 2011-02-25 18:31:37 +00:00
Laurent Destailleur
1799679a6b New: Can add analytics code into demo page 2011-02-20 16:49:37 +00:00
Laurent Destailleur
c93f349213 Add Google analytics tags into demo 2011-02-20 16:35:35 +00:00
Laurent Destailleur
3471cb0247 Fix: Bad link 2011-02-20 15:07:33 +00:00
Laurent Destailleur
fd31c191a4 Fix: Bad link 2011-02-20 15:05:47 +00:00
Laurent Destailleur
33dc0374bc Qual: Remove usage of deprecated properties 2011-02-20 11:52:23 +00:00
Laurent Destailleur
7d785d6878 Qual: Removed deprecated code 2011-02-20 00:53:58 +00:00
Laurent Destailleur
a8f9a9d0c6 New: a specialized menu is now used when using smartphones 2011-02-16 19:59:16 +00:00
Laurent Destailleur
e18a6e27ef Update demo profiles 2011-02-06 17:48:35 +00:00
Laurent Destailleur
eebc5a0a84 Fix: Missing translation 2011-01-10 00:09:31 +00:00
Laurent Destailleur
e94edf8cd8 Removed useless code 2010-12-20 12:16:31 +00:00
Laurent Destailleur
9a0de89827 Fix: Fix some bugs. There still a lot of new bugs to fix (like compatibility through proxy, or restore performance by avoiding huge number of file_exists). 2010-12-19 18:05:38 +00:00
Laurent Destailleur
b5e5dc3849 Fix: Fix regression by adding "custom" feature making web server hang in infinite loop. 2010-12-15 18:15:08 +00:00
Laurent Destailleur
39479397cc Comments 2010-12-15 17:40:57 +00:00
Laurent Destailleur
1f0123cf25 Fix: rename version num with "latest" expression 2010-12-14 23:52:34 +00:00
Laurent Destailleur
2498426867 Fix: Restore stable version for 3.0 2010-12-14 23:27:17 +00:00
Regis Houssin
ec73198bf5 Fix: rename version num with "latest" expression 2010-12-14 17:40:52 +00:00
Laurent Destailleur
f2fb89ef5b Do not show dev modules 2010-12-03 01:20:16 +00:00
Laurent Destailleur
c401d73575 Fix: Update jquery 2010-12-03 01:15:05 +00:00
Laurent Destailleur
75174ecc62 Restore work lost by savannah backup 2010-12-01 21:38:00 +00:00
Laurent Destailleur
e3f455899b New: Support "fulday" event in calendar module 2010-11-21 16:11:52 +00:00
Laurent Destailleur
f5a37a3837 Fix: Security hole 2010-11-21 14:43:08 +00:00
Laurent Destailleur
7df2187489 Fix: Security hole 2010-11-21 14:35:39 +00:00
Laurent Destailleur
984d6e12a2 Fix: Minor fix in paypal and paybox modules 2010-11-21 13:55:18 +00:00
Laurent Destailleur
e59ccde5b0 Doxygen 2010-11-20 18:40:14 +00:00
Laurent Destailleur
adfb9ea341 Sec: Removed security holes 2010-11-20 13:08:44 +00:00
Laurent Destailleur
770bdefc54 New: Support "fulday" event in calendar module 2010-11-19 23:50:27 +00:00
Laurent Destailleur
ad2b5f6449 Fix: Restore backward compatibility with old modules 2010-11-02 12:03:47 +00:00
Laurent Destailleur
e604d48519 New: Work on paypal module (finished) 2010-11-01 14:11:36 +00:00
Laurent Destailleur
717ae6d9c1 New: Work on paypal module (finished) 2010-11-01 13:15:06 +00:00
Laurent Destailleur
cc02778a69 New: Work on paypal module (finished) 2010-11-01 12:41:32 +00:00
Laurent Destailleur
b283d28fd5 Work on paypal module 2010-10-31 20:34:13 +00:00
Laurent Destailleur
c96915b3ce Fix: Pb with autocompletefor records with no country and state 2010-10-31 20:09:50 +00:00
Laurent Destailleur
5ba2e98adc Work on paypal module 2010-10-31 18:57:11 +00:00
Laurent Destailleur
ed5f35d0f5 Work on paypal module 2010-10-31 15:06:26 +00:00
Laurent Destailleur
e0f2520647 Work on paypal module 2010-10-31 13:29:33 +00:00
Laurent Destailleur
84534c036b Work on paypal 2010-10-11 19:36:34 +00:00
Laurent Destailleur
d7ee5ee5ac Work on paypal module 2010-10-10 19:14:08 +00:00
Laurent Destailleur
5497bfc1bb Work on paypal module 2010-10-03 23:20:49 +00:00
Laurent Destailleur
aa34a9c6dc Work on paypal module 2010-10-03 18:16:14 +00:00
Laurent Destailleur
2ab7e6c142 UTF8 2010-10-02 10:48:28 +00:00
Laurent Destailleur
7a2d72b6fd New: Can import members using assistant 2010-10-01 23:37:36 +00:00
Laurent Destailleur
0de3bff0b7 Qual: Menu management is simpler (no difference between left and top in setup). 2010-09-29 10:10:33 +00:00
Laurent Destailleur
92778276da Can have more personalized demo 2010-09-29 07:32:09 +00:00
Laurent Destailleur
9fe27f6ccf New: Work to have a more personalized demo 2010-09-28 21:28:28 +00:00
Philippe Grand
b6d0f859af task #6689, strlen problem
replace  strlen with dol_strlen
2010-08-24 19:51:56 +00:00
Laurent Destailleur
8fa175f3e9 Fix: Restore feature broken with renaming 2010-08-19 20:29:55 +00:00
Laurent Destailleur
f3bedb2ddc Add option to help debug of ical export 2010-08-19 19:30:17 +00:00
Regis Houssin
2c4a56771f Fix: $optiontype not used
Fix: select_array is deprecated
2010-08-19 15:20:25 +00:00
Laurent Destailleur
98a4430d5f Better postgresql compatibility 2010-08-14 02:44:07 +00:00
Regis Houssin
aa62559812 Fix: fetch_client is deprecated 2010-08-06 13:56:25 +00:00
Laurent Destailleur
fc2213a8f1 Doxygen 2010-07-21 12:35:56 +00:00
Laurent Destailleur
87ce3073d5 Doxygen 2010-07-21 11:57:52 +00:00
Laurent Destailleur
c7177d3f24 Fix: Wrong URL. 2010-07-19 20:40:03 +00:00
Laurent Destailleur
29536ecbd8 Fix: Use correct order of firstname and lastname. 2010-07-18 10:39:07 +00:00
Laurent Destailleur
7d447588cc Reorganise how theme works. Style sheet must be named style.css.php. 2010-06-25 19:52:11 +00:00
Laurent Destailleur
6dc8d0e390 Reorganize class files. 2010-06-05 15:20:09 +00:00
Laurent Destailleur
ad92ef19c4 Fix: Export ical was broken 2010-05-27 19:26:43 +00:00
Laurent Destailleur
8c0a14fa6d New: Can set a past delay to limit calendar export 2010-05-22 09:50:32 +00:00
Laurent Destailleur
e4bba520f7 Now fetch for User class use id like other classes. 2010-05-05 17:36:20 +00:00
Philippe Grand
32025de202 according to new tree directory 2010-05-03 08:22:35 +00:00
Philippe Grand
b65ddfabe8 according to new tree directory 2010-04-28 21:29:12 +00:00
Philippe Grand
faf19c91ae according to new tree directory 2010-04-28 08:35:57 +00:00
Philippe Grand
009b251d52 according to new tree directory 2010-04-27 08:13:42 +00:00
Philippe Grand
c418128a07 according to new tree directory 2010-04-25 14:17:39 +00:00
Philippe Grand
ae2445389e according to new tree directory 2010-04-25 13:03:14 +00:00
Philippe Grand
7d88487c80 according to new tree directory 2010-04-25 10:50:09 +00:00
Regis Houssin
3268dcbab8 Fix: missing google ad 2010-04-18 14:43:47 +00:00
Philippe Grand
57ae19fc71 Move file actioncomm.class.php to comm/action directory 2010-04-01 07:51:59 +00:00
Philippe Grand
3ce3c74ba7 Move facture class file to compta/facture directory 2010-03-26 15:45:01 +00:00