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

818 Commits

Author SHA1 Message Date
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