lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,388 Commits 43 Branches 150 Tags 886 MiB
5c0e581d5a
Commit Graph

60388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5c0e581d5a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-16 13:01:07 +02:00
Laurent Destailleur
7b2a71802b Do some TODO on modulebuilder module. 2017-07-16 13:00:35 +02:00
Laurent Destailleur
84d76f26f2 Fix missing picto 2017-07-15 21:55:05 +02:00
Laurent Destailleur
75ec7a309c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-15 21:25:14 +02:00
Laurent Destailleur
e5513cff91 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2017-07-15 21:24:21 +02:00
Laurent Destailleur
4e45c7fdba Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-15 21:21:40 +02:00
Laurent Destailleur
3cd21ee659 Fix sort order 2017-07-15 21:19:39 +02:00
Laurent Destailleur
bab963ec07 FIX Pagination on the ledger page. 2017-07-15 19:19:12 +02:00
Laurent Destailleur
d671421b8b Fix journalization of vat payments 2017-07-15 18:29:18 +02:00
Laurent Destailleur
fa00373e56 Fix remove log 2017-07-15 17:52:30 +02:00
Laurent Destailleur
644486b4a0 Fix css 2017-07-15 17:32:36 +02:00
Laurent Destailleur
a20bf05c64 Debug journalization 2017-07-15 17:32:22 +02:00
Laurent Destailleur
f9b9a9972e Fix value not defined 2017-07-15 17:22:57 +02:00
Laurent Destailleur
c6dcccba18 Fix better warning when record will be saved into a waiting account. 2017-07-15 14:55:04 +02:00
Laurent Destailleur
03d9cbb170 Fix refresh of list when change were done 2017-07-15 13:31:56 +02:00
Laurent Destailleur
248717ccac Fix refresh of list when change were done 2017-07-15 13:31:14 +02:00
Laurent Destailleur
1735a649e9 Fix permission on salary module 2017-07-15 13:02:41 +02:00
Laurent Destailleur
0763d15b4c Debug journalization 
Debug edition of user BAN.
 2017-07-15 12:37:31 +02:00
Laurent Destailleur
ab6646d16b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/bank/bankentries.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-07-15 03:54:50 +02:00
Laurent Destailleur
4055ac82ab Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-15 03:47:54 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
Laurent Destailleur
24ecd48b22 Minor fix 2017-07-15 03:40:37 +02:00
Laurent Destailleur
de66971d93 Fix bad setup 2017-07-14 15:49:33 +02:00
Laurent Destailleur
0fc56d2bcd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-14 15:26:03 +02:00
Laurent Destailleur
6a272523c0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-14 15:22:57 +02:00
Laurent Destailleur
e551c0a665 Fix autofill of amount on supplier payment page 2017-07-14 15:22:30 +02:00
Laurent Destailleur
2188135fb2 Prepare 7.0 alpha 2017-07-14 14:41:25 +02:00
Laurent Destailleur
3ac85e10c5 NEW Add mass action "validate" on supplier invoices. 
NEW Add date_valid and date_pointoftax on supplier invoices.
 2017-07-14 14:40:09 +02:00
Laurent Destailleur
bbc8994d36 Fix css 2017-07-14 13:28:21 +02:00
Laurent Destailleur
1ad7210506 Fix var not initialized 2017-07-14 03:14:21 +02:00
Laurent Destailleur
ccd20d979f Fix template 2017-07-14 03:09:58 +02:00
Laurent Destailleur
15cf15f47f Look and feel v6 2017-07-14 02:07:01 +02:00
Laurent Destailleur
201db3b720 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/tasks/task.php
 2017-07-14 00:24:49 +02:00
Laurent Destailleur
f9a99f506f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-14 00:17:49 +02:00
Laurent Destailleur
f106ff7e76 Fix var init 2017-07-13 23:52:02 +02:00
Laurent Destailleur
312b153005 Fix phpcs 2017-07-13 23:46:01 +02:00
Laurent Destailleur
652d715fdc Better translation 2017-07-13 18:18:56 +02:00
Laurent Destailleur
3db7bd7624 Fix look and feel v6 2017-07-13 17:44:12 +02:00
Laurent Destailleur
2b77c9b5c7 FIX #7050 2017-07-13 16:56:36 +02:00
Laurent Destailleur
be8e15a777 Prepare fix 2017-07-13 16:25:38 +02:00
Laurent Destailleur
7eb4562432 Code comment 2017-07-13 15:22:07 +02:00
Laurent Destailleur
43f6eab2ea FIX #7146 2017-07-13 15:16:17 +02:00
Laurent Destailleur
c434f72d31 Merge pull request #7146 from hregis/6.0_bug3 
Fix: travis error (categorie)
 2017-07-13 14:46:41 +02:00
Laurent Destailleur
ae7797ebf2 Look and feel v6 2017-07-13 14:43:41 +02:00
Laurent Destailleur
85d9a2f790 Merge pull request #7145 from hregis/6.0_bug2 
Fix: missing group name with dol_banner_tab
 2017-07-13 14:36:17 +02:00
Laurent Destailleur
4ee70e496e Merge pull request #7143 from hregis/6.0_bug 
Fix: missing entity filter (multicompany)
 2017-07-13 14:33:45 +02:00
Laurent Destailleur
74e29a3fdb FIX empty object 2017-07-13 14:32:49 +02:00
Laurent Destailleur
bea3ced763 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-13 14:32:03 +02:00
Laurent Destailleur
dec1ae863b Merge pull request #7142 from atm-alexis/FIX_task_view_without_thirdparty 
FIX empty thirdparty getNomUrl() call without thirdparty
 2017-07-13 14:31:08 +02:00
Laurent Destailleur
cbd9adc052 Update task.php 2017-07-13 14:30:50 +02:00