Commit Graph

13457 Commits

Author SHA1 Message Date
Regis Houssin
9c2d053f74 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-10-03 17:01:39 +02:00
Laurent Destailleur
422a3425a8 Merge pull request #7539 from defrance/patch-28
unable to delete salaries
2017-10-03 16:16:49 +02:00
Laurent Destailleur
a501a20487 NEW Search filters in lists are restored when using "back to list" 2017-10-03 16:00:52 +02:00
Maxime Kohlhaas
a88bcb5299 Add detailed menus in HRM module 2017-10-03 13:49:30 +02:00
Laurent Destailleur
0b808fa2aa FIX Bad preview on scroping when special file names 2017-10-03 10:55:45 +02:00
Laurent Destailleur
c4b3dc40c3 Allow : into file names 2017-10-03 10:54:51 +02:00
Laurent Destailleur
888e5ed2c5 Fix sanitize uploaded filename 2017-10-03 10:54:09 +02:00
Laurent Destailleur
1fc292fa56 FIX Bad preview on scroping when special file names 2017-10-03 10:11:03 +02:00
Laurent Destailleur
793f1318de Fix sanitize uploaded filename 2017-10-03 09:35:45 +02:00
Laurent Destailleur
26564cc79c Allow : into file names 2017-10-02 20:38:15 +02:00
BENKE Charlene
41ba7af9fe unable to delete salaries
compta/salaries/cards ask for a salarie/payement/delete right to delete
2017-10-02 18:49:25 +02:00
Regis Houssin
e65b21a3bf Fix: change the parameter value of dol_getIdFromCode 2017-10-02 11:59:17 +02:00
Regis Houssin
09e71f1390 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-10-02 11:51:27 +02:00
Regis Houssin
c1b6f59c1b Fix: restore possible ldap keys 2017-10-02 08:43:53 +02:00
Laurent Destailleur
7c30b3ca5d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-02 01:28:20 +02:00
Laurent Destailleur
6dbc02022f Merge pull request #7529 from Nicos-git/develop
NEW: Add project related fields to ODT
2017-10-02 00:36:46 +02:00
Laurent Destailleur
48c3d0e3f2 Update commondocgenerator.class.php 2017-10-02 00:36:15 +02:00
Laurent Destailleur
f15ce54c05 Update commondocgenerator.class.php 2017-10-02 00:34:55 +02:00
Laurent Destailleur
a81d458829 Merge pull request #7509 from dolibarr95/patch-21
NEW Add the attribute accept to the input form for file upload
2017-10-02 00:12:03 +02:00
Laurent Destailleur
f785203c0d Creating a page from an external url can grab images too. 2017-10-01 18:27:54 +02:00
Laurent Destailleur
3ddd5d3d3a The default value feature is sensitive to url parameters. 2017-10-01 14:54:17 +02:00
Laurent Destailleur
b7810d95b9 Fix permissions 2017-09-30 20:43:15 +02:00
Laurent Destailleur
e23a88732e Fix default value on extrafields 2017-09-30 20:05:34 +02:00
Laurent Destailleur
a43dcbd0c5 Fix no "now" link on search of a date extrafield in list 2017-09-30 18:57:21 +02:00
Laurent Destailleur
976cbd5f83 Fix javascript error and input field for password extrafield in list 2017-09-30 18:52:33 +02:00
Nicolas Leichtle
95cc007b39 NEW: Add project related fields to ODT 2017-09-30 15:40:17 +02:00
Laurent Destailleur
0feae17ef5 Fix file not always defined 2017-09-30 11:51:34 +02:00
Regis Houssin
46cc23c568 Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used 2017-09-30 10:41:35 +02:00
Laurent Destailleur
0e15aef44f CSS 2017-09-30 00:30:58 +02:00
Laurent Destailleur
02f069713e Standardize code 2017-09-29 17:43:32 +02:00
Laurent Destailleur
d2d77d4625 Module builder 2017-09-29 15:19:49 +02:00
Regis Houssin
9490e13c21 Fix: command not found with escapeshellarg ! 2017-09-29 14:52:05 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
atm-ph
7ba2dd8397 Fix the pdf_getlineprogress hook isn't use because hookmanager is null 2017-09-28 15:25:51 +02:00
Laurent Destailleur
537a551bb5 Fix vat visiblity on pdf 2017-09-27 21:58:42 +02:00
Laurent Destailleur
e878f3cfd5 No more need of contacts on each tab by default 2017-09-27 20:15:56 +02:00
Laurent Destailleur
6bdfa99fc2 FIX The backtopage 2017-09-27 20:07:01 +02:00
Laurent Destailleur
fdc1aa2a03 NEW Move contacts of a thirdparty on tab Contacts/Addresses 2017-09-27 19:56:03 +02:00
Laurent Destailleur
8242469e40 FIX The unique index on email templates can work now. 2017-09-27 18:16:28 +02:00
Laurent Destailleur
f1f4a2fb44 Add email template to send SEPA mandate 2017-09-27 17:40:14 +02:00
Regis Houssin
9823d6622c Fix: use default $shared value 2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/core/modules/rapport/pdf_paiement.class.php
	htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
arnaud
f29ea35dc8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element 2017-09-27 14:56:52 +02:00
dolibarr95
00862913d8 Add the attribute accept to input tag
I know this is not a security check but it is more convenient for the user when in a form only images or pdf are accepted for example.
see : 
*https://www.w3.org/wiki/HTML/Elements/input/file
*https://www.w3schools.com/TagS/att_input_accept.asp

Hope every body needs it.
tks
2017-09-27 11:12:38 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
4dd737fe44 Merge pull request #7503 from fappels/develop
Dispatch clean code and remove deprecated code
2017-09-26 20:06:44 +02:00
Laurent Destailleur
6b9e754221 Merge pull request #7496 from papoteur-mga/rapports_paiements
Rapports paiements
2017-09-26 20:02:09 +02:00
fappels
ca6ad909e7 remove deprecated file 2017-09-26 16:23:00 +02:00
Laurent Destailleur
d7dd6ed334 Fix undefined var 2017-09-26 16:15:22 +02:00
Laurent Destailleur
0dfbc8d72f doxygen 2017-09-26 16:03:08 +02:00