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

15766 Commits

Author SHA1 Message Date
Juanjo Menent
6104d16b08
Merge pull request #10117 from atm-maxime/fix_pdf_contract 
Fix pdf strato for contract with multipage
 2018-12-01 11:14:38 +01:00
BENKE Charlene
19e4698488
Update date.lib.php 2018-12-01 10:32:37 +01:00
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
BENKE Charlene
085101376c
Introduce standard sql date format filter 
refactoring standard sql filter for date
 2018-12-01 00:41:46 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Laurent Destailleur
4260d5765f Fix bad trans key 2018-11-30 11:50:32 +01:00
Laurent Destailleur
6fbf292a95 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-11-30 11:01:36 +01:00
Laurent Destailleur
dd357d167a Update ChangeLog 2018-11-30 11:00:42 +01:00
Laurent Destailleur
539d993666 Fix translation of month 2018-11-29 12:20:47 +01:00
Laurent Destailleur
bbfd134733 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:24:18 +01:00
Laurent Destailleur
ea3e58a390
Merge pull request #10090 from hregis/8.0_bug3 
FIX remove constant for avoid problem
 2018-11-29 11:18:29 +01:00
Laurent Destailleur
950dfeef58
Merge pull request #10081 from oscim/patch-1 
Update company.lib.php
 2018-11-29 11:15:52 +01:00
Laurent Destailleur
f3ce49806d
Update company.lib.php 2018-11-29 11:15:27 +01:00
Laurent Destailleur
9e20d9e847 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8 responsive 2018-11-29 11:03:02 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018 
fix typo error
 2018-11-29 10:57:48 +01:00
Laurent Destailleur
c5bd11951f Fix bar not visible on some screen 2018-11-29 02:09:07 +01:00
Regis Houssin
b4aa9ee335 FIX remove constant for avoid problem 2018-11-28 17:04:42 +01:00
Laurent Destailleur
b9c08853be CSS 2018-11-28 16:54:21 +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
01181ba3a4 Fix avoid warning 2018-11-28 13:06:39 +01:00
Laurent Destailleur
780a538fe0 Fix multicompany not accessible from website. 2018-11-27 17:37:39 +01:00
Laurent Destailleur
70bd931d08 FIX empty page due to preg_replace JIT error on large strings 2018-11-27 16:20:31 +01:00
Laurent Destailleur
7c22504252 Fix position of field must be ssame between create/edit/view 2018-11-27 09:22:59 +01:00
IJ
825f41bfda
Add Access Keys in Navigation Tooltips 2018-11-27 00:22:21 +00:00
Laurent Destailleur
b9e544d291 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/resource/list.php
 2018-11-26 23:08:06 +01:00
Philippe GRAND
52f587e1e3 merging 2018-11-26 16:05:53 +01:00
oscim
f5ebcca475
error space after comment 2018-11-26 15:47:51 +01:00
Laurent Destailleur
12b9ac2c3b Fix lang 2018-11-26 14:48:27 +01:00
Philippe GRAND
9bf0f12068 fix typo error 2018-11-26 14:32:04 +01:00
Laurent Destailleur
f0ab6e60ec FIX Loading translation of cron tasks 2018-11-26 13:31:05 +01:00
oscim
2af24903e9
Update company.lib.php 
Fix list in  agenda for tab customer / provider , no thirdparty selected because name of class is not Societe
 2018-11-26 10:53:34 +01:00
Laurent Destailleur
2e139d1960 Fix var $hidedetails not defined 2018-11-25 12:08:49 +01:00
Laurent Destailleur
82b4b3ccb3
Merge pull request #10047 from frederic34/patch-9 
doc cmail class
 2018-11-24 11:20:49 +01:00
Laurent Destailleur
ff857c0144
Merge pull request #10064 from frederic34/pdfexpensereport 
try to fix the expensereport pdf
 2018-11-24 11:11:26 +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
13e24dc894 Code comment 2018-11-23 15:35:40 +01:00
Laurent Destailleur
5bd9c14929 Update demo data for 8.0 and 9.0 2018-11-23 14:05:45 +01:00
Laurent Destailleur
0fbf213739 Fix length of field 2018-11-22 13:08:18 +01:00
Laurent Destailleur
1d4c756783 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-22 11:44:37 +01:00
Frédéric FRANCE
491270b27f
try to fix the expensereport pdf 2018-11-21 23:06:52 +01:00
IJ
693a8d6e4a
NEW: Add hidden config 'ADD_UNSPLASH_LOGIN_BACKGROUND' 
- The background image will be refreshed on every login page refresh
- Background image is pulled from the popular open source image website Unsplash
- If an already saved static background image exists, then this code will override it (but not delete the saved image).
 2018-11-21 21:53:29 +00:00
Laurent Destailleur
5e9abe6aad Fix getLanguageCodeFromCountryCode 2018-11-21 16:28:36 +01:00
Laurent Destailleur
b6dac7da20 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-21 15:40:15 +01:00
Thibault Descamps
1cc130e5f6 NEW : conf to change concat desc order 2018-11-21 09:57:44 +01:00
Frédéric FRANCE
730863cb09
reduce complexity of eldylib menu 2018-11-20 21:40:37 +01:00
Laurent Destailleur
c891f6ed10 Disable javascript feature with no javascript 2018-11-20 21:26:22 +01:00
Laurent Destailleur
1ecdaa548c Remove the no more used and deprecated dol_print_graph function 2018-11-20 20:28:46 +01:00
Laurent Destailleur
07fe7e58d8 Code comment 2018-11-20 19:04:58 +01:00
Laurent Destailleur
4b82538941 Better module position 2018-11-20 14:56:14 +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
62a5869db4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 20:08:14 +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
929635d468
Merge pull request #10026 from OPEN-DSI/fix-contact-agenda-filter 
Fix Contact Agenda events filter when no Third Party
 2018-11-19 18:35:55 +01:00
Laurent Destailleur
471f41577c
Merge pull request #10040 from defrance/patch-124 
Add societe extrafields on proposal export
 2018-11-19 18:33:41 +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
bd8856b988
Merge pull request #10033 from frederic34/patch-9 
Update CMailFile.class.php
 2018-11-19 18:20:20 +01:00
Laurent Destailleur
77bc1c4313 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-11-19 18:18:43 +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
gauthier
ecdfa5219b FIX : We want to be able to send PDF of paid invoices 2018-11-19 17:31:45 +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
Laurent Destailleur
ade0363224 Module status 2018-11-19 15:46:20 +01:00
Laurent Destailleur
5f93315097 Clean code 2018-11-19 15:14:46 +01:00
Laurent Destailleur
0886928a64 FIX Link between action and project must use field not the link table 2018-11-19 14:38:30 +01:00
Laurent Destailleur
1e1ccd4c88 Fix pagination in action/event list 2018-11-19 14:25:34 +01:00
BENKE Charlene
92562ad89f
Add societe extrafields on export 2018-11-19 12:17:41 +01:00
Laurent Destailleur
824b1924e2 Fix loading of cronjob 2018-11-19 10:33:42 +01:00
Alexandre SPANGARO
2d55666a0b NEW Add gender in member card 2018-11-18 21:50:58 +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
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +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
François J
a5777d30e1 Fix Contact Agenda events filter when no Third Party 
Handle case where the contact is not linked to any third party.
 2018-11-16 10:09:25 +01:00
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused 2018-11-15 22:15:45 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +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
2350908d4e FIX change getEntity doc and changelog 2018-11-15 19:00:14 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc 
FIX compatibility between proposal sharing and proposalnumber sharing
 2018-11-15 17:19:28 +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
f2fba05475
Merge branch 'develop' into new_branch_13_11_2018 2018-11-15 16:23:54 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
Laurent Destailleur
3ca45e0e40 Fix double dot in sql filename 2018-11-15 10:59:55 +01:00
Regis Houssin
0907a6d611 FIX wrong object name (travis error) 2018-11-14 16:55:14 +01:00
Regis Houssin
874e27ef84 FIX multicompany override constants of current entity 2018-11-14 15:37:10 +01:00
Regis Houssin
93a1e941a4 FIX new method: override constants of current entity 2018-11-14 15:34:39 +01:00
Regis Houssin
2bc25fc008 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-14 15:24:41 +01:00
Regis Houssin
9ff4b31843 FIX compatibility with invoice sharing and invoice number sharing 2018-11-14 15:24:22 +01:00
Laurent Destailleur
a7989eb893 Fix menu 2018-11-14 13:55:10 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
04edcaa89c FIX compatibility between proposal sharing and proposalnumber sharing 2018-11-13 20:20:46 +01:00
John BOTELLA
c6cf748ba7 Fix envent message on upload category picture 2018-11-13 14:44:10 +01:00
Laurent Destailleur
77582b2a41 FIX the autofocus feature 2018-11-13 11:36:57 +01:00
John BOTELLA
500bb7bc96 best conditions testing 2018-11-13 10:20:34 +01:00
Philippe GRAND
2ed060a070 fix: Invalid argument supplied for foreach() 2018-11-13 10:07:04 +01:00
Laurent Destailleur
628918f863 Remove var_dump 2018-11-12 16:43:33 +01:00
Laurent Destailleur
01e7b5747d FIX user param is null not 0 when not defined 
FIX properties email_xx were not set
 2018-11-12 15:27:59 +01:00
François J
10dd5652ee Add SELECT DISTINCT to show_actions_done() SQL request 2018-11-12 12:34:25 +01:00
François J
9a6a3d8df4 Join llx_actioncomm_resources only if we have a contact object. 2018-11-12 12:20:07 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
ca3510e889
Merge pull request #9994 from ptibogxiv/patch-91 
Fix Invalid argument supplied for foreach()
 2018-11-11 17:30:06 +01:00
patrick Delcroix
fa9ecd9f97 clean: align with upstream 2018-11-10 15:46:51 +01:00
patrick Delcroix
e9d3db084a new: link to the compta-files.php in the accountancy left menu 2018-11-10 15:35:56 +01:00
ptibogxiv
80782a366e
Fix Invalid argument supplied for foreach() 2018-11-10 15:04:38 +01:00
ptibogxiv
5c96689c87
Fix Invalid argument supplied for foreach() 2018-11-10 15:02:50 +01:00
delcroip
e0bae07f97 NEW:Invoice creation from task Time 2018-11-10 14:31:26 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +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
01baddb096
Merge pull request #9959 from hregis/8.0_bug 
FIX export only prices of the current entity !
 2018-11-08 19:26:09 +01:00
Laurent Destailleur
588de2cc86 Fix filter on entity on project 2018-11-08 18:45:02 +01:00
Laurent BOUQUET
320e7adef7 Fix blank lines and whitespace at end of lines 2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f Merge branch 'develop' into feature/product-search-barcode 2018-11-08 16:57:49 +01:00
Laurent Destailleur
c55f83b0b7 Fix multicompany filter missing 2018-11-08 11:25:29 +01:00
Laurent Destailleur
22170ac1c1 FIX Crop of large files was selecting wrong image area. 2018-11-08 10:45:39 +01:00
Laurent Destailleur
5bbf7e8f1d Fix look and feel v8 2018-11-08 10:21:43 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796 Fix look and feel v8 2018-11-08 09:51:46 +01:00
Frédéric FRANCE
3ba3a47f20
close window 2018-11-07 22:04:55 +01:00
Frédéric FRANCE
df224e4b54
can click on image to preview in doc list 2018-11-07 21:51:05 +01:00
François J
121297b5bd SQL Join actioncomm_resources 2018-11-07 17:10:51 +01:00
François J
aea01b3208 NEW Work with new table actioncomm_resources and multiple contact affectation 2018-11-07 17:04:18 +01:00
Laurent Destailleur
6ba78b2bb3 Work on email collector 2018-11-07 16:33:06 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +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
c1cf4fbb95 Fix phpcs 2018-11-06 20:29:58 +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
Regis Houssin
d32fd9fda5 FIX export only prices of the current entity ! 2018-11-06 18:08:29 +01:00
Laurent Destailleur
7e33af6677 Fix max size 2018-11-06 17:40:59 +01:00
Laurent Destailleur
1e801c7c8a Fix css 2018-11-06 16:50:31 +01:00
François J
29c71b31fe [New] Add Presend form & Actions to send emails to Contact card 
Add ability to send email to contact from the Contact card. Functionality was copied and adapted from the Third Party card.
 2018-11-06 16:40:39 +01:00
Laurent Bouquet
f05b67909b NEW : Add product search from barcode via REST api 2018-11-06 12:13:16 +01:00
Laurent Destailleur
055a55b900 NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and 
SHIPPING_PDF_HIDE_QTYTOSHIP
 2018-11-06 10:03:12 +01:00
Laurent Destailleur
52aa860008 Code comment 2018-11-06 09:39:22 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518 Debug modulebuilder 2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +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
90729c03c4 Fix dependencies of new modules 2018-11-05 10:28:44 +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
1afdf7a961
Merge pull request #9947 from bafbes/abb80042 
New : help picto for fields in creation
 2018-11-05 09:54:42 +01:00
Laurent Destailleur
7c3cb7d73c
Update commonfields_add.tpl.php 2018-11-05 09:54:11 +01:00
Laurent Destailleur
90d3b80efb NEW Add email in event histor for reminder email of expired subsription 2018-11-03 22:53:55 +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
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Laurent Destailleur
7e55701774 2 remind of subscription expired by default 2018-11-03 11:41:45 +01:00
Laurent Destailleur
64b5e432c2 2 remind of expired subscription by default 2018-11-03 11:40:43 +01:00
Laurent Destailleur
0229b96178 Fix family of module 2018-11-03 11:38:29 +01:00
Abbes Bahfir
5f4d644cab New : help picto for fields in creation 2018-11-03 11:12:50 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
4b402aa6d1 Fix regression on name of array 2018-10-31 15:41:00 +01:00
Laurent Destailleur
be8e48b265 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
	htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
	htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
 2018-10-31 15:38:29 +01:00
Laurent Destailleur
07719eaf1e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94 FIX Error generating ODT when option to use contact on doc on 2018-10-31 15:31:22 +01:00
Laurent Destailleur
0ca5da055f Debug v9 2018-10-31 15:04:01 +01:00
Laurent Destailleur
693570c48b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2018-10-31 11:50:29 +01:00
Laurent Destailleur
866729cd21 FIX bad link in notification 2018-10-30 22:32:42 +01:00
Laurent Destailleur
c764d7f8d5 Fix remove var_dump 2018-10-30 21:34:17 +01:00
Frédéric FRANCE
da3ee9ad9a
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-10-30 19:04:35 +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
a3e49f021d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 15:32:25 +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
b9078c6d58 Fix phpcs 2018-10-30 15:30:04 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias 
FIX missing name alias field in societe import/export #9091
 2018-10-30 15:00:34 +01:00
Laurent Destailleur
0c77f6c3c5
Merge pull request #9918 from bafbes/abb80041 
Fix: To be possibly intercepted : call create, update and delete of the object instead of commonobject
 2018-10-30 14:52:23 +01:00
Laurent Destailleur
c9d00848e6
Merge pull request #9914 from frederic34/patch-27 
make play and playdisable equals
 2018-10-30 14:49:54 +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
4a71374cf7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 14:48:09 +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
afe61579e8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-30 14:28:25 +01:00
Laurent Destailleur
7a268d8d9f Clean code 2018-10-30 14:27:14 +01:00
Laurent Destailleur
81c70898bf
Merge pull request #9884 from hregis/develop_bug 
FIX $forceentity is not used, replace by $currentobject if needed
 2018-10-30 14:16:29 +01:00
Laurent Destailleur
d309f22e55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 13:54:25 +01:00
Laurent Destailleur
d4fd55c4cf FIX #9907 2018-10-30 13:54:11 +01:00
Laurent Destailleur
ca6d15a3eb
Merge pull request #9820 from laudeco/hotfix/9640_member_email 
FIX the member e-mail on resign and validation.
 2018-10-30 12:41:34 +01:00
Laurent Destailleur
9bb1572e63
Update functions.lib.php 2018-10-30 12:41:06 +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
Laurent Destailleur
2ced09e8ab
Merge pull request #9888 from aljawaid/patch-3 
FIX: Expense Report Ref Not Showing in PDF File Properties
 2018-10-30 12:20:12 +01:00
Laurent Destailleur
f88b922d9d
Merge pull request #9908 from frederic34/patch-26 
Update box_graph_product_distribution.php
 2018-10-30 12:19:45 +01:00
Laurent Destailleur
5935a420a8
Merge pull request #9886 from frederic34/catchblockempty 
fill empty catch with log
 2018-10-30 12:16:41 +01:00
Abbes Bahfir
7f7df8d001 Fix: To be possibly intercepted : create, update and delete of the object instead of commonobject must be called 2018-10-30 09:03:33 +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
Frédéric FRANCE
450a837393
make play and playdisable equals 2018-10-29 18:50:15 +01:00
Laurent Destailleur
0266db7aa8 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:19:40 +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
0500f54237 Email collector 2018-10-29 11:29:08 +01:00
Laurent Destailleur
7785cae9aa Code comment 2018-10-29 03:46:45 +01:00
Laurent Destailleur
fcfb9746a8 Fix trackid when email sent from mass actions 2018-10-29 03:42:02 +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
244c7f8dc3 FIX thirdparty property of object not loaded when only one record 2018-10-29 02:14:36 +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
dbb2168b83 FIX thirdparty property of object not loaded when only one record 2018-10-29 02:02:43 +01:00
Laurent Destailleur
f8a49edf78 Fix use setup of template for attached files in mass actions 2018-10-29 00:55:55 +01:00
Frédéric FRANCE
9b3fc6527c
Update box_graph_product_distribution.php 2018-10-28 23:50:13 +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
f29ee25ea7
remove fieldlabel and add fieldeditkey 2018-10-27 11:06:45 +02:00
Regis Houssin
fdde88cbe6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug 2018-10-27 11:01:06 +02:00
Maxime Kohlhaas
abb343d37e Fix missing name alias field in societe import/export #9091 2018-10-27 09:42:08 +02:00
IJ
71c64c0944
FIX: Expense Report Ref Not Showing in PDF File Properties 
The generated pdf title field in the pdf file document properties was blank.  This fixes that.
 2018-10-27 01:57:07 +01:00
Frédéric FRANCE
b80d2fa12d
fill empty catch with log 2018-10-26 21:09:46 +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
Regis Houssin
866a7df510 FIX $forceentity is not used, replace by $currentobject if needed 2018-10-26 18:23:48 +02:00
Laurent Destailleur
087b68948d Fix: do not use point for graph with too many points. 2018-10-26 17:32:32 +02:00
De Coninck Laurent
d347cf3a85 set a message 2018-10-26 16:18:27 +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
d28c9ddea5
Merge pull request #9872 from laudeco/feature/improvement_module_picto 
improve img_picto by returning ASAP
 2018-10-26 15:20:40 +02:00
Laurent Destailleur
e875aee2c5
Merge pull request #9868 from atm-ph/fix_develop_php_warnings_in_js 
Fix PHP warnings printed in javascript
 2018-10-26 15:19:21 +02:00
Laurent Destailleur
ed0393dfa8
Merge pull request #9875 from atm-john/Fix_title 
FIX title
 2018-10-26 15:14:44 +02:00
Laurent Destailleur
35421d135a FIX Total of timespent 
Conflicts:
	htdocs/core/js/timesheet.js
 2018-10-26 15:04:02 +02:00
Laurent Destailleur
20d7c8bb8c FIX Total of timespent 2018-10-26 15:01:50 +02:00
Laurent Destailleur
5d249d71ca Fix menu at wrong place 2018-10-26 14:38:26 +02:00
atm-john
8a9b9f1736 Fix title 2018-10-25 21:53:48 +02:00
atm-john
759b2b6ccf Extend import option to Order's card and Propal's card 2018-10-25 21:39:22 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
De Coninck Laurent
70cd68ebef improve img_picto by returning ASAP 
We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).
 2018-10-25 18:21:00 +02:00
Laurent Destailleur
9ccdd10a81 FIXx format (html/text) of emails sent on leave request module 2018-10-25 13:19:56 +02:00