Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
65,163 Commits 36 Branches 189 Tags
40d04482b030e4b697e23fcb51e37b00f7b2d47b
Commit Graph

13372 Commits

Author SHA1 Message Date
Laurent Destailleur
db65379ebc FIX Subscription not correctly log in blockedlog 2018-03-05 17:07:59 +01:00
Marc de Lima Lucio
c4950d4f0c FIX: supplier discounts: wrong source invoice ref in DOCs 2018-03-05 11:49:04 +01:00
Marc de Lima Lucio
f1faf155fc FIX: supplier discounts: wrong link to source supplier invoice 2018-03-05 11:41:06 +01:00
Marc de Lima Lucio
480d756090 FIX: supplier discounts: typo 2018-03-05 11:30:18 +01:00
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +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
Marc de Lima Lucio
451d943927 NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts) 2018-03-02 16:48:25 +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
Laurent Destailleur
132ee2c788 CSS 2018-03-01 16:48:12 +01:00
Laurent Destailleur
0f237e4d5c NEW Add mass action enable/disable on cron job list 2018-03-01 15:24:50 +01:00
Marc de Lima Lucio
e07177fec2 FIX: supplier relativ discounts: pre-fill newlines with qty/discount 2018-03-01 12:31:33 +01:00
Laurent Destailleur
2368cb615f Look and feel v8 2018-03-01 11:51:25 +01:00
Marc de Lima Lucio
059801fe03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-01 10:22:21 +01:00
Laurent Destailleur
6f29a574cf CSS 2018-03-01 02:37:18 +01:00
Laurent Destailleur
de9f1aab0f NEW Can set the reply-to into email sent 2018-02-28 19:09:05 +01:00
Laurent Destailleur
e2c7585ae7 NEW Support alternative aliases of page name in website 2018-02-28 14:36:22 +01:00
Laurent Destailleur
575fc9f90d NEW add hook moreHtmlStatus to complete to status on banners 2018-02-27 22:06:21 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Laurent Destailleur
03858d73b1 NEW Add extrafield type "html" 2018-02-27 17:30:13 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Laurent Destailleur
8ac4cb9c43 Add fetch_product 2018-02-27 16:33:50 +01:00
Marc de Lima Lucio
9cf45266f5 NEW: supplier relative discounts 2018-02-27 16:30:39 +01:00
Rui Strecht
24ae7b4780 Suppress count warning in admin_extrafields_view.tpl 2018-02-27 14:45:17 +00:00
Laurent Destailleur
2294a50c89 Fix tooltip 2018-02-27 13:05:59 +01:00
Laurent Destailleur
7d3162313e FIX Temporary dir for mail files must be cleaned at beginning of form 2018-02-27 10:59:26 +01:00