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
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
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
Alexandre SPANGARO
cf0c4a5ce0
Add in public area
2018-11-18 22:03:32 +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
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
Frédéric FRANCE
35142ac2fb
wip
2018-11-16 17:58:14 +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
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
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
2350908d4e
FIX change getEntity doc and changelog
2018-11-15 19:00:14 +01:00
Regis Houssin
a0709895c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-15 18:55:48 +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
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
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
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
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
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
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
delcroix Patrick
4b0d3ad6c6
Update llx_projet_task_time.sql
2018-11-10 14:31:28 +01:00
delcroix Patrick
34787dc1d7
Update 5.0.0-6.0.0.sql
2018-11-10 14:31:27 +01:00
delcroip
e0bae07f97
NEW:Invoice creation from task Time
2018-11-10 14:31:26 +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
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +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
François J
7c2256a4a7
Fix X-Dolibarr-TRACKID header: set to 'conXXX' where XXX is contact ID.
2018-11-09 09:33:27 +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
abb6b41f91
Fix screen size fall
2018-11-07 11:25:13 +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
Laurent Destailleur
7dd941dd51
Fix bad fix
2018-11-06 19:51:16 +01:00
Laurent Destailleur
c4db549f94
Work on emailcollector
2018-11-06 19:49:52 +01:00
Laurent Destailleur
a976dd74db
Fix Report error if file size too large
2018-11-06 18:44:51 +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
François J
2dd69c3735
Hide buttons when action is presend email
2018-11-06 16:51:48 +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
François J
f9a8b240ac
Add PredefinedMailContentContact lang string
2018-11-06 15:05:03 +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 Bouquet
cb10da4d41
[Core] Add product search from barcode via REST api
2018-11-05 23:06:19 +01:00
Laurent Bouquet
0f43521274
Fix syntax error in 'htdocs\accountancy\admin\export.php' : Delete 'aZ09' text in line 45
2018-11-05 22:52:57 +01:00
Laurent Destailleur
15dd2b3e35
Work on email collector
2018-11-05 21:19:09 +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
dd70f1bf08
Debug emailcollector
2018-11-05 16:59:40 +01:00
Laurent Destailleur
eb9defcf1d
Debug emailcollector
2018-11-05 16:42:29 +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
f0305a7beb
Prepare 8.0.4
2018-11-05 13:50:12 +01:00
Laurent Destailleur
9556a6dfb9
Remove warning
2018-11-05 12:31:35 +01:00
Laurent Destailleur
c988e2e681
Fix phpcs
2018-11-05 10:44:37 +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
693cf72fca
Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access
...
FIX: task time screen: bad task assignments
2018-11-05 10:21:28 +01:00
Laurent Destailleur
01d7b1e96a
Fix readme detection
2018-11-05 10:15:22 +01:00
Laurent Destailleur
0c7f33e1ba
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-05 09:56:57 +01:00
Laurent Destailleur
e1e0001fda
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-05 09:56:00 +01:00
Laurent Destailleur
a9bbb82e98
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:55:12 +01:00
Laurent Destailleur
bf2c521988
Fix warning
2018-11-05 09:55:00 +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
ccf6554f76
Merge pull request #9941 from ptibogxiv/patch-87
...
Fix various fix cmail, payout, const, connect
2018-11-05 09:38:41 +01:00
Laurent Destailleur
6fd76f5ffb
Merge pull request #9939 from ptibogxiv/patch-86
...
Fix ext_payment_site
2018-11-05 09:37:45 +01:00
Laurent Destailleur
6b89bc4ecc
Merge pull request #9937 from aspangaro/9.0_FEC
...
Debug asset module
2018-11-05 09:36:42 +01:00
Laurent Destailleur
8b373fb7a3
Merge pull request #9935 from atm-maxime/fix_socdelete_unlink_parent
...
Fix parent link was not removed on societe deletion #9106
2018-11-05 09:35:41 +01:00
Laurent Destailleur
ce25c6644f
Merge pull request #9952 from andreubisquerra/master
...
No posibility to validate if invoice not exist
2018-11-05 09:27:12 +01:00
Laurent Destailleur
98a3af620b
FIX #9934
2018-11-05 09:26:23 +01:00
Laurent Destailleur
4e0dbc1826
Merge pull request #9932 from grandoc/new_branch_01_11_2018
...
complete comment
2018-11-05 09:20:00 +01:00
Laurent Destailleur
58b7201529
Merge pull request #9931 from aspangaro/9.0_accountancy
...
Fix Specific finename for FEC export only available on general ledger export
2018-11-05 09:19:42 +01:00
Laurent Destailleur
234c35e940
Merge pull request #9930 from frederic34/fixphpcs
...
fix phpcs
2018-11-05 09:18:34 +01:00
Laurent Destailleur
d130e79384
Merge pull request #9936 from ptibogxiv/patch-84
...
Fix payout
2018-11-05 09:17:18 +01:00
andreubisquerra
86b98db2a2
No posibility to validate if invoice not exist
2018-11-04 20:36:23 +01:00
Philippe GRAND
eb49558600
Clean and update code
2018-11-04 12:09:16 +01:00
Frédéric FRANCE
488ac8c8f0
Update index.php
2018-11-03 23:44:25 +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
Frédéric FRANCE
c01113e28b
typo
2018-11-03 22:49:30 +01:00
Laurent Destailleur
f4346c1469
Fix css
2018-11-03 19:24:28 +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
c4bf0f0e03
CSS Flex
2018-11-03 18:57:18 +01:00
Frédéric FRANCE
d6b909a280
Update index.php
2018-11-03 18:26:11 +01:00
Frédéric FRANCE
8ab53012b7
mode is only customer in stats fichinter
2018-11-03 18:20:36 +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
Laurent Destailleur
28d5f1d50b
Fix sql syntax error
2018-11-03 11:30:32 +01:00
Abbes Bahfir
5f4d644cab
New : help picto for fields in creation
2018-11-03 11:12:50 +01:00
ptibogxiv
171d36d4fc
Update payment.php
2018-11-02 17:49:11 +01:00
ptibogxiv
ab53885ef8
Fix with new stripe payment function
2018-11-02 17:22:42 +01:00
ptibogxiv
d5a910841f
Fix various fix cmail, payout, const, connect
2018-11-01 23:20:28 +01:00
ptibogxiv
b34f781686
Fix ext_payment_site
2018-11-01 23:04:10 +01:00
Alexandre SPANGARO
8d8023b405
Debug asset module
2018-11-01 22:32:33 +01:00
ptibogxiv
263e8ed4af
Fix payout
2018-11-01 20:45:08 +01:00
Maxime Kohlhaas
29c0448a2e
Fix parent link was not removed on societe deletion #9106
2018-11-01 15:41:58 +01:00
Maxime Kohlhaas
d1133916e0
Fix tracking field in dictionnary should not be mandatory
2018-11-01 15:33:14 +01:00
Laurent Destailleur
1140735554
Fix css
2018-11-01 15:20:05 +01:00
ptibogxiv
a46f29cb98
Update Stripe Version API
...
The description field on customer endpoints has a maximum character length limit of 350 now. The name field on product endpoints has a maximum character length limit of 250 now. The description field on invoice line items has a maximum character length limit of 500 now.
The billing_reason attribute of the invoice object now can take the value of subscription_create, indicating that it is the first invoice of a subscription. For older API versions, billing_reason=subscription_create is represented as subscription_update.
2018-11-01 12:02:36 +01:00
Philippe GRAND
b7f5e9e6c7
complete comment
2018-11-01 11:50:55 +01:00
Alexandre SPANGARO
af1305a0a8
Fix Specific finename for FEC export only available on general ledger export
2018-11-01 07:24:48 +01:00
Frédéric FRANCE
aa8236dd98
fix phpcs
2018-10-31 21:33:37 +01:00
Laurent Destailleur
970f501147
Debug modulebuilder
2018-10-31 20:10:20 +01:00
Laurent Destailleur
e4cfc2c6cb
Fix public
2018-10-31 17:30:08 +01:00
Laurent Destailleur
dfb20c705e
NEW Add hidden option EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE
2018-10-31 16:05:50 +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
c9ef298839
Fix setup template emails
2018-10-31 11:38:04 +01:00
Philippe GRAND
fe6b185bf1
Typo
2018-10-31 10:32:40 +01:00
Laurent Destailleur
ea5b0f53d0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-30 22:32:54 +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
Laurent Destailleur
a44fbfb2e9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 21:30:57 +01:00
Laurent Destailleur
3d16b05fdb
Fix fetch
2018-10-30 21:30:44 +01:00
Frédéric FRANCE
46fd3bcaf8
fix display holiday month report if none
2018-10-30 21:15:52 +01:00
Laurent Destailleur
064417dcf1
Merge pull request #9889 from atm-maxime/fix_invoice_from_contract2
...
Fix invoice creation from contract was invoicing closed services #9087
2018-10-30 21:13:38 +01:00
Frédéric FRANCE
395e9ceae2
fix stats display expensereport
2018-10-30 20:36:12 +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
Laurent Destailleur
f845a52b20
Fix phpcs
2018-10-30 16:37:50 +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
ecdecfcbce
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-30 15:28:23 +01:00
Laurent Destailleur
2b526f7469
Fix phpcs
2018-10-30 15:28:11 +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
4dca94480e
Merge pull request #9892 from atm-maxime/fix_supp_inv_clone
...
Fix invoice supplier clone was not getting all lines parameters #9800
2018-10-30 14:59:48 +01:00
Laurent Destailleur
cb2a5baa45
Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice
...
Fix clone fourn order and invoice lines special code
2018-10-30 14:55:50 +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
a231932972
Merge pull request #9904 from atm-maxime/fix_replenish_qtymin
...
FIX replenish wasn't caring about supplier price min quantity #9561
2018-10-30 14:25:55 +01:00
Laurent Destailleur
0f850cfa3e
Merge pull request #9901 from frederic34/patch-22
...
use strict compare
2018-10-30 14:23:40 +01:00
Laurent Destailleur
76c3bac777
Merge pull request #9900 from frederic34/patch-21
...
use strict compare
2018-10-30 14:23:14 +01:00
Laurent Destailleur
a16e7a84e9
Merge pull request #9899 from frederic34/patch-20
...
use strict compare
2018-10-30 14:23:01 +01:00
Laurent Destailleur
6c9f02e9c6
Merge pull request #9898 from frederic34/patch-18
...
use strict compare
2018-10-30 14:22:19 +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
8ce035fc36
Merge pull request #9894 from librethic-code/patch-1
...
FIX: keep external module element when adding resource
2018-10-30 14:06:38 +01:00
Laurent Destailleur
40cc2157ae
Merge pull request #9902 from frederic34/patch-24
...
use strict compare
2018-10-30 13:58:06 +01:00
Laurent Destailleur
b4c9df65f9
FIX #9907 Can set several modules on ->depends
2018-10-30 13:56:51 +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
0127682996
Merge pull request #9881 from grandoc/8.0
...
merging and typo
2018-10-30 12:41:56 +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
Laurent Destailleur
4d0cc0a03d
Merge pull request #9895 from hregis/develop_bug2
...
FIX remove deprecated and unused file
2018-10-30 12:32:20 +01:00
Laurent Destailleur
06bffeeca5
Merge pull request #9910 from atm-ph/fix_8.0_pgsql
...
Fix pgsql : operator does not exist: timestamp without time zone ~~ u…
2018-10-30 12:31:04 +01:00
Laurent Destailleur
a8e6c3832e
Update list.php
2018-10-30 12:30:56 +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
d938711e1e
Merge pull request #9883 from frederic34/patch-9
...
fix phpcs
2018-10-30 12:27:37 +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
7f1776c3a1
Merge pull request #9903 from atm-maxime/fix_loan_accounting
...
FIX default accounting accounts on loan creation #9643
2018-10-30 12:21:25 +01:00
Laurent Destailleur
9e849011e3
Merge pull request #9887 from frederic34/patch-16
...
code comment api contract
2018-10-30 12:20:42 +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
John BOTELLA
1e819ca7c1
FIX special code on create supplier invoice from supplier order
2018-10-30 10:46:33 +01:00
John BOTELLA
ca47d1b8b1
Fix clone fourn order and invoice lines special code
2018-10-30 10:26:59 +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
8fbf5b1f33
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:28:19 +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
d02fccd7e4
Fix deletion of draft invoice
2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6
Fix perm to delete
2018-10-29 14:47:33 +01:00
Laurent Destailleur
27d82d0e8e
FIX Delete of draft invoice
2018-10-29 14:41:00 +01:00
Laurent Destailleur
85b8c9f219
FIX Delete of draft invoice
2018-10-29 14:35:42 +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
d8bf635530
Prepare module
2018-10-29 11:21:57 +01:00
Regis Houssin
9e3800d7fd
FIX missing entity filter for stock
2018-10-29 11:14:05 +01:00
atm-ph
c83e67123d
Fix pgsql : operator does not exist: timestamp without time zone ~~ unknown
2018-10-29 11:04:16 +01:00
Regis Houssin
31497e867f
FIX missing entity filter
2018-10-29 11:01:02 +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
Laurent Destailleur
4611b96da8
Fix phpcs
2018-10-28 20:18:09 +01:00
Laurent Destailleur
af9b8f033a
Click to refresh
2018-10-28 17:23:42 +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
Maxime Kohlhaas
46d3bec104
Fix replenish wasn't caring about supplier price min quantity #9561
2018-10-28 10:25:56 +01:00
Regis Houssin
28360f6710
FIX add to migrate_delete_old_files
2018-10-28 09:41:11 +01:00
Maxime Kohlhaas
2fe4763570
Fix default accounting accounts on loan creation #9643
2018-10-28 09:22:55 +01:00
Frédéric FRANCE
fa48a442d6
use strict compare
2018-10-27 21:21:59 +02:00
Frédéric FRANCE
5ad03fcd35
use strict compare
2018-10-27 21:19:19 +02:00
Frédéric FRANCE
d7507ac858
use strict compare
2018-10-27 21:00:59 +02:00
Frédéric FRANCE
84219039a2
use strict compare
2018-10-27 20:57:59 +02:00
Frédéric FRANCE
e1625990f2
use strict compare
2018-10-27 20:54:53 +02: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
Frédéric FRANCE
fe5056add8
remove fieldlabel and add fieldeditkey
2018-10-27 18:07:05 +02:00
Frédéric FRANCE
42a9abad56
remove fieldlabel and add fieldeditkey
2018-10-27 17:45:29 +02:00
Frédéric FRANCE
546a353e58
remove fieldlabel and add fieldeditkey
2018-10-27 15:16:01 +02:00
Frédéric FRANCE
c92a2084f1
remove fieldlabel and add fieldeditkey
2018-10-27 14:50:27 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Regis Houssin
1c63d3a01d
FIX remove deprecated and unused file
2018-10-27 14:26:23 +02:00
Frédéric FRANCE
9c7ec434b7
remove fieldlabel and add fieldeditkey
2018-10-27 13:48:30 +02:00
Frédéric FRANCE
d67c40dffe
remove fieldlabel and add fieldeditkey
2018-10-27 13:01:01 +02:00
Librethic
fcd687642c
FIX: keep external module element when adding resource
...
When adding object from external module as a resource we need to keep @modulename as defined into url rather than use `element` property (which do not contain @modulename).
2018-10-27 11:46: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
4ec80b5136
Fix invoice supplier clone was not getting all lines parameters #9800
2018-10-27 10:53:01 +02:00
Frédéric FRANCE
a30091fd74
Update commande.class.php
2018-10-27 09:51:19 +02:00
Maxime Kohlhaas
abb343d37e
Fix missing name alias field in societe import/export #9091
2018-10-27 09:42:08 +02:00
Maxime Kohlhaas
1b054f1b36
Fix invoice creation from contract was invoicing closed services #9087
2018-10-27 09:21:49 +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
Laurent Destailleur
461bd76f70
Fix customer and supplier code name
...
Fix bill time flag must be visible only if option on
2018-10-26 23:27:29 +02:00
Frédéric FRANCE
dbbcb6f8a1
code comment api contract
2018-10-26 22:30:48 +02: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
622f31fd1e
Fix ref
2018-10-26 19:01:42 +02:00
Laurent Destailleur
d3893b8b95
Debug v9
2018-10-26 19:00:24 +02:00
Frédéric FRANCE
35ab3c9aad
Update holiday.php
2018-10-26 18:24:04 +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
Laurent Destailleur
d800fe9256
FIX extrafields of taks not visible in creation
2018-10-26 16:21:01 +02:00
De Coninck Laurent
d347cf3a85
set a message
2018-10-26 16:18:27 +02:00
Laurent Destailleur
852b069785
Fix reponsive in stats pages
2018-10-26 15:46:17 +02:00
Philippe GRAND
f450e04856
Merge remote-tracking branch 'upstream/8.0' into 8.0
2018-10-26 15:38:15 +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
2f30381cde
Merge pull request #9876 from frederic34/patch-9
...
add string cast
2018-10-26 15:19:42 +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
daa9ff9ea5
Merge pull request #9879 from frederic34/patch-15
...
use strict compare with boolean
2018-10-26 15:18:36 +02:00
Laurent Destailleur
84bff545b8
Merge pull request #9873 from frederic34/expeditioncomment
...
code comment expedition class
2018-10-26 15:15:08 +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
Laurent Destailleur
0ba86d4e5b
Trans
2018-10-26 12:22:31 +02:00
Laurent Destailleur
cae83cd8e7
Add solution to translate
2018-10-26 11:10:04 +02:00
Frédéric FRANCE
52b7d60a0f
use strict compare with boolean
2018-10-26 08:11:27 +02:00
Frédéric FRANCE
21c441540c
add string cast
2018-10-25 21:57:19 +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
Frédéric FRANCE
eb0b0baf40
code comment expedition class
2018-10-25 21:36:01 +02:00
Laurent Destailleur
af18e1b043
FIX XSS
2018-10-25 19:38:45 +02:00
Laurent Destailleur
61ab507ba4
Fix navigation
2018-10-25 18:53:00 +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
094bcc519f
Fix show customer code only if customer in company tooltip
2018-10-25 17:25:36 +02:00
Laurent Destailleur
1ba716b82c
Fix do not allow use of second or third tax without using 1st one.
2018-10-25 14:39:54 +02:00
Laurent Destailleur
5daf095fc6
FIX Title and content of automatic email of expense report
2018-10-25 14:05:22 +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
Marc de Lima Lucio
16c35035c1
FIX: pdf typhon: order reference duplicate
2018-10-25 12:07:40 +02:00
atm-ph
f41e7e05e1
Fix PHP warnings printed in javascript
2018-10-25 12:01:17 +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
Laurent Destailleur
f44162715e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-24 13:31:04 +02:00
Laurent Destailleur
30a2004d53
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-24 13:30:54 +02:00
Laurent Destailleur
4785884457
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-24 13:30:16 +02:00
Laurent Destailleur
8eb1af2b40
Start beta
2018-10-24 13:29:59 +02:00
Laurent Destailleur
c9dca22df2
Merge pull request #9854 from atm-john/NEW_missing_payment_date_col
...
NEW Add due date column in payment lists
2018-10-24 12:27:59 +02:00
Laurent Destailleur
6edaf3a422
Merge branch 'develop' into patch-9
2018-10-24 12:24:00 +02:00
Laurent Destailleur
24f37c7bd7
CSS
2018-10-24 12:12:06 +02:00
Laurent Destailleur
36323752ed
Project must be on a dedicated field
2018-10-24 12:00:54 +02:00
Laurent Destailleur
c2c4366c62
Removed duplicate translation
2018-10-24 11:38:16 +02:00
Laurent Destailleur
6d86727c0b
Lang not loaded
2018-10-24 11:34:00 +02:00
Laurent Destailleur
2e0de15f95
Add public
2018-10-24 11:26:50 +02:00
Laurent Destailleur
f0743c55bb
Fix phpcs
2018-10-24 11:24:10 +02:00
Laurent Destailleur
1a4bb7ed12
FIX hover on line of movement list
2018-10-24 11:23:21 +02:00
Laurent Destailleur
aa0bcc6878
Fix phpcs
2018-10-24 11:15:14 +02:00
Laurent Destailleur
d0ab12ba6e
Fix not used var
2018-10-24 11:10:55 +02:00
John BOTELLA
fccea99e23
FIX translation in select unit form
2018-10-24 10:23:27 +02:00
gauthier
036f70860e
FIX : wrong occurence number of contract on contact card, we must only count externals
2018-10-24 10:17:21 +02:00
atm-quentin
200702a53c
FIX Display edit batch only if product handle it
2018-10-24 09:35:18 +02:00
John BOTELLA
a380d3e89b
Fix missing group by in query
2018-10-24 09:21:30 +02:00
Frédéric FRANCE
2bc208675f
Update pdf_cyan.modules.php
2018-10-24 09:06:54 +02:00
Frédéric FRANCE
d9d346aab2
Update pdf_sponge.modules.php
2018-10-24 08:22:17 +02:00
Frédéric FRANCE
4747e93e39
Update pdf_eratosthene.modules.php
2018-10-24 08:18:21 +02:00
Frédéric FRANCE
2a6478a2c4
fix phpcs
2018-10-24 08:15:00 +02:00
Laurent Destailleur
eaab953ba2
Renamed mouvement.php into movement_list.php to follow dev rules
2018-10-24 03:50:18 +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
2794439da5
Merge pull request #9839 from oas-services/7.0
...
NEW Compatibility with new Paybox HMAC requirement
2018-10-24 03:27:12 +02:00
Laurent Destailleur
1d80e16ad1
Merge pull request #9831 from frederic34/payment
...
payments
2018-10-24 03:25:01 +02:00
Laurent Destailleur
5c72a7630e
Merge pull request #9833 from IAS-SYSTEMS-CSC/develop
...
Fix : missing semicolon
2018-10-24 03:24:09 +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
612e3a9805
Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr
...
into aspangaro-9.0_accountancy
# Conflicts:
# htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
# htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
# htdocs/accountancy/class/lettering.class.php
2018-10-24 02:54:57 +02:00
Laurent Destailleur
769bae75e9
Update list.php
2018-10-24 02:48:38 +02:00
Laurent Destailleur
a9736c1eef
Merge pull request #9828 from frederic34/patch-15
...
code comment
2018-10-24 02:44:46 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
c266084db7
Merge pull request #9841 from laudeco/fix/9824_pdf_merge
...
FIX the pdf merge
2018-10-24 02:31:48 +02:00
Laurent Destailleur
4060dd5377
Merge pull request #9826 from frederic34/patch-9
...
Update ajax.lib.php
2018-10-24 02:29:20 +02:00
Laurent Destailleur
52364f0fd9
Merge pull request #9834 from frederic34/patch-19
...
missing semicolon in MD style css
2018-10-24 02:29:02 +02:00
Laurent Destailleur
2ba6f96765
Update style.css.php
2018-10-24 02:27:59 +02:00
Laurent Destailleur
5a7f2c7e33
Merge pull request #9832 from frederic34/patch-18
...
fix phpunit
2018-10-24 02:26:12 +02:00
Laurent Destailleur
92b5346a6c
Merge pull request #9840 from frederic34/patch-21
...
code comment categories class
2018-10-24 02:25:23 +02:00
Laurent Destailleur
6c3e1f6d26
Merge pull request #9842 from fappels/8.0
...
Deprecate class property expeditionbatch before removing it.
2018-10-24 02:25:02 +02:00
Laurent Destailleur
e39e57c5b9
Update expeditionbatch.class.php
2018-10-24 02:24:47 +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
Laurent Destailleur
4b4d422126
Merge pull request #9835 from frederic34/patch-20
...
Update ajaxdirtree.php
2018-10-24 02:21:19 +02:00
Laurent Destailleur
065d715d41
FIX #9837 - The fetchAllXXX was not managing correctly the limit
2018-10-24 02:20:07 +02:00
Laurent Destailleur
83dacf6290
Merge pull request #9845 from frederic34/patch-22
...
remove deprecated form_confirm
2018-10-24 02:06:54 +02:00
Laurent Destailleur
f10cb76597
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-24 02:00:56 +02:00
Laurent Destailleur
ae44c4c7f5
Disable duplicate feature with emailing module and field "unsubscribe
...
requested"
2018-10-24 02:00:43 +02:00
Laurent Destailleur
03b93781a0
Merge pull request #9848 from bafbes/abb80038
...
New : parameter for getnomurl in field specification
2018-10-24 01:53:19 +02:00
Laurent Destailleur
d5285ca359
Update commonobject.class.php
2018-10-24 01:53:07 +02:00
Laurent Destailleur
f8ea9e7099
Merge pull request #9857 from atm-john/add_combo_seach_by_fourn_ref
...
NEW hidden conf to search product by supplier ref
2018-10-24 01:48:17 +02:00
Laurent Destailleur
6161d8300c
Merge pull request #9850 from simnandez/develop
...
New: works with variants:
2018-10-24 01:47:39 +02:00
Laurent Destailleur
914e4f0501
Merge pull request #9855 from atm-john/Fix_printer
...
FIX/ADD missing print button for delivery form
2018-10-24 01:46:20 +02:00
Laurent Destailleur
c6cfb977bb
Merge pull request #9852 from atm-john/fix_develop_travis
...
Fix travis messages
2018-10-24 01:45:12 +02:00
Laurent Destailleur
54b0fa1057
Merge pull request #9846 from bafbes/abb80037
...
Fix:empty value instead of 0 for empty links
2018-10-24 01:43:37 +02:00
Laurent Destailleur
592bfafd51
Merge pull request #9829 from frederic34/patch-16
...
code comment
2018-10-24 01:42:41 +02:00
Laurent Destailleur
fe665a060d
Merge branch 'develop' into patch-17
2018-10-24 01:42:02 +02:00
Laurent Destailleur
23a9416c19
Fix deprecated field
2018-10-23 23:51:27 +02:00
atm-john
82f40fb4b9
NEW hidden conf to search by supplier ref
2018-10-23 23:21:30 +02:00
atm-john
0fe2c63bc0
FIX missing print button for delivery form
2018-10-23 22:11:39 +02:00
atm-john
bed5084bcf
Add missing Max payment date col
2018-10-23 21:44:45 +02:00
Laurent Destailleur
0ad991766c
Fix deletion of project when there is events
2018-10-23 17:53:01 +02:00
John BOTELLA
d9965d1986
Fix travis messages
2018-10-23 17:18:30 +02:00
Laurent Destailleur
c8aa884462
Fix search all
2018-10-23 17:16:46 +02:00
atm-quentin
04eb9ca167
fix dont change num version
2018-10-23 17:06:21 +02:00
atm-quentin
52236d1f0c
set to development module
2018-10-23 15:58:38 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
Juanjo Menent
bdf94a4802
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-23 13:08:18 +02:00
Juanjo Menent
e40ee879dc
New: works with variants:
...
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
2018-10-23 13:07:09 +02:00
Laurent Destailleur
e0b20c2632
Add holiday for India
2018-10-23 12:49:48 +02:00
Laurent Destailleur
b7d91c30d9
FIX missing symbol for indian rupies
2018-10-23 12:38:12 +02:00
Laurent Destailleur
7bb5e7c31f
Fix responsive
2018-10-23 11:52:21 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
atm-quentin
d01faeee89
FIX set ordered if no more validate reception
2018-10-23 09:22:13 +02:00
Abbes Bahfir
7e7473e7df
New : parameter for getnomurl in field dpecification
2018-10-23 01:25:38 +01:00
Abbes Bahfir
5bac6a92e6
Fix:empty value instead of 0 for empty links
2018-10-23 00:03:34 +01:00
Frédéric FRANCE
85a94ec577
Update view.php
2018-10-22 22:40:18 +02:00
Frédéric FRANCE
90b85c1106
Update html.form.class.php
2018-10-22 22:23:43 +02:00
Frédéric FRANCE
e49f2bc562
Update document_actions_post_headers.tpl.php
2018-10-22 22:20:26 +02:00
Frédéric FRANCE
4aec343b24
Update html.form.class.php
2018-10-22 22:13:54 +02:00
Frédéric FRANCE
38df6ac27b
remove deprecated form_confirm
2018-10-22 21:57:18 +02:00
Frédéric FRANCE
570ee200d8
Merge remote-tracking branch 'upstream/develop' into fixpdf
2018-10-22 20:19:28 +02:00
Laurent Destailleur
f65df9e541
NEW Add option PDF_DISABLE_MYCOMPANY_LOGO to disable logo on PDF
2018-10-22 20:06:03 +02:00
Laurent Destailleur
bf46a35a31
Fix size of key for extrafield of type select
2018-10-22 19:05:04 +02:00
atm-quentin
0a033f4cfd
FIX : manage error
2018-10-22 16:49:36 +02:00
atm-quentin
5b69357233
FIX keep search value while changing page
2018-10-22 16:08:43 +02:00
atm-quentin
7684d7bddd
FIX export comment better than desc of order line
2018-10-22 15:51:47 +02:00
root
dc6a30997c
add missing require
2018-10-22 15:47:42 +02:00
ATM-Nicolas
cf28e4e442
FIX : Variable name
2018-10-22 15:19:33 +02:00
root
0c61162698
fix langs workflow reception
2018-10-22 14:56:13 +02:00
root
39f34dd36b
fix script migrate table
2018-10-22 14:49:21 +02:00
atm-quentin
cfff4c7df8
NEW add ref supplier on supplier invoice
2018-10-22 14:32:50 +02:00
Alexandre SPANGARO
930dce7611
change class name from lettering to Lettering
2018-10-22 06:39:23 +02:00
Alexandre SPANGARO
3f79580b19
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-22 06:33:34 +02:00
fappels
beb906b5f1
Deprecate class property before removing it.
2018-10-21 22:52:53 +02:00
De Coninck Laurent
59307165ce
fix the pdf merge
...
fix the pdf merge.
[See: #9824 ]
2018-10-21 19:45:33 +02:00
Frédéric FRANCE
0171301543
code comment categories class
2018-10-21 19:19:35 +02:00
aplose
8a27ead39f
fork sync
...
Merge remote-tracking branch 'upstream/7.0' into 7.0
2018-10-21 18:45:40 +02:00
aplose
263b53bf63
Paybox Update : include Paybox HMAC key in process in order to keep
...
the module working with Paybox.
2018-10-21 18:28:05 +02:00
Laurent Destailleur
2816bdf747
FIX Date into filename of FEC file.
2018-10-21 16:22:56 +02:00
Laurent Destailleur
4e6b21881f
Fix bug reported by scrutinizer
2018-10-21 12:14:20 +02:00
Laurent Destailleur
868caa4991
Missing ref_customer in popup
2018-10-21 12:05:31 +02:00
Laurent Destailleur
f6b3bc3bdb
Fix thirdparty popup
2018-10-21 12:03:22 +02:00
Laurent Destailleur
fa99ea1f0f
Fix thirdparty popup
2018-10-21 11:55:25 +02:00
Laurent Destailleur
cd9431809b
Fix: do not loose country_code after update
2018-10-21 11:44:21 +02:00
Laurent Destailleur
d38c68e54f
Remove unexpected char
2018-10-21 11:10:04 +02:00
Frédéric FRANCE
f169ec9259
Update ajaxdirtree.php
2018-10-21 10:37:49 +02:00
Frédéric FRANCE
83e2951107
Update style.css.php
2018-10-21 09:59:14 +02:00
Frédéric FRANCE
28c86a613d
Update style.css.php
2018-10-21 09:39:07 +02:00
Frédéric FRANCE
c4029f5e5f
Update style.css.php
2018-10-21 09:23:33 +02:00
ias-ceo
cce2e2414f
missing simicolon
2018-10-21 07:41:40 +03:00
Frédéric FRANCE
5f6cbda5a6
Update facture.class.php
2018-10-20 22:34:00 +02:00
Frédéric FRANCE
fbc5ce623e
payments
2018-10-20 17:17:21 +02:00
Frédéric FRANCE
02954931d8
Update thirdparty_lettrage_supplier.php
2018-10-20 16:27:15 +02:00
Frédéric FRANCE
d3022413ef
Update thirdparty_lettrage.php
2018-10-20 16:25:57 +02:00
Frédéric FRANCE
fab10acc15
change class name from lettering to Lettering
2018-10-20 16:23:43 +02:00
Frédéric FRANCE
4d72cafa52
code comment
2018-10-20 13:47:51 +02:00
Frédéric FRANCE
550dc622ca
code comment
2018-10-20 13:40:40 +02:00
Alexandre SPANGARO
a7de7013a1
Update code
2018-10-20 11:20:53 +02:00
Alexandre SPANGARO
921757c4a3
Fix travis
2018-10-20 10:57:59 +02:00
Alexandre SPANGARO
5cbcef4465
Debug Lettering
2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-20 06:35:39 +02:00
Frédéric FRANCE
f322c73dd7
Update ajax.lib.php
2018-10-19 22:52:18 +02:00
Frédéric FRANCE
042118fe38
fix it
2018-10-19 18:35:16 +02:00
Abbes Bahfir
bfadd39e8c
Fix: Grant right to child classes to use Category methods
2018-10-19 17:27:38 +01:00
Frédéric FRANCE
c811d5a371
fix new pdf
2018-10-19 18:20:06 +02:00
De Coninck Laurent
402bbbe839
fix the member e-mail on resign and validation.
...
Since the member module is only using the new configuration and the name of the global variabels changed you have a blocking e-mail error when you try to resign or validate a member. In order to fix that I fallback on the previous variable like that it's still working.
[see: #9640 ]
2018-10-19 17:23:53 +02:00
atm-greg
44b317e03e
fix display
2018-10-19 16:49:32 +02:00
atm-greg
6a3661586f
create payment for the last loanschedule
2018-10-19 16:12:21 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files
...
Experimental new pdf documents using new column system
2018-10-19 15:51:54 +02:00
Laurent Destailleur
4571210bcf
Fix remove deprecated field
2018-10-19 15:45:56 +02:00
atm-greg
582608cc57
manage fk_bank on loanschedule
2018-10-19 15:36:13 +02:00
Laurent Destailleur
897a2b09a7
Removed scrutinizer warning
2018-10-19 15:02:54 +02:00
Laurent Destailleur
b32ffdbbb9
Clean code
2018-10-19 14:59:00 +02:00
Laurent Destailleur
0408d123ec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:46:39 +02:00
Laurent Destailleur
e4b5cc154e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:46:32 +02:00
Laurent Destailleur
33cd0e84d2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2018-10-19 14:44:50 +02:00
Laurent Destailleur
57ad200ae5
Fix regression in creating discount
2018-10-19 14:43:10 +02:00
Laurent Destailleur
5a228bf394
Merge pull request #9786 from aspangaro/9.0_accountancy2
...
Fix FEC on accountancy movement card
2018-10-19 14:33:46 +02:00
Laurent Destailleur
4e82a6da46
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:32 +02:00
Laurent Destailleur
6a6a8ae14b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:22 +02:00
Laurent Destailleur
91745491ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-10-19 14:27:37 +02:00
Laurent Destailleur
5a1a5548df
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
2018-10-19 14:27:15 +02:00
Laurent Destailleur
47abbd3eb2
Fix bad merge
2018-10-19 14:23:36 +02:00
Laurent Destailleur
13171b0b55
Merge pull request #9781 from frederic34/patch-17
...
do not trim int
2018-10-19 14:18:32 +02:00
Laurent Destailleur
36ae81c749
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/class/accountancycategory.class.php
htdocs/core/actions_massactions.inc.php
htdocs/product/reassort.php
2018-10-19 14:16:53 +02:00
Laurent Destailleur
6d1a934e8d
Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type
...
NEW Add configuration to disable "customer/prospect" thirdparty type
2018-10-19 13:47:33 +02:00
Laurent Destailleur
c1d2556965
Update admin.lang
2018-10-19 13:47:18 +02:00
Laurent Destailleur
b6cb16a457
Merge pull request #9783 from frederic34/patch-18
...
Update menubase.class.php
2018-10-19 13:44:11 +02:00
Laurent Destailleur
86216960d4
Merge pull request #9785 from ptibogxiv/patch-81
...
NEW ADD civility list in API
2018-10-19 13:41:20 +02:00
Laurent Destailleur
078654b114
Merge pull request #9782 from ptibogxiv/patch-79
...
FIX uniformization dates of order in API
2018-10-19 13:39:10 +02:00
Laurent Destailleur
5f309bf155
Update commande.class.php
2018-10-19 13:38:23 +02:00
Laurent Destailleur
762d82f2fe
Move declaration into common
2018-10-19 13:38:05 +02:00
Laurent Destailleur
cff2b923f9
Merge pull request #9784 from ptibogxiv/patch-80
...
FIX harmony in date name with API
2018-10-19 13:29:59 +02:00
Laurent Destailleur
5a9f0cbff7
Merge pull request #9796 from frederic34/patch-21
...
do not trim int
2018-10-19 13:26:08 +02:00
Laurent Destailleur
ee4f6602cc
Merge pull request #9795 from frederic34/patch-20
...
do not trim int
2018-10-19 13:25:39 +02:00
Laurent Destailleur
b12769e5c1
Merge pull request #9803 from simnandez/develop
...
NEW Child label of variants change if parent label changes
2018-10-19 13:23:35 +02:00
Laurent Destailleur
8a88b66c9d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 13:18:28 +02:00
Laurent Destailleur
932a993b86
Merge pull request #9810 from andreubisquerra/master
...
Fix delete without any selected line on takepos
2018-10-19 13:18:07 +02:00
Laurent Destailleur
c13e555d5f
Merge pull request #9811 from frederic34/patch-24
...
use strict comparaison
2018-10-19 13:17:24 +02:00
Laurent Destailleur
24ae38abcc
Merge pull request #9797 from frederic34/patch-22
...
do not trim int
2018-10-19 13:03:03 +02:00
Laurent Destailleur
8af16609ca
Merge pull request #9779 from frederic34/patch-15
...
Update html.formmail.class.php
2018-10-19 13:02:15 +02:00
Laurent Destailleur
324f59ecc9
Merge pull request #9778 from frederic34/patch-9
...
add errors def to form class
2018-10-19 13:01:31 +02:00
Laurent Destailleur
0e33f18a3a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 12:58:31 +02:00
Laurent Destailleur
d086a71104
Merge pull request #9780 from frederic34/patch-16
...
fix phpunit
2018-10-19 12:58:15 +02:00
Laurent Destailleur
c01e6591ed
Merge pull request #9798 from frederic34/patch-23
...
code comment
2018-10-19 12:57:25 +02:00
Laurent Destailleur
c4e67de5c9
Merge pull request #9814 from Mavyre/patch-2
...
Fixed all resources displaying on add in projects, events...
2018-10-19 12:57:07 +02:00
Laurent Destailleur
b6e333876e
FIX #9813
2018-10-19 12:56:21 +02:00
Laurent Destailleur
44e0bc9aed
Merge pull request #9812 from frederic34/docodt
...
add log and comment
2018-10-19 12:53:54 +02:00
Laurent Destailleur
9eed87da8e
Merge pull request #9794 from frederic34/patch-19
...
do not trim int
2018-10-19 12:51:26 +02:00
Laurent Destailleur
4bdde9ad56
Update ticketlogs.class.php
2018-10-19 12:51:14 +02:00
Laurent Destailleur
696023c1aa
NEW Enhancement in the generic file manager
2018-10-19 12:47:59 +02:00
Juanjo Menent
34118bcf20
New: works with variants:
...
- Multiprices compatibility
2018-10-19 12:02:14 +02:00
Juanjo Menent
26dd738f3b
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-19 12:00:22 +02:00
Laurent Destailleur
985ab1efda
FIX delete of a file in file_manager return to same dir
2018-10-19 10:59:34 +02:00
Juanjo Menent
1714bce8a1
New: works with variants:
...
- Better function name
2018-10-19 08:53:01 +02:00
Juanjo Menent
b57993e599
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-19 08:36:12 +02:00
Mavyre
32a3779d23
Fixed all ressources displaying
2018-10-18 22:08:23 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment
2018-10-18 21:47:10 +02:00
Frédéric FRANCE
b0e24e2b8d
use strict comparaison
2018-10-18 21:24:06 +02:00
Laurent Destailleur
d4bc53660b
Code comment and debug filemanager
2018-10-18 21:22:30 +02:00
Frédéric FRANCE
256ee40d0a
Merge remote-tracking branch 'upstream/develop' into patch-16
2018-10-18 21:01:49 +02:00
Frédéric FRANCE
7012b7829f
Merge remote-tracking branch 'upstream/develop' into patch-23
2018-10-18 20:51:39 +02:00
Frédéric FRANCE
c4cc58443a
Merge remote-tracking branch 'upstream/develop' into patch-22
2018-10-18 20:50:03 +02:00
Frédéric FRANCE
5a9e49ef46
Merge remote-tracking branch 'upstream/develop' into patch-21
2018-10-18 20:48:01 +02:00
Frédéric FRANCE
69d3b274aa
Merge remote-tracking branch 'upstream/develop' into patch-20
2018-10-18 20:46:47 +02:00
Frédéric FRANCE
8dd7f62a77
Merge remote-tracking branch 'upstream/develop' into patch-19
2018-10-18 20:45:36 +02:00
Frédéric FRANCE
0f7b1a04d9
Merge remote-tracking branch 'upstream/develop' into patch-15
2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609
Merge remote-tracking branch 'upstream/develop' into patch-9
2018-10-18 20:41:36 +02:00
Frédéric FRANCE
300f80e914
Merge remote-tracking branch 'upstream/develop' into patch-18
2018-10-18 20:39:45 +02:00
Frédéric FRANCE
16211473d7
Merge remote-tracking branch 'upstream/develop' into patch-17
2018-10-18 20:36:43 +02:00
Laurent Destailleur
66cb06eca9
NEW Top menu is always on screen with MD theme.
2018-10-18 17:33:14 +02:00
atm-greg
db2937715d
create payment from loan schedule
2018-10-18 17:27:08 +02:00
atm-greg
f0849aaf81
schedule as a tab
2018-10-18 17:16:38 +02:00
Laurent Destailleur
05326e271d
FIX Filter on invoice type
2018-10-18 17:15:26 +02:00
atm-greg
ff92572d56
add insurance amount on loan
2018-10-18 17:03:49 +02:00
atm-quentin
cfba5a5e0f
fix when model mail selected
2018-10-18 17:02:20 +02:00
Laurent Destailleur
7cafdc4d9a
Fix phpcs
2018-10-18 16:56:43 +02:00
andreubisquerra
b396aaebc5
Fix delete without any selected line
2018-10-18 16:31:37 +02:00
atm-quentin
606011180b
renaming exp to rcp
2018-10-18 15:11:43 +02:00
atm-quentin
ba997a0d0f
FIX for mask
2018-10-18 14:48:20 +02:00
Juanjo Menent
52ad5c5565
New: works with variants:
...
-To edit child price and weight impacts better to see in tab the father price and weight
2018-10-18 12:21:39 +02:00
Juanjo Menent
c588f5e6c0
New: works with variants:
...
-Child label with combination labels
2018-10-18 10:55:27 +02:00
atm-quentin
eeb75bf650
FIX add object linked supplier order of reception
2018-10-18 10:26:32 +02:00
Juanjo Menent
6c76f9517f
New: works with variants:
...
-Child label with combination labels
2018-10-18 10:26:21 +02:00
Juanjo Menent
fd989230a4
New: works with variants:
...
-Child label change if parent changes
2018-10-18 09:09:42 +02:00
Laurent Destailleur
548fafc6e9
Fix trans
2018-10-18 01:32:06 +02:00
Laurent Destailleur
b2a7845c8a
Fix trans
2018-10-18 01:28:14 +02:00
Laurent Destailleur
63f4704725
Fix translation
2018-10-18 01:05:10 +02:00
Laurent Destailleur
52840478c0
Clean code
2018-10-17 21:11:07 +02:00
Frédéric FRANCE
db732ddedd
code comment
2018-10-17 20:36:45 +02:00
Frédéric FRANCE
ebc5cb5a96
do not trim int
2018-10-17 20:24:43 +02:00
Frédéric FRANCE
393303fe31
do not trim int
2018-10-17 20:17:43 +02:00
Frédéric FRANCE
47048baa36
do not trim int
2018-10-17 20:14:01 +02:00
Frédéric FRANCE
456bdb5b8c
do not trim int
2018-10-17 20:04:48 +02:00
atm-quentin
8ef7c29d19
FIX PDF Total Ordered
2018-10-17 17:17:11 +02:00
atm-greg
d86c44e641
Add conf to disable a thirdparty type
2018-10-17 15:55:46 +02:00
gauthier
aea7299970
FIX : use discount with multicurrency
2018-10-17 15:49:08 +02:00
atm-quentin
dd0a57d39e
FIX pdf for creating invoice without massaction
2018-10-17 15:36:47 +02:00
Laurent Destailleur
a66256a799
FIX Hover on the filemanager
2018-10-17 13:22:52 +02:00
atm-quentin
236a61ab55
new manage correctly create bills on reception
2018-10-17 11:56:32 +02:00
Ferran Marcet
ffde353441
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:06:06 +02:00
Ferran Marcet
bdae4e1c4d
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:04:42 +02:00
Ferran Marcet
b462e7b217
FIX When delete a product, llx_product_association rows are not deleted
2018-10-17 10:01:02 +02:00
Frédéric FRANCE
7d8ff04292
Update paiement.class.php
2018-10-17 08:15:12 +02:00
Alexandre SPANGARO
a466104b81
Fix FEC on transaction card
...
Fix for FEC compliance
- Remove useless column label_compte
- label_compte is generated with label of accounting account number
- Insert also the label of the journal
2018-10-17 07:20:04 +02:00
Alexandre SPANGARO
e614d33aa4
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-17 05:57:22 +02:00
ptibogxiv
f2d0004a3e
ADD civility list in API
2018-10-17 00:36:40 +02:00
Laurent Destailleur
3ef32a24a4
Look and feel
2018-10-17 00:34:39 +02:00
ptibogxiv
a77458cb36
Update facture.class.php
2018-10-17 00:07:21 +02:00
ptibogxiv
7c35eae202
Update commande.class.php
2018-10-17 00:06:24 +02:00
ptibogxiv
3fdf3c95b4
FIX harmony in date name with API
2018-10-17 00:04:44 +02:00
Frédéric FRANCE
70b6c502da
Update menubase.class.php
2018-10-16 23:36:00 +02:00
ptibogxiv
27b7cf8bea
Fix uniformization dates of order in API
2018-10-16 23:31:19 +02:00
Frédéric FRANCE
fa78ab7c66
do not trim int
2018-10-16 23:20:13 +02:00
Frédéric FRANCE
2e77b9fed9
fix phpunit
2018-10-16 22:42:18 +02:00
Frédéric FRANCE
cf1819ea0e
Update html.formmail.class.php
2018-10-16 22:27:34 +02:00
Alexandre SPANGARO
a5ebcff2ee
Fix lettering function
2018-10-16 22:27:34 +02:00
Frédéric FRANCE
2d542d028f
Update html.formmail.class.php
2018-10-16 22:22:57 +02:00
Frédéric FRANCE
4e14c2817c
add errors def to form class
2018-10-16 22:09:11 +02:00
Laurent Destailleur
00dc78dd01
Fix responsive
2018-10-16 21:58:33 +02:00
Frédéric FRANCE
f80de9e65e
fix syntax error and phpcs
2018-10-16 21:49:26 +02:00
Laurent Destailleur
74c74f9e2d
Merge pull request #9776 from ptibogxiv/patch-78
...
FIX call of bankaccount class
2018-10-16 21:43:51 +02:00
Laurent Destailleur
2ce1aaaebf
Update api_thirdparties.class.php
2018-10-16 21:43:40 +02:00
Laurent Destailleur
6a3597d9fd
Merge pull request #9774 from frederic34/datapolicy
...
cut long lines >500 to remove phpcs warning
2018-10-16 21:42:36 +02:00
Laurent Destailleur
e418090053
Merge pull request #9775 from aspangaro/9.0_accountancy
...
Fix FEC Missing some information in bookkeeping
2018-10-16 21:41:52 +02:00
Laurent Destailleur
192168cfa4
Merge pull request #9773 from ptibogxiv/patch-77
...
Delete dictionary in ticket API
2018-10-16 21:40:24 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76
...
NEW move ticket dictionary in API /setup
2018-10-16 21:39:30 +02:00
Laurent Destailleur
737bbf6e7c
Update api_setup.class.php
2018-10-16 21:38:27 +02:00
ptibogxiv
5e20390e15
FIX call of bankaccount class
2018-10-16 21:33:42 +02:00
Alexandre SPANGARO
eb4ffcf1a7
Fix FEC Missing some information in bookkeeping
2018-10-16 21:17:00 +02:00
Frédéric FRANCE
e2a6c9e332
cut long lines >500
2018-10-16 21:05:15 +02:00
ptibogxiv
0e6d3a0f48
FIX delete dictionnary in ticket API
2018-10-16 20:59:06 +02:00
ptibogxiv
c9aaf01a7c
MOVE ticket dictionnary in API /setup
2018-10-16 20:56:10 +02:00
Laurent Destailleur
58240c8f1c
Merge pull request #9767 from ptibogxiv/patch-74
...
NEW Save external payment IDs into table of payment
2018-10-16 20:32:23 +02:00
Laurent Destailleur
8d815c4e6b
Merge pull request #9766 from ptibogxiv/patch-73
...
ADD support of external modepayment
2018-10-16 20:30:24 +02:00
Laurent Destailleur
9959ba3662
Merge pull request #9761 from frederic34/patch-20
...
Update actioncomm.class.php
2018-10-16 20:29:15 +02:00
Laurent Destailleur
0ecf7986f8
Merge pull request #9771 from frederic34/patch-9
...
fix phpcs
2018-10-16 20:28:12 +02:00
Laurent Destailleur
57bb8bcfcd
Disabled action are hidden with reason
2018-10-16 20:27:33 +02:00
Frédéric FRANCE
a40271e475
Update bankjournal.php
2018-10-16 20:11:32 +02:00
Frédéric FRANCE
f470068d9d
fix phpcs
2018-10-16 20:10:13 +02:00
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop
...
New: works with variants
2018-10-16 20:08:17 +02:00
Laurent Destailleur
33031450a3
Merge pull request #9747 from atm-maxime/fix_status_tobatch
...
Fix missing status_batch var on product lists #9606
2018-10-16 20:02:56 +02:00
Laurent Destailleur
f07096ea3a
Merge pull request #9760 from frederic34/patch-19
...
add errors def in htmlformsms
2018-10-16 20:01:41 +02:00
Laurent Destailleur
44d8333633
Fix external link must be after label
2018-10-16 20:00:53 +02:00
Laurent Destailleur
97273ff746
Merge pull request #9768 from ptibogxiv/patch-75
...
Add source link in stripe
2018-10-16 19:50:11 +02:00
Laurent Destailleur
78d7ea459d
Update paymentmodes.php
2018-10-16 19:49:16 +02:00
Laurent Destailleur
eaa759fd68
Merge pull request #9759 from frederic34/patch-15
...
add errors def in mailman class
2018-10-16 19:46:42 +02:00
Laurent Destailleur
d56c237d4e
Merge pull request #9756 from atm-maxime/fix_refused_proposal_in_total
...
Fix refused proposals were counted in totals in project overview
2018-10-16 19:46:19 +02:00
Laurent Destailleur
7cd8b36cea
Merge pull request #9755 from atm-greg/fix_massaction_delete_tasks
...
FIX modify parenting before task deletion
2018-10-16 19:45:43 +02:00
Laurent Destailleur
51896757f6
Merge pull request #9752 from frederic34/patch-18
...
Update adherent.class.php
2018-10-16 19:44:24 +02:00
Laurent Destailleur
ae76891853
Merge pull request #9751 from frederic34/patch-17
...
Update bookkeeping.class.php
2018-10-16 19:44:07 +02:00