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

1051 Commits

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