Commit Graph

301 Commits

Author SHA1 Message Date
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
aFolletete 9038c4ea68 // fix calculation issue on product addition
// all elements are correctly updated when we adding, editing or deleting a product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11322 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:20:03 +00:00
jBreux 3c7de270c5 // Fix orders view icons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11309 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:18:01 +00:00
tDidierjean 31f3a71b9d // Fix product attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11308 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:06:53 +00:00
lLefevre a45921e1ea [-] BO : #PSTEST-15 : translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11304 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 14:44:57 +00:00
lLefevre 00b878d868 // added pack.tpl in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11301 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 13:57:27 +00:00
jBreux 2db96b625d // Fix scroll and add missing image
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11292 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 09:33:36 +00:00
jBreux 8a73986a76 [*] BO : Improvement invoices management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11291 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 09:14:11 +00:00
tDidierjean 7fcbd00819 // Changes to manufacturers and accessories in BO product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11272 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:57:50 +00:00
mMarinetti 3fc8ef3d88 [*] BO : optimization of liveEdit system
[+] FO : new theme file for front-office layout.tpl, designers have now more possibilities

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11235 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:18:57 +00:00
aFolletete d1fae41a4d // fix bug on product line edition
// put new ressource in getRessources method of Webservice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11216 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:24:35 +00:00
mDeflotte b48c20d1d5 // BugFix : Adding warehouse on order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11214 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:19:05 +00:00
vChabot dc29921f7e [+] BO : You can now have UTF-8 URL Rewriting
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11207 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 15:00:47 +00:00
lLefevre e816494ec2 // adding counter for short description and adding size of image files in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11183 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 15:31:17 +00:00
lLefevre c0fae8aa5c // adding the dynamic loading of tabs in products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 11:15:17 +00:00
tDidierjean 80ecb65475 // Commit new tabs in product edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11079 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:22:46 +00:00
lLefevre efe13abfd0 // fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10975 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 12:41:56 +00:00
lLefevre 5b7da70eb9 // adding edit action for combination in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10918 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:24:59 +00:00
lLefevre 9e6940eb4e // adding button in toolbar for AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10903 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 11:15:21 +00:00
lLefevre efc5ff8390 // update tab "attributes" in smarty template + update action in list in ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10891 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-04 10:42:05 +00:00
tDidierjean 579d012427 // AdminProducts refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10870 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:16:36 +00:00
lLefevre 8a62346471 // Adding a button to top
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10857 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 14:31:08 +00:00