Commit Graph

66078 Commits

Author SHA1 Message Date
Laurent Destailleur
2e277d643d Stabilize code to prepare beta freeze. 2019-04-24 21:26:58 +02:00
Laurent Destailleur
77f92a5da3 Update stripe.php 2019-04-24 21:12:43 +02:00
Laurent Destailleur
8007b222d0 Merge branch 'develop' into patch-153 2019-04-24 21:10:27 +02:00
Laurent Destailleur
ab1f371ea5 Fix encoding on expense report PDF 2019-04-24 20:58:27 +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
79c37f2226 Fix link for endpoint 2019-04-24 18:47:11 +02:00
Laurent Destailleur
fe3fe60efc Cleaner setup page 2019-04-24 18:31:11 +02:00
Laurent Destailleur
5a0d2bbcb4 Merge pull request #10634 from ptibogxiv/patch-120
Update stripe version api for payment intent
2019-04-24 18:08:04 +02:00
ptibogxiv
c485cc7a89 Update stripe.php 2019-04-24 15:41:08 +02:00
ptibogxiv
99e56f9cfa Update stripe.php 2019-04-24 14:53:31 +02:00
ptibogxiv
6d06f128e7 Update stripe.php 2019-04-24 13:51:41 +02:00
ptibogxiv
57ce70bbc9 NEW enhancement management of webhooks
active / inactive and sync only needed events
2019-04-24 13:08:13 +02:00
Laurent Destailleur
f8c381f069 Fix label for API 2019-02-19 2019-04-24 12:02:03 +02:00
Laurent Destailleur
8aa8efcb14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 11:25:23 +02:00
Laurent Destailleur
99639ef429 FIX #11013 2019-04-24 11:25:14 +02:00
Laurent Destailleur
f0bb9288bf FIX #11013 2019-04-24 11:23:49 +02:00
Laurent Destailleur
8e626ad463 Fic xss 2019-04-24 10:51:26 +02:00
Laurent Destailleur
4421dedbd2 Merge pull request #11008 from aspangaro/10.0_closure
FIX: Update blocked by datec on fiscal year
2019-04-24 10:28:23 +02:00
Laurent Destailleur
f5fb8363d8 FIX #11041 2019-04-24 10:26:57 +02:00
Laurent Destailleur
691159c56b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 10:24:55 +02:00
Laurent Destailleur
1264857211 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/js/timesheet.js
2019-04-24 10:24:32 +02:00
Laurent Destailleur
fb01f550f4 Merge pull request #11016 from ATM-Nicolas/fix_activity_perweek
FIX : Total per day in timespent per week
2019-04-24 10:21:08 +02:00
Laurent Destailleur
6a2c3e9fe3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 10:16:57 +02:00
Laurent Destailleur
30415d5832 Merge pull request #11017 from EuskalMoneta/develop
NEW REST API: get the list of objects in a category.
2019-04-24 10:15:02 +02:00
Laurent Destailleur
7afcb013b1 Merge pull request #11021 from atm-quentin/NEW_search_on_not_contact_list
NEW public note and private note in contact list sall
2019-04-24 10:12:45 +02:00
Laurent Destailleur
0090b26946 Merge pull request #11049 from frederic34/patch-5
Update mod_expedition_ribera.php
2019-04-24 10:10:11 +02:00
Laurent Destailleur
ad9dfc826a Merge pull request #11051 from frederic34/patch-7
Update mod_commande_saphir.php
2019-04-24 10:09:58 +02:00
Laurent Destailleur
7ad214b2f1 Merge pull request #11052 from frederic34/patch-8
Update mod_chequereceipt_thyme.php
2019-04-24 10:09:38 +02:00
Laurent Destailleur
49c7d07e8c Merge pull request #11050 from frederic34/patch-6
Update mod_contract_magre.php
2019-04-24 10:09:28 +02:00
Laurent Destailleur
a1bff2ca36 Merge pull request #11048 from frederic34/patch-2
Update mod_bom_advanced.php
2019-04-24 10:09:07 +02:00
Laurent Destailleur
6d397316d6 Merge pull request #11053 from frederic34/patch-9
In export modules, id is string
2019-04-24 10:08:30 +02:00
Laurent Destailleur
6ce88850e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 10:08:09 +02:00
Laurent Destailleur
8025fb1ac1 Fix size of column 2019-04-24 10:07:58 +02:00
Laurent Destailleur
e0b71fd258 Fix size of column 2019-04-24 10:07:34 +02:00
Abbes Bahfir
dccc8b0be3 Fix:Same action in both cases 2019-04-24 08:48:36 +01:00
atm-greg
6e425d1895 add origin of line in fourn orderstoinvoice.php 2019-04-24 08:56:06 +02:00
Laurent Destailleur
684e09fdcd NEW Add function isValidVATID() 2019-04-23 22:49:33 +02:00
atm-greg
3231e54abd fix actioncomm module for long trigger names 2019-04-23 16:19:58 +02:00
Laurent Destailleur
742de5c777 Fix pdf of expense report 2019-04-23 16:04:53 +02:00
Laurent Destailleur
72025f6d5d Fix CSS 2019-04-23 15:54:24 +02:00
Laurent Destailleur
633eb1d6c6 Remove warning 2019-04-23 13:28:42 +02:00
Laurent Destailleur
74d0edfc59 Removed not used file 2019-04-23 13:24:32 +02:00
Laurent Destailleur
3b04d2fe9b Fix warnings 2019-04-23 13:21:17 +02:00
Laurent Destailleur
7f4b09c482 Fix warnings 2019-04-23 13:20:44 +02:00
Laurent Destailleur
a8b645c7a3 Fix warnings 2019-04-23 13:07:46 +02:00
Laurent Destailleur
7c458ee4c0 TODO 2019-04-23 13:02:25 +02:00
Laurent Destailleur
a77b46f072 Removed warnings 2019-04-23 12:52:48 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
84ec39f043 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-23 12:25:53 +02:00