Commit Graph

5635 Commits

Author SHA1 Message Date
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