Commit Graph

111 Commits

Author SHA1 Message Date
rGaillard ad38878a8b [-] BO: Fix PSCFV-3918
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17208 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-06 09:28:07 +00:00
rGaillard e6112c4290 // small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17203 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-05 17:28:07 +00:00
rGaillard eb89723851 // display order slips amount in order view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17201 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-05 17:01:33 +00:00
vAugagneur 27014976fa [+] BO : in order tab you have new information of new customer message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17158 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-04 08:24:39 +00:00
rGaillard 4e060b9bbd [-] BO: Fix PSCFV-3804
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17154 b9a71923-0436-4b27-9f14-aed3839534dd
2012-09-03 16:45:42 +00:00
rGaillard 26d31d53c4 // Fix PSCFV-3842
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17141 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-31 16:09:47 +00:00
dMetzger e7bb178aa0 // Tpl cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16903 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-20 08:27:12 +00:00
rGaillard ca80cbc4b1 // Fix small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16724 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-06 13:55:43 +00:00
mDeflotte 3e76816edb [-] BO : #PSCFV-3474 - Force ajax request to be synchron
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16681 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-03 12:45:52 +00:00
rGaillard 100703b2f8 // Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16640 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-01 09:58:49 +00:00
rGaillard 0f56795f2f // Increase typewatch wait time on backoffice orders PSCFV-3349
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16628 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 12:46:29 +00:00
rGaillard ea35da0a1a // Small fix context is all when multishop is not activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16627 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-31 12:33:43 +00:00
rGaillard 4e39c6d41e [-] BO: Fix PSCFV-3095 display of gifts product on backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16496 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-19 14:03:56 +00:00
rGaillard 988f0480eb [-] BO: Fix PSCFV-2682 BackOffice order with customized datas on windows
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16493 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-19 13:12:15 +00:00
rGaillard cfb8b89481 // Fix various bugs with customized products in backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16489 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-19 12:26:04 +00:00
rGaillard bb704d1550 [-] BO: Fix smarty error with customized datas on orders view when product have no image
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16485 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-19 09:27:21 +00:00
rGaillard 4e3dbfb5cb [-] BO: Fix random bugs on backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16424 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 17:23:58 +00:00
mDeflotte a342ee66f2 // Fix little css bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16396 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 07:58:18 +00:00
lLefevre 75cbe6f6ec [*] TR : update English translations key for Back Office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16369 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-12 10:04:56 +00:00
fBrignoli 33d172e720 [-] BO : Bug Fixed #PSCFV-3093 - typo in JS
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16355 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 16:11:47 +00:00
mDeflotte c9592c4101 [-] BO : #PSCFV-3064 - Fix bug on creating order using a cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16342 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 13:33:23 +00:00
lLefevre 2f361c3bde [*] BO : #PSCFV-3007 : Now you can create a voucher when you create a partial refund on the BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16303 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 10:03:35 +00:00
mDeflotte e8b686d928 [-] BO : #PSCFV-3112 - Fix bug with payment by cheque and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16294 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 16:30:12 +00:00
lLefevre 81e6d2c488 [-] BO : fix #PSCFV-2955
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16269 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 07:55:21 +00:00
lLefevre 88545619f2 [-] BO : Fix W3C errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16264 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-06 14:32:35 +00:00
mDeflotte 1997bf6efb [-] BO : #PSCFV-3011 - Add details of refund and returned products on the BO order page.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16222 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-05 07:40:11 +00:00
mDeflotte 3c1c6fb7e0 [-] FO : #PSCFV-2920 - Hidding order number, use order reference instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16136 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-26 15:19:35 +00:00
rGaillard 24630365bd [-] BO: fix PSCFV-2778 display bad stock with product_attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15978 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-12 08:28:22 +00:00
dMetzger 57fc56c212 // Syntax error on BO order page when not using taxes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15937 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 15:46:50 +00:00
rGaillard 161f32b9e6 // Fix freeshipping on backoffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15930 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 14:56:48 +00:00
dMetzger 1989633b54 // missing semi colon on admin orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15898 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 08:28:26 +00:00
mDeflotte d02787dc97 [-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15797 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-01 15:40:32 +00:00
rGaillard 1334a89e95 [-] BO: Hide birthday date on BackOffice order when empty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15791 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-01 14:23:33 +00:00
aFolletete fbf58446c9 // fixed add order payment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15666 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 14:45:25 +00:00
lLefevre d8569a1ab1 // Fix small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15579 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:04:58 +00:00
aFolletete 545abdbc24 [-] BO : fixed bug #PSCFV-2503 - fix issue on stock update when product line edition in order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:04:07 +00:00
rGaillard 18160ffa65 // Little fix on order page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15561 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:38:55 +00:00
rGaillard 8b589b02c0 [*] BO: Add free shipping to BackOffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15551 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:11:00 +00:00
rGaillard d1e74ce3be // Display warning if no address is available in backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15529 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:27:11 +00:00
rGaillard c22c0d97f7 // Add information on BackOffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15475 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 08:48:55 +00:00
bLeveque 6f00731fba [-] INSTALLER : Fixed a missing "echo" at Step 3 in the SMTP configuration
[-] BO : Fixed a French hardcoded page (Favorites Views)
[-] BO : Fixed a typo ("Informations" => "Information")
[*] BO : Improved the UI of the Combinations generator and added some explanations - #PSCFV-770
[*] MO : Added a # before the order number in the e-mail sent to the merchant when an order is placed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15461 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 20:55:05 +00:00
aFolletete 098e0fbc35 [-] BO : fixed bug #PSCFV-2436 - fix bug on product adding on order page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15425 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:52:04 +00:00
mDeflotte ea7e73ef35 [-] BO : #PSCFV-139 - Improving Retial refund
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15316 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-15 14:58:02 +00:00
lLefevre d8b5cf93f3 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15279 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 14:38:07 +00:00
aFolletete 47cfd2b9f9 [-] BO : fixed bug #PSCFV-1296 - Can't add a product in order (BO)
// Fix backward compatibility issue with updateQty method

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15152 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 09:29:46 +00:00
rGaillard 7df7f7aac4 [+] BO: The customizable products are now usable in the BackOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15109 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 14:04:13 +00:00
rGaillard 4dd85be713 [-] BO: Fix the pictures link customized datas
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15084 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-07 16:00:54 +00:00
mDeflotte 207256d960 [-] BO : #PSCFV-858 - Rest to paid warning must be changed if the order is overpaid
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15074 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-04 12:54:29 +00:00
tDidierjean 0a3b557228 // #PSCFV-737 : BO - don't display shipping information for virtual order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15062 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 16:16:34 +00:00
rGaillard 068f98b5e5 [-] BO: Fix PSCFV-1439 BackOffice order switching language
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15057 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 15:32:41 +00:00