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

30122 Commits

Author SHA1 Message Date
Laurent Destailleur
3faa2b558f Renamed param. 2013-01-21 15:04:34 +01:00
Regis Houssin
71dd160c41 Fix: uniformize name 2013-01-21 14:35:49 +01:00
Regis Houssin
5b34f6ba4e Merge pull request #622 from jfefe/webservices 
Missing societe_id for user when called by webservice
 2013-01-21 05:33:14 -08:00
fhenry
7cc548db31 Force get list of extrafield even if external module manage extrafield 2013-01-21 13:52:59 +01:00
fhenry
91e86c5a59 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-21 13:48:29 +01:00
fhenry
bc8c36b08f Add parameters force get Extarfield list from ll_extrafield even if 
external extrafield module is enabled
 2013-01-21 13:48:15 +01:00
jfefe
a201d8cea0 Fix : bad classname in webservice to create an order 2013-01-21 11:43:22 +01:00
jfefe
8d8e649646 Rename societe_id -> id_thirdparty in webservice method to get an user 2013-01-21 11:42:25 +01:00
Laurent Destailleur
05bd489b82 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/admin/index.php
 2013-01-21 01:12:19 +01:00
Laurent Destailleur
e236ac3f03 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-21 01:07:22 +01:00
Laurent Destailleur
9cf405f9d2 Fix: syntax error 2013-01-21 01:06:52 +01:00
eldy
b3dbbe94e9 Missing div warning 
Conflicts:
	htdocs/admin/index.php
 2013-01-20 16:21:52 +01:00
eldy
4e8aaa99b5 Removed dead code 2013-01-20 15:41:39 +01:00
eldy
5fe1f38666 Missing div warning 2013-01-20 15:37:33 +01:00
eldy
5c49947750 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-20 15:32:48 +01:00
jfefe
b76fd1804b Missing societe_id for user when called by webservice 2013-01-20 15:31:24 +01:00
eldy
d1dc04761a Fix: dev rule to build portable requests 2013-01-20 15:30:51 +01:00
eldy
6ded74d5dd Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-20 15:22:14 +01:00
eldy
fc011610bb Fix: pgsql 2013-01-20 15:21:18 +01:00
jfefe
7a60bd0b3c Fix : missing class / bad user when create thirdparty with contact and 
user by webservice method
 2013-01-20 12:39:26 +01:00
jfefe
1ab6fe6c21 Fix : missing class / bad user when create thirdparty with contact and 
user by webservice method
 2013-01-20 11:56:56 +01:00
Laurent Destailleur
5597e1b5c2 Protection to avoid not desired modules into packages 2013-01-19 18:47:35 +01:00
Laurent Destailleur
d411310651 Trad 2013-01-19 17:58:20 +01:00
Laurent Destailleur
2f3ed04023 Add info if session are encrypted 2013-01-19 17:56:26 +01:00
Laurent Destailleur
47c42943e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-01-19 16:29:35 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
3551dff18a Fix: [ bug #671 ] Product country origin is automatically entered in 
description of invoices, but not in invoices generated from orders
 2013-01-19 15:57:28 +01:00
Laurent Destailleur
7002b328a8 Fix: [ bug #685 ] Supplier invoices should use encoding sequence number 
as secondary sorting field
 2013-01-19 15:32:03 +01:00
Laurent Destailleur
f701559056 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-19 14:32:50 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
simnandez
f7e5edb0f8 [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 2013-01-19 10:45:57 +01:00
Laurent Destailleur
0e060cac11 Merge pull request #619 from FHenry/develop 
Update web service
 2013-01-18 09:39:13 -08:00
Laurent Destailleur
aaa56ce606 Merge pull request #618 from simnandez/3.3 
Fix: Bad Spanish departament name
 2013-01-18 09:30:45 -08:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +01:00
Laurent Destailleur
591eab4826 Detect another problem into box. Just add a comment. 2013-01-18 14:22:18 +01:00
Laurent Destailleur
a12972034f Fix: Start to fix some bugs 2013-01-18 13:56:36 +01:00
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
fhenry
e4b704f76d Update web service 2013-01-18 11:10:56 +01:00
Laurent Destailleur
abafd4f4ff Fix: separator was working only once. 2013-01-18 11:05:18 +01:00
simnandez
a57f291aa2 Fix: Bad Spanish departament name 2013-01-18 09:28:54 +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
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
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
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
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
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
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
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
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