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

1889 Commits

Author SHA1 Message Date
Regis Houssin
4f4829ea70 FIX missing user get rights 2021-03-08 11:33:37 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
3cfcad284b Fix unsubscribe to MLs 2021-03-05 17:48:55 +01:00
Laurent Destailleur
1cd822bd75 Fix DOS attack on emailings wrappers 2021-03-05 14:54:17 +01:00
Frédéric FRANCE
883faf6f43
Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-02 08:13:33 +01:00
Laurent Destailleur
d6b81b21f1 fix phpcs 2021-03-02 03:03:41 +01:00
Laurent Destailleur
592dacd849 Fix phpcs 2021-03-02 02:45:39 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Frédéric FRANCE
b54d9751f5
Merge remote-tracking branch 'upstream/develop' into fixmerge 2021-03-01 21:19:39 +01:00
Laurent Destailleur
d4512c48cd Fix regression 2021-03-01 21:11:55 +01:00
Frédéric FRANCE
a5974bcf57
fix merge 2021-03-01 21:10:06 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
 2021-03-01 15:48:30 +01:00
Laurent Destailleur
a68721c5b4 Fix missing translation 2021-03-01 10:58:06 +01:00
Laurent Destailleur
c80151717e Fix set of payment 2021-03-01 10:45:37 +01:00
Laurent Destailleur
0796bc45b1 Fix amount for some language on public payment page 2021-03-01 10:39:27 +01:00
Laurent Destailleur
0a0c7fdeb1 FIX hourglass and hide button to pay 2021-02-28 21:15:40 +01:00
Frédéric FRANCE
df6650241d
code syntax public dir 2021-02-26 18:58:34 +01:00
Laurent Destailleur
f7c119e48c Fix json decode 2021-02-24 13:02:36 +01:00
Laurent Destailleur
22208b622f WIP Add lead 2021-02-24 12:55:24 +01:00
Laurent Destailleur
ebb4f03788 Prepare public page for autocreate contact-lead 2021-02-24 12:19:28 +01:00
Laurent Destailleur
566a0ba785 Code comment 2021-02-24 11:42:55 +01:00
Laurent Destailleur
4f1f17fedc Fix GETPOST instead of POST 2021-02-24 11:37:20 +01:00
Laurent Destailleur
ade5d98d56 Rename script to run cron by url to avoid confusion with script from cli 2021-02-20 17:03:27 +01:00
Laurent Destailleur
3d1dfccc1d More robust code 2021-02-19 18:12:15 +01:00
Laurent Destailleur
069cf46f16
Merge pull request #16347 from andreubisquerra/master 
NEW Can use captcha on public page to create ticket
 2021-02-19 18:07:25 +01:00
Laurent Destailleur
0f38b189df Fix test pages 2021-02-19 15:46:59 +01:00
Laurent Destailleur
e9f9c46cd6 Clean code. Fix nojs=1 2021-02-19 15:37:42 +01:00
Laurent Destailleur
efb32c7d0b Fix test pages 2021-02-19 15:06:36 +01:00
Laurent Destailleur
017b57f18c Code comment 2021-02-19 14:43:03 +01:00
Laurent Destailleur
33c81f3791 Limit DOS 2021-02-19 14:38:43 +01:00
andreubisquerra
6e7fd67f37
Fix travis 2021-02-18 19:27:50 +01:00
andreubisquerra
b8fabd90f8 NEW Use captcha on public page to create ticket 2021-02-18 19:02:16 +01:00
Laurent Destailleur
8b930cbe5e FIX Missing cache declaration into manifest.json.php 
Move test files into test.
 2021-02-17 14:22:01 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
ptibogxiv
89219a37a6
Fix stripe Payment method delete 2021-01-23 13:24:00 +01:00
Laurent Destailleur
d1af419d02 More log to debug payment errors 2021-01-21 11:50:15 +01:00
Laurent Destailleur
c112c807ac Fix action after payment on member registration 2020-12-18 19:53:33 +01:00
Laurent Destailleur
dc9ac9d298 Fix missing error message 2020-12-18 16:31:32 +01:00
Laurent Destailleur
c850f4c918 Fix fatal error 2020-12-10 16:01:06 +01:00
Laurent Destailleur
89828c18d1 CSS 2020-12-09 12:32:21 +01:00
Laurent Destailleur
7459607eb9 Look fix 2020-12-09 12:23:37 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
b3e03c6991 Fix css for public pages 2020-11-14 18:11:46 +01:00
Laurent Destailleur
0962c79c3e Update link poweredby 2020-11-09 14:45:40 +01:00
Laurent Destailleur
26b8e8d2bf More logs 2020-11-08 18:52:26 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Laurent Destailleur
1a818635b3 Add nofollow on some links 2020-11-07 13:01:35 +01:00
Laurent Destailleur
b386faebd8 Add noopenenr on links to dolibarr website 2020-11-07 12:49:38 +01:00
Laurent Destailleur
62ba731823 Fix the follow/nofollow was not propagated 2020-11-07 12:47:42 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
c918acaadc Doc 2020-10-26 19:37:30 +01:00
CHABANE HADJER
e7e8a91b13
Adding Payzen payment module hooks. 2020-10-26 16:38:11 +01:00
Laurent Destailleur
36854b0af4
Merge pull request #15123 from frederic34/patch-8 
fix unknown function
 2020-10-25 14:51:42 +01:00
Laurent Destailleur
80bbec7aeb
Merge pull request #15122 from frederic34/publicmember 
add hook on public new member card
 2020-10-25 14:51:14 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
167430137f
Merge pull request #15134 from frederic34/public_ticket 
add hook on public new ticket
 2020-10-25 14:33:46 +01:00
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
8e77ac4eb0
fix empty array 2020-10-24 13:28:38 +02:00
Frédéric FRANCE
302fb6defa
add hook on public new ticket 2020-10-24 13:17:23 +02:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
345015ece2
fix unknown function 2020-10-23 19:54:45 +02:00
Frédéric FRANCE
76a0eba1a0
add hook on public new member card 2020-10-23 18:49:06 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
66744658a2
Merge pull request #14966 from hregis/12_bug 
FIX Multicompany compatibility (missing entity value)
 2020-10-08 19:26:49 +02:00
Regis Houssin
aa84b76b6a FIX Multicompany compatibility (missing entity value) 2020-10-08 11:43:12 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
 2020-10-01 19:43:23 +02:00
ptibogxiv
676d70d86d
FIX stripe for connect mode 2020-10-01 12:14:50 +02:00
Laurent Destailleur
ba311e2cfd Fix phpcs 2020-09-26 21:24:28 +02:00
Laurent Destailleur
7865381434 Clean code 2020-09-26 12:19:08 +02:00
Laurent Destailleur
9d6e3be5d1 Fix #yogosha4463 2020-09-26 05:20:33 +02:00
Laurent Destailleur
e2b0c4bc41 css 2020-09-26 02:27:27 +02:00
Laurent Destailleur
becf91904f css 2020-09-24 08:55:33 +02:00
Laurent Destailleur
46eb78cd41 Fix escape 2020-09-19 04:18:51 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
970995d728 Clean code. Replace num_paiement with num_payment everywhere. 2020-09-14 01:03:51 +02:00
Scrutinizer Auto-Fixer
8aceab802f Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 10:29:37 +00:00
Laurent Destailleur
b1e45aef46 Debug opensurvey. Look and feel v13. Removed deprecated properties. 2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
1f6c0997f4 Add info when job is closed 2020-09-06 20:48:13 +02:00
lvessiller
123d33b47c NEW format tickets sent by mail in public interface 2020-09-04 17:50:49 +02:00
Laurent Destailleur
180a49601b Use CSS to define size of logo on public pages. 2020-08-27 11:01:41 +02:00
Laurent Destailleur
2ca0d67072 Removed section of files to download into POS 2020-08-18 11:20:02 +02:00
Laurent Destailleur
c407a19563 Remove type= from script tags 2020-08-16 22:03:11 +02:00
Laurent Destailleur
43b23994e4 WIP Recruitment module 2020-08-06 15:55:04 +02:00
Laurent Destailleur
cb0a9868d7 Space 2020-08-04 15:16:11 +02:00
Laurent Destailleur
07f420d58e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
 2020-08-04 15:03:51 +02:00
Laurent Destailleur
5d20f47473 FIX page for confirmation of payments is empty 2020-08-04 15:00:03 +02:00
Laurent Destailleur
4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent_emails.php
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
	htdocs/product/traduction.php
 2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825 FIX Param of fetch_name_optionals_label must be object->table_element 2020-08-04 12:47:09 +02:00
Laurent Destailleur
a51829d03c CSS 2020-08-02 18:50:08 +02:00
Laurent Destailleur
aca20c89f9 Can use a generic email for recruitment 2020-08-02 18:45:42 +02:00
Laurent Destailleur
04903460b1 Add contact on job page 2020-08-02 18:09:53 +02:00
Laurent Destailleur
05531f95d6 Fix phpcs 2020-07-30 14:03:01 +02:00
Laurent Destailleur
2ff6791e53 css 2020-07-30 04:23:23 +02:00
Laurent Destailleur
4ed1da1632 Work on recruitment module 2020-07-30 04:17:05 +02:00
Laurent Destailleur
f937f5beea Work on recruitment module 2020-07-30 04:06:27 +02:00
Laurent Destailleur
c79d617a50 Add public page of job position offers 2020-07-30 03:50:27 +02:00
Laurent Destailleur
26c253113b Removed not used files 2020-07-26 22:04:19 +02:00
Laurent Destailleur
cef996926e WIP Add publilc interface for recruitment 2020-07-26 22:03:40 +02:00
Laurent Destailleur
01adf73e53 WIP Add publilc interface for recruitment 2020-07-26 22:02:49 +02:00
Laurent Destailleur
5cf9bfcb5f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:32:54 +02:00
Laurent Destailleur
2cc7e88f8e clean code 2020-07-10 02:32:22 +02:00
Laurent Destailleur
96c583b84e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:28:34 +02:00
Laurent Destailleur
7fdccf4eb8 Fix error in stripe payment if no country defined 2020-07-10 02:28:00 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
b76828df9f Fix use of newtoken() 2020-07-06 09:39:26 +02:00
Laurent Destailleur
01914980d9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/notice.php
 2020-06-19 00:45:06 +02:00
Laurent Destailleur
623a9db4e7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/composition/card.php
	htdocs/public/notice.php
 2020-06-19 00:42:20 +02:00
Laurent Destailleur
22ca5e0671 Fix XSS reported by C. Weiler <sak1.s3curity@gmail.com> in notice.php 2020-06-19 00:39:27 +02:00
Laurent Destailleur
b763b40d8c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 19:37:27 +02:00
Laurent Destailleur
b7e7ccee54 Update demo 2020-06-12 18:55:36 +02:00
Laurent Destailleur
6e81542148 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 14:36:11 +02:00
Laurent Destailleur
a0b6d9c4e0 css 2020-06-12 01:19:50 +02:00
kamel
fe8eddac5e [NEW] Ticket message notifications from public interface 
Can send an email when a new message is added from public interface

 close issue #12181
 2020-05-27 11:39:06 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule 2020-05-21 02:02:54 +02:00
Laurent Destailleur
949ef8d7d8 Fix css 2020-05-15 12:49:22 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
bfca151d85 Responsive 2020-05-15 11:58:50 +02:00
Laurent Destailleur
734a8ba312 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 15:27:00 +02:00
atm-greg
64d2f906bc fix visibility of extrafields in public interface 2020-05-11 16:35:58 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with 
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
 2020-05-07 22:52:32 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
293034dd89 css 2020-04-28 19:47:31 +02:00
Laurent Destailleur
a7815e0aac css 2020-04-28 19:44:32 +02:00
Laurent Destailleur
4d22baabfe CSS 2020-04-28 19:40:25 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Scrutinizer Auto-Fixer
d021559b16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-15 22:42:57 +00:00
Laurent Destailleur
e26124bf84 Clean code to make option TICKET_NOTIFICATION_EMAIL_TO easier to 
understand
 2020-04-15 12:57:33 +02:00
Laurent Destailleur
f2e90c6657 Look and feel v12 2020-04-15 12:32:59 +02:00
Laurent Destailleur
7f54c28cdb Responsive 2020-04-15 12:13:29 +02:00
Laurent Destailleur
c93681ed33 Responsive 2020-04-15 11:51:43 +02:00
Laurent Destailleur
2bf36bff6d Fix restore dir at good place 2020-04-13 04:19:25 +02:00
Laurent Destailleur
3740d59848 Look and feel v12 2020-04-13 04:14:28 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
philazerty
63d41fa356
Update list.php 
Bug #13519
 2020-04-10 16:48:18 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Frédéric FRANCE
fc34b5a4cb
compress png with zopflipng 2020-04-06 19:03:48 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
3e807b00ba FIX Look and feel v11 2020-03-20 21:21:30 +01:00
Laurent Destailleur
588692760a FIX Look and feel v11 2020-03-20 21:16:52 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
54d9f6a703 Deprecated comment 2020-03-14 16:35:16 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
3cf7105635 Fix language in sublang dir 2020-03-13 10:05:54 +01:00
Laurent Destailleur
29843165ec Use the header and footer of public pages for the payment ok and ko page 2020-03-13 03:28:13 +01:00
Laurent Destailleur
35fae3ec5d NEW Upgrade Stripe library to 6.43.1 2020-03-13 03:07:28 +01:00
Laurent Destailleur
e1c7222172 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-09 20:39:05 +01:00
Jean Traullé
f7dda657b1
Fix Call to a member function getMessage() on null 
Because we are not in the exception block, $e is necessarily undefined.
Thus replacing $e->getMessage(); by value of $paymentintent->status.
 2020-03-06 17:46:45 +01:00
Laurent Destailleur
d0f22c7bff Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_graph_product_distribution.php
 2020-03-06 14:22:42 +01:00
Laurent Destailleur
adc996ee0a FIX #13194 2020-03-06 13:19:17 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
7909055ee8 Enhance multilangue support in website module 2020-02-21 11:36:16 +01:00
root
0dcb83e6bf referer XSS patches 2020-02-18 22:31:24 +01:00
Jamie Slome
2d9162aedb
Merge branch 'develop' into develop 2020-02-17 10:49:41 +00:00
Laurent Destailleur
ed778bd28f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/ticket/view.php
 2020-02-15 18:13:35 +01:00
Laurent Destailleur
9b6179850a CSS 2020-02-15 18:07:49 +01:00
Laurent Destailleur
f14cd9f49f Look and feel v11 2020-02-15 18:07:23 +01:00
Laurent Destailleur
2b3cc0d048 Fix add both public id and ref in topic 2020-02-15 18:00:09 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
c015707cbc Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
root
2419f122c4 referer XSS patches 2020-02-03 23:10:04 +00:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
d49534e646
Merge pull request #12546 from ptibogxiv/patch-285 
Upgrade Stripe - minimal stripe update for compatibility
 2020-01-29 23:04:25 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
40636adb56 Enhance #12865 
No need of option. A new parameter on url is enough.
 2020-01-28 03:34:56 +01:00
Laurent Destailleur
51d750cb49
Merge pull request #12865 from TobiasSekan/ExportIcalWithHolidays 
New: Export ical with holidays
 2020-01-28 03:19:34 +01:00
Laurent Destailleur
5feea89a94 Fix responsive for public interface 2020-01-27 14:11:40 +01:00
Laurent Destailleur
29853b5fbd Fix responsive for public interface of tickets 2020-01-27 14:01:35 +01:00
Laurent Destailleur
90d255d3c4 Look and feel v11 2020-01-27 13:43:03 +01:00
Laurent Destailleur
c4ac1469df Look and feel v11 2020-01-27 13:42:31 +01:00
Tobias Sekan
245b6e6554
Update agendaexport.php after review 2020-01-27 08:28:14 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
5d7fa55759 css 2020-01-24 17:48:24 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
Laurent Destailleur
1b84ff634f Doc 2020-01-23 11:07:02 +01:00
Laurent Destailleur
4686be34d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/stripe/charge.php
 2020-01-22 14:10:46 +01:00
Laurent Destailleur
fc894d7a20 Fix for stripe connect 2020-01-22 13:53:20 +01:00
Laurent Destailleur
13a9a22cc5 Fix responsive demo 2020-01-22 13:02:50 +01:00
Laurent Destailleur
6d50cc1899 Update demo profiles 2020-01-21 13:25:38 +01:00
Laurent Destailleur
4773c81ae1 Fix demo profiles 2020-01-21 13:01:49 +01:00
Laurent Destailleur
012e916c4b Fix tag 2020-01-05 19:59:14 +01:00
Laurent Destailleur
d077a1ca60 Fix add second in fulltag to avoid pb of idempotency when submitting 
page in same minutes with a different amount.
 2020-01-05 19:42:18 +01:00
Laurent Destailleur
e4a03e98b7 FIX Do not record resource owner of event when not defined. 
More log to track payment errors.
 2020-01-01 12:47:01 +01:00
Laurent Destailleur
f8c15a14cf Add try catch 2019-12-31 19:11:36 +01:00
Manu Bryk
14d69c5a2c New Ref more visible when create a ticket 
When customers call support to trace a ticket, they don't have easily ref of the ticket. Add Ref to the subject of mail for customers and for TICKET_NOTIFICATION_EMAIL_TO. Add ref also to the notification message when customers create a new ticket.
 2019-12-31 17:24:37 +01:00
Laurent Destailleur
fea34fa908 Fix load of CSS using dolibarr server 2019-12-19 10:42:43 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-17 02:00:52 +00:00
Laurent Destailleur
1af67a4336
Merge pull request #12713 from frederic34/doxygen_warning 
doxygen
 2019-12-16 19:02:10 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
d979f6f0f4 Debug module ticket. Add error if sender email is not defined. 2019-12-15 20:02:56 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
fbb5fbae13
Update new.php 2019-12-08 23:02:34 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
4ed44140e7
Merge branch 'develop' into patch-285 2019-12-01 11:01:40 +01:00
ptibogxiv
16d08bd903
Update newpayment.php 2019-11-28 22:19:52 +01:00
Laurent Destailleur
cb352407eb Add submit 2019-11-26 12:46:40 +01:00
Laurent Destailleur
4ef6c9cc13 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/ticket.lang
 2019-11-26 11:54:42 +01:00
Regis Houssin
1a43b58f8a FIX compatibility with Multicompany 2019-11-25 10:03:35 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 14:51:54 +00:00
Laurent Destailleur
d1c49c7021 Fix trans 2019-11-08 10:24:03 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
bc2a949bab New Add option to disable idempotency when using Stripe payments. 2019-10-31 16:47:27 +01:00
Frédéric FRANCE
20f97807ce
clean indent 2019-10-27 10:07:47 +01:00
Laurent Destailleur
433f6918fd Look and feel v11 2019-10-23 21:21:39 +02:00
Laurent Destailleur
84c8b6b5d1 FIX #12198 2019-10-22 15:23:23 +02:00
Laurent Destailleur
f9c86256dc FIX #12198 2019-10-22 15:21:41 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
5801d09dbe NEW Use the squarre logo as favicon of pages 2019-10-11 12:28:13 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
3e5cd877b8 FIX Bad list of ticket on public interface for ticket emailcollector 2019-10-05 14:27:42 +02:00
Laurent Destailleur
7c685bc76f FIX Bad list of ticket on public interface for ticket emailcollector 2019-10-05 14:25:20 +02:00
Laurent Destailleur
083db12490 FIX access to public interface when origin email has an alias. 2019-10-05 11:53:08 +02:00
Laurent Destailleur
5c11a0d6cd FIX access to public interface when origin email has an alias. 2019-10-05 11:52:02 +02:00
Laurent Destailleur
f0122a5766 Fix phpcs 2019-10-03 16:54:33 +02:00
Laurent Destailleur
78751fe0ad
Update newpayment.php 2019-10-03 15:54:52 +02:00
Yash Kothari
9ade323648
#11966 bug fix 
Stripe : take into account down payments or deposits
 2019-10-02 13:23:55 +05:30
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
obrunet
3e4e64ab1a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2019-09-27 21:36:35 +02:00
fuhraih
40a8fe3e79 FIX #11554 Extrafields: members autosubscription formular issue 2019-09-27 21:26:06 +02:00
Laurent Destailleur
138b494b98
Merge pull request #11936 from aspangaro/11.0_translation 
Translate and some fix
 2019-09-27 12:15:50 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
31cc7e0610 Clean code 2019-09-23 19:29:18 +02:00
Laurent Destailleur
5cd4455649 Removed deprecated files 2019-09-23 19:25:56 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
Alexandre SPANGARO
278312f38f Translate 2019-09-20 07:02:14 +02:00
Laurent Destailleur
41a2a25729 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/ligne.php
 2019-09-17 12:23:58 +02:00
Laurent Destailleur
23777fd5ff Fix css 2019-09-16 11:19:02 +02:00
Laurent Destailleur
abee6dceaa Fix css demo 2019-09-16 11:16:58 +02:00
Laurent Destailleur
f5dd4f4f9e css 2019-09-16 11:08:34 +02:00
Laurent Destailleur
eb70411ae0 Css demo 2019-09-16 11:01:09 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Laurent Destailleur
7e923f6c1f Fix remove test code and chen paymentintent is not null 2019-09-13 18:51:03 +02:00
Laurent Destailleur
b4831f9670 Code comment 2019-09-13 17:26:07 +02:00
Laurent Destailleur
84544b6bdc More details in log for CSRF error. 2019-09-13 13:50:17 +02:00
Laurent Destailleur
9df4f0601d Clean address line to be on 1 line 2019-09-13 11:18:08 +02:00
Laurent Destailleur
9eb736b110 FIX stripe payment when there is a quote into address 2019-09-13 10:12:43 +02:00
Laurent Destailleur
6d20a656bb FIX CSRF check when using stripe old payment methods 2019-09-11 18:44:10 +02:00
Laurent Destailleur
209a9eb569
Merge pull request #11812 from atm-john/9.0_FIX_MISSING_HOOK 
Fix missing hook for agenda export
 2019-09-03 17:47:08 +02:00
John Botella
42433f3beb Fix: hook replace behavior 2019-09-03 11:23:27 +02:00
John Botella
f743056572 Add missing agenda hook 2019-09-03 11:15:35 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
7cb68d6438 NEW Default for Stripe is STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION 2019-08-25 18:02:10 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
814c405021 Add link to retry payment if error 2019-08-01 03:54:54 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
406375bfc4 Fix error management 2019-07-29 01:17:53 +02:00
Laurent Destailleur
3112f2b1c5 Fix error level 2019-07-29 01:13:49 +02:00
Laurent Destailleur
9ca4d65965 Fix stripe error management 2019-07-29 01:12:03 +02:00
Laurent Destailleur
a63a6a5853 FIX Online payment 2019-07-28 23:49:05 +02:00
Laurent Destailleur
a379d7804c
Merge pull request #11535 from aspangaro/11.0_p1 
QUAL Move ligne.php to line.php
 2019-07-22 18:33:06 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
2418b94e28 Fix translation 2019-07-20 00:17:26 +02:00
Laurent Destailleur
220f8300c1 FIX Responsive of public interface of ticket 2019-07-20 00:14:14 +02:00
Laurent Destailleur
de4142e23e FIX Add message from public interface 2019-07-19 23:57:35 +02:00
Laurent Destailleur
feee437471 FIX Closing ticket from public interface 2019-07-19 23:43:49 +02:00
Alexandre SPANGARO
5f042cf6ad QUAL Move ligne.php to line.php 2019-07-19 23:19:06 +02:00
Laurent Destailleur
ec34ce1e64 Maxi debug of module ticket 2019-07-19 23:11:00 +02:00
Laurent Destailleur
e742c3eb20 Debug module ticket 2019-07-19 20:06:02 +02:00
Laurent Destailleur
327e5ebe78 FIX Show list of events on tickets 2019-07-19 19:09:38 +02:00
Laurent Destailleur
03aa8c4b83 Better log 2019-07-19 03:29:43 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
33bff1353c Fix css 2019-07-05 11:45:10 +02:00
Laurent Destailleur
e3359c6f0f FIX Can't submit a ticket from public interface 2019-07-05 11:21:04 +02:00
Laurent Destailleur
4c03aa6547 Fix selection of profile for demo 2019-07-04 17:03:36 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
2926bf4158 code comment 2019-06-28 12:35:25 +02:00
Laurent Destailleur
a776f3671b Fix demo profiles 2019-06-25 16:50:42 +02:00
Laurent Destailleur
a7d7d44f87 FIX Management of vat info in stripe 2019-06-21 19:59:16 +02:00
Laurent Destailleur
7afcdb46eb Debug module ticket 2019-06-19 12:10:05 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
Laurent Destailleur
1520ca9646 Fix buttons for payments 2019-06-07 13:51:53 +02:00
Laurent Destailleur
9314bb4667 Fix missing statement descriptor 2019-06-07 13:07:19 +02:00
Laurent Destailleur
9511a66681 Integrate the new Stripe checkout with STRIPE_USE_NEW_CHECKOUT=1 2019-06-07 12:41:37 +02:00
Laurent Destailleur
dc479a5377 FIX Create stripe intent only if Stripe was selected. This reduce also 
duplicate code.
FIX Free payment when using paymentintent architecture.
 2019-06-07 11:29:59 +02:00
Laurent Destailleur
969e139d5c Fix parameters of accessforbidden 2019-06-04 12:21:27 +02:00
Laurent Destailleur
a524fd17ce Fix phpcs 2019-05-29 10:03:05 +02:00
Laurent Destailleur
848b8f9bc4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/cron/cron_run_jobs.php
	htdocs/public/payment/newpayment.php
	scripts/cron/cron_run_jobs.php
 2019-05-27 19:01:28 +02:00
Laurent Destailleur
4596ec7d38 FIX Use of cron with multicompany 2019-05-27 18:11:15 +02:00
Laurent Destailleur
45aaafd4d6 Fix email not set in paybox payment 2019-05-26 15:25:26 +02:00
Laurent Destailleur
b5b5e1f6db More completepaybox integration with HMAC 2019-05-26 14:37:31 +02:00
Laurent Destailleur
e46481d837 Fix phpcs 2019-05-18 17:03:21 +02:00
Laurent Destailleur
a850c7aede Fix if setup not complete 2019-05-18 02:22:23 +02:00
Laurent Destailleur
ae3a20d6ff FIX compatibility with intent payment_modes 2019-05-17 00:10:44 +02:00
Laurent Destailleur
52c1f42734 Debug payment with stripe Intent 2019-05-16 23:11:49 +02:00
Laurent Destailleur
702c683ce4
Merge pull request #11115 from ptibogxiv/patch-167 
Fix footer in create ticket page
 2019-05-04 12:16:06 +02:00
Laurent Destailleur
918e7e09b4
Merge pull request #11114 from ptibogxiv/patch-166 
FIX footer on list ticket page
 2019-05-04 12:15:24 +02:00
Laurent Destailleur
5487900072
Merge pull request #11113 from ptibogxiv/patch-165 
Fix footer on view ticket page
 2019-05-04 12:14:28 +02:00
Laurent Destailleur
8059f7cf83
Merge pull request #11112 from ptibogxiv/patch-164 
FIX footer public ticket page
 2019-05-04 12:13:13 +02:00
ptibogxiv
965cf0410f
Fix footer in create ticket page 2019-05-03 17:16:04 +02:00
ptibogxiv
a3bb37eb84
FIX footer on list ticket page 2019-05-03 17:13:58 +02:00
ptibogxiv
78c18b1961
Fix footer on view ticket page 2019-05-03 17:11:13 +02:00
ptibogxiv
24775fec1b
FIX footer public ticket page 2019-05-03 17:06:57 +02:00
ptibogxiv
140cc93490
Update newpayment.php 2019-05-03 15:41:15 +02:00
ptibogxiv
65b21f3c37
Fix JS for payment intent 2019-05-03 15:14:20 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
10d853cdb3 Work on stripe payment using intent with option 
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
 2019-05-02 21:54:28 +02:00
Frédéric FRANCE
5766bb0b8a
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-04-30 20:16:43 +02:00
Laurent Destailleur
acfc251253 Fix idempotency key 2019-04-30 03:09:54 +02:00
Frédéric FRANCE
31022e6753
Update confirm_payment.php 2019-04-26 17:57:23 +02:00
Laurent Destailleur
9380254f76 Prepare for Manual confirmation quickstart 2019-04-26 10:48:38 +02:00
Laurent Destailleur
bb3f1c04f6 Prepare intent 2019-04-26 05:05:10 +02:00
Laurent Destailleur
653790fb5d Clean code 2019-04-26 03:11:46 +02:00
Laurent Destailleur
2e277d643d Stabilize code to prepare beta freeze. 2019-04-24 21:26:58 +02:00
Laurent Destailleur
b90613c6c4 Start debug IPN. Removed duplicate code. We will have to use existing 
code to not loose features.
 2019-04-24 20:21:03 +02:00
Laurent Destailleur
8d28506595 Better code 2019-04-24 19:25:04 +02:00
Laurent Destailleur
f8c381f069 Fix label for API 2019-02-19 2019-04-24 12:02:03 +02:00
Laurent Destailleur
6a846f46f2 Debug module ticket 2019-04-10 15:33:15 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
c61cbd7b15 Fix phpcs 2019-04-05 20:13:41 +02:00
Laurent Destailleur
83cf0dabae NEW Add more complete error messages in log on stripe payments 2019-04-03 17:54:55 +02:00
Laurent Destailleur
b97a9d1ef3 NEW Add more complete error messages in log on stripe payments 2019-04-03 17:53:24 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
82d90a201c WIP IFTTT setup 2019-03-22 19:20:54 +01:00
Philippe Grand
18c90763f4
Update test_arrays.php 2019-03-17 10:33:34 +01:00
Philippe GRAND
ef3ea11d30 update with html5 compliant code 2019-03-17 10:14:47 +01:00
Philippe GRAND
289c36924b update with html5 compliant code 2019-03-17 10:09:20 +01:00
Philippe GRAND
c6dbc0621a update with html5 compliant code 2019-03-17 10:05:24 +01:00
Laurent Destailleur
6f0fbc42c1 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/members/new.php
	htdocs/public/opensurvey/studs.php
 2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 2019-03-15 15:13:28 +01:00
Laurent Destailleur
d4f2a16abf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
 2019-03-14 17:10:58 +01:00
John BOTELLA
8bc795c055 Fix missing hook for export agenda 2019-03-14 15:19:38 +01:00
Laurent Destailleur
585e604ac4 Add a message to avoid using wrong script file 2019-03-11 18:02:03 +01:00
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