Commit Graph

42836 Commits

Author SHA1 Message Date
braito4
677cba01ce Part solution bug #4095
It allow us to deactivate the link to a project queries to lower the page workload.
2015-11-25 18:58:47 +01:00
Marcos García
a30f7d543a Corrected fix 2015-11-25 10:19:11 +01:00
Raphaël Doursenaud
91ce70a6e9 FIX #4081 Added missing translation 2015-11-23 17:25:10 +01:00
Maxime Kohlhaas
da51a28766 Fix : situation percent should be 100 by default 2015-11-23 17:22:29 +01:00
Laurent Destailleur
7bde781206 Merge pull request #4061 from marcosgdf/bug-3231
FIX #3231 [Members] Public subscription page displays GeoIP error
2015-11-21 17:58:29 +01:00
Laurent Destailleur
dc6496fdf3 Merge pull request #4054 from marcosgdf/bug-3508
FIX #3508 Useless tooltip in 3.8 boxes
2015-11-21 17:49:09 +01:00
Laurent Destailleur
4481c4f978 Merge pull request #4052 from marcosgdf/bug-4049
FIX #4049 PHP warning when trying to access a non-existing product/service
2015-11-21 17:47:03 +01:00
Laurent Destailleur
295d83001a Merge pull request #4051 from marcosgdf/bug-4018
FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined
2015-11-21 17:46:26 +01:00
Laurent Destailleur
54b6ff02c0 Merge pull request #4048 from FHenry/3.8
FIX Missing fields managed by update_customer_modtime in 3.8
2015-11-21 17:46:02 +01:00
Marcos García de La Fuente
a456d21249 FIX #3231 [Members] Public subscription page displays GeoIP error 2015-11-21 13:25:09 +01:00
Laurent Destailleur
758b8e1f7e Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/boxes/box_project.php
2015-11-21 12:32:03 +01:00
Laurent Destailleur
c04743aa84 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-11-21 12:23:51 +01:00
Marcos García de La Fuente
3fbe10a578 FIX #3293 Login page form icons not shown 2015-11-21 12:18:29 +01:00
Marcos García de La Fuente
9f27e2323f FIX #3734 Do not show empty links of deleted source objects in stock movement list 2015-11-21 11:51:23 +01:00
Marcos García de La Fuente
4bf6cf4e65 FIX #3508 Useless tooltip in 3.8 boxes 2015-11-21 11:24:18 +01:00
Marcos García de La Fuente
e8fc5f0d3a FIX #3987 Undefined variable $newref in CommandeFournisseur::approve 2015-11-21 11:00:56 +01:00
Marcos García de La Fuente
eba5832d3a FIX #4049 PHP warning when trying to access a non-existing product/service 2015-11-21 10:58:58 +01:00
Marcos García de La Fuente
e31a8f25a2 FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined 2015-11-21 10:55:23 +01:00
Florian HENRY
c0d29d2a15 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-21 10:10:42 +01:00
Laurent Destailleur
30f0b6e2e8 Merge pull request #4046 from marcosgdf/bug-4016
FIX #4016 User link is not correctly formed in emailing receivers
2015-11-21 02:14:08 +01:00
Laurent Destailleur
94fdff9a46 Merge pull request #4045 from marcosgdf/bug-4043
FIX #4043 Incorrect translation in error mesage in menu creation admin page
2015-11-21 02:08:55 +01:00
Laurent Destailleur
45d6635bf6 Merge pull request #4025 from ndrosis/3.8
FIX utf-8 characters in the mask mercure does not break counter
2015-11-21 00:26:38 +01:00
Marcos García de La Fuente
2dedea8736 FIX #4016 User link is not correctly formed in emailing receivers 2015-11-20 22:03:44 +01:00
Marcos García de La Fuente
5dba9ef54e FIX #4043 Incorrect translation in error mesage in menu creation admin page 2015-11-20 22:00:11 +01:00
Drosis Nikos
ee4eb13fff Update functions2.lib.php 2015-11-20 19:05:00 +02:00
arnaud
07226d32ec FIX NB task and percent progress in box project 2015-11-20 16:11:48 +01:00
arnaud
4233d24f4b FIX export with category contact extrafields 2015-11-19 18:01:58 +01:00
Florian HENRY
80f19de223 fix && vs and 2015-11-19 16:32:25 +01:00
Florian HENRY
0c4f7a1b22 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-19 12:55:20 +01:00
Juanjo Menent
a627e32fca Merge pull request #4034 from fmarcet/3.7
FIX Not use localtaxes when invoice some orders
2015-11-18 23:07:24 +01:00
fmarcet
f615927d24 FIX Not use localtaxes when invoice some orders 2015-11-18 17:56:04 +01:00
arnaud
85a58f666a FIX product link in project box 2015-11-18 17:22:53 +01:00
fmarcet
0cbf8ca1dd FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO
variable is empty or not
2015-11-18 13:59:25 +01:00
Florian HENRY
28196a5fd9 add pgsql function 2015-11-18 12:24:52 +01:00
Nikos Drosis
5082b1cc66 Fix for utf-8 characters in the mask mercure 2015-11-17 20:22:27 +02:00
Laurent Destailleur
508b11733a Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name
FIX 3.8 allow to search on alias name into select
2015-11-16 23:48:18 +01:00
Laurent Destailleur
2f1a1c5111 Merge pull request #4008 from atm-ph/fix_38_trigger_propal_clone
FIX can not have access to the new ids or propal lines on PROPAL_CLONE
2015-11-16 23:46:03 +01:00
Laurent Destailleur
835700bb25 Merge pull request #4006 from marcosgdf/bug-3989
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 23:42:38 +01:00
Laurent Destailleur
04ffe1c7f0 Merge pull request #4005 from marcosgdf/bug-3988
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 23:42:04 +01:00
Laurent Destailleur
76eeb0d2f1 Merge pull request #4004 from marcosgdf/bug-3992
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
2015-11-16 23:41:46 +01:00
Laurent Destailleur
0e511027f6 Merge pull request #4003 from marcosgdf/bug-3996
FIX #3996 Dictionnary hooks are not working in 3.8
2015-11-16 23:41:06 +01:00
Laurent Destailleur
9693982f27 Merge pull request #4002 from marcosgdf/bug-3997
FIX #3997 Wrong permission key used for Margins > Read all
2015-11-16 23:40:47 +01:00
Laurent Destailleur
d16efbaf24 Merge pull request #3999 from fmarcet/3.8
FIX: Can't update line's duration
2015-11-16 23:39:44 +01:00
Alexis Algoud
a7d2bdc2c1 FIX 3.8 allow to search on alias name into select 2015-11-16 19:10:20 +01:00
phf
c21354101f FIX can not have access to the new ids or propal lines on PROPAL_CLONE 2015-11-16 15:36:02 +01:00
Marcos García de La Fuente
53fb085766 Corrected indent 2015-11-16 13:29:37 +01:00
Marcos García de La Fuente
ec7e4cb3d4 FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl 2015-11-16 13:25:00 +01:00
Marcos García de La Fuente
0880b13142 FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline 2015-11-16 13:24:11 +01:00
Marcos García de La Fuente
be460b6cbf FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be 2015-11-16 13:20:56 +01:00
Marcos García de La Fuente
8e9e2911ae FIX #3996 Dictionnary hooks are not working in 3.8 2015-11-16 13:18:25 +01:00
Marcos García de La Fuente
73da011461 FIX #3997 Wrong permission key used for Margins > Read all 2015-11-16 13:16:54 +01:00
fmarcet
0a92849de3 FIX: Can't update line's duration 2015-11-16 10:57:47 +01:00
aspangaro
06f752b250 Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy 2015-11-16 06:50:04 +01:00
Florian HENRY
c3b7bbfb3b FIX : #3990 2015-11-15 20:00:11 +01:00
Laurent Destailleur
6895daa5e9 Fix tr/td not correctly open/closed
Fix default value was not set
2015-11-14 19:31:50 +01:00
Laurent Destailleur
b4af55ab40 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-14 14:57:49 +01:00
Laurent Destailleur
b75923871c FIX: Too many information were hidden. A lot of users still need bank
account on PDF.
2015-11-14 14:56:44 +01:00
Laurent Destailleur
5b1e20494b Merge pull request #3977 from FHenry/3.8
FIX : showrefnav htmlspecialchar instead of < >
2015-11-13 19:22:41 +01:00
Laurent Destailleur
85c0ed39f1 Merge pull request #3974 from atm-ph/fix_38_aufocus
FIX autofocus on input search product
2015-11-13 19:21:52 +01:00
Florian HENRY
2a2155a239 FIX : showrefnav htmlspecialchar instead of < > 2015-11-13 14:40:52 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
2015-11-13 12:18:46 +01:00
Laurent Destailleur
bad28c6d92 Fi sntax error 2015-11-13 11:44:55 +01:00
Laurent Destailleur
eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
2015-11-13 11:43:29 +01:00
Laurent Destailleur
c7546dbad2 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-13 11:13:04 +01:00
Laurent Destailleur
b3be7f65cd Fix syntax error . = instead of .= 2015-11-13 11:12:49 +01:00
phf
81a8933256 FIX autofocus on input search product 2015-11-13 10:36:32 +01:00
Laurent Destailleur
816bacc37e Merge pull request #3968 from atm-arnaud/3.8_fix_export_extrafield_propal_order
FIX export propal and order with extrafields
2015-11-12 18:31:59 +01:00
Laurent Destailleur
924db5b8aa Merge pull request #3969 from FHenry/3.8
FIX : better fix for #3805
2015-11-12 15:08:34 +01:00
Laurent Destailleur
8925717bbe Merge pull request #3966 from atm-ph/fix_38_title_actioncomm
FIX mail isn't display in title on event in mode view
2015-11-12 15:07:29 +01:00
Laurent Destailleur
9a9be97c2c Add a log to help diagnose bad usage of method ad of event 2015-11-12 14:36:35 +01:00
Regis Houssin
52bd90f950 Fix: wrong var name 2015-11-12 14:12:56 +01:00
Florian HENRY
019575d9ed FIX : better fix for #3805 2015-11-12 13:21:35 +01:00
arnaud
aaa6f00d11 FIX export propal and order with extrafields 2015-11-12 12:37:04 +01:00
phf
f041c017e9 FIX mail isn't display in title on event in mode view 2015-11-12 11:30:44 +01:00
Laurent Destailleur
b0419557b1 Exclude dir 2015-11-10 00:37:30 +01:00
Laurent Destailleur
98c32fa1ec FIX The label hidden was not supported when using jmobile 2015-11-10 00:36:33 +01:00
Laurent Destailleur
71fa347e8e FIX Better compatibility for users that used the not supported option
MAIN_USE_JQUERY_MULTISELECT set to 1.
2015-11-08 18:40:12 +01:00
Laurent Destailleur
e6ab6bdb8e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-08 14:38:01 +01:00
Laurent Destailleur
7a0206adce FIX Missing to set context into workflow actions, so triggers can't know
we are creating an invoice from order or an order from a proposal.
2015-11-08 14:37:50 +01:00
Juanjo Menent
0ce7cad48c Merge pull request #3946 from aspangaro/3.7-1
Fix: Accountancy compatibility with subtotal & jalon module
2015-11-08 11:26:06 +01:00
Juanjo Menent
7673a73a65 Merge pull request #3939 from marcosgdf/bug-3836
FIX #3836 Unable to upload a document to an invoice under some circunstances
2015-11-08 11:21:16 +01:00
Juanjo Menent
8377d6967a Merge pull request #3934 from marcosgdf/bug-3679
FIX #3679 Error when deleting a Localtax2 special payment
2015-11-08 11:16:07 +01:00
Juanjo Menent
a6f0baefc1 Merge pull request #3933 from marcosgdf/bug-3980
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-08 11:15:31 +01:00
aspangaro
f0a3bca4c2 Fix: Accountancy compatibility with subtotal & jalon module 2015-11-08 04:22:49 +01:00
Florian HENRY
a4fafae109 FIX : Remove column creation for table llx_product_fournisseur_price,
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
2015-11-07 17:19:13 +01:00
Marcos García de La Fuente
4a52d3c1b1 Removed unwanted change 2015-11-07 15:35:00 +01:00
Marcos García de La Fuente
84a152dc2e FIX #3836 Unable to upload a document to an invoice under some circunstances 2015-11-07 15:33:48 +01:00
Marcos García de La Fuente
01854b3259 FIX #3679 Error when deleting a Localtax2 special payment 2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e FIX #3890 Expected transactions bank account page, shows negative numbers 2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
3bbedf1795 FIX #3707 Thirdparty bank account page table has a glitch 2015-11-07 13:39:34 +01:00
Marcos García de La Fuente
b4c3804c91 FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card 2015-11-07 13:21:03 +01:00
Florian HENRY
b0be2b04c7 FIX : #3912 2015-11-06 10:53:33 +01:00
Florian HENRY
f6b8c3a130 FIX : #3912 2015-11-06 10:50:08 +01:00
Florian HENRY
121d2beb80 fix spacing 2015-11-06 10:34:18 +01:00
Florian HENRY
f220f584ce Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-06 10:31:03 +01:00
Florian HENRY
126b5d6eca FIX : only active customer should be available into select list
thirdparty on invoice creation
2015-11-06 10:19:10 +01:00
Juanjo Menent
f33157033c Merge pull request #3909 from altatof/fixcloseshipping
FIX: change object statut on close shipping and remove erratic db commit
2015-11-06 10:16:00 +01:00
Christophe Battarel
4d11205a01 FIX: change object statut on close shipping and remove erratic db commit 2015-11-06 09:51:33 +01:00
Florian HENRY
600dbced7e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-06 09:49:48 +01:00
Florian HENRY
8d829dca32 FIX : only active customer should be return into new invoice creation
select list
2015-11-06 09:49:02 +01:00
Laurent Destailleur
e78ebf041a Fix deprecated code not working in jcrop. $.browser.msie and $.browser
is no more available in jquery 1.9+.
2015-11-06 02:03:41 +01:00
Laurent Destailleur
58cac2d895 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/comm/action/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/stock/product.php
2015-11-05 22:09:54 +01:00
Laurent Destailleur
fe78996026 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/product/stock/fiche.php
	htdocs/product/stock/valo.php
2015-11-05 22:04:18 +01:00
Laurent Destailleur
5777c16b72 Merge pull request #3902 from altatof/clonedorderdate
FIX: change order date on clone (as everywhere else)
2015-11-05 21:49:50 +01:00
Laurent Destailleur
fdf9617e42 Merge pull request #3900 from GPCsolutions/dolibarr-3864
Fix #3864 Really fixed invalid jQuery code
2015-11-05 21:47:40 +01:00
Laurent Destailleur
d499fafdb9 Merge pull request #3901 from altatof/3.6
FIX bad calculation for stock value
2015-11-05 21:44:21 +01:00
Christophe Battarel
80d2445540 FIX: bad stock valorisation 2015-11-05 17:00:22 +01:00
Christophe Battarel
ad82135879 FIX: change order date on clone (as everywhere else) 2015-11-05 15:36:13 +01:00
Christophe Battarel
f566b38296 FIX pmp 2015-11-05 15:29:51 +01:00
Christophe Battarel
fa088eb6cc FIX bad calculation for stock value 2015-11-05 14:57:58 +01:00
Raphaël Doursenaud
b0cf9bd0be Fix #3864 Really fixed invalid jQuery code 2015-11-05 14:38:11 +01:00
fmarcet
015dedc3ab FIX: Show category selector if we have permission to view products or
services
2015-11-05 11:53:45 +01:00
Alexis Algoud
e1ea2215a3 FIX loss data also if update was cancel by error of ended state with no end date, try a generic patch 2015-11-05 11:25:04 +01:00
Alexis Algoud
0543a31920 FIX event's data lost on user assign update 2015-11-05 11:11:03 +01:00
Laurent Destailleur
f319976e5d FIX #3878 Storing and deleting files on emailing was done at wrong place
Conflicts:
	htdocs/comm/mailing/card.php
2015-11-05 03:08:15 +01:00
Laurent Destailleur
14ec86047f Merge pull request #3886 from GPCsolutions/dolibarr-3805
Fix #3805 Enhanced Facture::is_last_in_cycle()
2015-11-05 02:33:48 +01:00
Laurent Destailleur
4bb21fd218 Merge pull request #3884 from FHenry/3.8
FIX #3880
2015-11-05 02:32:32 +01:00
Laurent Destailleur
f3421bcf6d Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-05 01:13:23 +01:00
Laurent Destailleur
77371af35a FIX #3661 Margin is not selected correctly when adding a product 2015-11-05 01:08:30 +01:00
Raphaël Doursenaud
69ac75bef8 Fix #3864 Fixed invalid jQuery code 2015-11-04 22:55:14 +01:00
aspangaro
337643e53e Accountancy : Correct errors of display in bank journal 2015-11-04 22:31:24 +01:00
Raphaël Doursenaud
c534f5bcd5 Fix #3805 Enhanced Facture::is_last_in_cycle() 2015-11-04 20:35:20 +01:00
Florian HENRY
876ab4bb59 FIX : #3882 2015-11-04 18:30:09 +01:00
Florian HENRY
c0136daeb5 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-04 18:24:22 +01:00
Florian HENRY
d4ee183662 FIX : 3880 2015-11-04 18:21:59 +01:00
Laurent Destailleur
09f3cd6f1d Fix class cant be abstract 2015-11-04 16:43:24 +01:00
Laurent Destailleur
826cc6db1b Repair old deprecated data 2015-11-04 09:54:13 +01:00
Laurent Destailleur
df4f09e72f FIX #3240 2015-11-03 14:02:36 +01:00
Laurent Destailleur
74be7bf334 FIX Filter in customer price per product of a thirdparty returned error 2015-11-03 11:40:06 +01:00
Laurent Destailleur
ea0bf44670 The ckecksum file should not be into sources. Only into packages. 2015-11-03 09:43:39 +01:00
Frédéric FRANCE
e7ced32245 Fix Can't edit DictionaryRevenueStamp 2015-11-02 20:08:33 +01:00
Laurent Destailleur
d8796e4cc7 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/product/stats/commande.php
	htdocs/product/stats/commande_fournisseur.php
	htdocs/product/stats/facture.php
	htdocs/product/stats/facture_fournisseur.php
	htdocs/product/stats/propal.php
2015-11-02 19:25:51 +01:00
Laurent Destailleur
958c3851d7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 19:17:32 +01:00
Laurent Destailleur
055fe5e275 FIX #3786 Translation of select box. 2015-11-02 19:17:22 +01:00
Laurent Destailleur
67a2f6ee91 Merge pull request #3854 from fmarcet/3.8
FIX: Send emails to contacts who should not receive emails
2015-11-02 18:03:59 +01:00
Laurent Destailleur
2dab183240 Merge pull request #3858 from fappels/3.8
Fix always first warehouse in stock list lotserial
2015-11-02 17:59:33 +01:00
Laurent Destailleur
f928062e2b FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO 2015-11-02 17:56:32 +01:00
fappels
d714d32424 Fix always first warehouse in reassortlot 2015-11-02 16:37:51 +01:00
Laurent Destailleur
3ba97627ff FIX Default thirdparty when cloning invoice was not set. 2015-11-02 15:50:03 +01:00
Laurent Destailleur
c06c2d0464 FIX #3841 creation of a task completed has not status set to finished by
default
2015-11-02 14:21:45 +01:00
fmarcet
3c5903f75a FIX: Contacts are not added to the list with the status "no contact" 2015-11-02 11:52:58 +01:00
fmarcet
ba4f306c83 FIX: Avoid changing the state to a thirdparty who shouldn't be
contacted anymore
2015-11-02 11:52:58 +01:00
Laurent Destailleur
269fb87342 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-02 11:46:12 +01:00
Laurent Destailleur
20a1863866 FIX IF autocomplete was set on thirdparty list, it was not possible to
open list of extrafields.
2015-11-02 11:45:59 +01:00
Laurent Destailleur
bc29898621 Merge pull request #3814 from FHenry/3.8
FIX : missing tag myuser_job into ODT replacement
2015-11-02 11:22:52 +01:00
Laurent Destailleur
4cddb0175b Merge pull request #3575 from atm-ph/fix_3.8_clone_order
FIX clone customer order
2015-11-02 11:21:52 +01:00
Juanjo Menent
2f8afda29d Merge pull request #3833 from grandoc/3.8
[Qual] Prevent warning
2015-10-30 22:19:44 +01:00
Juanjo Menent
efb6e87f3f Merge pull request #3839 from fmarcet/3.8
FIX Bad parameter on calling get_exdir function
2015-10-30 22:13:36 +01:00
Ferran Marcet
5862037d34 FIX Bad parameters 2015-10-30 13:03:34 +01:00
Maxime Kohlhaas
c46f9350a5 Fix : stats were wrong if same product on several lines with same quantity because of distinct 2015-10-30 09:50:04 +01:00