aspangaro
|
9a2259c681
|
Correct button 'Export' and 'Write bookkeeping' on finance journal
|
2015-11-26 06:19:24 +01:00 |
|
Laurent Destailleur
|
a6d8f943df
|
Fix several bugs into leave requets module
|
2015-11-26 02:12:37 +01:00 |
|
Laurent Destailleur
|
1608fec937
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-11-26 00:47:29 +01:00 |
|
Laurent Destailleur
|
f353464bce
|
Prepare code to fix #4095
|
2015-11-26 00:47:17 +01:00 |
|
Laurent Destailleur
|
a1a5eba2de
|
Merge pull request #4096 from braito4/patch-1
Part solution bug #4095
|
2015-11-26 00:34:04 +01:00 |
|
Laurent Destailleur
|
bc6d04e495
|
Typo
|
2015-11-26 00:08:34 +01:00 |
|
Laurent Destailleur
|
ddd0f8224f
|
Picto was not visible onto login page, we keep this behaviour.
|
2015-11-26 00:08:24 +01:00 |
|
Laurent Destailleur
|
ad087a75e6
|
Fix missing php
|
2015-11-25 23:32:00 +01:00 |
|
Laurent Destailleur
|
1caf148dc6
|
Merge pull request #4053 from marcosgdf/bug-3987
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
|
2015-11-25 22:24:56 +01:00 |
|
Laurent Destailleur
|
c8da4ee9f3
|
Merge pull request #4058 from marcosgdf/bug-3293
FIX #3293 Login page form icons not shown
|
2015-11-25 22:18:00 +01:00 |
|
aspangaro
|
8c0dffd24e
|
Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy
|
2015-11-25 20:23:41 +01:00 |
|
Raphaël Doursenaud
|
973e42d10f
|
FIX #4097 Public holiday calculation
The last day was ommitted and never parsed. If this day was a
saturday, sunday or public holiday day, it was not computed.
|
2015-11-25 19:34:11 +01:00 |
|
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
|
316b7453e4
|
FIX bad stock valo
|
2015-11-05 17:04:08 +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
|
75bcb7e53f
|
fix pmp
|
2015-11-05 15:32:56 +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 |
|
Christophe Battarel
|
9b797c1831
|
FIX bad calculation for stock value
|
2015-11-05 12:49:43 +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 |
|
philippe grand
|
c26c8c7fcc
|
[Qual] Prevent warning
|
2015-10-30 08:47:30 +01:00 |
|
Juanjo Menent
|
c14349f1ea
|
Merge pull request #3829 from hregis/3.8_bug
Fix: add missing hooks
|
2015-10-29 16:05:35 +01:00 |
|
fmarcet
|
440df980ea
|
Fix SQL Query
|
2015-10-29 13:43:07 +01:00 |
|
Regis Houssin
|
6373c82559
|
Fix: broken features !!!
|
2015-10-29 13:14:38 +01:00 |
|
fmarcet
|
dba952e596
|
Fix: Products image on getNomUrl
|
2015-10-29 12:51:25 +01:00 |
|
fmarcet
|
310ecb1e09
|
FIX: Show product image on getNomUrl()
|
2015-10-29 12:28:28 +01:00 |
|
Regis Houssin
|
e5b1e214bc
|
Fix: add missing hooks
|
2015-10-29 11:50:16 +01:00 |
|
Juanjo Menent
|
b6b8a9e0f0
|
Merge pull request #3824 from aspangaro/3.8-23
Review 3.8
|
2015-10-29 10:54:01 +01:00 |
|
fmarcet
|
6469a31a32
|
Style corrections
|
2015-10-29 10:38:21 +01:00 |
|
fmarcet
|
62dc6814a3
|
FIX #3726 Not showing images on product card
|
2015-10-29 10:14:54 +01:00 |
|
aspangaro
|
4e9d06785c
|
Fix #3818 & presentation
|
2015-10-29 06:47:42 +01:00 |
|
aspangaro
|
e2ba24826f
|
Review 3.8
|
2015-10-29 06:06:56 +01:00 |
|
phf
|
4180862fec
|
Merge branch '3.8' into fix_3.8_clone_order
|
2015-10-28 14:36:31 +01:00 |
|
phf
|
f385f8bcfa
|
FIX better fix to generate a PROV ref after clone
|
2015-10-28 14:34:34 +01:00 |
|
Florian HENRY
|
9a95401473
|
FIX : add tag myuser_job into ODT replacement
|
2015-10-28 11:27:39 +01:00 |
|
Laurent Destailleur
|
1eca2d33c0
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-10-27 22:24:29 +01:00 |
|
Laurent Destailleur
|
87c240252c
|
FIX Can export a field into task time table with export project profile
|
2015-10-27 22:24:18 +01:00 |
|
Alexis Algoud
|
fa3af485ef
|
FIX action not appear before an update
because of a lack of line in action ressource
|
2015-10-26 18:33:22 +01:00 |
|
atm-robin
|
29b8919a40
|
FIX supplier rights for orderToInvoice
|
2015-10-26 14:34:46 +01:00 |
|
Laurent Destailleur
|
77a0359cfc
|
Fix bad test
|
2015-10-25 20:17:43 +01:00 |
|
Laurent Destailleur
|
295eb533f8
|
FIX Bad picto for expense report
|
2015-10-25 20:16:40 +01:00 |
|
Laurent Destailleur
|
4e206fa80b
|
Fix doxygen
|
2015-10-25 19:53:59 +01:00 |
|
Laurent Destailleur
|
48ed8d4408
|
FIX The thumb of user into top menu was using the image in full size.
This make a large download at each page call. We must use the mini
thumbs.
|
2015-10-25 19:42:00 +01:00 |
|
Laurent Destailleur
|
2cbfb69f9b
|
Update template
|
2015-10-23 15:28:14 +02:00 |
|
Laurent Destailleur
|
a01a85c3f6
|
FIX tag object_total_vat_x need x to be a string with unknown decimal
lenght. Now use for x the real vat real with no more decimal (x = 20 or
x = 8.5 or x = 5.99, ...)
|
2015-10-23 15:13:02 +02:00 |
|
Maxime Kohlhaas
|
ef2337a338
|
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
Conflicts:
htdocs/compta/facture/list.php
|
2015-10-22 14:41:58 +02:00 |
|
Laurent Destailleur
|
d55f138fb1
|
Merge pull request #3785 from frederic34/patch-19
FIX Error message not returne into update fournisseur.commande.class.php
|
2015-10-22 10:43:10 +02:00 |
|
Frédéric FRANCE
|
4689b0cc11
|
Update fournisseur.commande.class.php
|
2015-10-21 17:31:51 +02:00 |
|
Frédéric FRANCE
|
5237a2afc7
|
Fix lost searchstatus on next page list
|
2015-10-20 17:45:24 +02:00 |
|
Laurent Destailleur
|
7d382f7997
|
FIX Revert option WORKFLOW_PROPAL_CAN_CLASSIFIED_BILLED_WITHOUT_INVOICES
into option WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED
for better compatibility with old versions
|
2015-10-19 18:17:19 +02:00 |
|
Maxime Kohlhaas
|
d79fb71987
|
FIX : search_status not used in mergefusiontool
|
2015-10-19 16:17:47 +02:00 |
|
Maxime Kohlhaas
|
572be23fc1
|
FIX : filters on supplier invoices list are not used, search_status instead
|
2015-10-19 15:57:23 +02:00 |
|
Maxime Kohlhaas
|
5fb6705b5c
|
FIX : Search status not saved into list
|
2015-10-19 15:53:13 +02:00 |
|
Maxime Kohlhaas
|
9e9f32e3bf
|
FIX : project was not retrieved on invoice creation form
|
2015-10-19 15:38:28 +02:00 |
|
Laurent Destailleur
|
6a90431cf1
|
Prepare 3.8.2
|
2015-10-19 14:04:47 +02:00 |
|
Laurent Destailleur
|
fd3ba13130
|
FIX #3541 Bypass authentication when user was created using LDAP
|
2015-10-18 21:33:47 +02:00 |
|
Laurent Destailleur
|
bf6b48f5a0
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-10-18 21:17:29 +02:00 |
|
Laurent Destailleur
|
afe4057a97
|
FIX #3757 Can't set amount in a social contribution with some languages
|
2015-10-18 21:17:19 +02:00 |
|
Laurent Destailleur
|
be8e7515a1
|
Merge pull request #3762 from simnandez/3.8
Fix: Last page total is 0
|
2015-10-18 20:27:17 +02:00 |
|
Laurent Destailleur
|
c64c1a0201
|
FIX If no end date is set on survey, we should be able to vote.
|
2015-10-18 20:11:26 +02:00 |
|
Laurent Destailleur
|
420bfd8301
|
FIX Preview pages was not using correct style for ref
|
2015-10-18 19:09:35 +02:00 |
|
Laurent Destailleur
|
c51bc09e39
|
FIX The preview of PDF was never refreshed if PDF document was changed
|
2015-10-18 18:54:54 +02:00 |
|
Juanjo Menent
|
334c14d088
|
Fix: Last page total is 0
|
2015-10-18 11:56:42 +02:00 |
|
Frédéric FRANCE
|
6f4cfc86e8
|
Update notify.class.php
http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu
Fatal error: Call to a member function getFullName() on a non-object in /home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374
|
2015-10-18 11:25:55 +02:00 |
|
Laurent Destailleur
|
0211ad64ee
|
FIX Total in summary was not same than into detail on the referrer page.
Conflicts:
htdocs/product/stats/facture.php
|
2015-10-17 12:36:51 +02:00 |
|
Laurent Destailleur
|
5c1daa6135
|
Merge pull request #3746 from atm-gauthier/3.8_fix_function_update_extra
FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABL…
|
2015-10-17 10:39:37 +02:00 |
|
Laurent Destailleur
|
fc8f4b4d6e
|
Merge pull request #3745 from atm-arnaud/3.8_fix_propale_facturee
FIX bug invoice classified in propale next update commonobject class …
|
2015-10-17 10:38:35 +02:00 |
|
Laurent Destailleur
|
bba8db2b60
|
Merge pull request #3744 from atm-gauthier/3.8_fix_thirdparty_parent
FIX : Societe::set_parent() function needs societe object to be fetch…
|
2015-10-17 10:37:36 +02:00 |
|
Frédéric FRANCE
|
d68db2a844
|
Update fournisseur.commande.class.php
|
2015-10-17 08:48:53 +02:00 |
|
Laurent Destailleur
|
8a02c8288b
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/product/index.php
|
2015-10-16 09:56:55 +02:00 |
|
Laurent Destailleur
|
9b85a70013
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
|
2015-10-16 09:52:38 +02:00 |
|
Gauthier
|
b3e3cc14a7
|
FIX : 1/ update_extra() function musn't be in "if(!empty(MAIN_DISABLE_CONTACTS_TAB)" test.
2/ Reindented code
|
2015-10-15 17:26:16 +02:00 |
|
arnaud
|
6bd13b8071
|
FIX bug invoice classified in propale next update commonobject class in 3.8
|
2015-10-15 17:02:33 +02:00 |
|
Gauthier
|
2c6aeac64f
|
FIX : Societe::set_parent() function needs societe object to be fetched to update parent
|
2015-10-15 16:48:52 +02:00 |
|
fmarcet
|
4cdf17d8b5
|
FIX #3689 Bug on workflow module
|
2015-10-15 12:17:57 +02:00 |
|
Raphaël Doursenaud
|
6c2b46f939
|
Fix #3728 Properly remove last category
|
2015-10-15 10:15:37 +02:00 |
|
Laurent Destailleur
|
05686b532c
|
Merge pull request #3733 from fappels/3.8-shipment-lot-delete
FIX: #3605 deleting a shipping
|
2015-10-14 21:41:20 +02:00 |
|
Laurent Destailleur
|
a5b9a210ce
|
Merge pull request #3725 from FHenry/3.8
FIX : #3724 Bug: Blank page after cloning proposal with changed client
|
2015-10-14 21:27:58 +02:00 |
|
fappels
|
68aac4476c
|
FIX: #3605 deleting a shipping
Get lots to move back to stock.
Move lots back to stock.
Do not log object because it will be deleted
Improve error reporting
|
2015-10-14 12:16:54 +02:00 |
|
Laurent Destailleur
|
e9facbf108
|
FIX bad property so after creating an event from calendar, filter were
lost.
|
2015-10-14 10:53:38 +02:00 |
|
Florian HENRY
|
727db56576
|
FIX : #3724 Bug: Blank page after cloning proposal with changed client
|
2015-10-14 08:27:56 +02:00 |
|
Florian HENRY
|
00b610d87f
|
FIX : fix HTML into formconfirm box
|
2015-10-14 08:23:52 +02:00 |
|
Florian HENRY
|
8aaa1993c6
|
FIX : #3724 Bug: Blank page after cloning proposal with changed client
|
2015-10-13 09:37:33 +02:00 |
|
Alexis Algoud
|
0251728e28
|
FIX double db escape add too quote
|
2015-10-12 17:36:24 +02:00 |
|
Laurent Destailleur
|
87fad70f4a
|
Revert "FIX no need to remove file into mail form"
|
2015-10-11 20:42:49 +02:00 |
|
Laurent Destailleur
|
62dd936b08
|
Merge pull request #3573 from atm-alexis/FIX_remove_file_from_mail_remove_file
FIX no need to remove file into mail form
|
2015-10-11 20:42:42 +02:00 |
|
Laurent Destailleur
|
9fa2afb44b
|
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Conflicts:
ChangeLog
|
2015-10-11 19:55:50 +02:00 |
|
Laurent Destailleur
|
1acaf44acf
|
Merge pull request #3718 from hregis/3.8_bug
Fix: wrong files name
|
2015-10-11 19:48:25 +02:00 |
|
Laurent Destailleur
|
a9a3c3b97f
|
Exclude file from sources. It is generated when building package.
|
2015-10-11 19:47:47 +02:00 |
|
Laurent Destailleur
|
a8e52f9c54
|
Update filelist
|
2015-10-11 19:45:53 +02:00 |
|
Regis Houssin
|
f8f600828d
|
Fix: wrong files name
|
2015-10-11 19:18:03 +02:00 |
|
Marcos García de La Fuente
|
4e9a378f0d
|
Merge branch '3.6' into bug-1776
|
2015-10-11 12:37:41 +02:00 |
|
Marcos García de La Fuente
|
252f00dfe7
|
Merge branch '3.6' into clone-proposals
|
2015-10-11 12:29:45 +02:00 |
|
Laurent Destailleur
|
3f8e9bd181
|
Remove warning
|
2015-10-10 19:24:31 +02:00 |
|
Laurent Destailleur
|
7b7d27920d
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/adherents/type.php
htdocs/categories/class/categorie.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/tax.lib.php
htdocs/product/composition/card.php
|
2015-10-10 18:56:28 +02:00 |
|
Laurent Destailleur
|
384c89dcef
|
Merge pull request #3701 from altatof/fix_orderdateonclone
FIX: change order date on clone (as everywhere else)
|
2015-10-09 20:44:03 +02:00 |
|
Laurent Destailleur
|
856bfaaa3a
|
Merge pull request #3691 from FHenry/3.8
FIX : Always use type send in parameters in showCategories method
|
2015-10-09 20:39:28 +02:00 |
|
Laurent Destailleur
|
4fab809604
|
Merge pull request #3684 from aspangaro/3.8-21
Fix : Lines from ER show date in english format
|
2015-10-09 20:38:29 +02:00 |
|
Laurent Destailleur
|
279e7028fb
|
Merge pull request #3686 from grandoc/3.7
3.7
|
2015-10-09 20:38:16 +02:00 |
|
Laurent Destailleur
|
f9485bd25b
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/extrafields.class.php
|
2015-10-09 20:35:17 +02:00 |
|
Laurent Destailleur
|
b27989d5d4
|
Merge pull request #3665 from altatof/fix_extrafields
reenable search criteria in sql clause
|
2015-10-09 20:32:42 +02:00 |
|
Laurent Destailleur
|
c675f88dda
|
Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning
[Qual] Prevent warning
|
2015-10-09 20:29:24 +02:00 |
|
Laurent Destailleur
|
dea095dbf7
|
Merge pull request #3710 from GPCsolutions/3.8-rmdebug
Fix: remove debugging leftover
|
2015-10-09 20:19:41 +02:00 |
|
Laurent Destailleur
|
e886c89e06
|
Merge pull request #3668 from altatof/fix_stock_entity
fix entities warehouse share
|
2015-10-09 20:16:32 +02:00 |
|
Laurent Destailleur
|
53c9cb38ef
|
Merge pull request #3664 from FHenry/3.7
FIX : New adherent from, always redirect on entity
|
2015-10-09 20:15:23 +02:00 |
|
Laurent Destailleur
|
be9027df1a
|
Merge pull request #3687 from grandoc/3.8
syntax error
|
2015-10-09 20:14:08 +02:00 |
|
Raphaël Doursenaud
|
497c751fb9
|
Fix: remove debugging leftover
|
2015-10-09 16:24:42 +02:00 |
|
Christophe Battarel
|
00f0aff6f0
|
FIX: change order date on clone (as everywhere else)
|
2015-10-08 15:58:19 +02:00 |
|
Florian HENRY
|
1f2a86078a
|
FIX : Always use type send in parameters in showCategories method
|
2015-10-08 11:03:08 +02:00 |
|
philippe grand
|
0841feda47
|
syntax error
|
2015-10-08 09:40:00 +02:00 |
|
philippe grand
|
0e343ae3b2
|
syntax error
|
2015-10-08 09:34:02 +02:00 |
|
philippe grand
|
6cce2860c2
|
Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7
|
2015-10-08 09:12:36 +02:00 |
|
aspangaro
|
425e7ce808
|
Fix : ER Show date in english format
|
2015-10-07 22:31:23 +02:00 |
|
Laurent Destailleur
|
72cabe2fc3
|
More complete description of margin rules calculation
|
2015-10-06 19:27:48 +02:00 |
|
Laurent Destailleur
|
8426e2e506
|
FIX Can't reopen a canceled invoice.
|
2015-10-06 18:38:43 +02:00 |
|
Laurent Destailleur
|
c460873c85
|
FIX The filter on thirdparty prices should be visible if there is at
least one thirdparty price.
|
2015-10-06 17:13:35 +02:00 |
|
Laurent Destailleur
|
1f742c7464
|
FIX Add a test to save life when ref of object (invoice ref, order ref,
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
|
2015-10-06 16:38:27 +02:00 |
|
Laurent Destailleur
|
d4a85d9fba
|
Fix missing css
|
2015-10-06 16:12:09 +02:00 |
|
Laurent Destailleur
|
e776f685ba
|
FIX when editing time spent, date of line suggested was a rubbish value
|
2015-10-06 16:09:24 +02:00 |
|
Laurent Destailleur
|
6ea05aa311
|
FIX Bad translation key for project "Overview"
|
2015-10-06 16:03:47 +02:00 |
|
Raphaël Doursenaud
|
c208fccf35
|
[Qual] Prevent warning
calcul_price_total() prefers to have the seller and localtaxes specified
|
2015-10-06 15:03:59 +02:00 |
|
Laurent Destailleur
|
d92604f646
|
FIX Link of project must be cickable if user has permission to read all
projects
FIX Missing information into the alt of project picto
|
2015-10-06 00:46:26 +02:00 |
|
Laurent Destailleur
|
53d86e1661
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-10-05 23:54:13 +02:00 |
|
Laurent Destailleur
|
9f2bcf0e4f
|
FIX The admin flag is mising.
|
2015-10-05 23:53:49 +02:00 |
|
Laurent Destailleur
|
f1cf629b80
|
FIX List of project for user that are restrited as sale repreentative to
some thirdparties.
|
2015-10-05 23:52:54 +02:00 |
|
Raphaël Doursenaud
|
afbee44993
|
Fix #3667 checkbox extrafields on edit
For actions and members.
|
2015-10-05 20:51:43 +02:00 |
|
Raphaël Doursenaud
|
3fdd59bf0a
|
Fix #3666 checkbox extrafields on edit
|
2015-10-05 20:39:14 +02:00 |
|
Raphaël Doursenaud
|
41354ca00d
|
Added type hinting to extrafields object
|
2015-10-05 20:30:55 +02:00 |
|
Raphaël Doursenaud
|
d24f5538f9
|
Fix: wrong parameters order
|
2015-10-05 20:25:55 +02:00 |
|
Laurent Destailleur
|
e3f225e038
|
FIX bad link into project box
|
2015-10-05 19:41:41 +02:00 |
|
Christophe Battarel
|
f3ef9b868f
|
fix entities warehouse share
|
2015-10-05 16:19:54 +02:00 |
|
Christophe Battarel
|
bf262c2cae
|
reenable search criteria in sql clause
|
2015-10-05 15:41:28 +02:00 |
|
Florian HENRY
|
9dd4a23365
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-10-05 15:22:38 +02:00 |
|
Florian HENRY
|
c9d8e041d5
|
FIX : New adherent from, always redirect on entity
|
2015-10-05 15:20:55 +02:00 |
|
philippe grand
|
78cb31e55f
|
Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7
|
2015-10-05 14:50:30 +02:00 |
|
Laurent Destailleur
|
143c1e03f8
|
FIX Missing menu entry for list of thirdparties when using auguria menu
manager
|
2015-10-05 10:30:49 +02:00 |
|
Laurent Destailleur
|
7b2fbdd638
|
FIX Can't change the admin with default setup
|
2015-10-05 10:04:34 +02:00 |
|
Laurent Destailleur
|
c20296f963
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-10-04 20:46:17 +02:00 |
|
Laurent Destailleur
|
839d4c2a9a
|
Merge pull request #3650 from frederic34/patch-19
Update printing.php
|
2015-10-04 20:03:21 +02:00 |
|
Laurent Destailleur
|
c2cc9711f7
|
FIX Thirdparty is missing on card
|
2015-10-04 20:01:08 +02:00 |
|
Frédéric FRANCE
|
780a5a1996
|
Update files.lib.php
|
2015-10-04 19:59:26 +02:00 |
|
Laurent Destailleur
|
406b271275
|
Merge pull request #3635 from FHenry/3.7
FIX : Mass Mailing activity don't display all status
|
2015-10-04 19:57:29 +02:00 |
|
Laurent Destailleur
|
0df42bc5ea
|
FIX Filter on status of thirdparty list and bad encoding of url
|
2015-10-04 19:37:49 +02:00 |
|
Laurent Destailleur
|
75e337e8d9
|
FIX select of project using ajax autocomplete option
|
2015-10-04 16:02:50 +02:00 |
|
Juanjo Menent
|
8f28e7cf1c
|
Merge remote-tracking branch 'upstream/3.8' into 3.8
|
2015-10-03 23:34:37 +02:00 |
|
Juanjo Menent
|
8febf25c23
|
Fix: #3566
|
2015-10-03 23:34:10 +02:00 |
|
Laurent Destailleur
|
d737fd1fd2
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-10-03 19:06:44 +02:00 |
|
Laurent Destailleur
|
31acab92a6
|
Doc comments
|
2015-10-03 18:48:51 +02:00 |
|
Juanjo Menent
|
fbc3efb5a9
|
Merge pull request #3641 from grandoc/3.8
fix : Typo
|
2015-10-03 15:55:56 +02:00 |
|
Laurent Destailleur
|
a9e55fd08f
|
FIX Missing contracts into list in page of Refering objects of a
thirdparty.
|
2015-10-03 12:57:58 +02:00 |
|
philippe grand
|
d19a9f66b3
|
Merge branch '3.8' of https://github.com/Dolibarr/dolibarr.git into 3.8
|
2015-10-03 12:43:38 +02:00 |
|
Laurent Destailleur
|
996c9ca2ba
|
FIX Can't change state on a contact
|
2015-10-03 12:21:27 +02:00 |
|
Laurent Destailleur
|
b6a83ed5a6
|
FIX Can't delete thirdparty if there is some discounts
|
2015-10-03 12:20:50 +02:00 |
|
Frédéric FRANCE
|
322a2a54b8
|
Update printing.php
|
2015-10-03 11:34:14 +02:00 |
|
Laurent Destailleur
|
10b481f47f
|
Fix colspan
|
2015-10-03 11:15:12 +02:00 |
|
Laurent Destailleur
|
5acf961f23
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-10-03 00:10:19 +02:00 |
|
philippe grand
|
e22fb3c538
|
fix : Typo
|
2015-10-02 12:39:09 +02:00 |
|
philippe grand
|
8a9c9f49d5
|
fix : Typo
|
2015-10-02 12:37:13 +02:00 |
|
Juanjo Menent
|
4c1e018ded
|
Merge pull request #3621 from fmarcet/3.8
FIX Only are showing one object linked
|
2015-10-02 11:03:19 +02:00 |
|
Laurent Destailleur
|
f11fd22809
|
More accurate message
|
2015-10-01 22:27:02 +02:00 |
|
Laurent Destailleur
|
5ad665d00c
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-10-01 16:50:52 +02:00 |
|
Laurent Destailleur
|
60c0338d64
|
FIX #3628
|
2015-10-01 16:50:18 +02:00 |
|
Laurent Destailleur
|
e76124add5
|
FIX #3606
|
2015-10-01 16:09:51 +02:00 |
|
Florian HENRY
|
fd29bb34be
|
FIX : Mass Mailing activity don't display all status
|
2015-10-01 16:09:04 +02:00 |
|
Laurent Destailleur
|
4201e8b032
|
FIX #3630 - Wrong balance report when module salaries and donation
disabled
|
2015-10-01 14:38:31 +02:00 |
|
Laurent Destailleur
|
e2a88cd010
|
Merge pull request #3626 from GPCsolutions/3.8-3607
FIX #3607 Better categories setting and unsetting
|
2015-10-01 13:59:05 +02:00 |
|
Laurent Destailleur
|
b57c156b60
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/modules/modContrat.class.php
htdocs/fichinter/card.php
htdocs/install/upgrade2.php
|
2015-10-01 11:16:35 +02:00 |
|
Laurent Destailleur
|
076f2ed9d1
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/lib/security.lib.php
|
2015-10-01 11:10:47 +02:00 |
|
Laurent Destailleur
|
72c31c0fa9
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2015-10-01 10:48:28 +02:00 |
|
Laurent Destailleur
|
4da8fb901b
|
Add comment
|
2015-10-01 10:48:09 +02:00 |
|
Laurent Destailleur
|
1907e5da54
|
Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat
FIX facturestat bad sql when customer view is limited
|
2015-10-01 10:48:05 +02:00 |
|
Laurent Destailleur
|
34adc60d26
|
Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company
FIX error in SQL due to a previous fix
|
2015-10-01 10:35:07 +02:00 |
|
Laurent Destailleur
|
9c28894ec3
|
Merge pull request #3615 from FHenry/3.7
FIX : When delete actioncomm also delete actioncomm_resources
|
2015-10-01 10:34:54 +02:00 |
|
Laurent Destailleur
|
0c64fa04bc
|
Merge pull request #3614 from marcosgdf/bug-3572
FIX #3572 Impossible to attach project in order. The option to use autocompletion for project failed.
|
2015-10-01 10:32:32 +02:00 |
|
Laurent Destailleur
|
9901406634
|
A paswword can be set on member card but member can't login. Too much
work to fix this into a stable version, so I just introduce a warning to
explain why and how to solve this.
|
2015-10-01 10:15:07 +02:00 |
|
Laurent Destailleur
|
71ccdb5cfb
|
FIX Payment form for paypal and paybox was not centered.
|
2015-09-30 19:37:41 +02:00 |
|
Laurent Destailleur
|
747c49862c
|
Try to solve a flush pb
|
2015-09-30 19:15:45 +02:00 |
|
Laurent Destailleur
|
7037679718
|
FIX When update a member login for a member linked to a user, the login
of user was not sync (not updated).
|
2015-09-30 19:15:09 +02:00 |
|
Raphaël Doursenaud
|
f0466ba313
|
FIX #3607 Better categories setting and unsetting
This allows triggering CATEGORY_LINK and CATEGORY_UNLINK each time.
|
2015-09-30 18:47:02 +02:00 |
|
Florian HENRY
|
a96b92a618
|
FIX : Email selector contact must not include inactive contact
|
2015-09-30 14:06:45 +02:00 |
|
Laurent Destailleur
|
d59f62cd75
|
Sync transifex
|
2015-09-30 01:25:35 +02:00 |
|
Laurent Destailleur
|
673ce059e6
|
Fix locale for nl_BE must match netherland language
|
2015-09-29 23:55:38 +02:00 |
|
Florian HENRY
|
e209fb23a2
|
FIX : Admin fiche inter page do not take good action
|
2015-09-29 18:27:39 +02:00 |
|
Florian HENRY
|
fecd213bb8
|
FIX: display error on extrafields on ficheinter
|
2015-09-29 16:57:05 +02:00 |
|
Florian HENRY
|
bb0de1dcad
|
FIX : update2.php test res befre assign it
|
2015-09-29 15:00:11 +02:00 |
|
Florian HENRY
|
766b8535ae
|
spacing
|
2015-09-29 09:47:23 +02:00 |
|
Florian HENRY
|
4f5e207f08
|
review
|
2015-09-29 09:45:04 +02:00 |
|
Laurent Destailleur
|
c05df2ab7e
|
FIX Wizard for restore does not show import command
|
2015-09-29 09:11:13 +02:00 |
|
fmarcet
|
a585698b69
|
FIX: Only are showing one object linked
|
2015-09-29 08:49:11 +02:00 |
|
arnaud
|
0b7305d21a
|
FIX facturestat bad sql when customer view is limited
|
2015-09-28 16:55:34 +02:00 |
|
Alexis ALGOUD
|
453ed8a05e
|
FIX error in SQL due to a previous fix
|
2015-09-28 15:36:27 +02:00 |
|
Florian HENRY
|
0f27edad5d
|
FIX : When delete actioncomm also delete actioncomm_resources
|
2015-09-28 10:14:19 +02:00 |
|
Marcos García de La Fuente
|
188489c8ef
|
FIX #3572 Impossible to attach project in order
Added missing file of commit 65d3f79
Close #3572
|
2015-09-27 21:52:44 +02:00 |
|
Laurent Destailleur
|
fa9103fc97
|
FIX Bad title line in project view when using jmobile
|
2015-09-27 16:50:47 +02:00 |
|
Laurent Destailleur
|
1e2d06bcd1
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-27 16:02:44 +02:00 |
|
Laurent Destailleur
|
ff5f823bef
|
FIX not responsive part for project page
|
2015-09-27 16:01:57 +02:00 |
|
Grand Philippe
|
6f128907fe
|
fix : Missing argument 1 for CommonDocGenerator::__construct()
|
2015-09-27 11:30:23 +02:00 |
|
philippe
|
1454d942ef
|
missing translation
|
2015-09-27 11:06:45 +02:00 |
|
Laurent Destailleur
|
e1b969cb90
|
FIX Init into bad var
|
2015-09-26 16:52:58 +02:00 |
|
Laurent Destailleur
|
6aa13d4189
|
Fix the $colorbackvmenu2 was removed with 3.8
|
2015-09-26 16:34:43 +02:00 |
|
Laurent Destailleur
|
d119e04963
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-26 14:17:02 +02:00 |
|
Laurent Destailleur
|
9ecc8e5e6b
|
FIX Regression on bad use of fk_account showing the bad bank account on
PDF.
|
2015-09-26 14:11:39 +02:00 |
|
Laurent Destailleur
|
dd88a799fb
|
FIX Event from ical stream should not be movable into calendar view
|
2015-09-26 13:54:50 +02:00 |
|
Laurent Destailleur
|
c707c899c1
|
Fix remove warning
|
2015-09-26 13:22:05 +02:00 |
|
Laurent Destailleur
|
fef8203e65
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-26 12:01:58 +02:00 |
|
Laurent Destailleur
|
a3647bea4e
|
Fix bad information in report
|
2015-09-26 11:53:36 +02:00 |
|
Laurent Destailleur
|
5a2dc88d42
|
Merge pull request #3610 from defrance/patch-80
3.8 bad filtering caused by statut filter #3580
|
2015-09-26 11:20:54 +02:00 |
|
Laurent Destailleur
|
b99ef6b27c
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-26 11:05:12 +02:00 |
|
Laurent Destailleur
|
4e77a651d4
|
Merge pull request #3600 from fmarcet/3.8
FIX #3599 Not saving legal form
|
2015-09-26 11:05:02 +02:00 |
|
Laurent Destailleur
|
9644e242ae
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-26 11:04:32 +02:00 |
|
Laurent Destailleur
|
5f765419ea
|
Fix because project module introduced opportunity, user may create
project (opportunity) even when thirdparty does not exists yet, so we
must provide a solution for this.
|
2015-09-26 11:04:17 +02:00 |
|
Laurent Destailleur
|
f3ba115ef0
|
Fix missing default value
|
2015-09-26 10:53:59 +02:00 |
|
Laurent Destailleur
|
7424b521ed
|
Merge pull request #3609 from aspangaro/3.8-20
Fix centering on login page
|
2015-09-26 10:30:24 +02:00 |
|
BENKE Charlie
|
8dcd6158e3
|
3.8 bad filtering caused by statut filter #3580
correction ported on 3.8 too, sorry for the bad step process
|
2015-09-26 10:15:42 +02:00 |
|
Juanjo Menent
|
b8bf21b905
|
Merge pull request #3582 from grandoc/3.8
FIX: order ref must not be translated
|
2015-09-26 08:54:25 +02:00 |
|
aspangaro
|
df0e64eb7c
|
Fix centering on login page
|
2015-09-26 07:59:06 +02:00 |
|
Laurent Destailleur
|
9d0cd148a8
|
Fix duplicate log
|
2015-09-25 11:47:24 +02:00 |
|
Laurent Destailleur
|
dcf3c00023
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-25 11:28:59 +02:00 |
|
Laurent Destailleur
|
c0433928c6
|
FIX sortder field was missing so manually added values were moved to
begin.
|
2015-09-25 11:28:49 +02:00 |
|
fmarcet
|
b5b90d1639
|
FIX #3599 Not saving legal form
|
2015-09-25 08:50:00 +02:00 |
|
Laurent Destailleur
|
3ee5920947
|
Merge pull request #3571 from fmarcet/3.8
FIX: When filter with empty status, by default get canceled status (-1)
|
2015-09-24 18:40:06 +02:00 |
|
philippe
|
9e185eec75
|
FIX: order ref must not be translated
|
2015-09-24 15:29:17 +02:00 |
|
Laurent Destailleur
|
f8f1f4fd2b
|
Merge branch 'patch-2' of https://github.com/AlainRnet/dolibarr into
AlainRnet-patch-2
Conflicts:
htdocs/categories/categorie.php
|
2015-09-23 18:29:56 +02:00 |
|
tysauron
|
f3a28682ea
|
For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE
|
2015-09-23 18:26:50 +02:00 |
|
phf
|
b222800012
|
FIX clone customer order create new order with validate ref and not with PROV
|
2015-09-23 15:14:08 +02:00 |
|
Florian HENRY
|
206d6d0f7e
|
FIX : avoid SQL error in getValueFrom common object when all params are
not send
|
2015-09-23 13:17:58 +02:00 |
|
Florian HENRY
|
84fa92045c
|
FIX : avoid SQL error when no sortfield send to method
|
2015-09-23 12:10:38 +02:00 |
|
Alexis Algoud
|
2d35124c71
|
FIX no need to remove file into mail form, the temp dir will be deleted after any sending
|
2015-09-23 11:11:19 +02:00 |
|
Laurent Destailleur
|
12a08ae4e1
|
Prepare 3.8.1
|
2015-09-23 10:25:06 +02:00 |
|
fmarcet
|
3ff8b3e437
|
FIX: Error retrieving customer prices
|
2015-09-23 10:23:29 +02:00 |
|
fmarcet
|
8309ed5c12
|
FIX: When filter with empty status, by default get canceled status (-1)
|
2015-09-23 09:24:49 +02:00 |
|
Laurent Destailleur
|
a70e73a963
|
FIX Missing validate button if permission are not valid.
|
2015-09-23 01:08:23 +02:00 |
|
tysauron
|
f1ab0d36c5
|
Chmod new file not old file
|
2015-09-23 00:32:30 +02:00 |
|
Laurent Destailleur
|
00b858e644
|
Merge pull request #3564 from FHenry/3.8
FIX : remove twice same test
|
2015-09-23 00:07:28 +02:00 |
|
Laurent Destailleur
|
dc89e6c516
|
Merge pull request #3557 from hregis/3.8
Fix: use get instead getJSON for avoid freezing
|
2015-09-22 23:56:36 +02:00 |
|
Laurent Destailleur
|
077c696c09
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/.gitignore
htdocs/theme/.gitignore
|
2015-09-22 16:28:34 +02:00 |
|
Laurent Destailleur
|
90b78702e5
|
Update ignore to secure packaging
|
2015-09-22 16:23:51 +02:00 |
|
Laurent Destailleur
|
c125ba0d66
|
Update ignore to secure
Conflicts:
htdocs/.gitignore
|
2015-09-22 15:42:59 +02:00 |
|
Laurent Destailleur
|
75daddbbe2
|
Update ignore to secure
|
2015-09-22 15:40:49 +02:00 |
|
Florian HENRY
|
178208918f
|
FIX : remove twice same test
|
2015-09-22 12:03:11 +02:00 |
|
Laurent Destailleur
|
c2bdd9b465
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-22 11:29:49 +02:00 |
|
Laurent Destailleur
|
fe6af7d8eb
|
FIX Description of tags was mandatory in edit mode but not in create
mode. Should not be mandatory.
|
2015-09-22 11:29:26 +02:00 |
|
AlainRnet
|
30bfb0eee3
|
Update categorie.php
voir https://github.com/Dolibarr/dolibarr/pull/3562
|
2015-09-22 09:40:13 +02:00 |
|
Laurent Destailleur
|
f2e2edbc64
|
FIX not closing CSS.
|
2015-09-21 15:10:52 +02:00 |
|
Laurent Destailleur
|
7d4a9b17b6
|
FIX Creation of tables or keys must not be done with a random order.
|
2015-09-21 14:00:02 +02:00 |
|
Regis Houssin
|
de04f3022c
|
Fix: use get instead getJSON for avoid freezing
|
2015-09-20 09:05:52 +02:00 |
|
aspangaro
|
49f671eb1d
|
Correct name
|
2015-09-19 07:24:32 +02:00 |
|
aspangaro
|
1901b2fb3b
|
Missing translations in checks deposits exports
|
2015-09-19 07:15:13 +02:00 |
|
Laurent Destailleur
|
e85ddbb470
|
Merge pull request #3537 from GPCsolutions/3.8-3533
FIX #3533 Load categories language
|
2015-09-18 20:48:58 +02:00 |
|
Laurent Destailleur
|
378da082bd
|
Fix selector or margin with jmobile
|
2015-09-18 20:43:10 +02:00 |
|
Laurent Destailleur
|
5f507cbbd8
|
Fix missing closing div making jmobile crazy
|
2015-09-18 20:23:06 +02:00 |
|
Laurent Destailleur
|
8699776930
|
Better usability with dolidroid
|
2015-09-18 16:17:52 +02:00 |
|
Laurent Destailleur
|
e974b07b09
|
Fix javascript error
|
2015-09-18 16:05:38 +02:00 |
|
Laurent Destailleur
|
f72f652d98
|
FIX Pb into pagination scroll widget
FIX Style of previous-next card when using dolidroid
|
2015-09-18 15:51:27 +02:00 |
|
Laurent Destailleur
|
14b6a74b2d
|
Fix javascript error on POS
|
2015-09-18 14:13:15 +02:00 |
|
AlainRnet
|
8dd843ab8f
|
Update categorie.php
voir https://github.com/Dolibarr/dolibarr/pull/3540/files (je n'avais pas vu dans quelle branche j'étais)
|
2015-09-17 23:23:18 +02:00 |
|
Laurent Destailleur
|
57521f628c
|
Fix bad path
|
2015-09-17 19:35:03 +02:00 |
|
Laurent Destailleur
|
099e3f0376
|
FIX Removed warnings
|
2015-09-17 00:47:56 +02:00 |
|
Laurent Destailleur
|
313d9ddacd
|
FIX #3534
|
2015-09-16 22:04:03 +02:00 |
|
Raphaël Doursenaud
|
6ffdbf91ec
|
FIX #3533 Load categories language
|
2015-09-16 21:35:20 +02:00 |
|
Laurent Destailleur
|
7d8013b371
|
FIX #3533
|
2015-09-16 21:34:01 +02:00 |
|
Laurent Destailleur
|
38bae655ea
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
Conflicts:
htdocs/core/class/html.form.class.php
|
2015-09-16 21:24:51 +02:00 |
|
Laurent Destailleur
|
e36928fd65
|
FIX #3529
|
2015-09-16 21:23:52 +02:00 |
|
Laurent Destailleur
|
7f60abdf7b
|
FIX #3524
|
2015-09-16 21:05:02 +02:00 |
|
Marcos García de La Fuente
|
3818bff86a
|
Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address
|
2015-09-16 12:49:05 +02:00 |
|
Marcos García de La Fuente
|
e80f29c271
|
Fix: [ bug 1794 ] - Error when cloning Proposal gives error in a malformed page
|
2015-09-16 12:47:13 +02:00 |
|
Florian HENRY
|
8fd9d2a7ce
|
FIX : #3530
|
2015-09-16 10:21:32 +02:00 |
|
Juanjo Menent
|
7b8096d367
|
Merge pull request #3523 from defrance/patch-78
fix error on tabcollectors and enhance
|
2015-09-15 15:16:14 +02:00 |
|
Florian HENRY
|
a0fb27bd80
|
FIX : Can create Proposal on close thridparty #3526
|
2015-09-15 14:34:49 +02:00 |
|
BENKE Charlie
|
95cfce925f
|
fix error on tabcollectors and enhance
fix error on tabcollectors feature
add number of tabs present in tab collectors
|
2015-09-15 03:33:27 +02:00 |
|
aspangaro
|
2d2f59fe3f
|
Fix : Class 'Categorie' not found in core\class\html.form.class.php
|
2015-09-14 22:33:48 +02:00 |
|
Laurent Destailleur
|
d985c77eca
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-14 18:36:08 +02:00 |
|
Laurent Destailleur
|
e0a88fabd9
|
FIX #3521
|
2015-09-14 17:54:53 +02:00 |
|
Laurent Destailleur
|
36beb289f3
|
Merge pull request #3520 from aspangaro/3.8-18
Fix #3225 Missing translations in interventions
|
2015-09-14 17:24:42 +02:00 |
|
Laurent Destailleur
|
ca2b66ffb3
|
Merge pull request #3519 from aspangaro/3.8-17
Fix #3227 #3226 Missing translations in supplier exports
|
2015-09-14 17:24:22 +02:00 |
|
Laurent Destailleur
|
c75f62ddb7
|
FIX icon into export profile may be not correctly output
|
2015-09-14 12:12:14 +02:00 |
|
Laurent Destailleur
|
b4c964760d
|
Sync transifex
|
2015-09-13 23:25:55 +02:00 |
|
Laurent Destailleur
|
3b01b8cb47
|
Fix security hole
|
2015-09-13 22:50:08 +02:00 |
|
aspangaro
|
334766d194
|
Fix #3225 Missing translations in interventions
|
2015-09-13 22:03:54 +02:00 |
|
aspangaro
|
27a85c074e
|
Merge remote-tracking branch 'origin/3.8-18' into 3.8-17
|
2015-09-13 21:45:32 +02:00 |
|
aspangaro
|
1d4c747aa2
|
Fix #3227 #3226 Missing translations in supplier exports
|
2015-09-13 21:44:59 +02:00 |
|
Laurent Destailleur
|
4eedec0274
|
Fix tool to generate filecheck
|
2015-09-13 20:25:33 +02:00 |
|
Laurent Destailleur
|
7c030a114d
|
Release 3.8.0
|
2015-09-13 19:26:20 +02:00 |
|
aspangaro
|
a805cb9374
|
Fix: ER payments are on the bank credit
|
2015-09-13 16:33:02 +02:00 |
|
Juanjo Menent
|
ba3d8f445c
|
Fix #3514 More elegant
|
2015-09-13 00:25:32 +02:00 |
|
Juanjo Menent
|
744e5375d2
|
Fix #3514 Bug: Error when trying to add a product to a non-existing object
|
2015-09-13 00:09:32 +02:00 |
|
Juanjo Menent
|
1deb77896f
|
Fix #3515 Bug: Creating an invoice from a shipment links to wrong customer order
|
2015-09-12 23:42:48 +02:00 |
|
Laurent Destailleur
|
9aec4d554b
|
Fix #3215 [User card] [Contact card] [Member card] Error in LDAP tab
|
2015-09-12 18:21:37 +02:00 |
|
Laurent Destailleur
|
db3c544e21
|
Fix #3240 [Supplier orders] Dashboard links to unuseful page
|
2015-09-12 18:14:08 +02:00 |
|
Laurent Destailleur
|
aa1661d64c
|
Fix #3413 Translation of ExpireDate
|
2015-09-12 18:09:47 +02:00 |
|
Laurent Destailleur
|
67b7345e83
|
Fix the feature to log a cheque as returned.
Fix duplicate parameter mainmenu and leftmenu into url
|
2015-09-12 18:00:19 +02:00 |
|
Laurent Destailleur
|
97096536b1
|
Fix #2526 The filter on type numeric is ok now. Sometimes we used
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
|
2015-09-12 15:20:55 +02:00 |
|
Laurent Destailleur
|
a5c6582bc1
|
Fix duplicate translation/encoding on setEventMessage
Conflicts:
htdocs/ftp/index.php
|
2015-09-12 12:55:20 +02:00 |
|
Laurent Destailleur
|
1966d75ced
|
FIX #3490
|
2015-09-12 12:50:55 +02:00 |
|
Laurent Destailleur
|
db1d9d6d8e
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/dispatch.php
|
2015-09-12 11:50:46 +02:00 |
|
Laurent Destailleur
|
0c3ebe63c2
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/liste.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
|
2015-09-12 11:44:07 +02:00 |
|
Laurent Destailleur
|
86b1a9cbce
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2015-09-12 11:38:25 +02:00 |
|
Laurent Destailleur
|
36632593c0
|
Fix SQL injections #3300
|
2015-09-12 11:36:19 +02:00 |
|
Laurent Destailleur
|
0bfccc7255
|
Fix print into form to attach file must be into return.
|
2015-09-12 11:35:56 +02:00 |
|
Laurent Destailleur
|
309e1604e1
|
Fix migration missing for leave request module
Fix permission label for expense report and leave request
|
2015-09-12 11:35:49 +02:00 |
|
Laurent Destailleur
|
a83b3ae7e8
|
Merge pull request #3503 from fappels/3.7-dispatch-rounding
Fix #3471 3.7 Rounding issue when dispatching non-integer
|
2015-09-12 11:07:16 +02:00 |
|
Maxime Kohlhaas
|
c6081f0fa2
|
Fix multientity stock management (F.Henry followup)
|
2015-09-11 20:38:32 +02:00 |
|
fappels
|
c290840513
|
Revert "Fix delete not used empty stock record"
This reverts commit 1d85529eda.
|
2015-09-10 23:31:23 +02:00 |
|
fappels
|
75a14e02d8
|
Fix #3471 3.7 Rounding issue when dispatching non-integer
|
2015-09-10 23:29:13 +02:00 |
|
fappels
|
8bdfdc0127
|
Fix #3471 3.5 Rounding issue when dispatching non-integer
|
2015-09-10 23:12:27 +02:00 |
|
fappels
|
a294700cef
|
fix dispatch rounding version 1
|
2015-09-10 22:16:03 +02:00 |
|
Laurent Destailleur
|
7951483c5f
|
Fix: examples ko for import
Fix bad picto for export
|
2015-09-10 12:47:25 +02:00 |
|
Juanjo Menent
|
70df553814
|
Merge pull request #3494 from FHenry/3.6
3.6
|
2015-09-09 17:43:07 +02:00 |
|
Laurent Destailleur
|
8c1760fbcf
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-09-09 13:26:35 +02:00 |
|
Laurent Destailleur
|
d3f1a7d5b8
|
FIX Bad condition into invoice export request making reporting too many
rows.
|
2015-09-09 13:26:10 +02:00 |
|
Laurent Destailleur
|
7fd01d4aa3
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/paiement/cheque/class/remisecheque.class.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/list.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
|
2015-09-09 12:45:22 +02:00 |
|
Juanjo Menent
|
7d88405058
|
Fix #3475 RemiseCheque: Undefined variable $date
|
2015-09-08 21:31:04 +02:00 |
|
Juanjo Menent
|
c13d2d202b
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
|
2015-09-08 21:08:59 +02:00 |
|
Juanjo Menent
|
355fcc78cf
|
Fix #3475 RemiseCheque: Undefined variable $date
|
2015-09-08 20:48:31 +02:00 |
|
Florian HENRY
|
89b723b2a7
|
FIX : multientity warehouse management
|
2015-09-08 16:23:00 +02:00 |
|
Florian HENRY
|
63a817c3a4
|
Fix wahrehouse multientty management
|
2015-09-08 16:13:15 +02:00 |
|
Florian HENRY
|
52cb9581ff
|
Fix multientity stock management
|
2015-09-08 16:00:13 +02:00 |
|
Laurent Destailleur
|
82ad81fc03
|
Fix picto
|
2015-09-07 20:56:28 +02:00 |
|
Laurent Destailleur
|
9667b6a7c6
|
Solve conflict of var name
|
2015-09-07 20:22:44 +02:00 |
|
Laurent Destailleur
|
c9264fa1bc
|
Fix memcached effect was lost because init was done each time.
|
2015-09-07 20:19:37 +02:00 |
|
Laurent Destailleur
|
3ae19375cd
|
Merge pull request #3474 from aspangaro/3.8-16
Fix Problem with checked input when you edit a survey
|
2015-09-07 15:11:18 +02:00 |
|
Laurent Destailleur
|
9cd5e7cafa
|
Fix some errors into code generator.
|
2015-09-07 15:03:38 +02:00 |
|
Laurent Destailleur
|
822d4d1b39
|
Fix remove log
|
2015-09-06 15:06:13 +02:00 |
|
Laurent Destailleur
|
aaa639a3ab
|
Fix error when mark rate is 100% and buying price is 0, no way to
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
|
2015-09-06 15:00:17 +02:00 |
|
Laurent Destailleur
|
6c78b930d1
|
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
|
2015-09-06 11:26:20 +02:00 |
|
aspangaro
|
e88d7076a6
|
Fix Problem with checked input when you edit a survey
|
2015-09-06 07:58:49 +02:00 |
|
aspangaro
|
1756862a65
|
Typo
|
2015-09-06 07:56:43 +02:00 |
|
aspangaro
|
a4a72d64c0
|
New: Accountancy Add message when general ledger is witten
|
2015-09-06 06:43:40 +02:00 |
|
aspangaro
|
b268ccf064
|
Fix #3455 In advanced accounting module, button transfer to general ledger don't work
|
2015-09-06 04:52:03 +02:00 |
|
Laurent Destailleur
|
8076ea85ea
|
3.6.4 was packaged
|
2015-09-05 20:07:17 +02:00 |
|
Laurent Destailleur
|
a21b015cbb
|
Fix XSS
|
2015-09-05 20:03:02 +02:00 |
|
Laurent Destailleur
|
304a71710e
|
Fix not complete info
|
2015-09-05 00:57:11 +02:00 |
|
Laurent Destailleur
|
8bea703363
|
Fix deadlock feature. Can't reconciliate cash bank account. Sometimes
users need. I introduce a hidden option to fix this quickly.
|
2015-09-04 23:23:39 +02:00 |
|
Laurent Destailleur
|
398e9bad94
|
Add ignore
Conflicts:
htdocs/.gitignore
|
2015-09-04 23:22:38 +02:00 |
|
Juanjo Menent
|
de3f1b5559
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-09-04 18:23:33 +02:00 |
|
Juanjo Menent
|
ecf80249d1
|
Merge pull request #3454 from hregis/3.7_bug3
Fix: problem with pagination
|
2015-09-04 18:22:23 +02:00 |
|
Juanjo Menent
|
0016f48fac
|
Merge pull request #3424 from atm-aurelien/3.7
FIX ref_supplier to object property on supplier ref change
|
2015-09-04 18:00:05 +02:00 |
|
Laurent Destailleur
|
d19ec89bf1
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/modules/modHoliday.class.php
htdocs/holiday/card.php
|
2015-09-03 23:27:47 +02:00 |
|
Laurent Destailleur
|
2e3d25c055
|
Merge pull request #3462 from grandoc/3.7
fix : Typo
|
2015-09-03 19:15:31 +02:00 |
|
Laurent Destailleur
|
c7b7dff0ed
|
Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3460
Conflicts:
ChangeLog
|
2015-09-03 19:14:37 +02:00 |
|
Laurent Destailleur
|
54214cfddf
|
Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3383
Conflicts:
ChangeLog
|
2015-09-03 19:12:01 +02:00 |
|
Laurent Destailleur
|
be9d5b030d
|
Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3358
Conflicts:
ChangeLog
|
2015-09-03 19:08:08 +02:00 |
|
Laurent Destailleur
|
b0f604da14
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
Conflicts:
ChangeLog
|
2015-09-03 17:05:02 +02:00 |
|
philippe grand
|
fed70b1376
|
translation missing
|
2015-09-03 12:57:57 +02:00 |
|
Marcos García de La Fuente
|
ded6e7d6d9
|
Merge branch '3.7' into bug-3358
# Conflicts:
# ChangeLog
|
2015-09-03 12:32:03 +02:00 |
|
Marcos García de La Fuente
|
2d5331b8f8
|
FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice
Close #3460
|
2015-09-03 12:13:03 +02:00 |
|
philippe grand
|
8bf093a7ce
|
fix : Typo
|
2015-09-03 12:12:10 +02:00 |
|
Marcos García de La Fuente
|
67b7162c59
|
Merge branch '3.7' into bug-3383
# Conflicts:
# ChangeLog
|
2015-09-03 12:05:19 +02:00 |
|
Marcos García de La Fuente
|
86dd751f29
|
Merge branch '3.7' into bug-incorrect-pdf-bank
# Conflicts:
# ChangeLog
|
2015-09-03 12:03:24 +02:00 |
|
Marcos García de La Fuente
|
0955432de3
|
Merge branch '3.7' into bug-iban-whitespaces-37
# Conflicts:
# ChangeLog
|
2015-09-03 12:02:23 +02:00 |
|
Marcos García de La Fuente
|
08565d46fe
|
Merge branch '3.6' into bug-2893
|
2015-09-03 11:56:43 +02:00 |
|
Marcos García de La Fuente
|
50184babb9
|
FIX [ bug #2893 ] Dolibarr error when viewing an invoice after changing invoice mask
Close #2893
|
2015-09-03 11:55:40 +02:00 |
|
Laurent Destailleur
|
ce2e5e7862
|
Little debug of accounting module
|
2015-09-03 11:54:03 +02:00 |
|
Laurent Destailleur
|
36ed1c9a88
|
Fix error management
Fix look
|
2015-09-03 11:00:53 +02:00 |
|
Laurent Destailleur
|
5d34f787a3
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/core/class/conf.class.php
|
2015-09-03 10:51:17 +02:00 |
|
Laurent Destailleur
|
19ac160696
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_prospect.php
htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansextralight.z
htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmono.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonob.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
|
2015-09-03 10:49:41 +02:00 |
|
Laurent Destailleur
|
d64a87d980
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/index.php
|
2015-09-03 10:44:40 +02:00 |
|
Laurent Destailleur
|
001f1b4c31
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/filefunc.inc.php
|
2015-09-03 10:41:44 +02:00 |
|
Laurent Destailleur
|
7640abe6fc
|
Merge pull request #3453 from hregis/3.7_bug
Fix: wrong logical operator
|
2015-09-03 10:40:10 +02:00 |
|
Laurent Destailleur
|
cda681ac6a
|
Merge pull request #3451 from atm-gauthier/3.8_fix_right_on_asksupplierprice
FIX : on asksupplierprice module, order creation button must be avail…
|
2015-09-03 10:36:30 +02:00 |
|
Laurent Destailleur
|
124f068364
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-09-03 10:34:39 +02:00 |
|
Laurent Destailleur
|
897686a752
|
Merge pull request #3447 from fmarcet/3.5
FIX: The hours of date filter aren't correct
|
2015-09-03 10:33:00 +02:00 |
|
Laurent Destailleur
|
6ea31d87f8
|
Merge pull request #3445 from GPCsolutions/3.7-2863
Fix #2863 Sensible defaults for ChromePHP path
|
2015-09-03 10:32:22 +02:00 |
|
Laurent Destailleur
|
9efecbf52b
|
Merge pull request #3443 from GPCsolutions/3.5-3442
Fix #3442 Remove useless syslog
|
2015-09-03 10:30:42 +02:00 |
|
Laurent Destailleur
|
563c434fcf
|
Fix injection
|
2015-09-03 09:56:33 +02:00 |
|
Laurent Destailleur
|
c024578ca1
|
Fix bad link and remove a break
|
2015-09-02 19:41:54 +02:00 |
|
Laurent Destailleur
|
e3af0b90ec
|
Fix hidden feature to send remind by email
|
2015-09-02 18:09:29 +02:00 |
|
Regis Houssin
|
1a08f65942
|
Fix: problem with pagination
|
2015-09-02 17:22:19 +02:00 |
|
Laurent Destailleur
|
df3f29ee96
|
Fix hidden feature to send remind by email
|
2015-09-02 16:26:56 +02:00 |
|
Laurent Destailleur
|
5ef3c517bc
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-09-02 16:26:09 +02:00 |
|
Laurent Destailleur
|
c4fa4fc931
|
Fix hidden feature to send remind by email
|
2015-09-02 16:25:21 +02:00 |
|
Regis Houssin
|
fbf13ec2c7
|
Fix: wrong logical operator
|
2015-09-02 14:09:19 +02:00 |
|
Gauthier
|
c2c394ed8d
|
FIX : on asksupplierprice module, order creation button must be available if user is allowed to create supplier order and not if he's allowed to create customer order
|
2015-09-02 11:07:30 +02:00 |
|
Laurent Destailleur
|
f57284f507
|
Fix stats opportunities
|
2015-09-01 16:52:20 +02:00 |
|
Laurent Destailleur
|
a84696230b
|
Fix the translation page must be visible for all languages, except
en_US.
|
2015-09-01 16:11:58 +02:00 |
|
Laurent Destailleur
|
7d4602f2c4
|
Fix payment mode type
|
2015-09-01 15:59:11 +02:00 |
|
Laurent Destailleur
|
7a78c9d704
|
Fix doxygen
|
2015-09-01 14:31:32 +02:00 |
|
Laurent Destailleur
|
03435d7d90
|
Fix bad error management
|
2015-09-01 12:36:43 +02:00 |
|
Marcos García de La Fuente
|
216827b1d8
|
FIX [ bug #3358 ] Tasks box does not work with PostgreSQL
Close #358
|
2015-09-01 11:26:59 +02:00 |
|
Marcos García de La Fuente
|
3134950dbe
|
FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models
Close #3383
|
2015-09-01 11:19:05 +02:00 |
|
Marcos García de La Fuente
|
c4f9bde14d
|
FIX [ bug #3431 ] Invoice bank account is not respected
Close #3431
|
2015-09-01 11:09:37 +02:00 |
|
Raphaël Doursenaud
|
870882257d
|
Fix #3448 Pass expected date format
|
2015-09-01 11:06:44 +02:00 |
|
Marcos García de La Fuente
|
9ec349f410
|
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
Close #3432
|
2015-09-01 10:56:55 +02:00 |
|
Laurent Destailleur
|
441bb83e64
|
Fix url of local web sites
|
2015-09-01 10:08:03 +02:00 |
|
fmarcet
|
2b6a481011
|
FIX: The hours of date filter aren't correct
|
2015-09-01 09:46:45 +02:00 |
|
Raphaël Doursenaud
|
3b493ab0ed
|
Fix #2863 Sensible defaults for ChromePHP path
Use the provided ChromePHP class by default
|
2015-08-31 21:08:37 +02:00 |
|
Raphaël Doursenaud
|
51d5bff15d
|
Fix #3442 Remove useless syslog
Not having the permission to read the box is not an error.
Furthermore, no other boxes have this behavior.
|
2015-08-31 19:41:42 +02:00 |
|
Laurent Destailleur
|
9aa60e1ae1
|
Fix remove warning
|
2015-08-31 19:02:14 +02:00 |
|
Laurent Destailleur
|
6fd6df81ca
|
Fix css
|
2015-08-31 18:01:36 +02:00 |
|
Laurent Destailleur
|
2a85fb542a
|
Fix phpcs
Sync transifex
|
2015-08-31 17:22:36 +02:00 |
|
Laurent Destailleur
|
cf3eb1e452
|
Fix limit of nb of project.
|
2015-08-31 17:01:32 +02:00 |
|
Laurent Destailleur
|
3a32b08512
|
Fix filter on opportunity status
|
2015-08-31 15:52:54 +02:00 |
|
Laurent Destailleur
|
278e90cf0a
|
Fix same pb than #3297 with vat edit
|
2015-08-31 13:06:53 +02:00 |
|
Laurent Destailleur
|
5fd6c44640
|
Fix error management
|
2015-08-31 13:00:24 +02:00 |
|
Laurent Destailleur
|
dfde0314c6
|
Fix bad permission
|
2015-08-31 12:34:59 +02:00 |
|
Laurent Destailleur
|
00b9f98c1c
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2015-08-31 12:15:20 +02:00 |
|
Laurent Destailleur
|
942723ff8d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-08-31 12:13:35 +02:00 |
|
Laurent Destailleur
|
31465fe899
|
Fix several minor bugs
|
2015-08-31 12:13:23 +02:00 |
|
phf
|
9f4ec3dbdf
|
FIX error creating default object from empty value
|
2015-08-31 12:00:47 +02:00 |
|
Aurélien Stride
|
1a3d8b5ae4
|
FIX : adjusted test for affecting supplier reference
|
2015-08-31 09:25:39 +02:00 |
|
fmarcet
|
cf38b17e88
|
FIX: Bad visualization of suppliers name on Incomes-Expenses mode
|
2015-08-31 09:18:37 +02:00 |
|
Laurent Destailleur
|
fb70fbdc06
|
Merge pull request #3428 from marcosgdf/bug-3426
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
|
2015-08-31 00:53:04 +02:00 |
|
Laurent Destailleur
|
04d8bf7a1a
|
Merge pull request #3427 from fappels/3.8-fix-delivery-validate
Fix missing delivery validation button
|
2015-08-31 00:51:17 +02:00 |
|
Laurent Destailleur
|
1decd6be12
|
Merge pull request #3422 from fappels/3.8
Fix commit #3396 lot/serial shipment
|
2015-08-31 00:48:25 +02:00 |
|
Laurent Destailleur
|
2c85cf246c
|
Merge branch 'patch-1' of https://github.com/gschratzer/dolibarr into
gschratzer-patch-1
Conflicts:
htdocs/projet/element.php
|
2015-08-31 00:45:18 +02:00 |
|