dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,311 Commits 9 Branches 19 Tags
02fac949bfc362586fbf4a51e2de209ea46ebe5b
Commit Graph

87 Commits

Author SHA1 Message Date
mDeflotte
ad4c7dec2b [-] FO : #PSCFV-3318 - Guest Tracking must use order reference and not order id 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16566 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-25 13:00:43 +00:00
fBrignoli
7af140d285 [-] PDF : Canadian taxes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16386 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 16:45:14 +00:00
mDeflotte
dc35aaa83c [-] BO : #PSCFV-3000 - Send an email on changing an order from the BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16372 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 12:05:19 +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
991938edad [-] BO : #PSCFV-3036 : fix bug and fix notice and fix deprecated function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16248 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-05 15:35:13 +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
641d2b296b // Change commentaries 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16137 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-26 15:24:10 +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
aFolletete
b373f434ac [-] Classes : fixed bug #PSCFV-2681 - issue with updating of current_state column on order table 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15880 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-06 15:00:52 +00:00
mDeflotte
5dfc0e3824 // Fix little bug (undefined index) on canceling a product (BO order tab) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15823 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 12:26:55 +00:00
mDeflotte
0cf1fc870c // Fix bug with bad SQL request on changing state of an order paid by check 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15810 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 09:09:51 +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
rMalie
f6059f0a67 // Webservice getters are now multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15785 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-01 07: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
mDeflotte
ca6c08c36c [-] BO : #PSCFV-2276 - Fix bug on changing status of a order with virtual products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15140 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 07:45:22 +00:00
tDidierjean
503bb511d9 [-] Classes : fix #PSCFV-2185 - bad handling of order states for merchandise returns 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15036 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 11:48:40 +00:00
mDeflotte
2e7052d283 [-] FO : Fixed bug #PSCFV-1251 & #PSCFV-1727 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14979 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-30 13:40:46 +00:00
tDidierjean
8f4a8b1b5c // #PSTEST-1229 - remove virtual combinations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14844 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 13:23:02 +00:00
mDeflotte
3eeb6640fa // Order::getHistory() Fix cache problem 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14783 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-20 08:47:29 +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
813415a344 // Add missing parameter 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14634 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 14:25:00 +00:00
mDeflotte
58ef5e6e9b [-] FO : #PSCFI-5322 - Order::hasBeenDelivered and Order::hasBeenPaid don't work for all order states 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14629 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-13 13:40:29 +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
mDeflotte
4fd68f7666 [-] FO : #PSFV-717 - Bad parameter used 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14351 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 07:27:05 +00:00
rMalie
48e9590cf4 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-09 09:19:30 +00:00
rMalie
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 12:15:30 +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
aFolletete
cb7965c53f // Fixed bug #PSTEST-752 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13564 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 15:22:17 +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
mDeflotte
a17726f8ea [-] BO : #PSFV-503 - Fix bug with image generation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13368 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 17:31:39 +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
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
rMalie
33cf4fab23 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12687 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 15:51:47 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-19 10:14:10 +00:00
aFolletete
9b780a4df3 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12284 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 16:59:03 +00:00
fBrignoli
8e277e6e17 [-] FO : Bug Fixed #PSFV-315 - Incorrect products prices in order history 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12267 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 14:09:15 +00:00
aFolletete
a1eb20009a // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12209 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-05 16:34:01 +00:00
rMalie
494205d52e // Fix PrestaShopException typo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 13:53:19 +00:00
aFolletete
bc631a0e42 [-] BO : fixed bug on Delivery slip generation in AdminDeliverySlip 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12023 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 18:16:09 +00:00
aFolletete
8fa12fda5b [-] BO : fixed bug on Invoice generation in AdminInvoices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12021 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 17:30:11 +00:00
aFolletete
3da78b569d [-] Classes : fixed little bug on getShipping method on Order class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11840 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 13:59:12 +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
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
bMancone
c197093143 // Fixed getCartProducts() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11615 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 15:04:26 +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
rGaillard
739e51ce9a // Add specific_price management for backoffice order && fix installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11520 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 17:16:46 +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
rMalie
1d2f9e44c4 // Improve collections : where() method reworked (prototype changed) + validation of fields 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11383 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 16:57:28 +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