Commit Graph

78 Commits

Author SHA1 Message Date
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
dMetzger cfe25a54e1 // Improvement in the resolution of #PSCFV-2159 (I did not fix the bug, but I fixed a wrong display that hide the real bug)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15042 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 13:14:36 +00:00
vAugagneur 79a6a4ad41 //remove useless info
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15030 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 09:02:01 +00:00
vAugagneur 8375992d2d [-] BO : fixed bug #PSCFV-727 - added some help
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15027 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-03 08:26:30 +00:00
rMalie 327d7f42ec // Fix attr('checked'), attr('disabled') and attr('selected') with jquery update #PSCFV-2142
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14989 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-02 08:29:30 +00:00
mDeflotte c6f15bf828 [-] BO : #PSCFV-1325 - Remove warning message "$X paid instead of $X" if the order has not been paid
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14954 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-27 14:01:10 +00:00
mDeflotte e6348e694d [-] BO : #PSFV-434 - Fix bugs with invoice icons not visible for orders canceled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14834 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 08:47:57 +00:00
bMancone 9ea9bd183c // When viewing an order, the stock_available is now properly displayed.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14800 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 08:15:23 +00:00
mDeflotte a62e88bdb5 // Fix little bug with order without product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14737 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 15:15:58 +00:00
mDeflotte 6c0469aad0 // Fix little bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14727 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 12:01:08 +00:00
rGaillard d07623cbc2 [*] BO: Set defaults payment order state on BackOffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14694 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 15:56:38 +00:00
rGaillard 1e1970e13c // Fix default carrier selection on backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14660 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-16 14:03:07 +00:00
mDeflotte 39f403ac17 [-] BO : #PSCFI-PSCFI-5323 - Refound displayed instead of Return on the order lines if the order is shipped
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14635 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 14:26:11 +00:00
aFolletete d7777f270e [-] BO : fixed bug #PSFV-504 - Even if the invoices management is disabled, you can create an invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14627 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-13 10:01:21 +00:00
mDeflotte 99beaf6ed0 [-] FO : #PSFV-797 - Fix bug with order detail and customized products
[-] BO : #PSFV-797 - Fix bug with order editing  and customized products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14607 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 13:02:18 +00:00
tDidierjean 244a2f9102 [*] BO : #PI-123 - toolbar and page title refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14594 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-12 08:34:38 +00:00
tDidierjean fe491a5f8c // Fix function name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14508 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-05 16:00:06 +00:00
mDeflotte bbbd5cc880 [-] BO : #PSFV-754 - Token repeted twice on a link because of a missing urlencode to a "back" attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14386 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-30 14:21:31 +00:00
rMalie d55721b01b // Fix problems with display of PDF with multishop #PSFV-643 admin/pdf.php is now deprecated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14276 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-26 16:00:05 +00:00
rGaillard 82e0beb63d // Fix backOffice order cart rules management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14201 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-15 14:42:57 +00:00
lLefevre 1650b72cf3 // Fix replace //" by " in english keys and change french keys
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14177 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 17:25:41 +00:00
lLefevre 0a6e977161 // revert to revision 14160
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14163 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 15:05:13 +00:00
lLefevre f1ec6e5ce7 // Fix replace \\" by " in english keys
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14161 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 14:58:48 +00:00
lLefevre 0e9e23aaae // Fix update english key of translations in all files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 12:25:51 +00:00
rGaillard f125fdc7cc // Fix small bugs on backoffice orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14021 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-09 17:19:39 +00:00
rGaillard f9485509a2 [-] BO: Fix PSFV-177 backoffice order message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13816 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-02 11:21:40 +00:00
tDidierjean eae3bc2d84 // rename $toolbar_fix to $toolbar_scroll part1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13711 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 17:38:42 +00:00
vKham 607af2bb44 // increase height table tr total_products on admin order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13686 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 14:05:56 +00:00
bMancone 5d06b01a59 // Fixed revision 13573
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13677 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 13:13:47 +00:00
rMalie 2454cd7863 // Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 16:33:10 +00:00
vKham 959bc0612e // change order summary part on admin order translation HT
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13554 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 13:40:49 +00:00
vAugagneur 25f7a4c817 //fixed bug #PSTEST-838
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13533 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 15:09:33 +00:00
vAugagneur ff20f3b075 //restored "prev/next" button on orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13532 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 15:03:26 +00:00
mMarinetti 10b3e3d8d3 // Welcome 2012
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13520 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 09:28:22 +00:00