lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,510 Commits 43 Branches 150 Tags 886 MiB
5647a61d98
Commit Graph

26510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Regis Houssin
5647a61d98 Fix: cvs conflict 2011-06-30 17:43:33 +02:00
Regis Houssin
83449ce467 Merge branch '3.1.0-dev' of 
git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.1.0-dev

Conflicts:
	htdocs/install/mysql/migration/3.0.0-3.1.0.sql

Change-Id: I1348ca7ff239c1866d283cfe5db09724ef9e6d85
 2011-06-30 17:41:03 +02:00
Regis Houssin
f085258243 Fix: conflict with cvs 2011-06-30 17:21:21 +02:00
Regis Houssin
9359373fc4 cvsimport 
Conflicts:
	htdocs/install/mysql/migration/3.0.0-3.1.0.sql
 2011-06-30 17:14:45 +02:00
Regis Houssin
c68c82d117 cvsimport 2011-06-30 16:35:15 +02:00
Regis Houssin
71ef4d04d2 Fix: Name of hook must also be unique for each tab 2011-06-30 13:40:34 +00:00
Regis Houssin
7874af0e58 Fix: Name of hook must also be unique for each tab 2011-06-30 13:27:20 +00:00
Regis Houssin
79880a1aea Fix: regression, canvas is broken and societe.class and contact.class are incompatible with callHook function 2011-06-30 13:25:32 +00:00
Laurent Destailleur
6385641a8e Fix: tmp file must be removed if error. 2011-06-30 07:52:43 +00:00
Laurent Destailleur
ddfca31875 Fix: tmp file must be removed if error. 2011-06-30 07:49:26 +00:00
Laurent Destailleur
3b81558d2d New: Can add user login into menu urls added by modules. 2011-06-29 22:42:42 +00:00
Laurent Destailleur
d212413d08 New: Can add user login into menu urls. 2011-06-29 22:41:49 +00:00
Laurent Destailleur
2510fa1277 Qual: Uniformize code. Actions canvas conflicts with actions hook. So now we always hook to intercept actions. Name of hook must also be unique for each tab. 2011-06-29 22:29:50 +00:00
Regis Houssin
6d407b58d4 Fix: update jquery libraries 2011-06-29 19:29:26 +00:00
Laurent Destailleur
e381abf410 Serious enhancement of expenses module 2011-06-29 17:55:32 +00:00
Philippe Grand
092a3b6dd6 To change a bill owner if mistaking 
This parameters should be used for troubleshooting using FACTURE_CHANGE_THIRDPARTY
 2011-06-29 15:48:02 +00:00
Laurent Destailleur
4f68fc0c23 Fix: Style 2011-06-29 13:04:34 +00:00
Laurent Destailleur
46e34e6069 Fix: Style 2011-06-29 12:58:32 +00:00
root
661ef186e2 cvsimport 
Conflicts:
	htdocs/install/mysql/migration/3.0.0-3.1.0.sql
 2011-06-29 14:22:19 +02:00
Laurent Destailleur
508a1d00a2 Uniformize table fields 2011-06-29 11:22:35 +00:00
Laurent Destailleur
cb035666a6 Add patch to add signature on user. 2011-06-29 10:23:32 +00:00
Herve Prot
873c1ff160 Modify .gitignore 2011-06-29 01:04:22 +02:00
Laurent Destailleur
a2b1d97683 Doxygen 2011-06-28 20:31:23 +00:00
root
c159ee9639 purge 2011-06-28 17:45:47 +02:00
Regis Houssin
9f10a7c6e5 Test: commit to git branch dev to sync in cvs 2011-06-28 15:06:26 +00:00
Regis Houssin
2650480298 Commit to dev branch test 2 2011-06-28 15:05:44 +00:00
Regis Houssin
7c502d96bb cvsimport 2011-06-28 14:20:22 +00:00
Regis Houssin
eaea7ff804 Merge remote branch 'origin/3.1.0-dev' into 3.1.0-dev 2011-06-28 16:24:25 +02:00
Regis Houssin
7047001913 Commit to dev branch test 2 2011-06-28 16:23:05 +02:00
Regis Houssin
af34f28dfb Test2: commit to cvs for sync in git 2011-06-28 14:20:22 +00:00
Regis Houssin
ba60c9773e Test2: commit to cvs for sync in git 2011-06-28 14:20:22 +00:00
Regis Houssin
fdee3400ff Test: commit to git branch dev to sync in cvs 2011-06-28 15:43:44 +02:00
Regis Houssin
ddc92079db cvsimport 2011-06-28 13:42:06 +00:00
Regis Houssin
e35a21371f Test: commit to cvs for sync in git 2011-06-28 13:42:06 +00:00
Regis Houssin
8e86faf8b9 Test: commit to cvs for sync in git 2011-06-28 13:42:06 +00:00
Regis Houssin
d2c28a5911 Test git to cvs synchro 2011-06-28 12:25:43 +00:00
Regis Houssin
0e19bbdfa7 Test git to cvs synchro 2011-06-28 12:25:43 +00:00
cdelambert
7528eebd06 possibility of having two classes with the same name in two different tree level 2011-06-28 09:25:57 +00:00
cdelambert
34de5300fb possibility of having two classes with the same name in two different tree level 2011-06-28 09:25:57 +00:00
Laurent Destailleur
0baf406b3b Clean install 2011-06-28 07:47:10 +00:00
Laurent Destailleur
41eead006a Clean install 2011-06-28 07:47:10 +00:00
Laurent Destailleur
7ce9cfca74 Removed deprecated table 2011-06-28 07:18:32 +00:00
Laurent Destailleur
313c9871db Removed deprecated table 2011-06-28 07:18:32 +00:00
Laurent Destailleur
9f477147fd New: Add module field to allow external modules to set their name when they add a new record during init/remove. 2011-06-28 07:12:41 +00:00
Laurent Destailleur
1c900f9375 New: Add module field to allow external modules to set their name when they add a new record during init/remove. 2011-06-28 07:12:41 +00:00
Regis Houssin
845aee499b Merge remote branch 'origin/master' into test 2011-06-27 18:21:21 +02:00
Regis Houssin
518abfa56a Test git to cvs synchro 2011-06-27 18:15:47 +02:00
Regis Houssin
b56edeae24 Fix: delete old table 2011-06-27 18:13:50 +02:00
Herve Prot
c808e24380 Merge branch 'master' of git+ssh://github.com/Dolibarr/dolibarr 
Conflicts:
	.gitignore
Problem solved
 2011-06-27 17:20:30 +02:00
Herve Prot
8e69df637c Modify .gitignore 2011-06-27 17:19:17 +02:00