2
0
forked from Wavyzz/dolibarr
Commit Graph

72264 Commits

Author SHA1 Message Date
Laurent Destailleur
fe1682a9da Merge pull request #12538 from aspangaro/11.0_a10
Look & Feel v11
2019-11-28 12:17:37 +01:00
Laurent Destailleur
20b52db5b8 Merge pull request #12527 from frederic34/patch-7
dol_print_error returns void
2019-11-27 20:11:40 +01:00
Laurent Destailleur
c0d349e9f7 Merge pull request #12530 from frederic34/patch-13
fix doxygen
2019-11-27 20:11:24 +01:00
Laurent Destailleur
fa957889d2 Merge pull request #12531 from frederic34/patch-14
fix urlsource
2019-11-27 20:11:10 +01:00
ptibogxiv
825349e07e Update api_users.class.php 2019-11-27 16:04:52 +01:00
Laurent Destailleur
c22fea52e5 Fix do not ping name of server 2019-11-27 11:38:30 +01:00
Laurent Destailleur
9a9a43fc4d Return OS with ping 2019-11-27 11:34:10 +01:00
altairis
355d7545f6 filter language is an array 2019-11-27 10:23:01 +01:00
Alexandre SPANGARO
aa3b6533f1 Look & Feel v11 2019-11-27 02:45:43 +01:00
stickler-ci
bba4ed02d2 Fixing style errors. 2019-11-26 20:36:30 +00:00
ptibogxiv
bc1f9f5aaa Update api_users.class.php 2019-11-26 21:34:45 +01:00
ptibogxiv
27d6071a73 NEW add list of group and object group API 2019-11-26 21:33:42 +01:00
Alexandre SPANGARO
0f6de0049c Fix 2019-11-26 21:17:22 +01:00
Alexandre SPANGARO
659e3aca8e Look & field v11 2019-11-26 21:14:44 +01:00
Laurent Destailleur
6a210945b7 Prepare 10.0.4 2019-11-26 20:38:06 +01:00
Alexandre SPANGARO
d910b05a38 Look & Feel v11 2019-11-26 20:28:24 +01:00
Frédéric FRANCE
6ea204bd73 Update entrepot.class.php 2019-11-26 20:20:46 +01:00
Frédéric FRANCE
28b70a5399 remove deprecated 2019-11-26 20:14:46 +01:00
Frédéric FRANCE
32aca5f186 Update pdf_standard.class.php 2019-11-26 19:52:10 +01:00
Frédéric FRANCE
d77ad7dcbf fix urlsource
line 767: $reception->id = $obj->rowid;
2019-11-26 19:46:56 +01:00
Frédéric FRANCE
757d05e907 fix doxygen 2019-11-26 18:59:26 +01:00
Frédéric FRANCE
0357d134d5 fix missing $langs 2019-11-26 18:46:27 +01:00
Frédéric FRANCE
a04fa05b6c image2wbmp() is deprecated as of PHP 7.3.0
https://www.php.net/manual/en/function.image2wbmp.php
image2wbmp() is deprecated as of PHP 7.3.0, and will be removed in the next major version. Use imagewbmp() instead.
2019-11-26 18:41:38 +01:00
Frédéric FRANCE
b104133f7a Update orderstoinvoice.php 2019-11-26 18:29:52 +01:00
Frédéric FRANCE
c7e8194df9 dol_print_error returns void 2019-11-26 18:28:44 +01:00
Frédéric FRANCE
59e85d5518 Create index.html 2019-11-26 17:55:33 +01:00
Frédéric FRANCE
250b8d0b67 delete file not used 2019-11-26 17:54:48 +01:00
Laurent Destailleur
3a687b1dae Fix box of task hidden if tasks are not used 2019-11-26 17:44:21 +01:00
stickler-ci
247ef7b619 Fixing style errors. 2019-11-26 16:40:45 +00:00
ptibogxiv
d36cc22d39 NEW get company info by API 2019-11-26 17:38:49 +01:00
oscim
1e6b93500a Put $object in complete_head_from_modules
Add object for correctly usage in function complete_head_from_modules
2019-11-26 16:34:16 +01:00
Laurent Destailleur
30ea48a715 Fix api for deletion of attributes 2019-11-26 12:58:41 +01:00
Scrutinizer Auto-Fixer
057ab6a059 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-26 11:52:04 +00:00
Laurent Destailleur
cb352407eb Add submit 2019-11-26 12:46:40 +01:00
Laurent Destailleur
b06c281178 Fix error with postgresql 2019-11-26 12:39:31 +01:00
gauthier
f7e8131477 NEW : delay picto is currently useless because always displaied. If one day we add conf for supplier proposal in alert card, it will make sense, but not for now 2019-11-26 12:30:05 +01:00
Laurent Destailleur
5eb24ba240 Fix phpcs 2019-11-26 11:55:34 +01:00
Laurent Destailleur
4ef6c9cc13 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/ticket.lang
2019-11-26 11:54:42 +01:00
Laurent Destailleur
d1419f81da Merge pull request #12390 from bb2a/patch-4
Use english name of subsitution variables for thirdparties
2019-11-26 10:26:45 +01:00
Laurent Destailleur
9e34e619be Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-26 09:51:03 +01:00
Laurent Destailleur
5e5c1ac574 Merge pull request #12512 from Mavyre/develop
NEW Added SumUp payment to TakePOS
2019-11-26 09:50:37 +01:00
Laurent Destailleur
357af16ce1 Update terminal.php 2019-11-26 09:47:56 +01:00
Laurent Destailleur
01ca5d8251 Update setup.php 2019-11-26 09:46:47 +01:00
Laurent Destailleur
d081c9cf8a Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-26 09:36:47 +01:00
Laurent Destailleur
953ba8e323 Trans 2019-11-26 09:36:32 +01:00
Laurent Destailleur
cd6e81c46f Choice of a parameter is lost when saving 2019-11-26 09:34:42 +01:00
Laurent Destailleur
c9cc503036 Merge pull request #12504 from hregis/10.0_mc
FIX compatibility with Multicompany
2019-11-26 09:22:20 +01:00
Laurent Destailleur
334265ee6e Merge pull request #12510 from frederic34/patch-8
fk_user fk_usergroup are int
2019-11-26 09:21:27 +01:00
Laurent Destailleur
b370d70426 Merge pull request #12511 from erpware/develop
just fixed two small css issues
2019-11-26 09:20:40 +01:00
Laurent Destailleur
65f9d3e8f1 Merge pull request #12509 from frederic34/patch-7
do not evaluate count at each iteration
2019-11-26 09:16:58 +01:00