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

56669 Commits

Author SHA1 Message Date
Laurent Destailleur
25d59cf107 Fix sort on common fields 2018-01-15 18:05:15 +01:00
Laurent Destailleur
3d34a839a3 Doc 2018-01-15 17:43:18 +01:00
Laurent Destailleur
926683763b Modulebuilde fix sort of fields, fix generation of files 2018-01-15 17:38:15 +01:00
atm-quentin
6feacab4f5 FIX missing hook invoice index 2018-01-15 14:24:19 +01:00
Laurent Destailleur
bc2009874d Fix code comment 2018-01-15 12:59:30 +01:00
Laurent Destailleur
4c8af0ff50 Fix name alias on list 2018-01-15 12:24:56 +01:00
Laurent Destailleur
b154357683
Merge pull request #7982 from simnandez/6.0 
FIX: Bad name alias showing in name of third column
 2018-01-15 12:22:40 +01:00
Laurent Destailleur
3b9aee7d4c
Update list.php 2018-01-15 12:22:21 +01:00
Laurent Destailleur
e4c02152b3 Fix navigation in bookeeping view grouped by account 2018-01-15 12:14:18 +01:00
Laurent Destailleur
04a5dc79e9
Merge pull request #8054 from artis-auxilium/accounting_searchdate_fiscalyear 
Accounting searchdate fiscalyear
 2018-01-15 11:38:04 +01:00
Laurent Destailleur
926f39fc2b
Merge pull request #8060 from atm-maxime/fix_blockaedlog_migration 
Fix blockedlog triggers fatal error in migration script
 2018-01-15 11:34:48 +01:00
Laurent Destailleur
c29bfcef31
Merge pull request #8053 from Oeris/develop-api 
FIX use DB PREFIX instead of llx_
 2018-01-15 11:33:09 +01:00
Laurent Destailleur
193dfec29e
Merge pull request #8061 from fappels/7.0_fix_module_builder 
7.0 fix module builder
 2018-01-15 11:32:40 +01:00
Laurent Destailleur
64fd5154c9
Merge pull request #8052 from hregis/develop_multicompany 
Fix: regression and broken feature
 2018-01-15 11:31:07 +01:00
Laurent Destailleur
68f0808d16
Update societe.class.php 2018-01-15 11:30:32 +01:00
Laurent Destailleur
b8688a46d3
Update contact.class.php 2018-01-15 11:30:11 +01:00
fappels
00185bd9d4 Fix fetchCommon should return 0 iso error if not found 2018-01-15 11:21:24 +01:00
Laurent Destailleur
3410e29755 CSS 2018-01-15 11:20:45 +01:00
Laurent Destailleur
90fc086814 Fix minor 2018-01-14 20:11:38 +01:00
Laurent Destailleur
cc5dcde9e1 Fix protection to avoid errors 2018-01-14 18:55:55 +01:00
Laurent Destailleur
3c3402bc60 Debug API for prices of products 2018-01-14 15:58:04 +01:00
fappels
d6ed968c51 html modulebuilder type is a text type in database 2018-01-14 15:41:37 +01:00
fappels
25b455272a Fix 0 is a valif value for a NOT NULL field 2018-01-14 15:31:31 +01:00
Laurent Destailleur
133e87fcc3 Sync transifex 2018-01-14 12:45:26 +01:00
Maxime Kohlhaas
36afa87fb5 Fix blockedlog triggers fatal error in migration script 2018-01-14 11:56:45 +01:00
Laurent Destailleur
f0d6099e5f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/core/lib/functions.lib.php
 2018-01-14 03:15:49 +01:00
Laurent Destailleur
9f6118ed52 Code comments 2018-01-14 03:12:22 +01:00
Laurent Destailleur
debc758134 Fix code comment 2018-01-14 01:40:12 +01:00
Laurent Destailleur
7a087327e1 Fix deprecated code 2018-01-13 19:33:40 +01:00
Laurent Destailleur
c947502efa Fix typo 2018-01-13 17:22:59 +01:00
Laurent Destailleur
1f2d275ef2 Fix conditions of some fields 2018-01-13 17:21:56 +01:00
Laurent Destailleur
7c480f76e3 Fix thumbs of pdf at wrong place 
Fix param not provided
Fix css
 2018-01-13 16:09:05 +01:00
Laurent Destailleur
aa1692483f Fix colspan 2018-01-13 16:06:04 +01:00
Laurent Destailleur
8d793c680e Fix dol_delete_preview 2018-01-13 15:48:30 +01:00
Laurent Destailleur
7a88afe962 Fix field enabled and perms must differs 2018-01-13 13:16:33 +01:00
Laurent Destailleur
3bcf1d9da6 Fix css 2018-01-13 12:08:24 +01:00
Laurent Destailleur
53b36435d0 Fix on smartphone 2018-01-12 20:50:18 +01:00
Laurent Destailleur
854a71726c Fix lose filters 2018-01-12 20:32:30 +01:00
Laurent Destailleur
5fb8672221 Fix blockedlog. Browser can be used with large amount of events 2018-01-12 20:24:09 +01:00
Laurent Destailleur
8014f7d822 Fix blockedlog module must store ref of invoice once validated 2018-01-12 19:09:43 +01:00
Laurent Destailleur
d0680b429f Fix name of file saved from tax document tab 2018-01-12 17:39:20 +01:00
Laurent Destailleur
7bfcfd4574 Fix recursive path when dir is '0' 2018-01-12 17:12:38 +01:00
Laurent Destailleur
32a998e68d Fix preview link 2018-01-12 16:28:10 +01:00
Laurent Destailleur
8b972313ae Fix scrutinizer 2018-01-12 15:38:53 +01:00
Laurent Destailleur
ad4b59d2c8 Fix scrutinizer 2018-01-12 15:33:21 +01:00
Laurent Destailleur
92f8fc8b85 Fix scrutinizer 2018-01-12 15:26:50 +01:00
Laurent Destailleur
ac8a7f064a More robust code 2018-01-12 15:23:56 +01:00
Laurent Destailleur
64ae70d106 Fix scrutinizer bug 2018-01-12 15:20:17 +01:00
Laurent Destailleur
7da9911db1 Fix message 2018-01-12 15:06:50 +01:00
Laurent Destailleur
28207ad4cb Clean var 2018-01-12 14:57:02 +01:00
Laurent Destailleur
a44363ce3d Fix responsive 2018-01-12 14:41:57 +01:00
Laurent Destailleur
4f8a447d30 Fix alignement 2018-01-12 14:09:51 +01:00
Laurent Destailleur
50596a5214 Fix trans key 2018-01-12 14:06:48 +01:00
Laurent Destailleur
6c9d5984a2 Fix trans key 2018-01-12 14:03:03 +01:00
Laurent Destailleur
3423d4e6d3 Fix balance is amount after, so i fix by adding amount before 2018-01-12 13:35:53 +01:00
Regis Houssin
20ad3b0e80 Fix: if $entity is empty '' the isset return true !! 2018-01-12 10:39:15 +01:00
Regis Houssin
93d5c818c5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_multicompany 2018-01-12 10:35:22 +01:00
Laurent Destailleur
f0a10cdcc1 Missing backlink 2018-01-12 10:32:48 +01:00
Laurent Destailleur
95d2a9f88d Responsive and css 2018-01-12 01:10:03 +01:00
Laurent Destailleur
5e7b814966 Fix responsive 2018-01-12 00:16:55 +01:00
Laurent Destailleur
f93f9e1a73 Fix regression 2018-01-11 20:39:23 +01:00
Laurent Destailleur
eaecb9da5e CSS 2018-01-11 20:33:09 +01:00
Laurent Destailleur
b225a6f79c Better translation 2018-01-11 20:19:53 +01:00
Laurent Destailleur
e56d74f5c4 Fix generation of doc for supplier payment 2018-01-11 19:01:47 +01:00
Laurent Destailleur
e152e81d18 Fix close code 2018-01-11 18:24:40 +01:00
Laurent Destailleur
0b893c11fd Revert "Fix wrong address used into PDF model of supplier payment" 
This reverts commit 22d92c0540.
 2018-01-11 18:09:05 +01:00
Laurent Destailleur
15ed7584b8 Fix navigation in accounting account card 2018-01-11 17:06:06 +01:00
dev2a
60c508b1c4 Get start date from fiscal year 
if start date is empty, get date from current accounting fiscal year, else from company fiscal month setting
 2018-01-11 15:52:45 +01:00
dev2a
415d7574eb Fix PHP notices adding empty($page) 2018-01-11 15:35:34 +01:00
Laurent Destailleur
6d9a9dd3fe Fix Time spent for "other task" was not visible when filtering project 2018-01-11 13:08:13 +01:00
Neil Orley
8d710020e9 FIX use DB PREFIX instead of llx_ 2018-01-11 12:58:41 +01:00
Laurent Destailleur
46d28deee7 Fix substitution of thirdparty 2018-01-11 12:25:40 +01:00
Laurent Destailleur
3f4d7dbce6 Fix substitution of thirdparty 2018-01-11 12:24:47 +01:00
Regis Houssin
157e118cba Fix: broken feature 2018-01-11 10:47:40 +01:00
Laurent Destailleur
95312d1944 Fix regression 2018-01-11 10:20:49 +01:00
Laurent Destailleur
a4ab37e990 Remove deprecated field 2018-01-11 01:16:14 +01:00
Laurent Destailleur
d74305d333 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-11 01:14:40 +01:00
Laurent Destailleur
90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
 2018-01-11 01:14:20 +01:00
Laurent Destailleur
764646634d
Merge pull request #8051 from atm-florian/6.0 
fix: search translation into external module files also
 2018-01-11 01:12:53 +01:00
Laurent Destailleur
4316793638
Merge pull request #8047 from hregis/develop_multicompany 
Fix: some bugs with multicompany sharing
 2018-01-11 01:07:17 +01:00
Laurent Destailleur
a11cb8dcbf
Update card.php 2018-01-11 01:06:50 +01:00
Laurent Destailleur
0ae02d76a3
Merge pull request #8049 from fmarcet/6.0 
Fix: Still using property ->client instead of ->thirdparty.
 2018-01-11 01:03:47 +01:00
Laurent Destailleur
af6b84ba3a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/contact/document.php
	htdocs/product/list.php
 2018-01-11 01:03:13 +01:00
Laurent Destailleur
205e715b7f
Merge pull request #8046 from hregis/6.0_bug 
Fix: avoid Warning: A non-numeric value encountered
 2018-01-11 00:53:07 +01:00
Laurent Destailleur
b2c900011c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-11 00:48:10 +01:00
Laurent Destailleur
f83ea80d6a
Merge pull request #8041 from dolibarr95/patch-35 
NEW Add class in societe/card.php
 2018-01-11 00:47:53 +01:00
Laurent Destailleur
e41f761157 Fix ident 2018-01-11 00:47:29 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu 
fix #7963
 2018-01-11 00:44:45 +01:00
Laurent Destailleur
4747e84b74
Update price.php 2018-01-11 00:40:33 +01:00
Laurent Destailleur
79562f8d5b
Merge pull request #8036 from atm-ph/fix_6.0_model_pdf_invoice_payment 
Fix wrong address used into PDF model of supplier payment
 2018-01-11 00:37:37 +01:00
Laurent Destailleur
b5fe953a64
Merge pull request #8035 from pdermody/6.0 
Fix #8034 - Surface and volume units are calculated incorrectly
 2018-01-11 00:36:00 +01:00
Laurent Destailleur
436b653fa0 Error report 2018-01-11 00:16:45 +01:00
florian HENRY
c8c550cd33 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-01-10 20:49:48 +01:00
HENRY Florian
5af39e80e0
Update price.php 2018-01-10 20:38:06 +01:00
florian HENRY
0bd45dc64b fix: search translation into external module files also 2018-01-10 20:34:32 +01:00
Laurent Destailleur
f2b8c3c97d Fix check of customer/supplier code 2018-01-10 18:19:54 +01:00
Ferran Marcet
d99535d9da Fix: Still using property ->client instead of ->thirdparty. 2018-01-10 16:40:43 +01:00
Ferran Marcet
7ce7c0d5e5 Merge branch '5.0up' into 5.0 2018-01-10 16:12:53 +01:00
Regis Houssin
8c3b4f62db Fix: wrong entity with thirdparty sharing 2018-01-10 13:30:57 +01:00
Laurent Destailleur
43d560830c Fix on old php 2018-01-10 13:20:43 +01:00
Laurent Destailleur
e141d43999 Fix bad links with mobile 2018-01-10 13:14:30 +01:00
Laurent Destailleur
ae59ca43cc Fix sort of subscriptions 2018-01-10 13:02:05 +01:00
Regis Houssin
4683a35532 Fix: wrong image path with multicompany sharing 2018-01-10 12:52:30 +01:00
Regis Houssin
4cc0e889c1 Fix: restore broken feature 2018-01-10 12:38:27 +01:00
Regis Houssin
bd1acca2cd Fix: wrong entity with multicompany thirdparty sharing 2018-01-10 12:38:12 +01:00
Laurent Destailleur
cda078ce26 Fix test on email unique 2018-01-10 12:27:11 +01:00
Laurent Destailleur
e5c26f89e7 Fix search link 2018-01-10 11:08:52 +01:00
Laurent Destailleur
49f59e0d06 Fix menu visible in experimental mode 2018-01-10 11:02:11 +01:00
Regis Houssin
0f51aa15d8 Fix: avoid Warning: A non-numeric value encountered 2018-01-10 10:52:30 +01:00
Laurent Destailleur
bc9fc2828a Fix missing class 2018-01-10 10:42:36 +01:00
Laurent Destailleur
167ab17927 Fix substitution of user_signature 2018-01-10 10:31:27 +01:00
Laurent Destailleur
9b448459c9 Fix dispatching replacement invoice into bookkeeping (not used by most 
countries in europe)
 2018-01-09 19:12:08 +01:00
dolibarr95
6fdbd4cc17
Update company.lib.php 2018-01-09 14:29:01 +01:00
Laurent Destailleur
9f79ad800b Fix price per quantity 2018-01-09 14:20:47 +01:00
dolibarr95
b9b42e3e9d
Add class 
Add oddeven class to show_contacts() list.
 2018-01-09 14:04:18 +01:00
florian HENRY
fdedd6f75b fix 7963 2018-01-08 20:54:40 +01:00
atm-ph
22d92c0540 Fix wrong address used into PDF model of supplier payment 2018-01-08 15:25:18 +01:00
Laurent Destailleur
9844352193 More complete repair 2018-01-08 15:04:17 +01:00
Laurent Destailleur
42e659e26c Fix link for online payment 2018-01-08 13:21:04 +01:00
Laurent Destailleur
5847ea7319 Fix var_dump 2018-01-08 12:44:55 +01:00
Laurent Destailleur
5ebba6fead Fix example 2018-01-08 12:41:22 +01:00
Laurent Destailleur
40f2644520 Fix example 2018-01-08 12:31:11 +01:00
Laurent Destailleur
968bb8a100 Fix travis 2018-01-08 02:15:20 +01:00
Laurent Destailleur
f653adeb71 Fix phpcs 2018-01-08 02:00:06 +01:00
Laurent Destailleur
86227d77d6 Fix link of images 2018-01-08 01:37:10 +01:00
Laurent Destailleur
c13a7709f5 Fix link on image for website module 2018-01-08 00:20:38 +01:00
Laurent Destailleur
e256a1d57e Code comment 2018-01-08 00:05:26 +01:00
Laurent Destailleur
9254782ad7 Fix init template of non page 2018-01-07 22:04:31 +01:00
Laurent Destailleur
de94c77a98 Fix url to alias when dolibarr is server for website module 2018-01-07 20:32:59 +01:00
Paul Dermody
a1ac285a25 Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet. 2018-01-07 12:42:14 -06:00
Laurent Destailleur
9fd257d2f7 Fix rename of dir from filemanager 2018-01-07 19:38:20 +01:00
Laurent Destailleur
280059a3d7 Fix perm 2018-01-07 18:56:57 +01:00
Laurent Destailleur
a92f60416a Fix permissions 2018-01-07 18:52:35 +01:00
Laurent Destailleur
da4417dfc8 Fix website in multicompany mode 2018-01-07 18:33:20 +01:00
Laurent Destailleur
2812dae3b3 Fix website in multicompany mode 2018-01-07 18:28:47 +01:00
Laurent Destailleur
82fcf3cbdb CSS 2018-01-07 16:53:59 +01:00
Laurent Destailleur
e6ffaa0f8b Fix option MAIN_SHOW_TECHNICAL_ID 2018-01-07 16:41:45 +01:00
Laurent Destailleur
140ee422a4 NEW Add chart of account for england 2018-01-05 22:06:40 +01:00
Laurent Destailleur
a37019a25b NEW Add chart of account for england 2018-01-05 22:04:43 +01:00
Laurent Destailleur
b9015de7e2 Fix can't edit payment mode / default bank account 2018-01-05 19:52:23 +01:00
Laurent Destailleur
4f409b802e Fix switch extrafield password/text 2018-01-05 18:16:40 +01:00
Laurent Destailleur
35a710a8ed Missing translation 2018-01-05 17:50:05 +01:00
Laurent Destailleur
70cfec37b1 Fix add of free entry into bank account 2018-01-05 17:38:21 +01:00
Laurent Destailleur
5580cedfdc Fix add of free entry into bank account 2018-01-05 17:35:28 +01:00
Laurent Destailleur
f826696aa1 Add the status of record into blockedlog export 2018-01-05 13:40:56 +01:00
Laurent Destailleur
332ee53c22 Fix module blockedlog for donation 2018-01-05 12:43:53 +01:00
sschwebel
7e8fda2d71 FIX #8029 Unable to make leave request in holyday module 
wrong variable name in card.php
 2018-01-05 12:09:45 +01:00
Laurent Destailleur
dbf7603118 Debug blockedlog for loi finance 2016 2018-01-05 04:31:48 +01:00
Laurent Destailleur
1e438b7ebd Fix travis and return of api that change status 2018-01-05 02:01:57 +01:00
Laurent Destailleur
940e9cb1a5 Fix travis error 2018-01-05 01:46:07 +01:00
Laurent Destailleur
d7837f8800 Try fix for #7778 2018-01-05 01:43:51 +01:00
Laurent Destailleur
e7527ca4b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-05 01:30:32 +01:00
Laurent Destailleur
0fb95fa15f Try a fix for #7778 2018-01-05 01:30:12 +01:00
Laurent Destailleur
07d991cc8d Code comment 2018-01-05 01:27:48 +01:00
Laurent Destailleur
6e9e4e13c1 Code comment 2018-01-05 01:26:57 +01:00
Laurent Destailleur
45ed5c20ea
Merge pull request #8011 from frederic34/patch-1 
Update card.php
 2018-01-04 23:57:53 +01:00
Laurent Destailleur
dd8e7d657f
Update card.php 2018-01-04 23:57:45 +01:00
Laurent Destailleur
a3c6746b6f Merge #8008 manually 2018-01-04 23:50:15 +01:00
Laurent Destailleur
1464937c66 Merge #8008 manually 2018-01-04 23:44:21 +01:00
Laurent Destailleur
f19fb90ab0 Merge #8008 manually 2018-01-04 23:36:14 +01:00
Laurent Destailleur
6b8c7239cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-04 21:07:05 +01:00
Laurent Destailleur
5400bee3ed Fix title 2018-01-04 21:06:39 +01:00
Laurent Destailleur
f25b2ebc51
Merge pull request #8026 from c3do/patch-3 
Fix #8026 Remove PHP Warning adding empty($page)
 2018-01-04 21:04:33 +01:00
Laurent Destailleur
460bdd441a
Merge pull request #8025 from c3do/patch-2 
Fix #8025 Remove PHP Warning adding empty($page)
 2018-01-04 21:04:22 +01:00
Laurent Destailleur
055d0e138e
Merge pull request #8024 from c3do/patch-1 
Fix #8024 Remove PHP notices adding empty($page)
 2018-01-04 21:04:12 +01:00
Laurent Destailleur
21506f25b9
Merge pull request #8022 from OPEN-DSI/core_access_rights_resource_multientities 
Fix: Access rights for resource in multi-entities
 2018-01-04 21:03:55 +01:00
Laurent Destailleur
301f509611
Merge pull request #8019 from atm-gauthier/6.0_fix_vat_mass_update 
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
 2018-01-04 21:03:20 +01:00
Laurent Destailleur
550fc37e62
Merge pull request #8017 from atm-florian/6.0 
fix : linked object (new format  of linked_object atribut on 6.0)
 2018-01-04 21:02:31 +01:00
Laurent Destailleur
a14a3db2e9
Merge pull request #8013 from atm-john/FIX_invoice_filter_type 
fix filter for TYPE_SITUATION invoice
 2018-01-04 20:59:32 +01:00
Laurent Destailleur
e4d37c3e23
Merge pull request #8012 from ATM-Nicolas/fix_product_best_price 
Fix product best price
 2018-01-04 20:58:59 +01:00
Laurent Destailleur
60976c08e4
Merge pull request #8010 from atm-john/FIX_supplier_invoice_lines_extrafields_reception 
Fix extrafields transmition from supplier order to supplier invoice : lines part
 2018-01-04 20:57:20 +01:00
Laurent Destailleur
cc24634cfd
Merge pull request #8007 from atm-florian/develop 
fix #8004
 2018-01-04 20:56:38 +01:00
Laurent Destailleur
90e9b3db68 Fix look and feel v7 2018-01-04 20:42:57 +01:00
Laurent Destailleur
e10a9912dc Fix missing worload 2018-01-04 19:54:30 +01:00
Laurent Destailleur
6b77dc3b5d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2018-01-04 19:30:25 +01:00
Laurent Destailleur
b2feac9d90 CVE-2017-17971 2018-01-04 19:25:52 +01:00
Laurent Destailleur
01cde59608 Fix filter on bookkeeping group view 2018-01-04 19:16:53 +01:00
Laurent Destailleur
56b27a3a11 Fix: do no lose filter when deleting a bookeeping transaction 2018-01-04 19:03:01 +01:00
Laurent Destailleur
ebc76b5f27 Fix tooltips on thirdparty and invoice 2018-01-04 18:29:12 +01:00
Juanjo Menent
762ab74940 FIX: Cashdesk should not sell to inactive third parties 2018-01-04 18:09:25 +01:00
Juanjo Menent
9471495dca Merge remote-tracking branch 'upstream/6.0' into 6.0 2018-01-04 18:05:55 +01:00
Cédric
4ed86c830a
Fix PHP Warning 
Warning: A non-numeric value encountered in dolibarr/htdocs/accountancy/bookkeeping/list.php on line 89
 2018-01-04 17:42:23 +01:00
Cédric
777ed43e75
Remove PHP notices adding empty($page) 2018-01-04 17:31:59 +01:00
Cédric
41fec45daf
Fix PHP notices adding empty($page) 2018-01-04 16:23:25 +01:00
Laurent Destailleur
59ed23069c Fix debug accounting module 2018-01-04 15:52:07 +01:00
KHELIFA
7d824b3ef2 Fix: Access rights for resource in multi-entities 2018-01-04 15:05:11 +01:00
Laurent Destailleur
f4c62a3bd9 Fix ui 2018-01-04 14:54:04 +01:00
Laurent Destailleur
300d4e1603 Fix disable direct debit request for replaced invoices 2018-01-04 14:35:02 +01:00
Laurent Destailleur
c4eba665d0 Fix order of task in gantt diagram 2018-01-04 13:52:37 +01:00
Laurent Destailleur
04dd0663ff Fix translation 2018-01-04 12:17:32 +01:00
gauthier
58470e0913 FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false 2018-01-04 12:01:21 +01:00
Laurent Destailleur
b3465d441a Missing ajaxcombobox 2018-01-04 10:45:48 +01:00
Laurent Destailleur
f6007045f5 Fix search filters 2018-01-04 00:23:08 +01:00
Laurent Destailleur
6bc8268dc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-01-03 23:35:15 +01:00
Laurent Destailleur
534cbcb941 Debug translation 2018-01-03 20:59:35 +01:00
Laurent Destailleur
48261f793d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/admin/product.php
 2018-01-03 20:21:10 +01:00
Laurent Destailleur
f6ff6610e4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-03 20:13:56 +01:00
Laurent Destailleur
c7798d11ce Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-03 20:13:17 +01:00
florian HENRY
25390e5f73 fix : linked object (new format of linked_object atribut on 6.0) 2018-01-03 17:03:00 +01:00
Laurent Destailleur
bc1f741600 Fix duplicate instructions 2018-01-03 14:46:18 +01:00
florian HENRY
2bd8bafc1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-01-03 12:06:59 +01:00
Laurent Destailleur
c3f8012dfb Update vat rates 2018-01-02 23:05:40 +01:00
Laurent Destailleur
ca14dd790b Fix module website 2018-01-02 22:58:37 +01:00
Laurent Destailleur
c98b5c7ec7 Fix css background 2018-01-02 17:27:05 +01:00
ATM-Nicolas
2e6c036ad8 Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_product_best_price 2018-01-02 17:22:53 +01:00
ATM-Nicolas
61efda4cbd FIX : product best price on product list 2018-01-02 17:21:04 +01:00
John
1331e8add7 fix filter for TYPE_SITUATION invoice 2018-01-02 17:19:42 +01:00
Frédéric FRANCE
aaff13a984
Update card.php 2018-01-02 14:28:52 +01:00
John
9180121999 Fix extrafields transmition from supplier order lines to supplier invoice lines 2018-01-02 12:06:11 +01:00
florian HENRY
320465aeb9 fix : #8003 2018-01-02 09:46:45 +01:00
florian HENRY
abe53cad05 fix #8004 2018-01-02 09:36:37 +01:00
Laurent Destailleur
24a59a7731
Merge pull request #8002 from fappels/7.0_fix_on_fix_mail_trigger 
Fix on #7981 sendmail trigger error
 2017-12-31 12:53:02 +01:00
fappels
b6e3d312ad Fix on #7981 
Trigger interface does not set error eventmessage.
Improvement:
Show both trigger error and mail send succesful, so you know mail was
send succesful bot some trigger action after sending mail failed.
 2017-12-30 12:12:13 +01:00
Frédéric FRANCE
0fae2ba8ca
correct merge 2017-12-29 20:41:39 +01:00
Laurent Destailleur
77be56ff74
Merge pull request #7991 from defrance/patch-103 
Add project column on proposal list
 2017-12-28 13:03:03 +01:00
Laurent Destailleur
af8ebc616b
Update list.php 2017-12-28 13:02:26 +01:00
Laurent Destailleur
0abe19c30d
Merge pull request #7998 from hregis/6.0_bug 
Fix: avoid warning
 2017-12-28 12:53:04 +01:00
Laurent Destailleur
9ac99caffe
Merge pull request #7995 from frederic34/patch-1 
Update propal.class.php
 2017-12-28 12:51:44 +01:00
Laurent Destailleur
b0fefffcf8 Fix standardize api code 2017-12-28 12:44:15 +01:00
Laurent Destailleur
ce680af357 Fix field name and length (database portabilit) 2017-12-28 11:16:27 +01:00
Laurent Destailleur
6676178435 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/contrat/card.php
 2017-12-28 09:56:40 +01:00
Laurent Destailleur
bbcf70cf4e Remove spaces 2017-12-28 09:48:41 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0 2017-12-28 08:46:22 +01:00
Laurent Destailleur
836a94fab2
Merge pull request #7988 from OPEN-DSI/core_pdf_modele_propal_payment_mode_flag 
Fix PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE
 2017-12-28 07:18:57 +01:00
Laurent Destailleur
3d4e6c9169
Merge pull request #7987 from atm-arnaud/FIX_trans_product_stats 
FIX stats trad for customerinvoice
 2017-12-28 07:10:14 +01:00
Laurent Destailleur
56bc0dbd25
Merge pull request #7986 from atm-arnaud/FIX_contractline_trans_unactivate 
FIX trans unactivate on contractline
 2017-12-28 07:09:28 +01:00
Laurent Destailleur
31b5d9df52
Merge pull request #7985 from atm-arnaud/FIX_search_contact_list 
FIX search on contact list
 2017-12-28 07:07:47 +01:00
Laurent Destailleur
8476567dc6
Merge pull request #7981 from fappels/7.0_sendmail_trigger_error 
Fix action_sendmail.inc
 2017-12-28 07:01:02 +01:00
Laurent Destailleur
de305cb3b2
Merge pull request #7980 from hregis/6.0_bug2 
Fix: avoid php warning
 2017-12-28 06:53:09 +01:00
Laurent Destailleur
fcf42802a3 More example for website 2017-12-27 21:13:42 +01:00
Laurent Destailleur
5264aec853 Add js into export of website 2017-12-27 20:21:19 +01:00
Laurent Destailleur
8388858715 Fix filemanager 2017-12-27 20:17:08 +01:00
Laurent Destailleur
6f107e3fee Fix API to download/build doc 2017-12-27 15:48:20 +01:00
Regis Houssin
59a89b250d Fix: avoid warning (https://github.com/Dolibarr/dolibarr/issues/7993) 2017-12-27 11:56:58 +01:00
Frédéric FRANCE
80618d56ac
Update propal.class.php 2017-12-26 16:12:28 +01:00
Ferran Marcet
1c7b99d3dc Fix: Missing include for Project class 2017-12-26 12:13:35 +01:00
Juanjo Menent
b650ba21c4 Merge remote-tracking branch 'upstream/6.0' into 6.0 2017-12-26 10:52:46 +01:00
Laurent Destailleur
768cc19bbc Fix protection on tpl to avoid direct url call 2017-12-24 15:07:06 +01:00
Laurent Destailleur
07f1dd7dae Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-24 15:03:09 +01:00
Laurent Destailleur
644e8b5a05 Fix navigation on stock 2017-12-24 15:02:15 +01:00
Laurent Destailleur
fdac3078e2 Fix permissions 2017-12-24 14:42:51 +01:00
Laurent Destailleur
b70dd36ffa Better js comment 2017-12-24 12:16:48 +01:00
BENKE Charlene
df884e4080
Add project column on proposal list 
if project are not enabled we don't display it
 2017-12-23 18:37:08 +01:00
Laurent Destailleur
e6c7f9e69b Debug module inventory 2017-12-22 21:29:09 +01:00
Laurent Destailleur
57272dc5fe API to get list of available document is ok for invoice 
order, proposal, shipment
 2017-12-22 19:49:31 +01:00
Laurent Destailleur
f0c8b548f3 Fix bugs reported by scrutinizer 2017-12-22 14:24:31 +01:00
Laurent Destailleur
493669e986 Fix look and feel v7 2017-12-22 14:19:12 +01:00
Laurent Destailleur
e839c72109 Fix css 2017-12-22 14:05:49 +01:00
Laurent Destailleur
fb8326a9bb Css use roboto but files does not exists 2017-12-22 12:56:29 +01:00
Laurent Destailleur
3b54be5dac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/product/price.php
 2017-12-22 12:55:16 +01:00
Laurent Destailleur
2b056b0177 BUG Fix of old hidden feature price per quantity 2017-12-22 12:53:46 +01:00
Laurent Destailleur
ff245aa646 BUG Fix of old hidden feature price per quantity 2017-12-22 10:56:52 +01:00
Laurent Destailleur
d1cfbc2906 Code comment 2017-12-22 01:03:40 +01:00
Laurent Destailleur
207730bf63 Css 2017-12-22 00:22:33 +01:00
Laurent Destailleur
27a9a81f99 Fix link to contracts 2017-12-21 23:48:33 +01:00
KHELIFA
d069ccdb7f Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE 
- Fix hide payment condition for supplier proposal
 2017-12-21 16:58:37 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960 FIX security vulnerability reported by ADLab of Venustech 2017-12-21 13:32:16 +01:00
Laurent Destailleur
62f895e2ec Fix: avoid infinite loop 2017-12-21 13:31:39 +01:00
Laurent Destailleur
4a5988accb FIX security vulnerability reported by ADLab of Venustech 2017-12-21 12:52:19 +01:00
arnaud
b1ce3fc5c8 FIX stats trad for customerinvoice 2017-12-21 12:12:50 +01:00
arnaud
4ba039d229 FIX trans unactivate on contractline 2017-12-21 12:07:29 +01:00
arnaud
ae7f8c3fe4 FIX search on contact list 2017-12-21 12:01:30 +01:00
Laurent Destailleur
54d7d85d90 Sync transifex 2017-12-21 11:47:35 +01:00
Laurent Destailleur
e8a141aa63 Add uruguay languages 2017-12-21 11:37:51 +01:00
Laurent Destailleur
635917d0e6 CSS 2017-12-20 21:33:45 +01:00
Laurent Destailleur
f1305bbdd6 Fix css 2017-12-20 21:14:22 +01:00
Laurent Destailleur
d20062df73 Fix jquery css theme 2017-12-20 20:18:41 +01:00
Laurent Destailleur
9ea2fe226d Fix look and feel v6 2017-12-20 19:30:30 +01:00
Laurent Destailleur
b03d0134a7 Filter on date extrafield timestamp and datetime disabled (not possible 
yet)
 2017-12-20 18:30:41 +01:00
fappels
4bc2e80ba8 Fix sending expense reports 2017-12-20 17:20:40 +01:00
Juanjo Menent
dc930dd6c5 FIX: Bad name alias showing in name of third column 2017-12-20 16:46:49 +01:00
Laurent Destailleur
3f6b3b51ca Fix css 2017-12-20 15:09:58 +01:00
Laurent Destailleur
9d10eb57f2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/main.inc.php
 2017-12-20 13:28:41 +01:00
Laurent Destailleur
6900771c70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-20 13:17:39 +01:00
Laurent Destailleur
ca8ae3c723 Fix option MAIN_USE_JQUERY_JEDITABLE 2017-12-20 13:17:21 +01:00
Laurent Destailleur
b1f98b5903 Fix inline edit 2017-12-20 12:45:38 +01:00
fappels
7da1f706e5 Error in send_mail trigger is not system error 2017-12-20 12:25:30 +01:00
Regis Houssin
2821459894 Fix: avoid php warning 2017-12-20 11:36:51 +01:00
Laurent Destailleur
846453e94b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-19 18:26:49 +01:00
Laurent Destailleur
12d91d7444 Fix missing messages in error report. 
Fix test on non empty array
 2017-12-19 18:26:27 +01:00
Laurent Destailleur
d51ae72eb4
Merge pull request #7965 from Oeris/develop-api 
NEW improvements of invoices, orders and proposals in the REST API
 2017-12-19 18:17:48 +01:00
Laurent Destailleur
57603e3df4
Update api_invoices.class.php 2017-12-19 18:16:39 +01:00
Laurent Destailleur
bffed79132
Update api_invoices.class.php 2017-12-19 18:06:05 +01:00
Laurent Destailleur
3635e88396
Update api_proposals.class.php 2017-12-19 18:01:38 +01:00
Laurent Destailleur
29b9fb6f54
Merge pull request #7964 from aspangaro/8.0-a1 
NEW : Add search on date and accounting account in various payment list
 2017-12-19 17:58:26 +01:00
Laurent Destailleur
016be9139b Fix sql request 2017-12-19 17:09:47 +01:00
Laurent Destailleur
731cb3f721 Fix editor of user signature 2017-12-19 17:00:40 +01:00
Laurent Destailleur
01c99b780e Fix missing index 2017-12-19 16:22:47 +01:00
Laurent Destailleur
f504716501 Fix sync contact - external user 2017-12-19 16:16:31 +01:00
Neil Orley
171e388f6d NEW Update bank account when updating an order 
Add the ability to update the bankaccount when updating an order
 2017-12-19 14:16:51 +01:00
Neil Orley
a3f4066790 NEW Update bank account when updating an invoice 
Add the ability to update the bankaccount when updating an invoice
 2017-12-19 14:14:26 +01:00
Neil Orley
7e3a2d75bb FIX Error when classify the order as invoiced unsing API 
Remove of notrigger parameter. The notrigger attribute caused a type error when used.
 2017-12-19 13:06:28 +01:00
Neil Orley
40aebfa081 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-19 12:54:38 +01:00
Laurent Destailleur
feaff433b8 Debug module website 2017-12-19 12:54:10 +01:00
Neil Orley
e90183f4ba NEW Update end of validity date of proposal using the API 
Add the ability to update the end of validity date when modifying a proposal
 2017-12-19 12:37:37 +01:00
Neil Orley
fe8fac9577 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-19 12:36:46 +01:00
Laurent Destailleur
89a62103ca Debug module website 2017-12-19 11:40:29 +01:00
Laurent Destailleur
fcf04c122f Fix phpcs 2017-12-19 00:39:01 +01:00
Laurent Destailleur
91932838ef Fix constant MAIN_LANG_DEFAULT not used 2017-12-19 00:24:38 +01:00
Laurent Destailleur
d4afb8300d Fix several pb of duplicate functions in some cases 2017-12-19 00:15:22 +01:00
Laurent Destailleur
2e87318b58 Fix sql error 2017-12-18 19:15:42 +01:00
Laurent Destailleur
2204790602 Fix filter on project id when id is list with comma 2017-12-18 19:04:57 +01:00
Neil Orley
0817873267 NEW Create an order using an existing proposal 
Create an order using an existing proposal.
 2017-12-18 16:13:54 +01:00
Laurent Destailleur
1351a43a30 FIX Maxi debug of permission for users external or restricted to sales 
representatives
 2017-12-18 16:13:05 +01:00
Neil Orley
d8dac909d6 NEW Add error message 
Returns the error message when the API can't add a new line in a proposal
 2017-12-18 14:36:41 +01:00
Neil Orley
ee6b0d7237 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-18 14:36:29 +01:00
Laurent Destailleur
98b82d712a NEW Revenue stamp can be a percent 
FIX Revenue stamp not visible on the transfer payment page
 2017-12-18 12:43:03 +01:00
Laurent Destailleur
8e12551f17 Fix not employee must not appear on page to create salaries 2017-12-18 11:55:34 +01:00
Laurent Destailleur
54db0d31b4 Fix GETPOST for intcomma 2017-12-18 11:32:24 +01:00
Laurent Destailleur
6f9822ddb3 Fix link for payment no set 2017-12-17 22:03:42 +01:00
Laurent Destailleur
713af7f6df Debug module website 2017-12-17 20:25:45 +01:00
Laurent Destailleur
d6fb3aecba Clean code 2017-12-17 16:26:34 +01:00
Laurent Destailleur
8d671b2b26 Debug website module 2017-12-17 16:24:47 +01:00
Laurent Destailleur
5cd003973b Fix add payment when using multiple payment 2017-12-16 22:36:28 +01:00
Laurent Destailleur
d895e1be9f NEW Show list of tracked events into the module config page. 2017-12-16 22:26:25 +01:00
Laurent Destailleur
9f2a42b67d NEW Can filter on user on unalterable log 2017-12-16 21:50:58 +01:00
Laurent Destailleur
4abcbae79f NEW The unalterable log can be browse by any user with he permission 2017-12-16 21:36:36 +01:00
Laurent Destailleur
e90a6b8c0f Option THEME_HIDE_BORDER_ON_INPUT to restore border on inputfields work 
also with md theme.
 2017-12-16 20:52:49 +01:00
Laurent Destailleur
2163db446b NEW Can test signature of a version from API 2017-12-16 17:24:23 +01:00
Laurent Destailleur
fcf50c01b9 Fix translation 2017-12-16 15:33:29 +01:00
Laurent Destailleur
790a82aa6f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-16 15:11:52 +01:00
Laurent Destailleur
394eeb3cd9 Fix rendering MD files of images by adding a css 2017-12-16 15:11:40 +01:00
Laurent Destailleur
6bace33366
Merge pull request #7955 from fappels/7.0_fix_migration 
Fix migration script
 2017-12-16 01:15:29 +01:00
Laurent Destailleur
a020dbf3d7
Merge pull request #7953 from atm-ph/fix_6.0_checkbox_credit_note 
Fix since jquery 3 we can check all checkbox of credit note options
 2017-12-16 01:13:55 +01:00
Laurent Destailleur
ecb782f0b4
Merge pull request #7956 from aspangaro/7.0-b5 
FIX : Edit accountancy in loan
 2017-12-16 01:09:41 +01:00
Laurent Destailleur
6524fce9b7
Merge pull request #7959 from AurelienC/patch-1 
Fix Resolve bug for REST API PUT task
 2017-12-16 01:05:54 +01:00
Laurent Destailleur
9cdf322bfb Fix scrutinizer bugs 2017-12-15 22:14:28 +01:00
Laurent Destailleur
929893bd49 Fix regression introduced with task comments 2017-12-15 20:07:35 +01:00
Laurent Destailleur
db91a88c59 Fix error message and migration 2017-12-15 19:54:57 +01:00
Laurent Destailleur
ebdbddb7fd Fix error message and migration 2017-12-15 19:50:39 +01:00
Laurent Destailleur
8bb89f6bf4 Fix look and feel v6 2017-12-15 17:24:36 +01:00
Laurent Destailleur
e774beffc3 Fix the symbol of Yuan must be before amount 2017-12-15 17:17:35 +01:00
Laurent Destailleur
1a3fbc092d Fix method not found 2017-12-15 17:07:32 +01:00
Laurent Destailleur
5ae13ea9d6 Fix navigation in bank direct debit orders 2017-12-15 17:05:01 +01:00
Laurent Destailleur
5af153550d Debug blockedlog: 
- Add a track into log when we disable/enable module
- Add a protection to avoid disable of module when recording was started
- Better compatibility with multicompany
- Can filter on ref and amount
- Add a permission to read the blockedlog
- Add more information on payments/invoice/thirdparty into log
- Reset of module data after a migration from v6 (not compatible)
 2017-12-15 16:56:08 +01:00
Neil Orley
4c852d1b6f NEW Set a proposal to draft 
Set a proposal to draft
 2017-12-15 16:34:30 +01:00
Neil Orley
f4e8ce0598 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-15 16:23:38 +01:00
Laurent Destailleur
fb0169cbb8 Back link to module page 2017-12-15 10:46:11 +01:00
Laurent Destailleur
4a75d847e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-15 10:36:47 +01:00
Laurent Destailleur
2eea3a1afa Fix backlink of module setup pages 2017-12-15 10:36:35 +01:00
Neil Orley
e61d625577 FIX error message 2017-12-15 10:02:23 +01:00
Neil Orley
5ae74f8ae1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-12-15 09:56:02 +01:00
Alexandre SPANGARO
24ae3d5879 NEW : Add search on date and accounting account in various payment list 2017-12-15 07:04:05 +01:00
Laurent Destailleur
9a08ee269e Menu not visible 2017-12-14 23:43:04 +01:00
Laurent Destailleur
b8302f5bf0 Code comment 2017-12-14 21:28:51 +01:00
Laurent Destailleur
3b10f826f9 Css 2017-12-14 17:37:32 +01:00
Laurent Destailleur
541a1e0f7c Better message 2017-12-14 17:26:12 +01:00
Laurent Destailleur
d7e5d554ab Better message 2017-12-14 17:18:26 +01:00
Laurent Destailleur
4a9b61047f Filter on blockedlog 2017-12-14 17:08:43 +01:00
Laurent Destailleur
427f1490f8 Fix css 2017-12-14 13:52:32 +01:00
Aurélien
88b456a542
Resolve bug for REST API PUT task 
An error occured when I was trying to PUT task despite all rigths.

Ressource 'task' --> 'tasks'
 2017-12-14 11:53:48 +01:00
Frédéric FRANCE
ab558ee5fa
Update product.php 2017-12-14 09:49:55 +01:00
Alexandre SPANGARO
0c8ff80af0 FIX : Edit accountancy in loan 2017-12-14 06:57:17 +01:00
Laurent Destailleur
c119d7dbb9 Code comment 2017-12-13 23:37:34 +01:00
fappels
bb700494a1 Fix Collation update missing for llx_expeditiondet_batch 2017-12-13 20:39:37 +01:00
atm-ph
a2f4afbf88 Fix wrong or missing char for url 2017-12-13 16:17:22 +01:00
atm-ph
46770178d2 Fix since jquery 3 we can check all checkbox of credit note options 2017-12-13 15:24:09 +01:00
Laurent Destailleur
d59824cd69 Fix generic GETPOST 2017-12-13 13:19:15 +01:00
Laurent Destailleur
cc2c31d940 Fix typo 2017-12-12 16:31:59 +01:00
Laurent Destailleur
247c380d18 Several fixes 2017-12-12 16:11:40 +01:00
Laurent Destailleur
3f5bfa21c3
Merge pull request #7945 from mistraloz/patch-4 
Fix #7921 : For invoice with "/" in ref
 2017-12-12 15:00:07 +01:00
Laurent Destailleur
f886aac75a
Merge pull request #7944 from lampi87/develop 
public holiday in austria
 2017-12-12 14:59:23 +01:00
Laurent Destailleur
676e5a1bca
Merge pull request #7943 from aspangaro/7.0-b4 
FIX : Various payment
 2017-12-12 14:54:44 +01:00
Laurent Destailleur
1ad7ec5ad1 Test on bad entity 2017-12-12 13:23:39 +01:00
Laurent Destailleur
06e63615e3 complete api detection 2017-12-12 13:05:22 +01:00
Laurent Destailleur
ef9468f78a Fix missing field label 2017-12-12 11:48:51 +01:00
Laurent Destailleur
e9eeb59068 Revert "Add invoice label in supplier invoice web service" 
This reverts commit 8b288d99ff.
 2017-12-12 11:45:12 +01:00
Laurent Destailleur
8b288d99ff Add invoice label in supplier invoice web service 2017-12-12 11:43:53 +01:00
Laurent Destailleur
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54 Fix several pb in links to projects on create page 2017-12-12 10:37:51 +01:00
Laurent Destailleur
9314dcb046 Fix regression 2017-12-12 10:13:48 +01:00
Laurent Destailleur
118b6ce140 Code comment 2017-12-12 03:10:54 +01:00
Laurent Destailleur
9880ef7364 Fix module website 2017-12-12 01:40:34 +01:00
Laurent Destailleur
48aada6090 Export of website 2017-12-11 21:27:43 +01:00
Laurent Destailleur
6f3c839d65 Fix error management 2017-12-11 18:58:08 +01:00
Laurent Destailleur
dbefb93e0f Error management 2017-12-11 18:25:23 +01:00
Laurent Destailleur
bb7c03906e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/societe/list.php
 2017-12-11 15:25:09 +01:00
Laurent Destailleur
48499fb506 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-11 15:21:22 +01:00
Laurent Destailleur
f2e429e28f Fix file integrity checker (exclude files excluded from package) 2017-12-11 15:03:34 +01:00
Laurent Destailleur
1593792cdd Fix loading data after first install 2017-12-11 14:56:12 +01:00
Mistral Oz - LWEP
7cd785d59a
Fix #7921 : For invoice with "/" in ref 
Fix #7921 : For invoice with "/" in ref
 2017-12-11 14:47:07 +01:00
Laurent Destailleur
8189be0ac4 Fix warning 2017-12-11 14:17:26 +01:00
Laurent Destailleur
7efbcfa1e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-11 13:50:49 +01:00
Laurent Destailleur
338f8d978a Fix generation of doc in modulebuilder 2017-12-11 13:50:26 +01:00
Laurent Destailleur
acf2d2ee9a Fix scrutinizer reported bugs 2017-12-11 11:48:11 +01:00
Alexander Lampret
46aeb7068c public holiday in austria 2017-12-11 10:51:58 +01:00
Alexandre SPANGARO
7b935a96bf FIX : Various payment 2017-12-11 07:03:37 +01:00
Laurent Destailleur
066e04f33d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-12-11 00:22:05 +01:00
Laurent Destailleur
dbd96d1ac7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/loan/card.php
	htdocs/loan/class/loan.class.php
 2017-12-10 21:46:23 +01:00
Laurent Destailleur
d836d68801 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-10 21:29:35 +01:00
Laurent Destailleur
4017d09613 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-10 21:28:36 +01:00
Laurent Destailleur
fd85088a6c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-10 21:27:03 +01:00
Laurent Destailleur
1d9d8980a9 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-10 21:16:49 +01:00
Laurent Destailleur
e640831653
Merge pull request #7553 from atm-maxime/new_menu_expense_holidays 
Add detailed menus in HRM module
 2017-12-10 21:15:51 +01:00
Laurent Destailleur
c6c248fa28
Merge pull request #7930 from aspangaro/7.0-7 
Fix : Accountancy some cleaning
 2017-12-10 21:10:30 +01:00
Laurent Destailleur
d3150ede42
Merge pull request #7942 from delcroip/fixDeleteSalaries 
fix: unable to remove salaries, plus correct default rights management
 2017-12-10 21:09:15 +01:00
Laurent Destailleur
f18edd5787
Update security.lib.php 2017-12-10 21:08:13 +01:00
Laurent Destailleur
7e69a31dd6
Merge pull request #7941 from atm-maxime/fix_errmsg_stockneg 
Fix display error message when stock not enough on invoice validation #7846
 2017-12-10 21:05:23 +01:00
Laurent Destailleur
f7b663379a Fix PHP 7.2 2017-12-10 21:04:59 +01:00
Laurent Destailleur
3415ce4664
Merge pull request #7938 from aspangaro/7.0-b3 
FIX : Debug various_payment
 2017-12-10 20:59:45 +01:00
Laurent Destailleur
e01195f4f1
Merge pull request #7935 from aspangaro/7.0-b1 
FIX : v7 sql error on init database
 2017-12-10 20:58:05 +01:00
Laurent Destailleur
e4725f4248 FIX #7933 2017-12-10 20:55:51 +01:00
Laurent Destailleur
7d553f58f5 Debug website module 2017-12-10 20:34:35 +01:00
patrick Delcroix
033016da7f fix: unable to remove salaries, plus correct default rights management 2017-12-10 20:02:26 +01:00
Maxime Kohlhaas
12d0928244 Fix display error message when stock not enough on invoice validation 2017-12-10 19:59:56 +01:00
Laurent Destailleur
748aee9a54 Fix javascript error 2017-12-10 19:54:04 +01:00
Laurent Destailleur
d701a7617b Fix province nadorgg into nador 2017-12-10 19:04:21 +01:00
Laurent Destailleur
2dae21259e Fix the switch show more/less 2017-12-10 19:03:18 +01:00
Laurent Destailleur
e1f0483b23 Fix grabber of url when url is on second level dir. More phpunits 2017-12-10 17:59:19 +01:00
Laurent Destailleur
02d9e93ed4 Fix badge and use of data-html instead of html tag 2017-12-10 15:46:35 +01:00
Laurent Destailleur
4443c0f0a0 Fix style 2017-12-10 15:24:47 +01:00
Alexandre SPANGARO
ac95ccd872 FIX : Debug various_payment 2017-12-10 14:05:36 +01:00
Alexandre SPANGARO
cc2ea35c9a FIX : data 2017-12-10 08:46:50 +01:00
Alexandre SPANGARO
918f25983c FIX : v7 sql data 2017-12-10 08:27:13 +01:00
Maxime Kohlhaas
3db4d10fc0 Fix event late alert on third event list #7912 2017-12-10 08:12:49 +01:00
Alexandre SPANGARO
ff9c714f88 FIX : v7 sql error on init database 2017-12-10 08:02:57 +01:00
Alexandre SPANGARO
60fc500fa8 FIX : Edit accountancy account and warning message on loan 2017-12-10 07:00:46 +01:00
Laurent Destailleur
472d7b591e Fix hook for formmail and translation 2017-12-10 02:01:36 +01:00
Laurent Destailleur
57c7fa6ae9 Sync transifex 2017-12-10 01:17:32 +01:00
Laurent Destailleur
8d20473ffd Fix date of extrafields 2017-12-09 23:19:29 +01:00
Laurent Destailleur
1128b66b30 Fix ref of contract 2017-12-09 20:58:06 +01:00
Laurent Destailleur
e270295f5c Fix modulebuilder 2017-12-09 20:40:11 +01:00
Laurent Destailleur
cc813df2a5 Fix modulebuilder 2017-12-09 20:17:47 +01:00
Laurent Destailleur
f22e7ee24a Fixes 2017-12-09 17:29:19 +01:00
Laurent Destailleur
e3dcff7f5b Fix substition for menus title and urls 2017-12-09 15:35:01 +01:00
Alexandre SPANGARO
1269d98df2 Merge remote-tracking branch 'uptream/develop' into 7.0-7 
# Conflicts:
#	htdocs/accountancy/admin/export.php
#	htdocs/accountancy/class/accountancyexport.class.php
#	htdocs/accountancy/journal/expensereportsjournal.php
 2017-12-09 06:14:34 +01:00
Alexandre SPANGARO
065ef4e5c2 Fix : Accountancy some cleaning 2017-12-09 06:00:13 +01:00
Laurent Destailleur
47e9ab5738 Fix search on date on blocked logs 2017-12-09 00:40:22 +01:00
Laurent Destailleur
701ae7d21b Fix responsive 2017-12-08 20:15:28 +01:00
Laurent Destailleur
3ef215c3eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-08 19:23:41 +01:00
Laurent Destailleur
a5bdadf432 Fix menu with smartphone 2017-12-08 19:23:13 +01:00
alexis Algoud
9dfe309ef2 NEW filter date for blockedlog 2017-12-08 17:15:24 +01:00
Laurent Destailleur
3ddc582edd
Merge pull request #7913 from atm-ph/fix_6.0_var_name 
Fix $boad instead of $board
 2017-12-08 16:55:28 +01:00
Laurent Destailleur
95cb5025a2 Fix length of month too large 
More complete template
 2017-12-08 16:15:41 +01:00
florian HENRY
eb03f8f08e fix MAIN_COPY_FILE_IN_EVENT_AUTO 2017-12-08 15:03:42 +01:00
Laurent Destailleur
56b5eab2e4
Merge pull request #7911 from atm-alexis/NEW_blockedlog_reset_warning 
NEW warning on module blocked log reset if country code is FR
 2017-12-08 13:47:44 +01:00
Laurent Destailleur
2c62ea5fac
Merge pull request #7915 from ATM-Marc/NEW_hook_openelements_dashboard 
New hook to extend homepage open elements dashboard
 2017-12-08 13:39:52 +01:00
Laurent Destailleur
ac56e61cdf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-08 13:14:12 +01:00
Laurent Destailleur
f85e79e250 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/filefunc.inc.php
	htdocs/holiday/class/holiday.class.php
 2017-12-08 13:13:53 +01:00
Laurent Destailleur
b671edb116 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-08 13:10:30 +01:00
Laurent Destailleur
09d3db145b Merge 2017-12-08 13:10:13 +01:00
Laurent Destailleur
c2ad58895f
Merge pull request #7919 from atm-maxime/link_create_event 
Fix : link to create action is not a button but a top list link
 2017-12-08 13:02:21 +01:00
Laurent Destailleur
8dc3d7323d
Merge pull request #7923 from fmarcet/6.0 
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
 2017-12-08 13:02:07 +01:00
Laurent Destailleur
9b9b5adf66
Fix must be compatible with old and new storage location 2017-12-08 13:01:45 +01:00
Laurent Destailleur
08abb1490a
Remove code using not defined var 2017-12-08 12:54:08 +01:00
Laurent Destailleur
8a5c53550b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-08 12:43:53 +01:00
Laurent Destailleur
e526162e8e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-08 12:42:22 +01:00
Laurent Destailleur
acd4e0b083 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-08 12:38:33 +01:00
Laurent Destailleur
df5768c176 Fix missing translation 2017-12-08 12:38:22 +01:00
Regis Houssin
1b16eb731d Fix: missing load product translation file 2017-12-08 11:00:23 +01:00
Regis Houssin
1bdffa961f Fix: wrong translation if multilang activated 2017-12-08 10:41:14 +01:00
Laurent Destailleur
f0bdf3a537
Merge pull request #7917 from IonAgorria/fix-7914 
FIX #7914: More informative error message in dynamics prices
 2017-12-08 10:41:06 +01:00
Laurent Destailleur
50150cf897
Merge pull request #7918 from atm-maxime/develop 
Fix scrutinizer
 2017-12-08 10:35:24 +01:00
Laurent Destailleur
7e358afa39
Merge pull request #7920 from atm-maxime/fix_button_createevent 
Fix : no need for action button on cards, link is now available
 2017-12-08 10:35:10 +01:00
alexis Algoud
62cd77d999 NEW automatic activation of external module on country set 2017-12-08 10:13:03 +01:00
Regis Houssin
04327189f7 Fix: access error when user not right to view all customers 2017-12-08 09:41:33 +01:00
Regis Houssin
c4b2c3e697 FIXME $accounts[$bid] is a label ! 2017-12-08 09:17:12 +01:00
Regis Houssin
8e1a9064cb Fix: avoid warning again 2017-12-08 09:00:05 +01:00
Regis Houssin
95fa183fac Fix: Avoid warning "A non-numeric value encountered" 2017-12-08 08:49:03 +01:00
Laurent Destailleur
cf5265d405 Minor fix 2017-12-07 21:44:12 +01:00
Ferran Marcet
bfc476a118 FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable 2017-12-07 18:44:33 +01:00
Maxime Kohlhaas
6b278a6740 Add icons on home page menu 2017-12-07 16:01:52 +01:00
Maxime Kohlhaas
8a39e2a413 Fix : no need for action button on cards, link is now available 2017-12-07 00:36:23 +01:00
Maxime Kohlhaas
3fb8ec5067 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_menu_expense_holidays 2017-12-06 23:52:02 +01:00
Maxime Kohlhaas
2a64eb2983 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-12-06 23:45:37 +01:00
Maxime Kohlhaas
50203cdf01 Fix : link to create action is not a button but a top list link 2017-12-06 23:44:34 +01:00
Laurent Destailleur
74a63ca18c Fix scrutinizer 2017-12-06 23:43:59 +01:00
Laurent Destailleur
98149ae316 Fix regression 2017-12-06 23:31:42 +01:00
Maxime Kohlhaas
0fa77160d9 Fix scrutinizer 2017-12-06 23:21:58 +01:00
Ion
669e080670 More informative error message in dynamics price 2017-12-06 14:51:29 +01:00
atm-ph
c90ece1188 Fix include class WorkboardResponse 2017-12-06 14:22:37 +01:00
Marc de Lima Lucio
d43acefac4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_hook_openelements_dashboard 2017-12-06 12:39:50 +01:00
Marc de Lima Lucio
32d911b1df NEW: hook to enrich homepage open elements dashboard 2017-12-06 12:31:00 +01:00
atm-ph
c70dff89dd Fix $boad instead of $board 2017-12-06 12:13:15 +01:00
Laurent Destailleur
56b0279ed7 Fix translation 2017-12-05 20:46:36 +01:00
Laurent Destailleur
2c19c0a10e Fix test 2017-12-05 20:16:28 +01:00
Laurent Destailleur
c6e1087834 Fix test on vat amount 2017-12-05 19:47:46 +01:00
Laurent Destailleur
21ba8509c9
Merge pull request #7910 from ATM-Nicolas/6.0_fix_project_conf 
NEW link project from other company conf
 2017-12-05 19:18:07 +01:00
Alexis Algoud
ad46bf9a94 NEW option to avoid countries to disable there blockedlog 2017-12-05 18:30:48 +01:00
Alexis Algoud
cc9b55cb45 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_blockedlog_reset_warning 2017-12-05 18:08:53 +01:00
Laurent Destailleur
5ab7fa7422 Fix location on good page 2017-12-05 15:48:24 +01:00
Laurent Destailleur
3a9bf455e2 FIX #7870 2017-12-05 13:38:24 +01:00
Laurent Destailleur
93311e3817 FIX #7885 2017-12-05 12:31:57 +01:00
ATM-Nicolas
bdf1e30ef3
Merge branch 'develop' into 6.0_fix_project_conf 2017-12-05 12:20:48 +01:00
Laurent Destailleur
340287f073 FIX #7903 
Conflicts:
	htdocs/holiday/class/holiday.class.php
 2017-12-05 11:56:32 +01:00
Laurent Destailleur
365639a6c0 Prepare 6.0.5 2017-12-05 11:54:26 +01:00
Laurent Destailleur
22d61426a1 FIX #7903 2017-12-05 11:53:19 +01:00
alexis Algoud
a2df87ab15 NEW warning on module blocked log reset if country code is FR 
fix wrong paste click
 2017-12-05 11:40:42 +01:00
Laurent Destailleur
8019f73f99 Fix: protection to not delete invoice if invoice is in bookkeeping 2017-12-05 10:01:30 +01:00
ATM-Nicolas
36bcd26e27 FIX : link project from other company conf 2017-12-05 09:21:24 +01:00
Laurent Destailleur
78c4b7f912 Fix look and feel v7 2017-12-04 20:17:07 +01:00
Laurent Destailleur
c1791b87b4 Fix status tracked 2017-12-04 18:04:52 +01:00
Laurent Destailleur
c6d035392f Fix status message inverted 2017-12-04 17:58:21 +01:00
Laurent Destailleur
db4a96c96b Add payment delete into blockedlog 2017-12-04 17:55:22 +01:00
Laurent Destailleur
3cd7d0af11 Fix ref of invoice in blockedlog 2017-12-04 17:51:05 +01:00
Laurent Destailleur
0e4f82439b Add event BILL_DELETE into blockedlog module 2017-12-03 21:47:37 +01:00
Laurent Destailleur
2e2ab54d19 Fix parameter in delete line 2017-12-03 20:51:26 +01:00
Laurent Destailleur
d2adec01b0 Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice 2017-12-03 20:18:00 +01:00
Laurent Destailleur
58edc06ac3 Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice 2017-12-03 20:15:04 +01:00
Laurent Destailleur
b41213f9a1 Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice 2017-12-03 20:08:53 +01:00
Laurent Destailleur
9b5f7099f7 Code comment 2017-12-03 19:50:15 +01:00
Laurent Destailleur
cc05bb3c8c Fix duplicate errors 2017-12-03 19:36:59 +01:00
Laurent Destailleur
1b3680c200 Fix missing css 2017-12-03 12:21:38 +01:00
Laurent Destailleur
11286dee4a Delete of payment 2017-12-03 11:59:16 +01:00
Laurent Destailleur
9f1eba6b75 Fix write in blockedlog 2017-12-03 11:48:09 +01:00
Laurent Destailleur
081d31a56e Debug php backup for new mysql version 2017-12-03 11:45:34 +01:00
Laurent Destailleur
2458244ee3 Fix css 2017-12-02 16:24:38 +01:00
Laurent Destailleur
0a6633da6e Fix error message 2017-12-02 15:56:56 +01:00
Laurent Destailleur
5d7214c4e8 Sync transifex 2017-12-02 15:20:59 +01:00
Laurent Destailleur
1f4a079f01 Fix bug reported by scrutinizers 2017-12-02 15:03:14 +01:00
Laurent Destailleur
e57c8f324d Fix style 2017-12-02 14:57:27 +01:00
Laurent Destailleur
f51c96a7c6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-02 14:15:59 +01:00
Laurent Destailleur
38be224665 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-02 14:14:26 +01:00
Laurent Destailleur
29568287ef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-02 14:13:44 +01:00
Laurent Destailleur
5fae19b4d6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-02 14:13:29 +01:00
Laurent Destailleur
c7d0e917fb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-12-02 14:12:43 +01:00
Laurent Destailleur
9cafb08759
Merge pull request #7853 from atm-ph/fix_5.0_invoice_updateline_calcul_price_total 
Fix product type is ignored and can generate a diffrent result with s…
 2017-12-02 14:06:25 +01:00
Laurent Destailleur
dc04ab3164 Missing field in website module 2017-12-02 13:24:21 +01:00
Laurent Destailleur
7b47ef3ca1 Change order or field 2017-12-02 11:34:56 +01:00
Laurent Destailleur
fa8b913d24 Change order or field 2017-12-02 11:24:33 +01:00
Laurent Destailleur
e8327fd9a1 Fix the eatby/sellby date was not visible. 2017-12-02 10:43:01 +01:00
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
46b281f703 Fix for #7697 2017-12-01 19:29:29 +01:00
Laurent Destailleur
89ef597690 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-01 18:12:52 +01:00
Laurent Destailleur
64d29709d5 FIX #7881 error not reported/blocking when subprodut need lot 2017-12-01 18:12:29 +01:00
Laurent Destailleur
4969ae2abb Fix missing the badge on virtual product tab 2017-12-01 17:48:51 +01:00
Laurent Destailleur
9ed679d19a FIX #7882 2017-12-01 17:22:32 +01:00
Laurent Destailleur
03fd69c3b9 Fix missing lang 2017-12-01 16:48:43 +01:00
Laurent Destailleur
e36b62f539
Merge pull request #7900 from fappels/7.0_fix_warehouse_label_ref- 
Fix dispatch not adapted for label to ref change for warehouse
 2017-12-01 16:26:21 +01:00
Laurent Destailleur
1ce155728f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
 2017-12-01 16:25:13 +01:00
fappels
1c72dc608f Fix travis 2017-12-01 16:22:34 +01:00
Laurent Destailleur
a832bbb348 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
 2017-12-01 16:18:03 +01:00
Laurent Destailleur
c8f661021c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-01 15:58:58 +01:00
Laurent Destailleur
471f99c24c Fix look and feel v7 2017-12-01 15:58:35 +01:00
Laurent Destailleur
1d2b5dbe97
Merge pull request #7892 from atm-maxime/fix_contactlist_empty 
Fix filters on contact list must always appear
 2017-12-01 15:54:03 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
e3671da37f Fix edit shipment line when line is a not predefined product 2017-12-01 14:33:06 +01:00
Laurent Destailleur
09e611aa21 Move status of blockedlog to experimental 2017-12-01 13:41:37 +01:00
Laurent Destailleur
46b015d205 Fix usage of option STOCK_SUPPORTS_SERVICES 2017-12-01 13:40:24 +01:00
fappels
cec490dff5 Fix dispatch not adapted for label to ref change for warehouse 2017-12-01 12:57:56 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
670465fcd8 Fix responsive and search 2017-12-01 12:01:17 +01:00
Laurent Destailleur
b871c7e6ca Translation key 2017-11-30 15:16:01 +01:00
Laurent Destailleur
25bccfde8b Debug blockedlog module 2017-11-30 15:13:23 +01:00
Laurent Destailleur
6796c08cb8 Debug/rewrite Blockedlog 2017-11-30 14:21:55 +01:00
Alexis ALGOUD
b2effa7cc8
fix travis 2017-11-30 11:36:35 +01:00
Laurent Destailleur
39fdd1b37d Use correct link to changelog 2017-11-30 11:16:28 +01:00
root
b7f26ea788 FIX add line bad price and ref 2017-11-30 11:10:01 +01:00
Laurent Destailleur
dc692f333d Work on blockedlog 2017-11-30 10:45:55 +01:00
Maxime Kohlhaas
879a0812d7 Fix filters on contact list must always appear 2017-11-29 20:04:15 +01:00
Laurent Destailleur
33032a5474 Look and feel v6 2017-11-29 18:13:22 +01:00
Laurent Destailleur
c269dcc4d5 Fix scrutinizer 2017-11-29 17:58:13 +01:00
Laurent Destailleur
9508c3e0b9 Fix trigger was not called 2017-11-29 16:34:44 +01:00
Laurent Destailleur
4245ad6e2a Return error messages 2017-11-29 16:26:19 +01:00
Laurent Destailleur
682afe8918 Fix scrutinizer 2017-11-29 16:25:12 +01:00
Laurent Destailleur
2693e5db6d Fix the trigger COMPANY_MODIFY provide information of thirdparty merged 2017-11-29 16:24:58 +01:00
Laurent Destailleur
acd2d0121d
Merge pull request #7886 from ptibogxiv/patch-8 
Fix for multicompany
 2017-11-29 15:31:21 +01:00
Laurent Destailleur
9fa6bfd1a5 Fix edit external user or not 2017-11-29 15:30:41 +01:00
Laurent Destailleur
dbde97f25f
Update card.php 2017-11-29 15:07:09 +01:00
Laurent Destailleur
9af3ff2926
Merge pull request #7883 from hregis/develop_member 
Fix: move default fields before extrafields for best visibility
 2017-11-29 15:03:39 +01:00
gauthier
f04af6c1b3 FIX : test for filter fk_status 2017-11-29 11:06:33 +01:00
ptibogxiv
c194538609
Update fraise.modules.php 2017-11-29 10:45:16 +01:00
Laurent Destailleur
755b7a2717 Start 7.0 beta 2017-11-29 09:34:55 +01:00
ptibogxiv
883c9dbf99
Fix for multicompany 
last fix for multicompany compliance
 2017-11-29 09:28:03 +01:00
jfefe
d0ab117488
FIX : external user cannot be set as internal 2017-11-28 15:06:23 +01:00
Regis Houssin
310e91ad01 Fix: move default fields before extrafields for best visibility 2017-11-28 13:10:21 +01:00
Laurent Destailleur
9dcec5d6cf Sync transifex 2017-11-28 12:32:23 +01:00
Laurent Destailleur
3b98a06ebb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
 2017-11-28 12:18:01 +01:00
Laurent Destailleur
07bdd3213a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-28 12:16:13 +01:00
Laurent Destailleur
430c72bf0f
Merge pull request #7879 from ptibogxiv/patch-7 
fix for multicompany in mailing
 2017-11-28 12:16:00 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search 
factorization of extrafields into list
 2017-11-28 12:14:47 +01:00
Laurent Destailleur
222c53a756
Merge pull request #7877 from atm-alexis/fix_print_password_is_clear_after_login 
fix print password is visible into link after login
 2017-11-28 12:13:37 +01:00
Laurent Destailleur
3071796bc3
Merge pull request #7876 from ptibogxiv/patch-6 
fix for multicompany
 2017-11-28 12:12:50 +01:00
Laurent Destailleur
f8d6897888 Fix bug 2017-11-28 12:08:04 +01:00
Laurent Destailleur
b14cb7a97f Debug accountancy 2017-11-28 11:49:11 +01:00
Laurent Destailleur
ef786f2271 Debug accountancy module 2017-11-28 11:31:55 +01:00
Laurent Destailleur
a15a57317b Debug accountancy module 2017-11-28 11:12:13 +01:00
Laurent Destailleur
b63fb1f854 Support of VAT NPR in accounting module 2017-11-27 22:18:10 +01:00
Laurent Destailleur
a9d3e90b70 Big debug of accountancy module 2017-11-27 21:53:22 +01:00
ptibogxiv
10b0eafba7
Update fraise.modules.php 2017-11-27 18:12:52 +01:00
Laurent Destailleur
48f226a825 Fix translation 2017-11-27 17:15:03 +01:00
Laurent Destailleur
533a82187a NEW Add a protection so we can't journalize non balanced transactions 2017-11-27 17:12:48 +01:00
ptibogxiv
ea9071512d
Update fraise.modules.php 2017-11-27 17:08:15 +01:00
Laurent Destailleur
8954d52e32 Fix edit dictionary 2017-11-27 16:07:48 +01:00
ptibogxiv
0a5a50263d
fix for multicompany 2017-11-27 16:07:40 +01:00
Laurent Destailleur
57d4f28cba Enhance usability of accounting module 2017-11-27 15:51:28 +01:00
ptibogxiv
a9e4fcfdca
Update fraise.modules.php 2017-11-27 15:49:28 +01:00
alexis Algoud
e6f7fe4ce6 fix print password is visible into link after login 2017-11-27 15:29:19 +01:00
florian HENRY
94285ae494 factorization of extrafeild into list 2017-11-27 15:24:29 +01:00
ptibogxiv
780e8ce470
fix for multicompany 2017-11-27 15:13:14 +01:00
ptibogxiv
2e9952439e
Fix stat don in multicompany 2017-11-27 15:03:34 +01:00
Laurent Destailleur
de115f8150 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-27 14:56:59 +01:00
Laurent Destailleur
b55d085f2d
Merge pull request #7872 from atm-alexis/fix_include_for_ajax_select_product_supplier_order 
fix include for ajax select product supplier order
 2017-11-27 14:55:11 +01:00
Laurent Destailleur
c77b39bf1e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-27 14:52:51 +01:00
Laurent Destailleur
807bfbb696
Merge pull request #7867 from frederic34/bank 
info bank
 2017-11-27 14:50:00 +01:00
Scrutinizer Auto-Fixer
aab2799981 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-11-27 13:48:36 +00:00
Laurent Destailleur
bdd56ae925 Picto 2017-11-27 14:42:11 +01:00
Laurent Destailleur
f9e99e93c3 Fux utf8 trouble on direct printing message 2017-11-27 14:34:29 +01:00
Laurent Destailleur
69725fe62f Fix setup of direct print with google docs driver 2017-11-27 13:55:27 +01:00
Laurent Destailleur
43c60ec224 Fix error management at wrong place 2017-11-27 13:45:59 +01:00
atm-ph
5fef6478a5 Fix wrong calcul_price_total() update 2017-11-27 11:26:41 +01:00
alexis Algoud
61a3131fc4 fix include for ajax select product supplier order 2017-11-27 10:59:46 +01:00
Laurent Destailleur
cf274a7e3f Fix CSS 2017-11-26 22:23:21 +01:00
Laurent Destailleur
b142ac1c06 CSS 2017-11-26 22:12:11 +01:00
Laurent Destailleur
e4d0213916 Removed duplicate code 2017-11-26 22:06:14 +01:00
Laurent Destailleur
d340d7bae5 Fix CSS 2017-11-26 21:56:41 +01:00
Laurent Destailleur
ffe2be377c Fix navigation 2017-11-26 20:43:37 +01:00
Laurent Destailleur
a0406bc741 Standardize view of events for products 2017-11-26 20:24:20 +01:00
Laurent Destailleur
ae906270f3 Debug module variant 2017-11-26 18:43:43 +01:00
Laurent Destailleur
2c07886360 Debug module variant 2017-11-26 15:08:00 +01:00
Laurent Destailleur
1ec6c13ece Debug module variant 2017-11-26 10:13:32 +01:00
Laurent Destailleur
8352aee9f7 NEW Add option EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS 2017-11-26 00:14:54 +01:00
Laurent Destailleur
5bdb7d1b98 Fix line "none" must not be visible if there is lines 2017-11-25 23:28:00 +01:00
Laurent Destailleur
6a9056a924 Fix line "none" must not be visible if there is lines 2017-11-25 23:26:14 +01:00
Laurent Destailleur
7e40ee5e4b Fix substitution key for constant ok with php 5.3 2017-11-25 23:16:15 +01:00
Laurent Destailleur
a48fe55832 Fix language file of external module not visible in trans tool 2017-11-25 22:53:58 +01:00
Laurent Destailleur
c02528a479 NEW Accept substitution key __[ABC]__ replaced with value of const ABC 2017-11-25 19:55:31 +01:00
Laurent Destailleur
5935ad868a Fix the from robot must be visible only on test page 2017-11-25 19:23:27 +01:00
Laurent Destailleur
3d48e509bd Clean code 2017-11-25 19:16:15 +01:00
Laurent Destailleur
2fc5d9fefb The form to test email can now use all sending profiles. 2017-11-25 18:52:47 +01:00
Laurent Destailleur
a529725c5c Fix lang code must be null if not defined 2017-11-25 17:42:46 +01:00
Laurent Destailleur
e6b16815aa Fix responsive 2017-11-25 17:25:27 +01:00
Laurent Destailleur
e1484caa59 Fix responsive 2017-11-25 17:21:53 +01:00
Laurent Destailleur
4c8b8dcba5 Fix sort order 2017-11-25 16:53:37 +01:00
Laurent Destailleur
9b8011f75b Fix class not found 2017-11-25 16:52:04 +01:00
Laurent Destailleur
1ea9137863 Fix sort order 2017-11-25 16:21:44 +01:00
Laurent Destailleur
5ba4a57b61 Fix sort on last actions 2017-11-25 16:05:45 +01:00
Laurent Destailleur
e99f190ff1 Save search context on list of template invoices 2017-11-25 15:56:36 +01:00
Laurent Destailleur
dbcb38dd3b Use short label on table 2017-11-25 15:13:39 +01:00
Laurent Destailleur
1d97dd2bd8 NEW can filter on status of template invoices 2017-11-25 15:08:19 +01:00
Laurent Destailleur
bb1efb42ce Update doc 2017-11-25 14:58:16 +01:00
Laurent Destailleur
6a8388dd57 Add table for online signature 2017-11-25 14:11:34 +01:00
Laurent Destailleur
5bc2b34386 Fix error in api to get a member 2017-11-25 13:30:08 +01:00
Laurent Destailleur
7d3325c087 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/dolibarr_changes.txt
	htdocs/user/class/api_users.class.php
 2017-11-25 13:17:38 +01:00
Laurent Destailleur
77509ee37a Removed deprecated apis 2017-11-25 13:14:28 +01:00
Laurent Destailleur
a5dda258cd Fix scrutinizer 2017-11-25 12:18:23 +01:00
Frédéric FRANCE
6a91b16995
info bank 2017-11-25 12:13:03 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
Laurent Destailleur
944d666d1a Fix bugs 2017-11-25 11:27:24 +01:00
Laurent Destailleur
aaf08ade2f Fix bug reported by scrutinizer 2017-11-25 11:21:31 +01:00
Laurent Destailleur
412c4e335d Fix method of herited object has same signature than parent 2017-11-25 11:10:52 +01:00
Laurent Destailleur
61798d1af0 FIX list of module not complete when module mb_strlen not available 
Conflicts:
	dev/dolibarr_changes.txt
 2017-11-25 02:34:24 +01:00
Laurent Destailleur
bdecef56f9 FIX list of module not complete when module mb_strlen not available 2017-11-25 02:32:25 +01:00
Laurent Destailleur
88841ccbae FIX #7590 2017-11-25 01:58:11 +01:00
Laurent Destailleur
4cbcf5189a FIX #7806 2017-11-25 01:24:24 +01:00
Laurent Destailleur
38c770ffb3 FIX #7806 2017-11-25 01:16:12 +01:00
Laurent Destailleur
d90f68837a Missing migration line 2017-11-25 00:59:25 +01:00
Laurent Destailleur
0ec8c3c296
Merge branch 'develop' into patch-34 2017-11-25 00:57:10 +01:00
Laurent Destailleur
6876049779
Update 4.0.0-5.0.0.sql 2017-11-25 00:56:24 +01:00
Laurent Destailleur
b8251bac97 Fix rename files with accents 2017-11-25 00:48:19 +01:00
Laurent Destailleur
4cff4c6935 Simplify and standardize code for agenda pages 2017-11-25 00:12:45 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
7ea96d53a2 Minor fixes 2017-11-24 18:12:01 +01:00
Laurent Destailleur
63d2d38c5f Fix export stock with lot 2017-11-24 17:47:40 +01:00
Laurent Destailleur
8659d97e97 Fix export of lot must use properties of lot from product_lot 2017-11-24 17:44:19 +01:00
Laurent Destailleur
4f4f929efb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/holiday/class/holiday.class.php
 2017-11-24 17:02:14 +01:00
Laurent Destailleur
07cd1fb3c2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-11-24 16:54:38 +01:00
Laurent Destailleur
2493c2468d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/core/lib/files.lib.php
 2017-11-24 16:51:59 +01:00
Laurent Destailleur
0370368d04 Restore lost field during merge 2017-11-24 16:46:50 +01:00
Laurent Destailleur
d7f5f14f46
Merge branch 'develop' into new_export_stock_valo 2017-11-24 16:40:36 +01:00
Laurent Destailleur
c2f84309db
Update holiday.class.php 2017-11-24 16:38:52 +01:00
Laurent Destailleur
9836f42bc8
Merge pull request #7862 from atm-john/add_puschasesjournal_hook 
Add new doActions hook
 2017-11-24 16:37:26 +01:00
Laurent Destailleur
06de67cb8a
Update purchasesjournal.php 2017-11-24 16:37:19 +01:00
Laurent Destailleur
b052722cf1
Merge pull request #7861 from hregis/develop_member 
Fix: wrong table name and id field name
 2017-11-24 16:36:22 +01:00
Laurent Destailleur
e22d13cf55
Merge pull request #7860 from IonAgorria/resources-country 
Add country to resource
 2017-11-24 16:35:52 +01:00
Laurent Destailleur
aa2397ff1d
Merge pull request #7859 from vvnt/patch-9 
modPropale.class.php permissions in English
 2017-11-24 16:34:02 +01:00
Laurent Destailleur
8bd2707678
Merge pull request #7858 from vvnt/patch-8 
modFacture.class.php permissions in English
 2017-11-24 16:33:42 +01:00
Laurent Destailleur
a18824050c
Merge pull request #7857 from vvnt/patch-7 
modSociete.class.php permissions in English
 2017-11-24 16:33:22 +01:00
Laurent Destailleur
21764ed0cf
Merge pull request #7856 from frederic34/patch-1 
Update html.form.class.php
 2017-11-24 16:33:00 +01:00
Laurent Destailleur
438a68968f Fix regression 2017-11-24 16:28:24 +01:00
Laurent Destailleur
831099fef8 Debug modulebuilder 2017-11-24 16:24:42 +01:00
Laurent Destailleur
5ee85821fc Debug modulebuilder 2017-11-24 15:47:38 +01:00
Laurent Destailleur
9f235e1ff6 Standardize database: field ref of warehouse was renamed label -> ref 2017-11-24 15:27:00 +01:00
Laurent Destailleur
3db52b5f9e Debug responsive of v7 2017-11-24 14:23:25 +01:00
Laurent Destailleur
8450c78dff Fix warning on late surveys 2017-11-24 10:06:42 +01:00
Laurent Destailleur
6d5f2b2f21 Fix filters on surveys 2017-11-24 10:00:46 +01:00
Laurent Destailleur
f0d0969a3b Better name for generated page of barcodes 2017-11-24 09:30:21 +01:00
Laurent Destailleur
abe13d108b Clean code used for autocompletion 2017-11-24 09:23:18 +01:00
Laurent Destailleur
9c22b5f335 Replace deprecated dol_print_graph with DolGraph 2017-11-23 20:24:05 +01:00
Laurent Destailleur
38ef5890dc Replace deprecated dol_print_graph with DolGraph 2017-11-23 18:47:24 +01:00
Maxime Kohlhaas
cad2fedf70 New add pmp and cost price in product stock export 2017-11-23 18:41:48 +01:00
Laurent Destailleur
5cf21fef05 Use autocompletion on list of taxes 2017-11-23 15:46:52 +01:00
Laurent Destailleur
39d00b2ea9 Standardize code 2017-11-23 15:24:25 +01:00
Laurent Destailleur
9bc6acdf0e Fix syntax error 2017-11-23 15:23:45 +01:00
Laurent Destailleur
6a3dc91414 Standardize code 2017-11-23 15:22:32 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
atm-quentin
314c30f489 FIX too much users on holiday list 2017-11-23 14:26:26 +01:00
Laurent Destailleur
295b4483d4 Enhance the repair.php tool 2017-11-23 13:23:16 +01:00
Regis Houssin
2a7b04e795 Fix: wrong table name and id field name 2017-11-23 12:18:49 +01:00
John
d8f18e18ce Add new doActions hook 2017-11-23 12:08:33 +01:00
Laurent Destailleur
b22dfcf533 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-23 09:49:25 +01:00
Laurent Destailleur
657d1137c0 Disable field if overwrite transaction is off 2017-11-23 09:49:15 +01:00
Frédéric FRANCE
0ee30171db
Update html.form.class.php 2017-11-23 08:36:10 +01:00
Laurent Destailleur
5b77fe393e Fix: contact not preselected 2017-11-23 00:59:43 +01:00
Ion
6428c2157c Add country to resource 2017-11-23 00:26:25 +01:00
vvnt
09f4abd38e
modPropale.class.php permissions in English 2017-11-22 23:22:43 +01:00
vvnt
10ba9a2fee
modFacture.class.php permissions in English 2017-11-22 23:16:15 +01:00
vvnt
1b646f755d
modSociete.class.php permissions in English 2017-11-22 23:11:36 +01:00
Laurent Destailleur
5a2fe13958 Fix travis 2017-11-22 21:36:01 +01:00
Laurent Destailleur
b0cecab22b Removed useless code 2017-11-22 21:26:24 +01:00
Laurent Destailleur
240f67d82b Disable tab if not on develop mode 2017-11-22 21:23:42 +01:00
Laurent Destailleur
5fa8db1650 Work on timesheets 2017-11-22 21:19:40 +01:00
Laurent Destailleur
1e4844fd1c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-11-22 17:25:49 +01:00
Laurent Destailleur
e1344eb97c Fix edit of time spent 2017-11-22 17:25:31 +01:00
Laurent Destailleur
b405a877b9 Use automcomplete on resource combo list 2017-11-22 14:47:35 +01:00
Laurent Destailleur
adce4b5b7b Debug multi contact on event. 
Prepare also code to manage properties of attendees of event
 2017-11-22 14:42:47 +01:00
atm-ph
219e58d0e4 Fix product type is ignored and can generate a diffrent result with situation invoice 2017-11-22 12:15:02 +01:00
Laurent Destailleur
fd5cb736ce
Merge pull request #6961 from atm-ph/new_event_with_multi_contact 
New multi contacts on actioncomm
 2017-11-22 12:05:04 +01:00
Laurent Destailleur
1509a4f125
Merge pull request #7840 from frederic34/bankjournal 
align export bankjournal on others
 2017-11-22 11:57:27 +01:00
Laurent Destailleur
aa91b9075a Fix cancel button 2017-11-22 11:54:02 +01:00
Laurent Destailleur
d2b3fc5813
Merge pull request #7849 from IonAgorria/resources-card 
NEW: Merge resource/add.php to resource/card.php
 2017-11-22 11:33:56 +01:00
Laurent Destailleur
30d0c4f210
Merge pull request #7845 from vvnt/patch-6 
modSociete.class.php (spelling correction)
 2017-11-22 11:33:03 +01:00
Laurent Destailleur
918a51b9da
Merge pull request #7844 from vvnt/patch-5 
modPropale.class.php (spelling correction)
 2017-11-22 11:28:25 +01:00
Laurent Destailleur
f6cc441c2e
Merge pull request #7843 from vvnt/patch-4 
Update modFacture.class.php (Spelling correction)
 2017-11-22 11:28:05 +01:00
Laurent Destailleur
7c3dcc076a
Merge pull request #7835 from ptibogxiv/patch-3 
Fix import date
 2017-11-22 11:23:35 +01:00
Laurent Destailleur
9a75cb466a
Merge pull request #7834 from ptibogxiv/patch-2 
FIX list of donation not filtered on multicompany
 2017-11-22 11:23:13 +01:00
Laurent Destailleur
62da0160e1
Merge pull request #7780 from fappels/develop_update_tablednd 
FIX #3551 and #6823 table drag and drop not working.
 2017-11-22 11:22:14 +01:00
Laurent Destailleur
e0cd0bd7ee
Merge pull request #7833 from elarifr/patch-accountancy-export-class 
FIX Export to Quadra format date is wrong
 2017-11-22 11:19:42 +01:00
Laurent Destailleur
46d1318a32
Merge pull request #7828 from papoteur-mga/develop 
Fix:[proposals]Allow lines to be added from REST API
 2017-11-22 11:16:32 +01:00
Laurent Destailleur
c3d8ef2104
Update functions.lib.php 2017-11-22 11:14:52 +01:00
Regis Houssin
a9bfe0f48f Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876) 2017-11-22 10:12:51 +01:00
Regis Houssin
848a27283b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member 2017-11-22 09:51:57 +01:00
Regis Houssin
1595bb1148 NEW add possibility to remove address field 2017-11-22 09:51:46 +01:00
Ion
7c6622f5b3 Merge resource/add.php to resource/card.php 2017-11-21 20:12:55 +01:00
vvnt
c74eef03dd
modSociete.class.php (spelling correction) 
Minor spelling correction.
 2017-11-21 15:17:02 +01:00
vvnt
005be3f69b
modPropale.class.php (spelling correction) 
Minor spelling correction
 2017-11-21 15:13:13 +01:00
vvnt
98998a7060
Update modFacture.class.php 2017-11-21 15:07:53 +01:00
Laurent Destailleur
2b95679b84 Add info to help spam fight 2017-11-21 14:09:15 +01:00
Laurent Destailleur
9bdd31e05a Module builder 2017-11-21 12:28:34 +01:00
Laurent Destailleur
533979987f Work on module builder 2017-11-21 11:56:49 +01:00
Laurent Destailleur
a630e665d9 Work on modulebuilder 2017-11-21 11:50:57 +01:00
Laurent Destailleur
ff9a62e519 Fix trackid from emailings 2017-11-21 11:15:33 +01:00
Laurent Destailleur
4b4412d5da Standardize file names for ECM 2017-11-20 19:40:34 +01:00
Laurent Destailleur
e19ca7b6d4 Work on generic filemanager 2017-11-20 18:19:41 +01:00
Frédéric FRANCE
6d33cc3980
align export bankjournal on others 2017-11-20 15:02:11 +01:00
fappels
8d318337d9 Check hound barking 2017-11-20 14:56:12 +01:00
fappels
37caa28e7e Update tablednd to v1.0 RC 2017-11-20 10:25:02 +01:00
Laurent Destailleur
818f43e7ad Work on generic filemanager 2017-11-19 22:04:24 +01:00
ptibogxiv
16e791913f
Fix import date 
fix import date when creation
 2017-11-19 21:56:50 +01:00
ptibogxiv
5d6555b9dd
Update list.php 2017-11-19 21:54:14 +01:00
ptibogxiv
3f360601af
Fix entity 
Fix entity in list.php
 2017-11-19 21:52:18 +01:00
Laurent Destailleur
6953420ce8 Support for ar_EG as laternative of ar_AS 2017-11-19 21:25:21 +01:00
Laurent Destailleur
5849efd9fc Work on public sharing files 2017-11-19 20:44:57 +01:00
Laurent Destailleur
04091e2c1a Sync transifex 2017-11-19 20:43:04 +01:00
Laurent Destailleur
e4b91ceb38 Add ar_EG 2017-11-19 20:33:06 +01:00
elarifr
c7129cdd71 quadra format date is wrong 
need amount in cent without decimal symbol
need to remove accent as it give two ascii and break import
 2017-11-19 19:42:16 +01:00
Laurent Destailleur
4ad0d5df43 Fix scrutinizer issues 2017-11-19 16:55:28 +01:00
Laurent Destailleur
248a359ac9 Fix phpcs 2017-11-19 16:30:05 +01:00
Laurent Destailleur
304819a726 Work on module builder 2017-11-19 16:26:39 +01:00
ptibogxiv
35182066a8
update createfromorder 
lack of 2 fields date_start and date_end not imported from order
 2017-11-19 16:25:35 +01:00
Laurent Destailleur
4938a0ba2a Add param forcenowrap on tooltip function 2017-11-19 12:41:37 +01:00
Laurent Destailleur
47afe470eb Merge small js into lib_header.js.php 
Move filemanager.tpl.php
CSS enhancement
 2017-11-19 12:22:01 +01:00
Papoteur
dfffd7497e Correction of the previous commit. 
Place the convertion into object at the good place.
 2017-11-19 11:46:34 +01:00
Laurent Destailleur
9f5b73f4e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/website/index.php
 2017-11-18 22:19:15 +01:00
Laurent Destailleur
9b1470dab5 Work on generic filemanager component 2017-11-18 22:13:19 +01:00
Papoteur
f3f182b5bc [proposals]Allow lines to be added from REST API 
Prevously, only void lines was added. Need to convert array lines to object in this case.
 2017-11-18 16:21:54 +01:00
Laurent Destailleur
7288c18574 Work on generic filemanager component 2017-11-18 15:41:30 +01:00
Laurent Destailleur
90684750c1 CSS 2017-11-18 13:09:12 +01:00
atm-ph
fbc761cbac Fix rename TContactId into socpeopleassigned 2017-11-18 12:36:03 +01:00
Laurent Destailleur
bcaccb1829 Add layout into link of sub resources to solve undesired cache effect 2017-11-18 12:35:25 +01:00
atm-ph
15a8f2037b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-11-18 11:54:21 +01:00
Laurent Destailleur
f284cd6c0f Fix phpcs 2017-11-18 02:15:56 +01:00
Laurent Destailleur
14946a0dfa Fix sort on status 2017-11-18 02:14:04 +01:00
Laurent Destailleur
a00353f332 Fix link to create invoice from template on list 2017-11-18 02:07:52 +01:00
Laurent Destailleur
56036d3024 Fix css 2017-11-18 02:03:10 +01:00
Laurent Destailleur
fc1441086c Fix status in template invoice 2017-11-18 02:01:04 +01:00
Laurent Destailleur
80bdb45be8 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:48:16 +01:00
Laurent Destailleur
7ddf1669ef Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:34:20 +01:00
Laurent Destailleur
742bf29c65 Look and feel v6 - Show status of thirdparty in dol_banner 2017-11-18 01:29:42 +01:00
Laurent Destailleur
03cc685037 NEW Add a status enabled/disabled on recurring invoices 2017-11-18 00:54:23 +01:00
Laurent Destailleur
cf0d67d71c Generation of pdf become default value 2017-11-17 23:57:32 +01:00
Laurent Destailleur
bbf755f0b1 Fix for PHP7.2 2017-11-17 18:20:24 +01:00
Laurent Destailleur
b07895a26a Fix for php7.2 2017-11-17 18:04:55 +01:00
Laurent Destailleur
ede1f3fdfc PHP7.2 2017-11-17 17:53:20 +01:00
Laurent Destailleur
7349b5d793 Fix php 7.2 2017-11-17 17:23:56 +01:00
Laurent Destailleur
2705030006 Code comment 2017-11-17 15:34:15 +01:00
Laurent Destailleur
2cb190fc5c Fix return code 2017-11-17 15:27:59 +01:00
Laurent Destailleur
776f999b71
Merge branch 'develop' into develop_update_tablednd 2017-11-17 15:10:09 +01:00
Laurent Destailleur
77a0762fc1 Fix comment 2017-11-17 15:07:32 +01:00
Laurent Destailleur
2f6dfc2387
Merge pull request #7800 from atm-maxime/new_deposit_convert_unpaid 
NEW deposits can be converted even if unpaid
 2017-11-17 15:05:33 +01:00
Laurent Destailleur
ead629708c Look and feel v6 2017-11-17 14:57:14 +01:00
Laurent Destailleur
405275693f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/replenishorders.php
	htdocs/projet/activity/perday.php
 2017-11-17 14:20:08 +01:00
Laurent Destailleur
a6e4e4ddb0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/product/stock/replenishorders.php
 2017-11-17 14:17:49 +01:00
Laurent Destailleur
42b7d80567 FIX #7824 
Conflicts:
	htdocs/product/stock/replenishorders.php
 2017-11-17 14:12:53 +01:00
Laurent Destailleur
fde33594a2 FIX #7824 2017-11-17 14:06:08 +01:00
Laurent Destailleur
7f28c9fff6 FIX #7824 
Conflicts:
	htdocs/product/stock/replenishorders.php
 2017-11-17 14:01:21 +01:00
Laurent Destailleur
57a6ada2a3 FIX #7824 2017-11-17 13:57:40 +01:00
Laurent Destailleur
25a2e6f577 FIX #7824 2017-11-17 13:56:41 +01:00
Laurent Destailleur
97d38f32ad
Merge pull request #7822 from atm-maxime/new_contract_replicate_extraf 
New extrafields replicated on contract creation
 2017-11-17 13:20:10 +01:00
Laurent Destailleur
68f477eaf7
Merge pull request #7818 from dolibarr95/patch-29 
Fix : syntax error in dol_print_graph()
 2017-11-17 13:18:11 +01:00
Laurent Destailleur
7946f4a612
Merge pull request #7817 from grandoc/new_branch_15_11_17 
better handle of errors
 2017-11-17 13:09:35 +01:00
Laurent Destailleur
2077f7ad96
Update expensereport.class.php 2017-11-17 13:09:03 +01:00
Laurent Destailleur
acc2fcbddd
Update expensereport.class.php 2017-11-17 13:04:33 +01:00
Laurent Destailleur
d326641072
Merge pull request #7813 from hregis/develop_ldap 
Fix: missing encrypt datafor llx_const
 2017-11-17 13:03:22 +01:00
Laurent Destailleur
5741d4d67d
Merge pull request #7811 from atm-florian/6.0_fixvatcodesupplier 
fix : return vat code for supplier price
 2017-11-17 13:02:56 +01:00
Laurent Destailleur
481b810fd2
Merge pull request #7810 from frederic34/patch-1 
fix trigger when module not enabled
 2017-11-17 12:59:59 +01:00
Laurent Destailleur
3b3b017226
Merge pull request #7809 from defrance/patch-102 
Expensereport Normalize link and generate document
 2017-11-17 12:58:30 +01:00
Laurent Destailleur
f33b5067ad Upgrade branch 3.0 of RESTLER (still 3.0.0 RC6) 
This upgrade Swagger from 1.2 to 2.0
 2017-11-17 12:55:27 +01:00
Laurent Destailleur
a5a9b9b23f Removed deprecated REST API 
Prepare code to be compatible with swagger v2
 2017-11-17 12:50:34 +01:00
Laurent Destailleur
92753273b9 Fix upload api for invoices and bad id for bank account 2017-11-17 11:44:52 +01:00
Laurent Destailleur
ba372bfc5c Fix typo 2017-11-16 23:11:49 +01:00
Laurent Destailleur
f708450276 Fix sql error 2017-11-16 22:57:25 +01:00
Laurent Destailleur
e06087888b NEW Show line "other filtered task" when using filter on timesheet. 2017-11-16 22:55:04 +01:00
Laurent Destailleur
4b90510b82 Fix time assigned to wrong user 2017-11-16 22:35:55 +01:00
Laurent Destailleur
f153d9c9ff Fix time spent counted twice 2017-11-16 19:41:31 +01:00
Laurent Destailleur
0d192df1fd Standardize interface 2017-11-16 18:33:56 +01:00
Laurent Destailleur
4f25bc5e3b NEW detection of edge browser 2017-11-16 14:44:55 +01:00
Frédéric FRANCE
0d79cc50b0
Merge remote-tracking branch 'upstream/develop' into patch-1 2017-11-16 13:41:24 +01:00
Laurent Destailleur
a7aa3ee438 Rename file 2017-11-16 12:21:21 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
Laurent Destailleur
19d0283b63 Fix doxygen 2017-11-16 12:13:23 +01:00
Laurent Destailleur
4d198534a2 Clean CSS files 2017-11-16 12:09:34 +01:00
Laurent Destailleur
e6d02cebe7 Complete templates 2017-11-16 12:09:17 +01:00
Maxime Kohlhaas
1f5c2ec13f New extrafields replicated on contract creation 2017-11-15 21:20:30 +01:00
Laurent Destailleur
612dfb91ff Add more img templates for medias dir 2017-11-15 21:01:05 +01:00
Laurent Destailleur
d4d26eac9b More templates into medias directory 2017-11-15 20:41:04 +01:00
Laurent Destailleur
5c3d8acfbb Work on website 2017-11-15 19:47:07 +01:00
Laurent Destailleur
07c0b5d616 Code comment 2017-11-15 13:15:08 +01:00
Neil Orley
d97cf63a16 NEW Classify the order as invoiced in the REST API 
Classify the order as invoiced
FIX variable name
 2017-11-15 12:14:28 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
33910b9cc9 Add the trackid for emails sent from leave request card. 2017-11-15 11:29:22 +01:00
dolibarr95
c6c1552c01
syntax error 
bad syntax when add an url in dol_print_graph()
 2017-11-15 11:11:45 +01:00
Philippe GRAND
5615416d1a better handle of errors 2017-11-15 11:09:18 +01:00
Neil Orley
42d1072dee NEW Tag the order as validated (opened) in the REST API 
Tag the order as validated (opened)
 2017-11-15 10:55:39 +01:00
Neil Orley
8e869688f5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-11-15 10:42:00 +01:00
Laurent Destailleur
f37320590d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-15 10:40:53 +01:00
Laurent Destailleur
924cf871a7 FIX CSS for IE10 2017-11-15 10:40:24 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
366ade4030 Code comment 2017-11-14 19:42:34 +01:00
Laurent Destailleur
77b6ef7396 Code comment 2017-11-14 19:41:57 +01:00
Laurent Destailleur
388b90a94c Fix repair of utf8 2017-11-14 19:00:52 +01:00
Laurent Destailleur
501f5b8292 Merge duplicate translation key 2017-11-14 18:26:39 +01:00
Laurent Destailleur
f789714f14 Fix translation 2017-11-14 18:16:01 +01:00
Laurent Destailleur
451d3ed8ed NEW Add API to activate/unactivate a contract 2017-11-14 17:51:04 +01:00
Regis Houssin
a4b96f00df Fix: missing encrypt datafor llx_const 2017-11-14 16:00:34 +01:00
Neil Orley
9b2611933d NEW Create an invoice using an existing order 
Create an invoice using an existing order using the REST API
 2017-11-14 15:49:09 +01:00
Laurent Destailleur
e37252d83a Fix div not closed 2017-11-14 15:17:10 +01:00
Laurent Destailleur
a50589c3c9 NEW Better behaviour when using a text browser 2017-11-14 15:10:46 +01:00
Neil Orley
b334428d55 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-11-14 14:44:12 +01:00
Neil Orley
e513ed09f6 Change the way pa_ht is calculated 2017-11-14 14:43:50 +01:00
Frédéric FRANCE
4dca97401d
Update llx_actioncomm.sql 2017-11-14 13:18:31 +01:00
Laurent Destailleur
0e2f64af72 CSS 2017-11-14 12:18:02 +01:00
Laurent Destailleur
fa92c53ff6 Fix pb when showing dictionaries 2017-11-14 11:13:24 +01:00
Frédéric FRANCE
96031b0787
Update listactions.php 2017-11-14 11:05:58 +01:00
Frédéric FRANCE
7a76a3f497
fix trigger when module not enabled 2017-11-14 10:20:43 +01:00
florian HENRY
e195cf0b95 fix : return vat code for supplier price 2017-11-14 09:53:06 +01:00
BENKE Charlene
0553e331fe
Update card.php 
Normalize link and generate document
 2017-11-14 08:48:41 +01:00
Laurent Destailleur
11cb9c0d81 Code simpler 2017-11-14 01:57:50 +01:00
Laurent Destailleur
d0d1d646fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-14 01:35:16 +01:00
Laurent Destailleur
49ca901475
Merge pull request #7803 from atm-alexis/NEW_burger_menu_list_action 
NEW burger menu and hooks on list action
 2017-11-14 01:35:03 +01:00
Laurent Destailleur
3dc06977af
Update listactions.php 2017-11-14 01:33:44 +01:00
Laurent Destailleur
59d9ab731e Add param $idwarehouse to settodraft 2017-11-14 01:29:28 +01:00
Laurent Destailleur
a12186a0b8 Use HTTP response code 304 instead of 500 when nothing is done 2017-11-14 01:26:02 +01:00
Laurent Destailleur
765a2097bc
Merge pull request #7804 from Oeris/develop-api 
NEW Update in the order REST API
 2017-11-14 01:24:18 +01:00
Laurent Destailleur
4212000caf
Update api_orders.class.php 2017-11-14 01:21:06 +01:00
Laurent Destailleur
bf05a0b8e0
Update api_orders.class.php 2017-11-14 01:19:04 +01:00
Laurent Destailleur
010e542fe4 CSS 2017-11-14 01:15:02 +01:00
Laurent Destailleur
31e152274c NEW Add 2 new automatic classification in workflow module 2017-11-14 01:00:57 +01:00
Laurent Destailleur
a2c80a704f Code comment 2017-11-13 19:06:58 +01:00
Laurent Destailleur
2d78136781 Standardize field length 2017-11-13 18:04:14 +01:00
Laurent Destailleur
53bfbcf5db NEW Ad performances indexes on calendar events 2017-11-13 17:05:07 +01:00
Neil Orley
d2a67e152b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-11-13 14:39:09 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
1a5bbef266 FIX Locatax were not propagated when cloning order or proposal 2017-11-13 13:07:31 +01:00
Laurent Destailleur
97c9549087 Fix ref supplier must be output if it exists, even for free products 2017-11-13 11:30:41 +01:00
Laurent Destailleur
d59ad412a4 Clean code 2017-11-13 11:01:09 +01:00
Laurent Destailleur
40024c4264 Fix doxygen 2017-11-13 10:39:22 +01:00
alexis Algoud
19a2c2fe06 Merge branch 'NEW_burger_menu_list_action' of github.com:atm-alexis/dolibarr into develop 2017-11-13 10:05:29 +01:00
Laurent Destailleur
9a8423ba5e Start to show work on repeat events 2017-11-13 02:46:13 +01:00
Laurent Destailleur
90615a8682 Fix busy tag not set sometimes 2017-11-13 02:44:02 +01:00
Laurent Destailleur
f33182acc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-12 20:49:53 +01:00
Laurent Destailleur
53a523ba9d Module builder 2017-11-12 20:45:06 +01:00
Laurent Destailleur
36b4d50cff FIX #7737 2017-11-12 20:41:25 +01:00
Laurent Destailleur
d421b90376 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-11-12 20:18:56 +01:00
Laurent Destailleur
356525730d FIX #7786 2017-11-12 20:12:56 +01:00
Laurent Destailleur
fdcbf082fd Fix css 2017-11-12 19:39:02 +01:00
Laurent Destailleur
bf121f9b3c Work on saving supplier_ref into database lines 2017-11-12 19:29:03 +01:00
Laurent Destailleur
955ed7dbbf NEW Show the supplier ref into supplier cards 2017-11-12 15:30:21 +01:00
Laurent Destailleur
2668b80599 Standardize code 2017-11-12 14:21:34 +01:00
Laurent Destailleur
15fc8ce33b Fix responsive on agenda setup page 2017-11-12 14:02:27 +01:00
Laurent Destailleur
186c8cdbf0 Fix selection of contact into creation of event 2017-11-12 13:40:05 +01:00
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Alexis Algoud
7922fd0281 NEW add burger menu to list action comm 2017-11-11 18:41:35 +01:00
Laurent Destailleur
3b4cbf54d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-11 18:23:08 +01:00
Laurent Destailleur
d29233f553
Merge pull request #7801 from atm-maxime/fix_multi_vat_deposit 
Fix multi VAT deposit when special lines are in origin document
 2017-11-11 18:03:31 +01:00
Laurent Destailleur
a4632ea2c9
Merge pull request #7799 from hregis/develop_ldap 
Fix: Avoid ldap error
 2017-11-11 18:00:21 +01:00
Laurent Destailleur
0cd8aa8a49
Merge pull request #7798 from hregis/develop_extrafields 
Fix: missing status 3 (only on form)
 2017-11-11 17:59:33 +01:00
Laurent Destailleur
b5d63de708 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-11 17:49:51 +01:00
Laurent Destailleur
7e1e710d28
Merge pull request #7796 from IonAgorria/fix-price-dynamic 
Fix: price dynamic bugs
 2017-11-11 17:49:00 +01:00
Laurent Destailleur
5703c704f9
Merge pull request #7792 from atm-ph/fix_6.0_pdf_width_payment_term 
Fix width of payment term is to large
 2017-11-11 17:45:54 +01:00
Laurent Destailleur
cba3a3846f
Merge pull request #7790 from frederic34/facrecmodelpdf 
NEW generate also document when invoice is build from recurring template
 2017-11-11 17:42:26 +01:00
Laurent Destailleur
34c87407f1
Merge pull request #7789 from Oeris/develop-api 
NEW Get the list of delivery times
 2017-11-11 17:38:54 +01:00
Laurent Destailleur
cb6bf91044
Merge pull request #7787 from libersoft/feature/correct-italian-address-format 
NEW Support Italian addresses format. Fixes #7785
 2017-11-11 17:38:29 +01:00
Laurent Destailleur
50ed463b9f
Merge pull request #7784 from frederic34/patch-3 
account number on create bank account
 2017-11-11 17:37:29 +01:00
Laurent Destailleur
3889941406
Merge pull request #7783 from frederic34/patch-2 
Update card.php
 2017-11-11 17:36:51 +01:00
Laurent Destailleur
2fe831db63
Merge pull request #7779 from atm-maxime/new_dict_filter_country 
New dictionnaries are now pre-filtered on company country
 2017-11-11 17:30:26 +01:00
Laurent Destailleur
6608dd72bd
Merge pull request #7776 from frederic34/exportadmin 
correct merge
 2017-11-11 17:23:42 +01:00
Laurent Destailleur
b60870097b Standardize code 2017-11-11 17:21:11 +01:00
Laurent Destailleur
75e5d80eb6 Better help on mass invoicing from orders 2017-11-11 17:09:15 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Maxime Kohlhaas
22a3721dda Fix multi VAT deposit when special lines are in origin document 2017-11-11 16:10:06 +01:00
Laurent Destailleur
01a41237bf CSS 2017-11-11 14:20:08 +01:00
Maxime Kohlhaas
60fcddb9e4 NEW deposits can be converted even if unpaid 2017-11-11 12:07:55 +01:00
Laurent Destailleur
d938a56282 Clean code 2017-11-11 01:10:17 +01:00
Laurent Destailleur
bf0017ffaf Fix column 2017-11-11 00:30:16 +01:00
Laurent Destailleur
b8cbb84e7c Clean code 2017-11-11 00:28:00 +01:00
Laurent Destailleur
debc0480dd CSS 2017-11-10 20:20:59 +01:00
Laurent Destailleur
a029b16795 css 2017-11-10 18:27:03 +01:00
Laurent Destailleur
cb03b2f307 NEW Can sort joined files on thirdparty and user card. 2017-11-10 18:14:29 +01:00
Regis Houssin
56829656ba Fix: Avoid ldap error 2017-11-10 17:57:11 +01:00
Regis Houssin
3ffe1b6725 Fix: missing status 3 (only on form) 2017-11-10 16:51:37 +01:00
Neil Orley
4dfb0a8f1b NEW add the ability to regenerate an pdf for the order module 
add the ability to regenerate an pdf for the order module
 2017-11-10 16:42:06 +01:00
Neil Orley
c68f717071 NEW Update availability 
Add the ability to update availability while updating an invoice using the REST API
 2017-11-10 16:22:20 +01:00
Neil Orley
182fe4a90f Change HTTP response code when nothing modified 2017-11-10 15:48:43 +01:00
Neil Orley
73fe991aed NEW Return the order object when validate 
Return the order object when the order is validated using the REST API
 2017-11-10 15:46:53 +01:00
Laurent Destailleur
beacf4225f Work on filemanager 2017-11-10 15:44:43 +01:00
Neil Orley
4e9dae5129 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop-api 2017-11-10 15:44:31 +01:00
Laurent Destailleur
c2d7b88bdd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-10 13:51:59 +01:00
Laurent Destailleur
ab78007a54 Work on filemanager generic component 2017-11-10 13:45:38 +01:00
Ion
cb463d186a Error when fetching empty expression 2017-11-10 12:32:54 +01:00
Ion
e95ee4b878 Fix old parseProductSupplier call 2017-11-10 12:32:54 +01:00
Ion
fdf260a1da Use __METHOD__ on dynamic prices syslog 2017-11-10 12:32:54 +01:00
Ion
f642289160 Add missing arg in supplier min price 2017-11-10 12:32:49 +01:00
atm-ph
2636c2470b Fix width of payment term is to large 2017-11-10 10:52:58 +01:00
Laurent Destailleur
11cc82e6d2 Update doc 2017-11-10 10:15:50 +01:00
Frédéric FRANCE
5621e85c00
comment 2017-11-10 00:26:01 +01:00
Frédéric FRANCE
6f647f8a40
generate doc on cron jobs 2017-11-09 23:39:28 +01:00
Laurent Destailleur
788d22d62d Can sort on link in bookmark page 2017-11-09 18:54:33 +01:00
Laurent Destailleur
9d3cf8f217 Fix can use tooltip with popup even for column titles 2017-11-09 18:50:15 +01:00
Laurent Destailleur
f6a0603fb0 Clean code/constant 2017-11-09 18:16:15 +01:00
Ion Agorria
aa0b811f73 Undefined variable detection in price parser 2017-11-09 17:12:55 +01:00
Ion
e528a82051 Remove price dynamic internal var 2017-11-09 17:12:55 +01:00
Laurent Destailleur
9b07f33649 Clear code 2017-11-09 09:50:55 +01:00
Laurent Destailleur
d18f65a6e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions.lib.php
 2017-11-09 01:25:41 +01:00
Laurent Destailleur
ad71a22994 Code comment 2017-11-09 01:21:02 +01:00
Laurent Destailleur
c8a551e7de Reorganize javascript at end of page. 2017-11-09 01:00:43 +01:00
Neil Orley
e025167747 Modify getAvailability comments 2017-11-08 17:17:25 +01:00
Neil Orley
ac64ada264 NEW Get the list of delivery times 
Get the list of delivery times using the REST API
 2017-11-08 17:15:28 +01:00
Valerio Baldisserotto
15a501467e FR: Support Italian address format. Fixes #7785 2017-11-08 11:43:52 +01:00
Frédéric FRANCE
1ea6df14d0
Update card.php 2017-11-08 11:35:15 +01:00
Frédéric FRANCE
fe3ce78ae4
Update card.php 2017-11-08 11:24:33 +01:00
Laurent Destailleur
864e747f51 CSS 2017-11-07 19:46:28 +01:00
Laurent Destailleur
9f2e9ce6ef Shorter translation 2017-11-07 19:38:31 +01:00
fappels
b38265bc15 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_update_tablednd 
fix  Conflicts in ChangeLog
 2017-11-07 16:34:21 +01:00
Frédéric FRANCE
27ace14fb7
Fetch right account 2017-11-07 16:28:51 +01:00
fappels
14bc066454 Update for new tablednd compatibility 2017-11-07 16:25:57 +01:00
fappels
6ef72a033b Update tablednd jquery plugin to latest git master 2017-11-07 16:15:59 +01:00