Commit Graph

30273 Commits

Author SHA1 Message Date
fhenry
0d0c1e8c14 Fix [ bug #736 ] 2013-02-28 21:18:52 +01:00
fhenry
7952a1f1a5 rool back changes 2013-02-28 21:15:45 +01:00
fhenry
dcf76d7bcb Fix [ bug #736 ] 2013-02-28 21:13:25 +01:00
Regis Houssin
16ad99f8c5 Fix: to force id field name 2013-02-28 19:41:44 +01:00
Regis Houssin
d9b7886ef9 Fix: try to fix regression, stored the last id created in a session
variable in order to be used to find out information in the "ref_ext" in
order to differentiate automatic actions.
2013-02-28 18:47:38 +01:00
Laurent Destailleur
d190e924b3 Fix: Update of type was not working. 2013-02-27 19:43:40 +01:00
Laurent Destailleur
8b244b0d61 Fix: select lost if error 2013-02-27 19:21:40 +01:00
Laurent Destailleur
47c89dfd8e Fix: trans 2013-02-27 17:47:51 +01:00
Laurent Destailleur
f2371be191 Fix: Update button does not appear 2013-02-27 15:24:08 +01:00
Laurent Destailleur
283aeb2945 Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
2013-02-27 01:06:08 +01:00
Laurent Destailleur
18aff92366 Merge pull request #683 from FHenry/3.3
Fix [ bug #733 ]
2013-02-26 11:03:36 -08:00
Laurent Destailleur
c4948ea3db Fix: It seems foreign key is not deleted sometimes. To be sure, we force
delete also at end.
2013-02-25 20:23:44 +01:00
fhenry
af6bb94ff3 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 15:02:33 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
Regis Houssin
ae154ed9a3 Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3 2013-02-22 13:15:41 +01:00
Regis Houssin
b5d2a378fa Fix: pdf models are unstable and time consuming. 2013-02-22 13:14:54 +01:00
Laurent Destailleur
6b50ddf6ec Merge pull request #682 from FHenry/3.3
Fix bug #730
2013-02-22 03:45:32 -08:00
Regis Houssin
dd7411593e Fix: wrong hidden 2013-02-22 12:21:49 +01:00
Regis Houssin
3b45cffafa Fix: hide blocs with multi-page 2013-02-22 11:26:23 +01:00
Regis Houssin
20522148f2 Fix: regression, the product discount overwrites the default customer
discount !
2013-02-22 11:06:45 +01:00
fhenry
aa473fa3e3 Fix bug #730 2013-02-22 09:42:02 +01:00
simnandez
723c46ec42 Fix: Pagination at bottom not work correctly with filters applied 2013-02-21 14:29:06 +01:00
Laurent Destailleur
3687b29a7b Fix: Missing translation 2013-02-20 21:42:20 +01:00
Laurent Destailleur
402bc48b24 Merge pull request #666 from grandoc/3.3
fix language
2013-02-19 01:13:00 -08:00
simnandez
15f6f7c335 Fix: Translation 2013-02-18 17:07:20 +01:00
Grand Philippe
3ce75ce382 fix: bad commit 2013-02-18 16:57:38 +01:00
Grand Philippe
108b4d1ae9 fix language 2013-02-18 16:10:27 +01:00
Laurent Destailleur
b5260e4ab1 Fix: Translation 2013-02-18 14:13:02 +01:00
Laurent Destailleur
f82bec552b Fix: Check id field are mandatory 2013-02-18 13:07:32 +01:00
Laurent Destailleur
d6e907b69b Fix: Nb of holidays was not using correct user 2013-02-17 19:26:33 +01:00
Laurent Destailleur
df2fde3a68 Prepare 3.3 release 2013-02-17 17:17:19 +01:00
Laurent Destailleur
b434f58af3 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:06 +01:00
Laurent Destailleur
d2074d1a17 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:06:55 +01:00
Laurent Destailleur
aff919fd10 Fix: Bad test 2013-02-17 12:45:46 +01:00
fhenry
f043fcfaf7 Fix bug [ bug #709 ] 2013-02-14 13:55:05 +01:00
Laurent Destailleur
365680d90e Fix: Missing vat rates 2013-02-13 21:25:17 +01:00
Laurent Destailleur
031bc911ea Fix: Mass save or update of const fails. 2013-02-13 16:47:25 +01:00
Laurent Destailleur
2dce0c68e8 Merge pull request #652 from cbattarel/3.3
3.3 : fix bug in contract update line (wrong vat variable name)
2013-02-13 05:56:09 -08:00
Christophe Battarel
c6b263c586 fix bug in contract update line (wrong vat variable name) 2013-02-13 09:53:26 +01:00
Laurent Destailleur
ddf27b2c67 Fix Bug 708 2013-02-12 15:01:16 +01:00
Laurent Destailleur
8a72ff8fc2 Fix: bad translation 2013-02-12 14:48:51 +01:00
Laurent Destailleur
fed591d989 Merge pull request #641 from simnandez/3.3
Fix: Amarok login page issues
2013-02-10 17:37:38 -08:00
Laurent Destailleur
4d9f22c909 Renamed "Salvador" into "El Salvador" 2013-02-10 22:09:25 +01:00
Laurent Destailleur
e5e9dc404b Fix: Bad choice of template 2013-02-10 21:57:53 +01:00
simnandez
caf6fa2240 Fix: Amarok login page issues 2013-02-10 11:09:21 +01:00
Laurent Destailleur
36eb0f01d8 Merge pull request #635 from simnandez/3.3
Trad: Add missing translations
2013-02-01 08:36:07 -08:00
Laurent Destailleur
72c5652a4a Fix: Holiday module update always done 2013-02-01 10:13:42 +01:00
Laurent Destailleur
9f7a06e04d Fix: Test not complete 2013-02-01 09:56:45 +01:00
simnandez
7134ab5594 Trad: Add missing translations 2013-02-01 09:28:02 +01:00
Laurent Destailleur
26c66a11ed Fix: Bug 701 2013-01-31 10:21:34 +01:00
fhenry
96efa87708 Fix bug
"A user can always read its own card" false today for external user even
if user get right to change his won info
2013-01-29 20:05:08 +01:00
Laurent Destailleur
30764a6c00 Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party
selection when autocomplete is on.
2013-01-29 16:14:53 +01:00
Laurent Destailleur
ac3ccade98 Fix: number of chars to low to show value. 2013-01-28 13:11:12 +01:00
Laurent Destailleur
a8ccc0ab0b Fix: loghandler loaded twice. 2013-01-28 12:36:15 +01:00
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
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
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
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
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
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
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
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
086b223c81 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-15 11:50:15 +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
fhenry
52b4d98849 remove parenthesis not usefull 2013-01-15 11:11:24 +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
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
0861fbfeb6 Fix: Missing kenya currency 2013-01-13 23:47:23 +01:00
Laurent Destailleur
0f6506d457 Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-13 18:57:55 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Laurent Destailleur
37b6bab893 Fix: Missing lang loading 2013-01-10 22:45:55 +01:00
Laurent Destailleur
14dede1a74 Fix: Protection to avoid renaming a user with a login that already
exists.
2013-01-10 21:32:10 +01:00
Laurent Destailleur
03b906808e Merge pull request #593 from marcosgdf/eu-vat
Updated EU VAT area links and added Isle of Man
2013-01-10 12:12:25 -08:00
Laurent Destailleur
9251d9a6ac Merge pull request #592 from marcosgdf/minor
Minor changes related to commit 8ac33e9
2013-01-10 12:10:49 -08:00
Laurent Destailleur
275cecccbc Merge pull request #587 from marcosgdf/translations
Fixed problems with translations
2013-01-10 12:09:45 -08:00
Laurent Destailleur
3c6e4bc267 Merge pull request #590 from marcosgdf/3.3
Fix bug in Adherent class not saving civilite=0
2013-01-10 12:09:23 -08:00
Laurent Destailleur
941afd7545 Fix: Because of autocomplete, password was changed when we changed
login.
2013-01-10 20:12:14 +01:00
Laurent Destailleur
0c7b469192 Fix: Session was lost when user change its own login. 2013-01-10 20:07:44 +01:00
Laurent Destailleur
de03f57620 Fix: Translation 2013-01-10 18:02:06 +01:00
Laurent Destailleur
eb078e6c8a Fix: Missing css entries. Solve look of ecm module. 2013-01-10 16:06:13 +01:00
Laurent Destailleur
a1282f5236 Fix: Navigation into projects 2013-01-10 16:04:23 +01:00
Marcos García
8e7a66a544 Fixed indentation problem 2013-01-10 14:20:03 +01:00
Marcos García
809367d23b Updated EU VAT area links and added Isle of Man
Isle of Man is in included in UK state as shown in http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
2013-01-10 14:17:43 +01:00
Marcos García
593db37423 Function getTotalDiscount of commonobject.class.php should always return a float for precission 2013-01-10 13:53:46 +01:00
Laurent Destailleur
8ac33e98e7 Fix: property object_total_discount was not working when quantity was
not 1.
2013-01-10 12:58:46 +01:00
Marcos García
e6e183aad4 Fix bug in Adherent class not saving civilite=0 2013-01-10 12:03:08 +01:00
Marcos García
be40114541 Fixed translation problems with Prelevement module 2013-01-09 21:33:55 +01:00
Marcos García
a1e17978d1 Little es_ES typo (again) 2013-01-09 21:24:40 +01:00
Marcos García
7b1aed65cf Little es_ES typo 2013-01-09 21:23:50 +01:00
Marcos García
3f42c198db Little typo in es_ES translation 2013-01-09 20:53:28 +01:00
fhenry
e369d5dfd8 Fix [ bug #668 ] Event created with a profile is not visible by the same
profile
2013-01-09 20:34:36 +01:00
Laurent Destailleur
abccfdd168 Fix: Option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-09 19:56:43 +01:00
Laurent Destailleur
24b50b8ed3 Fix: Example an label of category import 2013-01-09 13:29:12 +01:00
Laurent Destailleur
4a2a8e438d Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-09 11:45:04 +01:00
Laurent Destailleur
7114ae33fe Fix: Doc not uptodate 2013-01-09 11:44:45 +01:00
Laurent Destailleur
e31aedbc50 Merge pull request #584 from jfefe/3.3
Fix bug #666 : error when sending intervention card
2013-01-09 02:23:00 -08:00
Regis Houssin
a7ed40b10d Fix: empty value if combobox disabled 2013-01-09 10:43:21 +01:00
jfefe
1a3cecfae5 Fix bug #666 : error when sending intervention card 2013-01-09 06:30:27 +01:00
Laurent Destailleur
64d2a662de Merge pull request #582 from marcosgdf/translations
Improvements in translations
2013-01-08 14:03:52 -08:00
Laurent Destailleur
f3df7a2fec Fix: An easier to understand fix. Remove also not recommanded "continue
2" instructions.
2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c Merge pull request #581 from simnandez/3.3
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
2013-01-08 13:38:38 -08:00
Laurent Destailleur
b7a5e226c9 Fix: Disable menu entry of a not avilable feature 2013-01-08 18:53:45 +01:00
Laurent Destailleur
53df0766cb Fix: Translation 2013-01-08 18:47:40 +01:00
Laurent Destailleur
334b5b5dac Fix: Minor fix 2013-01-08 18:31:55 +01:00
Laurent Destailleur
5aeec9eab2 Fix: line into theme 2013-01-08 16:46:06 +01:00
Marcos García
ae98ebc793 There is no need to warn the user as the picto already does 2013-01-08 12:14:11 +01:00
Laurent Destailleur
77f177d846 Fix: Bad selection of option 2013-01-08 11:04:29 +01:00
Laurent Destailleur
a555b47acd Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-08 10:45:59 +01:00
Laurent Destailleur
47482202ac Fix: Missing picto 2013-01-08 10:28:22 +01:00
simnandez
596df78d39 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
is Spain
2013-01-08 08:46:48 +01:00
Laurent Destailleur
f96c1d83cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 23:22:20 +01:00
Laurent Destailleur
0889bdc3eb Fix: Error using static method 2013-01-07 23:20:00 +01:00
Laurent Destailleur
eca1e3a7e1 Look: Minor fix in themes 2013-01-07 17:57:39 +01:00
Laurent Destailleur
e5f5e38736 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-07 00:41:32 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via
e-mail
2013-01-07 00:40:18 +01:00
eldy
24d3fdfe6c Fix: bad setup entry page 2013-01-06 21:52:59 +01:00
eldy
c0bbd5d730 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-06 20:46:58 +01:00
eldy
492d00ee86 Fix: Syntax error with pgsql 2013-01-06 20:45:03 +01:00
Laurent Destailleur
567cd00f5c Fix: Lost button
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/facture/fiche.php
2013-01-06 13:33:09 +01:00
Laurent Destailleur
a40047d464 Merge pull request #578 from marcosgdf/translations
Translations!
2013-01-06 04:03:14 -08:00
Laurent Destailleur
d70f671ba0 Merge pull request #576 from simnandez/3.3
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
2013-01-06 04:02:12 -08:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
Laurent Destailleur
d44b086527 Fix: font size 2013-01-05 16:32:58 +01:00
simnandez
c0246c07b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
is Spain
2013-01-05 16:03:00 +01:00
Laurent Destailleur
a9ff3c2be1 Merge pull request #574 from simnandez/3.3
Fix: Modify Spanish localtax2 to new rate
2013-01-05 03:29:54 -08:00
Laurent Destailleur
9ce7a430b8 Merge pull request #573 from marcosgdf/translations
Added missing translations
2013-01-05 03:18:33 -08:00
simnandez
c639d80372 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
is Spain
2013-01-05 09:47:54 +01:00
simnandez
32b19802b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
is Spain
2013-01-05 09:43:40 +01:00
simnandez
773882c8c0 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3 2013-01-05 09:42:20 +01:00
simnandez
d0265db3d2 Fix: Modify Spanish localtax2 to new rate 2013-01-05 09:07:01 +01:00
Marcos García
5bf93ca41a Added missing es_ES translation & fixed typo 2013-01-04 23:56:22 +01:00
Marcos García
d27519338a Added missing translations
Reverted removal of strings in PR #570
Added missing strings to en_US
2013-01-04 22:34:55 +01:00
Cedric GROSS
ff3231045b Fix: A better fix for escaping data: escape for database must be done
during sql request forging. Also renamed tag to tag.

Merge:
Security fix emailing read and
unsubscribe

unsubscribe can lead to email disclosure

Conflicts:
	htdocs/public/emailing/mailing-unsubscribe.php
2013-01-04 18:08:34 +01:00
simnandez
9a3681e6b0 Fix: Bug creating invoice from a contract 2013-01-04 16:23:15 +01:00
simnandez
b9ec558501 Trad: Add missing ca_ES and es_ES translations 2013-01-04 16:13:03 +01:00
simnandez
68866eaa5f Fix: Withdrawal payment warning 2013-01-04 11:07:31 +01:00
Laurent Destailleur
a9ce8083cb Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-01-04 00:24:39 +01:00
Laurent Destailleur
86645d8be9 Fix: Field birthday must be hidden for moral members 2013-01-04 00:23:46 +01:00
Laurent Destailleur
932c36e695 Merge pull request #568 from FHenry/3.3
CheckStyle
2013-01-03 11:47:57 -08:00
Regis Houssin
c730aff87b Fix: possibility to activate jquery plugins with a constant 2013-01-03 19:14:22 +01:00
fhenry
3e05581c70 Same as last commit 2013-01-03 15:13:07 +01:00
fhenry
f2a4e42712 CheckStyle
I check everypalce where this function is call in Dolibarr, and to be
consistant it's better to use new attribute names
2013-01-03 14:44:04 +01:00
Laurent Destailleur
b667400cc1 Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 21:35:28 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 18:43:59 +01:00
Laurent Destailleur
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +01:00
Laurent Destailleur
cd6e3464db Fix: Several fixes for bad management of external/internal users. 2013-01-02 14:35:16 +01:00
Laurent Destailleur
049a6dc742 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-31 14:00:38 +01:00
Laurent Destailleur
dbdc4e6ce8 Fix: Normalize option names 2012-12-31 13:40:13 +01:00
Laurent Destailleur
f7a53eebfb Fix: Suggested start date of subscription must be validation date. 2012-12-31 13:39:42 +01:00
Marcos García
674034e648 Translated some strings in the code 2012-12-31 05:55:06 +01:00
Marcos García
d7121f6351 Updated demo trigger class with last changes in triggers 2012-12-31 05:30:09 +01:00
Marcos García
93c5acbf39 There's actually no CONTRACT_MODIFY trigger 2012-12-31 05:26:56 +01:00
Marcos García
50975b61b7 Revert "Fixed typo introduced in commit ca2b3f11b166f395e11af74d825989737920e925"
This reverts commit a90db96421.
2012-12-31 05:22:18 +01:00
Marcos García
adc9897d16 Agenda contacts type wasn't shown in $elementList 2012-12-31 05:10:35 +01:00
Marcos García
3b68faa119 Added missing translations 2012-12-31 05:10:18 +01:00
Marcos García
632b2d7a05 Fixed a bug when modifying a 0% local tax 2012-12-31 04:11:56 +01:00
Marcos García
406ce9e11c Update changelog + update deprecated triggers in database 2012-12-31 04:11:13 +01:00
Marcos García
a90db96421 Fixed typo introduced in commit ca2b3f11b1 2012-12-31 04:10:48 +01:00
Laurent Destailleur
f345e43dad Fix: date 2012-12-30 22:23:23 +01:00
Laurent Destailleur
815f43904d Fix: Warning if setup not complete 2012-12-30 21:56:53 +01:00
Laurent Destailleur
df43d477fc Merge pull request #562 from simnandez/3.3
Fix: Supplier is mandatory into adding invoice suppliers
2012-12-30 08:38:34 -08:00
Laurent Destailleur
86c9011437 Merge pull request #561 from marcosgdf/3.3
Updated changelog + also removed unused triggers when migrating from 3.2.X
2012-12-30 08:36:25 -08:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
a1b0fbcc2c Fix: [ bug #659 ] Comment in recurrent invoices is not stored
Fix: Missing payment mode
2012-12-30 14:14:52 +01:00
Laurent Destailleur
201829e60c Fix:[ bug #653 ] Error while creating additional attributes 2012-12-30 13:49:37 +01:00
Laurent Destailleur
717657dd05 Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO 2012-12-30 12:40:32 +01:00
Marcos García
c3a75307b0 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into 3.3 2012-12-30 12:37:48 +01:00
Laurent Destailleur
ca2b3f11b1 Fix: Several fix in trigger names 2012-12-30 12:24:53 +01:00
Laurent Destailleur
3fb60304db Fix: Css for ecm module 2012-12-30 12:02:54 +01:00
simnandez
f05176dc8a Fix: Date is mandatory into adding customer orders 2012-12-30 10:49:11 +01:00
simnandez
9732a2f336 Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:26:18 +01:00
simnandez
f0f45b70da Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:24:20 +01:00
Laurent Destailleur
b8303bdd5f Fix: CSS 2012-12-29 23:40:16 +01:00
Marcos García
99bf09dc9e Updated changelog + also removed unused triggers when migrating from 3.2.x 2012-12-29 18:28:24 +01:00
Laurent Destailleur
703c82f9e2 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-29 17:35:07 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
bc489773e8 Merge pull request #559 from FHenry/3.3
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 08:32:47 -08:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Laurent Destailleur
caf4130fb7 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-29 16:41:28 +01:00
Laurent Destailleur
44fe52d5b2 Fix: Missing field 2012-12-29 16:32:47 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3
Improved translations
2012-12-29 07:29:29 -08:00
Laurent Destailleur
a84e06cbfc Merge pull request #555 from simnandez/3.3
Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012
2012-12-29 07:28:55 -08:00
fhenry
32966fe25f Fix [ bug #658 ] Seacrh on bank do not work for description 2012-12-29 16:02:02 +01:00
Laurent Destailleur
ca6e9643ea Fix: Pb in json function for objects 2012-12-29 12:21:13 +01:00
Laurent Destailleur
7d60c33c1a Fix: typo 2012-12-29 12:16:45 +01:00
Laurent Destailleur
17a3204578 Fix: dol_json_encode was wrong with objects 2012-12-29 06:51:12 +01:00
Laurent Destailleur
215139ca72 Fix: Test for css must match test for js 2012-12-29 05:14:07 +01:00
Marcos García
bae8a749b8 Replaced 'Tel' string with 'Phone' to allow translation 2012-12-29 02:51:35 +01:00
Marcos García
4af2a4f875 Improved agenda translations 2012-12-29 02:21:00 +01:00
Laurent Destailleur
6ff9444903 Fix: temporary folder when creating ODT segments on Windows or system… 2012-12-29 01:25:56 +01:00
Marcos García
354c00b9ca CerfaFR donation template wasn't translating payment mode 2012-12-29 01:13:31 +01:00
Marcos García
316552f4ea Added missing translation and fixed references to incorrect variable 2012-12-29 00:59:16 +01:00
Marcos García
1b153aef93 Fixed donation payment mode translation and another problem with donation edit form 2012-12-29 00:46:25 +01:00
Marcos García
c8eac78a8d Translated labels that weren't being translated and improved es_ES translations 2012-12-29 00:24:55 +01:00
Marcos García
7ff5db3385 Improved and added missing es_ES translations 2012-12-29 00:21:50 +01:00
Laurent Destailleur
1722d58196 Fix: Selection of choice in demo page 2012-12-28 22:05:36 +01:00
Laurent Destailleur
2bec26c32a Fix: Some fix into menu translation 2012-12-28 19:18:04 +01:00
Laurent Destailleur
012ee020a4 Fix: Bad label 2012-12-28 15:48:20 +01:00
simnandez
87434fa9c8 Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012 2012-12-28 11:41:53 +01:00
Laurent Destailleur
8436f0666d Fix: [ bug #252 ] Contrat : pas d'éditeur WYSIWYG
Fix: Margins information must be visible for orders, proposals and
invoices only.
Fix: Delete button for contracts not visible
2012-12-28 11:36:31 +01:00
Laurent Destailleur
a8012d0f18 Fix: [ bug #617 ] champs non repris lors d'une création de commande à
partir d'une propale
2012-12-27 18:02:36 +01:00
Laurent Destailleur
1a530d0ca9 Fix: Broken translation 2012-12-27 17:12:35 +01:00
Laurent Destailleur
ba4be70a5e Fix: External user was not using correct menu handler. 2012-12-27 17:06:55 +01:00
Laurent Destailleur
f566cd4d99 Fix: Use date of user to define if an action is in past or future. 2012-12-27 15:43:52 +01:00
Laurent Destailleur
251f4f3742 Fix: Avoid duplicate link 2012-12-27 15:33:18 +01:00
Laurent Destailleur
c7b3f2099e Fix: [ bug #648 ] Warning into instalation
Install must use new log modules.
2012-12-27 15:22:40 +01:00
Laurent Destailleur
f9700dc941 Fix: [ bug #651 ] FusionPDF created files cannot be deleted 2012-12-27 14:37:15 +01:00
Laurent Destailleur
fc71073e4e Fix: Minor fix into user interface 2012-12-27 14:25:52 +01:00
Laurent Destailleur
d4f81a9ee7 Fix: Predefined invoice feature was broken. 2012-12-27 12:51:38 +01:00
Laurent Destailleur
6ba4a22d21 Fix: Migration of payment id not complete 2012-12-27 01:22:00 +01:00
simnandez
a209d5cd55 Fix: Box issues 2012-12-26 12:01:34 +01:00
Laurent Destailleur
3aa9c75b0d Fix: If thirdparty module not enabled, company and contact fields must
not be visibles
2012-12-21 17:56:40 +01:00
Laurent Destailleur
fe469b83ab Fix: [ bug #641 ] Suppression d'un administrateur 2012-12-21 17:45:13 +01:00
Laurent Destailleur
ec767a9772 Correct path determination if origin is project 2012-12-21 15:39:21 +01:00
Laurent Destailleur
e102592fcd Merge pull request #551 from simnandez/develop
Trad: Add missing credit note payments ca_ES and es_ES translations
2012-12-21 06:35:47 -08:00
Laurent Destailleur
a3f679183f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-21 14:26:26 +01:00
Laurent Destailleur
6716003960 Fix: delete 2012-12-21 14:23:48 +01:00
Laurent Destailleur
f1671e5acf Fix: Remove last chackstyle errors 2012-12-21 11:59:55 +01:00
simnandez
61ee604888 Trad: Add missing credit note payments ca_ES and es_ES translations 2012-12-21 09:27:51 +01:00
Laurent Destailleur
65b59b8d92 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-21 04:14:24 +01:00
Laurent Destailleur
8f2baf08ac Fix: Checkstyle 2012-12-21 04:14:02 +01:00
Laurent Destailleur
5dfefa1313 Fix: doxygen 2012-12-20 20:16:10 +01:00
Laurent Destailleur
6b43810881 Merge pull request #550 from simnandez/develop
GUI: Amarok disabled buttons more accurated
2012-12-20 10:35:59 -08:00
Laurent Destailleur
1d17d990bd Fix: Patch from antar3s: Re: Filter on company type in modSociete 2012-12-20 17:42:23 +01:00
simnandez
a10cdcc72e GUI: Amarok disabled buttons more accurated 2012-12-20 17:16:32 +01:00
Laurent Destailleur
bcd2fead3d Fix: patch from forum "User permissions on modAgenda" 2012-12-20 17:07:15 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression.
Include an option to support local tax of type 7 (need more time to
validate this type).
2012-12-19 18:51:49 +01:00
Laurent Destailleur
e9d7a4adc6 Fix: Removed warnings 2012-12-19 15:29:27 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Laurent Destailleur
d69e88435c Add option to have alternative method when ftp does not work 2012-12-18 23:45:51 +01:00
Laurent Destailleur
c0b3690a11 Fix: FTP login 2012-12-18 20:58:50 +01:00
Laurent Destailleur
dff532159d Fix: FTP modules fails with servers than need passive connection 2012-12-18 18:17:07 +01:00
Laurent Destailleur
6952a5f465 Fix: syntax error 2012-12-18 15:00:35 +01:00
Laurent Destailleur
19d5458ded Prepare freeze of 3.3 2012-12-18 14:21:56 +01:00
Laurent Destailleur
6b01c45210 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-18 13:14:29 +01:00
Laurent Destailleur
4cc44292e7 Fix: Maxi debug of holiday module 2012-12-18 13:12:11 +01:00
Regis Houssin
fb0869e0d0 Merge pull request #549 from jfefe/webservices
New webservice method to create a thirdparty with contact and user
2012-12-18 02:49:45 -08:00
jfefe
0d8969e2a6 New webservice method to create a thirdparty with contact and user 2012-12-18 11:17:46 +01:00
Laurent Destailleur
7cbd938c9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-18 10:10:19 +01:00
Laurent Destailleur
e4b4f459da Fix: Missing drop of table deprecated into 3.2 2012-12-18 10:10:04 +01:00
simnandez
c70bba3a57 Fix: showrefnav fails with multicompany 2012-12-18 09:01:04 +01:00
Laurent Destailleur
752aabfc86 Fix: dynamic menu does not works with auguria. Add a temporary fix. 2012-12-17 23:19:48 +01:00
Laurent Destailleur
515f30591d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-12-17 15:48:16 +01:00
Laurent Destailleur
7cf47b2e24 Fix: Missing translation 2012-12-17 15:47:01 +01:00
fhenry
2d2aaad1b0 Manage Extrafields deletion for contact 2012-12-16 23:18:20 +01:00
Laurent Destailleur
a83329f6c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-16 19:46:33 +01:00
Laurent Destailleur
5cf07a214c Fix: Close db at wrong place 2012-12-16 19:42:58 +01:00