Commit Graph

89 Commits

Author SHA1 Message Date
bMancone 1db3cf3fd5 // Fixed norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12428 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-16 12:57:15 +00:00
bMancone ca23737c04 // #PSTEST-473 Fixed OrderHistory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12427 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-16 11:34:46 +00:00
bMancone 57b0bd86d4 // #PSTEST-473 Fixed OrderHistory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12426 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-16 11:29:19 +00:00
bMancone 7492cd60f8 // Fixed OrderHistory for Packs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12343 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-11 10:11:24 +00:00
bMancone c0523a2f74 // Improved Pack management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12317 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-10 15:40:46 +00:00
bMancone 4af34a28b3 // updated stock for Pack
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12292 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 18:23:01 +00:00
aFolletete 9b780a4df3 // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12284 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 16:59:03 +00:00
fBrignoli 8e277e6e17 [-] FO : Bug Fixed #PSFV-315 - Incorrect products prices in order history
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12267 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 14:09:15 +00:00
aFolletete 925c1245e3 [-] Classes : fixed bug #PSFV-328 - Round error while editing order in back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12243 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-06 16:41:50 +00:00
aFolletete a1eb20009a // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12209 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-05 16:34:01 +00:00
mDeflotte a880921e7a // BugFix : Order states deleted are visible on the list of the order form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12196 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-05 14:48:17 +00:00
rMalie 494205d52e // Fix PrestaShopException typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:53:19 +00:00
mDeflotte e5cad60084 [-] BO : #PSCFI-4484 - Add historisation of the order status
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12082 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 16:06:18 +00:00
aFolletete bc631a0e42 [-] BO : fixed bug on Delivery slip generation in AdminDeliverySlip
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12023 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 18:16:09 +00:00
aFolletete 8fa12fda5b [-] BO : fixed bug on Invoice generation in AdminInvoices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12021 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 17:30:11 +00:00
rMalie 07207496d7 // Rename correctly all hooks
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 15:52:40 +00:00
rMalie 50e4dff4e5 // Refactoring of Hook class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11998 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 14:42:05 +00:00
aFolletete 3da78b569d [-] Classes : fixed little bug on getShipping method on Order class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11840 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 13:59:12 +00:00
aFolletete d010933362 [-] BO : fixed bug on product addition
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11838 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 13:46:42 +00:00
aFolletete 45cc1929d4 // add delivery slip
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11693 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:21:41 +00:00
fSerny 560903fefe [-] BO : Credit slips now appear in document section
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11653 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 18:02:04 +00:00
fSerny 71f2f43ca6 [*] BO : Partial refund now handle quantity
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11624 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:57:30 +00:00
bMancone c197093143 // Fixed getCartProducts()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11615 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:04:26 +00:00
vChabot 2a5faa0271 // Improvement : target blank on PDF
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11594 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 13:38:00 +00:00
rGaillard 739e51ce9a // Add specific_price management for backoffice order && fix installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11520 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:16:46 +00:00
bMancone 0d0f43f783 // Orders : fixed stock (available quantity & Stock)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11491 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 14:24:34 +00:00
bMancone 09c22d9083 // OrderHistory : fixed r11441
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11471 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 11:10:52 +00:00
mMarinetti 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
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
mDeflotte 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
rMalie 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
mDeflotte 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
fBrignoli 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
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 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
aFolletete 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
aFolletete 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
aFolletete 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
aFolletete 6f03353f96 [*] BO : no payment is registered on order creation for check and bankwire payment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11296 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 10:10:48 +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
rMalie 13a70e1044 [*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11256 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 13:24:03 +00:00
jBreux cb984199fc [+] BO : Add a note on invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11253 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 11:38:01 +00:00
aFolletete c16aed3424 // you can define invoice on payment addition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11238 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:42:50 +00:00
vChabot 3f814a3cf0 // little fix about generating first John Doe invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11229 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 17:09:52 +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
rMalie 03bd438c7d // Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11173 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:41:54 +00:00
mBertholino 225c8523e9 // improve multishop code, id_shop has an id different than 0 even if share_customer or share_order is true
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11172 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:37:59 +00:00
mBertholino 5f4972701c // improve multishop code with id_shop = 0 when share_customer or share_order is true
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11169 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 11:59:41 +00:00
aFolletete 7d67b9cc6e // revert r11153
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11164 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 09:50:21 +00:00
bMancone 9329793e65 // Updated OrderHistory / StockManager. Added feature to StockCover: it is now possible to display the number of sales per product / and highlight products which coverage is less than a given threshold
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11163 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 09:48:52 +00:00