lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,428 Commits 43 Branches 150 Tags 886 MiB
575e4d11d0
Commit Graph

69428 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gauthier
575e4d11d0 FIX : wrong test 2019-09-19 17:28:51 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
56e070cd7f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:23:20 +02:00
Laurent Destailleur
7aac67f79c
Merge pull request #11884 from frederic34/patch-10 
fix colspan in show_project
 2019-09-14 16:33:02 +02:00
Laurent Destailleur
935e84d985
Merge pull request #11885 from frederic34/patch-12 
Create .stickler.yml
 2019-09-14 16:32:25 +02:00
Laurent Destailleur
fbb8808f29
Merge pull request #11887 from frederic34/patch-14 
Update index.php
 2019-09-14 16:32:11 +02:00
Frédéric FRANCE
00394493eb
Update index.php 2019-09-12 22:02:39 +02:00
Frédéric FRANCE
6db7414f88
Create .stickler.yml 2019-09-12 21:45:04 +02:00
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project 2019-09-12 21:39:57 +02:00
Laurent Destailleur
d4e26fcc55 FIX missing include (dol_convert_file not found) 2019-09-10 15:29:33 +02:00
Laurent Destailleur
8a4ac2cb07
Merge pull request #11760 from atm-john/FIX_module_product_disabled 
FIX: remove disabled product type from product list
 2019-08-27 12:38:21 +02:00
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +02:00
Laurent Destailleur
60b8982a74 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-08-26 16:39:39 +02:00
Laurent Destailleur
bdd57ecce7
Merge pull request #11727 from hregis/7.0_price 
FIX avoid sql error if fk_project is empty during update
 2019-08-26 16:38:57 +02:00
Laurent Destailleur
238970c069
Merge pull request #11734 from hregis/8.0_mc2 
FIX wrong parameters
 2019-08-26 16:28:39 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Regis Houssin
2d59f6bb3d FIX avoid sql error if fk_project is empty during update 2019-08-23 07:59:36 +02:00
Laurent Destailleur
18eb2a83fe FIX #11671 CVE-2019-15062 2019-08-17 22:17:27 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list 
Fix total on list and amount opened on thirdparty card (for supplier)
 2019-08-15 21:14:03 +02:00
Laurent Destailleur
c647195689
Merge pull request #11632 from atm-greg/FIX_delivery_Extrafields 
FIX delivery extrafields
 2019-08-10 01:28:46 +02:00
atm-greg
1d4fc32c20 fix second bad test 2019-08-05 13:13:56 +02:00
atm-greg
41c07b9b43 fix bad test in delivery card 2019-08-05 13:10:26 +02:00
Laurent Destailleur
5339bb71ac FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:57:21 +02:00
Laurent Destailleur
e4f2728494
Merge pull request #11608 from atm-arnaud/8.0_FIX_workflow_propal_and_order_billed 
FIX order or proposals billed if both workflow conf activated
 2019-08-01 16:37:48 +02:00
Laurent Destailleur
cd0d5c41f5
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-08-01 16:37:40 +02:00
atm-arnaud
f64092a1e8 FIX order or proposals billed if both workflow conf activated 2019-08-01 11:00:49 +02:00
Laurent Destailleur
9a87e27176
Merge pull request #11566 from atm-florianm/FIX_workflow_amount_comparison_fails_due_to_floating_point_val_precision_arithmetic_drift 
FIX: floating point precision errors in the triggers of the workflow module
 2019-07-30 21:23:43 +02:00
Laurent Destailleur
fe8ced58c8
Update interface_20_modWorkflow_WorkflowManager.class.php 2019-07-30 21:19:33 +02:00
Laurent Destailleur
64118a4ae3
Merge pull request #11573 from atm-maxime/8.0 
Fix var declaration #11429
 2019-07-30 20:56:23 +02:00
Laurent Destailleur
9e622fe042
Merge pull request #11572 from atm-maxime/fix_holiday_update_solde 
Fix holiday counter auto update
 2019-07-30 20:12:30 +02:00
Laurent Destailleur
ea92ba2a78
Update holiday.class.php 2019-07-30 20:11:43 +02:00
Laurent Destailleur
24695a9112
Merge pull request #11595 from ATM-Marc/FIX_8.0_import_bad_categories 
FIX: categories import: prevent mismatch between category type and object type
 2019-07-30 15:56:36 +02:00
Laurent Destailleur
5ef5c5521f
Merge pull request #11597 from atm-florianm/8.0-FIX_missing_prefix_replacement_in_database_function_initialization 
FIX issue #9300: install error with PostgreSQL using custom table prefix
 2019-07-30 15:38:22 +02:00
Marc de Lima Lucio
703506c0e2 FIX: import filter error 2019-07-30 14:11:21 +02:00
Florian Mortgat
de293c4ef2 FIX issue #9300: install error with PostgreSQL when using custom table prefix 2019-07-30 14:09:03 +02:00
Marc de Lima Lucio
449ef92007 FIX: categories import: prevent mismatch between category type and object type 2019-07-30 12:31:03 +02:00
Florian Mortgat
858e8a826f FIX: use rounding to compare the amounts 2019-07-29 09:47:28 +02:00
Maxime Kohlhaas
43adb51932 Fix var declaration #11429 2019-07-27 22:06:08 +02:00
Maxime Kohlhaas
37ad5308e6 Fix holiday counter auto update 2019-07-27 19:19:13 +02:00
Laurent Destailleur
fe9ddd7649 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/lib/files.lib.php
 2019-07-25 17:50:07 +02:00
Laurent Destailleur
e8932335aa
Merge pull request #11544 from atm-josselin/FIX_upload_file_with_multiple_spaces 
FIX : correct error in files with multiple spaces
 2019-07-25 17:48:26 +02:00
atm-josselin
0a1f4b7931 FIX : correct error in files with multiple spaces 2019-07-23 09:45:17 +02:00
Laurent Destailleur
b4e0c5ef6c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-07-22 18:51:32 +02:00
Laurent Destailleur
4c4a0b796e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-07-22 18:50:59 +02:00
Laurent Destailleur
891eaf50e1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-07-22 18:50:49 +02:00
Laurent Destailleur
45ea80a336
Merge pull request #11530 from atm-florianm/FIX_if_MAIN_USE_COMPANY_NAME_OF_CONTACT_set_socobject_is_a_contact 
FIX: extrafield loading bug due to assumption that an object is a thi…
 2019-07-22 18:43:51 +02:00
Laurent Destailleur
a872b7d42f
Merge pull request #11532 from atm-gauthier/6.0_fix_phone_search 
FIX : search by phone pro
 2019-07-22 18:30:07 +02:00
gauthier
cd7d3f1a36 FIX : search by phone pro 2019-07-19 15:41:44 +02:00
Florian Mortgat
b100cdb9db FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set. 2019-07-19 11:58:21 +02:00
Laurent Destailleur
a03a8da2fd
Merge pull request #11519 from atm-gauthier/8.0_fix_addline_cmdfourn_qty_inf_0 
FIX : we need to be able to add freeline with qty between 0 & 1 in su…
 2019-07-16 17:02:59 +03:00