Marc de Lima Lucio
85cef09e83
FIX: triggers: directories read with opendir() never closed
2019-10-30 14:46:46 +01:00
Laurent Destailleur
c2638f4148
Merge pull request #12238 from atm-maxime/fix_fetch_contact
...
Fix missing contact fetch on card
2019-10-30 03:04:01 +01:00
Laurent Destailleur
b7e81c5396
Merge pull request #12247 from frederic34/patch-21
...
HOLIDAY_APPROVEInDolibarr
2019-10-30 02:44:50 +01:00
Laurent Destailleur
149d63757f
Space
2019-10-29 11:43:56 +01:00
Laurent Destailleur
e58ecaaa64
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/product/stock/replenishorders.php
2019-10-29 11:43:35 +01:00
Laurent Destailleur
21d15c3bcb
FIX Set unpaid of expense report
2019-10-29 11:35:33 +01:00
Laurent Destailleur
5e06fe0712
FIX Avoid fatal error when creating thumb from PDF
2019-10-29 11:11:13 +01:00
Frédéric FRANCE
30d416f8c0
Update agenda.lang
2019-10-28 20:16:27 +01:00
Maxime Kohlhaas
fced9ec690
Fix missing contact fetch on card
2019-10-27 12:04:01 +01:00
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
40135e043e
Merge pull request #12166 from frederic34/patch-13
...
fix cant add bookmark with csrf active
2019-10-20 12:43:39 +02:00
Laurent Destailleur
b5390bfb3c
Merge pull request #12167 from frederic34/patch-14
...
Update main.lang
2019-10-20 12:41:06 +02:00
Laurent Destailleur
ce1b443212
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-18 14:26:09 +02:00
Frédéric FRANCE
f9c0e63f16
Update main.lang
2019-10-17 22:59:52 +02:00
Frédéric FRANCE
aeafdae34c
Update main.lang
2019-10-17 22:58:47 +02:00
Frédéric FRANCE
d442134a51
fix cant add bookmark with csrf active
2019-10-17 21:15:34 +02:00
Laurent Destailleur
373d6d60e7
Add a message
2019-10-17 21:13:18 +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
93aa7e208d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-16 17:10:19 +02:00
Laurent Destailleur
b47ebcca2b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-16 17:10:10 +02:00
Frédéric FRANCE
6a8e8907ef
Update list.php
2019-10-15 17:55:07 +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
Frédéric FRANCE
45b3d623bb
Update list.php
2019-10-14 20:30:31 +02:00
Frédéric FRANCE
c3e8aec07c
fix translation for showemailing
...
in lang files, it's ShowEMailing not ShowEmailing
2019-10-11 23:54:05 +02:00
Laurent Destailleur
7ea0af4067
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-11 15:53:38 +02:00
Laurent Destailleur
2a07ecf659
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-11 15:53:30 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen
2019-10-09 18:47:25 +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
611b045676
Merge pull request #12053 from atm-lena/9.0_fix_link_fetch
...
FIX : missing "$this->id" in "fetch" function
2019-10-07 12:38:05 +02:00
Laurent Destailleur
55508e25ec
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-07 12:27:06 +02:00
atm-lena
8c024b3786
FIX : missing "$this->id" in "fetch" function
2019-10-07 11:26:10 +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
d9aa816197
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:50:57 +02:00
atm-lena
ae01bd8f07
FIX missing begin()
2019-10-03 17:23:16 +02:00
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency
...
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
2019-10-02 11:12:30 +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
4f356fa412
Merge pull request #11859 from altatof/avoir
...
FIX : allow standalone credit note even if no invoice
2019-09-30 18:12:55 +02:00
Laurent Destailleur
945dd0ae89
Update card.php
2019-09-30 18:12:43 +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
5d45638248
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-27 14:02:23 +02:00
Laurent Destailleur
7f9ea2e223
Merge pull request #11929 from atm-florian/9.0
...
fix regex main.inc.php warning
2019-09-27 12:26:24 +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
59a099b176
Merge pull request #11954 from frederic34/patch-18
...
add missing error code in price parser
2019-09-27 11:35:42 +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
Laurent Destailleur
ba1275332d
Fix thousand separator for fr_NC
2019-09-25 13:03:43 +02:00
Frédéric FRANCE
26cd418320
Update price_parser.class.php
2019-09-24 10:28:27 +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
florian HENRY
3b555797d1
fix regex
2019-09-19 12:32:26 +02:00
florian HENRY
536e99e3c9
fix regex main.inc.php fatal
2019-09-19 09:59:05 +02:00
Laurent Destailleur
00d5cff00d
Fix XSS injection into textarea
2019-09-18 14:44:31 +02:00
Laurent Destailleur
e52788eb75
Fix xss
2019-09-18 14:31:03 +02:00
Laurent Destailleur
771104bc68
Fix XSS
2019-09-18 14:25:53 +02:00
Laurent Destailleur
345ac28c89
Fix js injection
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/user/group/card.php
2019-09-18 14:21:02 +02:00
Laurent Destailleur
7b512587aa
FIX XSS
2019-09-18 14:15:20 +02:00
Laurent Destailleur
2da5071642
Fix VAT in New caledonia is now called TGC
2019-09-18 13:12:22 +02:00
Laurent Destailleur
ab9dee631b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-17 12:20:05 +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
697b25aa82
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-14 18:24:00 +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
7b73e2d57a
FIX label of thirdparty is wrong on open project list
2019-09-13 11:05:50 +02:00
Frédéric FRANCE
00394493eb
Update index.php
2019-09-12 22:02:39 +02:00
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project
2019-09-12 21:39:57 +02:00
Christophe Battarel
c8cb5886f4
correction
2019-09-10 17:04:09 +02:00
Christophe Battarel
95417d4c86
allow standalone credit note even if no invoice
2019-09-10 16:24:04 +02:00
Laurent Destailleur
48aedcee20
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-09-10 15:31:29 +02:00
Laurent Destailleur
d4e26fcc55
FIX missing include (dol_convert_file not found)
2019-09-10 15:29:33 +02:00
Laurent Destailleur
f2b9517dac
FIX #11834
2019-09-09 13:16:31 +02:00
Laurent Destailleur
ffc49705d3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-03 17:42:04 +02:00
Laurent Destailleur
1a8f271bf4
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-09-03 17:41:56 +02:00
Laurent Destailleur
f1a16a68dc
Merge pull request #11787 from aspangaro/9.0_balance
...
FIX Sens of the balance (Debit - Credit in accountancy not contrary)
2019-09-03 17:41:35 +02:00
Laurent Destailleur
4a76dfa6ff
Fix link to setup
2019-08-30 18:23:43 +02:00
Alexandre SPANGARO
14b9460de0
FIX Sens of the balance (Debit - Credit in accountancy not contrary)
2019-08-29 16:27:25 +02:00
Laurent Destailleur
55505604c1
Merge pull request #11397 from atm-josselin/FIX_product_document_and_special_characters
...
FIX : filepath of generated documents doesn't handle products with sp…
2019-08-27 14:12:48 +02:00
John Botella
c2f570ae60
FIX: remove disabled product type from product list
2019-08-27 11:54:20 +02:00
Laurent Destailleur
047298cded
Merge pull request #11511 from atm-florianm/9.0_FIX_dispatched-products-array-bug
...
9.0 fix dispatched products array bug
2019-08-26 23:58:40 +02:00
Laurent Destailleur
c7f06fe50e
Fix phpcs
2019-08-26 23:56:17 +02:00
Laurent Destailleur
b6db04a727
Fix add missing filter on entity on stock listing for product combo
2019-08-26 22:42:04 +02:00
Laurent Destailleur
952e395943
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-08-26 22:34:51 +02:00
Laurent Destailleur
76bd9a09a6
FIX #11570
2019-08-26 22:34:41 +02:00
Laurent Destailleur
f07d99ed9a
Merge pull request #11730 from atm-ph/fix_9.0_missing_hooks
...
Fix wrong placement to print title and missing hook to print value
2019-08-26 17:14:50 +02:00
Laurent Destailleur
9d2942bb88
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-08-26 16:41:14 +02:00
Laurent Destailleur
dcfbba9af5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:41:06 +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
ptibogxiv
73a6b45e23
Fix load langs in takepos
2019-08-24 13:26:01 +02:00
Regis Houssin
064ab389ed
FIX wrong parameters (same error in branch 9, 10, develop)
2019-08-24 12:44:23 +02:00
atm-ph
f14f1c9190
Fix wrong placement to print title and missing hook to print value
2019-08-23 09:15:15 +02:00
Regis Houssin
2d59f6bb3d
FIX avoid sql error if fk_project is empty during update
2019-08-23 07:59:36 +02:00
Florian Mortgat
fa29415e6a
Moved repair payload from a specific script to install/repair.php
2019-08-22 14:06:18 +02:00
Laurent Destailleur
a35f010e55
FIX name and position of hook FIX #11710
2019-08-22 12:30:14 +02:00
Laurent Destailleur
b06dab6930
Fix add option to restore backward compatibility
2019-08-22 00:44:28 +02:00
Laurent Destailleur
ed7480ddbb
Fix phpcs
2019-08-21 16:03:49 +02:00
Laurent Destailleur
1b21905c55
Fix test on uploaded modules
...
Conflicts:
htdocs/admin/modules.php
2019-08-21 14:53:58 +02:00
Laurent Destailleur
3a0057f6a3
FIX too many record in sql request. Whena criteria is a filter, we must
...
use an inner join.
2019-08-18 23:59:24 +02:00
Laurent Destailleur
b1be6bf4f2
FIX #11422 Can't edit his own events with standard rights
2019-08-18 01:24:54 +02:00
Laurent Destailleur
18eb2a83fe
FIX #11671 CVE-2019-15062
2019-08-17 22:17:27 +02:00
Laurent Destailleur
d21e557100
FIX #11671 CVE-2019-15062
2019-08-17 22:16: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
a8afb4549a
Merge pull request #11634 from fmarcet/9.0
...
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-15 20:22:27 +02:00
Laurent Destailleur
31fa26c2be
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-08-10 01:36:50 +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
Laurent Destailleur
049a08f435
Merge pull request #11631 from frederic34/patch-9
...
Update admin.lang
2019-08-10 01:15:28 +02:00
Laurent Destailleur
cee92356c6
Merge pull request #11644 from frederic34/patch-11
...
Update price_parser.class.php
2019-08-10 01:11:02 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php
2019-08-06 11:47:34 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php
2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php
2019-08-05 14:58:50 +02:00
Ferran Marcet
32220dde2e
FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES
2019-08-05 14:12:19 +02:00
Ferran Marcet
cda8b15c7f
FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field
2019-08-05 14:00:15 +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
Frédéric FRANCE
baa2e870d0
Update admin.lang
...
found in admin/company.php
2019-08-05 11:01:58 +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
7f42380f83
FIX Fatal situation if payment removed on expense report. Action
...
set_unpaid was not available.
2019-08-03 20:53:57 +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
Florian Mortgat
3ef257f4f2
Removed commented out code from the new migration script
2019-07-31 09:21:00 +02:00
Laurent Destailleur
9baf21f492
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-30 22:03:13 +02:00
Laurent Destailleur
754ed1b93b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2019-07-30 22:03:02 +02:00
Laurent Destailleur
6b789a13a1
Merge pull request #11562 from atm-quentin/FIX_pdf_cheque
...
FIX name was able to be in field but went back to new line
2019-07-30 22:00:58 +02:00
Laurent Destailleur
ed7a57e3ef
Merge pull request #11571 from atm-john/9.0_fix_showOutputField
...
Fix sellist showOuputField
2019-07-30 21:40:37 +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
cb07d80681
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-30 20:37:55 +02:00
Laurent Destailleur
5f2439bf0a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-30 20:37:44 +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
a5e0dd56f4
Merge pull request #11580 from aspangaro/9.0_FEC
...
FIX FEC Format - Save translation of the journal label in database & nowrap on amount
2019-07-30 16:10:32 +02:00
Laurent Destailleur
941b2c5325
Merge pull request #11581 from aspangaro/9.0_adh
...
FIX Language key
2019-07-30 15:58:30 +02:00
Laurent Destailleur
c080878083
Merge pull request #11585 from ATM-Marc/FIX_9.0_expedition_printObjectLine_loop
...
FIX: expedition card: infinite loop for printObjectLine hook if return > 0
2019-07-30 15:58:09 +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
bb885cadf2
Merge pull request #11563 from atm-quentin/FIX_sociales_redirect_index
...
FIX wrong path sociales/index.php doesnt exist anymore
2019-07-30 15:43:42 +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
Laurent Destailleur
6aefa648e7
FIX CVE-2019-11199
2019-07-30 14:00:43 +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
Marc de Lima Lucio
87fc3c3968
FIX: expedition card: infinite loop for printObjectLine hook if return > 0
2019-07-29 13:56:35 +02:00
Florian Mortgat
858e8a826f
FIX: use rounding to compare the amounts
2019-07-29 09:47:28 +02:00
Alexandre SPANGARO
7a9f2b43c5
FIX Language key
2019-07-29 07:05:18 +02:00
Alexandre SPANGARO
bb168d7f54
Merge branch '9.0' into 9.0_FEC
2019-07-29 06:54:48 +02:00
Alexandre SPANGARO
cd22cc70c8
FIX FEC Format - Save translation of the journal
2019-07-29 06:41:51 +02:00
Alexandre SPANGARO
a2fc3689da
Nowrap on amount
2019-07-28 22:59:43 +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
ATM john
581ae226ff
Fix sellist showOuputField
2019-07-27 18:25:25 +02:00
Laurent Destailleur
471a947e8a
FIX Attachment was lost when we validate an expense report
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2019-07-26 16:33:32 +02:00
Laurent Destailleur
8b81702dd7
Fix API 404 errors
2019-07-26 13:23:42 +02:00
Laurent Destailleur
c61f8e965d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-26 13:16:59 +02:00
Laurent Destailleur
e92c6c87a0
FIX API return 404 sometimes even if API exists
2019-07-26 13:16:49 +02:00
atm-quentin
f7c739bba9
FIX wrong path sociales/index.php doesnt exist anymore
2019-07-26 12:12:08 +02:00
atm-quentin
1f7cd1a3f8
FIX name was able to be in field but went back to new line
2019-07-26 11:05:16 +02:00
Laurent Destailleur
0d79905b0a
Merge pull request #11539 from hregis/9.0_bug2
...
FIX duplicate on the check (TODO field $onetrtd not used ?)
2019-07-25 17:56:42 +02:00
Laurent Destailleur
8241bc414a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/lib/files.lib.php
2019-07-25 17:52:17 +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
6e3fad8f83
Fix phpcs
2019-07-25 17:42:44 +02:00
Laurent Destailleur
27c6bfe9db
Merge pull request #11548 from aspangaro/9.0pa
...
FIX FEC Format - Missing date_creation in general ledger when you add a new transaction
2019-07-25 17:37:05 +02:00
Florian Mortgat
65e9d8f239
FIX: tk9877 - PDF rouget requires product.lib.php (otherwise measuring_units_string() is not defined)
2019-07-25 11:14:59 +02:00
Alexandre SPANGARO
2162f2331d
Try to fix travis
2019-07-24 06:57:42 +02:00
atm-josselin
0a1f4b7931
FIX : correct error in files with multiple spaces
2019-07-23 09:45:17 +02:00
Laurent Destailleur
47ec88c8b5
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-22 19:06:57 +02:00
Laurent Destailleur
5dcf4d6646
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-22 19:06:48 +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
f39f710fd9
Merge pull request #11538 from atm-maxime/fix_agenda_list_filter
...
Fix lost filter in action list
2019-07-22 18:44:22 +02:00
Laurent Destailleur
56851f475e
Merge pull request #11529 from atm-ph/fix_9.0_missing_hook
...
Fix missing hook
2019-07-22 18:41:55 +02:00
Alexandre SPANGARO
7bdfd83288
FIX FEC Format - Missing date_creation in general ledger when you add a new transaction
2019-07-22 15:15:08 +02:00
Regis Houssin
6409cc06ae
FIX duplicate on the check (TODO field $onetrtd not used ?)
2019-07-22 11:44:56 +02:00
Florian Mortgat
c9e70ed1c1
Fix problems detected by travis-ci
2019-07-22 09:30:43 +02:00
Maxime Kohlhaas
7ec8b48b18
Fix lost filter in action list
2019-07-21 22:21:11 +02:00
florian HENRY
b046bcc197
fix warning php
2019-07-20 15:19:25 +02:00
florian HENRY
d03d79222e
fix warning php
2019-07-20 15:15:48 +02:00
florian HENRY
d88fec52bf
fix warining message
2019-07-20 15:07:59 +02:00
gauthier
cd7d3f1a36
FIX : search by phone pro
2019-07-19 15:41:44 +02:00
Laurent Destailleur
98ae66b387
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-07-19 13:31:25 +02:00
Laurent Destailleur
1f308915ee
Fix trans
2019-07-19 13:23:17 +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
atm-ph
a03bb00254
Fix missing hook
2019-07-19 11:26:21 +02:00
Laurent Destailleur
e5801c0b68
Update bonprelevement.class.php
2019-07-19 04:06:22 +02:00
atm-ph
fcd95ce073
Fix missing trigger call
2019-07-18 18:07:17 +02:00
Laurent Destailleur
5e204f0f67
Merge
2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf
Merge
2019-07-18 17:50:15 +02:00
Laurent Destailleur
b0baba3293
Merge pull request #11526 from atm-ph/fix_9.0_missing_hook
...
Fix missing hook then can't interact with actions
2019-07-18 17:24:08 +02:00
Laurent Destailleur
b3182f65bc
Update create.php
2019-07-18 17:23:52 +02:00
Laurent Destailleur
e548872133
Update prelevement.php
2019-07-18 17:23:05 +02:00
Laurent Destailleur
a20a121558
Merge pull request #11522 from atm-john/9.0_fix_action_list_contact_assigned
...
FIX: socpeople assigned list in action com list
2019-07-18 17:20:41 +02:00
Florian Mortgat
dbd68027f8
New script that links "orphaned" dispatch lines to order lines
...
(the "orphans" are dispatch lines that were created in old versions of Dolibarr which didn’t have fk_commandefourndet in llx_commande_fournisseur_dispatch)
2019-07-18 17:03:16 +02:00
Florian Mortgat
e404069d26
Revert "FIX: calculation of $products_dispatched"
...
This reverts commit 75ae611f9e .
2019-07-18 17:00:57 +02:00
Florian Mortgat
770b419769
Revert "FIX: wrong display (and hidden input) for already dispatched quantity"
...
This reverts commit b155fdc014 .
2019-07-18 17:00:46 +02:00
atm-ph
984fe98342
Fix missing hook
2019-07-18 16:12:42 +02:00
atm-ph
c961a397c4
Fix missing hook then can't interact with actions
2019-07-18 15:40:50 +02:00