dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,976 Commits 9 Branches 19 Tags
dce26dab08994b2522ddbc3d305df246e43a714f
Commit Graph

139 Commits

Author SHA1 Message Date
mDeflotte
dbcff517b4 [-] BO : #PSCFV-2739 - Hide button merchandise return if disable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15952 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-08 08:44: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
rGaillard
2bce691ae8 // Improve performance and bug fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15882 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-06 16:22:48 +00:00
vAugagneur
1e1452468c //remove unused variable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15846 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-05 09:24:15 +00:00
mDeflotte
f109695cbd // Fix bugs on adding products to an orders on the BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15826 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 13:25:35 +00:00
dMetzger
a6ca0bb1b2 // Code cleaning 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15770 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-30 16:18:10 +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
2553bc015e [-] BO: Fix PSCFV-2442 product price on backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15493 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 13:05:16 +00:00
lLefevre
c344ae2385 [-] BO : fix #PSCFV-2381 : now count translations fields are good and translations... 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15443 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 13:26:27 +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
aFolletete
6230b51db1 [-] BO : fixed bug #PSCFV-2434 - FIx bug on Product line edition in order page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15422 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 10:41:51 +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
rGaillard
30bc1f1de3 // New order message for BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15291 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 17:31:00 +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
lLefevre
897c6acb82 [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 11:45:41 +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
mDeflotte
55aa82c00c // Little bug fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15061 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 15:59:15 +00:00
mDeflotte
5b2e04fc7b // remove undefined function call 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14907 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 13:07:19 +00:00
mDeflotte
7f2c9fe45e [-] BO : #PSCFV-139 - Partial refund must not be available when order was not paid 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14892 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 08:19:41 +00:00
mDeflotte
b1f1febc88 [-] BO : #PSCFV-139 - Partial refund must not be available when order was not paid 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14890 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 08:16:43 +00:00
bMancone
53821dd3ad // When viewing an order, a warning is now displayed if one/some product(s) are out of stock - #PSTEST-821 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14801 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 08:26:10 +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
37401cd8fa // Removing debug function call 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14759 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 09:16:11 +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
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
mDeflotte
d4d1c35cb9 [-] BO : #PSCFI-5378 - Create voucher from the BO after a product return 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14681 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:19:13 +00:00
mDeflotte
d0809600a0 [-] BO : #PSFV-434 - Bad product total calculation (confusion with wt) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14672 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 09:08:54 +00:00
bMancone
285becae29 // Fixed stock_available when ordering products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14656 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 13:39:15 +00:00
rGaillard
aed2458a70 [-] BO: Fix specific prices on BackOffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14642 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 17:20:17 +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
e288be915e // Rename fieldsDisplay to fields_list part2 (timeout) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14377 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 16:29:31 +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
mDeflotte
69420af5d5 // Add hover to the new button 
// Add the avaibility to add alt/title attribute to the icon on helper list

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13970 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-08 14:05:16 +00:00
tDidierjean
7a6a998aab // rename $toolbar_fix to $toolbar_scroll part2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13712 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 17:39:40 +00:00
vAugagneur
bad7d8c586 [-] BO : fixed bug in contact message with html 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13673 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 11:05:21 +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
rMalie
b24dcffc9c // Improve multishop API 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 15:39:44 +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
fBrignoli
f437fe1106 // merge 1.4 => 1.5 (bug #PSCFI-4954) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13453 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 10:01:37 +00:00
dMetzger
2c7720ab08 // You shall not DIE! 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13448 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 09:14:01 +00:00
mMarinetti
166d540dbd // die2exception 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13441 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:49:27 +00:00
rGaillard
91c932f9f9 // Improve BackOffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13122 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 13:34:53 +00:00
aFolletete
11a74c652a // clean code && fix norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13081 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 15:31:59 +00:00
fSerny
a5d024ad84 // Adding some hooks :) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12932 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 14:18:07 +00:00
aFolletete
5615dca5c1 [-] Classes : fixed bug #PSTEST-550 - Add current_state attribute on Order class 
[~] Deprecated : OrderHistory::getLastOrderState()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12898 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 14:34:17 +00:00
aFolletete
22483a0320 [-] Classes : fixed bug #PSTEST-549 - Clean useless code 
[-] BO : fixed bug on sorting feature on AdminOrdersController
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12850 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 14:34:59 +00:00
dMetzger
b274997203 [-] BO : voucher creation in the order detail fixed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12718 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 14:34:58 +00:00