Commit Graph

63668 Commits

Author SHA1 Message Date
Maxime Kohlhaas
e0e7e60048 Fix : GETPOST for update keys in import module 2017-10-03 11:28:13 +02:00
Laurent Destailleur
0b808fa2aa FIX Bad preview on scroping when special file names 2017-10-03 10:55:45 +02:00
Laurent Destailleur
c4b3dc40c3 Allow : into file names 2017-10-03 10:54:51 +02:00
Laurent Destailleur
888e5ed2c5 Fix sanitize uploaded filename 2017-10-03 10:54:09 +02:00
Rui Strecht
8b4b270720 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-10-03 09:32:22 +01:00
Laurent Destailleur
1fc292fa56 FIX Bad preview on scroping when special file names 2017-10-03 10:11:03 +02:00
Regis Houssin
32e3845667 Fix: travis error 2017-10-03 10:08:25 +02:00
Laurent Destailleur
793f1318de Fix sanitize uploaded filename 2017-10-03 09:35:45 +02:00
Frédéric FRANCE
1d2f7dec50 Update define_holiday.php 2017-10-03 08:02:47 +02:00
Alexandre SPANGARO
0acb391b36 Fix : label_operation on general ledger 2017-10-03 05:27:08 +02:00
Frédéric FRANCE
dd76672c27 ref can be null 2017-10-03 00:30:42 +02:00
Maxime Kohlhaas
29a6c7e6ba Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-10-02 21:32:29 +02:00
Laurent Destailleur
26564cc79c Allow : into file names 2017-10-02 20:38:15 +02:00
Laurent Destailleur
46698192b4 NEW Bulk delete actions available on leave requests 2017-10-02 20:32:31 +02:00
Laurent Destailleur
20b91a8d5f Fix type of leave request not visible in list 2017-10-02 19:36:54 +02:00
BENKE Charlene
41ba7af9fe unable to delete salaries
compta/salaries/cards ask for a salarie/payement/delete right to delete
2017-10-02 18:49:25 +02:00
Laurent Destailleur
fea5746618 Standardize look and feel on leave request module 2017-10-02 18:17:16 +02:00
Laurent Destailleur
90964d25ce Fix css 2017-10-02 17:52:20 +02:00
Laurent Destailleur
97d399595f Add unique key on table to follow leave request counter per type 2017-10-02 17:45:01 +02:00
Laurent Destailleur
3208d8d3ac Fix phpcs 2017-10-02 13:52:18 +02:00
Laurent Destailleur
75e7281054 Add resource for NACE 2017-10-02 12:41:50 +02:00
Laurent Destailleur
a23065c3df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-10-02 12:20:18 +02:00
Laurent Destailleur
138f8cd7ea Fix url to explorer no more working 2017-10-02 12:20:03 +02:00
Regis Houssin
e65b21a3bf Fix: change the parameter value of dol_getIdFromCode 2017-10-02 11:59:17 +02:00
Neil Orley
503129c9f4 Rename method draft and paid to settodraft and settopaid 2017-10-02 11:51:54 +02:00
Regis Houssin
09e71f1390 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-10-02 11:51:27 +02:00
Laurent Destailleur
d021288ec3 Merge pull request #7534 from atm-gauthier/FIX_invalid_foreach
FIX : invalid foreach protection
2017-10-02 11:21:40 +02:00
Neil Orley
5b91a6a37b NEW Sets an invoice as paid using the REST API
Adds the ability to set an invoice as paid using the REST API
2017-10-02 11:17:46 +02:00
Neil Orley
91a1d6c17e NEW Set invoices as draft using the REST API
Adds the ability to set an invoice status as draft using the REST API
Change response when validating an invoice: before returned 200 + text message, now returns an invoice object
2017-10-02 10:55:34 +02:00
gauthier
8f969d61e2 FIX : invalid foreach protection 2017-10-02 09:23:04 +02:00
florian HENRY
18bd2c4445 fix travis 2017-10-02 09:04:22 +02:00
Regis Houssin
475c881e67 Fix: add missing ldap fields 2017-10-02 09:00:07 +02:00
Regis Houssin
c1b6f59c1b Fix: restore possible ldap keys 2017-10-02 08:43:53 +02:00
Laurent Destailleur
26e537e328 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-02 01:28:31 +02:00
Laurent Destailleur
7c30b3ca5d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-10-02 01:28:20 +02:00
Laurent Destailleur
ea5c54ad9c Merge pull request #7525 from hregis/5.0_bug2
Fix: two errors when you create invoice from shipping
2017-10-02 01:25:35 +02:00
Laurent Destailleur
ec8db116f8 Update llx_c_type_contact.sql 2017-10-02 01:25:28 +02:00
Laurent Destailleur
884fc5d249 Update facture.class.php 2017-10-02 01:25:00 +02:00
Laurent Destailleur
989f285d32 Replace table with div 2017-10-02 01:23:07 +02:00
Laurent Destailleur
3f3a5e0921 Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
New custom meteo
2017-10-02 00:48:52 +02:00
Laurent Destailleur
88554a74a9 Merge pull request #7532 from AXeL-dev/develop
Fix: payment form & user first/last name position
2017-10-02 00:37:35 +02:00
Laurent Destailleur
6dbc02022f Merge pull request #7529 from Nicos-git/develop
NEW: Add project related fields to ODT
2017-10-02 00:36:46 +02:00
Laurent Destailleur
48c3d0e3f2 Update commondocgenerator.class.php 2017-10-02 00:36:15 +02:00
Laurent Destailleur
f15ce54c05 Update commondocgenerator.class.php 2017-10-02 00:34:55 +02:00
Laurent Destailleur
b5bfc3e2c7 Merge pull request #7528 from aspangaro/6.0-agiris2
FIX Accountancy export model for Agiris Isacompta
2017-10-02 00:33:13 +02:00
Laurent Destailleur
be84b52d19 Merge pull request #7518 from atm-ph/fix_5.0_hookmanager_situation_invoice
Fix the pdf_getlineprogress hook isn't use because hookmanager is null
2017-10-02 00:14:34 +02:00
Laurent Destailleur
7c690ae8b8 Merge pull request #7517 from simnandez/5.0
FIX: #7510 Bug: extrafield content disappear when generate pdf within intervention
2017-10-02 00:14:05 +02:00
Laurent Destailleur
c118f4a317 Merge pull request #7511 from Oeris/develop-api
NEW Get a list of payments terms
2017-10-02 00:13:30 +02:00
Laurent Destailleur
a81d458829 Merge pull request #7509 from dolibarr95/patch-21
NEW Add the attribute accept to the input form for file upload
2017-10-02 00:12:03 +02:00
Laurent Destailleur
17b286ef59 Merge pull request #7508 from atm-arnaud/FIX_replenish_stock_line_0
FIX replenish if line test GETPOST on line 0
2017-10-02 00:10:55 +02:00