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

47937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
acbbe823e8 Typo 2014-11-06 20:04:51 +01:00
aspangaro
a8b3153f54 Improve search in list 2014-11-06 19:47:27 +01:00
Juanjo Menent
e421741fc4 Trad: More accurate trad of holidays. Update form transifex 2014-11-06 17:33:05 +01:00
Laurent Destailleur
633e34da52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-06 13:47:38 +01:00
Laurent Destailleur
9ec71e18fc Try to track travis pb 2014-11-06 13:47:15 +01:00
Laurent Destailleur
b68bfac593 Fix: Usage of migration scripts from command line 2014-11-06 13:46:12 +01:00
Juanjo Menent
0f22ebb7b5 Trad: More accurate trad es_ES of after order. Update form transifex 2014-11-06 12:26:15 +01:00
Juanjo Menent
c422024cb9 Trad: More accurate trad of notifications. Update form transifex 2014-11-06 11:55:26 +01:00
Juanjo Menent
6f9d283ddc Fix: Module notifications DB Error "unknown field type" into third tab 
notifications
 2014-11-06 11:20:47 +01:00
aspangaro
b60f834d8d Improve search into supplier command list 2014-11-06 07:19:16 +01:00
aspangaro
4c95cab35f Improve search in customer command list 2014-11-06 07:13:03 +01:00
aspangaro
16126891a6 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-06 06:41:09 +01:00
aspangaro
b47e899e57 Merge remote-tracking branch 'origin/develop-patch' into develop-search 2014-11-06 06:40:50 +01:00
Laurent Destailleur
0ae1bfab04 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-06 00:58:43 +01:00
Juanjo Menent
eadb10e71e Trad: update es_ES from transifex 2014-11-05 22:31:23 +01:00
aspangaro
89296e3011 Typo search list 2014-11-05 22:27:26 +01:00
Frédéric FRANCE
4cb3dc4238 Update antispamimage.php 
If imagecreate fail, we can't see error message
 2014-11-05 20:02:58 +01:00
Laurent Destailleur
cc1b14e9f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-05 17:42:11 +01:00
Laurent Destailleur
b601afc92b Merge pull request #1994 from aspangaro/develop-patch 
Update module accounting
 2014-11-05 17:40:51 +01:00
Laurent Destailleur
e052010941 Merge pull request #2004 from Devensys/Develop-FixErrorFormOther 
fix error FormOther in user/card.php
 2014-11-05 17:39:29 +01:00
Laurent Destailleur
60ca5aa026 Debug of module withdraw. 2014-11-05 17:32:42 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
 2014-11-05 16:28:44 +01:00
Laurent Destailleur
31c38cedbc Fix: checkstyle 2014-11-05 16:26:11 +01:00
Laurent Destailleur
f7e71d8848 Fix: checkstyle 2014-11-05 16:23:10 +01:00
Laurent Destailleur
90fb05805c Fix: Missing translation 2014-11-05 16:21:17 +01:00
Andrelec1
5742e42689 Fix require FormOther ! 
If agenda module is desable
 2014-11-05 14:24:02 +01:00
Teddy
e37741c114 Merge pull request #4 from Dolibarr/develop 
Merge pull request #4 from Dolibarr/develop
 2014-11-05 11:20:59 +01:00
Laurent Destailleur
0d62556fa0 Maj doc 2014-11-05 11:01:53 +01:00
aspangaro
cbfa90abca Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 20:57:05 +01:00
aspangaro
aecb985659 Update work 2014-11-04 20:53:07 +01:00
Laurent Destailleur
606a3f9917 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-11-04 17:54:09 +01:00
Laurent Destailleur
504a9a92a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-04 17:42:22 +01:00
Laurent Destailleur
5656773430 Update doc 2014-11-04 17:42:01 +01:00
Laurent Destailleur
45d57b0492 Merge pull request #1995 from atm-maxime/3.4 
Fix : actioncomme report was not filtering by entity...
 2014-11-04 17:41:40 +01:00
Laurent Destailleur
5c2862dae3 Merge pull request #1976 from frederic34/patch-2 
Add a little delay in ajax_autocompleter
 2014-11-04 17:41:23 +01:00
Laurent Destailleur
420de76b4b Merge pull request #1993 from aspangaro/3.6-patch 
GPLv3
 2014-11-04 17:40:38 +01:00
Laurent Destailleur
26bd214e72 Merge pull request #1996 from aspangaro/develop-search 
Increase list search
 2014-11-04 17:40:11 +01:00
Laurent Destailleur
ebb061e68d Merge pull request #1997 from defrance69/patch-26 
Update odf.php
 2014-11-04 17:37:47 +01:00
Laurent Destailleur
c41e908dba Merge pull request #2000 from Devensys/Develop-MajPasswordPattern 
New modGeneratePass with personal conf
 2014-11-04 17:37:25 +01:00
Laurent Destailleur
fd8d571d67 Merge pull request #2003 from atm-alexis/3.6 
fix bug on thm
 2014-11-04 17:36:17 +01:00
Laurent Destailleur
e296e52531 Merge pull request #2002 from Devensys/develop-FixErrorinSQLsociete 
Develop fix errorin sq societe
 2014-11-04 17:35:39 +01:00
Laurent Destailleur
899fecb484 Some maintenance sqls 2014-11-04 16:40:01 +01:00
Alexis Algoud
d177a2fbb4 fix bug on thm 2014-11-04 16:13:51 +01:00
Alexis Algoud
af7f9e1707 no dol_include 2014-11-04 16:08:07 +01:00
Andrelec1
c9c499717b Fix bad comma 2014-11-04 14:56:18 +01:00
Andrelec1
6837ff730b Fix missing comma 2014-11-04 14:41:56 +01:00
Laurent Destailleur
0a0dd81c9a Fix: When selecting a carbon copy fro select list, mail was not attached 
to user.
 2014-11-04 13:54:18 +01:00
Andy
19980ec708 Merge pull request #3 from Dolibarr/develop 
Merge pull request #3 from Dolibarr/develop
 2014-11-04 13:42:05 +01:00