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

49592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Menent
5d10fc2c77 Merge pull request #3644 from frederic34/patch-14 
can't access documents for bank
 2015-10-03 15:57:58 +02:00
Juanjo Menent
553c8c0bd0 Merge pull request #3643 from frederic34/patch-12 
Typo (broken facture.php)
 2015-10-03 15:57:04 +02:00
Juanjo Menent
d1a52119e4 Merge pull request #3642 from frederic34/patch-11 
Update suppliers.lang
 2015-10-03 15:56: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
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
Laurent Destailleur
10b481f47f Fix colspan 2015-10-03 11:15:12 +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
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
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
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
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
Laurent Destailleur
09e5d71796 Merge pull request #3631 from hregis/develop_origin 
Fix: missing llx_const encryption
 2015-10-01 13:57:47 +02:00
Laurent Destailleur
4057d682f1 Merge pull request #3633 from hregis/develop_bug 
Fix: avoid error during update if db port not defined
 2015-10-01 13:56:48 +02:00
Regis Houssin
45a70d7dc3 Fix: wrong test 2015-10-01 12:41:29 +02:00
Regis Houssin
1c023e291c Fix: avoid error during update if db port not defined 2015-10-01 12:35:38 +02:00
Regis Houssin
259f7af3e6 Fix: missing llx_const encryption 2015-10-01 12:06:45 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Laurent Destailleur
076f2ed9d1 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/lib/security.lib.php
 2015-10-01 11:10:47 +02:00
Laurent Destailleur
72c31c0fa9 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-10-01 10:48:28 +02:00
Laurent Destailleur
4da8fb901b Add comment 2015-10-01 10:48:09 +02:00
Laurent Destailleur
1907e5da54 Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat 
FIX facturestat bad sql when customer view is limited
 2015-10-01 10:48:05 +02:00
Laurent Destailleur
34adc60d26 Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company 
FIX error in SQL due to a previous fix
 2015-10-01 10:35:07 +02:00
Laurent Destailleur
9c28894ec3 Merge pull request #3615 from FHenry/3.7 
FIX : When delete actioncomm also delete actioncomm_resources
 2015-10-01 10:34:54 +02:00
Laurent Destailleur
0c64fa04bc Merge pull request #3614 from marcosgdf/bug-3572 
FIX #3572 Impossible to attach project in order. The option to use autocompletion for project failed.
 2015-10-01 10:32:32 +02:00
Laurent Destailleur
9c4a12b9d4 Merge pull request #3613 from aspangaro/develop-68 
Fix : remove viewport for mobile device already declared
 2015-10-01 10:29:39 +02:00
Laurent Destailleur
74fb718b77 Merge pull request #3612 from grandoc/3.7 
missing translation
 2015-10-01 10:28:27 +02:00