Commit Graph

5007 Commits

Author SHA1 Message Date
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
Laurent Destailleur
0afbd70c2c
Merge pull request #10833 from grandoc/new_branch_14_03_2019
update with html5 compliant code
2019-03-14 18:04:06 +01:00
gauthier
3fb6978bc8 FIX : no need to test anything to display documents tabs on expense report 2019-03-14 17:36:49 +01:00
Laurent Destailleur
8a752ae657
Merge pull request #10744 from OPEN-DSI/fix-show-action-done-sortfield
Fix sort by field in all events (action and emailing type)
2019-03-14 17:00:12 +01:00
Laurent Destailleur
be0535d11f
Merge pull request #10805 from frederic34/patch-2
update doc
2019-03-14 16:55:29 +01:00
Philippe GRAND
27b7ec8202 update with html5 compliant code 2019-03-14 14:24:17 +01:00
Philippe GRAND
d506cf7700 update with html5 compliant code 2019-03-14 14:21:54 +01:00
Philippe GRAND
68c6c0513d update with html5 compliant code 2019-03-14 14:20:32 +01:00
Philippe GRAND
38822a9bb1 update with html5 compliant code 2019-03-14 14:18:44 +01:00
Philippe GRAND
6984cd25d8 update with html5 compliant code 2019-03-14 14:11:43 +01:00
Philippe GRAND
0832e9873c update with html5 compliant code 2019-03-14 14:10:41 +01:00
Philippe GRAND
63b1a1459b update with html5 compliant code 2019-03-14 14:09:54 +01:00
Laurent Destailleur
f8a4d9075b Fix css for fontawesome 5 2019-03-14 11:48:25 +01:00
Laurent Destailleur
fcbd39fda9 Fix typo 2019-03-13 19:07:19 +01:00
Laurent Destailleur
e7cd8d690c Remove warnings 2019-03-13 19:06:45 +01:00
Laurent Destailleur
1bd9d6a8e5 Fix font awesome 5 picto for notes 2019-03-13 15:02:43 +01:00
Laurent Destailleur
7d82073eab Use fontawesome for icon "setup". 2019-03-12 11:57:55 +01:00
Laurent Destailleur
d762766a56 Font awesome 5 by default 2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle 2019-03-12 09:24:42 +01:00
Frédéric FRANCE
40a1562077
update doc 2019-03-12 09:09:26 +01:00
Laurent Destailleur
abdc2aa21a Fix phpcs 2019-03-11 21:03:23 +01:00
Laurent Destailleur
e5f0c8e0e7 Look and feel 2019-03-11 20:54:25 +01:00
John BOTELLA
57c6c60118 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-11 14:44:35 +01:00
John BOTELLA
5d7118340b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-11 14:40:19 +01:00
Laurent Destailleur
fac329e637 Clean code 2019-03-11 01:01:15 +01:00
Laurent Destailleur
935fe7c22a Debug and enhance modulebuilder. 2019-03-10 19:33:28 +01:00
John BOTELLA
ccebb8d1a7 Fix travis errors 2019-03-08 14:40:22 +01:00
John BOTELLA
37cd62b564 Add user friendly behavior 2019-03-08 14:26:06 +01:00
John BOTELLA
218690db00 add css behavior 2019-03-07 17:05:27 +01:00
John BOTELLA
a0b14b9105 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092 fix travis 2019-03-07 15:49:16 +01:00
John BOTELLA
5ea5d51247 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 09:41:03 +01:00
John BOTELLA
89157234b7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-07 09:33:11 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
Lionel VESSILLER
bf5b482f3d Fix replace TRUE and FALSE for php checkstyle and aliasing label instead of note in SQL request 2019-03-06 09:05:07 +01:00
John BOTELLA
e382f13637 remove test 2019-03-05 17:16:38 +01:00
John BOTELLA
ef9ad4d109 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-05 17:14:59 +01:00
John BOTELLA
600f0c9fa6 Fix condition 2019-03-05 17:14:29 +01:00
John BOTELLA
72d96d2ac3 prepare badges 2019-03-05 17:13:20 +01:00
John BOTELLA
6b98eecd32 fix compatibility status 2019-03-05 16:58:05 +01:00
John BOTELLA
7a4540088a Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-05 15:37:17 +01:00
John BOTELLA
95981ca14c PR feedback 2019-03-05 15:26:19 +01:00
Lionel VESSILLER
9b797eb980 Fix sort by field in all events (action and emailing type) and fix multiple contacts in one event 2019-03-05 14:55:04 +01:00
Laurent Destailleur
4a582485b9 Debug module ticket 2019-03-04 19:19:09 +01:00
John BOTELLA
7cadaca8fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-04 11:37:16 +01:00
John BOTELLA
74caaca827 fix travis errors 2019-03-04 11:15:01 +01:00
John BOTELLA
c420cab500 fix travis errors 2019-03-04 11:11:15 +01:00
Laurent Destailleur
1931f43ce7 Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into
MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE
2019-03-03 00:05:07 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
e215bfdb66
Merge pull request #10721 from frederic34/bad-exclude-pattern
fix exclude from phpcs
2019-03-02 18:23:02 +01:00
Laurent Destailleur
03237d1730 NEW Look and feel v10 - Add CSS tabBarNoTop 2019-03-02 18:20:13 +01:00
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +01:00
Frédéric FRANCE
65551864d5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-02 12:24:15 +01:00
Laurent Destailleur
359f2c6e81 NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE
Removed migration files
2019-03-02 12:16:37 +01:00
Frédéric FRANCE
40d34940f1
fix exclude from phpcs 2019-03-02 10:00:51 +01:00
John BOTELLA
421c009e58 Standardise new function name 2019-03-01 15:33:23 +01:00