Commit Graph

17803 Commits

Author SHA1 Message Date
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
165f64463b Fix look and feel v10 2019-09-06 12:46:54 +02:00
Laurent Destailleur
123eace8c0 Fix look and feel v10 2019-09-06 12:44:23 +02:00
Laurent Destailleur
f08c07f315 Fix bugs reported by scrutinizer 2019-09-06 10:42:51 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
Laurent Destailleur
ec1751bae9 Doxygen 2019-09-06 02:47:20 +02:00
Laurent Destailleur
5b1d94a668 Fix translation 2019-09-06 02:27:49 +02:00
Laurent Destailleur
08c16ea2e1 Fix bad dir created 2019-09-06 02:03:26 +02:00
Laurent Destailleur
37a32af7b0 NEW Add dictionary to store public holidays. 2019-09-05 20:19:13 +02:00
Laurent Destailleur
87c596a934 Fix responsive 2019-09-05 15:58:54 +02:00
Laurent Destailleur
07e647ca10 Fix sql outside transaction 2019-09-05 14:27:13 +02:00
Laurent Destailleur
f62c79c445 Fix object user must be a param of delete method 2019-09-05 14:26:18 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
4a19f510fd Fix scrutinizer reports 2019-09-05 13:58:35 +02:00
Laurent Destailleur
f4a7714f82 Fix bad log 2019-09-05 13:42:58 +02:00
Laurent Destailleur
12868413bd Doxygen 2019-09-05 13:33:49 +02:00
Alexandre SPANGARO
4fe141c9f1 FIX Nowrap missing on amount in boxes 2019-09-05 12:05:50 +02:00
Laurent Destailleur
9666200d6b Enhance error management 2019-09-04 19:55:15 +02:00
Laurent Destailleur
1950952b05 Missing label 2019-09-04 15:11:06 +02:00
Laurent Destailleur
7d5877b8b1 Doxygen 2019-09-04 13:50:10 +02:00
Laurent Destailleur
b445c0eec7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5 FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2019-09-03 22:39:24 +02:00
Laurent Destailleur
bb7b34816d
Merge pull request #11785 from a-schild/develop
Fix for issue #11783
2019-09-03 17:43:49 +02:00
Laurent Destailleur
1a8f271bf4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-03 17:41:56 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
2019-09-03 17:34:49 +02:00
Laurent Destailleur
bd47bd096b NEW Can defined a position of numbering submodules for thirdparties 2019-09-03 15:58:20 +02:00
Laurent Destailleur
106938168f Fix phpcs 2019-09-03 15:36:49 +02:00
Laurent Destailleur
2c02e4d118
Merge branch 'develop' into FIX_cron_module_conf_to_display_link_to_cron_task_list 2019-09-03 15:28:52 +02:00
Laurent Destailleur
3c80bc139e
Merge pull request #11794 from atm-florian/10_fixMissingSubstitutionCheckbox
FIX bad substitution for extrafields type checkbox
2019-09-03 15:18:17 +02:00
Laurent Destailleur
a9bb891760
Merge pull request #11767 from aspangaro/11.0_digitaria
NEW Digitaria model for numbering accountancy thirdparty
2019-09-03 15:01:10 +02:00
Laurent Destailleur
c4a4efe0dc
Merge pull request #11769 from Tim-Otte/develop
NEW: Added odt support to supplier orders
2019-09-03 13:04:33 +02:00
Laurent Destailleur
931380c740
Merge pull request #11803 from atm-florian/10_fixavoidDividedBy0
fix avoid error message Divided By 0
2019-09-03 12:58:56 +02:00
Tim Otte
0f02a621ba Seriously? One newline failed the stickler ci test? 2019-09-03 10:39:11 +02:00
Tim Otte
443f16bddf Removed debug output 2019-09-03 10:36:00 +02:00
Laurent Destailleur
ca7ce63648 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/societe/class/societe.class.php
2019-09-02 23:04:15 +02:00
Laurent Destailleur
6c96478040 Removed deprecated code 2019-09-02 22:57:55 +02:00
Laurent Destailleur
a126b1e538 FIX Add char $ and ; in sanitizing of filenames. 2019-09-02 22:25:44 +02:00
Laurent Destailleur
a96742ee9b Can search into global site files.
Support of cancel to previous page
2019-09-02 18:43:22 +02:00
Laurent Destailleur
c068177027 Work on search on global site files 2019-09-02 16:39:56 +02:00
Laurent Destailleur
59fe34752c Fix error reporting of LDAP errors 2019-09-02 16:02:48 +02:00
Laurent Destailleur
6cf3fd79bb Fix error reporting of LDAP errors 2019-09-02 15:50:48 +02:00
florian HENRY
c8bfc7441e fix avoid error message Divided By 0 2019-09-02 09:44:59 +02:00
florian HENRY
7dc3684662 fix bad substitution for extrafields type checkbox 2019-09-02 09:41:30 +02:00
Laurent Destailleur
29d2e7edd0 missing reposition 2019-09-02 04:39:36 +02:00
Laurent Destailleur
ee15ccf82e missing reposition 2019-09-02 04:28:55 +02:00
Laurent Destailleur
ac7d0b5eb6 Fix scrutinizer 2019-09-02 04:12:48 +02:00
Laurent Destailleur
a4600c9efa Fix missing class reposition 2019-09-01 23:24:29 +02:00
Laurent Destailleur
aff4118dc9 Fix missing class reposition 2019-09-01 23:24:02 +02:00
Laurent Destailleur
40890ae345 Fix scrutinizer 2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Laurent Destailleur
7f5728ead9 A better message when database is off. 2019-08-31 19:39:39 +02:00
Laurent Destailleur
0889f2f537 Start to enable MAIN_SECURITY_CSRF_WITH_TOKEN (for develop) 2019-08-31 14:41:54 +02:00
Laurent Destailleur
2f49fc6a7b Fix scrutinizer 2019-08-31 02:49:54 +02:00
Laurent Destailleur
48db5c2a44 Replace deprecated actioncomm->note into actioncomm->note_private 2019-08-31 02:46:39 +02:00
Laurent Destailleur
cc5dad977c Fix scrutinizer 2019-08-31 02:17:06 +02:00
Laurent Destailleur
5188f3ed44 Fix doxygen 2019-08-31 02:10:55 +02:00
Laurent Destailleur
517a0091d6 Doxygen 2019-08-31 02:02:19 +02:00
Laurent Destailleur
43e0655dd5 Fix code style and var type 2019-08-31 01:54:21 +02:00
Laurent Destailleur
a3e221468a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-31 01:15:04 +02:00
Laurent Destailleur
7942c5edf7 Fix js injection 2019-08-30 16:22:24 +02:00
Christophe Battarel
8c8844d7ae Differentiate supplier orders status 2019-08-30 09:33:01 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
Laurent Destailleur
01962cbc67 Clean code 2019-08-29 13:17:14 +02:00
a-schild
ad779bc714 Correctly initialize $addDescription in all cases 2019-08-29 09:46:10 +02:00
a-schild
c38e29185c Fix for #11783 2019-08-29 09:43:49 +02:00
Laurent Destailleur
77dfc19389 Try to compile css with lessc 2019-08-29 04:38:24 +02:00
Laurent Destailleur
6420a32395 Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:54:31 +02:00
Laurent Destailleur
641a50a58b Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:52:29 +02:00
Laurent Destailleur
0a1a930bfe Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:51:58 +02:00
Laurent Destailleur
ff7c122b6d Add class specific to web page ref 2019-08-29 02:36:32 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
c10f755619 Fix compatibility with old multicompany modules 2019-08-29 00:19:46 +02:00
Laurent Destailleur
76e8384f09 NEW Add option multiselect for developers on the selector of language. 2019-08-28 16:06:19 +02:00
Laurent Destailleur
85016a7a45 Fix bad error when module not enabled 2019-08-28 13:12:43 +02:00
Laurent Destailleur
b05b3e897f Fix bad error when module not enabled 2019-08-28 13:11:51 +02:00
Laurent Destailleur
c0262f1e19 Fix type integer 2019-08-28 12:24:56 +02:00
Laurent Destailleur
9109eeaa77 Fix type integer 2019-08-28 12:24:35 +02:00
Laurent Destailleur
7236df37d4 FIX error management when adding a property with type real 2019-08-28 12:16:59 +02:00
Laurent Destailleur
ed42f59201 FIX error management when adding a property with type real 2019-08-28 12:10:28 +02:00
Laurent Destailleur
e3a4ad00d7 Code comment 2019-08-28 10:22:40 +02:00
Laurent Destailleur
04e11bcbd1 Doxygen 2019-08-27 20:35:42 +02:00
Laurent Destailleur
4ceb3c2e85 Add context 'ws' for web services authentication. 2019-08-27 20:35:06 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +02:00
Laurent Destailleur
bbda4269b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 17:55:21 +02:00
Laurent Destailleur
e09223ed4d FIX #11702 2019-08-27 17:52:46 +02:00
Tim Otte
5abfc04900
Merge branch 'develop' into develop 2019-08-27 16:37:41 +02:00
Alexandre SPANGARO
47b9af09a5 Fix stickler 2019-08-27 16:37:14 +02:00
Tim Otte
75152cb210 Added odt support to supplier orders 2019-08-27 16:22:16 +02:00
Maxime Kohlhaas
9c09876bd4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin 2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65 Move $selectedlines to parameter 2019-08-27 14:33:28 +02:00
Alexandre SPANGARO
958361b45e Merge branch 'develop' into 11.0_digitaria 2019-08-27 14:11:27 +02:00
Alexandre SPANGARO
d7f8df2e45 NEW Digitaria model for numbering accountancy thirdparty 2019-08-27 14:03:33 +02:00
Laurent Destailleur
442793aa65
Merge pull request #11755 from jtraulle/stickler-ci
Add .stickler.yml config file
2019-08-27 12:39:50 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
22719b90b6 Fix remove warning 2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +02:00
Laurent Destailleur
20f61fb9be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 11:43:07 +02:00
Laurent Destailleur
9fb06b1e7e Fix phpcs 2019-08-27 11:42:18 +02:00
Jean Traullé
dd1e7bbc3d
Merge branch 'develop' into stickler-ci 2019-08-27 08:52:33 +02:00