Commit Graph

85829 Commits

Author SHA1 Message Date
Laurent Destailleur
4e6017e5bf Look and feel v12 2020-04-23 18:50:20 +02:00
Laurent Destailleur
0aa0d62f43 Fix constant 2020-04-23 18:42:59 +02:00
Laurent Destailleur
c054b45ac6
Merge pull request #13501 from ptibogxiv/patch-324
FIX better url for get conf with REST API
2020-04-23 18:40:10 +02:00
Laurent Destailleur
201a2349f6
Merge branch 'develop' into patch-324 2020-04-23 18:39:30 +02:00
Laurent Destailleur
fdf8ce1965 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-23 18:33:36 +02:00
Laurent Destailleur
73ddfb1c81 Use label instead of libelle 2020-04-23 18:33:25 +02:00
Laurent Destailleur
bcad90ccf2
Merge pull request #13715 from ndrosis/patch-25
Fix check VAT ID HTTP to HTTPS
2020-04-23 18:22:39 +02:00
Laurent Destailleur
dc0978e88b
Merge pull request #13720 from FHenry/dev_fix_odt
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 18:22:00 +02:00
Laurent Destailleur
8401f68bde
Update doc_generic_task_odt.modules.php 2020-04-23 18:21:17 +02:00
Laurent Destailleur
86be024dcc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
Laurent Destailleur
293c5a5626 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2020-04-23 17:12:06 +02:00
Laurent Destailleur
cd1368cb71 Fix dispatch in ledger for various payment done in same account when
there is 2 different transaction in 2 different account (backport v12)
2020-04-23 17:10:40 +02:00
florian HENRY
32385b75e1 travis 2020-04-23 16:18:31 +02:00
florian HENRY
7a206df96f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-04-23 16:04:58 +02:00
florian HENRY
6dafb30ee8 fix time duration substitution 2020-04-23 15:57:06 +02:00
florian HENRY
55a9aa5991 fix: missing duration odt task substitution 2020-04-23 15:55:37 +02:00
Laurent Destailleur
68e9d8463a Debug MAIN_USE_ALTERNATE_TRANSLATION_FOR variable 2020-04-23 15:52:15 +02:00
florian HENRY
da80bacf9b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-04-23 15:50:53 +02:00
florian HENRY
882b39628f fix: uniformize extrafeild replacemnt for ODT docs 2020-04-23 15:50:42 +02:00
Laurent Destailleur
098b7828fa Removed useless test 2020-04-23 13:59:40 +02:00
Laurent Destailleur
defef24c3c Fix regression 2020-04-23 13:57:27 +02:00
Laurent Destailleur
6819255b76 FIX #13650 2020-04-23 13:49:18 +02:00
Laurent Destailleur
436362502c CSS 2020-04-23 13:41:51 +02:00
Laurent Destailleur
3a9add0e70 FIX #13663 2020-04-23 13:37:43 +02:00
Laurent Destailleur
86928efb95 Var not defined 2020-04-23 13:35:40 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
4475df14b4 Finish removal of duplicate hook/trigger 2020-04-23 12:54:28 +02:00
Laurent Destailleur
e1129babbc Code comment 2020-04-23 12:44:30 +02:00
Laurent Destailleur
93278b2dca FIX #13713 2020-04-23 12:42:03 +02:00
Laurent Destailleur
46716f2259 Typo 2020-04-23 12:34:37 +02:00
Laurent Destailleur
8f8ae5a4db Fix typo 2020-04-23 12:33:22 +02:00
Drosis Nikos
d11396be3e
Fix check VAT ID HTTP to HTTPS
No response to HTTP
2020-04-23 13:22:30 +03:00
Laurent Destailleur
18d3d68cae Fix def 2020-04-23 12:22:24 +02:00
Laurent Destailleur
da02863242 Code comment 2020-04-23 12:19:51 +02:00
Laurent Destailleur
69f4a3e7b0 Doc 2020-04-23 11:41:03 +02:00
Laurent Destailleur
b971aabf3c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 22:13:04 +02:00
Laurent Destailleur
b6786c515a picto 2020-04-22 22:12:53 +02:00
Laurent Destailleur
b19e0d43fd
Merge pull request #13701 from frederic34/patch-1
Update api_bankaccounts.class.php
2020-04-22 22:12:09 +02:00
Laurent Destailleur
a7641cdb90 CSS 2020-04-22 22:02:25 +02:00
Laurent Destailleur
9bda294edc Fix set default warehouse of product in MO consumption 2020-04-22 21:41:56 +02:00
Laurent Destailleur
ead78ae777 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 21:29:44 +02:00
Laurent Destailleur
de90f24bd4 Fix phpcs 2020-04-22 21:29:15 +02:00
Laurent Destailleur
245f89ceaa Look and feel v12 2020-04-22 21:28:23 +02:00
Frédéric FRANCE
4605b9ec61
Update api_bankaccounts.class.php 2020-04-22 19:16:58 +02:00
Laurent Destailleur
3170060c65 Help show format of price 2020-04-22 18:34:52 +02:00
Laurent Destailleur
52c8e3aff1 Look and feel v12 2020-04-22 18:30:25 +02:00
Laurent Destailleur
3101f72b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 18:28:59 +02:00
Laurent Destailleur
39c454d07b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
6b8ff56c20 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/core/class/html.formother.class.php
2020-04-22 18:26:26 +02:00
Laurent Destailleur
80271cc852 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-22 18:24:00 +02:00