Laurent Destailleur
|
63a26ed436
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-12-09 13:25:49 +01:00 |
|
Laurent Destailleur
|
f2c7d3de2e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-12-09 13:25:23 +01:00 |
|
Laurent Destailleur
|
5dbf060f00
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-12-09 13:24:01 +01:00 |
|
Laurent Destailleur
|
fba274997a
|
Merge pull request #12647 from atm-john/develop_fix_dolGetBadge
Fix dolGetBadge class
|
2019-12-09 13:05:07 +01:00 |
|
Laurent Destailleur
|
eb0d20b77e
|
Fix label of country
Fix div empty
|
2019-12-09 09:16:59 +01:00 |
|
Alfredo Altamirano
|
39afe39016
|
Bugfix: Module builder missing table prefix
The function rebuildObjectSql from the module builder module is missing the table prefix when adding a constraint
|
2019-12-08 19:29:46 -06:00 |
|
Laurent Destailleur
|
2ca5a4378b
|
Fix empty div when no address
Fix deletion of MO
|
2019-12-09 00:54:42 +01:00 |
|
Laurent Destailleur
|
394104291a
|
Fix function not found when creating a payment of an expense report
|
2019-12-08 04:22:09 +01:00 |
|
ATM John BOTELLA
|
4d3ed4ffd3
|
Fix dolGetBadge class
|
2019-12-07 17:41:13 +01:00 |
|
Laurent Destailleur
|
d58a6a7d9a
|
Fix hreflang is more complete
|
2019-12-07 16:59:35 +01:00 |
|
Laurent Destailleur
|
0e063a3bb3
|
Fix hreflang tag (must include itself)
|
2019-12-07 15:46:14 +01:00 |
|
Laurent Destailleur
|
3f0fd9b82a
|
Fix url
|
2019-12-07 13:36:37 +01:00 |
|
Laurent Destailleur
|
ff05150f7e
|
Fix link for alternate language
|
2019-12-07 13:25:59 +01:00 |
|
Laurent Destailleur
|
7f23c5f74e
|
Fix link for alternate language
|
2019-12-07 13:21:11 +01:00 |
|
Laurent Destailleur
|
a2da98c08a
|
Fix $db not defined
|
2019-12-07 13:19:12 +01:00 |
|
Laurent Destailleur
|
7be8b14368
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-07 13:10:07 +01:00 |
|
Laurent Destailleur
|
3030a9fa2a
|
Fix manifest file was saved but not enabled.
|
2019-12-07 13:09:55 +01:00 |
|
Laurent Destailleur
|
8138fa9780
|
Missing X-Content-Type-Options: nosniff on header of website pages
|
2019-12-07 11:51:21 +01:00 |
|
Laurent Destailleur
|
91d83c3d60
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-06 17:40:43 +01:00 |
|
Laurent Destailleur
|
796f34628d
|
Debug v11
|
2019-12-06 17:40:22 +01:00 |
|
Scrutinizer Auto-Fixer
|
4debd71281
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-06 08:26:49 +00:00 |
|
Laurent Destailleur
|
cb497cb08e
|
Translation
|
2019-12-06 08:58:16 +01:00 |
|
Laurent Destailleur
|
f74e1f8fa3
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-06 08:11:23 +01:00 |
|
Laurent Destailleur
|
a7571054f0
|
Fix if exif not available
|
2019-12-04 22:19:35 +01:00 |
|
Laurent Destailleur
|
553bb728c6
|
Fix break not necessary
|
2019-12-04 22:13:50 +01:00 |
|
Laurent Destailleur
|
bde917d7fc
|
Fix responsive
|
2019-12-04 15:09:20 +01:00 |
|
Laurent Destailleur
|
9878eddd75
|
Fix phpcs
|
2019-12-03 22:52:20 +01:00 |
|
Laurent Destailleur
|
a75915a7a8
|
Fix regression
|
2019-12-03 22:37:58 +01:00 |
|
Laurent Destailleur
|
60d3bd0fe9
|
Fix regression
|
2019-12-03 22:36:26 +01:00 |
|
Laurent Destailleur
|
558e0cb5f6
|
Fix regression
|
2019-12-03 22:34:49 +01:00 |
|
Laurent Destailleur
|
22b17190e8
|
Update pdf.lib.php
|
2019-12-03 22:26:33 +01:00 |
|
stickler-ci
|
24b5b9bd72
|
Fixing style errors.
|
2019-12-03 18:42:29 +00:00 |
|
Philippe GRAND
|
0ce1e5c007
|
Fix : Fatal error: Uncaught Error: Class Facture not found
|
2019-12-03 19:39:32 +01:00 |
|
Laurent Destailleur
|
576006ff6c
|
Merge pull request #12605 from atm-john/10.0_fix_exif_images
Fix Use dynamically exif image information with conf MAIN_USE_EXIF_ROTATION
|
2019-12-03 17:57:19 +01:00 |
|
John Botella
|
e46f654e9f
|
Fix deprecated image2wbmp function
|
2019-12-03 17:27:13 +01:00 |
|
Laurent Destailleur
|
d93cfedcbe
|
Merge pull request #12602 from TobiasSekan/AddMoreFilesForPreview
Add preview button for MD, CSS, XAML files
|
2019-12-03 13:20:08 +01:00 |
|
Scrutinizer Auto-Fixer
|
36a74cd160
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-03 10:17:29 +00:00 |
|
John Botella
|
f806c0da78
|
Fix comment missing
|
2019-12-03 09:29:04 +01:00 |
|
John Botella
|
2b01576aa9
|
Fix comment
|
2019-12-03 09:24:11 +01:00 |
|
John Botella
|
3b72cade4e
|
Fix exif image with conf MAIN_USE_EXIF_ROTATION
|
2019-12-02 17:32:06 +01:00 |
|
Tobias Sekan
|
f4e4e1e518
|
Add preview for MD, CSS, XAML files
|
2019-12-02 13:53:28 +01:00 |
|
Laurent Destailleur
|
6d81bc77cb
|
Fix look and feel v11
|
2019-12-02 11:00:09 +01:00 |
|
Laurent Destailleur
|
af5beade41
|
Merge pull request #12584 from atm-john/develop_add_link_to_widget
NEW link to widget
|
2019-12-01 19:13:10 +01:00 |
|
Laurent Destailleur
|
f378141fbd
|
PHPCS
|
2019-12-01 12:51:01 +01:00 |
|
Laurent Destailleur
|
3eec2430eb
|
Merge pull request #12585 from atm-john/develop_factoring_token_usage
Factoring token usage
|
2019-12-01 11:37:30 +01:00 |
|
Laurent Destailleur
|
790fdc881c
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-01 10:50:56 +01:00 |
|
Laurent Destailleur
|
bf99e8af5d
|
Fix phpcs
|
2019-12-01 10:33:55 +01:00 |
|
Laurent Destailleur
|
6bf3af5d83
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
|
2019-12-01 10:30:22 +01:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +01:00 |
|
ATM John BOTELLA
|
096e50aaf6
|
add link to widget
|
2019-12-01 10:08:43 +01:00 |
|
Laurent Destailleur
|
1d564c2a39
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/core/class/notify.class.php
|
2019-12-01 00:58:01 +01:00 |
|
Laurent Destailleur
|
bfb8a4e8da
|
Merge pull request #12578 from Dolibarr/revert-12577-#12482
Revert "FIX#12482"
|
2019-12-01 00:55:13 +01:00 |
|
Laurent Destailleur
|
199b0c11af
|
Merge pull request #12572 from atm-maxime/fix_deposit
Fix deposit line was not translated in deposit invoice
|
2019-12-01 00:44:17 +01:00 |
|
Laurent Destailleur
|
7931bfa766
|
Merge pull request #12568 from atm-john/develop_fix_divide_by_zero
Fix division by zero
|
2019-11-30 23:29:11 +01:00 |
|
Laurent Destailleur
|
47b35e9011
|
Merge pull request #12570 from atm-maxime/fix_margin_rights
Fix margin rights
|
2019-11-30 23:28:26 +01:00 |
|
Laurent Destailleur
|
a352fd5a6e
|
Revert "FIX#12482"
|
2019-11-30 21:00:56 +01:00 |
|
Nicolas
|
f2ff443641
|
FIX #12482
|
2019-11-30 20:04:27 +01:00 |
|
Maxime Kohlhaas
|
558669dd88
|
Fix #6497 : deposit lines were not translated
|
2019-11-30 16:14:16 +01:00 |
|
Maxime Kohlhaas
|
2c165d0a61
|
Fix deposit date display in PDF
|
2019-11-30 15:53:50 +01:00 |
|
Maxime Kohlhaas
|
916954b301
|
Fix #12371 : access rights on contacts
|
2019-11-30 14:48:05 +01:00 |
|
ATM John BOTELLA
|
b7d39b610b
|
Fix divided by zero
|
2019-11-30 10:08:55 +01:00 |
|
Laurent Destailleur
|
35b4318cee
|
Merge pull request #12552 from frederic34/patch-15
$head was never initialized
|
2019-11-30 01:16:40 +01:00 |
|
Laurent Destailleur
|
3b9d2abcb2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/product.lib.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
htdocs/product/list.php
|
2019-11-29 11:42:08 +01:00 |
|
Laurent Destailleur
|
3acd0bc2ff
|
FIX Reduce number of request for list of products
|
2019-11-29 11:32:09 +01:00 |
|
Frédéric FRANCE
|
00a80e498e
|
$head was never initialized
|
2019-11-28 23:06:04 +01:00 |
|
Scrutinizer Auto-Fixer
|
5f99e25c45
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-28 11:36:20 +00:00 |
|
Laurent Destailleur
|
540f47b998
|
Merge pull request #12523 from oscim/patch-11
Put $object in complete_head_from_modules
|
2019-11-28 12:20:16 +01:00 |
|
Laurent Destailleur
|
1e84b0ea97
|
Merge pull request #12522 from Dolibarr/scrutinizer-patch-15
Scrutinizer Auto-Fixes
|
2019-11-28 12:19:43 +01:00 |
|
Laurent Destailleur
|
874f5b7005
|
Merge pull request #12528 from frederic34/patch-8
image2wbmp() is deprecated as of PHP 7.3.0
|
2019-11-28 12:19:32 +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
|
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 |
|
Frédéric FRANCE
|
757d05e907
|
fix doxygen
|
2019-11-26 18:59:26 +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 |
|
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 |
|
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
|
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
|
b44817f2bf
|
Merge pull request #12518 from frederic34/patch-17
doxygen
|
2019-11-26 09:10:47 +01:00 |
|
Frédéric FRANCE
|
1ccf0808d0
|
doxygen
|
2019-11-26 00:28:26 +01:00 |
|
andreubisquerra
|
6baa1c8d4a
|
Fix travis
|
2019-11-25 23:32:40 +01:00 |
|
andreubisquerra
|
b2e995279e
|
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
|
2019-11-25 19:29:07 +01:00 |
|
Laurent Destailleur
|
bc5270ce76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/facture/card.php
|
2019-11-24 18:15:25 +01:00 |
|
Laurent Destailleur
|
cf0311dd6a
|
FIX Hook getAccessForbiddenMessage was missing parameters
|
2019-11-22 16:13:22 +01:00 |
|
Laurent Destailleur
|
e8bc8b68c1
|
Fix missing field in migration
|
2019-11-21 18:17:40 +01:00 |
|
Anthony Berton
|
496aa0c065
|
Update functions.lib.php
|
2019-11-21 10:38:59 +01:00 |
|
Scrutinizer Auto-Fixer
|
cd7523318d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-19 08:30:26 +00:00 |
|
Laurent Destailleur
|
16d67a1a8e
|
Fix several trouble with some types in modulebuilder
Fix difference between null and 0
|
2019-11-17 17:36:36 +01:00 |
|
Anthony Berton
|
fe3c921152
|
Merge branch 'develop' into patch-4
|
2019-11-17 10:17:47 +01:00 |
|
Anthony Berton
|
e1f36ae107
|
Update functions.lib.php
|
2019-11-16 17:37:18 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Laurent Destailleur
|
7e52c70321
|
FIX Advisory ID: usd20190067
|
2019-11-14 21:16:18 +01:00 |
|
Laurent Destailleur
|
411e9c87e3
|
Debug feature to set sender profiles
|
2019-11-14 11:53:28 +01:00 |
|
Laurent Destailleur
|
52787b56b2
|
Fix when limit = 0
Look and feel v11
|
2019-11-14 11:00:49 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Laurent Destailleur
|
ede05e03ba
|
Merge pull request #12417 from frederic34/patch-7
doxygen
|
2019-11-13 18:34:29 +01:00 |
|
Laurent Destailleur
|
7118dbbd1d
|
Fix var not defined
|
2019-11-13 18:25:48 +01:00 |
|