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

72521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f2ecdac454 Fix idempotency_key 
Conflicts:
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:12:03 +02:00
Laurent Destailleur
d55c440740 Fix some product and services export profiles 2019-04-29 21:23:01 +02:00
Laurent Destailleur
ef8bb1f5ca Add MAIN_DOLEDITOR_HEIGHT as quick hack to fix pb of too small area 2019-04-29 20:55:45 +02:00
Laurent Destailleur
101f6a5af3 FIX Several fixes on import of services/products 2019-04-29 20:41:36 +02:00
Laurent Destailleur
5d40124b22 Fix import of product price with multilevel prices 2019-04-29 20:15:03 +02:00
Laurent Destailleur
627ef14454 FIX The autocopy feature was ko for suppliers 2019-04-29 18:51:15 +02:00
Laurent Destailleur
899f41d68c Fix bad constant MAIN_MAIL_AUTOCOPY into email form of project page. 2019-04-29 18:26:27 +02:00
Laurent Destailleur
5253c759af Fix overwrite feature 2019-04-27 21:42:52 +02:00
Laurent Destailleur
70975b36c7 Fix link 2019-04-27 19:46:53 +02:00
Laurent Destailleur
789a76320a Fix info message 2019-04-27 19:43:48 +02:00
Laurent Destailleur
6b2b996935 Missing translation 2019-04-27 19:41:47 +02:00
Laurent Destailleur
c43bc63d2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-27 13:49:13 +02:00
Laurent Destailleur
a7530b7eff Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-27 13:28:36 +02:00
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
143cbec281 Fix test 2019-04-26 13:23:33 +02:00
Laurent Destailleur
9760ed5c8d FIX CVE-2019-11199 2019-04-25 23:36:19 +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
5259547b96
Merge pull request #11069 from atm-gauthier/6.0_fix_select_prev_situ 
Fix prev situation invoice selection (backport fix 8.0)
 2019-04-25 18:59:48 +02:00
gauthier
31897f54ac Fix prev situation invoice selection (backport fix 8.0) 2019-04-25 12:37:05 +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
b62323939e
Merge pull request #11064 from atm-greg/FIX_create_supplier_invoice_button 
FIX test to display create invoice button on supplier_order card
 2019-04-24 21:07:15 +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
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
f0bb9288bf FIX #11013 2019-04-24 11:23:49 +02:00
Laurent Destailleur
f5fb8363d8 FIX #11041 2019-04-24 10:26:57 +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
e0b71fd258 Fix size of column 2019-04-24 10:07:34 +02:00
Laurent Destailleur
21b79d314a
Merge pull request #11059 from atm-greg/FIX_actioncomm_for_long_trigger_name 
fix actioncomm module for long trigger names
 2019-04-24 10:06:55 +02: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
atm-greg
3231e54abd fix actioncomm module for long trigger names 2019-04-23 16:19:58 +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
09914f31f9 Trans 2019-04-23 12:14: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
83205e6963
Merge pull request #11030 from atm-florian/9.0 
fix #11023
 2019-04-19 13:05:38 +02:00
Laurent Destailleur
c9445ee700
Merge pull request #11038 from atm-john/FIX_error_messages_not_displayed 
FIX error messages not displayed
 2019-04-19 12:55:30 +02:00
florian HENRY
83cf08f2eb fix php warning 2019-04-18 20:37:27 +02:00
John BOTELLA
0855d84ccf FIX error messages not displayed 2019-04-18 10:40:34 +02:00
florian HENRY
2b6cdd2e33 Fix workfolow module launch trigger on order close 2019-04-18 10:01:05 +02:00
florian HENRY
f412ce6a9c fix #11023 2019-04-17 10:49:39 +02:00