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 |
|
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
|
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
|
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 |
|
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 |
|