Commit Graph

34762 Commits

Author SHA1 Message Date
Laurent Destailleur
abd8aea06b Fix: Log not reported
Fix: charset not correctly forced

Conflicts:
	htdocs/install/inc.php
2013-01-28 11:56:45 +01:00
Laurent Destailleur
2002388098 Revert "New: add hook getFormMail"
This reverts commit c732532483.
2013-01-26 13:40:31 +01:00
Regis Houssin
e3be718a57 Fix: wrong object name 2013-01-25 12:38:41 +01:00
Maxime Kohlhaas
7facbf7aa2 Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough 2013-01-24 18:12:29 +01:00
Regis Houssin
b50a9415df Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-01-24 17:31:51 +01:00
Regis Houssin
c688e2afab New: add hook getFormMail 2013-01-24 17:31:22 +01:00
Laurent Destailleur
98ce66d8b7 Merge pull request #628 from simnandez/3.3
Fix:  [ bug #698 ] Bad calculation of totals of associated documents
2013-01-24 08:17:50 -08:00
simnandez
03d6903248 Fix: [ bug #698 ] Bad calculation of totals of associated documents 2013-01-24 12:53:42 +01:00
Laurent Destailleur
3472282703 Fix: [ bug #667 ] Customer categories wrong tree shown after update
3.2->3.3
2013-01-23 23:34:43 +01:00
Laurent Destailleur
5e42a9ff8a Fix: Revert again another fix that was not correct. It was no more
possible to edit a user even if user has permission for.
If module multicompany does not exists (standard mode), no
other test must be added to the if, except the $canxxx test.
2013-01-23 18:08:11 +01:00
Regis Houssin
beea9c2ec4 Fix: use the users entity 2013-01-23 15:44:51 +01:00
Regis Houssin
459adb146c Fix: only once superadmin and an admin can not delete/modify a
superadmin
2013-01-23 15:26:18 +01:00
Regis Houssin
b12101a650 Fix: only once superadmin if no multicompany setup 2013-01-23 15:11:33 +01:00
Regis Houssin
173740157f Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-01-23 11:28:49 +01:00
Regis Houssin
c66c02e745 Fix: missing files library 2013-01-23 11:28:11 +01:00
Laurent Destailleur
5f2af00397 Add logs to debug 2013-01-23 00:24:20 +01:00
Regis Houssin
06a0da990b Fix: broken features, special_code also used by externals modules ! 2013-01-22 21:35:15 +01:00
Regis Houssin
7b04da43c1 Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-01-22 18:07:22 +01:00
Regis Houssin
a019b1c854 Fix: disable "datetimepicker" from edit in place for the moment 2013-01-22 18:04:04 +01:00
Laurent Destailleur
b0c1137397 Restore correct code: A module decide if standard code is used or not
after running by a return code that is an int 
0=execute standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
2013-01-22 17:43:41 +01:00
Laurent Destailleur
d622078d08 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-22 17:14:44 +01:00
Regis Houssin
910543c5b9 Fix: broken feature 2013-01-22 16:53:39 +01:00
Laurent Destailleur
ec76127625 Fix: http://www.dolibarr.fr/forum/12-howto--aide/28089-adherents--tiers
Fix: Update member
2013-01-22 15:14:46 +01:00
Regis Houssin
a9b0469f7d Merge pull request #623 from FHenry/3.3
3.3
2013-01-21 05:31:44 -08: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
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
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
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
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
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
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
simnandez
a57f291aa2 Fix: Bad Spanish departament name 2013-01-18 09:28:54 +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
b158758e7c Fix: Missing exclude dir 2013-01-17 10:32:00 +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