Commit Graph

172 Commits

Author SHA1 Message Date
mMarinetti 8305215fbc [-] BO : #PSTEST-248 - ergonomy in Product (pack) edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12141 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 15:08:57 +00:00
mMarinetti c5390b036f // removed draggable option in jquery.alerts config
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12136 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 14:34:26 +00:00
aFolletete c5519c7b70 // fix bug on Loading indicator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12127 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:49:18 +00:00
aNiassy e9a190ff0a [-] BO : modified the treatment in order to add specials characters like password in Preferences/Emails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12126 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:46:36 +00:00
mMarinetti c3aa2dd571 // added javascript doc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12119 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:37:54 +00:00
tDidierjean 566f10681a // fix save button hiding during loading of product pages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12112 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 10:55:55 +00:00
mMarinetti 96f8878aa5 // improvement about admin-products.js enable/disable save buttons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12105 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 10:30:21 +00:00
tDidierjean 4f1948cc1c // Added safety to not be able to save product before the mandatory tabs are loaded
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12085 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 16:28:51 +00:00
aFolletete 743fc2d2b8 [*] BO : add Loading information in back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12078 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 15:56:44 +00:00
tDidierjean d3f8c6b28a // Product tabs now trigger an event when finished loading. Fixed pack and virtual product not being updated when the loading is not complete.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12077 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 15:38:47 +00:00
lLefevre ff68f9b47c [-] BO : #PSTEST-219 : fix small bugs and translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12057 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 13:05:36 +00:00
bMancone 6f8f5ae3db // Fixed #PSTEST-273
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12034 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 09:48:10 +00:00
lLefevre 9600128885 [-] BO : #PSTEST-302 : update call javascript file via setMedia()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12025 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 08:44:15 +00:00
tDidierjean 9393b62dcc // Refactor admin-product.js
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12016 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 17:03:30 +00:00
tDidierjean b40583eec2 // fix displayTabProduct
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12012 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 16:37:37 +00:00
tDidierjean 38793a54d2 // Changes to ajax product tabs loading
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12009 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 16:05:35 +00:00
lLefevre 4e9e2c0676 // update call loading page in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11996 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 14:25:39 +00:00
mDeflotte 1e827f9465 [-] BO : #PSFV-262 - Fixed bug "Multishipping order notification totals not correct"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11972 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 10:14:26 +00:00
lLefevre 3ce9a8705c // add loading tab product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11960 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-01 15:20:27 +00:00
mMarinetti cc0d828205 // fix admin Language (javascript check lang for iso)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11956 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 16:06:04 +00:00
lLefevre 45627096c2 // fix check default theme in AdminShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11952 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 15:54:01 +00:00
tDidierjean 3d54800f89 // BO - Fix bug where the current product tab is loaded twice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11947 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 15:28:57 +00:00
lLefevre e3ccdae6d2 [-] BO : #PSTEST-273 : fix bug for generate URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11933 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 13:11:18 +00:00
rMalie 2ff9e1f6e3 // Fix live edit bug #PSFV-292
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11922 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 10:02:57 +00:00
mMarinetti 7b412165a6 // minor fix in doAjaxAdmin, showSuccessMessage, showErrorMessage javascript functions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11897 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-29 15:56:18 +00:00
mMarinetti 0500d8282a // fixed js error related to #PSTEST-166
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11886 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-29 13:13:42 +00:00
rMalie 38086c5dc6 [+] BO: Add Jquery alerts for nice alert box
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11845 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:18:20 +00:00
lLefevre bc3261e0b7 [-] BO : #PSTEST-165 : calculate price without or with tax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11818 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 09:24:47 +00:00
vKham 2bd3fe4cb8 //fix bug IE7 > delete font-size:118px on fileuploader js, add gradiant images ie7 table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11769 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-26 14:55:51 +00:00
fGaillard af36d06a26 [-] BO : #PSTEST-166 : Digits precision on product prices changed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11765 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-26 13:58:09 +00:00
rMontagne 8d083d38dd [BO] Fix IE bug for adding Images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11762 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-26 13:21:16 +00:00
lLefevre a4d3d16156 [-] BO : #PSTEST-95 : adding token
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11752 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-23 10:40:21 +00:00
fSerny ba041f3b20 // Preparing partial refund update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11603 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 14:01:05 +00:00
mMarinetti 1e1141acc8 // fix #PSTEST-125
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11598 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:43:23 +00:00
vAugagneur accd9d0f19 [-] BO : fixed js global conflict for categories tree
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11580 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 11:01:24 +00:00
fBrignoli 59f46ddfe5 [-] BO : Cannot send test email
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11564 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 09:27:46 +00:00
mBertholino ad79f651d8 [-] BO : fixed bug -> product/combination ergonomics
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11521 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:18:21 +00:00
lLefevre e25b8b0d95 [-] FO : #PSTEST-95 : change default combination in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11493 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:34:26 +00:00
aFolletete 083f1baf61 // fix issue on ajax querie on adding product
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11451 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 09:23:31 +00:00
aFolletete bb4576c4ab // when you adding a product on order, you can set a specific price
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11444 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 22:52:41 +00:00
tDidierjean c8342112c8 // fix category autocompletion binding
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11417 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 15:13:26 +00:00
aFolletete d3a3a76421 // add payment information on Payment table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11391 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 19:03:27 +00:00
aFolletete 5d7a120e50 // management of discount addition when no invoice on current order
// update the discount form when new invoice is created

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11389 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 18:24:03 +00:00
lBrieu 1e47744868 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11376 b9a71923-0436-4b27-9f14-aed3839534dd 2011-12-19 16:04:47 +00:00
fGaillard 72db8c8f42 [-] BO : Reinitialized H.T prices precision (decimals)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11372 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 15:58:03 +00:00
lLefevre 42bad872d7 [-] BO : #PSTEST-31 : update in AdminProductsController : available_date
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11363 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 14:42:58 +00:00
fGaillard 8dff8f9969 [-] BO : #PSTEST-8 : Javascript - Rounded prices (2 digits only)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11362 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 14:42:23 +00:00
lLefevre 373232aa93 // small bugs in combinaitions of virtual products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11356 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:20:30 +00:00
vAugagneur 1d545efe66 //move jquery plugin in the good folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-18 21:17:06 +00:00
aFolletete 92805dc869 [+] BO : on order edition, you can add a discount
[+] BO : on order edition, you can delete a discount
// Adding two new columns in order_cart_rule table: id_order_invoice, value_tax_excl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11330 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-18 17:18:54 +00:00