Commit Graph

125 Commits

Author SHA1 Message Date
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
mDeflotte 1e8ed9d47e // Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10827 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 12:58:35 +00:00
aFolletete 8bbd830446 // fix little bug on AdminOrdersController
[~] Deprecated: Cart::getOrderShippingCost()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10818 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:25:27 +00:00
lLefevre a8e8b25194 // fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10806 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 14:55:49 +00:00
vKham ad65287eeb // new layout page stats, substitute fieldset by div, legend by h2, delete stylesheet on html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10760 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 17:42:38 +00:00
fSerny a3a06d737b // Pizza fix :D
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10641 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:24:22 +00:00
aFolletete 04a3aab393 // WAOW ! Adding change currency feature in AdminOrdersController ! It's amaizing :D Wonderful ;)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10635 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:04:33 +00:00
fSerny 76cb8f5e03 // Little fix on admin_order.js
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10633 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:01:08 +00:00
vAugagneur 367c863e3a //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10632 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:54:43 +00:00
vAugagneur c3e7c28220 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10630 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:45:25 +00:00
vAugagneur bc3f7c89a9 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10628 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:44:15 +00:00
fSerny f5aadafc92 [-] BO : Partial refund - part 4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10626 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:42:17 +00:00
vAugagneur 66b1f844e4 [+] BO : login and lost password is now in ajax and convert in AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10608 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:32:11 +00:00
mMarinetti b12517c17c [+] BO : new javascript function doAdminAjax to simplify uses of ajax request (the prototype of this function can evolve before beta)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10588 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:38:50 +00:00
tDidierjean 9ebe542fdb // fix product live preview and duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10585 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:33:11 +00:00
dMetzger f670f7573f [+] BO : add new feature, Order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:45:52 +00:00
rMalie 3bbbdf8de5 // Fix multishop javascript for preferences and shop url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10549 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:37:29 +00:00
tDidierjean 1d734487ff // Fix google autotranslate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:19:53 +00:00
rMalie 0f87f86203 // Fix some bug on multishop + improve display of shop pages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:09:23 +00:00
vAugagneur 7c7eda3167 //clean header.tpl and footer.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10517 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 12:59:02 +00:00
vAugagneur aed1e77b94 //clean header.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:28:31 +00:00
vAugagneur 0242329b30 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10468 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 19:33:19 +00:00
vChabot 4334537fe1 // feature position works fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10443 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 15:49:59 +00:00
dSevere a9b5f70767 // Product Warehouse location : Manage multiple warehouses and location associated for a product / product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10375 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 18:43:04 +00:00
rMalie 9d10de0848 // Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
lLefevre c47131aa9f // fix bug display message error or success in AdminAccessController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10326 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:11:38 +00:00
dSevere a24764b9b3 // Suppliers : Manage multiple suppliers for a product / product attribute + integration with supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10279 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:29:50 +00:00