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

6513 Commits

Author SHA1 Message Date
Regis Houssin
5b79b76685 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ticket

Conflicts:
	htdocs/core/class/html.formticketsup.class.php
 2018-04-19 15:58:14 +02:00
Laurent Destailleur
0358e0f29f Debug ticketsup 2018-04-19 15:11:26 +02:00
Laurent Destailleur
8acc752195 Debug ticket module 2018-04-19 14:44:21 +02:00
Marc de Lima Lucio
893ce55852 FIX: commonobject: don't require notnull field if default set 2018-04-19 10:29:48 +02:00
Laurent Destailleur
41be1c3d3d Removed deprecated class (method setCookie already exists for that) 2018-04-19 10:22:08 +02:00
florian HENRY
882863ab48 fix : define in conf dir_output for suipplier_proposal modules 2018-04-18 16:21:20 +02:00
Marc de Lima Lucio
e88830820a FIX: dont print empty date in CommonObject::showOutputField 2018-04-18 11:13:18 +02:00
Regis Houssin
ff76e60c49 Fix: some bugs and warnings 2018-04-18 10:13:20 +02:00
Regis Houssin
d841abd55a Fix: missing value when reload 2018-04-18 09:37:29 +02:00
Regis Houssin
85c93c26a9 Fix: dolibarrize 2018-04-18 09:27:54 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44 Look and feel v8 2018-04-18 02:10:23 +02:00
Inovea Conseil
d032280a96
NEW add any predefined mail content 2018-04-17 16:03:12 +02:00
Laurent Destailleur
2135365e0a Bug new extrafields architecture 2018-04-17 14:44:55 +02:00
Laurent Destailleur
7bb8078b46 Fix translation of extrafields 2018-04-17 13:52:50 +02:00
Laurent Destailleur
1e0a660d24 More font awesome picto instead of img 2018-04-16 19:57:46 +02:00
Laurent Destailleur
106fb87d0a NEW Can sort order of files in attach tab for leave and expensereport 2018-04-16 19:25:27 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Laurent Destailleur
9e50bbb9b1 standardize code 2018-04-15 16:35:18 +02:00
Philippe GRAND
0a6bcb2a39 fix typo and translation 2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402 fix typo 2018-04-15 07:07:04 +02:00
Laurent Destailleur
a0e243a29b Clean code 2018-04-13 23:11:19 +02:00
Laurent Destailleur
3b202b2255
Merge branch 'develop' into develop_bug5 2018-04-13 22:23:14 +02:00
Laurent Destailleur
6f91b8019f Remove warnings 2018-04-13 17:54:27 +02:00
Laurent Destailleur
4251748aca Clean code 2018-04-13 16:18:33 +02:00
Laurent Destailleur
77a853e49d Fix remove warning 2018-04-13 14:53:40 +02:00
Laurent Destailleur
9f5eed0c9a Code comment 2018-04-13 14:12:31 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
b68cded9c4 Clean code 2018-04-13 13:11:07 +02:00
Laurent Destailleur
fbae4429b7 Clean code for better extrafields management 2018-04-13 12:52:23 +02:00
Regis Houssin
e6ff852226 Fix: avoid Warning: Creating default object from empty value 2018-04-13 11:20:21 +02:00
Laurent Destailleur
78fcbe9633 FIX the extrafields separator was not translated 2018-04-13 10:48:29 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +02:00
Laurent Destailleur
3cecfd02c7 NEW Mutualize code for action="update_extras" 
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
 2018-04-12 23:16:23 +02:00
All-3kcis
f7e58f3c73 Add files management on products lot 2018-04-12 15:10:37 +02:00
Laurent Destailleur
dd022ee423 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
3df873ee06
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder 
FIX: various modulebuilder-related issues
 2018-04-11 18:01:04 +02:00
Laurent Destailleur
9ccba03a17
Update html.form.class.php 2018-04-11 18:00:34 +02:00
Laurent Destailleur
afdd504e16 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/journal/sellsjournal.php
 2018-04-11 17:58:21 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser 
NEW : Can select from the user list into send form email (For field to and CC)
 2018-04-11 17:55:40 +02:00
Laurent Destailleur
d7da83ebc5
Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity 
Fix extrafield entity query filter
 2018-04-11 17:31:36 +02:00
Laurent Destailleur
e4f2e0ecbd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 17:21:14 +02:00
Laurent Destailleur
590bc2948a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
 2018-04-11 17:20:49 +02:00
Laurent Destailleur
c70e0c1cda FIX #8475 #8540 2018-04-11 17:14:34 +02:00
Laurent Destailleur
ca6b7205ef
Update commonobject.class.php 2018-04-11 16:27:56 +02:00
Laurent Destailleur
ab43d9d675
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement 
FIX: payment term doc-specific label was not used (issue #8414)
 2018-04-11 14:52:06 +02:00
Laurent Destailleur
f54113b1a1
Merge pull request #8524 from frederic34/patch-10 
FIX do not fill error with success message when using SwiftMailer
 2018-04-11 13:19:04 +02:00
Laurent Destailleur
273eadab43
Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby 
NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830)
 2018-04-11 13:18:10 +02:00
Marc de Lima Lucio
c966cdbd47 FIX: selectForFormsList: entity checked even is object not multi-entity managed 2018-04-11 11:43:51 +02:00
John
96e26100f0 Add extrafield entity query filter 2018-04-11 11:27:47 +02:00
Laurent Destailleur
f181719769 Can fetch a companypaymentmode of a thirdparty 2018-04-10 18:11:08 +02:00
ATM-Nicolas
47d5b1f6fd FIX : update wrong datetime extrafield 2018-04-10 16:39:28 +02:00
Marc de Lima Lucio
7aa4d16eef NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked 2018-04-10 16:23:56 +02:00
Laurent Destailleur
0bf4381226 NEW The field "visible" on extrafield can accept expression as condition 2018-04-10 15:39:11 +02:00
Marc de Lima Lucio
1fd5dba118 FIX: payment term doc-specific label was not used 2018-04-10 15:24:57 +02:00
Laurent Destailleur
24f4d5040a Move isInEEC from common to thirdparty class. 2018-04-09 14:25:02 +02:00
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
Frédéric FRANCE
f5b49aa93b
do not fill error with success message 2018-04-09 00:21:29 +02:00
Laurent Destailleur
259f3b3020 Add hidden option MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP 2018-04-07 13:23:26 +02:00
Laurent Destailleur
093c367609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-04-07 13:20:22 +02:00
Laurent Destailleur
5a34a22934 Code comment 2018-04-07 13:04:52 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
Laurent Destailleur
9ce5d02fde
Merge pull request #8517 from bafbes/master700 
define module part to include external modules menus
 2018-04-06 11:26:23 +02:00
Laurent Destailleur
151245a5e4
Update conf.class.php 2018-04-06 11:25:48 +02:00
Laurent Destailleur
658e1224d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 19:53:09 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element 
New import lines from linked element
 2018-04-05 18:26:47 +02:00
Laurent Destailleur
d55657951d
Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda 
FIX: img_pictos for remove assigned user in agenda card
 2018-04-05 16:42:40 +02:00
bahfir abbes
16ae46e64c define module part to include external modules menus 2018-04-05 15:23:17 +01:00
Laurent Destailleur
dd934c89bf
Merge pull request #8507 from frederic34/patch-2 
Translation of error message
 2018-04-05 16:12:36 +02:00
Laurent Destailleur
533de639ae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2018-04-05 13:29:27 +02:00
Laurent Destailleur
45d074c39d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-05 13:25:59 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Regis Houssin
5914bfdf18 Fix: more complete 2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +02:00
florian HENRY
cc0fb830b8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-04-05 10:53:17 +02:00
Frédéric FRANCE
fd6c1f129c
Update CMailFile.class.php 2018-04-04 15:58:24 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
Rui Strecht
4f9a8d5b0a img_picto must return fullpath to picto.png 2018-04-03 12:23:26 +01:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Laurent Destailleur
2d3a55a6a8 Restore broken confirmation popup 2018-03-31 23:39:08 +02:00
Laurent Destailleur
d21143831c Clean code 2018-03-31 22:44:32 +02:00
Laurent Destailleur
96c73a13f6 Clean code 2018-03-31 16:45:36 +02:00
Laurent Destailleur
84bb4c6ad7 FIX With x extrafields, request for multicompany label was done x times 2018-03-30 19:51:53 +02:00
Laurent Destailleur
0978c8f58b CSS 2018-03-29 16:07:49 +02:00
Laurent Destailleur
a214d0b3d7
Merge pull request #8461 from hregis/develop_multicompany 
Fix: best visibility of choices
 2018-03-29 13:58:30 +02:00
florian HENRY
cc7deb0add Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-29 09:36:05 +02:00
florian HENRY
78812ef826 better error management 2018-03-29 09:35:47 +02:00
Laurent Destailleur
1c86eb1c44 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/quarter_report.php
	htdocs/core/lib/tax.lib.php
 2018-03-29 03:08:01 +02:00
Laurent Destailleur
125085acee Fix name of method to avoid ci errors 2018-03-29 03:01:05 +02:00
florian HENRY
7635f23d78 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0 2018-03-27 18:39:56 +02:00
florian HENRY
af7c1d8da1 fix error log 2018-03-27 18:39:18 +02:00
Regis Houssin
7d7a006583 Fix: best visibility of choices 2018-03-27 18:12:42 +02:00
Laurent Destailleur
e28307ede4
Merge pull request #8449 from hregis/develop_dict 
NEW add "moreHtmlRef" hook
 2018-03-27 18:07:57 +02:00
Laurent Destailleur
3fa7cdf17f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-27 18:00:29 +02:00
Laurent Destailleur
20eb7015e8 Doxygen 2018-03-27 18:00:17 +02:00
Regis Houssin
35b6cb750f Fix: move "moreHtmlRef" hook in "showrefnav" function 2018-03-27 17:36:25 +02:00
Laurent Destailleur
930512d9a2 FIX Add a test to avoid to reset binding by error. 2018-03-27 13:08:16 +02:00
Frédéric FRANCE
1071ec7e57
ignore Return-Path in dkim sign with swiftmailer 2018-03-26 21:36:03 +02:00
florian HENRY
ffbeb17ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-25 17:19:27 +02:00
Laurent Destailleur
852191010a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-25 15:29:11 +02:00
Laurent Destailleur
a5dd98701e Too verbose log 2018-03-25 13:40:22 +02:00
Laurent Destailleur
6ef1dbbe0f FIX auto open contract if one result found 2018-03-24 18:28:06 +01:00
Laurent Destailleur
c85cb7fe0a
Merge pull request #8447 from fappels/7.0_modulbuilder 
Update on module builder
 2018-03-24 16:41:43 +01:00
Laurent Destailleur
a3c199e9e3 FIX Missing include 2018-03-24 12:48:19 +01:00
Laurent Destailleur
f9ad2f7fb2 FIX Missing include 2018-03-24 12:10:04 +01:00
Laurent Destailleur
c864dbd515 Save Stripe customer id when using online member subscription 2018-03-23 23:59:35 +01:00
Laurent Destailleur
53edb86ffb Make sending of email for member module ok with new email template archi 2018-03-23 19:35:25 +01:00
Laurent Destailleur
639d8ce9ef Fix link replacement 2018-03-23 18:11:01 +01:00
Laurent Destailleur
6e32e9961f Syn transifex 2018-03-23 17:56:35 +01:00
fappels
caa43ae2f6 Make helper methods available for derived classes. 
Use-case: a module build with modulebuilder can make it's own fetch
method using the helper methods.
 2018-03-23 17:35:46 +01:00
John
88fab15c60 Change situation display 2018-03-23 17:12:09 +01:00
Laurent Destailleur
7363ae17ee Move setup of email for module module into email templates 2018-03-23 16:09:46 +01:00
Laurent Destailleur
171ad5dce2 Enhance code for template invoices 2018-03-22 21:42:19 +01:00
Laurent Destailleur
86e496963b
Merge pull request #8081 from atm-maxime/new_salesrep 
NEW improve way of adding users/sales representative to thirdparty
 2018-03-22 14:05:44 +01:00
Laurent Destailleur
700c69e127 NEW Can set position of images in module tickets 
Mutualize code of method show_photo
 2018-03-22 11:46:35 +01:00
florian HENRY
e2e1fae5e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser 2018-03-21 22:58:33 +01:00
florian HENRY
d3ae285c0c finish work 2018-03-21 22:58:17 +01:00
Laurent Destailleur
7b6104de38
Merge pull request #8427 from ATM-Consulting/develop_atm 
NEW: method Form::selectArrayFilter() + use in left menu search
 2018-03-21 20:44:44 +01:00
Laurent Destailleur
10d7e7d289
Merge pull request #8425 from atm-florian/dev_scrunit 
Dev scrunit
 2018-03-21 20:40:01 +01:00
Laurent Destailleur
35938b1942 NEW Variable __ONLINE_PAYMENT_URL__ available in email templates 2018-03-21 20:06:22 +01:00
Laurent Destailleur
517301f014 Work on subscription reminder 2018-03-21 16:40:09 +01:00
Marc de Lima Lucio
744c263c6c NEW: selectArrayFilter() + use in left menu search 2018-03-21 15:08:20 +01:00
Laurent Destailleur
200fd88132 Fix output message in log rotation job 2018-03-21 13:56:24 +01:00
Laurent Destailleur
7e5c3cc807 Code comment 2018-03-21 13:30:30 +01:00
florian HENRY
dc6f4c1f4d NEW : option to send email to salaries 2018-03-21 11:48:30 +01:00
florian HENRY
d959905e4f fix scrutinizer 2018-03-21 08:35:03 +01:00
Laurent Destailleur
fc50fcd59e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-20 20:07:24 +01:00
Laurent Destailleur
11d33c8dcc
Merge pull request #8420 from hregis/7.0_bug3 
Fix: better compatibility with all hostname syntax
 2018-03-20 17:32:14 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
896a1cbc24 Fix bad var init 2018-03-20 11:27:47 +01:00
Laurent Destailleur
29775f735b Option MAIN_EXTRAFIELDS_IN_ONE_TD is now 1 2018-03-20 11:26:41 +01:00
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
a325bbf865 FIX Input of holiday for subordinates was ko 2018-03-19 20:46:43 +01:00
Regis Houssin
4767819b7a Fix: better compatibility with all hostname syntax 2018-03-19 17:59:23 +01:00
Laurent Destailleur
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-03-19 17:58:19 +01:00
Laurent Destailleur
91cc3d1b73 FIX navigation and filters on holiday list 2018-03-19 16:11:42 +01:00
Laurent Destailleur
eb7886ecff
Update ldap.class.php 2018-03-19 12:37:53 +01:00
Regis Houssin
890d0b6685 Fix: replace ldaps:// by ssl:// 2018-03-19 12:11:59 +01:00
Laurent Destailleur
e91ffa00eb NEW Can crop image files attached in "document" tabs of a member 2018-03-19 11:56:04 +01:00
Laurent Destailleur
f46df6d8e5 Can resize and crop images in the ticketsup module 2018-03-19 11:49:05 +01:00
Laurent Destailleur
f8ca4b1b5c NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD 2018-03-19 11:34:48 +01:00
Laurent Destailleur
51b6723b08 Dolibarrize module ticket 2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
dc0fc73931 Code comment 2018-03-17 12:15:32 +01:00
Laurent Destailleur
e323084cf8 Better template 2018-03-16 19:03:16 +01:00
Laurent Destailleur
2bbf738cb8 FIX Sql escape 2018-03-16 18:20:28 +01:00
Laurent Destailleur
f258d31a98 Triggers for Strips payment modes 2018-03-16 16:10:04 +01:00
Laurent Destailleur
9997a6c787 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-03-16 12:20:42 +01:00
Laurent Destailleur
96ff5b1b23 Update sql image file for 7.0 stable 2018-03-16 11:19:58 +01:00
Laurent Destailleur
46fb2945d4 NEW Show keyboard shortcut of nav arrow into tooltip 2018-03-15 22:02:03 +01:00
Laurent Destailleur
e1a0df263d Fix code with the new return structure of getEmailTemplate 2018-03-15 18:43:47 +01:00
Laurent Destailleur
5392218806 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/translate.class.php
 2018-03-15 02:13:29 +01:00
Laurent Destailleur
c4eea1f0e0 Fix SQLi 2018-03-15 02:12:01 +01:00
Laurent Destailleur
f0f6f71161 Fix Sqli 2018-03-15 01:55:47 +01:00
Laurent Destailleur
87bbb4ef87 Can create card from dolibarr 2018-03-15 00:40:29 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Laurent Destailleur
9994b1f133 Work on stripe interface 2018-03-14 17:12:32 +01:00
Laurent Destailleur
3f7cd8b1bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75 Work on generic customer payment modes 2018-03-14 13:56:21 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
 2018-03-14 10:49:54 +01:00
Laurent Destailleur
da617f7d32 Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
Laurent Destailleur
a86da671ba Remove verbose log 2018-03-13 18:13:31 +01:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
Laurent Destailleur
e6d8219396 Dolibarrize module ticket 2018-03-13 13:26:03 +01:00
Laurent Destailleur
4380367923 Error management 2018-03-13 12:54:53 +01:00
Frédéric FRANCE
d6e98d3b05
Update CMailFile.class.php 2018-03-12 15:14:41 +01:00
Laurent Destailleur
0d1e26b02c Fix error management 2018-03-12 13:19:09 +01:00
Laurent Destailleur
ae82d045f8 Dolibarrize module ticket 2018-03-11 23:56:17 +01:00
TuxGasy
34145ed443 Do not display multicurrency cols if currency of object is same as main currency 2018-03-11 21:58:32 +01:00
Frédéric FRANCE
683486eaf1
Update html.formticketsup.class.php 2018-03-11 21:00:39 +01:00
Laurent Destailleur
b084ca4a50 Fix 2018-03-11 19:44:19 +01:00
Laurent Destailleur
baf6fc6a8b
Merge pull request #8343 from atm-maxime/develop 
Fix mail send
 2018-03-11 18:11:37 +01:00
Maxime Kohlhaas
df185de6ae Fix mail send 2018-03-11 15:09:25 +01:00
jfefe
0f96575b41 Fix PHPCS errors with ticketsup module 2018-03-11 12:06:57 +01:00
Laurent Destailleur
0ac1d8b226 Dolibarize 2018-03-11 11:33:24 +01:00
Laurent Destailleur
e14d2f08b8 Dolibarize 2018-03-11 11:12:38 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Laurent Destailleur
72bccd9c6b
Merge branch 'develop' into bug-6980 2018-03-10 22:27:07 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Laurent Destailleur
72eff36cd6
Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked 
Fix commonobject isInt for module builder capabilities
 2018-03-10 18:59:12 +01:00
Laurent Destailleur
b2677c35e2
Merge pull request #8317 from frederic34/swifmailer 
Add dkim signing with Swiftmailer
 2018-03-10 18:48:08 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00
Alexis Algoud
b370a3096c fix commonobject isInt for module builder capabilities 2018-03-10 14:14:31 +01:00
florian HENRY
26686a05c2 fix scrunituzer 2018-03-10 10:38:56 +01:00
florian HENRY
63fb53159c fix scrunitizer 2018-03-10 01:12:47 +01:00
Laurent Destailleur
cc7ac2a0da
Merge pull request #8313 from atm-florian/7.0_fix8241 
7.0 fix8241
 2018-03-09 22:47:43 +01:00
Frédéric FRANCE
27bf5419d6
Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
TuxGasy
9eeb80151e Fix bug when updating multi currency rate on invoice supplier 2018-03-09 21:13:54 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e better space 2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9 FIX #8232 2018-03-09 19:10:52 +01:00
Maxime Kohlhaas
4e222d3d92 Comment for travis 2018-03-09 19:09:16 +01:00
Maxime Kohlhaas
ded69bf57d New : link users to company like a tag 2018-03-09 18:59:06 +01:00
Marc de Lima Lucio
d6b4bc14e4 NEW: syslog file autoclean 2018-03-09 16:52:06 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Laurent Destailleur
47b03068ac
Merge pull request #8300 from hregis/develop_dict 
Fix: regression, restore primary key
 2018-03-08 16:22:23 +01:00
Laurent Destailleur
0b316c3980 Attach invoice on email subscription confirmation 2018-03-08 15:01:34 +01:00
Regis Houssin
fd9c79fa7f Fix: use getEntity if no rowid to compare 2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Marc de Lima Lucio
884b74a6bb FIX: warning when adding ECM files using old photo path 2018-03-07 17:12:59 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
florian HENRY
03873038d5 fix comment task 2018-03-07 08:47:34 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Laurent Destailleur
a086bd0137 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/class/utils.class.php
 2018-03-06 09:20:45 +01:00
Marc de Lima Lucio
f1faf155fc FIX: supplier discounts: wrong link to source supplier invoice 2018-03-05 11:41:06 +01:00
Marc de Lima Lucio
480d756090 FIX: supplier discounts: typo 2018-03-05 11:30:18 +01:00
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned) 
NEW Online payment now record the payment on invoices
 2018-03-04 19:39:46 +01:00
Laurent Destailleur
9355c5a8d7 Fix scrutinizer 2018-03-04 11:31:57 +01:00
Laurent Destailleur
e574ec4bf1 Fix backward compatibility 2018-03-04 11:28:01 +01:00
Laurent Destailleur
82fd84fb48 Fix scrutinizer errors 2018-03-04 11:22:43 +01:00
Laurent Destailleur
6338328c90 Fix scrutinizer errors 2018-03-04 11:09:53 +01:00
Laurent Destailleur
44eb50c424 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:57:10 +01:00
Laurent Destailleur
eac1b2efe9 FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:23:23 +01:00
Laurent Destailleur
f0c9cd3acc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-03 11:22:31 +01:00
Laurent Destailleur
d6b782e5ef FIX Infinite loop on deletion of temp file when there is symbolic links 2018-03-03 11:22:15 +01:00
Laurent Destailleur
0a5edb871b
Merge pull request #8253 from ruistrecht-alt/Fix_supress_count_warning_in_extrafields_view_tpl 
FIX Suppress count warning in admin_extrafields_view.tpl
 2018-03-02 18:00:52 +01:00
Laurent Destailleur
7584fe62e3
Merge pull request #8244 from hregis/develop_bug 
Fix: avoid warning during "upgrade2" process
 2018-03-02 17:51:47 +01:00
Laurent Destailleur
48b578b9f2
Update commonobject.class.php 2018-03-02 17:51:21 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany 
Fix: use "multidir_output" instead "dir_output" (propal)
 2018-03-02 17:49:25 +01:00
Laurent Destailleur
bf36f00897
Update html.formfile.class.php 2018-03-02 17:48:58 +01:00
Marc de Lima Lucio
451d943927 NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts) 2018-03-02 16:48:25 +01:00
Laurent Destailleur
e073fa15f7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-02 14:00:27 +01:00
Laurent Destailleur
c478ab952f Fix block to generate donation document missing 2018-03-02 11:57:39 +01:00
Laurent Destailleur
191a1e9350 Fix css 2018-03-02 11:18:29 +01:00
Laurent Destailleur
132ee2c788 CSS 2018-03-01 16:48:12 +01:00
Laurent Destailleur
0f237e4d5c NEW Add mass action enable/disable on cron job list 2018-03-01 15:24:50 +01:00
Marc de Lima Lucio
e07177fec2 FIX: supplier relativ discounts: pre-fill newlines with qty/discount 2018-03-01 12:31:33 +01:00
Laurent Destailleur
2368cb615f Look and feel v8 2018-03-01 11:51:25 +01:00
Marc de Lima Lucio
059801fe03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-01 10:22:21 +01:00
Laurent Destailleur
de9f1aab0f NEW Can set the reply-to into email sent 2018-02-28 19:09:05 +01:00
Laurent Destailleur
575fc9f90d NEW add hook moreHtmlStatus to complete to status on banners 2018-02-27 22:06:21 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Laurent Destailleur
03858d73b1 NEW Add extrafield type "html" 2018-02-27 17:30:13 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Laurent Destailleur
8ac4cb9c43 Add fetch_product 2018-02-27 16:33:50 +01:00
Rui Strecht
24ae7b4780 Suppress count warning in admin_extrafields_view.tpl 2018-02-27 14:45:17 +00:00
Laurent Destailleur
7d3162313e FIX Temporary dir for mail files must be cleaned at beginning of form 2018-02-27 10:59:26 +01:00
Regis Houssin
1aa1b0a3ea Fix: avoid warning during "upgrade2" process 2018-02-26 12:15:30 +01:00
Laurent Destailleur
0d12552445 NEW Can enter time spent from the list of time spent of project 2018-02-26 11:57:29 +01:00
Regis Houssin
365fffddf5 Fix: missing object entity 2018-02-26 11:35:44 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
4866d63ece Fix method getListOfPayments in the wrong class 2018-02-26 09:45:15 +01:00
Laurent Destailleur
1666f371bf css 2018-02-26 00:13:16 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
2cd5ed65a6 Clean deprecated (field unit_charge in supplier price) 2018-02-25 14:13:09 +01:00
Laurent Destailleur
8dceb8930f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/user/card.php
 2018-02-25 12:41:17 +01:00
Laurent Destailleur
c604ce0a06 Fix date in odt 2018-02-24 15:31:30 +01:00
Laurent Destailleur
3b5a3915c4 NEW Use common substitution rule for language to get translation in ODT 2018-02-24 14:23:52 +01:00
Laurent Destailleur
38d1fc27e0 Start to introduce common substitution rules for odt substitutions 2018-02-24 13:41:01 +01:00
Laurent Destailleur
c8078b54b5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
 2018-02-24 12:52:57 +01:00
Laurent Destailleur
435e4823a5 Fix some warning during install 2018-02-24 11:58:09 +01:00
Laurent Destailleur
d8bf553ea9 Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing 2018-02-23 19:55:15 +01:00
Laurent Destailleur
7cf7bf6e45 Code comment 2018-02-23 16:26:23 +01:00
Laurent Destailleur
f3e1e81219 Fix update of extrafield password that are crypted 2018-02-23 16:11:25 +01:00
Laurent Destailleur
93a8176813 Fix do not encrypt if empty 2018-02-23 15:28:24 +01:00
Laurent Destailleur
863cab362f NEW Cat set the encryption algorithm for extrafields of type password 2018-02-23 14:38:41 +01:00
Laurent Destailleur
cc618e886f Fix extrafield password must be >= than 64 for password_hash 2018-02-23 13:19:33 +01:00
Laurent Destailleur
82ae65b18d NEW Can get template of email from its label 2018-02-23 11:23:36 +01:00
Laurent Destailleur
420fe3a07a Clean code 2018-02-22 17:05:45 +01:00
Laurent Destailleur
a27ed54128 Fix sort order of email templates 2018-02-22 16:40:48 +01:00
John
a7a6630fad Add popin dialog 2018-02-22 15:19:20 +01:00
Laurent Destailleur
b87feab1e3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-02-22 12:19:20 +01:00
Laurent Destailleur
51cfb9795e Fix bad picto 2018-02-22 11:26:41 +01:00
Juanjo Menent
1d6baf5f2b Fix: Not showing link to ad event if module is disabled 2018-02-22 10:16:53 +01:00
John
f313fb925b Add new checkbox for lines 2018-02-21 17:06:40 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
John
bd0e8506f5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-02-21 11:53:16 +01:00
Laurent Destailleur
72c1357c9b NEW Section of files generated by mass action not visible if empty 2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
34135e0a13 Fix extrafield date or datetime with bad timezone 2018-02-20 19:20:47 +01:00
Laurent Destailleur
e465b0c40e Fix extrafield date or datetime with bad timezone 2018-02-20 19:19:27 +01:00
Laurent Destailleur
71cbcce3a2 NEW Can select sample to use when creating a new page 2018-02-20 18:10:11 +01:00
John
09c5dc506a Add html dom element and fix class 2018-02-20 17:46:32 +01:00
John
5624257a6d add new dom html5 elements and class 2018-02-20 16:49:49 +01:00
Marc de Lima Lucio
95be155010 FIX: supplier credit notes: harmonize discount filters 2018-02-20 12:26:29 +01:00
Laurent Destailleur
5f51af505f NEW Can delete dir content in media and ECM module recursively 2018-02-19 23:52:45 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Marc de Lima Lucio
44b0d1ca0f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-19 17:33:20 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Laurent Destailleur
60fe1fa503 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails.php
 2018-02-17 01:19:17 +01:00
Laurent Destailleur
f67f0df609 Fix preview link not visible with long file names 2018-02-16 12:11:39 +01:00
Marc de Lima Lucio
e2b65b3755 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note 2018-02-16 09:14:53 +01:00
Laurent Destailleur
362aec3e4b NEW Add param $dolibarr_main_restrict_ip in config file to limit ips 2018-02-15 19:49:50 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
Laurent Destailleur
b515448bbd Fix delete when no extrafields used 2018-02-15 00:01:25 +01:00
Laurent Destailleur
5f0f9ff326 Fix delete page 2018-02-14 23:57:57 +01:00
Laurent Destailleur
78697c1735 USe fk_product is better than ref 2018-02-14 21:14:24 +01:00
Laurent Destailleur
f3ffc7ce8a
Merge pull request #8185 from BitKFu/develop 
NEW Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
 2018-02-14 20:56:00 +01:00
Marc de Lima Lucio
daca27b2ed NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring 2018-02-14 18:02:40 +01:00
Marc de Lima Lucio
4f9bb33600 NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid 2018-02-14 10:47:10 +01:00
Laurent Destailleur
795cbaa978 Code comment 2018-02-13 20:13:35 +01:00
Laurent Destailleur
b128c95a74 NEW Add showempty parameter in country selection 2018-02-13 19:08:46 +01:00
Laurent Destailleur
e510e1b679 Fix search field at wrong column 2018-02-13 15:48:29 +01:00
Laurent Destailleur
35aece060c Search field in correct column 2018-02-13 15:47:17 +01:00
Laurent Destailleur
1a4aa89489 NEW Can share any file from the "Document" tab. 2018-02-13 13:55:36 +01:00
Gerhard Stephan
f93934905f Implemented a correct error handling, if the $line->product_ref has not been set 2018-02-13 08:41:57 +01:00
Laurent Destailleur
36ac380cac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 22:26:48 +01:00
Gerhard Stephan
2aaf3a466d Load product data optional fields to the line -> enables to use "line_options_{extrafield}" 
This fixes the issue #3185
https://github.com/Dolibarr/dolibarr/issues/3185
 2018-02-12 21:38:51 +01:00
Laurent Destailleur
b2835fc803 Fix check of vat only for european countries 2018-02-12 15:54:24 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
ab21769aa2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/card.php
 2018-02-08 12:58:47 +01:00
Rui Strecht
ecea8d698c Forgot that MAIN_SHOW_STATE_CODE is not just 0 or 1 2018-02-07 16:07:33 +00:00
Rui Strecht
8c732a1443 Trying to not include sql request into method setMysoc 2018-02-06 12:01:54 +00:00
Rui Strecht
31372f8948 Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
# Conflicts:
#	htdocs/core/class/commonobject.class.php
 2018-02-06 10:26:38 +00:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
565372eaab Fix param showsize. Fix extrafields field too long 2018-02-06 10:34:29 +01:00
Laurent Destailleur
eedbcbdc40
Merge branch 'develop' into patch-2 2018-02-05 15:43:18 +01:00
Laurent Destailleur
6291cb4cbe
Update commonobject.class.php 2018-02-05 15:41:34 +01:00
Laurent Destailleur
9a0dca57af
Update commonobject.class.php 2018-02-05 15:40:18 +01:00
Laurent Destailleur
9731a7fedc Code for update more similar than insert 2018-02-05 15:31:40 +01:00
Regis Houssin
839de65012 Fix: avoid error -1 2018-02-05 11:30:31 +01:00
Laurent Destailleur
0cc6654b06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:25:00 +01:00
Laurent Destailleur
5a609215d5 Fix default value was not save at creation 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:23:04 +01:00
Laurent Destailleur
aff6bced4a Fix default value was not save at creation 2018-02-04 13:20:47 +01:00
Laurent Destailleur
4fdde55c59 Keep empty graph if graph is called with empty data 2018-02-04 12:14:39 +01:00
Laurent Destailleur
f57ea2682a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php
 2018-02-03 19:33:24 +01:00
Laurent Destailleur
7c6c893657
Merge pull request #7996 from atm-maxime/new_force_mailto 
NEW Option to force all emails recipient
 2018-02-03 19:15:11 +01:00
Laurent Destailleur
833c7685e1 Hook 'maildao' was renamed into 'mail' into the method sendfile that 
send emails, and method was renamed from 'doaction' into 'sendMail'.
To process task #4875 #7969 in several steps.
 2018-02-03 17:36:33 +01:00
Regis Houssin
13106d34a6 Fix: compatibility with multicompany sharing 2018-02-02 12:36:47 +01:00
Laurent Destailleur
f51d6a2e50 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-02 10:07:16 +01:00
Laurent Destailleur
a7357e67f9 Code comment 2018-02-01 20:19:04 +01:00
Laurent Destailleur
0412d3d11d Fix extrafield mandatory check.Fix empty extrafields with type link. 2018-02-01 19:05:24 +01:00
Laurent Destailleur
ed3bcf59b6 Try doc hint array of array of int with @var int[][] 2018-02-01 10:50:50 +01:00
Laurent Destailleur
7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-01-31 20:25:24 +01:00
Laurent Destailleur
14ecdce650 Fix merge of thirdparties (pb when merging codes and error management) 2018-01-31 18:01:56 +01:00
Laurent Destailleur
de0a8ba71f Fix extrafields 2018-01-31 14:01:58 +01:00
Rui Strecht
b387c3fdf8 Forgot to update other files to same PR changes 2018-01-31 11:45:30 +00:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 2018-01-31 11:19:39 +00:00
Laurent Destailleur
e9f8c7ba01 Fix edit of extrafields "link" corrupts the data definition 2018-01-31 10:51:40 +01:00
Laurent Destailleur
d6317a26d2 Fix for multicompany 2018-01-30 15:48:09 +01:00
Laurent Destailleur
8d983717a3
Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user 
NEW export filter models can be share or not by user
 2018-01-29 21:19:50 +01:00
Laurent Destailleur
98c7ac9362
Merge pull request #8100 from ruistrecht-alt/label_for_MAIN_SHOW_REGION_IN_STATE 
NEW: Option MAIN_SHOW_REGION_IN_STATE renamed into MAIN_SHOW_REGION_IN_STATE_SELECT and more complete
 2018-01-29 21:08:18 +01:00
Laurent Destailleur
8102883356 Fix error when email list contains ', ,' 
Fix output dir of notification
 2018-01-29 20:36:40 +01:00
Laurent Destailleur
4eb7d7a332 Debug blockedlog with various payments 2018-01-29 18:22:26 +01:00
Frédéric FRANCE
def89d30ae
Merge remote-tracking branch 'upstream/develop' into patch-2 2018-01-28 15:36:40 +01:00
Laurent Destailleur
65c7117240 Fix var serialized twice 2018-01-27 19:40:42 +01:00
Laurent Destailleur
7dcb3bf6fc Fix var not initialized 2018-01-27 19:40:35 +01:00
Laurent Destailleur
7a2992bc4b Fix var serialized twice 2018-01-27 19:35:30 +01:00
Laurent Destailleur
f1cd905bf1 Fix var not initialized 2018-01-27 19:29:57 +01:00
Laurent Destailleur
eb3eee9b6a Code comment 2018-01-26 15:25:47 +01:00
Frédéric FRANCE
336c44dc88
trigger on shipping method update 2018-01-26 08:33:35 +01:00
Frédéric FRANCE
d0e83b7902
trigger on bank account update 2018-01-26 08:14:39 +01:00
Frédéric FRANCE
ec38b8a5a2
Update interface_99_modMyModule_MyModuleTriggers.class.php 2018-01-25 22:07:10 +01:00
Frédéric FRANCE
0568461a7b
swiftmailer 2018-01-25 22:03:51 +01:00
Frédéric FRANCE
9e0a548eff
Update commonobject.class.php 2018-01-25 17:42:25 +01:00
Rui Strecht
a13866f091 Changed MAIN_SHOW_REGION_IN_STATE to MAIN_SHOW_REGION_IN_STATE_SELECT for clarity 2018-01-25 16:14:39 +00:00
Laurent Destailleur
60c1a1e745 Code comment on accesskey 2018-01-24 17:29:29 +01:00
Laurent Destailleur
d796f403a9 Fix sender email when sending a password remind 2018-01-24 15:43:55 +01:00
Laurent Destailleur
273e88a599 Fix send into ledger for expense report. Show accounted status. 2018-01-22 03:07:11 +01:00
Frédéric FRANCE
d31684376a
swiftmailer 2018-01-21 18:59:48 +01:00
Frédéric FRANCE
a34b99f3ec
swiftmailer 2018-01-21 15:55:56 +01:00
atm-quentin
ce29331c05 NEW Filter export model by user 2018-01-18 12:34:22 +01:00
Laurent Destailleur
1a04178d64 Clean unused file and fix missing translation 2018-01-17 11:20:18 +01:00
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +01:00
Laurent Destailleur
51421a8bf6 Fix position of fields 2018-01-15 18:11:56 +01:00
Laurent Destailleur
926683763b Modulebuilde fix sort of fields, fix generation of files 2018-01-15 17:38:15 +01:00
Laurent Destailleur
193dfec29e
Merge pull request #8061 from fappels/7.0_fix_module_builder 
7.0 fix module builder
 2018-01-15 11:32:40 +01:00
fappels
00185bd9d4 Fix fetchCommon should return 0 iso error if not found 2018-01-15 11:21:24 +01:00
Laurent Destailleur
3c3402bc60 Debug API for prices of products 2018-01-14 15:58:04 +01:00
fappels
25b455272a Fix 0 is a valif value for a NOT NULL field 2018-01-14 15:31:31 +01:00
Laurent Destailleur
f0d6099e5f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/core/lib/functions.lib.php
 2018-01-14 03:15:49 +01:00
Laurent Destailleur
9f6118ed52 Code comments 2018-01-14 03:12:22 +01:00
Laurent Destailleur
7a087327e1 Fix deprecated code 2018-01-13 19:33:40 +01:00
Laurent Destailleur
7c480f76e3 Fix thumbs of pdf at wrong place 
Fix param not provided
Fix css
 2018-01-13 16:09:05 +01:00
Laurent Destailleur
7a88afe962 Fix field enabled and perms must differs 2018-01-13 13:16:33 +01:00
Laurent Destailleur
53b36435d0 Fix on smartphone 2018-01-12 20:50:18 +01:00
Laurent Destailleur
32a998e68d Fix preview link 2018-01-12 16:28:10 +01:00
Laurent Destailleur
ad4b59d2c8 Fix scrutinizer 2018-01-12 15:33:21 +01:00
Laurent Destailleur
50596a5214 Fix trans key 2018-01-12 14:06:48 +01:00
Laurent Destailleur
15ed7584b8 Fix navigation in accounting account card 2018-01-11 17:06:06 +01:00
Laurent Destailleur
e141d43999 Fix bad links with mobile 2018-01-10 13:14:30 +01:00
Laurent Destailleur
9b448459c9 Fix dispatching replacement invoice into bookkeeping (not used by most 
countries in europe)
 2018-01-09 19:12:08 +01:00
Laurent Destailleur
b3465d441a Missing ajaxcombobox 2018-01-04 10:45:48 +01:00
Laurent Destailleur
c98b5c7ec7 Fix css background 2018-01-02 17:27:05 +01:00
Laurent Destailleur
8388858715 Fix filemanager 2017-12-27 20:17:08 +01:00
Maxime Kohlhaas
a9c7dc48ab New option to force e-mail recipient, helpful for test purposes 2017-12-24 17:31:31 +01:00
Laurent Destailleur
e6c7f9e69b Debug module inventory 2017-12-22 21:29:09 +01:00
Laurent Destailleur
2b056b0177 BUG Fix of old hidden feature price per quantity 2017-12-22 12:53:46 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2017-12-21 14:35:33 +01:00
Marcos García
b5804d18b8 Merge branch 'develop' into bug-6980 
# Conflicts:
#	htdocs/core/class/html.formmail.class.php
 2017-12-21 12:03:03 +01:00
Laurent Destailleur
f1305bbdd6 Fix css 2017-12-20 21:14:22 +01:00
Laurent Destailleur
b03d0134a7 Filter on date extrafield timestamp and datetime disabled (not possible 
yet)
 2017-12-20 18:30:41 +01:00
Laurent Destailleur
3f6b3b51ca Fix css 2017-12-20 15:09:58 +01:00
Laurent Destailleur
12d91d7444 Fix missing messages in error report. 
Fix test on non empty array
 2017-12-19 18:26:27 +01:00
Laurent Destailleur
f504716501 Fix sync contact - external user 2017-12-19 16:16:31 +01:00
Laurent Destailleur
1351a43a30 FIX Maxi debug of permission for users external or restricted to sales 
representatives
 2017-12-18 16:13:05 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +01:00
Laurent Destailleur
8e12551f17 Fix not employee must not appear on page to create salaries 2017-12-18 11:55:34 +01:00
Marcos García
f45c3e8231 FIX #6980 FormMail::getEmailTemplate returns an array instead of a ModelMail object 
Close #6980
 2017-12-17 23:42:50 +01:00
Laurent Destailleur
6f9822ddb3 Fix link for payment no set 2017-12-17 22:03:42 +01:00
Laurent Destailleur
4abcbae79f NEW The unalterable log can be browse by any user with he permission 2017-12-16 21:36:36 +01:00
Laurent Destailleur
e90a6b8c0f Option THEME_HIDE_BORDER_ON_INPUT to restore border on inputfields work 
also with md theme.
 2017-12-16 20:52:49 +01:00
Laurent Destailleur
9cdf322bfb Fix scrutinizer bugs 2017-12-15 22:14:28 +01:00
Laurent Destailleur
c119d7dbb9 Code comment 2017-12-13 23:37:34 +01:00
Laurent Destailleur
247c380d18 Several fixes 2017-12-12 16:11:40 +01:00
Laurent Destailleur
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54 Fix several pb in links to projects on create page 2017-12-12 10:37:51 +01:00
Laurent Destailleur
9314dcb046 Fix regression 2017-12-12 10:13:48 +01:00
Laurent Destailleur
7efbcfa1e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-11 13:50:49 +01:00
Laurent Destailleur
338f8d978a Fix generation of doc in modulebuilder 2017-12-11 13:50:26 +01:00
Laurent Destailleur
acf2d2ee9a Fix scrutinizer reported bugs 2017-12-11 11:48:11 +01:00
Laurent Destailleur
748aee9a54 Fix javascript error 2017-12-10 19:54:04 +01:00
Laurent Destailleur
2dae21259e Fix the switch show more/less 2017-12-10 19:03:18 +01:00
Laurent Destailleur
02d9e93ed4 Fix badge and use of data-html instead of html tag 2017-12-10 15:46:35 +01:00
Laurent Destailleur
472d7b591e Fix hook for formmail and translation 2017-12-10 02:01:36 +01:00
Laurent Destailleur
8d20473ffd Fix date of extrafields 2017-12-09 23:19:29 +01:00
Laurent Destailleur
cc813df2a5 Fix modulebuilder 2017-12-09 20:17:47 +01:00
Laurent Destailleur
f22e7ee24a Fixes 2017-12-09 17:29:19 +01:00
Laurent Destailleur
e3dcff7f5b Fix substition for menus title and urls 2017-12-09 15:35:01 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large 
More complete template
 2017-12-08 16:15:41 +01:00
Laurent Destailleur
f85e79e250 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/filefunc.inc.php
	htdocs/holiday/class/holiday.class.php
 2017-12-08 13:13:53 +01:00
Laurent Destailleur
8dc3d7323d
Merge pull request #7923 from fmarcet/6.0 
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
 2017-12-08 13:02:07 +01:00
Ferran Marcet
bfc476a118 FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable 2017-12-07 18:44:33 +01:00
Laurent Destailleur
74a63ca18c Fix scrutinizer 2017-12-06 23:43:59 +01:00
Laurent Destailleur
8019f73f99 Fix: protection to not delete invoice if invoice is in bookkeeping 2017-12-05 10:01:30 +01:00
Laurent Destailleur
78c4b7f912 Fix look and feel v7 2017-12-04 20:17:07 +01:00
Laurent Destailleur
d2adec01b0 Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice 2017-12-03 20:18:00 +01:00
Laurent Destailleur
58edc06ac3 Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice 2017-12-03 20:15:04 +01:00
Laurent Destailleur
b41213f9a1 Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice 2017-12-03 20:08:53 +01:00
Laurent Destailleur
cc05bb3c8c Fix duplicate errors 2017-12-03 19:36:59 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
670465fcd8 Fix responsive and search 2017-12-01 12:01:17 +01:00
Laurent Destailleur
b14cb7a97f Debug accountancy 2017-11-28 11:49:11 +01:00
Laurent Destailleur
533a82187a NEW Add a protection so we can't journalize non balanced transactions 2017-11-27 17:12:48 +01:00
Laurent Destailleur
57d4f28cba Enhance usability of accounting module 2017-11-27 15:51:28 +01:00
alexis Algoud
61a3131fc4 fix include for ajax select product supplier order 2017-11-27 10:59:46 +01:00
Laurent Destailleur
e4d0213916 Removed duplicate code 2017-11-26 22:06:14 +01:00
Laurent Destailleur
c02528a479 NEW Accept substitution key __[ABC]__ replaced with value of const ABC 2017-11-25 19:55:31 +01:00
Laurent Destailleur
5935ad868a Fix the from robot must be visible only on test page 2017-11-25 19:23:27 +01:00
Laurent Destailleur
3d48e509bd Clean code 2017-11-25 19:16:15 +01:00
Laurent Destailleur
2fc5d9fefb The form to test email can now use all sending profiles. 2017-11-25 18:52:47 +01:00
Laurent Destailleur
e6b16815aa Fix responsive 2017-11-25 17:25:27 +01:00
Laurent Destailleur
e1484caa59 Fix responsive 2017-11-25 17:21:53 +01:00
Laurent Destailleur
1ea9137863 Fix sort order 2017-11-25 16:21:44 +01:00
Laurent Destailleur
5ba4a57b61 Fix sort on last actions 2017-11-25 16:05:45 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
Laurent Destailleur
412c4e335d Fix method of herited object has same signature than parent 2017-11-25 11:10:52 +01:00
Laurent Destailleur
88841ccbae FIX #7590 2017-11-25 01:58:11 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
7ea96d53a2 Minor fixes 2017-11-24 18:12:01 +01:00
Laurent Destailleur
4f4f929efb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/holiday/class/holiday.class.php
 2017-11-24 17:02:14 +01:00
Laurent Destailleur
2493c2468d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/core/lib/files.lib.php
 2017-11-24 16:51:59 +01:00
Laurent Destailleur
21764ed0cf
Merge pull request #7856 from frederic34/patch-1 
Update html.form.class.php
 2017-11-24 16:33:00 +01:00
Laurent Destailleur
831099fef8 Debug modulebuilder 2017-11-24 16:24:42 +01:00
Laurent Destailleur
abe13d108b Clean code used for autocompletion 2017-11-24 09:23:18 +01:00
Laurent Destailleur
9c22b5f335 Replace deprecated dol_print_graph with DolGraph 2017-11-23 20:24:05 +01:00
Laurent Destailleur
5cf21fef05 Use autocompletion on list of taxes 2017-11-23 15:46:52 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
Frédéric FRANCE
0ee30171db
Update html.form.class.php 2017-11-23 08:36:10 +01:00
Laurent Destailleur
5b77fe393e Fix: contact not preselected 2017-11-23 00:59:43 +01:00
Laurent Destailleur
5a2fe13958 Fix travis 2017-11-22 21:36:01 +01:00
Laurent Destailleur
adce4b5b7b Debug multi contact on event. 
Prepare also code to manage properties of attendees of event
 2017-11-22 14:42:47 +01:00
Laurent Destailleur
fd5cb736ce
Merge pull request #6961 from atm-ph/new_event_with_multi_contact 
New multi contacts on actioncomm
 2017-11-22 12:05:04 +01:00
Laurent Destailleur
aa91b9075a Fix cancel button 2017-11-22 11:54:02 +01:00
Regis Houssin
a9bfe0f48f Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876) 2017-11-22 10:12:51 +01:00
Laurent Destailleur
2b95679b84 Add info to help spam fight 2017-11-21 14:09:15 +01:00
Laurent Destailleur
4b4412d5da Standardize file names for ECM 2017-11-20 19:40:34 +01:00
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