lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,863 Commits 43 Branches 150 Tags 886 MiB
3438b9fa62
Commit Graph

34863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3438b9fa62 Fix: init specimen 2013-01-18 12:32:10 +01:00
Laurent Destailleur
f650888ea6 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-18 12:17:21 +01:00
Laurent Destailleur
7c826dc38d Fix: Bad error management 2013-01-18 12:09:39 +01:00
Laurent Destailleur
57a869683d Fix date function 2013-01-18 11:28:06 +01:00
Laurent Destailleur
abafd4f4ff Fix: separator was working only once. 2013-01-18 11:05:18 +01:00
Laurent Destailleur
34c5343103 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-17 20:56:28 +01:00
Laurent Destailleur
0c418160b9 Fix: exclude files 2013-01-17 20:56:13 +01:00
Laurent Destailleur
91f666bd90 Merge pull request #617 from FHenry/develop 
Fix bug on update thirdpartty webservice
 2013-01-17 11:28:35 -08:00
fhenry
685400c20e Fix bug on web service 2013-01-17 18:49:21 +01:00
Laurent Destailleur
6091f74b13 New: First changes to simplify/optimize menu management. 2013-01-17 18:39:15 +01:00
fhenry
9d5ab6daa0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-17 18:04:47 +01:00
fhenry
f665980ef0 Fix bug on update thirdpartty webservice 2013-01-17 18:03:10 +01:00
Laurent Destailleur
db54f5af44 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 18:02:51 +01:00
Laurent Destailleur
c16269d04e Fix: load at wrong place 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2013-01-17 17:59:47 +01:00
Laurent Destailleur
9d5b36b27b Fix: error set on non object 2013-01-17 17:54:08 +01:00
Laurent Destailleur
b89b74e933 Fix: load at wrong place 2013-01-17 17:40:27 +01:00
Laurent Destailleur
66921cf24a Prepare 3.4 2013-01-17 13:19:17 +01:00
Laurent Destailleur
f0f347394a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-17 13:15:30 +01:00
Laurent Destailleur
cccc7d1af3 Fix: comments 2013-01-17 13:02:34 +01:00
Laurent Destailleur
2b8aa54f68 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 10:32:49 +01:00
Laurent Destailleur
b158758e7c Fix: Missing exclude dir 2013-01-17 10:32:00 +01:00
Laurent Destailleur
9134dfc896 Prepare 3.4 2013-01-17 10:25:40 +01:00
Laurent Destailleur
c222f39c76 Prepare 3.4 2013-01-17 10:22:26 +01:00
Laurent Destailleur
dddcc0b424 Update doc 2013-01-16 21:31:27 +01:00
Laurent Destailleur
3685911bfa Merge pull request #616 from FHenry/3.3 
Fix bug [ bug #694 ] Set security permision to user belong to group
 2013-01-16 11:45:33 -08:00
Laurent Destailleur
2f528cc090 Merge pull request #615 from simnandez/3.3 
Trad: Best ca_ES and es_ES translations
 2013-01-16 11:40:35 -08:00
fhenry
968e980f58 Fix bug [ bug #694 ] Set security permision to user belong to group 2013-01-16 18:58:39 +01:00
simnandez
e820e62c03 Trad: Best ca_ES and es_ES translations 2013-01-16 18:19:48 +01:00
Laurent Destailleur
533f162e3e Fix: var not defined 2013-01-16 17:09:46 +01:00
Laurent Destailleur
0923102c4a Fix: Duplicate declaration 2013-01-16 16:53:47 +01:00
Laurent Destailleur
f97f34a302 Update doc 2013-01-16 16:28:36 +01:00
Laurent Destailleur
f1f7ff315f Fix: CRLF 2013-01-16 15:54:07 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
d40440fc45 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 14:21:56 +01:00
Laurent Destailleur
6d843e76e1 Merge pull request #614 from FHenry/develop 
Add adherent type extrafield extrafield table in migration script
 2013-01-16 05:20:07 -08:00
Laurent Destailleur
0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php
 2013-01-16 14:11:19 +01:00
fhenry
e3fd60c762 Add adherent type extrafield extrafield table in migration script 2013-01-16 13:49:44 +01:00
Laurent Destailleur
5497b93247 Fix: Removed warning 2013-01-16 13:43:25 +01:00
Laurent Destailleur
de739c58a1 Fix generator of page 2013-01-16 12:57:09 +01:00
Laurent Destailleur
3ed4a7494f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-16 12:30:53 +01:00
Laurent Destailleur
7bd6a0c1e3 Update doc 2013-01-16 12:30:39 +01:00
Laurent Destailleur
a92b1d8677 Merge pull request #613 from FHenry/3.3 
Fix bug 692, 681
 2013-01-15 14:14:49 -08:00
fhenry
ff06b05b3d Fix Bug [ bug #681 ] Can't modify a line a business proposal 2013-01-15 23:04:42 +01:00
fhenry
b8dfee2a3b Fix bug [ bug #692 ] Can't search for suppliers invoice 2013-01-15 23:03:03 +01:00
Laurent Destailleur
6a964d10f6 Merge pull request #611 from FHenry/develop 
Add update actioncomm webservice method
 2013-01-15 13:57:34 -08:00
fhenry
d3ca82d984 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-15 21:43:24 +01:00
fhenry
1605e72adb Add update actioncomm webservice method 
Fix bug on update thridparty webservice method
 2013-01-15 21:43:11 +01:00
Regis Houssin
6d882c18de Merge pull request #610 from FHenry/3.3 
Remove bad retrun parameters
 2013-01-15 10:23:12 -08:00
Laurent Destailleur
3b8e99dd4e Fix: Bad menu def 2013-01-15 18:49:53 +01:00