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

6710 Commits

Author SHA1 Message Date
Laurent Destailleur
b14a16a119 Code comment 2019-02-01 13:48:09 +01:00
Laurent Destailleur
849b3b640b Code comment 2019-02-01 13:41:23 +01:00
Frédéric FRANCE
f83ee43a19
Merge branch 'develop' into nospaceaftercomma 2019-01-30 22:15:22 +01:00
Laurent Destailleur
c1f3f4c2b5 Fix: text for empty line not visible in select 2019-01-30 20:03:04 +01:00
Laurent Destailleur
200d30f2b9 Fix: text for empty line not visible in select 2019-01-30 20:01:55 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
3198f9fbbe
Merge pull request #10441 from aspangaro/10.0_email 
Move my email to the new one
 2019-01-30 14:59:58 +01:00
Laurent Destailleur
3d218cadb7 FIX last_main_doc var not saved 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-01-29 19:03:45 +01:00
Laurent Destailleur
9ef93bceca FIX last_main_doc var not saved 2019-01-29 18:40:47 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15
wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
b4400b95db
Merge pull request #10411 from BitKFu/develop 
Added new calculation fields for the doc generator
 2019-01-26 14:17:43 +01:00
Laurent Destailleur
c989b8d102
Update commondocgenerator.class.php 2019-01-26 14:17:01 +01:00
Laurent Destailleur
59e993e834 Code comment 2019-01-25 12:03:07 +01:00
Gerhard Stephan
a78e406e76 Added new calculation fields for the doc generator 
- object_total_up  : Sum of all lines (subprice * qty)
- object_total_up_locale : Localized sum of all lines (subprice * qty)
- object_total_discount : Total discount in percent
- object_total_discount_locale : Localized total discount in percent
- line_total_up : Total sum of a line (subprice * qty)
- line_total_up_locale : Localized Total sum of a line (subprice * qty)
 2019-01-24 21:08:13 +01:00
Laurent Destailleur
f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php
 2019-01-23 19:22:42 +01:00
Laurent Destailleur
e33f102dc2 FIX Edit of virtualhost 2019-01-23 14:57:43 +01:00
Laurent Destailleur
8fba387673 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-22 10:39:18 +01:00
Laurent Destailleur
3cca0df28e Support getFormatedCustomerRef into contract list 2019-01-22 10:39:06 +01:00
Günter Lukas
1cf786acff
Fix #10278 
Fix #10278
 2019-01-22 00:09:36 +01:00
Laurent Destailleur
eba8a8f34d
Merge pull request #10376 from atm-maxime/fix_extrafields_computed 
Compute value of computed extrafield on fetch, not on show
 2019-01-21 23:41:06 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc 2019-01-21 18:04:48 +01:00
torvista
9b1cf648dc more validation fixes 2019-01-21 16:19:31 +01:00
Laurent Destailleur
8950720fb5 NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods 2019-01-21 15:22:35 +01:00
Maxime Kohlhaas
23438b1f48 Compute extrafields after having set all others 2019-01-21 14:40:33 +01:00
Maxime Kohlhaas
f50de03585 Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_extrafields_computed 2019-01-21 14:36:23 +01:00
Maxime Kohlhaas
a2f5c72b54 Merge branch '8.0' of github.com:atm-maxime/dolibarr into fix_extrafields_computed 2019-01-21 14:33:25 +01:00
torvista
07b2bb6715 Swap of align/valign/border/width for css 
Removal of type="text/javascript"
 2019-01-20 23:36:39 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +01:00
Maxime Kohlhaas
c0b0d5484c Compute value of computed extrafield on fetch, not on show 2019-01-19 17:14:56 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Philippe GRAND
29fdad144d update with html5 compliant code 2019-01-19 12:40:17 +01:00
wdammak
191900d258 Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:35:16 +01:00
wdammak
13e7d18291 Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:33:56 +01:00
wdammak
9f60c208ca
Update stats.class.php 
Fix div/0 warnings
 2019-01-18 22:25:51 +01:00
Laurent Destailleur
d6b0f852c5 Work on invoicing time spent 2019-01-15 21:01:01 +01:00
Laurent Destailleur
f8ca44e42c NEW Preview of images into the filemanager component 2019-01-15 15:48:28 +01:00
Laurent Destailleur
d929d93376 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-08 14:19:35 +01:00
Laurent Destailleur
acc665a9f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2019-01-08 14:16:23 +01:00
Laurent Destailleur
1ee0d42408 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 14:08:22 +01:00
Laurent Destailleur
9a6c3ac3df FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER 2019-01-08 14:05:07 +01:00
Laurent Destailleur
3d4879c538 Code comment 2019-01-06 05:16:50 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2019-01-06 01:22:10 +01:00
Laurent Destailleur
c9e6074551 Code clean 2019-01-05 15:14:06 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
ldestailleur
dbbfdd984a Fix emailcollector can't be used without syntax rules 2019-01-03 11:47:27 +01:00
Laurent Destailleur
8b380489f2 Update commonobject.class.php 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-01-02 19:55:51 +01:00
Laurent Destailleur
85d60b93d6
Update commonobject.class.php 2019-01-02 19:53:59 +01:00
Günter Lukas
2857447aee
Update commonobject.class.php 2018-12-30 00:20:38 +01:00
ldestailleur
7b91c14cb3 FIX sql error when resetting payment mode / term 2018-12-28 23:14:41 +01:00
ldestailleur
c0eef25b31 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:14:36 +01:00
ldestailleur
2fef2b633a FIX sql error when resetting payment mode / term 2018-12-28 23:13:39 +01:00
ldestailleur
8ad06463e0 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:06:04 +01:00
Laurent Destailleur
64de31ef67 Clean log 2018-12-27 06:09:27 +01:00
Laurent Destailleur
deba3249f8 FIX Bad trigger name 2018-12-27 06:09:03 +01:00
Laurent Destailleur
8ab2ef0cf0 Add log 2018-12-27 06:08:48 +01:00
Laurent Destailleur
fb813fcfb1 Clean log 2018-12-27 06:06:32 +01:00
Laurent Destailleur
88ad059f25 FIX Bad trigger name 2018-12-27 06:04:55 +01:00
Laurent Destailleur
0ffefd71f3 Add log 2018-12-27 05:58:27 +01:00
Laurent Destailleur
eda3a5bc8c FIX Init of email topic when using a template 2018-12-27 05:18:16 +01:00
Laurent Destailleur
0f76279a03 FIX Missing token and style 2018-12-27 03:46:14 +01:00
Laurent Destailleur
791b2f485a FIX Missing token and style 2018-12-27 03:45:30 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Laurent Destailleur
35debd06fb List of events show user firstname by default 2018-12-23 01:28:36 +01:00
Laurent Destailleur
6557dcfb81 CSS 2018-12-23 00:49:26 +01:00
Laurent Destailleur
da3d1ab8b8 CSS 2018-12-23 00:24:10 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
 2018-12-22 19:06:58 +01:00
Laurent Destailleur
94ee18a20a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-22 19:00:15 +01:00
Laurent Destailleur
8d39edf430 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2018-12-22 18:59:49 +01:00
Laurent Destailleur
a5dccd1cc3 Enable by default the test on anti CSRF token 2018-12-22 18:09:26 +01:00
Laurent Destailleur
6c54ea925b Add token into confirm link so we will be able to check we accept the 
confirmation on interface for critical actions
 2018-12-22 17:42:33 +01:00
Laurent Destailleur
91f63f025b Add rolling token into confirm url 2018-12-22 17:34:57 +01:00
Laurent Destailleur
33564ddafc Fix css 2018-12-22 16:45:57 +01:00
Laurent Destailleur
7d1b48815d Fix css 2018-12-22 11:57:23 +01:00
Regis Houssin
9b215e117a FIX check if "entity" is already defined in "$param" 2018-12-21 11:23:44 +01:00
Laurent Destailleur
86502d881a
Merge pull request #10253 from grandoc/new_branch_18_12_2018 
fix align issue
 2018-12-19 13:02:25 +01:00
Laurent Destailleur
2978522006
Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change 
FIX: contact/address tab issue when changing company
 2018-12-19 12:59:32 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b6ae9d424 FIX Error reported when creation of thirdparty from member fails 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
 2018-12-18 21:32:41 +01:00
Laurent Destailleur
f2318716ec FIX Error reported when creation of thirdparty from member fails 2018-12-18 21:27:16 +01:00
Philippe GRAND
7b84825d2b fix align issue 2018-12-18 17:30:24 +01:00
Marc de Lima Lucio
7e2eca661b FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account 2018-12-18 09:40:58 +01:00
Laurent Destailleur
e80e366fb1
Merge pull request #10187 from AlainRnet/patch-6 
Update vcard.class.php
 2018-12-15 15:59:34 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats 2018-12-15 15:17:15 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
0cbc0fa0fc Fix shortkey 2018-12-14 19:33:43 +01:00
Laurent Destailleur
32f51838ec
Merge pull request #10083 from aljawaid/aljawaid-improve_access_keys 
NEW: Improve Displaying Access Keys in Navigation
 2018-12-14 19:29:50 +01:00
Laurent Destailleur
d5bbb3033c
Update html.form.class.php 2018-12-14 19:29:15 +01:00
Laurent Destailleur
f9c06cdb82 FIX #9498 #10132 2018-12-14 19:04:17 +01:00
Laurent Destailleur
59bc15377d CSS 2018-12-14 18:58:55 +01:00
Laurent Destailleur
0ac287c356
Merge pull request #10046 from frederic34/htmlformmail 
reduce complexity of htmlformmail class
 2018-12-14 17:37:34 +01:00
Laurent Destailleur
bd7df9869f
Update html.formmail.class.php 2018-12-14 17:37:08 +01:00
Laurent Destailleur
4dc32dafaa
Merge pull request #10043 from OPEN-DSI/selectcontacts-afterselectoptions-hook 
NEW Add afterSelectContactOptions hook
 2018-12-14 17:35:16 +01:00
Laurent Destailleur
89909ebab0
Update html.form.class.php 2018-12-14 17:32:41 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer 
fix scrunitizer
 2018-12-14 17:28:34 +01:00
Laurent Destailleur
7665c368a2
Merge branch 'develop' into allow_ajax_search_on_product_desc 2018-12-14 17:24:52 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
59e38d4a81
Merge pull request #9897 from Vaadasch/develop 
NEW Update working chkbxlst filter for lists
 2018-12-14 15:33:50 +01:00
altatof
d5bf9691ee allow product ajax search on description 2018-12-14 15:10:32 +01:00
Laurent Destailleur
dc4a122697
Merge pull request #10224 from fmarcet/develop 
Qual: Better management of select type of lines
 2018-12-14 11:06:33 +01:00
Laurent Destailleur
8c9f81807f
Merge pull request #9702 from bafbes/abb80027 
New : Link to create new element on linked fields
 2018-12-14 11:01:39 +01:00
Laurent Destailleur
42de7da334
Update commonobject.class.php 2018-12-14 11:01:27 +01:00
Laurent Destailleur
9bb3382002
Merge pull request #9534 from wdammak/patch-16 
Add the ability to sort products by category
 2018-12-14 10:02:08 +01:00
Laurent Destailleur
e1baf3ab2b
Update html.form.class.php 2018-12-14 10:01:12 +01:00
Laurent Destailleur
5d5add641b Fix scrutinizer 2018-12-14 09:58:23 +01:00
Laurent Destailleur
4fc2cefce3
Merge pull request #10181 from aljawaid/aljawaid-override_vat_expense_report 
NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT'
 2018-12-13 20:53:32 +01:00
Laurent Destailleur
3484b50511
Update html.form.class.php 2018-12-13 20:51:45 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
860492a19f
Merge pull request #10201 from joseplluis/patch-3 
Fix: add ID property to select objects
 2018-12-13 20:03:46 +01:00
Ferran Marcet
555698a3af Qual: Better management of select type of lines 2018-12-13 10:36:30 +01:00
Philippe GRAND
58175b76f2 to avoid html issue 2018-12-12 12:17:28 +01:00
Laurent Destailleur
434cf2e046 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-11 09:58:14 +01:00
Laurent Destailleur
3213b3be07 Standardize code: Move jabberid into social network module 2018-12-11 09:17:02 +01:00
Laurent Destailleur
b35a9c0e64 FIX Edition of menu fails (mainmenu required for top menu) 2018-12-10 17:50:58 +01:00
Laurent Destailleur
af5b63954a Clean code 2018-12-10 12:49:20 +01:00
Laurent Destailleur
3f912ebfff FIX restore security event login/logout 2018-12-10 11:19:52 +01:00
Laurent Destailleur
cd3716ff9f Dolibarize module ticket 2018-12-08 16:37:41 +01:00
Josep Lluís
1c9ccc1442
Fix: add ID property to select objects 
Add ID property to select objects
I.e: id="select_'.$htmlname.'"
 2018-12-07 17:28:31 +01:00
aljawaid
292dd5290a Amend Add Access Keys in Navigation Tooltips 
- Fix travis
 2018-12-07 12:39:20 +00:00
AlainRnet
d8c600636c
Update vcard.class.php 
update from vcard 2.1 to vcard 3.0
 2018-12-06 00:26:54 +01:00
IJ
8bd2efe648
NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT' 
- Setting constant `OVERRIDE_VAT_FOR_EXPENSE_REPORT` to `1` will allow expense reports to show VAT even if the global VAT setting is off
 2018-12-05 12:36:46 +00:00
Laurent Destailleur
d9bb39970f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/barcode.php
 2018-12-04 13:20:40 +01:00
Laurent Destailleur
5061a9b0c2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/mysql/tables/llx_paiementfourn.sql
 2018-12-04 13:17:25 +01:00
Alexandre SPANGARO
3b8dd71816 Remove public $db 2018-12-03 21:25:44 +01:00
Alexandre SPANGARO
0c6f6b80cb Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats 2018-12-03 21:16:53 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
07425e4e19
Merge pull request #10156 from grandoc/7.0_bug 
FIX #3234
 2018-12-02 17:06:06 +01:00
Alexandre SPANGARO
7eee155439 Correct documentation 2018-12-02 14:07:38 +01:00
IJ
30e84f8f2c
Amend Add Access Keys in Navigation Tooltips 
- based on suggested code by @eldy
- Added `classfortooltip` for better display
 2018-12-02 10:29:04 +00:00
Alexandre SPANGARO
088c002ed1 NEW: Add stats on entries & movements by fiscal year 2018-12-02 11:01:11 +01:00
Philippe GRAND
8ec2bac36a FIX #3234 2018-12-02 10:02:05 +01:00
Maxime Kohlhaas
ad05b531e7 Fix display user photo with new path 2018-12-02 00:02:43 +01:00
Maxime Kohlhaas
09b967bb1b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_user_photo 2018-12-01 23:39:28 +01:00
Maxime Kohlhaas
5e2f3a53c9 Fix expense report in ecm auto dir 2018-12-01 19:39:00 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
8c13c87429 Fix path for user photo 2018-12-01 16:55:42 +01:00
Inovea Conseil
18281d9d43
FIX #6580 
FIX #6580
 2018-12-01 16:48:50 +01:00
Maxime Kohlhaas
748dd12e4d
Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model 
FIX : Select first mail model by default
 2018-12-01 16:39:22 +01:00
florian HENRY
faf7ea345f fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/commonobject.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:23:46 +01:00
florian HENRY
dacc959937 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/core/class/comment.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 15:18:51 +01:00
ATM John BOTELLA
c6f4879575 Fix issue from scrutinizer 2018-12-01 12:04:34 +01:00
Laurent Destailleur
c5bd11951f Fix bar not visible on some screen 2018-11-29 02:09:07 +01:00
Marc de Lima Lucio
c13cc5d697 FIX: form actions: select_type_actions could be too small + bad init 2018-11-28 15:46:27 +01:00
Laurent Destailleur
780a538fe0 Fix multicompany not accessible from website. 2018-11-27 17:37:39 +01:00
IJ
825f41bfda
Add Access Keys in Navigation Tooltips 2018-11-27 00:22:21 +00:00
Laurent Destailleur
f0ab6e60ec FIX Loading translation of cron tasks 2018-11-26 13:31:05 +01:00
Laurent Destailleur
82b4b3ccb3
Merge pull request #10047 from frederic34/patch-9 
doc cmail class
 2018-11-24 11:20:49 +01:00
wdammak
5c9d5bb6ad
order by category 2018-11-23 21:30:34 +01:00
wdammak
5c3daf4a6a
order by category 2018-11-23 21:27:22 +01:00
wdammak
064816242a
Order by category 2018-11-23 21:26:10 +01:00
Laurent Destailleur
1d4c756783 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-22 11:44:37 +01:00
Laurent Destailleur
b6dac7da20 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-21 15:40:15 +01:00
Frédéric FRANCE
4e60e48f34
Update CMailFile.class.php 2018-11-19 23:43:58 +01:00
Frédéric FRANCE
2179e2011e
doc cmail class 2018-11-19 23:38:07 +01:00
Frédéric FRANCE
32706f570d
reduce complexity of htmlformmail class 2018-11-19 21:19:39 +01:00
Laurent Destailleur
e020597ba7 Fix deletion for class build with modulebuilder 2018-11-19 21:11:26 +01:00
Laurent Destailleur
39621ec686 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-11-19 20:07:51 +01:00
Laurent Destailleur
25ee999d27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:32 +01:00
Laurent Destailleur
8191df4857
Merge pull request #9962 from atm-john/fix_extrafield_view 
FIX hidden extrafield
 2018-11-19 18:37:18 +01:00
Laurent Destailleur
8535844737 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:27:00 +01:00
Laurent Destailleur
1931fd33eb
Merge pull request #10041 from atm-ph/fix_8.0_optional_param 
Fix new params has been added not optional
 2018-11-19 18:26:21 +01:00
Laurent Destailleur
4bedeabc5b FIX #10036 2018-11-19 18:02:29 +01:00
François J
37f3b8bbde Update @since version to 9.0 2018-11-19 17:51:00 +01:00
François J
6aaf0f4655 Add afterSelectOptions hook & selectcontacts context 2018-11-19 17:40:16 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00
atm-ph
129034ba76 Fix new params has been added not optional 2018-11-19 15:46:30 +01:00
Regis Houssin
7cba680f38 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-18 17:07:03 +01:00
Frédéric FRANCE
30b1db34cd
Update CMailFile.class.php 2018-11-17 11:33:01 +01:00
Laurent Destailleur
6b8a3094f0 Fix missing some keys in substitution arrays 2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584 Fix trackid must contains an id of instance 2018-11-16 16:43:13 +01:00
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Laurent Destailleur
f3228dc4f8
Merge pull request #10010 from atm-john/Fix_cat_photo_upload 
Fix event message on upload category picture fail
 2018-11-15 16:43:59 +01:00
Laurent Destailleur
3ca45e0e40 Fix double dot in sql filename 2018-11-15 10:59:55 +01:00
John BOTELLA
c6cf748ba7 Fix envent message on upload category picture 2018-11-13 14:44:10 +01:00
John BOTELLA
500bb7bc96 best conditions testing 2018-11-13 10:20:34 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
9d15f83f4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-08 20:19:45 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
Laurent Destailleur
4ced94f5fd
Merge pull request #9974 from frederic34/previewimage 
can click on image to preview in doc list
 2018-11-08 20:06:38 +01:00
Laurent Destailleur
9a31a61c9d FIX #9971 2018-11-08 20:05:01 +01:00
Laurent Destailleur
22170ac1c1 FIX Crop of large files was selecting wrong image area. 2018-11-08 10:45:39 +01:00
Frédéric FRANCE
df224e4b54
can click on image to preview in doc list 2018-11-07 21:51:05 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
John BOTELLA
4f7be36249 fix extrafield hidden 2018-11-07 09:14:29 +01:00
Laurent Destailleur
e0070bd348 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2018-11-06 18:30:57 +01:00
Laurent Destailleur
7e33af6677 Fix max size 2018-11-06 17:40:59 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
4c591daab1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2018-11-05 10:39:22 +01:00
Laurent Destailleur
56a70ab4e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 10:23:15 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
866729cd21 FIX bad link in notification 2018-10-30 22:32:42 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Marc de Lima Lucio
2fbc305683 FIX: task time screen: last fix was overkill 2018-10-30 16:00:56 +01:00
Laurent Destailleur
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Laurent Destailleur
2c8b7a4a3d
Merge pull request #9905 from atm-maxime/fix_currency_change 
Fix changing currency in a doc was recalculating amounts in company currency #9801
 2018-10-30 14:48:46 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
7a268d8d9f Clean code 2018-10-30 14:27:14 +01:00
Marc de Lima Lucio
8911d72be8 FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do 2018-10-30 12:28:04 +01:00
Laurent Destailleur
bddd658ba6
Merge pull request #9885 from frederic34/patch-15 
code comment html form class
 2018-10-30 12:27:19 +01:00
Laurent Destailleur
4ef0d2ce82
Merge branch 'develop' into 8.0_dict 2018-10-30 12:26:37 +01:00
Vaadasch
0d7dbace63
Update extrafields.class.php 2018-10-30 07:20:42 +01:00
Vaadasch
a4c7787d8c
Update extrafields.class.php 2018-10-29 22:00:08 +01:00
Laurent Destailleur
27d82d0e8e FIX Delete of draft invoice 2018-10-29 14:41:00 +01:00
Regis Houssin
977a88363e FIX missing multidir_output for supplier modules 2018-10-29 12:50:40 +01:00
Regis Houssin
6e2d62bea6 FIX wrong entity id 2018-10-29 12:30:36 +01:00
Laurent Destailleur
08862fb482 Log success of emails 2018-10-29 03:25:21 +01:00
Laurent Destailleur
b4600fdc06 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/js/timesheet.js
 2018-10-29 02:31:05 +01:00
Laurent Destailleur
04f80f0925 FIX Do not show check box if not applicable 2018-10-29 02:27:51 +01:00
Laurent Destailleur
553e984465 FIX Selection of addmaindocfile is lost on error 2018-10-29 02:14:41 +01:00
Laurent Destailleur
6e3822345c Fix use setup of template for attached files in mass actions 2018-10-29 02:14:31 +01:00
Laurent Destailleur
770f8c3f3b FIX Selection of addmaindocfile is lost on error 2018-10-29 02:11:33 +01:00
Laurent Destailleur
f8a49edf78 Fix use setup of template for attached files in mass actions 2018-10-29 00:55:55 +01:00
Maxime Kohlhaas
b68b8fe412 Fix changing currency in a doc was recalculating amounts in company currency #9801 2018-10-28 11:02:51 +01:00
Vaadasch
2b91067966
Update working chkbxlst filter 
Update line 1337 to make the filtering on chkbxlst working
 2018-10-27 19:31:50 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
47ac420133
code comment html form class 2018-10-26 20:12:46 +02:00
Laurent Destailleur
d3893b8b95 Debug v9 2018-10-26 19:00:24 +02:00
Laurent Destailleur
087b68948d Fix: do not use point for graph with too many points. 2018-10-26 17:32:32 +02:00
Laurent Destailleur
4955ae03e8
Merge pull request #9867 from atm-john/develop_jflot 
FIX hover stability and modernize style
 2018-10-26 15:33:47 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
9ccdd10a81 FIXx format (html/text) of emails sent on leave request module 2018-10-25 13:19:56 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
atm-john
d0dc8b2a9c Add points to lines charts and remove shadow to improve performances 2018-10-25 00:24:25 +02:00
atm-john
b5c47f16e6 Fix hover stability and modernize style 2018-10-24 23:25:40 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
277655b911 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:31:31 +02:00
John BOTELLA
fccea99e23 FIX translation in select unit form 2018-10-24 10:23:27 +02:00
Laurent Destailleur
65a39269d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-10-24 03:39:33 +02:00
Laurent Destailleur
047d130081 Fix phpcs 2018-10-24 03:38:12 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
f0dc2df526 Fix code comment 2018-10-24 03:30:06 +02:00
Laurent Destailleur
0f48cc1d0f
Merge branch 'develop' into fixpdf 2018-10-24 03:01:52 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
 2018-10-24 02:58:29 +02:00
Laurent Destailleur
ddd267f4c3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-24 02:21:53 +02:00