Commit Graph

99 Commits

Author SHA1 Message Date
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
fBrignoli
ed7686f8d1 // merge 1.4 => 1.5 (bug #PSCFI-4954) 2012-02-20 10:01:37 +00:00
dMetzger
161ff82fbf // You shall not DIE! 2012-02-20 09:14:01 +00:00
mMarinetti
5e3ff7eacd // die2exception 2012-02-17 15:49:27 +00:00
rGaillard
14089c455d // Improve BackOffice Order 2012-02-08 13:34:53 +00:00
aFolletete
5b6802f3e2 // clean code && fix norm 2012-02-07 15:31:59 +00:00
fSerny
1a656302c2 // Adding some hooks :) 2012-02-02 14:18:07 +00:00
aFolletete
34e63c9d2b [-] Classes : fixed bug #PSTEST-550 - Add current_state attribute on Order class
[~] Deprecated : OrderHistory::getLastOrderState()
2012-02-01 14:34:17 +00:00
aFolletete
9fb2e29835 [-] Classes : fixed bug #PSTEST-549 - Clean useless code
[-] BO : fixed bug on sorting feature on AdminOrdersController
// Clean code
2012-01-31 14:34:59 +00:00
dMetzger
18a040a30a [-] BO : voucher creation in the order detail fixed 2012-01-26 14:34:58 +00:00
mDeflotte
8164a7326e [-] BO : #PSTEST-575 - Replace a || by a && 2012-01-26 13:28:35 +00:00
bMancone
281a70cdaa // Fixed AdminOrdersController 2012-01-25 18:05:19 +00:00
rMalie
8836b9e392 // Normalize 2012-01-25 17:26:04 +00:00
aFolletete
f8ceb7ab6b // clean code
[-] BO : fixed bug #PSTEST-510 - Now, you can't define several times the same order status
2012-01-25 09:55:12 +00:00
rMalie
84f4d0838c [*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead 2012-01-23 10:21:51 +00:00
dMetzger
c7a156ef4f // Code cleaning (norm) 2012-01-20 16:09:37 +00:00
dMetzger
87fa332fd1 // Code cleaning 2012-01-20 15:58:40 +00:00
tDidierjean
8a757aaa9c // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
tDidierjean
e2dbac517f // Move controller templates to subfolder controllers/ 2012-01-09 17:23:42 +00:00
aFolletete
7ba36f20ae [-] Classes : fixed bug #PSFV-300 - Bug on Orders 2012-01-09 14:07:44 +00:00
aFolletete
bbd3630a34 // clean code 2012-01-05 16:34:01 +00:00
rMalie
4b17d64cf7 // Fix PrestaShopException typo 2012-01-04 13:53:19 +00:00
rMalie
649837fec6 // Set admin display hooks in templates 2012-01-04 11:03:51 +00:00
lLefevre
010f96175b [-] BO : fix #PSTEST-134 2012-01-04 09:43:09 +00:00
aFolletete
db0c7c9f8f [-] BO : fixed bug on product line edition in order page 2012-01-03 16:50:06 +00:00
bMancone
2cde961d37 // Fixed #PSTEST-261 2012-01-03 16:01:33 +00:00
rMalie
a776684f13 // Rename correctly all hooks 2012-01-02 15:52:40 +00:00
vKham
a8a72d78a5 // fix bug stylesheet stat conversion and calendar referrer 2011-12-30 12:58:05 +00:00
aFolletete
2aa90badf2 [-] BO : add a validation on name of discount in order page 2011-12-28 15:49:51 +00:00
aFolletete
5241ab154a // change image for partial and standard refund
[-] BO : fixed bug on updating of document table when adding a product
2011-12-28 15:40:03 +00:00
aFolletete
7362b4c4d4 [-] BO : fixed bug on product addition
// clean code
2011-12-28 13:46:42 +00:00
vKham
eef7e9ecd8 // fix table extensible 2011-12-22 19:45:23 +00:00
jBreux
e3d0c3e46e // Fix payments module list 2011-12-22 18:53:44 +00:00
fSerny
d4beecb774 [-] BO : Credit slips now appear in document section 2011-12-22 18:02:04 +00:00
fSerny
2d66dee685 [*] BO : Partial refund now handle quantity 2011-12-22 15:57:30 +00:00
vChabot
ef77153c28 // Improvement : target blank on PDF 2011-12-22 13:38:00 +00:00
mDeflotte
35aadde8c6 // Problem with product return 2011-12-22 09:39:44 +00:00
aFolletete
f6d8f403da // fix issue on ajax querie on adding product
// clean code
2011-12-21 09:23:31 +00:00
aFolletete
23c3e7a4ca // when you adding a product on order, you can set a specific price 2011-12-20 22:52:41 +00:00
aFolletete
f6d29cc757 // management of discount addition when no invoice on current order
// update the discount form when new invoice is created
2011-12-19 18:24:03 +00:00
mDeflotte
a58e1f41c8 // Removing red error message when orders total is diferent form the total paid if there are multiple orders with the same reference 2011-12-19 17:26:17 +00:00
mDeflotte
bab4e9c6e1 // Removing some id_warehouse
// Adding some checks with advanced_stock_management product attribute
2011-12-19 16:01:41 +00:00
aFolletete
a299b66c33 [+] 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
2011-12-18 17:18:54 +00:00
aFolletete
28ab48985b // clean code 2011-12-17 16:26:59 +00:00
aFolletete
9ccb81e485 // fix calculation issue on product addition
// all elements are correctly updated when we adding, editing or deleting a product
2011-12-17 16:20:03 +00:00
aFolletete
53d1559835 // fixed bug on automatic payment addition when put the order to a paid status
// fix "Free shipping" when create a new invoice
2011-12-16 17:17:13 +00:00
aFolletete
ca3f633245 // fix bug on tracking number value 2011-12-16 15:22:38 +00:00
jBreux
a4f970280c [*] BO : Improvement invoices management 2011-12-16 09:14:11 +00:00
jBreux
b2777ffd8c [+] BO : Add a note on invoice 2011-12-15 11:38:01 +00:00
aFolletete
59741d4ad8 // you can define invoice on payment addition 2011-12-14 18:42:50 +00:00