Commit Graph

66149 Commits

Author SHA1 Message Date
Laurent Destailleur
3393aba85f Fix autocopy on projects 2019-04-29 18:19:56 +02:00
Laurent Destailleur
5f54bd250c Suuport SETIFEMPTY flag 2019-04-29 17:21:27 +02:00
Laurent Destailleur
c7fcecc336 Fix email not loaded 2019-04-29 17:17:25 +02:00
Laurent Destailleur
7c26785cb2 Fix emailcollector 2019-04-29 16:47:00 +02:00
Laurent Destailleur
d0eecf9be5 Fix emailcollector 2019-04-29 16:38:56 +02:00
Laurent Destailleur
483d017fc5 Fix creation of project 2019-04-29 16:16:44 +02:00
Laurent Destailleur
8091cff009 Can edit param of operation for email collector 2019-04-29 15:44:16 +02:00
Laurent Destailleur
3c90461502 Better error message in convert odt to pdf 2019-04-27 17:31:14 +02:00
Laurent Destailleur
bd15bf2952 CSS 2019-04-27 13:43:11 +02:00
Laurent Destailleur
b275160f20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-27 13:26:12 +02:00
Laurent Destailleur
ee5d50b905 css 2019-04-27 13:25:21 +02:00
Laurent Destailleur
15d57df177 CSS 2019-04-27 13:03:11 +02:00
Laurent Destailleur
c90dc13a21 CSS 2019-04-27 13:02:52 +02:00
Laurent Destailleur
143cbec281 Fix test 2019-04-26 13:23:33 +02:00
Laurent Destailleur
0c432c28a8 Trans 2019-04-26 13:08:19 +02:00
Laurent Destailleur
9380254f76 Prepare for Manual confirmation quickstart 2019-04-26 10:48:38 +02:00
Laurent Destailleur
22b8a67e55 A more complete function 2019-04-26 05:19:11 +02:00
Laurent Destailleur
a7362ca055 More examples 2019-04-26 05:05:33 +02:00
Laurent Destailleur
bb3f1c04f6 Prepare intent 2019-04-26 05:05:10 +02:00
Laurent Destailleur
f81a1a3e85 Complete examples 2019-04-26 03:50:05 +02:00
Laurent Destailleur
653790fb5d Clean code 2019-04-26 03:11:46 +02:00
Laurent Destailleur
5b9716b9d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-26 02:06:10 +02:00
Laurent Destailleur
85059eeedb Debug method getPaymentIntent 2019-04-26 02:05:57 +02:00
Laurent Destailleur
8c6dedd851
Merge pull request #11072 from ptibogxiv/patch-157
FIX : sync data thirdparty to member
2019-04-26 01:31:44 +02:00
Laurent Destailleur
9760ed5c8d FIX CVE-2019-11199 2019-04-25 23:36:19 +02:00
Laurent Destailleur
4bd732cc40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/export.php
	htdocs/core/class/utils.class.php
	htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb FIX CVE-2019-11201 2019-04-25 23:21:25 +02:00
Laurent Destailleur
01075081cb FIX CVE-2019-11200 2019-04-25 22:25:19 +02:00
Laurent Destailleur
1dd8d9fa8f Fix phpcs 2019-04-25 21:48:35 +02:00
Laurent Destailleur
e332288e73 Fix concat 2019-04-25 19:46:20 +02:00
Laurent Destailleur
b2614259e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-25 19:32:58 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
ptibogxiv
23f4536a78
FIX : sync data thirdparty to member 2019-04-25 19:22:14 +02:00
Laurent Destailleur
c76c0e6fd0
Merge pull request #11071 from OPEN-DSI/fix-fourn--orderstoinvoice-reglement
Fix default payment terms and method
2019-04-25 19:03:58 +02:00
Laurent Destailleur
ad50aa2e79
Merge pull request #11070 from ptibogxiv/patch-156
Fix display type in subscription list
2019-04-25 19:02:25 +02:00
Laurent Destailleur
4353925d95
Update subscription.php 2019-04-25 19:02:16 +02:00
Laurent Destailleur
68926e3b6f
Merge pull request #11066 from aspangaro/10.0_accountancy7
FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries)
2019-04-25 18:59:17 +02:00
Laurent Destailleur
06d8ecde8b
Merge pull request #11068 from ptibogxiv/patch-155
Fix morphy type adherent
2019-04-25 18:58:21 +02:00
Lionel VESSILLER
e80436469f Fix default payment condition and method 2019-04-25 16:05:12 +02:00
ptibogxiv
2968921f87
Fix display type in subscription 2019-04-25 13:12:33 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
ptibogxiv
cb658dda8c
Fix morphy type adherent 2019-04-25 12:04:26 +02:00
Laurent Destailleur
e08959484d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-25 11:18:36 +02:00
Laurent Destailleur
6fe84a7962 Fix phpcs 2019-04-25 11:18:25 +02:00
ptibogxiv
65bb7d9031
Update adherent_type.class.php 2019-04-25 09:37:07 +02:00
ptibogxiv
6190e7813e
Fix get morphy adherent type 2019-04-25 09:14:51 +02:00
Alexandre SPANGARO
2c411310bc FIX Menu Accountancy (Simple) not accessible without module Accountancy (Double entries) 2019-04-25 08:29:43 +02:00
Laurent Destailleur
6884999ee3
Merge pull request #10925 from ptibogxiv/patch-146
NEW morphy value in member type
2019-04-25 03:00:25 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
2019-04-25 01:50:48 +02:00
Laurent Destailleur
a15f1350be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-25 01:39:02 +02:00