Laurent Destailleur
0c418160b9
Fix: exclude files
2013-01-17 20:56:13 +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
fhenry
b6b9f06a72
Remove bad retrun parameters
2013-01-15 18:32:14 +01:00
Laurent Destailleur
1e9cb6b1d4
Qual: A translation file must not be loaded into class constructors, but
...
at output level.
2013-01-15 17:06:53 +01:00
Laurent Destailleur
7075ae2daa
Fix: Showing warning
2013-01-15 16:08:16 +01:00
Laurent Destailleur
6a51db82e9
Qual: We can enable box by default because a warning is output to user.
2013-01-15 15:53:35 +01:00
Laurent Destailleur
db923b9814
Fix: Removed warning
2013-01-15 15:44:42 +01:00
Laurent Destailleur
e28fefc989
Fix: Missinf class
2013-01-15 15:43:37 +01:00
Laurent Destailleur
db1cd6b27f
Qual: Merge the 2 class MenuTop and MenuLeft into menu handler file
...
into 1 class MenuManager. This make code simpler and is also a first
step to optimize performance of menu loading.
2013-01-15 15:42:39 +01:00
Laurent Destailleur
ec5b4f5fa7
Fix: Start to fix some bug (pgsql compatibility), try to optimize
...
request. Added FIXME tags.
2013-01-15 15:36:04 +01:00
Laurent Destailleur
1851aa4646
Fix: Move not stable feature as experimental. Disabled box by default
...
because there is still some bug (pgsl support, filters) and major
problem to solve (it slow down seriously Dolibarr, result not accurate
for some status).
2013-01-15 15:26:46 +01:00
Laurent Destailleur
0c6c2eca8a
Fix: Removed warning
2013-01-15 13:11:36 +01:00
Laurent Destailleur
4cf56eafa5
Qual: Removed useless param
2013-01-15 12:48:46 +01:00
Laurent Destailleur
f57409ddcd
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-15 12:06:41 +01:00
Laurent Destailleur
086b223c81
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-01-15 11:50:15 +01:00
Regis Houssin
92723bd6fe
Fix: broken features
2013-01-15 11:41:12 +01:00
Regis Houssin
9152d5575f
Merge pull request #609 from FHenry/3.3
...
Add option to fecth extrafield even if extranal extrafield module is
2013-01-15 02:35:56 -08:00
Laurent Destailleur
11bb3d0137
Fix: Several fixes into boxes management: boxes was loaded twice, logs
...
were wrong, global conf missing.
2013-01-15 11:35:10 +01:00
Regis Houssin
8a6bc63127
Fix: uniformize code
2013-01-15 11:23:24 +01:00
fhenry
52b4d98849
remove parenthesis not usefull
2013-01-15 11:11:24 +01:00
