Commit Graph

62453 Commits

Author SHA1 Message Date
Laurent Destailleur
084516b885 Fix ip detection of geoip 2018-11-21 15:11:57 +01:00
Frédéric FRANCE
e8cac0df35
correct link and avoid warning in resource list 2018-11-21 14:06:06 +01:00
Laurent Destailleur
0ea6f2778b Fix examples 2018-11-20 22:01:38 +01:00
Laurent Destailleur
6514b51382 Better help 2018-11-20 21:59:05 +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
966a0b7ec7 Fix message content and language 2018-11-20 20:13:16 +01:00
Laurent Destailleur
07fe7e58d8 Code comment 2018-11-20 19:04:58 +01:00
Laurent Destailleur
61fddadc3f Complete the fetchAll of modulebuilder + websitepage 2018-11-20 18:29:29 +01:00
Laurent Destailleur
200de22807 Missing image in container 2018-11-20 16:48:34 +01:00
Laurent Destailleur
f455e32bef FIX Some modules templates were visible when it should not 2018-11-20 16:22:16 +01:00
Laurent Destailleur
12a6709ebe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-20 15:27:16 +01:00
Laurent Destailleur
4b82538941 Better module position 2018-11-20 14:56:14 +01:00
Laurent Destailleur
7587eedd7c
Merge pull request #10044 from prietojc/patch-1
# Fix: Missing lines to search total_ttc
2018-11-20 13:44:08 +01:00
Laurent Destailleur
7e735e222e
Merge pull request #10045 from frederic34/patch-2
GETPOSTISSET has only one parameter
2018-11-20 13:43:41 +01:00
Laurent Destailleur
8ecd5ffa3b FIX Missing button cancel 2018-11-20 13:41:38 +01:00
Laurent Destailleur
be4dc40dfa Fix standardize date format for payment between customer and supplier 2018-11-20 10:16:54 +01:00
Laurent Destailleur
4845e90d95 Fix update of hours for payment 2018-11-20 10:03:38 +01:00
Laurent Destailleur
4bf5a12f35 Fix trans 2018-11-20 09:56:03 +01:00
Frédéric FRANCE
2e4ec1ed10
Update fournisseur.commande.class.php 2018-11-19 23:56:20 +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
Frédéric FRANCE
8f17ae8df5
GETPOSTISSET has only one parameter 2018-11-19 20:28:55 +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
20dbbaf5cc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:04 +01:00
Laurent Destailleur
fb6aa01207 FIX #10030 better german chart 2018-11-19 20:04:31 +01:00
JC Prieto
deff4ca4a0
Update list.php
Missing the following lines to search total_ttc
2018-11-19 20:03:36 +01:00
Laurent Destailleur
839428d545 Missing trans 2018-11-19 19:02:00 +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
e2269796e2
Merge branch 'develop' into swiftmailer 2018-11-19 18:23:55 +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
7a3f088fcb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:19:11 +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
c0dac69116
Merge pull request #10031 from aspangaro/9.0_style
Fix Page Salaries stats - Look & feel  v9
2018-11-19 18:14:35 +01:00
Laurent Destailleur
4bedeabc5b FIX #10036 2018-11-19 18:02:29 +01:00
Laurent Destailleur
1b09179df7
Merge pull request #10035 from frederic34/patch-15
typo
2018-11-19 17:44:20 +01:00
Laurent Destailleur
828f79bbd5
Merge pull request #10023 from hregis/develop_bug2
FIX more simple
2018-11-19 17:44:05 +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
8d4db1d085 Fix phpcs 2018-11-19 16:35:37 +01:00
Laurent Destailleur
77ed591648 Fix phpcs 2018-11-19 16:05:27 +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
Laurent Destailleur
2d09008610 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 15:55:59 +01:00
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/comm/propal/card.php
2018-11-19 15:55:41 +01:00
Laurent Destailleur
8a5add6a98 Fix phpcs 2018-11-19 15:53:09 +01:00
Laurent Destailleur
50e20b2ac0 Fix phpcs 2018-11-19 15:52:46 +01:00
Laurent Destailleur
a3398f1a8d Sync transifex 2018-11-19 15:49:58 +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
2947dcfc8d Sanitize message 2018-11-19 15:36:12 +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
florian HENRY
dc2f1e9812 fix list agenda extrafield visibility 2018-11-19 11:25:48 +01:00
Laurent Destailleur
824b1924e2 Fix loading of cronjob 2018-11-19 10:33:42 +01:00
Laurent Destailleur
2480a8dc2a Ignore 2018-11-18 15:57:20 +01:00
Laurent Destailleur
22b2af6911 Exclude dir 2018-11-18 15:46:37 +01:00
Laurent Destailleur
a179d45afd Remove deprecated translation keys 2018-11-17 23:40:10 +01:00
Laurent Destailleur
1cce95cb23 Trans 2018-11-17 23:35:49 +01:00
Laurent Destailleur
13d00b2eb1 Sync transifex 2018-11-17 23:14:12 +01:00
Laurent Destailleur
7f33403d43 Fix translation 2018-11-17 22:55:13 +01:00
Frédéric FRANCE
0ba388de5d
typo 2018-11-17 18:03:59 +01:00
Frédéric FRANCE
30b1db34cd
Update CMailFile.class.php 2018-11-17 11:33:01 +01:00
Alexandre SPANGARO
4e39065e29 Fix Page Salaries stats - Look & feel v9 2018-11-17 07:37:32 +01:00
Laurent Destailleur
a2c9fefee0 Fix do not show tool to check european vat if country is not in EEC 2018-11-17 00:40:39 +01:00
Laurent Destailleur
6b8a3094f0 Fix missing some keys in substitution arrays 2018-11-17 00:14:23 +01:00
Laurent Destailleur
028be21070 Debug 2018-11-16 16:55:53 +01:00
Laurent Destailleur
5d596fe584 Fix trackid must contains an id of instance 2018-11-16 16:43:13 +01:00
Laurent Destailleur
3b193a8a7b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-16 14:13:18 +01:00
Laurent Destailleur
f32706259a Sync transifex 2018-11-16 14:13:00 +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
532ce34c53
i put the sword under the carpet 2018-11-15 21:36:20 +01:00
Frédéric FRANCE
7c241620c0
replace random_bytes 2018-11-15 21:20:09 +01:00
Frédéric FRANCE
482c6efdd9
replace php > 5.4 code 2018-11-15 20:35:40 +01:00
Frédéric FRANCE
caa080f103
replace php > 5.4 code 2018-11-15 20:32:51 +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
ffc9b02322 FIX missing one column 2018-11-15 18:28:12 +01:00
Regis Houssin
38b4b719f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug2 2018-11-15 18:27:50 +01:00
Regis Houssin
03acd7a40c FIX travis error again 2018-11-15 18:24:32 +01:00
Laurent Destailleur
e58dd3c0b1
Merge pull request #10024 from hregis/develop_bug
FIX travis errors
2018-11-15 18:21:25 +01:00
Laurent Destailleur
7d5c9959bc Close #9978
Better way to address the feature. Work in most cases, need less code
and less sql access.
2018-11-15 18:20:38 +01:00
Regis Houssin
531b6e8d2b FIX travis errors 2018-11-15 18:13:07 +01:00
Laurent Destailleur
103dfe2aa7 FIX go back to create form if error 2018-11-15 17:55:27 +01:00
Regis Houssin
2d2e836965 FIX more simple 2018-11-15 17:45:33 +01:00
Laurent Destailleur
b51004e809 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:34:36 +01:00
Laurent Destailleur
2d6f7f926c FIX xss injection on user address 2018-11-15 17:34:11 +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
6297e03ea9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:16:12 +01:00
Laurent Destailleur
4fa694569e
Merge pull request #10018 from Tetras-Libre/develop
Fix issue #9956 User can edit some of their data without permissons
2018-11-15 16:56:57 +01:00
Laurent Destailleur
8a97ba4ba9
Update card.php 2018-11-15 16:56:12 +01:00
Laurent Destailleur
ff0a5d9fe1
Merge pull request #10016 from WSoptics/wsoptics-8.0
FIX: sql errors
2018-11-15 16:47:52 +01:00
Laurent Destailleur
6ffd63c965
Update projectstats.class.php 2018-11-15 16:47:40 +01:00
Laurent Destailleur
f2bbb54b8f
Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist
FIX : filter on product category doesn't work
2018-11-15 16:44:40 +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
d20bb41cde
Merge pull request #10017 from hregis/8.0_bug
FIX avoid error if $object->fk_account =< 0 for getNomUrl
2018-11-15 16:43:00 +01:00
Laurent Destailleur
b0d1174600
Merge pull request #10020 from mwelters/develop
for Denmark: forme_jurisdisque additions
2018-11-15 16:39:32 +01:00
Laurent Destailleur
8bfcbc8f9d
Merge pull request #10015 from frederic34/patch-9
doc bookkeeping class
2018-11-15 16:28:42 +01:00
Laurent Destailleur
f2fba05475
Merge branch 'develop' into new_branch_13_11_2018 2018-11-15 16:23:54 +01:00
Laurent Destailleur
c04fcf170b Work on emailcollector 2018-11-15 16:23:07 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
markus
ac0f46f9e5 for Denmark: forme_jurisdisque additions 2018-11-15 11:10:54 +01:00
Laurent Destailleur
3ca45e0e40 Fix double dot in sql filename 2018-11-15 10:59:55 +01:00
Regis Houssin
6f90516f57 FIX check write permission for multicurrency 2018-11-15 09:40:08 +01:00
Frédéric FRANCE
92cda2a75c
fix cant use method return value 2018-11-14 23:29:24 +01:00
Frédéric FRANCE
b13ad8170f
correctly check intl extension 2018-11-14 22:42:09 +01:00
Frédéric FRANCE
1c15d249b3
replace specific php7 code 2018-11-14 22:05:21 +01:00
Laurent Destailleur
e94b545cb6 Fix field not required 2018-11-14 18:38:09 +01:00
David Beniamine
01947288fb
Fix issue #9956 User can edit some of their data without permissons 2018-11-14 18:29:15 +01:00
Regis Houssin
bcc83408e0 FIX avoid error if $object->fk_account =< 0 for getNomUrl 2018-11-14 18:10:41 +01:00
Regis Houssin
976094043b FIX missing GETPOST('entity') 2018-11-14 17:34:27 +01:00
Regis Houssin
0907a6d611 FIX wrong object name (travis error) 2018-11-14 16:55:14 +01:00
Regis Houssin
0592e8a31c FIX config is override by multicompany module 2018-11-14 16:44:10 +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
Regis Houssin
3294fada3d FIX working on invoice sharing (multicompany) 2018-11-14 14:59:36 +01:00
Laurent Destailleur
1f6ccd4a66 Fix permission to edit websites 2018-11-14 13:58:00 +01:00
Laurent Destailleur
a7989eb893 Fix menu 2018-11-14 13:55:10 +01:00
Laurent Destailleur
df2aa2e2f6 Fix column balance 2018-11-14 13:52:43 +01:00
Laurent Destailleur
ba22ae45e7 Fix column balance 2018-11-14 13:45:20 +01:00
Laurent Destailleur
0201939ebe Fix column balance 2018-11-14 13:43:39 +01:00
Laurent Destailleur
7aa042172e Fix sql error 2018-11-14 13:06:40 +01:00
Frédéric FRANCE
4909e3afc4
doc bookkeeping class 2018-11-14 08:28:20 +01:00
Regis Houssin
04edcaa89c FIX compatibility between proposal sharing and proposalnumber sharing 2018-11-13 20:20:46 +01:00
gauthier
85dd0ec2dd FIX : filter on product category doesn't work 2018-11-13 15:24:53 +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
Philippe GRAND
35c43683b6 fix Erreur DB_ERROR_SYNTAX 2018-11-13 09:45:47 +01:00
Laurent Destailleur
723654efea Fix phpcs 2018-11-12 17:15:03 +01:00
Laurent Destailleur
628918f863 Remove var_dump 2018-11-12 16:43:33 +01:00
Tobias Elbert
fceaae7a8d fixed sql query error 2018-11-12 16:22:42 +01:00
Tobias Elbert
ceae6ac376 fixed sql query error 2018-11-12 16:21:20 +01:00
gauthier
f404cae546 FIX : Same on customer card 2018-11-12 16:04:42 +01:00
gauthier
66ea8bbe87 FIX : fourn payment modes musn't be available on customer docs 2018-11-12 15:58:41 +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
Laurent Destailleur
5a7cb95b72 FIX filter on entity must be done as soon as we don't search on rowid. 2018-11-12 14:49:08 +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
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +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
Laurent Destailleur
cda88f4df9
Merge pull request #9993 from ptibogxiv/patch-90
Fix Invalid argument supplied for foreach()
2018-11-11 17:29:32 +01:00
Laurent Destailleur
4f7d3e794a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47 FIX #9992 2018-11-11 17:28:17 +01:00
Laurent Destailleur
65d8f59321
Merge pull request #9992 from delcroip/patch-18
to support proposal_supplier insert
2018-11-11 17:27:23 +01:00
Laurent Destailleur
2985d9cfbf
Update 8.0.0-9.0.0.sql 2018-11-11 17:27:16 +01:00
Laurent Destailleur
f39b99b153
Merge pull request #9933 from ptibogxiv/patch-83
Update Stripe Version API
2018-11-11 17:25:49 +01:00
Laurent Destailleur
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Laurent Destailleur
0b57faa7b4 Fix help 2018-11-11 14:42:11 +01:00
Laurent Destailleur
de259e9db6 Code comment 2018-11-11 14:36:35 +01:00
Laurent Destailleur
ad7ae76cd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:51:49 +01:00
ptibogxiv
80782a366e
Fix Invalid argument supplied for foreach() 2018-11-10 15:04:38 +01:00
Laurent Destailleur
6591cdba75 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:03:34 +01:00
ptibogxiv
5c96689c87
Fix Invalid argument supplied for foreach() 2018-11-10 15:02:50 +01:00
delcroix Patrick
52f35d8038
to support proposal_supplier insert
proposal_supplier has 17 char when the elementtype column can take only 16 char
2018-11-10 14:59:46 +01:00
Laurent Destailleur
ed3a333436 Fix phpcs 2018-11-10 13:11:18 +01:00
Laurent Destailleur
776d5e6fc6
Merge pull request #9988 from frederic34/patch-15
The variable $i seems to be never defined.
2018-11-10 12:20:09 +01:00
Laurent Destailleur
5ec602cafa
Merge pull request #9983 from hregis/8.0_bug
FIX missing field "visible"
2018-11-10 12:19:35 +01:00
Laurent Destailleur
2946ca60cf
Merge pull request #9989 from frederic34/patch-16
Update actions_ticket.class.php
2018-11-10 12:18:37 +01:00
Laurent Destailleur
bd78ea1ccf
Merge pull request #9987 from frederic34/dkim
add admin dkim translation
2018-11-10 12:16:43 +01:00
Laurent Destailleur
bae1ff67a4
Merge pull request #9986 from frederic34/patch-9
remove warning
2018-11-10 12:16:10 +01:00
ptibogxiv
20a3dd86cd
2018-11-08
no change for dolibarr but better for integration and development
2018-11-10 11:07:01 +01:00
Frédéric FRANCE
20acf440a3
Update api_products.class.php 2018-11-10 07:55:01 +01:00
Frédéric FRANCE
c2ee9ba9db
Update actions_ticket.class.php 2018-11-10 07:38:55 +01:00
Frédéric FRANCE
2514cf4a96
Update actions_ticket.class.php 2018-11-10 07:32:22 +01:00
Frédéric FRANCE
b271e1a3b0
The variable $i seems to be never defined. 2018-11-10 07:27:20 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Laurent Destailleur
f1287578f3 Work on emailcollector 2018-11-09 18:18:17 +01:00
Frédéric FRANCE
172468587d
Update mymodulewidget1.php 2018-11-09 18:13:13 +01:00
Frédéric FRANCE
6cd27d8c80
add admin dkim translation 2018-11-09 18:08:06 +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
Frédéric FRANCE
1fd398234f
remove warning 2018-11-09 15:29:49 +01:00
Laurent Destailleur
773e2da4cc Fix example of number for holiday 2018-11-09 11:41:27 +01:00
Regis Houssin
ee06f36f4c FIX missing field "visible" 2018-11-09 11:36:20 +01:00
Regis Houssin
5d1d77a966 FIX missing action "edit" for the hook 2018-11-09 10:32:08 +01:00
Laurent Destailleur
f1193ad3dd FIX: Missing date creation and modification of supplier price 2018-11-09 10:29:22 +01:00
Laurent Destailleur
4946de9533 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/setup/codesniffer/ruleset.xml
2018-11-09 01:32:47 +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
8a89da25c6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/margin/tabs/thirdpartyMargins.php
2018-11-08 20:18:13 +01:00
Laurent Destailleur
400b48bd9b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:59 +01:00
Laurent Destailleur
9012f6ecc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:40 +01:00
Laurent Destailleur
1b8649be6f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 20:14:02 +01:00
Laurent Destailleur
d6bd325f70
Merge pull request #9980 from atm-john/fix_supplier_order_list_socid
FIX supplier order list keep socid
2018-11-08 20:13:52 +01:00
Laurent Destailleur
b26867c027
Merge pull request #9977 from ptibogxiv/patch-89
FIX API for document download
2018-11-08 20:09:08 +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
f919e6ddb0
Merge pull request #9971 from atm-gauthier/FIX_langs_projet
FIX : OppStatusShort doesn't exists
2018-11-08 20:00:49 +01:00
Laurent Destailleur
76ac3bd457 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 19:57:42 +01:00
Laurent Destailleur
be788e6167 FIX responsive 2018-11-08 19:57:31 +01:00
Laurent Destailleur
b45ead7038
Merge pull request #9970 from OPEN-DSI/search-contact-by-town
New Search Contact by Town
2018-11-08 19:55:51 +01:00
Laurent Destailleur
50bd8bc4ce
Merge pull request #9969 from grandoc/new_branch_07_11_2018
fix : missing translation
2018-11-08 19:55:25 +01:00
Laurent Destailleur
7430a35533
Merge pull request #9966 from madx666/contrib
Fix public ticket website
2018-11-08 19:54:36 +01:00
Laurent Destailleur
e84e7f02c8
Merge pull request #9963 from atm-john/fix_marge_sign
FIX marge sign
2018-11-08 19:37:52 +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
d1aabf9566
Merge pull request #9976 from atm-john/fix_warning
FIX Warning: count()
2018-11-08 19:25:32 +01:00
Laurent Destailleur
b6ffca01d2
Merge pull request #9973 from AXeL-dev/patch-2
remove useless line of code
2018-11-08 19:25:00 +01:00
Laurent Destailleur
ed76fef860
Merge pull request #9954 from LaurentBouquet/feature/product-search-barcode
NEW Add product search from barcode via REST api.
2018-11-08 19:18:41 +01:00
Laurent Destailleur
5e705ae209
Merge pull request #9950 from grandoc/new_branch_04_11_2018
Clean and update code
2018-11-08 19:16:25 +01:00
Laurent Destailleur
78778e4c58
Merge pull request #9948 from frederic34/patch-9
FIX mode is only customer in stats fichinter
2018-11-08 19:16:00 +01:00
Laurent Destailleur
a50eb014ee
Merge pull request #9946 from ptibogxiv/patch-88
Fix with new stripe payment function
2018-11-08 19:13:38 +01:00
Laurent Destailleur
588de2cc86 Fix filter on entity on project 2018-11-08 18:45:02 +01:00
Laurent Destailleur
27dcf18637 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 18:43:31 +01:00
ptibogxiv
cf688a894b
Update api_documents.class.php 2018-11-08 17:20:12 +01:00
Laurent Destailleur
e92a63ba73 FIX If we change customer/supplier rule we can't edit old thirdparty. 2018-11-08 17:15:35 +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
6401a7ab06 Fix css 2018-11-08 16:03:10 +01:00
John BOTELLA
98548337ae FIX supplier order list keep socid 2018-11-08 15:38:25 +01:00
ptibogxiv
8727435216
Update API for download
more infos for easiest & better use of the generated file by API
2018-11-08 13:58:37 +01:00
Frédéric FRANCE
8bb1545ed0
Update index.php 2018-11-08 12:16:05 +01:00
Frédéric FRANCE
670eed1e68
Update index.php 2018-11-08 12:13:07 +01:00
John BOTELLA
7c4dad2728 FIX Warning: count() 2018-11-08 12:12:45 +01:00
Laurent Destailleur
224d37cfeb Add bootstrap-iso class 2018-11-08 12:12:08 +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
AXeL-dev
9dbb222a0a remove useless line of code 2018-11-07 18:27:41 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +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
gauthier
70826c3191 FIX : same on lines 2018-11-07 16:32:23 +01:00
gauthier
05a679a10c FIX : OppStatusShort doesn't exists 2018-11-07 16:26:25 +01:00
François J
afdefa56bd New Search Contact by Town
Adding the missing SQL condition to filter contact list by user requested town
2018-11-07 15:34:07 +01:00
Philippe GRAND
f6394e4210 fix : error 500 2018-11-07 15:07:57 +01:00
Philippe GRAND
671b4dc227 fix : missing translation 2018-11-07 14:01:49 +01:00
Laurent Destailleur
46db246273 Look and feel v9: Autofocus on create forms 2018-11-07 13:04:43 +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
Laurent Destailleur
c5231112c5 Fix regression with old canvas 2018-11-07 12:22:12 +01:00
John BOTELLA
9d780a1722 Fix sign 2018-11-07 10:11:29 +01:00
madx666
2ff69bb3fc Fix viewTicketMessages for ticket module 2018-11-07 10:11:28 +01:00
madx666
c76c2e0d3e Fix newMessagePublic for ticket module 2018-11-07 10:08:38 +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