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

34825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Regis Houssin
787d3bd6a9 Fix: use event method 2013-01-15 11:00:32 +01:00
fhenry
f214c06b1e Add option to fecth extrafield even if extranal extrafield module is 
enabled. Usefull for web service to fetch optionnal from llx_extrafields
even if record or update is manage by hook with external module
 2013-01-15 10:20:19 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
3332709ba1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 16:51:38 +01:00
Regis Houssin
e06912dff3 Merge pull request #608 from FHenry/develop 
Add standard extrafield type : mail, phone, price
 2013-01-14 07:19:07 -08:00
fhenry
51098c1227 Add standard extrafield type : 
- mail
	- phone
	- price
 2013-01-14 16:13:09 +01:00
Laurent Destailleur
6942700ce7 New: Direct jump to edit page 2013-01-14 15:18:15 +01:00
Laurent Destailleur
e8ab24949a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 13:08:48 +01:00
Laurent Destailleur
49313fff3b Fix: External user should not see boxes of modules not allowed to 
external users.
 2013-01-14 13:06:08 +01:00
Laurent Destailleur
b9dc76ebaf Fix: List of contacts when connected as external user. 2013-01-14 12:27:19 +01:00
Laurent Destailleur
6746e76564 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 12:24:06 +01:00
Regis Houssin
f954ff509c Merge pull request #607 from atm-maxime/develop 
Display bug on FF while closing proposal
 2013-01-14 03:22:11 -08:00
Maxime Kohlhaas
14dde75c4b Display bug on FF while closing proposal 2013-01-14 12:17:21 +01:00
Regis Houssin
c9e4da8533 Merge pull request #606 from atm-maxime/develop 
Multi-company compatibility with transverse mode
 2013-01-14 03:04:22 -08:00
Maxime Kohlhaas
6abf682faa Multi-company compatibility with transverse mode for pdf models 2013-01-14 12:01:44 +01:00
Laurent Destailleur
07ba988cf8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 11:45:16 +01:00
Laurent Destailleur
297c10d16b Qual: externalise code of merging PDFs into a library. 2013-01-14 11:39:30 +01:00
Maxime Kohlhaas
fb1d99d0dd Multi-company compatibility with transverse mode for home boxes 2013-01-14 11:09:10 +01:00
Regis Houssin
cf12815ca9 Fix: phpunit error 2013-01-14 09:39:35 +01:00
Laurent Destailleur
0861fbfeb6 Fix: Missing kenya currency 2013-01-13 23:47:23 +01:00