Maxime Kohlhaas
510b1aedcf
Fix xml SEPA $ListOfFactures not used and was listing all invoices in each XML line
2017-05-30 16:13:49 +02:00
Maxime Kohlhaas
200f4010d8
Fix special char and size limit in SEPA XML
2017-05-30 16:00:39 +02:00
Laurent Destailleur
86cbf7e35f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-20 21:38:14 +02:00
Laurent Destailleur
2a9c6d9387
Complete ignore file
2017-05-20 21:11:31 +02:00
Laurent Destailleur
59517a1fa0
Merge pull request #6855 from olsesacl/#6813
...
FIX : #6813 No numbering model for supplier proposal module
2017-05-18 17:58:10 +02:00
Sergio Sanchis Climent
1a98886aa3
FIX : #6813
2017-05-17 00:42:29 +02:00
arnaud
c9738aa7ea
FIX doactions hook missing in invoice model page
2017-05-16 11:34:00 +02:00
Laurent Destailleur
dec602a27b
Merge pull request #6838 from atm-ph/fix_invoice_credit_note_standalone
...
Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work
2017-05-13 19:45:42 +02:00
Laurent Destailleur
419c15ee8e
Fix escaping class
2017-05-12 15:28:10 +02:00
phf
b092b6861a
Fix feature INVOICE_CREDIT_NOTE_STANDALONE doesn't work
2017-05-11 12:48:47 +02:00
Laurent Destailleur
ef5fd503cd
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-10 23:43:08 +02:00
Laurent Destailleur
b2e9d4cc21
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-10 23:42:49 +02:00
Laurent Destailleur
d7b142beb7
Merge pull request #6830 from jfefe/patch-12
...
Fix #6504 : CVE-2017-7886
2017-05-10 23:41:19 +02:00
Laurent Destailleur
61a4382bd8
Merge pull request #6814 from fmarcet/3.9
...
FIX: Correction with author and validator user on orders
2017-05-10 23:11:21 +02:00
jfefe
d410a320d7
WIP #6504 : CVE-2017-7886
...
'defaultlang' attribute was not filtered before database request which cause an SQL injection.
2017-05-10 20:32:54 +02:00
Ferran Marcet
dbcb60433b
FIX: Correction with author and validator user on orders
2017-05-09 13:31:20 +02:00
Laurent Destailleur
4b42a5fd86
Merge pull request #6775 from marcosgdf/bug-6677
...
FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty
2017-05-05 17:05:06 +02:00
Laurent Destailleur
e830ea6714
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-05 14:02:10 +02:00
Laurent Destailleur
8a37eeea74
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-05 14:02:02 +02:00
Laurent Destailleur
938d33941d
Merge pull request #6780 from marcosgdf/php7-warnings
...
Corrected PHP7 warnings for several pages
2017-05-05 09:59:25 +02:00
Laurent Destailleur
9785e9b298
Update commonobject.class.php
2017-05-05 09:57:51 +02:00
Laurent Destailleur
db8c4a5ac4
Merge pull request #6760 from fappels/4.0_fix_download_delivery_doc
...
Fix download delivery and donation document
2017-05-05 09:21:19 +02:00
Laurent Destailleur
0c9f268f99
Merge pull request #6759 from ATM-Marc/FIX_supplier_order_rang
...
FIX supplier order line creation with rang = 0
2017-05-04 21:06:58 +02:00
Laurent Destailleur
1096177cce
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-04 09:57:57 +02:00
Laurent Destailleur
ee039c69a8
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-04 09:57:45 +02:00
Laurent Destailleur
4adfe6de70
Merge pull request #6725 from atm-gauthier/FIX_restrictedarea_document_contact
...
FIX : forgotten parameter for right multicompany use
2017-05-04 09:37:24 +02:00
Marcos García de La Fuente
7ae405a254
Corrected PHP7 warnings for several PDF document models
2017-05-02 14:08:20 +02:00
Marcos García de La Fuente
6e7fddee7d
Corrected PHP7 warnings for function pdf_einstein::write_file
2017-05-02 14:07:04 +02:00
Marcos García de La Fuente
166f2d262d
Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume
2017-05-02 14:00:27 +02:00
Marcos García de La Fuente
d658a833c9
FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty
...
Close #6677
2017-05-01 12:05:52 +02:00
Laurent Destailleur
fd72977505
Merge pull request #6690 from atm-gauthier/FIX_dateSelector
...
FIX : global $dateSelector isn't the good one, then date selector on …
2017-04-29 21:20:54 +02:00
Laurent Destailleur
50d65e3a9f
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/install/mysql/migration/repair.sql
2017-04-29 17:40:47 +02:00
fappels
18981ab0c9
Fix download donation document
2017-04-28 11:39:33 +02:00
fappels
c69a1205c0
Fix download delivery document
2017-04-26 19:06:41 +02:00
Marc de Lima Lucio
56e749df9f
FIX: supplier order line were always created with rang = 0
2017-04-26 16:12:27 +02:00
Laurent Destailleur
a2287fd183
Add example of sql request to fix llx_product_price
2017-04-24 13:46:41 +02:00
Laurent Destailleur
587f5a76e6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-04-24 12:59:51 +02:00
Laurent Destailleur
cd099bf3b1
Fix bad update of prices
2017-04-24 12:42:54 +02:00
Juanjo Menent
9bbfeed1bc
Merge pull request #6722 from Christian-Seiler/3.9
...
Fix #5911 Added missing Slashes
2017-04-16 12:23:52 +02:00
Christian Seiler
e23a44bcdf
Added missing Slashes
...
fixed line where two slashes were missing, that caused an error when creating barcodes.
2017-04-16 11:09:18 +02:00
Juanjo Menent
3a8608db19
Merge pull request #6697 from atm-maxime/fix_supp_prop_subprice
...
Fix Subprice was null in supplier proposal and line was not transfered to…
2017-04-16 11:08:41 +02:00
Laurent Destailleur
d2173c1fa4
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-04-15 16:24:42 +02:00
Laurent Destailleur
7fe66581f1
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-04-15 16:24:30 +02:00
Laurent Destailleur
72ff353e9f
Fix repair of product_stock
2017-04-15 16:22:15 +02:00
Laurent Destailleur
2e759d5156
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-04-15 16:19:02 +02:00
Laurent Destailleur
086fa4385f
Fix clean of product_batch
2017-04-15 16:17:22 +02:00
Laurent Destailleur
6f4ce8dc2f
Merge remote-tracking branch 'origin/3.9' into 4.0
2017-04-12 14:22:47 +02:00
Maxime Kohlhaas
396ea54894
Subprice was null in supplier proposal and line was not transfered to supplier order
2017-04-12 11:09:49 +02:00
gauthier
8a373b25ba
FIX : global $dateSelector isn't the good one, then date selector on objectline_create tpl was hidden
2017-04-11 12:41:19 +02:00
gauthier
30d58f77db
FIX : forgotten parameter for right multicompany use
2017-04-11 11:33:05 +02:00
Laurent Destailleur
17da4f64a7
Merge pull request #6683 from marcosgdf/bug-6679
...
FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
2017-04-11 11:21:14 +02:00
Laurent Destailleur
4d72165288
Merge pull request #6681 from marcosgdf/bug-6680
...
FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
2017-04-11 11:20:52 +02:00
Laurent Destailleur
a7ccb175e5
Merge pull request #6676 from marcosgdf/bug-6675
...
FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
2017-04-11 11:17:45 +02:00
Laurent Destailleur
5ae1b5457b
Merge pull request #6674 from marcosgdf/bug-6673
...
FIX #6673 Missing "nature" table header in thirdparty list
2017-04-11 11:17:21 +02:00
Laurent Destailleur
fc735eaa4f
Merge pull request #6672 from marcosgdf/bug-6671
...
FIX #6671 Cannot remove thirdparty type with "#" in its name
2017-04-11 11:16:58 +02:00
Laurent Destailleur
eb4236011b
Merge pull request #6670 from marcosgdf/bug-6669
...
FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry
2017-04-11 11:15:16 +02:00
Laurent Destailleur
50dbe39cda
Merge pull request #6668 from marcosgdf/bug-6613
...
FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key
2017-04-11 11:14:47 +02:00
Laurent Destailleur
cd90dcb1e1
Merge pull request #6667 from marcosgdf/bug-6623
...
FIX #6623 User card shows "Return to list" link even if the user has no rights to list users
2017-04-11 11:14:25 +02:00
Laurent Destailleur
d4de81ed6d
Merge pull request #6659 from altatof/fix_incoterm
...
FIX: dont get empty "Incoterms : - " string if no incoterm
2017-04-11 11:08:17 +02:00
Laurent Destailleur
abf87a6946
Merge branch '4.0' into fix_reffourn
2017-04-11 11:00:35 +02:00
Marcos García de La Fuente
996b5e9f87
Corrected translation errors and little bug showing a non-available button to a restricted user
2017-04-09 18:17:46 +02:00
Marcos García de La Fuente
12df7b6ab9
FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
...
Close #6679
2017-04-09 18:09:08 +02:00
Marcos García de La Fuente
59fa5c2fe6
FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
...
Close #6680
2017-04-09 17:38:59 +02:00
Marcos García de La Fuente
2057613ad9
FIX #6675 Restricted user with no agenda permissions can see a button to create appointment in thirdparty contact list
...
Close #6675
2017-04-09 15:18:02 +02:00
Marcos García de La Fuente
2d83efc7e3
FIX #6673 Missing "nature" table header in thirdparty list
...
Close #6673
2017-04-09 15:03:02 +02:00
Marcos García de La Fuente
da0af36086
FIX #6671 Cannot remove thirdparty type with "#" in its name
...
Close #6671
2017-04-09 14:51:15 +02:00
Marcos García de La Fuente
411d276ed2
FIX #6669 User with no permission to edit customer invoices can see a edit button in project entry
...
Close #6669
2017-04-09 14:29:40 +02:00
Marcos García de La Fuente
a8da077613
FIX #6613 Default subject for Supplier proposal emails is filled with a non-existing key
...
Close #6613
2017-04-09 14:13:04 +02:00
Marcos García de La Fuente
74f0ae5bbb
FIX #6623 User card shows "Return to list" link even if the user has no rights to list users
...
Close #6623
2017-04-09 14:09:33 +02:00
altatof
d892a89f45
FIX: dont get empty "Incoterms : - " string if no incoterm
2017-04-07 14:15:51 +02:00
altatof
919633b2be
escape supplier ref
2017-04-07 12:10:01 +02:00
altatof
a6ec22d7fe
FIX: dont lose supplier ref if no supplier price in database
2017-04-07 12:06:15 +02:00
Laurent Destailleur
fe4f71296f
FIX #6636 Complete fix
2017-04-06 21:55:23 +02:00
arnaud
6b2d8a3c34
FIX limit+1 dosn't show Total line
2017-04-06 11:14:15 +02:00
BENKE Charlie
5b5380659e
ERROR Categories Bank vs categories transactions
...
PB since 4.0, present in 5.0 and develop version
There is a confusion between the categorization function of bank accounts and the categorization function of the records. The categorization of the entries has been removed or it is not replaced by the categorization of the bank accounts.
I propose for the moment to restore the old category of writings but to envisage the creation of a new type of category "bank records" (or if it is not necessary with the new account) to leave so
2017-04-03 15:58:48 +02:00
Laurent Destailleur
00d485b2c5
Start 4.0.6
2017-04-02 22:09:06 +02:00
Laurent Destailleur
2164d93f36
Merge pull request #6622 from marcosgdf/bug-6505
...
FIX #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled
2017-03-31 19:22:49 +02:00
Laurent Destailleur
7b0c6ea940
Merge pull request #6620 from marcosgdf/bug-6619
...
FIX #6619 Template invoices list do not respect restricted thirdparty user rights
2017-03-31 18:41:46 +02:00
Laurent Destailleur
93b5801592
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-31 18:30:56 +02:00
Laurent Destailleur
911d5832c6
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-31 18:30:41 +02:00
Laurent Destailleur
b44143d24d
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-03-31 18:29:15 +02:00
Marcos García de La Fuente
cd5b074a48
FIX #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled
2017-03-30 15:21:20 +02:00
Marcos García de La Fuente
2448b9ee55
FIX #6619 Template invoices list do not respect restricted thirdparty user rights
2017-03-30 14:52:26 +02:00
phf
2dc721c538
Fix picture with jpeg extension are not visible
2017-03-29 16:10:59 +02:00
Laurent Destailleur
90a90e1a3c
FIX #6533 #6590
2017-03-28 12:45:09 +02:00
Laurent Destailleur
61031f1633
FIX Missing total on project overview.
2017-03-21 19:10:43 +01:00
Laurent Destailleur
e7e51d9e4f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/projet/class/project.class.php
2017-03-21 17:19:30 +01:00
Laurent Destailleur
43e70830ed
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-21 17:18:41 +01:00
Regis Houssin
f03bdb91a4
Merge remote-tracking branch 'origin/4.0' into 4.0_bug3
2017-03-17 12:42:54 +01:00
Regis Houssin
9e944e4525
Fix: wrong user fetch when same login in different entity
2017-03-17 12:41:56 +01:00
Laurent Destailleur
9827887643
Merge pull request #6519 from marcosgdf/bug-multiprices
...
FIX Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
2017-03-14 10:45:47 +01:00
Laurent Destailleur
60a9268ff5
Merge pull request #6518 from marcosgdf/bug-6505
...
FIX #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled
2017-03-14 10:45:09 +01:00
Laurent Destailleur
214350a8f5
Merge pull request #6509 from marcosgdf/bug-6507
...
FIX #6507 : Statistics counter show wrong total Contract numbers when the user does not have full access
2017-03-14 10:30:25 +01:00
Laurent Destailleur
53abc326b6
Merge pull request #6508 from marcosgdf/bug-6503
...
FIX #6503 : SQL error in "Last pending payment invoices"
2017-03-14 10:25:59 +01:00
Laurent Destailleur
9e7230e63a
Merge pull request #6484 from fmarcet/3.9
...
Fix: Error when references are numeric
2017-03-14 10:24:44 +01:00
Marcos García de La Fuente
15d0e6abc5
Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
2017-03-13 20:33:21 +01:00
Marcos García de La Fuente
cd349ab6cc
FIX #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled
...
Close #6505
2017-03-13 20:17:31 +01:00
hugome
38ccf7ffdd
Fix : Agenda getCalendarEvents hook
...
Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.
2017-03-13 11:35:49 +01:00
Laurent Destailleur
6aeae12775
Fix medias could not be loaded
2017-03-13 02:28:58 +01:00
Marcos García de La Fuente
e9d5b44009
Fixed Project counter showing total amount of projects instead of just the projects current user can see
2017-03-12 15:31:39 +01:00
Marcos García de La Fuente
f15c6da887
Typo
2017-03-11 19:24:05 +01:00
Marcos García de La Fuente
e9c7b02049
FIX #6507 : Statistics counter show wrong total Contract numbers when the user does not have full access
...
Close #6507
2017-03-11 19:22:01 +01:00
Marcos García de La Fuente
a39dccad19
FIX #6503 : SQL error in "Last pending payment invoices"
...
Close #6503
2017-03-11 19:00:44 +01:00
Laurent Destailleur
277fa7dbe1
FIX #6444
2017-03-10 14:08:53 +01:00
Laurent Destailleur
fbbcec2ba3
FIX #6444
2017-03-10 14:04:06 +01:00
Laurent Destailleur
86d8fe1285
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-03-10 13:41:55 +01:00
Laurent Destailleur
1a57d1864a
FIX #6443
2017-03-10 13:39:11 +01:00
Laurent Destailleur
427f656bac
Merge pull request #6500 from atm-florian/4.0
...
FIX : Can use quote into supplier ref on order line add
2017-03-10 12:49:36 +01:00
Laurent Destailleur
6977daf76a
Merge pull request #6491 from atm-gauthier/4.0_fix_supplierinvoiceline_fetch
...
FIX : forgotten fk_facture_fourn attribute on supplierinvoice line ob…
2017-03-10 12:31:20 +01:00
Laurent Destailleur
66d30344f9
Merge pull request #6490 from atm-gauthier/4.0_fix_fetch_infos_multicurrency
...
FIX : load multicurrency informations on supplier order and bill line…
2017-03-10 12:30:56 +01:00
Laurent Destailleur
bf34543085
FIX #6443
2017-03-10 12:19:50 +01:00
florian HENRY
9b10c9f6d1
FIX : Can use quote into supplier ref on order line add
2017-03-10 09:19:42 +01:00
gauthier
9eb3975803
FIX : forgotten fk_facture_fourn attribute on supplierinvoice line object
2017-03-07 15:18:20 +01:00
gauthier
b192b6cd50
FIX : multicurrency_subprice
2017-03-07 11:33:18 +01:00
gauthier
6e0589ce2c
FIX : load multicurrency informations on supplier order and bill lines fetch
2017-03-07 10:55:17 +01:00
Laurent Destailleur
ee25a412dd
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/commande/list.php
2017-03-05 22:02:16 +01:00
fmarcet
e1f459d67a
Fix: Error when references are numeric
2017-03-03 12:57:52 +01:00
gauthier
9cd807af1a
FIX : param billed when we change page
2017-02-28 12:31:45 +01:00
Laurent Destailleur
f579fc6b2d
Code comment
2017-02-27 12:07:38 +01:00
Laurent Destailleur
1be389fd3e
FIX deletion of bank tag
2017-02-27 12:06:45 +01:00
Laurent Destailleur
10838983b5
FIX error management in bank account deletion.
2017-02-27 11:38:19 +01:00
Laurent Destailleur
024cecec29
FIX Error management during bank account creation
2017-02-27 11:16:46 +01:00
Laurent Destailleur
0f8a8869cb
FIX Error management during bank account creation
2017-02-27 11:15:59 +01:00
Laurent Destailleur
cff284b2f3
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/compta/bank/categ.php
2017-02-27 10:55:18 +01:00
Laurent Destailleur
9ecc56ad4d
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2017-02-27 10:48:36 +01:00
Laurent Destailleur
e559834379
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-25 11:54:28 +01:00
Laurent Destailleur
08915d88d0
FIX the dolCopyDir fails if target dir does not exists.
2017-02-25 11:53:50 +01:00
Laurent Destailleur
b32c552fbc
Merge pull request #6447 from aternatik/fix_6446
...
Fix #6446 : Event status lost after assign or remouve user
2017-02-22 14:21:50 +01:00
Laurent Destailleur
daf1dbb3a1
FIX #6453
2017-02-22 14:09:19 +01:00
Laurent Destailleur
32678015c9
FIX protection against infinite loop on hierarchy
2017-02-21 23:52:13 +01:00
Laurent Destailleur
089aa1df33
FIX If bank module on, field must be required to register payment of
...
expense report.
2017-02-21 17:10:32 +01:00
jfefe
0a9ffa58c1
FIX : event status is not modified when assign an user
2017-02-20 09:54:20 +01:00
Laurent Destailleur
d3eff46305
Merge pull request #6423 from atm-florian/4.0
...
FIX #6411
2017-02-17 10:45:24 +01:00
Laurent Destailleur
45eba9f62e
Merge pull request #6420 from fmarcet/4.0
...
Fix: Bad code makes don't work for external modules numeration model
2017-02-17 10:33:48 +01:00
Laurent Destailleur
efd2e85f12
Merge pull request #6416 from laudeco/fix/password_forgotten
...
[mail; password; forgotten][#6334 ] - Fix mail url
2017-02-17 10:19:40 +01:00
fmarcet
c175dfe68b
Fix: Bad code makes don't work for external modules numeration model
2017-02-15 09:47:18 +01:00
florian HENRY
89e6d86bf7
FIX #6411
2017-02-15 09:08:27 +01:00
fmarcet
e903bf2b5c
Fix: Bad code makes don't work for external modules numeration model
2017-02-14 18:55:39 +01:00
De Coninck Laurent
294517a8e0
use already existing variable
2017-02-13 16:49:10 +01:00
Laurent Destailleur
25e8caa64e
Fix reversing test for a test
2017-02-13 01:37:12 +01:00
Laurent Destailleur
bf32acaadd
Fix control of module format.
2017-02-13 01:13:41 +01:00
De Coninck Laurent
b356c34dc4
[mail; password; forgotten][ #6334 ] - Fix mail url
...
Fix the mail url on password generation
2017-02-12 17:22:06 +01:00
Laurent Destailleur
a4f2325902
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-10 17:28:49 +01:00
Laurent Destailleur
a4d9f7dbbe
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-10 17:27:47 +01:00
Laurent Destailleur
d463511cff
Fix: no way to know type of invoice.
2017-02-10 17:24:47 +01:00
gauthier
c01988ba43
FIX : delete bank class lines when we delete bank_categ
2017-02-09 17:28:37 +01:00
florian HENRY
ab0783edcc
FIX #6234
2017-02-08 17:18:06 +01:00
fmarcet
d5978a5092
Fix: Wrong vat calculation when split discounts
2017-02-07 14:02:27 +01:00
Laurent Destailleur
df6983b3c5
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-02-07 02:13:54 +01:00
Laurent Destailleur
d56b5f30c8
FIX #6330
2017-02-07 01:34:21 +01:00