Commit Graph

69453 Commits

Author SHA1 Message Date
Juanjo Menent
7e9d6dc153 Fix With pagination it is possible that the searched product does not appear if there are many open supplier orders 2019-10-24 10:58:29 +02:00
Laurent Destailleur
9cd2406d50
Merge pull request #12156 from ATM-Marc/FIX_8.0_replenish_resql
FIX: stock replenish: fetching and freeing non existing SQL result set
2019-10-17 17:40:24 +02:00
Marc de Lima Lucio
d79340a632 FIX: stock replenish: fetching and freeing non existing SQL result set 2019-10-17 09:55:02 +02:00
Laurent Destailleur
6662b00575 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:40 +02: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
Laurent Destailleur
b847eb1b7e
Merge pull request #12056 from atm-florianm/FIX_7.0_email_addresses_in_email_sending_error_message
FIX 7.0: addresses not displayed in e-mail sending error messages
2019-10-07 20:25:01 +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
Laurent Destailleur
bb84e4a236
Merge pull request #12037 from frederic34/patch-14
Fix list of expense report list for user when he has extrafields
2019-10-07 13:10:02 +02:00
Laurent Destailleur
3d20766392
Merge pull request #12047 from frederic34/patch-15
translation for holidays actioncomm
2019-10-07 10:23:29 +02:00
Frédéric FRANCE
37f6aa3395
Update list.php 2019-10-06 15:52:33 +02:00
Frédéric FRANCE
52da21912b
Update agenda.lang 2019-10-06 13:21:04 +02:00
Frédéric FRANCE
21dcc549fa
translation for holidays actioncomm 2019-10-06 10:09:06 +02:00
Frédéric FRANCE
55410a55ef
Update list.php 2019-10-04 00:45:57 +02:00
Laurent Destailleur
7412335217
Merge pull request #12031 from atm-lena/8.0_fix_missingbegin
FIX missing begin()
2019-10-03 17:50:35 +02:00
atm-lena
ae01bd8f07 FIX missing begin() 2019-10-03 17:23:16 +02:00
Laurent Destailleur
4928a999a0
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype
FIX : change product type must be allowed if we activate hidden conf
2019-10-01 14:41:52 +02:00
Laurent Destailleur
d448998762
Update card.php 2019-10-01 14:41:25 +02:00
gauthier
2167e7ed98 FIX : hidden conf to prevent from changing product_type 2019-10-01 09:12:51 +02:00
Laurent Destailleur
29d941cb6e
Merge pull request #11918 from atm-gauthier/8.0_fix_discount_visibility_follows_invoice_sharing
FIX : If we share invoice, we need to see discount created from a deposit on each entity
2019-09-30 18:04:07 +02:00
Laurent Destailleur
de11801792
Merge pull request #11971 from ATM-Marc/FIX_8.0_shipping_errors
FIX: shipping card: missing user error messages when classifying closed or billed
2019-09-27 11:56:43 +02:00
Laurent Destailleur
fe15871fe3
Merge pull request #11935 from atm-gauthier/8.0_chargesociale
FIX : wrong test
2019-09-27 11:35:00 +02:00
Laurent Destailleur
99cfea1ff4
Update paiement_charge.php 2019-09-27 11:34:50 +02:00
Marc de Lima Lucio
13f5decdf7 FIX: shipping card: missing user error messages when classifying closed or billed 2019-09-27 11:00:17 +02:00
gauthier
575e4d11d0 FIX : wrong test 2019-09-19 17:28:51 +02:00
gauthier
d40534e8fa FIX : change product type must be allowed if we activate hidden conf 2019-09-19 15:21:52 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +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
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