lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
84,523 Commits 43 Branches 150 Tags 886 MiB
36873f2db7
Commit Graph

5960 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
59c0631172 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-06 09:49:12 +00:00
Laurent Destailleur
4f3cc87077 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9 FIX Confusion between 'bank reconciled' and 'accounted'. Show both data 2020-02-05 19:23:00 +01:00
Laurent Destailleur
80f4e625be Fix phpcs 2020-02-05 17:07:42 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
c015707cbc Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
Laurent Destailleur
ddd1ca26b9 CSS 2020-02-05 14:04:19 +01:00
Laurent Destailleur
f8daed7f56
Update company.lib.php 2020-02-05 12:49:56 +01:00
ptibogxiv
94fd2b40c7
new fix Count of Stripe payment mode must take test/live into account 
fix error message for if no stripe enabled 0b891d5e0c
 2020-02-05 12:04:27 +01:00
Laurent Destailleur
0b891d5e0c FIX Count of Stripe payment mode must take test/live into account 2020-02-04 19:33:47 +01:00
Laurent Destailleur
bc19f72306 FIX Count of Stripe payment mode must take test/live into account 2020-02-04 19:33:20 +01:00
Laurent Destailleur
bb1c9a66dd Fix code alignement on modulebuilder 2020-02-04 16:37:30 +01:00
Laurent Destailleur
976ce0a954 Fix scrutinizer 2020-02-04 14:33:25 +01:00
Laurent Destailleur
157745a1bb Fix phpcs 2020-02-04 14:18:37 +01:00
Laurent Destailleur
12b63606df Fix look and feel of v11 2020-02-02 20:21:16 +01:00
Laurent Destailleur
21e4717721
Merge pull request #12983 from atm-quentin/NEW_monthly_view 
NEW monthly view to enter time
 2020-02-02 20:05:18 +01:00
Laurent Destailleur
86c1777702
Merge pull request #12976 from mapiolca/patch-28 
Add support of Number2Words module (v2)
 2020-02-02 19:54:49 +01:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +01:00
Laurent Destailleur
075b1ea744 FIX Log of authentication ko or ko + CVE-2020-7996 2020-02-02 19:05:38 +01:00
Laurent Destailleur
aa54aaeb01 FIX search filter on extrafields were not restored avec "Back to list" 2020-01-31 19:46:03 +01:00
Laurent Destailleur
9372940f17 Fix log through proxy 2020-01-31 17:51:30 +01:00
Laurent Destailleur
8e18a08377 Fix log of proxy forward only if it differs from remote_addr 2020-01-31 16:59:10 +01:00
Laurent Destailleur
0cd8337b7e NEW Can manage situation invoices 2020-01-31 14:54:42 +01:00
Laurent Destailleur
f752551914 WIP Generic stats page 2020-01-31 14:53:47 +01:00
atm-quentin
78baae1480 Fix stickler v2 2020-01-31 11:51:40 +01:00
atm-quentin
398e83d1cc FIX for stickler 2020-01-31 11:36:53 +01:00
stickler-ci
fee113bfb5 Fixing style errors. 2020-01-31 10:26:33 +00:00
atm-quentin
a001913751 Debut modification saisie par mois 
NEW hook and data id

NEW visu FROM day TO day in permonth view

FIX
 2020-01-31 11:21:49 +01:00
atm-quentin
ae14814f10 NEW visu FROM day TO day in permonth view 2020-01-31 11:10:40 +01:00
Laurent Destailleur
c58f76b15c Fix constant name 2020-01-30 17:06:26 +01:00
Pierre Ardoin
05d3c134db
Add support of Number2Words module (v2) 
if the Number2Words Module is detected, this conversion is selected.
 2020-01-30 15:58:21 +01:00
Laurent Destailleur
141664ff10 Fix phpcs 2020-01-30 02:25:26 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
f64ad71924 Missing country code 2020-01-28 02:50:11 +01:00
Laurent Destailleur
c2c80bf40f Fix Look and feel v11 2020-01-28 02:44:41 +01:00
Laurent Destailleur
fc63d7366d FIX Mandatory fields must stay mandatory if create/update submit fails 2020-01-27 22:23:40 +01:00
Laurent Destailleur
4fe942985f FIX Mandatory fields must stay mandatory if create/update submit fails 2020-01-27 22:22:59 +01:00
Laurent Destailleur
29853b5fbd Fix responsive for public interface of tickets 2020-01-27 14:01:35 +01:00
Laurent Destailleur
50d9ac0b52 Fix else if 2020-01-27 02:13:12 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
8f3f34e1c0 Fix css 2020-01-24 20:11:07 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
7ad827f212 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
 2020-01-23 12:07:17 +01:00
Laurent Destailleur
cbe396b97c
Update functions2.lib.php 2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082
Update functions2.lib.php 2020-01-23 12:02:29 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
040f8bef5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-01-22 16:29:04 +01:00
Laurent Destailleur
28d0b85b84 Fix phpcs 2020-01-22 14:56:19 +01:00
Laurent Destailleur
2caa4e9fa6
Merge pull request #12885 from leninrivas/10.0 
FIX Missing Linked objects Fichinter Ref. in PDF formats
 2020-01-22 14:17:25 +01:00
Laurent Destailleur
4922567a27 Add .noexec extension for old php4, php5... files 2020-01-21 15:02:04 +01:00
Laurent Destailleur
4fdfba3867 Add .noexec extension for old php4, php5... files 2020-01-21 15:01:22 +01:00
Laurent Destailleur
ab5940f28c Fix css lost 2020-01-21 00:56:32 +01:00
Laurent Destailleur
acdb28ba25 Add country id and country code in substitution vars 2020-01-21 00:28:53 +01:00
Laurent Destailleur
5b86851cf3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:46:52 +01:00
Laurent Destailleur
5cac54b2e1 Doc 2020-01-20 18:46:13 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
d465101ae3 Fix We should not be able to choose which permission to use to have 
access to an object.
 2020-01-20 14:29:02 +01:00
Laurent Destailleur
18f2b09fb1 Debug v11 2020-01-20 12:25:25 +01:00
Laurent Destailleur
b8938b8d19 Fix look and feel v11 2020-01-20 02:18:00 +01:00
Laurent Destailleur
24d439845b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-18 20:20:25 +01:00
Laurent Destailleur
d9f7c4aec4 FIX #12838 2020-01-18 19:53:48 +01:00
Laurent Destailleur
9c1e409feb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-17 11:35:16 +01:00
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