Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,046 Commits 35 Branches 179 Tags 1.7 GiB
e242dbad88
Commit Graph

13329 Commits

Author SHA1 Message Date
Laurent Destailleur
64b0d1d390 Fix by adding a redirect to avoid the order2billing being done twice. 2018-03-07 14:33:29 +01:00
Laurent Destailleur
913be91ac7
Merge pull request #8279 from ptibogxiv/develop 
New add a stripeconnect mode + add webhook key
 2018-03-07 14:17:15 +01:00
Laurent Destailleur
62a339e582 Minor fix in multicurrency for supplier prices 2018-03-07 14:13:46 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
f8d8c5c658 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:04:27 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
Laurent Destailleur
8b9041b93e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-03-07 12:59:52 +01:00
Marc de Lima Lucio
dd208348c4 FIX: add planned delivery to order exports 2018-03-07 12:18:08 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
florian HENRY
6cb77577a6 can use image 2018-03-07 09:03:13 +01:00
florian HENRY
bb73a715a8 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix_comment_task 2018-03-07 08:49:08 +01:00
florian HENRY
03873038d5 fix comment task 2018-03-07 08:47:34 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
ptibogxiv
10b16187d4
NEW convert rib.php to gateway.php 2018-03-06 13:26:40 +01:00
Laurent Destailleur
45fd0cfc16 FIX Subscription events not recorded into agenda 2018-03-06 12:36:39 +01:00
Laurent Destailleur
72af963ed5 Fix triggers 2018-03-06 12:26:26 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
 2018-03-06 09:20:45 +01:00
Laurent Destailleur
17e012e0ac FIX Subscription not correctly log in blockedlog 2018-03-06 09:08:45 +01:00
Laurent Destailleur
db65379ebc FIX Subscription not correctly log in blockedlog 2018-03-05 17:07:59 +01:00
Regis Houssin
722fbc9d29 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug5 2018-03-05 10:25:23 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned) 
NEW Online payment now record the payment on invoices
 2018-03-04 19:39:46 +01:00
Laurent Destailleur
9355c5a8d7 Fix scrutinizer 2018-03-04 11:31:57 +01:00
Laurent Destailleur
e574ec4bf1 Fix backward compatibility 2018-03-04 11:28:01 +01:00
Laurent Destailleur
82fd84fb48 Fix scrutinizer errors 2018-03-04 11:22:43 +01:00
Laurent Destailleur
6338328c90 Fix scrutinizer errors 2018-03-04 11:09:53 +01:00
Laurent Destailleur
44eb50c424 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:57:10 +01:00
Laurent Destailleur
eac1b2efe9 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:23:23 +01:00
Laurent Destailleur
f0c9cd3acc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-03 11:22:31 +01:00
Laurent Destailleur
d6b782e5ef FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:22:15 +01:00
Regis Houssin
647331876b Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug5 2018-03-02 19:02:08 +01:00
Regis Houssin
b69d2800ef Fix: check if file name already exists 2018-03-02 18:59:30 +01:00
Laurent Destailleur
b24259ed46
Merge pull request #8265 from hregis/7.0_bug5 
Fix: missing hook during rename file action
 2018-03-02 18:15:01 +01:00
Regis Houssin
8e85198bd1 Fix: missing $upload_dir 2018-03-02 18:09:06 +01:00
Laurent Destailleur
0a5edb871b
Merge pull request #8253 from ruistrecht-alt/Fix_supress_count_warning_in_extrafields_view_tpl 
FIX Suppress count warning in admin_extrafields_view.tpl
 2018-03-02 18:00:52 +01:00
Laurent Destailleur
7584fe62e3
Merge pull request #8244 from hregis/develop_bug 
Fix: avoid warning during "upgrade2" process
 2018-03-02 17:51:47 +01:00
Laurent Destailleur
48b578b9f2
Update commonobject.class.php 2018-03-02 17:51:21 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany 
Fix: use "multidir_output" instead "dir_output" (propal)
 2018-03-02 17:49:25 +01:00
Laurent Destailleur
bf36f00897
Update html.formfile.class.php 2018-03-02 17:48:58 +01:00
Regis Houssin
bf4543a636 Fix: missing hook during rename file action 2018-03-02 17:05:52 +01:00
Laurent Destailleur
e073fa15f7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-02 14:00:27 +01:00
Laurent Destailleur
8d11f1efa1 FIX Payment mode not correctly set in donation and document 2018-03-02 12:32:49 +01:00
Laurent Destailleur
a01287b211 Fix template donation 2018-03-02 12:25:43 +01:00
Laurent Destailleur
c478ab952f Fix block to generate donation document missing 2018-03-02 11:57:39 +01:00
Laurent Destailleur
191a1e9350 Fix css 2018-03-02 11:18:29 +01:00
Laurent Destailleur
a3350d12d8 css 2018-03-01 23:51:06 +01:00
Laurent Destailleur
f36308fa0a FIX nohover broken on boxes 2018-03-01 17:20:37 +01:00