Commit Graph

20301 Commits

Author SHA1 Message Date
Laurent Destailleur
2f7786f50f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 10:37:43 +02:00
Laurent Destailleur
c5e341883d Fix popup of supplier invoice 2020-05-19 23:22:40 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
Laurent Destailleur
00d7947ee8 Fix link replaced twice 2020-05-19 19:55:28 +02:00
Laurent Destailleur
d89c9abcb6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 00:53:01 +02:00
Laurent Destailleur
7b29ce036a Fix input of virtual host and canonical url 2020-05-19 00:50:30 +02:00
Laurent Destailleur
9f9dfb94f0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 22:40:52 +02:00
Laurent Destailleur
76663ae3e8 Fix canonical tag 2020-05-18 22:40:32 +02:00
Laurent Destailleur
d60598b848 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 14:53:57 +02:00
Laurent Destailleur
d3ac33ce20 Fix json-ld file 2020-05-18 14:53:35 +02:00
Laurent Destailleur
729cc4fd6f Fix do not show full path 2020-05-18 13:26:33 +02:00
Laurent Destailleur
02d4ecb21c Fix url for youtube 2020-05-17 20:08:01 +02:00
Laurent Destailleur
9370f71d01 Fix hardcoded value 2020-05-17 20:03:56 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
8a6ae84fb0 Fix getStructuredData for organization 2020-05-17 20:02:01 +02:00
Laurent Destailleur
6be60efaba Fix bad link in json-ld 2020-05-17 19:09:22 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
783b71a9da Fix language set 2020-05-16 16:27:23 +02:00
Laurent Destailleur
ff07837053 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 19:01:54 +02:00
Laurent Destailleur
ff84fd8118 Fix default language of user. Must separate weblangs and pagelangs. 2020-05-15 19:01:12 +02:00
Laurent Destailleur
3f5692c4d7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 18:42:08 +02:00
Laurent Destailleur
a73eccf70d FIX env of browser not loaded in website 2020-05-15 18:41:46 +02:00
Laurent Destailleur
73cc50e1bf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 17:19:57 +02:00
Laurent Destailleur
70fc74008a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
2020-05-15 17:19:43 +02:00
Laurent Destailleur
9fb1766266 CSS 2020-05-15 17:14:28 +02:00
Laurent Destailleur
5fe9c45fb2 Fix look and feel v12 2020-05-15 16:07:39 +02:00
Laurent Destailleur
86ff60f161 Fix break line and set of opportunity fields 2020-05-15 15:50:50 +02:00
Laurent Destailleur
0091a48f42 Merge pull request #13787 from simicar29/dev-multiplemassaction
Enable multiple mass actions on a single page - dev branch
2020-05-15 14:37:33 +02:00
Laurent Destailleur
5933aba38c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 14:12:04 +02:00
Laurent Destailleur
0f403ba9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 14:11:13 +02:00
Scrutinizer Auto-Fixer
9699ee7263 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
Laurent Destailleur
02b40ae8f6 Fix scrutinizer 2020-05-15 13:54:05 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
40d30f9a60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 18:37:47 +02:00
Laurent Destailleur
7daef0d146 Fix bad parameters of function 2020-05-14 18:17:08 +02:00
Laurent Destailleur
f7d69e443e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 18:15:08 +02:00
Laurent Destailleur
1bf677f537 Can set status of a websitepage 2020-05-14 18:14:55 +02:00
Laurent Destailleur
a865dc7232 Merge pull request #13762 from indelog/rappaygroupmod
NEW possibilty to group payments by mode and show their subtotal
2020-05-14 16:55:37 +02:00
Laurent Destailleur
499c2ea30a FIX #13855 2020-05-14 16:52:21 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
3d26351c6b Fix function if hours. 2020-05-14 16:03:31 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00
Laurent Destailleur
6ec5dd02b6 Fix Fatal error with bad triggers 2020-05-14 15:27:10 +02:00
Laurent Destailleur
68512e0281 Look and feel v12 2020-05-14 14:56:15 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape <
Better help
2020-05-14 14:30:36 +02:00
Laurent Destailleur
0b3e917155 CSS 2020-05-14 14:30:26 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
Laurent Destailleur
ed68b73ef5 Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search
NEW Add invoice stat graph and categ search
2020-05-12 03:31:09 +02:00
Laurent Destailleur
632ca40b1d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 03:04:59 +02:00