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

66251 Commits

Author SHA1 Message Date
Laurent Destailleur
0532598ecf Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-27 13:28:05 +02:00
Laurent Destailleur
410a3801da Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-04-27 13:27:52 +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
Frédéric FRANCE
31022e6753
Update confirm_payment.php 2019-04-26 17:57:23 +02:00
Frédéric FRANCE
3e99a40b9e
Update website.lib.php 2019-04-26 17:47:47 +02:00
Mavyre
485bc8cd7c
Corrected syncRates parameter 2019-04-26 14:45:59 +02:00
ptibogxiv
423c5c3ac8
Update card.php 2019-04-26 14:26:50 +02:00
ptibogxiv
9b9295ab50
Update adherent.class.php 2019-04-26 14:25:58 +02:00
Laurent Destailleur
143cbec281 Fix test 2019-04-26 13:23:33 +02:00
ptibogxiv
3e02dc2465
FIX : dolibarrize fk_soc ->socid for member 2019-04-26 13:23:30 +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
gauthier
31897f54ac Fix prev situation invoice selection (backport fix 8.0) 2019-04-25 12:37:05 +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
Laurent Destailleur
50a4d54d8a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-25 01:37:32 +02:00
Laurent Destailleur
07caf22647 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-25 01:37:25 +02:00
Laurent Destailleur
becf096bf8 FIX ref for table without ref manager are set to NULL. 2019-04-25 01:37:08 +02:00
Laurent Destailleur
82093f5891 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-25 01:27:02 +02:00
Laurent Destailleur
560b026d68 Fix CSS 2019-04-25 01:26:29 +02:00
Laurent Destailleur
e5c2027dbb NEW Add accounting code for eec sales and export sales on products 2019-04-25 01:16:29 +02:00
Laurent Destailleur
aa9184905a FIX Duration is lost when editing 2019-04-25 00:11:08 +02:00
Laurent Destailleur
2e277d643d Stabilize code to prepare beta freeze. 2019-04-24 21:26:58 +02:00
Alexandre SPANGARO
6f9e71dae3 Merge remote-tracking branch 'upstream/develop' into 10.0_closure2 2019-04-24 21:15:54 +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
0583cf7804
Update adherent_type.class.php 2019-04-24 15:44:57 +02:00
ptibogxiv
c485cc7a89
Update stripe.php 2019-04-24 15:41:08 +02:00
atm-greg
70017da95a testing if customer invoice module is activated doesn't make sense on supplier commande card... 2019-04-24 14:59:54 +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
287b8ebe53
Merge pull request #11060 from hregis/9.0_mc 
FIX missing compatibility with multicompany
 2019-04-24 11:33:16 +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
Regis Houssin
740fddcd42 FIX missing global $user 2019-04-24 08:22:00 +02:00
Regis Houssin
41a82023e3 FIX missing compatibility with multicompany 2019-04-24 08:17:10 +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
Laurent Destailleur
bf7fcce1b2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-23 12:24:25 +02:00
Laurent Destailleur
fe1b884966 Add missing methods 2019-04-23 12:20:59 +02:00
Laurent Destailleur
09914f31f9 Trans 2019-04-23 12:14:50 +02:00
Laurent Destailleur
c0c723a207 Work on inventory feature 2019-04-23 11:00:28 +02:00
Laurent Destailleur
8d0825910a Fix warnings 2019-04-23 10:38:20 +02:00
Laurent Destailleur
7c7c4f0d93 Removed warnings 2019-04-23 10:24:16 +02:00
Laurent Destailleur
f19d96bf8d NEW Show enabled modules in dol_print_error 2019-04-23 10:24:05 +02:00
Laurent Destailleur
9930b276ff Fix image link 2019-04-22 17:29:02 +02:00
Laurent Destailleur
a50fc9189b Fix phpcs 2019-04-22 15:45:44 +02:00
Laurent Destailleur
1ec8c259eb Remove useless var 2019-04-22 14:54:37 +02:00
Laurent Destailleur
9e91826dea Can set length of random password 2019-04-22 14:12:58 +02:00
Laurent Destailleur
be726c2376 Code comment 2019-04-22 12:44:25 +02:00
Laurent Destailleur
24572e2f82 Remove warnings 2019-04-22 12:42:46 +02:00
Laurent Destailleur
c0b12ee94a Typo 2019-04-22 12:24:21 +02:00
Laurent Destailleur
6da42941a8 NEW Add attached document on bank account visible in automatic ECM. 2019-04-21 19:54:30 +02:00
Frédéric FRANCE
53c851de7b
Update export_csv.modules.php 2019-04-20 11:42:25 +02:00
Frédéric FRANCE
a0ce52bb23
Update export_excel.modules.php 2019-04-20 11:41:37 +02:00
Frédéric FRANCE
73b32f0679
Update export_excel2007.modules.php 2019-04-20 11:41:19 +02:00
Frédéric FRANCE
06a8513575
Update export_excel2007new.modules.php 2019-04-20 11:40:59 +02:00
Frédéric FRANCE
b05a5e49ff
Update export_tsv.modules.php 2019-04-20 11:39:38 +02:00
Frédéric FRANCE
e5559ac2f9
Update mod_chequereceipt_thyme.php 
The property db does not exist on mod_chequereceipt_thyme.
 2019-04-20 09:36:47 +02:00
Frédéric FRANCE
fbf718f330
Update mod_commande_saphir.php 2019-04-20 09:34:23 +02:00
Frédéric FRANCE
bed3ed705c
Update mod_contract_magre.php 
The property db does not exist on mod_contract_magre.
 2019-04-20 09:31:53 +02:00
Frédéric FRANCE
9b9d4ddc45
Update mod_expedition_ribera.php 
The property db does not exist on mod_bom_advanced.
 2019-04-20 09:29:24 +02:00
Frédéric FRANCE
e9b13baac2
Update mod_bom_advanced.php 
The property db does not exist on mod_bom_advanced.
 2019-04-20 09:27:15 +02:00
Laurent Destailleur
734b1ca7c1 Fix phpcs 2019-04-19 22:18:08 +02:00
Laurent Destailleur
74ba9f57f1 Fix phpcs 2019-04-19 18:48:00 +02:00
Laurent Destailleur
1c90d157a0 Look and feel v10 2019-04-19 18:45:01 +02:00
Laurent Destailleur
19f6334483
Merge pull request #11047 from ATM-Nicolas/new_edit_supplier_price_ref 
NEW : Can update product supplier price ref
 2019-04-19 13:49:19 +02:00
Laurent Destailleur
4d911fa7b4
Merge pull request #11033 from atm-quentin/NEW_thirdparty_filter_on_CAPRODSERV 
NEW filter by thirdparty on report CA by prod/serv
 2019-04-19 13:17:08 +02:00
Laurent Destailleur
94ca74b37e
Merge pull request #11009 from bafbes/abb90047 
fix:Select chart plan from active countries only 2829bfc
 2019-04-19 13:12:00 +02:00
Laurent Destailleur
6d34a38042
Update account.php 2019-04-19 13:11:50 +02:00
Laurent Destailleur
11d737f23a
Merge pull request #11029 from ATM-Marc/FIX_7.0_sort_events 
FIX: actioncomm: sort events by date after external calendars and hook (into 7.0)
 2019-04-19 13:06:09 +02:00
Laurent Destailleur
a0cd053206
Merge branch 'develop' into patch-2 2019-04-19 13:04:52 +02:00
Laurent Destailleur
6ed616a969
Merge pull request #11042 from aspangaro/10.0_assets 
Assets - Debug - Look & field v10
 2019-04-19 13:02:50 +02:00
Laurent Destailleur
31167857b5 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-19 13:01:14 +02:00
Laurent Destailleur
a438f688fb Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-04-19 13:00:37 +02:00