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

63874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a3c6746b6f Merge #8008 manually 2018-01-04 23:50:15 +01:00
Laurent Destailleur
1464937c66 Merge #8008 manually 2018-01-04 23:44:21 +01:00
Laurent Destailleur
742c4efe7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-04 23:36:35 +01:00
Laurent Destailleur
f19fb90ab0 Merge #8008 manually 2018-01-04 23:36:14 +01:00
Laurent Destailleur
24dc144cc4 Merge #8008 manually 2018-01-04 21:14:45 +01:00
Laurent Destailleur
6b8c7239cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-04 21:07:05 +01:00
Laurent Destailleur
5400bee3ed Fix title 2018-01-04 21:06:39 +01:00
Laurent Destailleur
f25b2ebc51
Merge pull request #8026 from c3do/patch-3 
Fix #8026 Remove PHP Warning adding empty($page)
 2018-01-04 21:04:33 +01:00
Laurent Destailleur
460bdd441a
Merge pull request #8025 from c3do/patch-2 
Fix #8025 Remove PHP Warning adding empty($page)
 2018-01-04 21:04:22 +01:00
Laurent Destailleur
055d0e138e
Merge pull request #8024 from c3do/patch-1 
Fix #8024 Remove PHP notices adding empty($page)
 2018-01-04 21:04:12 +01:00
Laurent Destailleur
21506f25b9
Merge pull request #8022 from OPEN-DSI/core_access_rights_resource_multientities 
Fix: Access rights for resource in multi-entities
 2018-01-04 21:03:55 +01:00
Laurent Destailleur
60976c08e4
Merge pull request #8010 from atm-john/FIX_supplier_invoice_lines_extrafields_reception 
Fix extrafields transmition from supplier order to supplier invoice : lines part
 2018-01-04 20:57:20 +01:00
Laurent Destailleur
cc24634cfd
Merge pull request #8007 from atm-florian/develop 
fix #8004
 2018-01-04 20:56:38 +01:00
Laurent Destailleur
90e9b3db68 Fix look and feel v7 2018-01-04 20:42:57 +01:00
Laurent Destailleur
e10a9912dc Fix missing worload 2018-01-04 19:54:30 +01:00
Laurent Destailleur
6b77dc3b5d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2018-01-04 19:30:25 +01:00
Laurent Destailleur
b2feac9d90 CVE-2017-17971 2018-01-04 19:25:52 +01:00
Laurent Destailleur
01cde59608 Fix filter on bookkeeping group view 2018-01-04 19:16:53 +01:00
Laurent Destailleur
56b27a3a11 Fix: do no lose filter when deleting a bookeeping transaction 2018-01-04 19:03:01 +01:00
Laurent Destailleur
ebc76b5f27 Fix tooltips on thirdparty and invoice 2018-01-04 18:29:12 +01:00
Cédric
4ed86c830a
Fix PHP Warning 
Warning: A non-numeric value encountered in dolibarr/htdocs/accountancy/bookkeeping/list.php on line 89
 2018-01-04 17:42:23 +01:00
Cédric
777ed43e75
Remove PHP notices adding empty($page) 2018-01-04 17:31:59 +01:00
Cédric
41fec45daf
Fix PHP notices adding empty($page) 2018-01-04 16:23:25 +01:00
Laurent Destailleur
59ed23069c Fix debug accounting module 2018-01-04 15:52:07 +01:00
KHELIFA
7d824b3ef2 Fix: Access rights for resource in multi-entities 2018-01-04 15:05:11 +01:00
Laurent Destailleur
f4c62a3bd9 Fix ui 2018-01-04 14:54:04 +01:00
Laurent Destailleur
300d4e1603 Fix disable direct debit request for replaced invoices 2018-01-04 14:35:02 +01:00
Laurent Destailleur
c4eba665d0 Fix order of task in gantt diagram 2018-01-04 13:52:37 +01:00
Laurent Destailleur
04dd0663ff Fix translation 2018-01-04 12:17:32 +01:00
Laurent Destailleur
b3465d441a Missing ajaxcombobox 2018-01-04 10:45:48 +01:00
Laurent Destailleur
f6007045f5 Fix search filters 2018-01-04 00:23:08 +01:00
Laurent Destailleur
6bc8268dc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-01-03 23:35:15 +01:00
Laurent Destailleur
534cbcb941 Debug translation 2018-01-03 20:59:35 +01:00
Laurent Destailleur
48261f793d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/admin/product.php
 2018-01-03 20:21:10 +01:00
Laurent Destailleur
f6ff6610e4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-03 20:13:56 +01:00
Laurent Destailleur
c7798d11ce Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-03 20:13:17 +01:00
Laurent Destailleur
bc1f741600 Fix duplicate instructions 2018-01-03 14:46:18 +01:00
florian HENRY
2bd8bafc1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-01-03 12:06:59 +01:00
Laurent Destailleur
c3f8012dfb Update vat rates 2018-01-02 23:05:40 +01:00
Laurent Destailleur
ca14dd790b Fix module website 2018-01-02 22:58:37 +01:00
Laurent Destailleur
c98b5c7ec7 Fix css background 2018-01-02 17:27:05 +01:00
John
9180121999 Fix extrafields transmition from supplier order lines to supplier invoice lines 2018-01-02 12:06:11 +01:00
florian HENRY
320465aeb9 fix : #8003 2018-01-02 09:46:45 +01:00
florian HENRY
abe53cad05 fix #8004 2018-01-02 09:36:37 +01:00
Laurent Destailleur
24a59a7731
Merge pull request #8002 from fappels/7.0_fix_on_fix_mail_trigger 
Fix on #7981 sendmail trigger error
 2017-12-31 12:53:02 +01:00
Laurent Destailleur
affce9c0a7
Merge pull request #8001 from frederic34/patch-1 
correct merge
 2017-12-31 12:49:02 +01:00
fappels
b6e3d312ad Fix on #7981 
Trigger interface does not set error eventmessage.
Improvement:
Show both trigger error and mail send succesful, so you know mail was
send succesful bot some trigger action after sending mail failed.
 2017-12-30 12:12:13 +01:00
Frédéric FRANCE
0fae2ba8ca
correct merge 2017-12-29 20:41:39 +01:00
Laurent Destailleur
77be56ff74
Merge pull request #7991 from defrance/patch-103 
Add project column on proposal list
 2017-12-28 13:03:03 +01:00
Laurent Destailleur
af8ebc616b
Update list.php 2017-12-28 13:02:26 +01:00