lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,558 Commits 43 Branches 150 Tags 886 MiB
8.0
Commit Graph

5993 Commits

Author SHA1 Message Date
Laurent Destailleur
6953420ce8 Support for ar_EG as laternative of ar_AS 2017-11-19 21:25:21 +01:00
Laurent Destailleur
5849efd9fc Work on public sharing files 2017-11-19 20:44:57 +01:00
Laurent Destailleur
4ad0d5df43 Fix scrutinizer issues 2017-11-19 16:55:28 +01:00
Laurent Destailleur
4938a0ba2a Add param forcenowrap on tooltip function 2017-11-19 12:41:37 +01:00
Laurent Destailleur
9b1470dab5 Work on generic filemanager component 2017-11-18 22:13:19 +01:00
atm-ph
15a8f2037b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-11-18 11:54:21 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
451d3ed8ed NEW Add API to activate/unactivate a contract 2017-11-14 17:51:04 +01:00
Laurent Destailleur
a50589c3c9 NEW Better behaviour when using a text browser 2017-11-14 15:10:46 +01:00
Laurent Destailleur
11cb9c0d81 Code simpler 2017-11-14 01:57:50 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
53a523ba9d Module builder 2017-11-12 20:45:06 +01:00
Laurent Destailleur
955ed7dbbf NEW Show the supplier ref into supplier cards 2017-11-12 15:30:21 +01:00
Laurent Destailleur
186c8cdbf0 Fix selection of contact into creation of event 2017-11-12 13:40:05 +01:00
Laurent Destailleur
0cd8aa8a49
Merge pull request #7798 from hregis/develop_extrafields 
Fix: missing status 3 (only on form)
 2017-11-11 17:59:33 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Laurent Destailleur
01a41237bf CSS 2017-11-11 14:20:08 +01:00
Laurent Destailleur
debc0480dd CSS 2017-11-10 20:20:59 +01:00
Laurent Destailleur
a029b16795 css 2017-11-10 18:27:03 +01:00
Laurent Destailleur
cb03b2f307 NEW Can sort joined files on thirdparty and user card. 2017-11-10 18:14:29 +01:00
Regis Houssin
3ffe1b6725 Fix: missing status 3 (only on form) 2017-11-10 16:51:37 +01:00
Laurent Destailleur
beacf4225f Work on filemanager 2017-11-10 15:44:43 +01:00
Laurent Destailleur
c2d7b88bdd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-10 13:51:59 +01:00
Laurent Destailleur
ab78007a54 Work on filemanager generic component 2017-11-10 13:45:38 +01:00
Laurent Destailleur
9d3cf8f217 Fix can use tooltip with popup even for column titles 2017-11-09 18:50:15 +01:00
Laurent Destailleur
f8a44431b5 Fix visibility of extrafields 2017-11-07 13:41:59 +01:00
Laurent Destailleur
bc79aced6c Fix extrafields with column perms not filled are not visible 2017-11-07 12:33:13 +01:00
Laurent Destailleur
d90e3e88c2 NEW Add method executeCLI and a phpunit 2017-11-06 20:24:12 +01:00
Laurent Destailleur
c78c06776b Fix bug reported by scrutinizer 2017-11-05 03:39:27 +01:00
Laurent Destailleur
cd70e1506b Work on common core code 2017-11-03 17:20:08 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Laurent Destailleur
fd86c470a8 FIX #7651 #7748 #7542 2017-11-02 13:47:29 +01:00
Laurent Destailleur
f26d970d58 Remove option MAIN_HTML5_PLACEHOLDER (on by default now) 2017-11-01 10:17:24 +01:00
Laurent Destailleur
9458c80c48 Work on reminders 2017-10-31 23:10:29 +01:00
Laurent Destailleur
bbe1c9c494 NEW Can download PDF document from the payment page 2017-10-30 00:45:47 +01:00
Laurent Destailleur
76b0e7ee5a NEW Add option PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD 2017-10-29 21:24:54 +01:00
Laurent Destailleur
02cae88a8c Fix date output 2017-10-29 17:50:50 +01:00
Laurent Destailleur
33aa0f3160 Code comment 2017-10-29 17:49:24 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Laurent Destailleur
46f95e14fa Fix select2 search 2017-10-28 17:34:46 +02:00
Laurent Destailleur
00db7e16ec Clean code 2017-10-28 16:00:07 +02:00
Laurent Destailleur
9283aaf6aa Fix scrutinizer 2017-10-27 00:07:58 +02:00
Laurent Destailleur
a1f862eba6 NEW Enhance framework so we can use html/icons into SELECT options. 2017-10-26 20:06:23 +02:00
Laurent Destailleur
89baa0b307 Work on website 2017-10-26 14:49:30 +02:00
Laurent Destailleur
82b333e423 Fix migration to select2 4.0.5 2017-10-26 14:06:23 +02:00
Laurent Destailleur
6d6c4bf088 Fix export web site 2017-10-26 10:43:47 +02:00
Laurent Destailleur
e865f41b86 NEW Extrafields "link to object" now use a combo selection and getNomUrl 2017-10-26 02:55:43 +02:00
Laurent Destailleur
66d2c29fe1 Work on modulebuilder and website module 2017-10-26 01:02:13 +02:00
Laurent Destailleur
ff9a6ca01b Work on module builder 2017-10-25 22:23:54 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
bb996019c2 NEW Support visibility on extrafields 2017-10-25 11:42:14 +02:00
Laurent Destailleur
f381361c8b Work on modulebuilder 2017-10-24 19:57:36 +02:00
Laurent Destailleur
0b120dd1a9 Prepare code to remove hooks on extrafield update 2017-10-24 18:45:34 +02:00
Laurent Destailleur
d3f2e19691 Merge pull request #7680 from Nicos-git/OdtGeneration 
NEW Add product unit fields for ODT substitution
 2017-10-22 04:14:17 +02:00
Laurent Destailleur
ba2dd953b4 Update commondocgenerator.class.php 2017-10-22 04:13:49 +02:00
Laurent Destailleur
764e215ca1 Update commondocgenerator.class.php 2017-10-22 04:12:46 +02:00
Laurent Destailleur
b9c0ea3691 Update commondocgenerator.class.php 2017-10-22 04:07:54 +02:00
Laurent Destailleur
5984222794 FIX #7679 2017-10-22 03:47:36 +02:00
Nicolas Leichtle
fc2a834e41 New Add product unit fields for ODT substitution 2017-10-21 23:54:49 +02:00
Laurent Destailleur
dbcf3ddbe8 NEW Upgrade jquery select2 to 4.0.4 2017-10-21 19:05:24 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
5c189449e1 Move default value for user expense report on tab expense report 2017-10-20 17:02:26 +02:00
Laurent Destailleur
f67350db72 Merge pull request #7647 from BackrndSource/patch-2 
FIX: Some errors from html.form.class.php not translated on fourn/commande/card.php
 2017-10-19 19:19:21 +02:00
Laurent Destailleur
9c45e86a1c Introduce main_doc into table of objects to know what is main doc. 
Work on option PROPOSAL_USE_ONLINE_SIGN
 2017-10-19 11:40:40 +02:00
Laurent Destailleur
cfeab01996 Prefill hour/min to 23:59 when creating a task 2017-10-18 18:50:30 +02:00
Laurent Destailleur
8b140ab069 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-17 10:44:29 +02:00
Laurent Destailleur
eb1fdca157 NEW Can create intervention from a proposal 2017-10-17 10:44:18 +02:00
BackrndSource
df388df3ff Update html.form.class.php 
$lang->load('errors') is needed to load the traductions for:

$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
 2017-10-16 22:56:16 +02:00
Laurent Destailleur
768c623a89 Merge pull request #7644 from atm-florian/dev_extrafield_default_value 
FIX : Extrafield default value admin/defaultvalues.php enabled
 2017-10-16 21:42:50 +02:00
florian HENRY
51ce8bf2a5 js 2017-10-16 21:08:09 +02:00
florian HENRY
17db813a4e Logical variable name suffix/prefix 2017-10-16 21:05:12 +02:00
florian HENRY
695740142a FIX : Extrafield default value admin/defaultvalues.php enabled 2017-10-16 20:54:53 +02:00
Laurent Destailleur
ebe0664aff Merge branch 'develop' into scrutinizer-patch-3 2017-10-16 20:54:15 +02:00
Laurent Destailleur
f7fe011e98 Add CRLF before 'boundary' word. Use \r\n on wordwrap. 2017-10-16 14:31:28 +02:00
Rui Strecht
447cc208fe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/societe/class/societe.class.php
 2017-10-16 09:34:24 +01:00
Laurent Destailleur
afdc176f47 Fix scrutinizer 2017-10-16 08:52:00 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Laurent Destailleur
ab280feaa5 Move datepicker vars into lib_heas.js.php 2017-10-13 22:37:46 +02:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
 2017-10-13 22:01:56 +02:00
Laurent Destailleur
5092c41d94 Look and feel v6 2017-10-13 20:04:11 +02:00
Laurent Destailleur
8b64f979ef Fix multiple upload was broken 2017-10-13 15:49:39 +02:00
Laurent Destailleur
5f22afa450 Merge pull request #7621 from atm-ph/fix_distinct_credit_note 
Fix distinct credit note select list
 2017-10-13 13:32:04 +02:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
d12019d1b5 Fix from scrutinizer 2017-10-13 13:10:36 +02:00
Laurent Destailleur
8113321062 Start to work on email sender profiles 2017-10-13 12:02:26 +02:00
Laurent Destailleur
2b55fb81b9 Standardize substition keys. 2017-10-13 10:35:21 +02:00
atm-ph
bab43b043e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-10-13 09:52:56 +02:00
atm-ph
647c4036cf Fix simplification of code 2017-10-13 09:21:37 +02:00
Laurent Destailleur
558f261b60 FIX #7593 2017-10-13 01:03:33 +02:00
atm-ph
8d3df7ea57 Fix can not distinct which credit note are in select list 2017-10-12 09:59:25 +02:00
Laurent Destailleur
0d0030cff4 Fix use of sender profiles 2017-10-11 19:57:53 +02:00
Laurent Destailleur
56be9e2b60 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:45 +02:00
Laurent Destailleur
bcf56e3140 Introduce table c_email_senderprofile to have several profils 2017-10-11 19:41:19 +02:00
Laurent Destailleur
efac9ddb12 Merge pull request #7613 from hregis/develop_extrafields 
Fix: label not translated if special lang file used
 2017-10-11 11:58:44 +02:00
Laurent Destailleur
eb995bb7ad Merge pull request #7603 from hregis/develop_bug5 
Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented)
 2017-10-11 11:48:46 +02:00
Laurent Destailleur
e644f7df58 Merge pull request #7597 from hregis/develop_member 
NEW add company alias name when create company from member
 2017-10-11 11:31:55 +02:00
Regis Houssin
7e79c3a795 Fix: label not translated if special lang file used 2017-10-11 10:10:27 +02:00
Regis Houssin
9ff0855812 Fix: datepicker.js.php is needed for the translation !! 2017-10-10 10:04:16 +02:00
Regis Houssin
88e700ae12 Fix: add month names short 2017-10-10 09:30:07 +02:00
Regis Houssin
f51c0db705 NEW add translation and possibility to change month and year 2017-10-10 09:16:14 +02:00
Regis Houssin
00db16e0de Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented) 2017-10-10 08:49:00 +02:00
Regis Houssin
625e440653 Fix: wrong test 2017-10-09 16:50:20 +02:00
Regis Houssin
86c301f197 Fix: uniformize parameters 2017-10-09 15:49:10 +02:00
Regis Houssin
16b766182c NEW view company name if different of fullname in dol_banner 2017-10-09 15:35:08 +02:00
Laurent Destailleur
8f24a86352 NEW If max nb of generation is reached, date for next gen is striked 2017-10-09 14:16:22 +02:00
Rui Strecht
6c0cb31c08 Fixed issue with merge error 2017-10-09 11:44:10 +01:00
Regis Houssin
f2d9288db5 NEW add company alias name when create company from member 2017-10-09 12:38:44 +02:00
Rui Strecht
1a5cdf2406 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/admin/company.php
#	htdocs/core/class/commonobject.class.php
 2017-10-09 11:36:38 +01:00
Laurent Destailleur
3e0ccd6312 FIX #7585 2017-10-09 10:43:19 +02:00
Laurent Destailleur
67c33840cf Code comment 2017-10-08 23:19:19 +02:00
Laurent Destailleur
33624e1001 NEW Attaching doc automatically in email is now a parameter of template. 2017-10-08 16:34:42 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
de71de61af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 18:52:38 +02:00
Laurent Destailleur
df38f60617 Export website into zip 2017-10-06 18:29:18 +02:00
Laurent Destailleur
8d47969d29 Merge pull request #7578 from OPEN-DSI/fix_0002 
NEW add a new notification for the signed closed event of a proposal.
 2017-10-06 17:36:23 +02:00
Laurent Destailleur
c7a0f467cc Fix var unknown 2017-10-06 17:03:32 +02:00
KHELIFA
88ab3a9cab Add a new notification for the event that has successfully closed a proposal. 2017-10-06 16:15:40 +02:00
Laurent Destailleur
43d85af5ae Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 15:23:10 +02:00
Laurent Destailleur
f9d9642340 FIX #6981 2017-10-06 14:07:28 +02:00
Laurent Destailleur
8ce723b4c9 FIX #7514 2017-10-06 13:56:54 +02:00
Laurent Destailleur
2d549a6191 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-06 13:09:42 +02:00
Laurent Destailleur
4bc7eb0ec1 Merge pull request #7520 from hregis/develop_ldap 
Fix: Set LDAP password when LDAP key changed
 2017-10-06 13:09:28 +02:00
Laurent Destailleur
2148622d40 Clean code 2017-10-06 12:55:48 +02:00
Inovea Conseil
2f3f04c2b1 Add constant to manage update_price function 
Some external module want no update price after a trigger because they have a other method to calculate the total (ex: with a extrafield).
 2017-10-06 10:42:25 +02:00
Laurent Destailleur
801a5180d6 Fix scrutinizer bug reports 2017-10-06 01:16:19 +02:00
Laurent Destailleur
2a2cd30e19 Fix code 2017-10-05 10:00:43 +02:00
Regis Houssin
8a79198769 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ldap

Conflicts:
	htdocs/core/class/comment.class.php
 2017-10-04 20:00:39 +02:00
Laurent Destailleur
6540bc0061 Fix doxygen 2017-10-04 19:48:11 +02:00
Laurent Destailleur
ded55f41fb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-10-04 16:08:22 +02:00
Laurent Destailleur
13cb806436 FIX #7531 #7537 2017-10-04 15:18:15 +02:00
Regis Houssin
c563c3d3ac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-10-04 13:19:07 +02:00
Regis Houssin
537fc63da5 Fix: add by error 2017-10-04 13:18:48 +02:00
Laurent Destailleur
85606126a9 Standardize code for events 2017-10-04 12:58:13 +02:00
Regis Houssin
a259057dd3 Fix: Found non escaped string 2017-10-04 12:42:41 +02:00
Regis Houssin
a124f47dcd Fix: PHPCS 2017-10-04 12:07:17 +02:00
Regis Houssin
66ad30feb0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-10-04 11:23:50 +02:00
Regis Houssin
723bc4d436 NEW add ldap_rename for avoid password if ldap key changed 2017-10-04 11:22:41 +02:00
Laurent Destailleur
75a7e086b3 Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element 
New comment generic element
 2017-10-04 11:13:39 +02:00
Regis Houssin
8d3ad9ddc8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-10-04 08:43:07 +02:00
Laurent Destailleur
a6cf934973 Add log 2017-10-04 02:46:01 +02:00
Laurent Destailleur
eeb36464b7 Merge pull request #7524 from hregis/develop_mc 
Fix: command not found with escapeshellarg !
 2017-10-03 18:06:49 +02:00
Laurent Destailleur
c22cd1cfe9 Fix test on entity must always be done using the "IN" instead of "=" 2017-10-03 17:41:22 +02:00
Regis Houssin
a88938ace4 Fix: use GETPOST 2017-10-03 17:11:42 +02:00
Regis Houssin
9c2d053f74 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-10-03 17:01:39 +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
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
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
0e15aef44f CSS 2017-09-30 00:30:58 +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
Rui Strecht
4839d0f84d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 2017-09-28 09:36:52 +01:00
Laurent Destailleur
e878f3cfd5 No more need of contacts on each tab by default 2017-09-27 20:15:56 +02:00
Laurent Destailleur
fdc1aa2a03 NEW Move contacts of a thirdparty on tab Contacts/Addresses 2017-09-27 19:56:03 +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
Rui Strecht
3ebb18ab16 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 2017-09-26 16:34:59 +01:00
Laurent Destailleur
d7dd6ed334 Fix undefined var 2017-09-26 16:15:22 +02:00
Laurent Destailleur
d1bee67b40 FIX #3991 2017-09-26 13:09:19 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
919d29fdf7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-25 19:45:40 +02:00
Laurent Destailleur
fe55feb82f FIX #7461 2017-09-25 19:45:01 +02:00
Laurent Destailleur
dc362fcd30 NEW Can show currency in list of bank accounts 2017-09-25 18:11:03 +02:00
Inovea Conseil
35ae0e435d Fix quote in input 
Delete a quote in input field
 2017-09-25 16:14:14 +02:00
Laurent Destailleur
7b9facc76a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-25 11:43:12 +02:00
Laurent Destailleur
a9fabf117e Code comment 2017-09-25 11:42:59 +02:00
Laurent Destailleur
53d931dd11 Merge pull request #7481 from dolibarr95/patch-17 
Fix 7470
 2017-09-25 11:34:00 +02:00
dolibarr95
6ee15f1c45 Fix 7470 
php warning when  MAIN_MODULE_xxxxx_DIR exists but the module does not have a directory.
 2017-09-25 09:01:47 +02:00
Regis Houssin
d592664150 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-09-25 06:48:26 +02:00
Regis Houssin
92ff974c5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-25 06:47:34 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Laurent Destailleur
2285e9bc0b Merge branch 'develop' into develop_trad 2017-09-24 21:47:17 +02:00
Laurent Destailleur
971e59395c Fix phpcs 2017-09-24 21:46:14 +02:00
Laurent Destailleur
4246cf24f3 Perf enhancement: Remove one include of js. 2017-09-24 20:36:27 +02:00
Regis Houssin
06ee9f4775 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-24 16:10:55 +02:00
Regis Houssin
0cdca6f3eb Fix: phpcs error 2017-09-24 11:10:33 +02:00
Laurent Destailleur
91d303465d NEW Can add html content on right of tabs 2017-09-24 01:39:06 +02:00
Laurent Destailleur
414f633e75 Fix css 2017-09-23 12:59:49 +02:00
Regis Houssin
791c385e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ldap

Conflicts:
	htdocs/adherents/card.php
 2017-09-22 20:26:22 +02:00
Laurent Destailleur
63ec14e47d Convert sode to send member info email into new generic email template 
system.
 2017-09-22 20:18:11 +02:00
Laurent Destailleur
f990667b1a NEW Can send email from the member card using email templates. 2017-09-22 17:48:38 +02:00
Laurent Destailleur
8578a1b825 NEW Option "one email per recipient" when using bulk actions emails. 2017-09-22 17:04:26 +02:00
Laurent Destailleur
6d7db96359 NEW Option "one email per recipient" when using bulk actions emails. 2017-09-22 16:31:05 +02:00
Laurent Destailleur
252f038468 Mutualize code of substitutions for emails 2017-09-22 14:34:31 +02:00
Laurent Destailleur
bd45ea5a03 Split page for invoice template into card + list. Add more filters. 2017-09-22 11:28:53 +02:00
Regis Houssin
1314e00bc6 Fix: check if array and check empty value if required 2017-09-20 14:46:51 +02:00
Rui Strecht
395100ca70 Added missing comments for new function parameters, removed unused parameter $searchlabel 2017-09-20 12:45:18 +01:00
Rui Strecht
24f8ea003a Added self to contributors list 2017-09-20 12:30:59 +01:00
Rui Strecht
42a57aab26 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 2017-09-20 12:16:09 +01:00
Rui Strecht
f1126b65bf Updated method to fetch state name, code and id to match method used with country 
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
 2017-09-20 12:06:35 +01:00
Regis Houssin
1f59e4f7e9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-20 12:47:35 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
c38ed54990 Disable old datepicker 2017-09-19 17:31:37 +02:00
atm-quentin
815d0aff90 FIX for free line select unit was wrong 2017-09-19 15:10:18 +02:00
Laurent Destailleur
f936b17d68 FIX Protection to avoid to apply credit note discount > remain to pay 2017-09-19 00:24:52 +02:00
Rui Strecht
998eea09bd Added new option MAIN_SHOW_STATE_CODE (on/off; 1/0) to show state code in select fields options and values. 
Changed option MAIN_SHOW_REGION_IN_STATE to on/off - 1/0 and to mix with the new MAIN_SHOW_STATE_CODE (can show region name and state code)
 2017-09-18 16:48:13 +01:00
arnaud
e7bb7a3588 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element 2017-09-18 17:28:03 +02:00
arnaud
9795f48046 NEW comment system working with all objects 2017-09-18 17:27:29 +02:00
Laurent Destailleur
da6b1e92b2 NEW Add the total in the perday view of the time spent form. 2017-09-18 14:18:34 +02:00
Regis Houssin
f550e27579 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-18 12:15:01 +02:00
Regis Houssin
a03ef95eaa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql
 2017-09-18 09:11:04 +02:00
Laurent Destailleur
3f7b705674 Use correct term accounting for codes 2017-09-18 00:48:09 +02:00
Laurent Destailleur
ee774f1bf9 FIX Calculation in the activity box 2017-09-17 20:20:48 +02:00
Laurent Destailleur
9dbd88f0ba FIX Calculation in the activity box 2017-09-17 20:17:51 +02:00
Laurent Destailleur
fa18e788b5 Fix must use photo of user 2017-09-17 17:29:00 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Regis Houssin
d9b3a4e456 Fix: phpcs 2017-09-16 21:58:05 +02:00
Regis Houssin
bdc425c203 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd NEW add members types ldap group management 2017-09-16 21:41:30 +02:00
Laurent Destailleur
b4eab24490 Add project into list of customer orders 2017-09-16 20:32:28 +02:00
Laurent Destailleur
0fec777d0e NEW On bulk email from a list, can uncheck "Join main document". 
NEW Show direct preview link on contract
 2017-09-16 18:31:30 +02:00
Regis Houssin
4ab1f68102 Fix: check connectivity for avoid ldap errors 2017-09-16 17:12:51 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
e56b41c1ae Clean code 2017-09-16 13:28:13 +02:00
Laurent Destailleur
0cf67944fa Clean code 2017-09-16 13:14:46 +02:00
Laurent Destailleur
bd7c4fe940 NEW Summary of last events on a card are sorted on decreasing date. 2017-09-16 10:12:44 +02:00
Laurent Destailleur
8986640a10 FIX Responsive 2017-09-16 09:16:05 +02:00
Laurent Destailleur
4e7e6cc658 Fix W3C 2017-09-16 09:15:10 +02:00
Laurent Destailleur
baa32f6ed8 FIX Responsive 2017-09-16 09:13:57 +02:00
Laurent Destailleur
961d475a9d More complete substitution system. 
Add __CONTRACT_NEXT_EXPIRATION_DATE__  and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
 2017-09-16 03:45:29 +02:00
Laurent Destailleur
a4086b52ef NEW Can send email from contract card 2017-09-16 01:34:15 +02:00
Laurent Destailleur
b13dbf1f06 Clean code. Make selection of template working even if public. 2017-09-16 00:49:46 +02:00
Regis Houssin
767240698f Fix: wrong var name 2017-09-15 18:31:22 +02:00
Regis Houssin
7f57f737b3 New: Ping ldap server before ldap_connect for avoid waiting 2017-09-15 18:02:52 +02:00
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
77056d9adb NEW All setup of accountancy can be done from menu "Accountancy-Setup" 2017-09-15 14:09:42 +02:00
Laurent Destailleur
1a78e2a055 Mutualize/share code of all payments modes 2017-09-15 13:43:16 +02:00
Laurent Destailleur
0ade500535 Better support of text editor when no js available. 2017-09-15 11:19:56 +02:00
Laurent Destailleur
3b40c95107 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2017-09-14 21:57:14 +02:00
Laurent Destailleur
c52e593ea8 Fix this->db 2017-09-14 21:27:14 +02:00
Laurent Destailleur
2f80618545 Merge pull request #7390 from atm-arnaud/FIX_task_comment_design 
Fix task comment design
 2017-09-14 12:21:58 +02:00
Laurent Destailleur
ed9c401ca6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-14 12:20:26 +02:00
Laurent Destailleur
b80b7bbcb9 Merge pull request #7384 from atm-ph/fix_6.0_get_class_self 
Fix get_class(self) instead of get_class($this)
 2017-09-14 12:16:16 +02:00
Laurent Destailleur
f2d092c815 Merge pull request #7377 from hregis/6.0_bug2 
Fix: missing select2 combobox
 2017-09-14 12:08:28 +02:00
Regis Houssin
a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-14 12:07:19 +02:00
Laurent Destailleur
74b55d8e8d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-14 11:49:43 +02:00
Laurent Destailleur
ed013c1b7e Compatibilty php 7.2 2017-09-14 10:21:04 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
9b22f046f5 FIX multicompany better accuracy in rounding and with revenue stamp. 2017-09-13 19:31:32 +02:00
Laurent Destailleur
a5a08006e9 FIX multicompany better accuracy in rounding and with revenue stamp. 2017-09-13 19:27:21 +02:00
Laurent Destailleur
c44a5ede43 FIX Several problem with the last event box on project/tasks 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7 FIX Several problem with the last event box on project/tasks 2017-09-13 15:12:54 +02:00
arnaud
4b6553d360 FIX comment color and create colorIsLight function 2017-09-13 10:43:44 +02:00
Laurent Destailleur
2cdea7e37c Fix bug reported by scrutinizer 2017-09-12 19:21:26 +02:00
atm-ph
30eb03af4c Fix get_class(self) instead of get_class($this) 2017-09-12 16:36:14 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
 2017-09-12 13:26:25 +02:00
Regis Houssin
e038e1a2f5 Fix: missing select2 combobox 2017-09-12 09:27:59 +02:00
Laurent Destailleur
44405e5415 Fix #7335 #7365 Better fix 2017-09-11 15:04:29 +02:00
Laurent Destailleur
dcc9cb4a16 Some fixes in various payment 2017-09-11 14:29:27 +02:00
Laurent Destailleur
029f1c411f Merge pull request #7357 from hregis/6.0_medias 
Fix: some problems with medias in multicompany
 2017-09-11 14:13:51 +02:00
Regis Houssin
b5de8da3a6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/modFacture.class.php
 2017-09-11 08:07:55 +02:00
Laurent Destailleur
d13c4b7b84 Better autosize of extrafields 2017-09-11 01:05:55 +02:00
Laurent Destailleur
25ec124411 Better autosize of extrafields 2017-09-11 00:19:42 +02:00
Laurent Destailleur
e7abb39ee2 NEW Template invoices are visible on the customer tab 2017-09-10 19:28:20 +02:00
Regis Houssin
762b4eb876 Fix: some problems with medias in multicompany 2017-09-09 17:48:04 +02:00
Laurent Destailleur
4f52871c67 Merge pull request #7345 from AXeL-dev/develop 
fix hidepriceinlabel when using ajax autocompleter
 2017-09-08 21:22:38 +02:00
Laurent Destailleur
75172966c2 Fix selection of email templates 2017-09-08 14:40:39 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97 Escape all status 2017-09-08 13:23:12 +02:00
Laurent Destailleur
b7197530c2 NEW Each user can edit its own email template (menu tools) 2017-09-08 12:48:01 +02:00
AXeL-dev
a615a46a5a fix hidepricelabel when using ajax autocompleter 2017-09-08 11:06:55 +01:00
Regis Houssin
66e548427c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/resultat/clientfourn.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-07 10:50:35 +02:00
Laurent Destailleur
61ee071f43 Fix regression 2017-09-04 10:17:51 +02:00
Laurent Destailleur
2c3a696b78 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-09-04 10:16:02 +02:00
Laurent Destailleur
f3b1f89bae Fix warning 2017-09-03 15:21:37 +02:00
Laurent Destailleur
f963afa505 Fix warning 2017-09-03 15:21:17 +02:00
Laurent Destailleur
3126676ffb FIX inert of extra field must not change extrafield values in memory 2017-09-03 14:27:46 +02:00
Laurent Destailleur
c6cbf2345d FIX Management of default value in extrafields when default is '0' 2017-09-03 14:25:54 +02:00
Laurent Destailleur
a4d3e48773 FIX inert of extra field must not change extrafield values in memory 2017-09-03 12:40:49 +02:00
Laurent Destailleur
3beee569a6 Enhance support of default value in extrafields 2017-09-02 15:18:41 +02:00
Laurent Destailleur
9923c87fd8 Fix translation of extrafields 2017-09-02 13:03:14 +02:00
Laurent Destailleur
36eb21c135 Fix translation of extrafields 2017-09-02 13:02:01 +02:00
Laurent Destailleur
e5400a4a36 Fix translation of extrafields 2017-09-02 13:01:41 +02:00
Laurent Destailleur
7f7b4cddb4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-02 12:37:02 +02:00
Laurent Destailleur
015bc51c43 Fix regression adding a false error message 2017-09-02 12:17:29 +02:00
Laurent Destailleur
32c6acefd2 Merge pull request #7321 from ruistrecht-alt/NEW_Add_region_to_state/province_form_field 
NEW Added Region name to state/province form field
 2017-09-02 00:10:25 +02:00
Rui Strecht
1ee0077e4e Fix: Added name to contributors 2017-09-01 16:10:19 +01:00
Laurent Destailleur
4660bc58fc Fix nostop option 2017-09-01 17:08:47 +02:00
Laurent Destailleur
bda507d191 Fix nostop option 2017-09-01 17:07:26 +02:00
Laurent Destailleur
223e1b1cd4 Fix missing the nostop tag 2017-09-01 16:55:09 +02:00
Laurent Destailleur
920d6270c3 Fix missing the nostop tag 2017-09-01 16:54:06 +02:00
Rui Strecht
9443cb0c1b NEW Added Region name to state/province form field 2017-09-01 15:53:06 +01:00
Laurent Destailleur
2768878618 FIX Bad condition on sms log debug 2017-09-01 16:39:49 +02:00
Laurent Destailleur
e663314cb1 Clean code 2017-09-01 16:38:56 +02:00
Laurent Destailleur
c02355c8c3 FIX Bad condition on sms log debug 2017-09-01 16:37:45 +02:00
Laurent Destailleur
61cf69f2bb NEW Include a color syntaxed HTML editor for emailing edition. 2017-09-01 13:09:13 +02:00
Maxime Kohlhaas
cf49c274a6 Better fix 2017-09-01 10:38:50 +02:00
Maxime Kohlhaas
1a956cce9a Fix : insert line extrafield 2017-09-01 10:31:22 +02:00
atm-ph
8188abd4cd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-08-31 11:09:02 +02:00
Laurent Destailleur
9146bb336e Work on merging all payment modes in one page 2017-08-31 03:34:57 +02:00
Regis Houssin
8e8f94df11 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture-rec.class.php
 2017-08-30 19:33:23 +02:00
Laurent Destailleur
a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php
 2017-08-28 12:53:02 +02:00
Laurent Destailleur
075a138e14 Fix substitution of __EMAIL__ 2017-08-28 12:49:57 +02:00
Laurent Destailleur
c382ca22b8 FIX link in to email and option for tls 2017-08-28 00:09:21 +02:00
Laurent Destailleur
b12800d174 FIX link in to email and option for tls 2017-08-28 00:06:19 +02:00
Laurent Destailleur
502ac19a0a Fix regression on categories 2017-08-27 12:28:59 +02:00
Laurent Destailleur
3f7eea2e0a NEW Can set language on extrafields 2017-08-27 12:12:02 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
Laurent Destailleur
782b85ba13 Merge pull request #7285 from hregis/6.0_bug 
Fix: avoid error "A non-numeric value encountered"
 2017-08-26 19:31:16 +02:00
Laurent Destailleur
7329d21dcd Fix lang selection 2017-08-25 17:13:33 +02:00
Laurent Destailleur
9d380a8b8a NEW Can edit the language into the email templates editor. 2017-08-25 16:38:45 +02:00
Laurent Destailleur
4337001418 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/list.php
 2017-08-24 14:26:45 +02:00
Laurent Destailleur
8e6546497a Code comment 2017-08-24 13:43:36 +02:00
Laurent Destailleur
326d3df63f FIX select of category 
FIX pb with extrafield list and key '0'

Conflicts:
	htdocs/core/class/extrafields.class.php
 2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e FIX select of category 
FIX pb with extrafield list and key '0'
 2017-08-24 13:23:15 +02:00
Laurent Destailleur
17f44ad980 NEW Can make a specific setup for SMTP sending for emailing module 2017-08-24 02:02:00 +02:00
Regis Houssin
1befd9c67f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-23 21:05:36 +02:00
Regis Houssin
7da1b215f3 Fix: avoid error "A non-numeric value encountered" 2017-08-23 21:01:14 +02:00
Laurent Destailleur
ab37794f61 Fix text 2017-08-23 19:34:26 +02:00
Laurent Destailleur
90afbcb034 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/bank.php
	htdocs/core/lib/functions.lib.php
 2017-08-23 17:02:53 +02:00
Laurent Destailleur
f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/supplier_payment.php
	htdocs/core/lib/ajax.lib.php
	htdocs/don/admin/donation.php
	htdocs/product/admin/product.php
 2017-08-23 16:11:51 +02:00
Laurent Destailleur
4da49dfc2d FIX #7239 2017-08-23 15:02:38 +02:00
Regis Houssin
2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-22 18:49:40 +02:00
Laurent Destailleur
e05ac34966 Fix remove var_dump 2017-08-22 18:03:37 +02:00
Laurent Destailleur
64c4f899f3 Fix charset management with ace 2017-08-22 18:00:54 +02:00
Laurent Destailleur
db9cc4683a Fix php warning 2017-08-22 15:29:40 +02:00
Laurent Destailleur
14cd150762 NEW Introduce experimental feature to search dolistore from application 2017-08-22 14:47:01 +02:00
Laurent Destailleur
30c39d246b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-22 11:18:56 +02:00
Laurent Destailleur
731f826a55 NEW jquery date selector become default date selector 2017-08-22 09:23:35 +02:00
Laurent Destailleur
2321091170 NEW Move the upload input on top right in ECM module 2017-08-20 21:23:19 +02:00
Laurent Destailleur
188653a85d Work on website module 2017-08-20 18:50:51 +02:00
Laurent Destailleur
260beed512 NEW Generated files are now indexed in database 2017-08-18 23:19:55 +02:00
Laurent Destailleur
097b660c41 Mutualize code 2017-08-18 16:25:00 +02:00
florian HENRY
874d61bb6d Other fix 2017-08-18 11:35:20 +02:00
florian HENRY
c793e847bc fix comondoc generator 2017-08-18 11:30:13 +02:00
florian HENRY
f6a1e7685c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_manageextrafieldswithmultientity 2017-08-04 17:13:53 +02:00
florian HENRY
03e935f493 Better management 2017-08-04 17:11:40 +02:00
Laurent Destailleur
1bd992dae9 Merge pull request #7238 from atm-florian/dev_manageextrafieldswithmultientity 
NEW : manageme extrafields with multientity
 2017-08-04 15:39:31 +02:00
Laurent Destailleur
402e6bf650 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/index.php
	htdocs/compta/paiement/list.php
	htdocs/core/modules/modCron.class.php
 2017-08-04 15:39:00 +02:00
Laurent Destailleur
da831d2c8e FIX Bad link in ECM 2017-08-04 13:45:57 +02:00
Laurent Destailleur
5b7c144f95 FIX Bad link in ECM 2017-08-04 13:45:20 +02:00
Laurent Destailleur
c107a77722 NEW Can filter on document name in ECM module for automatic tree 2017-08-04 13:10:51 +02:00
Laurent Destailleur
3a098ca047 Reduce verbosity 2017-08-04 11:50:30 +02:00
florian HENRY
8fd45383e2 NEW : manageme extrafields with multientity 2017-08-04 09:00:11 +02:00
Laurent Destailleur
f058fa1938 Better detection if a module provide triggers 2017-08-03 12:19:31 +02:00
Laurent Destailleur
81b11100b0 Prepare code to clone site an fetch external page 2017-08-03 01:45:31 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
 2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
71d49f1c6f Fix pb in ecm 2017-08-01 18:44:34 +02:00
Laurent Destailleur
ba221650cf Start to work on using the jquery date selector. 2017-08-01 01:25:30 +02:00
Regis Houssin
0dc0fe81fc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-31 07:40:01 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Laurent Destailleur
ec27eb5b1e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/societe/list.php
 2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Regis Houssin
acd5780e32 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-26 08:58:56 +02:00
Laurent Destailleur
760d2617a0 Can disable the search of previous/next in dol_banner 2017-07-25 23:03:28 +02:00
Laurent Destailleur
5b9ac2a7a9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/index.php
 2017-07-25 21:11:36 +02:00
Laurent Destailleur
c386a02889 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2017-07-25 21:10:08 +02:00
Laurent Destailleur
8b793a261f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2017-07-25 21:08:31 +02:00
Laurent Destailleur
6c9242b605 Merge pull request #7201 from atm-florian/dev_extrafields_table_uniformisation 
NEW new columns into extrafields table to get update create information
 2017-07-25 20:04:50 +02:00
Laurent Destailleur
0e23b04fab Update extrafields.class.php 2017-07-25 20:04:10 +02:00
Laurent Destailleur
6e8498465a Update extrafields.class.php 2017-07-25 20:01:47 +02:00
Laurent Destailleur
a7c96416ba Merge pull request #7194 from hregis/6.0_bug2 
Fix: getEntity $shared param value is now 1 by default
 2017-07-25 13:29:42 +02:00
florian HENRY
d2ecebdddd new :new column into extrafeild table to get update create information 2017-07-25 11:57:36 +02:00
Laurent Destailleur
dcf5fd20bb Fix navigation on card generated by modulebuilder 2017-07-25 10:38:39 +02:00
Laurent Destailleur
bfd1fa3984 Enhance modulebuilder 2017-07-25 02:56:19 +02:00
Laurent Destailleur
13cd203502 Enhance modulebuilder 2017-07-25 01:54:54 +02:00
Laurent Destailleur
70341d6169 Debug modulebuilder 2017-07-25 00:33:43 +02:00
Laurent Destailleur
307b8ef4f6 Debug modulebuilder 2017-07-25 00:32:06 +02:00
Laurent Destailleur
1877a3b6fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-24 21:04:07 +02:00
Laurent Destailleur
dcb79e66cc Debug modulebuilder 2017-07-24 13:55:12 +02:00
Regis Houssin
48800bc268 Fix: getEntity $shared param value is now 1 by default 2017-07-24 08:52:10 +02:00
Laurent Destailleur
6421ec3139 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2017-07-23 19:27:40 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Laurent Destailleur
0aed9ecd7c Fix ckeditor is now ok since there is no more jmobile. 2017-07-23 18:52:30 +02:00
Laurent Destailleur
336400d9ea Can clone a page onto another website 2017-07-23 16:20:53 +02:00
Regis Houssin
2efb86b5d8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-23 10:36:14 +02:00
Laurent Destailleur
764c7ac792 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/websites/index.php
 2017-07-22 20:46:02 +02:00
Laurent Destailleur
854a6ca3d5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-22 16:40:45 +02:00
Laurent Destailleur
340203cc18 Fix vat label for India 2017-07-22 16:05:51 +02:00
Regis Houssin
26df1389f4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-07-21 20:42:21 +02:00
Laurent Destailleur
d07741ada1 Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
Laurent Destailleur
6830fe4f91 Fix generic clone function 2017-07-21 13:39:06 +02:00
Laurent Destailleur
1e7aa4d9b4 Work on module website 2017-07-19 16:38:00 +02:00
Regis Houssin
c8bd11660d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-07-18 15:23:43 +02:00
Laurent Destailleur
a416ec4258 Try to fix travis 2017-07-18 14:25:07 +02:00
Laurent Destailleur
5c296c679e Enhance source code editor 2017-07-18 13:42:07 +02:00
Laurent Destailleur
97fe41d603 A info int smtp header 2017-07-18 12:49:19 +02:00
Laurent Destailleur
6db2aeff20 Fix source code editor 2017-07-18 12:00:18 +02:00
Laurent Destailleur
2a50a78497 Fix hack to solve link to restrictions 2017-07-18 10:15:48 +02:00
Laurent Destailleur
98ef978b2a NEW Introduce code syntax coloration with mode 'ace' for DolEditor. 2017-07-18 03:18:16 +02:00
Laurent Destailleur
4582b54e91 Fix use command standard @... to mark a change in official code 2017-07-17 20:09:19 +02:00
Laurent Destailleur
7b2a71802b Do some TODO on modulebuilder module. 2017-07-16 13:00:35 +02:00
Regis Houssin
200f232164 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-16 07:51:20 +02:00
Laurent Destailleur
15cf15f47f Look and feel v6 2017-07-14 02:07:01 +02:00
Laurent Destailleur
312b153005 Fix phpcs 2017-07-13 23:46:01 +02:00
Laurent Destailleur
43f6eab2ea FIX #7146 2017-07-13 15:16:17 +02:00
Laurent Destailleur
c434f72d31 Merge pull request #7146 from hregis/6.0_bug3 
Fix: travis error (categorie)
 2017-07-13 14:46:41 +02:00
Laurent Destailleur
85d9a2f790 Merge pull request #7145 from hregis/6.0_bug2 
Fix: missing group name with dol_banner_tab
 2017-07-13 14:36:17 +02:00
Laurent Destailleur
23fbef3dae Fix the delete dir functions does not return real nb of deleted files. 2017-07-13 00:26:05 +02:00
Laurent Destailleur
44b6b8cc65 Fix purge of log files was missing some log files. 2017-07-12 20:27:25 +02:00
Laurent Destailleur
a487492a7a Fix purge of log files was missing some log files. 2017-07-12 20:23:35 +02:00
Regis Houssin
44a44ab0a2 Fix: travis error 2017-07-12 16:45:32 +02:00
Regis Houssin
d63e15f0c6 Fix: missing group name with dol_banner_tab 2017-07-12 15:52:58 +02:00
Laurent Destailleur
33ceb22b8b Fix error management into modulebuilder 2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15 Debug modulebuilder 2017-07-12 11:52:07 +02:00
Regis Houssin
cb6b81d897 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-11 19:10:22 +02:00
Laurent Destailleur
c75db29ff2 Fix warning when module position is not correct 2017-07-11 12:54:49 +02:00
Laurent Destailleur
32d5edf5b9 Fix warning when module position is not correct 2017-07-11 12:54:03 +02:00
Laurent Destailleur
45d8fbb19e Fix gravatar 2017-07-08 21:39:48 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
cf6745b1ae Debug module builder 2017-07-08 17:08:07 +02:00
Laurent Destailleur
8db4e91888 Debug modulebuilder 2017-07-08 15:43:36 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
gauthier
a6f1e08c19 FIX : we have to check if contact doesn't already exist on add_contact() function 2017-07-07 11:48:30 +02:00
Laurent Destailleur
9baeee893f Fix multicurrency (tags for odt) 2017-07-07 10:54:54 +02:00
phf
6ab0ec4b1b Fix travis and rename 2 fields 2017-07-07 10:22:37 +02:00
Laurent Destailleur
2aaf8b22f2 Fix substitution var 2017-07-07 10:10:12 +02:00
phf
49b8689f2d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-07-05 11:02:39 +02:00
phf
b8865c425f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-05 10:48:01 +02:00
phf
1beec51928 New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE 2017-07-05 10:44:52 +02:00
Regis Houssin
fa247ffd98 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-29 08:51:42 +02:00
Laurent Destailleur
ab0a730d4a Fix bad GETPOST on 'action' 2017-06-29 02:54:56 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
3fdfebf7ef Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
Laurent Destailleur
59bd4749a8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/class/product.class.php
 2017-06-24 10:27:10 +02:00
Laurent Destailleur
1211e0d7ab FIX vat code not saved during product creation. 2017-06-23 12:09:21 +02:00
Laurent Destailleur
693b2fe3b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
 2017-06-23 11:20:29 +02:00
Laurent Destailleur
3a400c46ad Fix preselected email not done 2017-06-23 10:15:32 +02:00
Laurent Destailleur
1b96bb4221 Fix usage of constant. No need to have a dedicated setup as it should be 
supported by the responsive design architecture.
 2017-06-22 14:48:13 +02:00
Laurent Destailleur
474a2692fa Fix missing /div 2017-06-22 13:54:03 +02:00
Laurent Destailleur
4102403482 Look and feel v6 2017-06-21 11:37:34 +02:00
Laurent Destailleur
3ec0e6f7ef FIX #6885 2017-06-20 12:31:08 +02:00
Laurent Destailleur
d8b0199ba2 FIX #7040 2017-06-20 10:24:54 +02:00
Regis Houssin
909826e24f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-20 06:25:35 +02:00
Laurent Destailleur
658ba50aa8 Standardize picto status 2017-06-20 02:29:29 +02:00
Marcos García
eaaee59f92 FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working 2017-06-19 19:23:00 +02:00
Regis Houssin
d2371946ba Fix: for avoid warning 2017-06-19 09:50:13 +02:00
Regis Houssin
544d051fe3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-19 07:06:57 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6 Escape hml tags 2017-06-18 19:42:59 +02:00
Regis Houssin
dcc152d4a4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-18 06:52:20 +02:00
Laurent Destailleur
b73228899a Merge pull request #7024 from defrance/patch-14 
Introduce weight conversion lb & oz
 2017-06-17 17:52:20 +02:00
BENKE Charlene
fcdf68db6a Update commonobject.class.php 2017-06-17 16:31:54 +02:00
Regis Houssin
a0299042e4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-17 12:05:33 +02:00
Laurent Destailleur
5b7a8e9c90 Fix missing signature when sending email from user card 2017-06-17 10:17:36 +02:00
BENKE Charlene
5320ebc051 getTotalWeightVolume : add conversion Lb & oz to KG 
New conversion value : Oz once
Little az a wizzard...
 2017-06-17 10:16:52 +02:00
Laurent Destailleur
26e80045a6 Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor 
NEW log download or preview event on a validate bill
 2017-06-16 11:06:27 +02:00
Laurent Destailleur
343e8d8498 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-16 00:49:52 +02:00
Laurent Destailleur
ac708a8ee9 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-15 23:58:56 +02:00
Laurent Destailleur
f39fb5187a Fix component to select journal 2017-06-15 20:27:40 +02:00
Regis Houssin
cd095e99c9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-14 12:16:10 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +02:00
alexis Algoud
ef0907d89e NEW log download or preview event on a validate bill 2017-06-13 15:55:22 +02:00
Regis Houssin
773abff80e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
5d9a84dedb Fix sql syntax error 2017-06-12 15:35:50 +02:00
Laurent Destailleur
bf41056c68 Fix test on permission for widgets 2017-06-12 14:21:04 +02:00
Regis Houssin
3445c9d329 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/lib/functions.lib.php
 2017-06-11 06:27:49 +02:00
Laurent Destailleur
4683ef41be Fix hide search label on computed field into lists 2017-06-10 22:49:16 +02:00
Laurent Destailleur
6ab47a845e Fix look and feel v6 2017-06-10 13:54:43 +02:00
Laurent Destailleur
a8e16910c0 Fix look and feel v6 2017-06-10 13:44:20 +02:00
Laurent Destailleur
884c6c674d Fix css 2017-06-09 20:08:23 +02:00
Regis Houssin
0e8f36dc92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-06-09 14:00:48 +02:00
Laurent Destailleur
1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-06-09 12:50:56 +02:00
Laurent Destailleur
62933e9a26 Fix sql syntax error in some cases 2017-06-09 11:22:42 +02:00
Laurent Destailleur
929946ad47 Fix several problem with hook printFieldListWhere 2017-06-09 10:12:01 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +02:00
Regis Houssin
4c70908ea2 Fix: entity field in combobox 2017-06-08 18:52:01 +02:00
phf
d6d451b54a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-06-08 12:03:59 +02:00
phf
711f9696aa New multi contacts on actioncomm 2017-06-08 12:02:39 +02:00
Laurent Destailleur
3e51d2f537 Fix backto link after creating a third party 2017-06-08 11:51:31 +02:00
Laurent Destailleur
a1144e1f66 Fix missing init of hookmanager 2017-06-08 11:18:41 +02:00
Laurent Destailleur
9c4a2594b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-08 11:07:25 +02:00
Laurent Destailleur
832e288814 FIX #6955 2017-06-08 10:47:22 +02:00
Laurent Destailleur
7587a3d592 Merge branch 'develop' into develop_transverse 2017-06-08 10:25:04 +02:00
Regis Houssin
b183c6e7ac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_transverse
 2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
a0295821ba Fix errors in extra computed field 2017-06-07 11:38:42 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Regis Houssin
7ed0643b52 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 10:54:16 +02:00
Laurent Destailleur
2f59525967 Merge pull request #6942 from hregis/develop_bug 
Fix: avoid warning "Undefined property: stdClass::$AGENDA_DEFAULT_FILTER_TYPE"
 2017-06-06 10:47:20 +02:00
Regis Houssin
79a0b959d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 10:36:37 +02:00
Laurent Destailleur
2510ec7015 Fix php error 2017-06-06 10:29:34 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Laurent Destailleur
22efbabfa6 NEW Add hook doUpgrade2 2017-06-06 01:34:25 +02:00
Regis Houssin
74710827b2 Fix: avoid warning "Undefined property: 
stdClass::$AGENDA_DEFAULT_FILTER_TYPE"
 2017-06-03 14:15:34 +02:00
Regis Houssin
a25facef7c Fix: use 0 instead false 2017-06-03 11:49:59 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-03 11:45:15 +02:00
Laurent Destailleur
832e9ed15a Merge pull request #6932 from atm-ph/fix_develop_get_extra_chkbxlst 
Fix get extrafields value from getOptionalsFromPost give an error wit…
 2017-06-03 01:04:18 +02:00
Laurent Destailleur
e1b19b831a NEW An external module can hook and add mass actions 2017-06-02 23:57:37 +02:00
Laurent Destailleur
66420d0e80 Restore lost file and better generation of modules 2017-06-02 23:02:48 +02:00
Laurent Destailleur
9e629bdb02 Work on modulebuilder 2017-06-02 20:01:25 +02:00
Laurent Destailleur
c59d216cf5 NEW Can read time spent of others (hierarchy only or all if granted) 2017-06-02 13:24:45 +02:00
phf
64cd1e0923 Fix get extrafields value from getOptionalsFromPost give an error with chkbxlst type on propaldet for exemple 2017-06-02 12:31:03 +02:00
Laurent Destailleur
c70beaa56b Complete work for mutualizing generic substitution system. 2017-06-01 01:57:22 +02:00
Laurent Destailleur
10ac53077e Code comment 2017-05-31 11:51:38 +02:00
Laurent Destailleur
292571688b Fix error message not reported 2017-05-31 10:49:06 +02:00
Regis Houssin
aa780ea33b Fix: missing dot 2017-05-30 19:15:37 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
df729d8889 Fix travis 2017-05-29 19:28:43 +02:00
Laurent Destailleur
d56cd44ebc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-29 19:11:41 +02:00
Laurent Destailleur
ab5545d02d Merge pull request #6898 from defrance/patch-12 
$resaction need in 5.0.x too
 2017-05-29 11:41:22 +02:00
BENKE Charlie
18799c3a7f Changes Done 
question
need to change $actionclassinstance->results in $actionclassinstance->resactionss ???
 2017-05-29 11:00:08 +02:00
Laurent Destailleur
452579150d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2017-05-29 10:43:26 +02:00
Laurent Destailleur
e667d72547 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
 2017-05-29 10:41:51 +02:00
Laurent Destailleur
16456cf19f Merge pull request #6891 from hregis/develop_api 
NEW add REST api "memberstypes"
 2017-05-29 10:29:04 +02:00
Laurent Destailleur
d03d179fa3 FIX Fullname when member is a moral entity with no name. 2017-05-28 23:43:24 +02:00
Laurent Destailleur
c4f09b8894 Work on modulebuilder 2017-05-28 14:43:17 +02:00
BENKE Charlie
e4f7f2a0b2 $resaction need in 5.0.x too 2017-05-26 12:39:49 +02:00
Regis Houssin
18886849eb New: add REST api "memberstypes" 2017-05-25 08:54:30 +02:00
Alexandre SPANGARO
e4f5d45c45 Remove old code (selectjournal_accountancy_bookkepping) 2017-05-25 07:10:09 +02:00
Alexandre SPANGARO
1f079fac9d Move html.formventilation.class.php to html.formaccounting.class.php 2017-05-25 06:57:28 +02:00
Laurent Destailleur
e5fe629a0e NEW Extrafields support formulas to be computed using PHP expressions 2017-05-24 22:48:44 +02:00
Laurent Destailleur
aef9ef2d75 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-24 13:46:03 +02:00
Laurent Destailleur
6eeb82ec70 FIX dialog window with md theme must not be hidden by left menu part. 2017-05-24 13:45:26 +02:00
Laurent Destailleur
80ce8da7a3 Fix migration errors and responsive design 2017-05-23 15:13:52 +02:00
Laurent Destailleur
1a8884bbbe NEW Can filter on year and product tags on the product statistic page 2017-05-22 15:20:52 +02:00
Laurent Destailleur
52b5a8ece7 More powerfull dol_move function. 2017-05-21 14:06:43 +02:00
Laurent Destailleur
2dd2ab1003 Look and feel v6 2017-05-20 20:59:54 +02:00
Laurent Destailleur
80cbc28385 NEW Add REST API to push a file. 2017-05-20 15:52:36 +02:00
Laurent Destailleur
807c77f754 Fix inconsistent options 2017-05-19 18:03:49 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
florian HENRY
82cac745e3 FIX 6863 2017-05-18 14:18:59 +02:00
Laurent Destailleur
0b52c43e05 Fix bad selection of progress when not known 2017-05-18 11:35:12 +02:00
Laurent Destailleur
1a1b27d68c Fix input of duration 2017-05-18 11:13:18 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
b29d0385e6 NEW Can send an email to a user from its card. 2017-05-15 00:15:56 +02:00
Alexandre SPANGARO
143c019905 Fix : Sql error on salaries index for accountancy multijournal + debug 2017-05-14 08:07:34 +02:00
Laurent Destailleur
e0abba5cf2 Merge pull request #6831 from Gecka-Apps/5.0-fixes 
Fix: when sending a mail the default template used should be the first positioned template
 2017-05-13 19:35:58 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Dinclaux
8ae05a9651 Fix: when sending a mail the default template used should be the first positionned template 2017-05-11 13:38:17 +11:00
Laurent Destailleur
cd72c50356 Merge pull request #6799 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2017-05-11 00:04:12 +02:00
Laurent Destailleur
30cf3f2bda Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/tables/llx_bank_account.sql
 2017-05-11 00:03:06 +02:00
Laurent Destailleur
922fa088b4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/boxes/box_services_expired.php
 2017-05-10 23:47:33 +02:00
Laurent Destailleur
b2e9d4cc21 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-10 23:42:49 +02:00
Laurent Destailleur
2da0a129d1 Multiple file upload on by default on desktop. 2017-05-10 23:41:43 +02:00
Laurent Destailleur
164f3954ee Merge pull request #6824 from ATM-Marc/NEW_multiple_fileupload 
NEW permit multiple file upload in linked documents tab
 2017-05-10 23:24:41 +02:00
Laurent Destailleur
2b64cf0ebe Update html.formfile.class.php 2017-05-10 23:24:33 +02:00
Laurent Destailleur
1c7d9b9d9a Merge pull request #6804 from aspangaro/6.0-multijournal 
New : Accountancy - Add a list to select the bank journal in bank card
 2017-05-10 22:46:30 +02:00
jfefe
d410a320d7 WIP #6504: CVE-2017-7886 
'defaultlang' attribute was not filtered before database request which cause an SQL injection.
 2017-05-10 20:32:54 +02:00
Laurent Destailleur
5a96ae54b9 FIX Link to files on bank account tab broken with multicompany 
FIX Link to preview on thirdparty broken with multicompany
 2017-05-10 19:08:07 +02:00
Marc de Lima Lucio
984531411d NEW: permit multiple file upload in linked documents 2017-05-10 15:01:27 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
9fe28c9b2c NEW Can disable all overwrote translations in one click. 2017-05-09 10:08:04 +02:00
Laurent Destailleur
05d6c2cd75 Fix no more use of constant 2017-05-09 01:36:20 +02:00
Alexandre SPANGARO
a3602ff6b4 Add journal list in new movement card 2017-05-08 06:20:17 +02:00
Alexandre SPANGARO
dd97bbdc82 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 2017-05-07 15:10:30 +02:00
Laurent Destailleur
46ff62fc87 Work on inventory module debug 2017-05-06 22:28:07 +02:00
Alexandre SPANGARO
68aaef2f66 Add list to select journal in bank 2017-05-06 08:06:01 +02:00
Alexandre SPANGARO
a4defb8102 Add html form for accountancy journals list 2017-05-06 07:02:34 +02:00
Laurent Destailleur
d53654e64f Look and feel v6 2017-05-05 20:45:06 +02:00
Scrutinizer Auto-Fixer
d93552c8c5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-05-05 17:13:29 +00:00
Laurent Destailleur
2e5c32eb62 Merge pull request #6748 from atm-florian/5.0 
FIX : #6747
 2017-05-05 19:06:14 +02:00
Laurent Destailleur
806157ae40 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-05 17:52:22 +02:00
Laurent Destailleur
15d20497c8 FIX #6795 #6796 2017-05-05 17:46:22 +02:00
Laurent Destailleur
a8292ce990 Code comment 2017-05-05 17:27:16 +02:00
Laurent Destailleur
885a636351 Debug new journal list page 2017-05-05 16:35:05 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
 2017-05-05 14:49:25 +02:00
Laurent Destailleur
eb2124bfc8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-05 14:14:53 +02:00
Laurent Destailleur
2120b9af85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/theme/eldy/style.css.php
 2017-05-05 14:14:21 +02:00
Laurent Destailleur
a1ac3b470b Change menu for setup of predefined emails 2017-05-05 14:01:20 +02:00
Laurent Destailleur
90542d119a FIX trigger name and status set of setStatus for commercial proposal 2017-05-05 13:25:30 +02:00
Laurent Destailleur
9785e9b298 Update commonobject.class.php 2017-05-05 09:57:51 +02:00
Laurent Dinclaux
24a2fb57ea Resolved merge conflict 2017-05-05 10:22:46 +11:00
Laurent Destailleur
089b882033 Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone 
FIX ajax autocomplete on clone
 2017-05-04 21:05:40 +02:00
Laurent Destailleur
bf616cbe05 Fix bad var 2017-05-04 19:05:02 +02:00
florian HENRY
b8d63ae6c0 Better fix 2017-05-04 14:04:30 +02:00
florian HENRY
9958fcaa6f Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0 2017-05-04 14:02:28 +02:00
Laurent Destailleur
c196e79bf4 Merge branch 'develop' into FIX_inventory 2017-05-04 13:50:53 +02:00
Laurent Destailleur
0c76db7973 FIX #6698 #6742 2017-05-04 13:41:37 +02:00
Laurent Destailleur
7d5b5cf86a Better behavior for tooltip on click 2017-05-04 13:09:42 +02:00
Laurent Destailleur
c7d736376f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-04 12:41:49 +02:00
Laurent Destailleur
7ec46b3bd6 Finished work to have substitution keys code mutualized. 2017-05-04 12:35:45 +02:00
Laurent Destailleur
f543461e9b Complete the substitution array with substitution array with all 
possible keys
 2017-05-04 11:21:28 +02:00
Laurent Destailleur
3871da0324 Merge pull request #6729 from atm-florian/dev_importexport_ressources 
NEW : Add module resources import/export
 2017-05-04 09:43:00 +02:00
Laurent Dinclaux
f63f28c7fe Fix vat_src_code propagation between post types 2017-05-03 21:37:30 +11:00
alexis portable
da4d179d36 fix travis 2017-05-02 23:20:23 +02:00
alexis portable
d1a443f0f0 fix camelcase for travis 2017-05-02 23:11:05 +02:00
Laurent Destailleur
3917bdfc79 Fix vat_src_code propagation. 2017-05-02 22:37:43 +02:00
alexis Algoud
6138d197e4 FIX major issues for inventory 
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
 2017-05-02 15:19:55 +02:00
Marcos García de La Fuente
166f2d262d Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume 2017-05-02 14:00:27 +02:00
Laurent Destailleur
1e3384a842 Fix travis 2017-04-30 14:16:58 +02:00
Laurent Destailleur
58e2b49b1c Clean code 2017-04-30 13:49:06 +02:00
Laurent Destailleur
865c8140d1 Clean code 2017-04-30 03:23:06 +02:00
Laurent Destailleur
4993a43025 Move new feature inventory into module stock. 2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e Move new feature inventory into module stock. 2017-04-29 21:53:01 +02:00
Laurent Destailleur
f5bdfc426f Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview 
New inventory coreobject listview
 2017-04-29 21:31:46 +02:00
Laurent Destailleur
a8c775dcbd Fix compatibility with the removal of "constant". 2017-04-29 18:48:30 +02:00
phf
8219ff84c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-04-28 14:45:04 +02:00
Laurent Destailleur
c722286bcb Fix regressions 2017-04-28 13:37:36 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Quentin Vial-Gouteyron
4ab5674ffb FIX ajax autocomplete on clone 2017-04-25 15:10:46 +02:00
florian HENRY
86338d1781 FIX : #6747 2017-04-24 09:03:25 +02:00
Laurent Destailleur
ec59f08e41 FIX extrafield css for boolean type 2017-04-24 00:46:27 +02:00
florian HENRY
213e0d2870 fix travis 2017-04-19 14:49:12 +02:00
florian HENRY
4efb1ba23a update credentials 2017-04-18 15:27:18 +02:00
florian HENRY
a52db08cd6 NEW : Add module resources import/export 2017-04-18 15:25:04 +02:00
Laurent Destailleur
3da0aea168 Prepare code to use different SMTP servers. 2017-04-18 01:39:06 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
436f60a784 FIX Cache to load currencies was not working when loading all currencies 2017-04-14 18:08:02 +02:00
Laurent Destailleur
5931bc4068 NEW Feature to crop/resize images available on user and expense reports 2017-04-14 13:53:39 +02:00
Laurent Destailleur
e6e9b65594 NEW Reduce memory usage by removing deprecated constant loading. 2017-04-14 12:38:52 +02:00
Laurent Destailleur
4e021c123b Fix travis error 2017-04-14 11:28:19 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
6c069e9a1a Fix label of long status 2017-04-13 15:15:44 +02:00
Laurent Destailleur
3e9ccc186a NEW Small PDF template for products 2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
4eaa1d4f46 Add nb of generation into list of template invoices 2017-04-11 20:07:35 +02:00
Laurent Destailleur
8e33c8090d FIX No filter on company when showing the link to elements. 2017-04-11 19:07:03 +02:00
Laurent Destailleur
423ffefbf3 NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN_LINKTO 2017-04-11 18:18:36 +02:00
Laurent Destailleur
2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php
 2017-04-11 11:43:54 +02:00
Laurent Destailleur
81020cea77 Merge pull request #6660 from atm-florian/dev_contractselect 
NEW select2 for contract selector
 2017-04-11 11:08:59 +02:00
Laurent Destailleur
d4de81ed6d Merge pull request #6659 from altatof/fix_incoterm 
FIX: dont get empty "Incoterms : - " string if no incoterm
 2017-04-11 11:08:17 +02:00
Laurent Destailleur
6aa56ce0fa NEW Add a tracking id into mass emailing 
Prepare code to use a dedicated SMTP server according to context.
 2017-04-11 10:57:17 +02:00
Marcos García de La Fuente
996b5e9f87 Corrected translation errors and little bug showing a non-available button to a restricted user 2017-04-09 18:17:46 +02:00
Laurent Destailleur
52c86cb3f5 NEW Bulk actions available on supplier orders 2017-04-09 13:12:25 +02:00
Laurent Destailleur
a0e75d0af0 Work on look and feel v6 2017-04-07 18:38:55 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
florian HENRY
e76a00845d better test 2017-04-07 14:55:59 +02:00
florian HENRY
a1c1aa054f new : select2 for contract selector 2017-04-07 14:55:14 +02:00
altatof
d892a89f45 FIX: dont get empty "Incoterms : - " string if no incoterm 2017-04-07 14:15:51 +02:00
Laurent Destailleur
60a54041c2 NEW Enable bulk actions delete on supplier invoices 2017-04-07 14:09:19 +02:00
Laurent Destailleur
ea44e14b60 Start debug the variant module 2017-04-07 11:01:12 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:56:48 +02:00
Laurent Destailleur
e2ea5945dd Work on look and feel v6 2017-04-06 21:48:28 +02:00
Alexis ALGOUD
736800dd66 little fix 
for param into list pagination
 2017-04-05 12:16:10 +02:00
Laurent Destailleur
1dc2cae3a5 NEW Show company into combo list of projects 2017-04-05 11:51:55 +02:00
Laurent Destailleur
7c868888a5 FIX Add option MAIN_MAIL_USE_MULTI_PART to include text content into 
HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to
restore the inline images feature.
 2017-04-05 01:02:03 +02:00
Laurent Destailleur
13333ffd73 Add multipart text version into html emails. 2017-04-05 00:39:32 +02:00
Laurent Destailleur
c4d4856997 FIX sql errors on user card 2017-04-04 12:23:44 +02:00
Laurent Destailleur
9df4bac202 NEW Bookmarks are into a combo list. 2017-04-04 11:56:19 +02:00
Laurent Destailleur
761ece3125 Remove $maxfilenamelength replace with auto overflow. 2017-04-03 16:59:22 +02:00
Laurent Destailleur
e8767122b0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/societe/list.php
 2017-04-03 11:05:19 +02:00
Laurent Destailleur
13587fa13e Fix key were not translated 2017-04-03 10:51:35 +02:00
Laurent Destailleur
6a69f9349b Fix too much logs in list 2017-04-03 10:43:04 +02:00
Laurent Destailleur
a5a0995313 More comments 2017-04-03 10:11:29 +02:00
Laurent Destailleur
17a1874e36 FIX Counter of notification of a thirdparty 2017-04-01 13:43:05 +02:00
Laurent Destailleur
d975e7f442 Work on 6.0 look and feel 2017-04-01 12:46:47 +02:00
Laurent Destailleur
88017f5707 Merge pull request #6369 from atm-florian/dev_replace_extrefield_checkboxByMultiSelect 
NEW : change render extrafields checkbox list for multiselectarray
 2017-03-31 18:12:58 +02:00
Laurent Destailleur
7bcd4d74ef Merge pull request #6617 from dolibarr95/patch-9 
Display mobile icon
 2017-03-31 17:43:01 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Marcos García de La Fuente
cd5b074a48 FIX #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled 2017-03-30 15:21:20 +02:00
dolibarr95
1489847a74 Display mobile icon 
Display a specific icon when mobile
 2017-03-30 09:49:34 +02:00
Laurent Destailleur
fbca800246 FIX Detection of color brightness 2017-03-29 11:46:13 +02:00
Laurent Destailleur
4fa5448aab FIX Detection of color brightness 2017-03-29 10:34:33 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
phf
fe1b1ede0f Fix remove filter on date 2017-03-28 17:35:51 +02:00
phf
c3e8a5be62 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-03-28 17:20:50 +02:00
Laurent Destailleur
31bde1ae74 Code for 6.0 new look and feel 2017-03-28 17:12:15 +02:00
phf
5decbde79b Fix search by date does not work 2017-03-28 17:06:22 +02:00
phf
df170769c9 Update function module inventory 2017-03-28 16:05:18 +02:00
phf
70743e1f68 Update list header to be print with Dolibarr functions 2017-03-28 13:48:33 +02:00
Laurent Destailleur
f843f8a93d Start to move search bar before table titles 2017-03-27 00:48:50 +02:00
atm-ph
ed27b44f62 Add TODO to print header table as Dolibarr 2017-03-26 14:58:59 +02:00
atm-ph
ae2ab3276d Refactoring and class/method documentation 2017-03-26 14:37:25 +02:00
Laurent Destailleur
e38ad37ce3 FIX #6517 #6525 Autocompletion of thirdparty after n chars not 
implemented
 2017-03-26 05:02:06 +02:00
atm-ph
09f645fc9f Fix travis 2017-03-25 23:21:49 +01:00
atm-ph
76b95aeec0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-03-25 19:15:25 +01:00
atm-ph
2fc74b4962 Refactoring class 2017-03-25 18:53:14 +01:00
atm-ph
cb576e6c99 Refactoring class 2017-03-25 18:26:10 +01:00
atm-ph
fce8e08b51 Refactoring and fix 2017-03-25 18:13:39 +01:00
atm-ph
ae33e40dc8 Refactoring and add method comments 2017-03-25 17:32:42 +01:00
atm-ph
269645dfc7 Add method documentations 2017-03-25 10:48:06 +01:00
atm-ph
de832d90a9 Refactoring 2017-03-25 00:50:53 +01:00
Laurent Destailleur
292bcae592 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-25 00:05:04 +01:00
Laurent Destailleur
d1a988a0be Fix document_preview is possible on files with + chars inside. 2017-03-24 17:32:38 +01:00
atm-ph
edc2d39702 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-03-24 17:06:40 +01:00
Laurent Destailleur
38660418b4 Include preview of pdf into dol_banner 2017-03-23 22:27:44 +01:00
Laurent Destailleur
664380d304 Css enhancement 2017-03-23 21:24:57 +01:00
Laurent Destailleur
eb145faffd Replace parameter mixte with textselect 2017-03-23 19:57:45 +01:00
Laurent Destailleur
d1c29bf698 Merge pull request #6552 from defrance/patch-91 
NEW : introducing "mixte" mode for select_duration
 2017-03-23 19:54:33 +01:00
Laurent Destailleur
fec3a89aa5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 11:38:46 +01:00
Laurent Destailleur
0a35d17207 CSS enhancement 2017-03-23 10:59:13 +01:00
BENKE Charlie
7999cb9a46 introducing "mixte" mode for select_duration 
If 'select' then input hour and input min is a combo,
if 'text' input hour is in text and input min is a text, 
if 'mixte' input hour is in text and input min is a combo
 2017-03-21 23:48:06 +01:00
Laurent Destailleur
acdfd6ab9e css enhancement 2017-03-21 18:23:58 +01:00
Laurent Destailleur
e7a45a7f6a NEW Use html5 type "number" on select field for year and duration. 2017-03-21 17:50:43 +01:00
Laurent Destailleur
68257283e4 Enhance select list 2017-03-21 13:39:42 +01:00
Laurent Destailleur
1b0b4c9609 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-20 23:53:47 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
b169f93abc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-19 14:27:12 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Laurent Destailleur
b9d6122c53 Add comments 2017-03-18 19:56:53 +01:00
Laurent Destailleur
f7e71d1de2 FIX LOG_ERROR does not exists. Use LOG_ERR. 2017-03-18 11:48:02 +01:00
Laurent Destailleur
597fb11d08 Fix error management in duplicate trigger 2017-03-18 11:36:48 +01:00
Laurent Destailleur
35b79818b7 Uniformize css rules 2017-03-16 20:33:51 +01:00
Laurent Destailleur
dba6d99686 Minor look enhancement 2017-03-16 17:02:30 +01:00
Laurent Destailleur
6f25d6de24 Fix bad management of PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY 2017-03-15 12:33:06 +01:00
Laurent Destailleur
4c0ff38020 Fix closing boxes 2017-03-15 11:58:13 +01:00
Laurent Destailleur
d951114c18 Merge branch 'develop' into NEW_odt_others_objects 2017-03-14 10:44:05 +01:00
arnaud
192a825de8 NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class 2017-03-14 09:25:29 +01:00
Alexandre SPANGARO
c6c07bf9f4 New : Add project to social contributions 2017-03-12 14:32:49 +01:00
Laurent Destailleur
4bf0e31299 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/loan.lang
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-11 02:40:42 +01:00
Laurent Destailleur
47dd53abbe NEW The substitution keys available for emailing edition is now into a 
popup
 2017-03-11 02:36:22 +01:00
Laurent Destailleur
4737c62394 FIX Avoid flash on screen 2017-03-11 00:52:35 +01:00
Laurent Destailleur
2054ce0aab FIX Avoid flash on screen 2017-03-11 00:50:55 +01:00
Laurent Destailleur
209bd0b3e4 2nd try to fix better compatibility 2017-03-10 16:53:26 +01:00
Laurent Destailleur
2a3d3b4b50 Fix dol_banner for agenda 2017-03-10 16:40:38 +01:00
Laurent Destailleur
a9b39f3028 Fix dol_banner for agenda 2017-03-10 16:27:28 +01:00
Laurent Destailleur
57c2971175 Fix dol_banner for agenda 2017-03-10 16:19:18 +01:00
Laurent Destailleur
c72e7c1057 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2017-03-10 14:54:35 +01:00
Laurent Destailleur
de2558c907 Fix useless lines 2017-03-10 12:47:51 +01:00
Laurent Destailleur
50044ed21e FIX #6499 2017-03-10 12:45:56 +01:00
arnaud
a796a321cc Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2017-03-10 12:16:55 +01:00
arnaud
1d31603ad2 Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo 2017-03-10 11:46:59 +01:00
Laurent Destailleur
46eedeafe8 Fix message shown to many times 2017-03-10 11:30:46 +01:00
Laurent Destailleur
8389db18bf Fix solution for comaptibility 2017-03-10 10:07:09 +01:00
Laurent Destailleur
d241adc201 NEW Use autocompletion on the "Add widget list". 2017-03-09 13:22:43 +01:00
arnaud
4a7e3fb387 NEW odt usergroup 2017-03-08 11:34:21 +01:00
Laurent Destailleur
8ac1aab45a Uniformize look and feels 2017-03-07 18:34:57 +01:00
florian HENRY
fc63008485 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect 2017-03-06 15:35:29 +01:00
Laurent Destailleur
4e4045d18a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-05 22:12:08 +01:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00
Laurent Destailleur
52a4863ed8 Merge pull request #6480 from dolibarr95/patch-2 
Add label tag
 2017-03-05 21:40:31 +01:00
Laurent Destailleur
5fa6592d6e Fix bad conf used 2017-03-04 20:10:50 +01:00
Laurent Destailleur
379e0083ab Fix bad help 2017-03-03 18:00:53 +01:00
Laurent Destailleur
6c91cb4f90 Fix it was not possible to create/edit a new chart of account 2017-03-03 17:59:49 +01:00
Laurent Destailleur
28ad50e059 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/suppliers.lang
 2017-03-03 14:31:35 +01:00
Laurent Destailleur
85518c6a54 FIX #6479 2017-03-03 14:04:40 +01:00
Laurent Destailleur
07c828d38f Introduce method loadLangs to save code lines 2017-03-03 13:27:51 +01:00
arnaud
cff9fa0e6b FIX user odt 2017-03-03 12:01:58 +01:00
arnaud
abeba95de9 New USER odt 2017-03-02 15:13:42 +01:00
dolibarr95
d3a80795ce Add label tag 
Add a label html tag for the input radio extrafield tag.
 2017-03-02 11:40:43 +01:00
Laurent Destailleur
d202003e29 Fix translation 2017-03-01 18:12:06 +01:00
Laurent Destailleur
8487f0fc96 Fix missing setup of new option 2017-03-01 11:18:11 +01:00
Laurent Destailleur
3c54cb5ba9 Fix avoid trigger during migration 2017-02-28 20:55:14 +01:00
Laurent Destailleur
9648f20a2e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-28 12:08:41 +01:00
Laurent Destailleur
59d2943d8d Fix context must be provided to triggers using ->context no a dedicated 
property.
 2017-02-28 12:07:05 +01:00
Laurent Destailleur
0f22beb774 Upgrade to ckeditor 4.6.2. 2017-02-28 10:49:58 +01:00
Laurent Destailleur
74e8fb9c19 NEW Can set number of dump to keep with job "local database backup" 2017-02-27 02:04:25 +01:00
Laurent Destailleur
43f3e46aac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-27 01:23:48 +01:00
Laurent Destailleur
4f24613de0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2017-02-27 01:19:03 +01:00
Laurent Destailleur
92acbbd8a8 Fix parameters 2017-02-27 00:22:11 +01:00
Ion
320da17c78 Add object extrafields to mail form 2017-02-26 03:42:42 +01:00
Laurent Destailleur
1ef899dacc Prepare database to follow supplier discounts 2017-02-24 15:22:32 +01:00
Laurent Destailleur
baa1f3ed2b Clean doc about changes in external libraries 2017-02-24 14:35:20 +01:00
Laurent Destailleur
fb88eaf2a4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-02-23 02:55:50 +01:00
Laurent Destailleur
92d9eb3c5d Several fix for a better management of #6424 2017-02-22 17:46:54 +01:00
Laurent Destailleur
24c2675705 Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email 
NEW : Can send email to multiple destinaries from mail form
 2017-02-22 14:39:35 +01:00
Laurent Destailleur
ba03b17354 Fix css 2017-02-22 14:30:39 +01:00
Laurent Destailleur
a0fb53d5b1 Merge branch 'develop' into NEW_pdf_supplier_payment 2017-02-22 14:20:47 +01:00
Laurent Destailleur
cbe855370b Merge pull request #6451 from laudeco/feature/list_user_by_firstname 
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
 2017-02-22 14:17:00 +01:00
Laurent Destailleur
3f3b82ed64 Merge pull request #6454 from atm-florian/dev_fix_unittrad 
fix unit trad
 2017-02-22 14:16:28 +01:00
Laurent Destailleur
1681445427 Remove useless line 2017-02-22 00:08:25 +01:00
florian HENRY
c8de648924 fix unit trad 2017-02-21 19:07:57 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
De Coninck Laurent
33d1d78329 FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users 2017-02-21 09:22:50 +01:00
Alexis ALGOUD
4a97864d23 change for tms 2017-02-20 15:54:02 +01:00
Alexis ALGOUD
07d6bbf835 change for tms 2017-02-20 15:53:43 +01:00
Laurent Destailleur
a8129ce46e Fix transaction/sql error 2017-02-20 11:49:27 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not 
admin user.
 2017-02-20 11:21:38 +01:00
Laurent Destailleur
2dbae7b808 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 17:14:00 +01:00
Laurent Destailleur
fd111cb1c6 NEW tooltip can be on hover or on click with textwithpicto function. 2017-02-17 17:11:14 +01:00
arnaud
4ec664029d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment 2017-02-17 16:40:14 +01:00
Laurent Destailleur
1f156c1716 Merge pull request #6436 from defrance/patch-79 
on list, preview tooltip is not displayed correctly
 2017-02-17 13:27:31 +01:00
florian HENRY
f7e1927b43 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect 2017-02-17 13:25:19 +01:00
florian HENRY
4836fa8f76 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email 2017-02-17 13:24:06 +01:00
Laurent Destailleur
8d03f86f45 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-17 13:10:46 +01:00
Laurent Destailleur
a91d57037e FIX #6433 2017-02-17 13:09:28 +01:00
BENKE Charlie
b94312162e on list, preview tooltip is not displayed correctly 
it's a problem of alignment, the tooltip is cut by the left part on list (ex : comm/propal/list.php)
think we can do better
 2017-02-17 12:05:24 +01:00
Laurent Destailleur
afa5ef2913 NEW Introduce fields that can be computed during export in export 
profiles.
 2017-02-17 00:19:28 +01:00
florian HENRY
a98e5b7290 fix syntax 2017-02-15 11:46:36 +01:00
florian HENRY
5ec01b3175 NEW : Can send email to multiple destinaries from mailform 2017-02-15 11:41:09 +01:00
florian HENRY
a26081d352 Merge branch 'develop' of local repository into dev_replace_extrefield_checkboxByMultiSelect 2017-02-15 09:10:49 +01:00
Laurent Destailleur
eb70d6eea1 Debug of feature for browser notifications 2017-02-14 18:20:01 +01:00
arnaud
977c18513d FIX pdf supplier payment work 2017-02-14 12:00:56 +01:00
Laurent Destailleur
05c9f57fd4 Move edition of emails templates out of dictionaries so we would be able 
to have templates per user (not reserved to admin).
 2017-02-12 18:13:49 +01:00
arnaud
4230b075c2 INIT pdf supplier payment 2017-02-10 17:28:00 +01:00
Laurent Destailleur
ad361d6d45 Merge pull request #6394 from aspangaro/6.0-fiscalyear 
[FP17] Accountancy - Prepare fiscal year
 2017-02-08 19:25:02 +01:00
Laurent Destailleur
596c092ec8 Merge pull request #6219 from atm-florian/dev_changelistchild 
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
 2017-02-08 16:49:18 +01:00
Laurent Destailleur
d5b10a18b7 Debug module variant 2017-02-08 12:52:31 +01:00
Laurent Destailleur
e1a6e6e4ab Rename "attributes" into "variants" to avoid confusion with extrafields 2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67 Merge pull request #5533 from marcosgdf/prod-attr 
Feature Request: NEW Added product attributes feature
 2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53 Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received 
NEW Develop new reduc on excess received
 2017-02-08 11:16:10 +01:00
Alexandre SPANGARO
4126dcff03 [FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed. 2017-02-08 06:51:42 +01:00
Laurent Destailleur
fcbc12ce31 Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project 
New link movement stock to project
 2017-02-06 20:45:04 +01:00
Laurent Destailleur
d230883638 Merge pull request #6367 from gnovaro/patch-2 
Code style
 2017-02-06 20:25:16 +01:00
Laurent Destailleur
a673afe601 NEW Description of feature of a module into a dedicated popup 2017-02-04 14:16:17 +01:00
BENKE Charlie
3f236b1ebf FIX : $resaction not used in all case 
Please integrate on next 5.0
 2017-02-03 12:14:29 +01:00
Laurent Destailleur
53661e1e4f Merge pull request #6211 from GPCsolutions/optimizetranslate 
[Qual] Optimize language file loading
 2017-02-03 11:55:29 +01:00
Laurent Destailleur
3dea950c24 Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project 
New htmlid can be use instead of htmlname for select projects
 2017-02-03 11:44:54 +01:00
florian HENRY
dccddf5c7e NEW : change render extrafields checkbox list for multiselectarray 2017-02-03 09:25:26 +01:00
Gustavo Novaro
f815d1bed3 Code style 2017-02-02 17:30:06 -03:00
atm-ph
ac20a1a874 Fix remove param htmlid in ajax_combobox 2017-02-02 20:47:45 +01:00
Marcos García de La Fuente
d06fb423c0 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/fourn/commande/card.php
#	htdocs/fourn/facture/card.php
#	htdocs/langs/en_US/products.lang
 2017-02-02 20:07:41 +01:00
Laurent Destailleur
c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2017-02-01 20:58:17 +01:00
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
phf
aea6a8f9ec Fix ( 2017-01-31 14:03:54 +01:00
phf
e73c60b526 New htmlid can be use instead of htmlname for select projects 2017-01-31 12:20:45 +01:00
Laurent Destailleur
756919de2a Fix deadlock feature: could not solve a situation where an emailing was 
validated by error.
 2017-01-29 16:08:45 +01:00
atm-ph
ccad6d6dde New show on project "overview" tab the informations about movements stock 2017-01-29 13:36:33 +01:00
Laurent Destailleur
fd90bf466b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/societe/soc.php
 2017-01-28 15:12:14 +01:00
Laurent Destailleur
c88e63ecc9 FIX #6259 2017-01-28 15:01:17 +01:00
Laurent Destailleur
bc8ccd8ec5 Fix bad var set 2017-01-28 13:01:10 +01:00
florian HENRY
055a00a338 fix travis 2017-01-27 15:18:12 +01:00
florian HENRY
cb6209de31 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-27 15:16:28 +01:00
Laurent Destailleur
29df2c9115 Merge branch 'develop' into mail-lines 2017-01-27 01:29:58 +01:00
Laurent Destailleur
70091eceed Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2017-01-27 01:26:11 +01:00
Laurent Destailleur
0c14e1d233 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-27 01:24:55 +01:00
Laurent Destailleur
3c86507ce6 FIX #6328 2017-01-27 00:51:22 +01:00
Laurent Destailleur
1239e8600a Merge pull request #6326 from altatof/fix_entity_thirdpart_files 
Fix entity thirdparty files links
 2017-01-27 00:30:03 +01:00
Laurent Destailleur
053afe21dd Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2017-01-26 23:40:16 +01:00
Laurent Destailleur
c1b59b1950 Fix several security bugs on expense report 2017-01-26 18:08:00 +01:00
Laurent Destailleur
c39fcce9f1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-26 10:45:38 +01:00
Laurent Destailleur
9889f0a4a2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/modules/modProjet.class.php
	htdocs/filefunc.inc.php
 2017-01-26 10:44:50 +01:00
florian HENRY
13917cebdc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild 2017-01-25 11:02:23 +01:00
altatof
d65cb29536 FIX: use param for http links 2017-01-25 09:25:06 +01:00
Laurent Destailleur
755d353dfa Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2017-01-24 18:41:29 +01:00
Laurent Destailleur
84fec7c5c7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2017-01-24 18:40:01 +01:00
Laurent Destailleur
b1e5d8ce98 FIX Combo list of VAT is wrong on POS 2017-01-24 14:33:49 +01:00
Laurent Destailleur
f591e2b1b1 FIX Combo list of VAT is wrong on POS 2017-01-24 14:29:05 +01:00
Laurent Destailleur
1878647d26 NEW Add statistics on supplier tab. 2017-01-23 20:54:52 +01:00
Laurent Destailleur
9a59fbada7 Fix missing info admin picto. Fix colspan. 2017-01-23 17:31:39 +01:00
florian HENRY
d714a52f95 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_changelistchild

Conflicts:
	htdocs/core/class/commonobject.class.php
 2017-01-23 11:35:11 +01:00
Laurent Destailleur
7622d3b2fb Fix missing info admin picto. Fix colspan. 2017-01-23 10:23:24 +01:00
Laurent Destailleur
daf40ed573 NEW Direct open of card after a search if on record only found. 2017-01-22 23:35:32 +01:00
Laurent Destailleur
39151d7a74 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2017-01-21 21:56:24 +01:00
Laurent Destailleur
6ab9ba3284 Fix management of alternative language for Greek (el_CY) 2017-01-21 21:52:42 +01:00
Laurent Destailleur
b8a80f9311 Fix code comment and missing showLinkToObjectBlock hook declaration as 
an addreplace hook.
 2017-01-21 17:30:35 +01:00
Laurent Destailleur
3a2d9c8610 Fix for rtl languages 2017-01-21 16:12:25 +01:00
Laurent Destailleur
9a5670787f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-21 12:26:50 +01:00
Laurent Destailleur
fc4aa96cd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/dispatch.php
 2017-01-20 21:02:05 +01:00
Laurent Destailleur
6780b20968 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-20 14:11:55 +01:00
Laurent Destailleur
2f4ff66c43 Minor fixes 2017-01-20 14:10:57 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
Laurent Destailleur
4047de82bd Fix navigation on projects 2017-01-20 10:27:37 +01:00
Laurent Destailleur
03c1521cde Merge pull request #6271 from altatof/fix_extra_input 
FIX: extrafield input for varchar was not working with special char
 2017-01-18 16:53:43 +01:00
Laurent Destailleur
562bdbc9f5 Merge pull request #6291 from gnovaro/patch-1 
Improve code style
 2017-01-18 16:44:56 +01:00
Laurent Destailleur
2566df8252 Merge pull request #6298 from benlo06/fix_shipping_contactid 
FIX getIdContact for shipping
 2017-01-18 15:53:32 +01:00
Benoit
73852beb4e FIX contactid for shipping pdf 2017-01-17 21:55:21 +01:00
arnaud
39f35bbaab FIX all dolibarr versions about project list and ajax completion bug 2017-01-17 11:17:40 +01:00
Gustavo Novaro
0f6cb52376 Improve code style 
Replace var for public and private.
 2017-01-16 17:40:13 -03:00
altatof
3dd160c663 use dol_escape_htmltag 2017-01-16 09:17:37 +01:00
Laurent Destailleur
36bd63c1a7 NEW PHP 7.1 compatibility 2017-01-16 09:05:18 +01:00
Laurent Destailleur
6bfd534a36 NEW PHP 7.1 compatibility 2017-01-16 01:21:33 +01:00
Laurent Destailleur
846e827e09 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:49:11 +01:00
Laurent Destailleur
f5458b4337 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/admin/modules.php
	htdocs/core/class/html.formfile.class.php
	htdocs/product/stats/card.php
 2017-01-16 00:48:37 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
0671f75417 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-16 00:01:37 +01:00
Regis Houssin
fd4a19855d Fix: preview image not show with multicompany product sharing 2017-01-15 12:09:26 +01:00
Marcos García de La Fuente
d09a3628c5 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/compta/facture.php
 2017-01-14 23:59:14 +01:00
Laurent Destailleur
1fd9f5e1fb Fix: host was twice into message id for smtp driver and swiftmailer was 
not using dol_getprefix() to build host.
 2017-01-14 13:27:44 +01:00
altatof
55c0a99bce fix was not at the right place 2017-01-13 15:42:07 +01:00
altatof
487b5b25db FIX: extrafield input for varchar was not working with special char 
within (ie double quotes)
 2017-01-13 15:37:33 +01:00