Commit Graph

233 Commits

Author SHA1 Message Date
Laurent Destailleur
0e1cf72c43 Fix bad order for firstname, lasname 2015-05-16 13:59:48 +02:00
Laurent Destailleur
b0d73ee674 FIX Bad link to login page into email for password renewal. 2015-05-12 23:47:28 +02:00
Marcos García de La Fuente
86100758ff Miscellaneous corrections 2014-12-28 20:13:15 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
99e5715f28 Fixed: Length too small to see fullname. 2014-12-10 20:09:48 +01:00
Laurent Destailleur
c186f13218 Fix: Param $action was not defined.
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
8821fbac76 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/product/fiche.php
	htdocs/user/class/user.class.php
2014-10-30 11:19:29 +01:00
Laurent Destailleur
8248ab4f9a Fix: doxygen 2014-10-30 11:16:45 +01:00
Laurent Destailleur
106b4a669f id_parent and id_children was not set.
So introduce new method to return same with no risk to break current
working code to address this.
2014-10-30 11:15:13 +01:00
Laurent Destailleur
0abeea059e Uniformize and clean boxes behaviour and translation. 2014-10-27 21:48:28 +01:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
aspangaro
b4a9e6a119 Fix :: Administrator not created on new install 2014-10-16 21:14:57 +02:00
aspangaro
c1d016a531 Add field to select color of the user in user's card 2014-10-16 06:20:54 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
a4d8739477 Qual: Clean a lot of deprecated code 2014-09-24 01:35:29 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
23eee1b83a New: Add hourly and daily amount on user card. Add weekly working hours
and salary on user card.
2014-09-13 17:41:26 +02:00
Laurent Destailleur
98f140962a Merge remote-tracking branch 'origin/3.6' into develop 2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-13 19:23:45 +02:00
Laurent Destailleur
8205a0e1b5 Fix: Better comment and var name 2014-08-11 10:50:08 +02:00
Laurent Destailleur
159d0c7057 Fix: get_full_tree was not working correctly. 2014-08-07 20:21:16 +02:00
Laurent Destailleur
69888aa569 Fix: get_full_tree was not working correctly. 2014-08-07 20:13:19 +02:00
Laurent Destailleur
7d09b4b45c Fix: get_full_tree was not working correctly. 2014-08-07 20:11:39 +02:00
Laurent Destailleur
fa82cbceb9 Qual: Removed useless function 2014-07-05 08:59:41 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
KreizIT
1e5c35093b Review trigger for user module 2014-07-03 14:01:01 +02:00
Marcos García de La Fuente
460fb7a453 Removed new SQL double-debug 2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
3791175536 Fix: doxygen 2014-06-20 13:07:15 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
b124007c8c Merge remote-tracking branch 'origin/3.5' into develop 2014-06-09 15:30:41 +02:00
Florian HENRY
77a9d4eb71 Start fix [ bug #1437 ] Securitu Issue
Some of them can be fix, because GETPOST even with 'alpha' test do not
warn if input is
"2%2F0%2F1234%3cscript%3ealert%2893275%29%3c%2fscript%3e"
for exemple

I don't have magical solution for this kind of security issue
2014-06-09 12:34:10 +02:00
Laurent Destailleur
171227e43a Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
2014-06-06 12:00:21 +02:00
Laurent Destailleur
efd9337c9f Fix: Hierarchy view with multicompany 2014-05-30 12:55:00 +02:00
Laurent Destailleur
449678d687 Fix: get_full_tree must follow same filter rule thant list of users 2014-05-30 12:43:07 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
e5012a1670 Fix: Bad parameter type 2014-04-28 04:27:49 +02:00
Laurent Destailleur
eb5e891cf9 Fix: Not mandatory field must not be not null
Fix: field to store amount must be double(24,8)
2014-03-16 20:37:43 +01:00
Maxime Kohlhaas
0083e529c7 Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost 2014-03-16 14:31:02 +01:00
Drosis Nikos
997e16fec7 Update user.class.php
String translated twice
2014-03-15 17:22:34 +01:00
Drosis Nikos
8ff0022a53 Update user.class.php
String translated twice
2014-03-15 15:23:41 +02:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
fa7e7c75bf Fix: Add a protection if user has no option to edit stock 2014-02-17 11:48:57 +01:00
Laurent Destailleur
ce24a7e9ad Fix: Bad error management making rollback instead of commit 2014-01-23 09:20:06 +01:00
aspangaro
6a86c31067 Update Skype Module 2013-11-07 13:17:08 +01:00
Laurent Destailleur
4eb37abed9 New: Translate the email to change password. 2013-08-25 06:53:59 +02:00