Commit Graph

14753 Commits

Author SHA1 Message Date
Laurent Destailleur
53709cf509 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/utils.class.php
2022-01-07 15:40:05 +01:00
Laurent Destailleur
10e32c056e FIX avoid infinite loop on dump with popen 2022-01-07 15:35:33 +01:00
Laurent Destailleur
14531bf160 Fix #13046 - Bad parenthesis on test 2020-02-08 15:28:40 +01:00
Laurent Destailleur
bf4fca0c7e Fix warning 2020-02-03 22:09:21 +01:00
Gérald Lelarge
5d61e53140 FIX #12665 Mass invoice validation with stock management
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
2019-12-10 14:16:15 +01:00
Frédéric FRANCE
f4674a7558 doxygen and $db bot defined 2019-12-10 07:51:39 +01:00
Laurent Destailleur
c0e23c7b71 Merge pull request #12670 from frederic34/patch-7
The variable $id seems to be never defined
2019-12-10 05:53:46 +01:00
Frédéric FRANCE
de741f5dd0 The variable $id seems to be never defined 2019-12-09 23:22:13 +01:00
Frédéric FRANCE
a16e342af6 typo 2019-12-09 23:15:15 +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
394104291a Fix function not found when creating a payment of an expense report 2019-12-08 04:22:09 +01:00
Laurent Destailleur
13acb8537d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-12-03 22:38:10 +01:00
Laurent Destailleur
a75915a7a8 Fix regression 2019-12-03 22:37:58 +01:00
gauthier
cec54d6ce0 FIX : when we need to bill several orders, order lines unit is not on bill lines 2019-12-03 16:40:35 +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
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
Maxime Kohlhaas
9095482113 Fix margins access + menu display 2019-11-30 14:47:48 +01:00
Maxime Kohlhaas
02b5da5db1 Fix #12448 : notifications were sent to disabled user or contacts 2019-11-30 00:57:21 +01:00
Laurent Destailleur
918f476c2b Fix backport fix not checking mandatory extrafields of type select 2019-11-18 19:02:12 +01:00
Marc de Lima Lucio
85cef09e83 FIX: triggers: directories read with opendir() never closed 2019-10-30 14:46:46 +01:00
Laurent Destailleur
5e06fe0712 FIX Avoid fatal error when creating thumb from PDF 2019-10-29 11:11:13 +01:00
Laurent Destailleur
2d1bc90e57 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:06 +02:00
Florian Mortgat
2aee62ea28 FIX: $from and $sendto variables are unescaped in the sending error message
This causes addresses like Tom <tom@examp.le> not to be shown in the message.
2019-10-07 17:32:52 +02:00
gauthier
2ac8bd4e16 FIX : If we share invoice, we need to see discount created from a deposit on each entity 2019-09-17 11:59:58 +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
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
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +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
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
Marc de Lima Lucio
703506c0e2 FIX: import filter error 2019-07-30 14:11:21 +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
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
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
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
4dabdfa5ac Merge pull request #11483 from inoveaconseil/FIX_update_price
FIX element name in update_price
2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e Update commonobject.class.php 2019-07-13 22:29:50 +02:00