lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,748 Commits 43 Branches 150 Tags 886 MiB
7909055ee8
Commit Graph

5894 Commits

Author SHA1 Message Date
Laurent Destailleur
c556f60c89 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-16 18:13:35 +01:00
Anthony Berton
9a6ee89d43
Update functions.lib.php 2020-01-16 15:44:07 +01:00
Anthony Berton
9a6bcaa683
Update functions.lib.php 2020-01-16 15:20:09 +01:00
Laurent Destailleur
849c78f4cd Doc 2020-01-16 10:12:39 +01:00
atm-ph
3cdb84b192 Fix note started with <s> balise 2020-01-16 09:50:57 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
Laurent Destailleur
07b12e507f
Merge pull request #12841 from bb2a/patch-10 
Addition of delivery times substitution
 2020-01-15 12:08:07 +01:00
Laurent Destailleur
c8ff847480 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/modulebuilder/index.php
 2020-01-15 11:56:46 +01:00
Laurent Destailleur
0442105bd4 Fix Generation of zip of module 2020-01-15 11:55:27 +01:00
Anthony Berton
ef5c1e6c8c
Update functions.lib.php 2020-01-13 23:09:08 +00:00
Anthony Berton
1eff733e1c
Update functions.lib.php 2020-01-13 18:23:50 +01:00
Anthony Berton
f3046589e7
Update functions.lib.php 2020-01-13 18:19:51 +01:00
Anthony Berton
226dbceac0
Update functions.lib.php 2020-01-13 17:11:50 +01:00
Laurent Destailleur
9d4e1a3941 FIX #12797 2020-01-13 14:25:48 +01:00
Laurent Destailleur
e88c11c417 Space 2020-01-13 13:20:58 +01:00
Laurent Destailleur
22d4f37e58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/html.form.class.php
 2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/inventory/class/inventory.class.php
	htdocs/product/inventory/list.php
 2020-01-10 14:30:42 +01:00
Laurent Destailleur
9ebdd82edb Fix We must refuse to delete a various payment if payment was dispatched 
in accountancy.
 2020-01-10 02:43:24 +01:00
Scrutinizer Auto-Fixer
8691194627 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-09 23:03:10 +00:00
Laurent Destailleur
f48c7d2ecf Fix modulebuilder 2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896 Fix modulebuilder 2020-01-09 22:27:24 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Laurent Destailleur
622dc7e8d7 Debug v11 2020-01-07 22:01:55 +01:00
Laurent Destailleur
7ef3ee56bd Fix MRP 2020-01-07 20:28:21 +01:00
Laurent Destailleur
a947215ac1 Fix morecss param was lost 2020-01-07 14:40:59 +01:00
Laurent Destailleur
0e2edde6d3 Look and feel v11 2020-01-07 14:25:58 +01:00
Laurent Destailleur
f4d7958ead Fix duplicate record in list of events for projects 2020-01-07 14:16:13 +01:00
Laurent Destailleur
f05873201c Fix duplicate record in list of events for projects 2020-01-07 14:14:47 +01:00
Laurent Destailleur
444e2f1130 Fix length of column 2020-01-07 14:01:45 +01:00
Laurent Destailleur
eea8a4df7b Fix length of column 2020-01-07 14:01:12 +01:00
Laurent Destailleur
750fa83e96 FIX Bad management of elementtype not llx_actioncomm 2020-01-07 13:49:52 +01:00
Laurent Destailleur
6029e82e90 FIX Bad management of elementtype not llx_actioncomm 2020-01-07 13:48:44 +01:00
Laurent Destailleur
8c67ea14a0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-06 15:30:22 +01:00
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