Laurent Destailleur
|
40ba90d170
|
css
|
2020-01-06 15:29:18 +01:00 |
|
Laurent Destailleur
|
afd32135f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/invoice.php
|
2020-01-01 22:37:13 +01:00 |
|
Laurent Destailleur
|
e7ac01e1bd
|
FIX localtax info were not returned correctly when call done with id.
|
2020-01-01 22:27:47 +01:00 |
|
Laurent Destailleur
|
2e8fd25299
|
FIX Local taxes was not correctly supported in TakePOS.
|
2020-01-01 21:54:47 +01:00 |
|
Laurent Destailleur
|
094b37d79d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-23 19:12:32 +01:00 |
|
Laurent Destailleur
|
8e78dbad69
|
Fix for php 7.4
|
2019-12-23 16:41:22 +01:00 |
|
Laurent Destailleur
|
f193d3edd8
|
Fix for php7.4
|
2019-12-23 16:38:37 +01:00 |
|
Laurent Destailleur
|
1ebf7e642f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-23 15:49:25 +01:00 |
|
Laurent Destailleur
|
330cca994e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2019-12-23 15:49:00 +01:00 |
|
Laurent Destailleur
|
3250b13f4a
|
FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
|
2019-12-23 15:45:08 +01:00 |
|
Laurent Destailleur
|
07c1a5717e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
|
2019-12-23 14:16:34 +01:00 |
|
Laurent Destailleur
|
2df9df2db0
|
Debug v11
|
2019-12-23 12:24:27 +01:00 |
|
Laurent Destailleur
|
693551069b
|
Fix look and feel v11
|
2019-12-22 21:32:35 +01:00 |
|
Laurent Destailleur
|
30b8affdb7
|
Fix look and feel v11
|
2019-12-22 21:32:19 +01:00 |
|
Laurent Destailleur
|
ad039ff968
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/repair.php
|
2019-12-21 14:03:45 +01:00 |
|
Laurent Destailleur
|
03649ea2c8
|
Fix pb with svg images
|
2019-12-19 19:10:23 +01:00 |
|
Laurent Destailleur
|
43ff015157
|
Fix pb with svg images
|
2019-12-19 19:09:56 +01:00 |
|
stickler-ci
|
863fa7360d
|
Fixing style errors.
|
2019-12-19 09:57:37 +00:00 |
|
Laurent Destailleur
|
dd0a1b3e10
|
Merge branch 'develop' into develop_project
|
2019-12-19 10:56:03 +01:00 |
|
Laurent Destailleur
|
2afaed6981
|
Fix bad use of MAIN_MAX_DECIMALS_UNIT_ for foreign currencies
|
2019-12-19 10:50:23 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
138215fc3f
|
Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
european users.
|
2019-12-16 22:30:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
fdf4d86d81
|
Debug code
|
2019-12-16 12:38:51 +01:00 |
|
Laurent Destailleur
|
28bcb49957
|
Fix css
|
2019-12-16 11:32:27 +01:00 |
|
Laurent Destailleur
|
9e94be8bac
|
CSS
|
2019-12-15 20:31:09 +01:00 |
|
Laurent Destailleur
|
7c71f6cae9
|
Fix message
|
2019-12-15 17:48:30 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Laurent Destailleur
|
17b9964678
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
|
2019-12-14 14:43:14 +01:00 |
|
Laurent Destailleur
|
a8de7b850a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/admin/system/filecheck.php
|
2019-12-14 14:33:46 +01:00 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Laurent Destailleur
|
d38c73c90a
|
FIX output of emails from and error on emailing pages.
|
2019-12-13 15:52:08 +01:00 |
|
Laurent Destailleur
|
a612aefab7
|
Fix HTML5
|
2019-12-12 11:11:08 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Frédéric FRANCE
|
12f84d8254
|
doxygen
|
2019-12-11 23:04:27 +01:00 |
|
Laurent Destailleur
|
6f4e2e7e61
|
Fix rounding with multicurrency
|
2019-12-11 17:58:14 +01:00 |
|
VESSILLER
|
0396b348f7
|
NEW add weighted amount on project/opportunity
|
2019-12-10 09:32:37 +01:00 |
|
Frédéric FRANCE
|
f4674a7558
|
doxygen and $db bot defined
|
2019-12-10 07:51:39 +01:00 |
|
Laurent Destailleur
|
c8f457f303
|
Merge pull request #12666 from atm-john/develop_fix_exif_read_data_fatal
Fix warning introduce by my #12605 PR #12622
|
2019-12-09 15:57:24 +01:00 |
|
Laurent Destailleur
|
04a7de14c6
|
Merge pull request #12660 from Ahuahuachi/develop
Bugfix: Module builder missing table prefix
|
2019-12-09 15:56:01 +01:00 |
|
Laurent Destailleur
|
8c50097012
|
Update modulebuilder.lib.php
|
2019-12-09 15:55:25 +01:00 |
|
Laurent Destailleur
|
a12b2fea80
|
Update modulebuilder.lib.php
|
2019-12-09 15:54:14 +01:00 |
|
John Botella
|
e1cf93d9a9
|
Fix exif_read_data fatal error
|
2019-12-09 14:44:37 +01:00 |
|
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 |
|
Laurent Destailleur
|
89bf35a8bf
|
Fix default value show must match the theme selected
|
2019-11-12 21:54:41 +01:00 |
|
Frédéric FRANCE
|
7ce297c6cc
|
doxygen
|
2019-11-12 21:53:17 +01:00 |
|
Laurent Destailleur
|
03e35623c6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-12 00:43:37 +01:00 |
|
Laurent Destailleur
|
8be0a6d470
|
Fix: Can set savingdocmask by caller. Fix permissions names.
Fix: Disable crop on svg images.
|
2019-11-12 00:43:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
038bda254d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 22:59:36 +00:00 |
|
Laurent Destailleur
|
5eb03cf6ad
|
Avoid false positive.
|
2019-11-11 13:26:48 +01:00 |
|
Laurent Destailleur
|
771f304c79
|
Fix typo
|
2019-11-09 18:40:08 +01:00 |
|
Anthony Berton
|
4449c6d2a7
|
Update functions.lib.php
|
2019-11-08 16:34:20 +01:00 |
|
Laurent Destailleur
|
d1c49c7021
|
Fix trans
|
2019-11-08 10:24:03 +01:00 |
|
Laurent Destailleur
|
34beca0758
|
Fix var not not consistent
|
2019-11-07 16:33:11 +01:00 |
|
Laurent Destailleur
|
8318db85a3
|
Fix typo
|
2019-11-07 16:32:44 +01:00 |
|
Laurent Destailleur
|
c0b8684475
|
Merge pull request #12341 from inoveaconseil/bankStatementDocument
NEW add upload for account statement
|
2019-11-07 15:06:47 +01:00 |
|
Nicolas
|
f18bca7687
|
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
|
2019-11-06 20:51:17 +01:00 |
|
Inovea Conseil
|
fed6ed8760
|
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
|
2019-11-06 20:48:24 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
stickler-ci
|
f537ae60b6
|
Fixing style errors.
|
2019-11-05 12:52:58 +00:00 |
|
Nicolas
|
991e1b2747
|
NEW Add upload document on account statement
|
2019-11-05 13:51:52 +01:00 |
|
Laurent Destailleur
|
747113551b
|
Debug pagination of bookmark list
|
2019-11-05 09:52:33 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Laurent Destailleur
|
c276659acd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/ticket.lib.php
|
2019-11-04 20:37:49 +01:00 |
|
Laurent Destailleur
|
e60fff39d9
|
Fix phpcs
|
2019-11-04 20:36:55 +01:00 |
|
Laurent Destailleur
|
0347d82660
|
Merge pull request #12303 from frederic34/patch-2
css
|
2019-11-04 20:31:02 +01:00 |
|
Laurent Destailleur
|
ec8bd6327d
|
Fix css
|
2019-11-04 18:53:46 +01:00 |
|
Laurent Destailleur
|
6e591d2be0
|
Fix css
|
2019-11-04 18:25:32 +01:00 |
|
Laurent Destailleur
|
8aa2fd04ad
|
NEW The integrity checker now show the expected size of files
|
2019-11-04 13:23:48 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
99a4781a42
|
Fix better support for multicurrency for template invoices
|
2019-11-03 18:58:26 +01:00 |
|
Frédéric FRANCE
|
3e2d89dc02
|
Update ticket.lib.php
|
2019-11-02 18:16:09 +01:00 |
|
Laurent Destailleur
|
496f93911f
|
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
|
2019-11-02 16:19:13 +01:00 |
|
Laurent Destailleur
|
df750b6a9d
|
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
NEW Add attendee to ical export + cleanup
|
2019-11-02 13:40:27 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
04a5054e1c
|
Merge pull request #12279 from atm-john/develop_ticket_file_display
New - ticket file download button display
|
2019-11-02 13:32:33 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
stickler-ci
|
b43d06db37
|
Fixing style errors.
|
2019-11-02 10:55:24 +00:00 |
|
Laurent Destailleur
|
37f4ebb1b2
|
Update xcal.lib.php
|
2019-11-02 11:56:01 +01:00 |
|
Laurent Destailleur
|
d9f333d828
|
Merge pull request #12289 from frederic34/datetime
php is > 5.4
|
2019-11-02 11:46:34 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Laurent Destailleur
|
8608c5db9c
|
Fix color of task progression
|
2019-11-01 23:16:08 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
2af23aa658
|
Enhance modulebuilder
|
2019-11-01 17:54:17 +01:00 |
|
Laurent Destailleur
|
a1b2130247
|
Enhance the progress bar of tasks
|
2019-11-01 16:09:31 +01:00 |
|
Laurent Destailleur
|
135e65c4aa
|
Look and feel v11
Enhance the progress bar of tasks
|
2019-11-01 15:53:57 +01:00 |
|
Frédéric FRANCE
|
da238e94e1
|
php is > 5.4
|
2019-11-01 15:21:21 +01:00 |
|
Sekan, Tobias
|
e27f1c623d
|
Merge branch 'AddAttendeeToIcal' of https://github.com/TobiasSekan/dolibarr into develop
|
2019-11-01 13:16:54 +01:00 |
|
Sekan, Tobias
|
885c6e6516
|
Fix wrong newline replacement
|
2019-11-01 13:16:14 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
stickler-ci
|
fee0a362ad
|
Fixing style errors.
|
2019-11-01 11:11:59 +00:00 |
|
Sekan, Tobias
|
2a983a6a7c
|
fix link in documentation
|
2019-11-01 12:09:43 +01:00 |
|
Sekan, Tobias
|
0bfff92032
|
Add attendee to ical export + cleanup
|
2019-11-01 11:59:54 +01:00 |
|
Laurent Destailleur
|
5b5a2e9804
|
Clean code
|
2019-11-01 03:25:09 +01:00 |
|
Laurent Destailleur
|
c215d534fc
|
Fix phpcs
|
2019-10-31 21:16:41 +01:00 |
|
Laurent Destailleur
|
f98df3c807
|
NEW Can edit link to the translation page in website module
|
2019-10-31 21:09:33 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
John Botella
|
d0a5e30faa
|
Change btn name
|
2019-10-31 08:44:08 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
John Botella
|
0cff122ccd
|
Add file display in ticket
|
2019-10-30 17:46:18 +01:00 |
|
Laurent Destailleur
|
2770f79a86
|
Merge pull request #12216 from frederic34/patch-5
css
|
2019-10-30 03:02:24 +01:00 |
|
Laurent Destailleur
|
66a288a343
|
Merge pull request #12235 from frederic34/scopeindent
clean indent
|
2019-10-30 02:57:59 +01:00 |
|
Laurent Destailleur
|
bf0400a29b
|
Merge pull request #12252 from oscim/patch-10
Update admin.lib.php
|
2019-10-30 02:41:59 +01:00 |
|
Laurent Destailleur
|
f03bf149bd
|
Fix autoselect of field with modulebuilder
|
2019-10-30 02:09:29 +01:00 |
|
Laurent Destailleur
|
4eedf4a113
|
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-10-29 11:48:36 +01:00 |
|
Laurent Destailleur
|
9483e367ca
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:48:11 +01:00 |
|
Laurent Destailleur
|
e58ecaaa64
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:43:35 +01:00 |
|
stickler-ci
|
52ef2bb990
|
Fixing style errors.
|
2019-10-29 10:16:49 +00:00 |
|
oscim
|
d310ca6e82
|
Update admin.lib.php
add function modulehelp_prepare_head
|
2019-10-29 11:15:03 +01:00 |
|
Laurent Destailleur
|
5e06fe0712
|
FIX Avoid fatal error when creating thumb from PDF
|
2019-10-29 11:11:13 +01:00 |
|
Frédéric FRANCE
|
e2afcfb999
|
clean indent
|
2019-10-27 11:53:20 +01:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Frédéric FRANCE
|
83ed70f72f
|
Update agenda.lib.php
|
2019-10-24 22:44:51 +02:00 |
|
Laurent Destailleur
|
2814a5c07b
|
Fix phpcs
|
2019-10-24 21:47:31 +02:00 |
|
Laurent Destailleur
|
b45ee20696
|
NEW Add a tab to setup "Opening hours" of company (information only)
|
2019-10-24 21:29:07 +02:00 |
|
Laurent Destailleur
|
b48f08dd07
|
Theme v11
|
2019-10-23 20:12:29 +02:00 |
|
Laurent Destailleur
|
41303006f3
|
Rename constant
|
2019-10-23 17:48:55 +02:00 |
|
Laurent Destailleur
|
f4545a2068
|
Debug method MAIN_STATUS_USES_CSS
|
2019-10-23 17:31:54 +02:00 |
|
Laurent Destailleur
|
da00591bba
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
|
2019-10-23 04:04:32 +02:00 |
|
Laurent Destailleur
|
c4be61c55c
|
FIX Better compatible fix for the trouble of weight / size units
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
|
2019-10-22 18:42:59 +02:00 |
|
Laurent Destailleur
|
e7e9898e0d
|
FIX Better compatible fix for the trouble of weight / size units
|
2019-10-22 18:36:36 +02:00 |
|
Laurent Destailleur
|
8242281ef8
|
Close #12096
|
2019-10-22 14:39:33 +02:00 |
|
Laurent Destailleur
|
b2bbee55f1
|
Fix phpcs
|
2019-10-22 12:37:36 +02:00 |
|
Anthony Berton
|
5e7d615250
|
Update functions.lib.php
|
2019-10-21 21:06:48 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Laurent Destailleur
|
49c101bb77
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-20 15:16:51 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Laurent Destailleur
|
84f6fd64a9
|
Merge pull request #12176 from Ahuahuachi/develop
Translation of some function documentation
|
2019-10-20 13:31:25 +02:00 |
|
Laurent Destailleur
|
62a8523ccf
|
Merge pull request #12178 from frederic34/patch-18
Update functions2.lib.php
|
2019-10-20 12:40:34 +02:00 |
|
stickler-ci
|
66a2dc4994
|
Fixing style errors.
|
2019-10-20 09:18:55 +00:00 |
|
Frédéric FRANCE
|
33c35780e0
|
wip
|
2019-10-20 11:17:54 +02:00 |
|
Frédéric FRANCE
|
f0a3d1a1c4
|
Update functions2.lib.php
|
2019-10-18 23:20:34 +02:00 |
|
Alfredo Altamirano
|
71f9b4f36b
|
Translation of parameter documentation
|
2019-10-18 12:55:21 -05:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Laurent Destailleur
|
4d9c285126
|
Merge pull request #12163 from sadlig/fix-stock-movement-right
Fix Stock movement user's right (Fixes #11967)
|
2019-10-17 17:53:17 +02:00 |
|
Gildas
|
132ea56a59
|
Fix Stock movement user's right (Fixes #11967)
|
2019-10-17 17:06:38 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
6d05d42c50
|
Look and feel v11
|
2019-10-16 11:26:20 +02:00 |
|
Laurent Destailleur
|
63a60c7811
|
NEW Add option MAIN_PDF_FORCE_FONT_SIZE
|
2019-10-15 11:13:14 +02:00 |
|
Frédéric FRANCE
|
d1d9b1ed85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-15 09:39:57 +02:00 |
|
Laurent Destailleur
|
2ed96c9e5f
|
Fix scrutinizer
|
2019-10-15 02:54:19 +02:00 |
|
Laurent Destailleur
|
a1c93cb2e6
|
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
Look and feel v11
|
2019-10-15 02:45:12 +02:00 |
|
Laurent Destailleur
|
c869cbe193
|
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
Unlock title button feature
|
2019-10-14 23:55:10 +02:00 |
|
Laurent Destailleur
|
7b1b51e752
|
Merge pull request #12115 from TobiasSekan/develop
Fix MS Outlook import error
|
2019-10-14 20:54:30 +02:00 |
|
Laurent Destailleur
|
3b84e2bac3
|
Use img-thumb css
|
2019-10-14 19:21:13 +02:00 |
|
Tobias Sekan
|
e2ca646b6e
|
Fix MS Outlook import error
|
2019-10-14 10:22:47 +02:00 |
|
Frédéric FRANCE
|
c143584af4
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 21:16:54 +02:00 |
|
Laurent Destailleur
|
c338db6c36
|
Fix unlink picto
|
2019-10-12 19:16:36 +02:00 |
|
Frédéric FRANCE
|
d9ba09bec1
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 19:02:24 +02:00 |
|
Laurent Destailleur
|
9ba992b8b6
|
Work on inventory module
|
2019-10-12 12:31:35 +02:00 |
|
Laurent Destailleur
|
95305a313d
|
Fix trans
|
2019-10-11 17:02:35 +02:00 |
|
Laurent Destailleur
|
60bdb3133e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-11 16:57:56 +02:00 |
|
Laurent Destailleur
|
b58c2c38b2
|
Fix missing token
|
2019-10-11 16:57:47 +02:00 |
|
Laurent Destailleur
|
3f62a6d532
|
Merge pull request #12093 from frederic34/patch-23
fix search by roles
|
2019-10-11 16:57:33 +02:00 |
|
Frédéric FRANCE
|
367ef4acaf
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-11 16:44:25 +02:00 |
|
Laurent Destailleur
|
cc73877e03
|
Merge branch 'develop' into patch-18
|
2019-10-11 16:32:48 +02:00 |
|
Laurent Destailleur
|
541357027e
|
Merge pull request #12077 from frederic34/patch-15
globe fontawesome
|
2019-10-11 16:31:37 +02:00 |
|
Laurent Destailleur
|
9251f04d63
|
Update thumbs of themes
|
2019-10-11 13:26:48 +02:00 |
|
Laurent Destailleur
|
5801d09dbe
|
NEW Use the squarre logo as favicon of pages
|
2019-10-11 12:28:13 +02:00 |
|
John Botella
|
9194eb4bec
|
Fix block title height if no button
|
2019-10-11 09:14:10 +02:00 |
|
John Botella
|
724999f1ce
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-11 08:40:43 +02:00 |
|
Frédéric FRANCE
|
c80d055af3
|
fix search by roles
|
2019-10-10 23:51:54 +02:00 |
|
Frédéric FRANCE
|
03bbfc6ad9
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-10 23:24:50 +02:00 |
|
Laurent Destailleur
|
e7f56b67d8
|
Look and feel v11
|
2019-10-10 23:00:33 +02:00 |
|
Laurent Destailleur
|
aebae5ff83
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
|
2019-10-10 10:37:17 +02:00 |
|
Frédéric FRANCE
|
be00576717
|
Update functions.lib.php
|
2019-10-10 08:22:14 +02:00 |
|
Frédéric FRANCE
|
d4757a0b5b
|
globe fontawesome
|
2019-10-09 23:20:15 +02:00 |
|
Laurent Destailleur
|
072a0a26d6
|
Use a font awesome icon to show "shippable" flag on orders.
|
2019-10-09 18:07:00 +02:00 |
|
Laurent Destailleur
|
db651a607d
|
Use fontawesome for img_warning
|
2019-10-09 17:33:46 +02:00 |
|
Laurent Destailleur
|
f2d04fe55c
|
Code comment
|
2019-10-09 11:51:10 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
f55a4d77e4
|
css
|
2019-10-08 16:41:03 +02:00 |
|
Laurent Destailleur
|
d55b7689bb
|
Merge pull request #11920 from ptibogxiv/patch-264
NEW translation for member type
|
2019-10-08 09:00:49 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
297313e7de
|
CSS
|
2019-10-07 16:01:36 +02:00 |
|
Laurent Destailleur
|
c6c498fd67
|
Merge pull request #11829 from atm-florian/dev_contactdefault
NEW : Address/Contact by default on third parties
|
2019-10-07 15:27:58 +02:00 |
|
ptibogxiv
|
9aa7226d39
|
Update member.lib.php
|
2019-10-07 13:38:05 +02:00 |
|
Laurent Destailleur
|
e02794248e
|
Merge branch 'develop' into patch-264
|
2019-10-07 13:25:16 +02:00 |
|
Laurent Destailleur
|
1060ac4608
|
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
Fix : LibStatut missing dolgetstatus usage
|
2019-10-07 13:08:33 +02:00 |
|
Laurent Destailleur
|
c2a7ae23bc
|
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
|
2019-10-07 13:03:27 +02:00 |
|
Frédéric FRANCE
|
ec8569dd85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-06 15:56:21 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Frédéric FRANCE
|
6384e7eb67
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-05 20:02:16 +02:00 |
|
Laurent Destailleur
|
b883a8092a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
|
2019-10-05 19:35:40 +02:00 |
|
Laurent Destailleur
|
ac8837d01f
|
Fix url
|
2019-10-05 19:28:00 +02:00 |
|
Laurent Destailleur
|
7f5ccf4b8e
|
Remove google+
|
2019-10-05 19:27:14 +02:00 |
|
Laurent Destailleur
|
031c5523d4
|
NEW Add link to the public interface on the ticket card.
|
2019-10-05 11:52:30 +02:00 |
|
stickler-ci
|
bc32d684a4
|
Fixing style errors.
|
2019-10-04 16:12:33 +00:00 |
|
florian HENRY
|
2d3dd9ed3c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-10-04 18:10:16 +02:00 |
|
Laurent Destailleur
|
503973cec9
|
FIX Edit of ticket module parameters erased others
|
2019-10-04 14:04:31 +02:00 |
|
ATM john
|
027c8224b0
|
Fix dolGetStatus unused
|
2019-10-03 21:34:01 +02:00 |
|
Alexandre SPANGARO
|
ddadff5731
|
Add globe fa-icon
|
2019-10-03 21:32:55 +02:00 |
|
ATM john
|
77f666a236
|
Fix dolGetStatus param
|
2019-10-03 21:28:11 +02:00 |
|
Alexandre SPANGARO
|
8668e7157a
|
Add bookmark fa-icon
|
2019-10-03 21:00:59 +02:00 |
|
Alexandre SPANGARO
|
d0840b038f
|
Remove constant MAIN_DISABLE_FONT_AWESOME_5
|
2019-10-03 20:42:02 +02:00 |
|
Alexandre SPANGARO
|
14381927c7
|
Fix Bank Fa-icon
|
2019-10-03 20:32:15 +02:00 |
|