Commit Graph

5264 Commits

Author SHA1 Message Date
Laurent Destailleur
a4cd7772ef Fix title 2019-06-22 12:02:41 +02:00
John Botella
ec7ebe9f39 redo backported fix and update adherent substitution methode 2019-06-21 15:32:38 +02:00
John Botella
200b66d11f Remove a backported fix because failling at init test 2019-06-21 14:52:12 +02:00
Laurent Destailleur
ff0f6295d8 Fix phpcs 2019-06-20 13:59:53 +02:00
Laurent Destailleur
29e3199639 Fix phpcs 2019-06-20 13:39:29 +02:00
Laurent Destailleur
cb057e9c6d NEW Add hidden option to be ready for BREXIT 2019-06-20 12:32:14 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
Laurent Destailleur
ee8e7d66f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 03:43:27 +02:00
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
2019-06-20 03:43:16 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2019-06-20 03:39:48 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other
Translate rights
2019-06-20 03:36:16 +02:00
Laurent Destailleur
03178bc481
Merge pull request #11293 from hregis/develop_pdf
FIX better method to check if pdf is protected/encrypted
2019-06-20 03:22:51 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
Allow zero as account number
2019-06-20 03:09:37 +02:00
Laurent Destailleur
d6b6f77e74 Fix support domains with 3 levels 2019-06-19 22:06:12 +02:00
Alexandre SPANGARO
c59de49894 Translate rights 2019-06-18 22:38:52 +02:00
Laurent Destailleur
20e00ca290 FIX if last char of customercode is accent making the truncate of first
chars wrong.
2019-06-18 19:41:16 +02:00
Laurent Destailleur
42e58d9ea5 Fix preview of interventions 2019-06-17 18:38:14 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Regis Houssin
3afd4e15ad FIX try to remove ob_* functions 2019-06-17 07:09:19 +02:00
Regis Houssin
908b5fff00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf 2019-06-17 07:08:35 +02:00
Laurent Destailleur
122c4eb8bd
Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction
FIX empty test
2019-06-14 13:51:34 +02:00
Laurent Destailleur
1fa1b91916
Update product.lib.php 2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db
Update product.lib.php 2019-06-14 13:38:52 +02:00
ATM john
e7d81a68f0 Fix Override Attribute 2019-06-13 22:11:47 +02:00
ATM john
0ef9a8843a Fix empty test 2019-06-13 21:57:30 +02:00
ptibogxiv
a30f029bbf
Update product.lib.php 2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58
Fix measuring_units_string display function 2019-06-13 20:52:52 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formfile.class.php
2019-06-13 12:15:51 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d Fix look and field v10 2019-06-12 19:03:22 +02:00
Laurent Destailleur
e81663ec34 Fix cropping of image files for BOM module was ko 2019-06-12 19:00:34 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
2019-06-07 22:58:58 +02:00
Laurent Destailleur
0a903da5dc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
2019-06-07 22:53:30 +02:00
Laurent Destailleur
b73d287953
Update agenda.lib.php 2019-06-07 18:09:43 +02:00
Frédéric FRANCE
f11db8396a
Parameter must be array or object that implements Countable
warning with php 7.2
2019-06-06 09:49:32 +02:00
Laurent Destailleur
a08dcec7fc Fix doc 2019-06-04 20:02:29 +02:00
Laurent Destailleur
210b2f37dc Fix error message 2019-06-04 19:18:20 +02:00
Laurent Destailleur
79a3e41418 Hook 'getAccessForbiddenMessage' 2019-06-04 12:48:06 +02:00
Regis Houssin
43ada3fcd4 FIX better method to check if pdf is protected/encrypted 2019-06-03 09:36:00 +02:00
Laurent Destailleur
5530e003ba Fix title 2019-06-02 19:47:19 +02:00
Laurent Destailleur
e6100310af Fix missing title 2019-06-02 19:47:01 +02:00
Laurent Destailleur
ab73d8a6fc
Merge pull request #11258 from hregis/develop_security
FIX add Windows and Mac executable
2019-05-29 13:52:19 +02:00
Laurent Destailleur
05063016e8 FIX #11244 Enhance repair tool 2019-05-29 12:21:51 +02:00
Laurent Destailleur
a524fd17ce Fix phpcs 2019-05-29 10:03:05 +02:00
Laurent Destailleur
3841fb5a85 Fix doxygen 2019-05-28 22:18:46 +02:00
Laurent Destailleur
454316a5fa Fix getDomainFromURL 2019-05-28 22:18:22 +02:00
Laurent Destailleur
2404e6a521 Fix cast to int 2019-05-28 12:38:21 +02:00
Regis Houssin
3df6f0f6c3 FIX wrong extension 2019-05-27 11:43:06 +02:00
Regis Houssin
c1242f409b FIX add Windows and Mac executable 2019-05-27 11:32:46 +02:00
Laurent Destailleur
c8970c0283 Fix vat validator 2019-05-22 16:50:53 +02:00
Laurent Destailleur
fb95fe0606 Check vat is not case sensitive 2019-05-22 16:15:26 +02:00
Laurent Destailleur
65acd6ef60 Fix function to check vat syntax 2019-05-22 15:48:07 +02:00
Laurent Destailleur
11bcfb4f5e Fix check on VAT syntax not visible on list 2019-05-22 15:37:59 +02:00
Laurent Destailleur
42f5ebed2d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/admin/system/database-tables.php
	htdocs/admin/tools/export_files.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/functions.lib.php
2019-05-21 15:13:25 +02:00
Laurent Destailleur
f283e24b48 Fix the noexe must be added for dangerous extension like js and shells 2019-05-21 13:53:12 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:06:20 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0
Conflicts:
	htdocs/core/actions_sendmails.inc.php
2019-05-19 02:03:16 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
Laurent Destailleur
41cb13b1cc Fix warning 2019-05-18 19:28:14 +02:00
Laurent Destailleur
4517d84e3a FIX Disable a module 2019-05-18 19:22:17 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser
FIX: scrutinizer feedback
2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
Laurent Destailleur
26d4875f8f Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-18 02:26:40 +02:00
Maxime Kohlhaas
2a2f0557cf Fix : display hr tab on user if rights to read all 2019-05-17 17:07:38 +02:00
Laurent Destailleur
2d0b3b7b23 Fix dol_sort_array for objects 2019-05-16 12:25:14 +02:00
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213 Fix doc 2019-05-15 17:50:35 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
2019-05-13 12:22:14 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php 2019-05-13 12:00:13 +02:00
Laurent Destailleur
1c3bcea1f9
Merge pull request #11157 from ptibogxiv/patch-180
Fix img_credit_card with payment methods
2019-05-10 16:28:52 +02:00
Laurent Destailleur
cd8f601cdc Fix length of vat number 2019-05-10 14:01:11 +02:00
ptibogxiv
f50280f13b
Fix img_credit_card with payment methods 2019-05-10 01:16:58 +02:00
Laurent Destailleur
314dc26b87 Look and feel v10 2019-05-09 19:32:19 +02:00
Laurent Destailleur
a5b1de4f6a Fix tab that should not be visible 2019-05-09 17:52:55 +02:00
Laurent Destailleur
84714f39e2 Fix setup of terminal 2019-05-09 13:37:20 +02:00
Laurent Destailleur
96c021773e
Update takepos.lib.php 2019-05-08 19:11:17 +02:00
andreubisquerra
84cfa00bf1 Terminals 2019-05-08 18:29:00 +02:00
gauthier
f661b926fa FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf
Example : if you upload a file like "my  file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space
2019-05-07 14:33:17 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9 FIX Default value on form to send email 2019-05-02 15:34:29 +02:00
Laurent Destailleur
425dd6faf7
Merge branch 'develop' into patch-2 2019-05-02 12:38:38 +02:00
Laurent Destailleur
ceeb9752ce Fix PHPCS 2019-05-02 12:28:40 +02:00
Laurent Destailleur
0f8c7df6fe Debug api of module BOM 2019-05-02 12:19:43 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Laurent Destailleur
a75c6a81d1 FIX Follow rule to create a new page 2019-05-01 17:15:42 +02:00
Frédéric FRANCE
ac304f58b0
clean new commits 2019-04-30 20:37:59 +02:00
Frédéric FRANCE
5766bb0b8a
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-04-30 20:16:43 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00
Frédéric FRANCE
3e99a40b9e
Update website.lib.php 2019-04-26 17:47:47 +02:00
Laurent Destailleur
4bd732cc40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/export.php
	htdocs/core/class/utils.class.php
	htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb FIX CVE-2019-11201 2019-04-25 23:21:25 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
6fe84a7962 Fix phpcs 2019-04-25 11:18:25 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
2019-04-25 01:50:48 +02:00
Laurent Destailleur
560b026d68 Fix CSS 2019-04-25 01:26:29 +02:00
Laurent Destailleur
79c37f2226 Fix link for endpoint 2019-04-24 18:47:11 +02:00
Laurent Destailleur
684e09fdcd NEW Add function isValidVATID() 2019-04-23 22:49:33 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
8d0825910a Fix warnings 2019-04-23 10:38:20 +02:00
Laurent Destailleur
7c7c4f0d93 Removed warnings 2019-04-23 10:24:16 +02:00
Laurent Destailleur
f19d96bf8d NEW Show enabled modules in dol_print_error 2019-04-23 10:24:05 +02:00
Laurent Destailleur
a50fc9189b Fix phpcs 2019-04-22 15:45:44 +02:00
Laurent Destailleur
9e91826dea Can set length of random password 2019-04-22 14:12:58 +02:00
Laurent Destailleur
be726c2376 Code comment 2019-04-22 12:44:25 +02:00
Laurent Destailleur
24572e2f82 Remove warnings 2019-04-22 12:42:46 +02:00
Laurent Destailleur
6da42941a8 NEW Add attached document on bank account visible in automatic ECM. 2019-04-21 19:54:30 +02:00
florian HENRY
83cf08f2eb fix php warning 2019-04-18 20:37:27 +02:00
Frédéric FRANCE
4912c69d8a
Update functions2.lib.php 2019-04-18 10:12:00 +02:00
Laurent Destailleur
b5bf6830e9 Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
2019-04-17 01:13:59 +02:00
ATM john
945e3db952 remove text 2019-04-16 22:03:11 +02:00
ATM john
965c973bda Change class name 2019-04-16 22:02:23 +02:00
ATM john
684879d73c apply appli btn to more elements 2019-04-16 21:49:26 +02:00
John BOTELLA
a60d4b3b52 Appli btn apply to links 2019-04-16 09:09:25 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Laurent Destailleur
00eb0511f6 Make code simpler to sort list of files. 2019-04-13 12:41:50 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
Laurent Destailleur
cfa414b2de Better log 2019-04-10 16:42:45 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
ac25003d33 Dolibarize module ticket 2019-04-10 11:39:54 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
917b9d69fa Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
not recommanded to use in Dolibarr.
2019-04-08 14:55:31 +02:00
Laurent Destailleur
2b5e25188c
Merge pull request #10977 from IonAgorria/resources-product
NEW: Resources tab possible in products/services
2019-04-08 13:57:30 +02:00
Laurent Destailleur
7c91c1b9f1
Merge pull request #10962 from aspangaro/v10_p2
FIX: Problem with badge in tab in expedition card
2019-04-08 13:33:59 +02:00
Ion
b64cb4129f Add resources tab for products/services 2019-04-07 23:52:49 +02:00
Laurent Destailleur
fad2fa48dd NEW Introduce a config parameter $dolibarr_main_instance_unique_id 2019-04-07 15:44:17 +02:00
Ion
71f30266dc Add service to getElementProperties 2019-04-07 12:53:52 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
b6c19e0f35 Fix var not defined 2019-04-05 19:48:32 +02:00
Laurent Destailleur
becefeebff Fix upload of files without extension 2019-04-05 19:39:49 +02:00
Laurent Destailleur
734b97e255 Fix upload of files without extension 2019-04-05 19:39:04 +02:00
Laurent Destailleur
00cdf13a15 Revert "Do not close php tags"
This reverts commit 1db134c2a0.
2019-04-05 11:09:39 +02:00
Alexandre SPANGARO
b64ee3af70 FIX: Problem with badge in tab in expedition card 2019-04-04 17:02:18 +02:00
Laurent Destailleur
1f00e24abc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-03 18:52:47 +02:00
Laurent Destailleur
9e5d87e821 Fix warning 2019-04-03 18:39:27 +02:00
Laurent Destailleur
82c19a6372 FIX Avoid error 500 when extension php-intl not loaded 2019-04-03 18:38:27 +02:00
Laurent Destailleur
1db134c2a0 Do not close php tags 2019-04-03 18:13:39 +02:00
Laurent Destailleur
c5f5abc67d Fix css for MD theme 2019-04-03 14:37:38 +02:00
Laurent Destailleur
80be77d95d
Merge pull request #10948 from ptibogxiv/patch-148
fix term autoOrManual
2019-04-03 11:03:44 +02:00
Laurent Destailleur
bb9cd05ea8 Fix phpcs 2019-04-02 20:02:43 +02:00
Laurent Destailleur
8a6e28860b A better transition with deprecation 2019-04-01 22:09:24 +02:00
Laurent Destailleur
7db443e8ab Better compatibility 2019-04-01 21:14:15 +02:00
ptibogxiv
5d25c33ff5
fix term 2019-04-01 20:49:41 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
fc983fa65c Move a function into functions2.lib.php 2019-04-01 18:46:13 +02:00
Laurent Destailleur
0c051e0cf0
Merge pull request #10923 from ptibogxiv/patch-145
NEW automatic / manual selector form
2019-04-01 18:44:05 +02:00
Laurent Destailleur
5d9a7e0d80 Fix phpcs 2019-04-01 18:21:59 +02:00
Laurent Destailleur
0091b65a83 Fix phpcs 2019-04-01 18:10:14 +02:00
Laurent Destailleur
c07159fee9 Fix regression in timesheet. Keep extrafield of task for the moment. 2019-03-31 22:06:41 +02:00
Laurent Destailleur
d572a9258c
Merge branch 'develop' into new_evol_time_spent_views 2019-03-31 19:12:27 +02:00
Laurent Destailleur
039e6034d1
Merge pull request #10936 from aspangaro/10.0_WARNING
LOG_WARNING on function dol_print_date with deprecated value
2019-03-31 18:45:01 +02:00
Frédéric FRANCE
ddd1c04eae
phpcs fix 2019-03-31 09:27:11 +02:00
Laurent Destailleur
fca404e8d5 Show price without tax to prepare tax per customer country. 2019-03-30 19:30:58 +01:00
Laurent Destailleur
be21755378 Add page id to help debug in header 2019-03-29 23:04:09 +01:00
Laurent Destailleur
697a2e5576 Show time to bill and billed in list of tasks 2019-03-29 14:34:55 +01:00
Alexandre SPANGARO
8163739a68 LOG_WARNING on function dol_print_date with deprecated value 2019-03-28 12:03:04 +01:00
ptibogxiv
2c71b98d0d
NEW automatic / manual selector form 2019-03-27 11:05:43 +01:00
Laurent Destailleur
513ef1e727 Fix label short 2019-03-25 16:16:08 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
a950d8389e WIP Attach document to expense report lines 2019-03-24 20:22:05 +01:00
Laurent Destailleur
b2eee520df Fix phpcs 2019-03-24 16:11:12 +01:00
Laurent Destailleur
152c27139f Doc 2019-03-24 14:54:04 +01:00
Laurent Destailleur
614b4afeb0 NEW The preview of PDF files generates 1 png file even if several pages. 2019-03-24 14:53:26 +01:00
Laurent Destailleur
949ef79227 Better error message 2019-03-24 14:26:16 +01:00
Laurent Destailleur
fad6efd86c WIP file attachment on expense report lines 2019-03-24 13:27:26 +01:00
Laurent Destailleur
df9e121ac6 Enhance the module debugbar. Do not scan the log anymore. 2019-03-23 14:37:54 +01:00
Laurent Destailleur
cd6a0bacdd Look and feel v10 2019-03-22 14:32:15 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
2019-03-22 13:00:48 +01:00
atm-ph
b202169e9a New evol "Input per day" display 2019-03-21 15:20:59 +01:00
atm-ph
fa41eeec7f New evol "Input per week" display 2019-03-21 14:21:29 +01:00
Laurent Destailleur
70c2ffc816 FIX toggle of login_block was ko with eldy theme 2019-03-19 14:22:57 +01:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Laurent Destailleur
2a8056b075
Merge pull request #10881 from frederic34/patch-5
phpcs fix
2019-03-19 11:15:16 +01:00
Frédéric FRANCE
03cd321aeb
phpcs fix 2019-03-18 20:18:38 +01:00
Frédéric FRANCE
135df4b3ce
Usage of ELSE IF is discouraged; use ELSEIF instead 2019-03-18 11:24:56 +01:00
Laurent Destailleur
b3dc6d7d1d NEW Generation of doc by modulebuilder can include README and CHANGELOG 2019-03-17 19:33:25 +01:00
Laurent Destailleur
5f9fa817fb Fix bad log 2019-03-16 23:41:06 +01:00
Laurent Destailleur
e5567c7ee4 Fix typo 2019-03-16 14:48:41 +01:00
Laurent Destailleur
40c2ca4310 Fix label of status of third party record when using smartphone 2019-03-15 23:08:00 +01:00
Laurent Destailleur
7a5a561170 Fix label of status of invoice record when using smartphone 2019-03-15 23:00:50 +01:00
Laurent Destailleur
91f80934f3 Fix: On smartphone, hide label of status only on lists. 2019-03-15 20:39:55 +01:00
Laurent Destailleur
b6cacf3a20 Fix label of status for members on smartphone 2019-03-15 20:18:35 +01:00
Laurent Destailleur
d512e54407 Restore toggle of login_block because it was no more visible 2019-03-15 20:10:39 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
6f0fbc42c1 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/members/new.php
	htdocs/public/opensurvey/studs.php
2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 2019-03-15 15:13:28 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
d31b632d96 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/security.lib.php
2019-03-15 11:06:49 +01:00
Laurent Destailleur
074ba0729a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 11:00:52 +01:00
Laurent Destailleur
84bff41543 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 11:00:24 +01:00
Laurent Destailleur
6c2cad3d48 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/lib/security.lib.php
2019-03-15 11:00:00 +01:00
Laurent Destailleur
e326c4d579 Look and feel v10 2019-03-15 10:48:10 +01:00
gauthier
8375b47e74 FIX : in fact expensereport must be in $check array 2019-03-15 10:21:50 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00