Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,918 Commits 36 Branches 190 Tags
d71ccc4a0292f3bbdd449768b51a4c310f4e744c
Commit Graph

49918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
philippe grand
47fd949068 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-03 14:35:35 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
9e7ded94af Clean init/demo file. Demo init must contains real and clean values 2015-10-03 13:00:44 +02:00
Laurent Destailleur
a9e55fd08f FIX Missing contracts into list in page of Refering objects of a 
thirdparty.
 2015-10-03 12:57:58 +02:00
philippe grand
19df00579d Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-10-03 12:44:00 +02:00
philippe grand
d19a9f66b3 Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8 2015-10-03 12:43:38 +02:00
Laurent Destailleur
996c9ca2ba FIX Can't change state on a contact 2015-10-03 12:21:27 +02:00
Laurent Destailleur
b6a83ed5a6 FIX Can't delete thirdparty if there is some discounts 2015-10-03 12:20:50 +02:00
Frédéric FRANCE
7da49a3592 Add badge for number of files in bank's tab 2015-10-03 12:09:42 +02:00
Frédéric FRANCE
322a2a54b8 Update printing.php 2015-10-03 11:34:14 +02:00
Laurent Destailleur
10b481f47f Fix colspan 2015-10-03 11:15:12 +02:00
Frédéric FRANCE
471e75f029 Lost search_status on next page button 2015-10-03 10:15:07 +02:00
Frédéric FRANCE
418bcf8d36 Update style.css.php 2015-10-03 10:00:06 +02:00
aspangaro
9191b77ecd Merge remote-tracking branch 'Upstream/develop' into develop-68 2015-10-03 08:21:35 +02:00
aspangaro
6969339159 Try for responsive design 2015-10-03 08:18:03 +02:00
Laurent Destailleur
e444cb57d4 Fix bad print 2015-10-03 00:35:26 +02:00
Laurent Destailleur
5acf961f23 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-03 00:10:19 +02:00
Frédéric FRANCE
f643613d69 Typo 2015-10-02 17:07:22 +02:00
Frédéric FRANCE
f295b38ccb Typo 2015-10-02 17:05:58 +02:00
Laurent Destailleur
920803518f Removed not used table 2015-10-02 16:31:34 +02:00
Frédéric FRANCE
d451051d97 can't access documents for bank 2015-10-02 16:29:54 +02:00
Laurent Destailleur
43f09dfccf Work on theme 2015-10-02 16:26:08 +02:00
Frédéric FRANCE
8a984980ca Type (broken facture.php) 2015-10-02 16:16:05 +02:00
Frédéric FRANCE
17f6e5e48c Update suppliers.lang 2015-10-02 16:07:56 +02:00
Laurent Destailleur
1ffe8f55ca Clean skin code. Prepare to allow more option to choose colors. 2015-10-02 15:37:32 +02:00
philippe grand
ac7ee86da3 fix : Typo 2015-10-02 13:41:07 +02:00
Frédéric FRANCE
379ebba8ac Update files.lib.php 2015-10-02 13:12:35 +02:00
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Laurent Destailleur
5a7adf9b47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-02 11:58:41 +02:00
Laurent Destailleur
17a5b0a0f4 Fix css 2015-10-02 11:58:19 +02:00
Juanjo Menent
bb050734b1 Merge pull request #3638 from hregis/develop_origin 
Fix: wrong date format
 2015-10-02 11:53:22 +02:00
philippe grand
12275871a8 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2015-10-02 11:29:35 +02:00
Regis Houssin
8912e111a3 Fix: wrong date format 2015-10-02 11:21:23 +02:00
Juanjo Menent
cfa6938e5e Merge pull request #3637 from hregis/develop_origin 
Fix: sql error, status is an integer
 2015-10-02 11:11:39 +02:00
Juanjo Menent
f33d6de8c1 Merge pull request #3636 from frederic34/patch-10 
Update index.php
 2015-10-02 11:10:46 +02:00
Juanjo Menent
4c1e018ded Merge pull request #3621 from fmarcet/3.8 
FIX Only are showing one object linked
 2015-10-02 11:03:19 +02:00
Regis Houssin
65935c6603 Fix: copy/paste error 2015-10-02 10:46:32 +02:00
Regis Houssin
6f9b0e1053 Fix: sql error, status is an integer 2015-10-02 10:37:08 +02:00
Frédéric FRANCE
6e947add92 Update index.php 2015-10-02 08:58:09 +02:00
Laurent Destailleur
53269a2703 Removed old theme with no maintener. 2015-10-01 23:27:41 +02:00
Laurent Destailleur
fcf3a0966c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-01 23:19:58 +02:00
Laurent Destailleur
3f8b95de77 Work on default theme 2015-10-01 23:19:50 +02:00
Laurent Destailleur
f11fd22809 More accurate message 2015-10-01 22:27:02 +02:00
Laurent Destailleur
5ad665d00c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-01 16:50:52 +02:00
Laurent Destailleur
60c0338d64 FIX #3628 2015-10-01 16:50:18 +02:00
Laurent Destailleur
e76124add5 FIX #3606 2015-10-01 16:09:51 +02:00
Florian HENRY
fd29bb34be FIX : Mass Mailing activity don't display all status 2015-10-01 16:09:04 +02:00
Laurent Destailleur
4201e8b032 FIX #3630 - Wrong balance report when module salaries and donation 
disabled
 2015-10-01 14:38:31 +02:00
Laurent Destailleur
e2a88cd010 Merge pull request #3626 from GPCsolutions/3.8-3607 
FIX #3607 Better categories setting and unsetting
 2015-10-01 13:59:05 +02:00