BENKE Charlene
|
fca332995b
|
scrutinizer major error
|
2018-12-01 11:37:50 +01:00 |
|
BENKE Charlene
|
c34b213f61
|
scrutinizer major error
|
2018-12-01 11:33:58 +01:00 |
|
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 |
|
Maxime Kohlhaas
|
2b5bf0e2dd
|
Fix pdf strato for contract with multipage
|
2018-12-01 01:07:15 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
6d640ab83c
|
Fix feature to drag and drop rows of table (not generic)
|
2018-11-15 19:58:06 +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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
e86e3ec7ac
|
Work on email collector
|
2018-11-09 19:30:44 +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 |
|
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 |
|