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
b74c003c39
// class Shop optimization in sql request
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11443 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 22:39:11 +00:00
e813ea996d
// minor notice fix when new order, related to OrderHistory::getLastOrderState() returning false instead of an object
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11441 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 19:04:56 +00:00
0b1e2ba0a3
[-] PROJECT : Moving xml files to xml directory
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:37:14 +00:00
6ef2e2cc50
[*] BO : New category management with multi shop
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11437 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:36:08 +00:00
2576abc756
// Fix bug when updating product tags
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11436 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:30:12 +00:00
b03bfc5efd
// Fixed warehouse shops list
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11435 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:29:24 +00:00
1423fb7cea
// retrocompatibility fix : displayHeader and displayFooter
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11433 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:17:57 +00:00
7776b7af6d
// Add id_shop
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11431 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:58:27 +00:00
549aff4ce6
// Complete the removal of Image->legend property
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11430 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 16:54:44 +00:00
f00ce25f7b
// Remove "*" from require radio button
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11420 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 15:23:21 +00:00
c29b3acdc1
// added the name of controller as class in form.tpl
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11419 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 15:18:32 +00:00
3527399c24
[-] WS: Norm fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11413 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:38:18 +00:00
9fe70bb963
[-] WS: Norm fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11412 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:38:00 +00:00
daa8c7f8c9
// BugFix - Changing error message "name is to long (32 chars max)" + Adding context to Tools::displayError()
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11409 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:06:57 +00:00
59fd81a2e2
// StockManager: fixed
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11408 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 13:51:05 +00:00
a2ff7db3e2
// Fix default value of iterator in collections
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11407 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 13:49:59 +00:00
4b15867b80
// Stockavailable debugged
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11406 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 13:31:45 +00:00
95eda3498f
// fix minor issue about Hook::preloadHookAlias
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11403 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 12:55:33 +00:00
8fb44e6892
// BugFix - PSTEST-64 - Duplication de produit dans la liste et la fiche
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11396 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 09:43:56 +00:00
33b340dcaa
// Fix duplication of images
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 09:40:59 +00:00
895437e02d
// Stock : updated Product
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11392 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 08:52:45 +00:00
8af781e449
// Webservice: Stock
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11390 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 18:34:31 +00:00
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
4b8097e154
// Add module upgrader
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11388 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 17:54:54 +00:00
016e7b268f
// Removing red error message when orders total is diferent form the total paid if there are multiple orders with the same reference
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11385 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 17:26:17 +00:00
1d2f9e44c4
// Improve collections : where() method reworked (prototype changed) + validation of fields
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:57:28 +00:00
1c3f989220
// BugFix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11380 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:19:31 +00:00
2c60a188d9
[-] BO : #PSTEST-53 : fixed added quantities maximal for a pack
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11379 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:13:52 +00:00
772147a6ee
// Removing some id_warehouse
...
// Adding some checks with advanced_stock_management product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11375 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 16:01:41 +00:00
af51b8aa87
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11369 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 15:46:47 +00:00
74b6c9c628
[*] Update messages notifications to display customer threads
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11365 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 15:35:13 +00:00
4e810c850c
[+] Project : Add specific prices to a specific customer
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11364 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 15:31:18 +00:00
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
dac7c7795c
// Fix bug with specific prices creation
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11358 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:53:56 +00:00
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
5e60b5eada
// Protect $table and $alias in DbQuery
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:15:53 +00:00
b7ae37f6d7
// Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11351 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 11:13:13 +00:00
2139d3983d
[*] CO : Additional Shipping Cost / Purchase Price / Reduction Amount texc in OrderDetails
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11345 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:16:04 +00:00
d33fcc2da6
// DisplayDate don't have to 'die' if date == '0000-00-00'
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11344 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:14:42 +00:00
9688e7741f
// Fixing bugs in admin cart
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11343 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:51:59 +00:00
f0a1fc667b
// StockMvt : added id_warehouse as part of the params of getNegativeStockMvts()
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11334 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:10:21 +00:00
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
d446d77261
// fix bug on Cart rule update in validateOrder
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11326 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 17:13:48 +00:00
073e0fbbc4
// clean code
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11325 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:53:50 +00:00
4b4a4bbfce
// fix notice error on payment validation
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11324 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:44:48 +00:00
8415b8136d
// fixed bug on automatic payment addition when put the order to a paid status
...
// fix "Free shipping" when create a new invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11321 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 17:17:13 +00:00
896b62978f
// fix bug on tracking number value
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11311 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:22:38 +00:00
5a4bc80867
// improve invoice and order payment
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11306 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:00:43 +00:00
eb14c43722
// Norm + improve ObjectModel
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11305 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 14:55:05 +00:00
aFolletete