Commit Graph

55 Commits

Author SHA1 Message Date
mDeflotte f6e9488e74 // BugFix : encoding problems
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11705 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 22:04:04 +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
jBreux 9129bdb0c0 // Fix payments module list (O_o)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11671 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 18:54:13 +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
vKham 8527b9e12f // re add stylesheet page commande
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11611 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 14:31:21 +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
vKham 1c6ff9d9a3 // add stylesheet page commande
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11588 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 12:59:41 +00:00
mDeflotte cc7584e340 // Problem with product return
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11566 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 09:39:44 +00:00
aFolletete a2b15b4ea4 // add icon in order to see invoice in document table on order page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11559 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 21:15:08 +00:00
vKham c3dde0b518 // add stylesheet stats, commandes, new icon back to list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11541 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:10:07 +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
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
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
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
aFolletete 41f7ae4d3a // add message when no payment is present
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11314 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:31:14 +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
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
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
jBreux 1207ab6607 // Fix bad colspan and add form label
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11267 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:05:53 +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
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
aFolletete 0db603d498 // fix bug on Payment addition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11148 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 16:51:47 +00:00
mDeflotte 177de86c10 // BugFix : Warehouse list on admin order is not visible on chrome
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11130 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 13:23:59 +00:00
aFolletete a96fb0d2e2 [-] BO : fixed calculation error on Product addition
[-] BO : fixed notice error on message addition

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10973 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 10:50:00 +00:00
dSevere a5c44ac8bc // Update and fix some bugs on stock display on orders in backoffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10949 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:17:01 +00:00
fBrignoli fc865e4986 // merge trunk r10863
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10935 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:09:08 +00:00
aFolletete 2e8abff9a9 // add restriction on addition and edition of an order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10904 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 11:27:26 +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
aFolletete 13bdaf6c3f [*] BO : you can now generate manually the invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10814 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:41:24 +00:00
rGaillard af8875217e // Fix links on order view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10662 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 13:31:55 +00:00
aFolletete 3d39e32c43 // fixed little issue
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10636 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:05:56 +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 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
rGaillard f59ff65357 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10615 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:51:17 +00:00
fSerny 3c7d9ba53b [*] BO : Partial refund - part 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10611 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 21:42:27 +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
tDidierjean 27e910572c // fixes to orders->view product, adminsearch->toolbar, admintaxrules hint
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10519 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:14:07 +00:00
lBrieu 41b256f637 // bug fix when a product has no default image
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10194 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 08:46:06 +00:00
rGaillard a1fb08f026 // Improve Specific prices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 17:40:42 +00:00
aFolletete a1c8dec437 // fixed misstyping on length attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9880 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-04 10:43:56 +00:00
rGaillard fe7dfe0460 // Some improvements on BackOffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9810 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 19:19:03 +00:00
rGaillard 903d9b783a [+] BO: Add BackOffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 09:18:45 +00:00
vSchoener 5ee2e7a6bb - Liable to last commit, update button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9633 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 14:19:01 +00:00
vSchoener 3557b042e0 - Liable to last commit (style)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9632 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 14:17:49 +00:00
vSchoener 314d0713db - Update theme for payment_cc detail
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9631 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 14:14:38 +00:00
vSchoener 11c86e7e66 [+] CORE: OrderControler display the payment_cc detail for an order, transaction_id can be changed manually
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9629 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 13:46:37 +00:00