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

147 Commits

Author SHA1 Message Date
mDeflotte 2f17afcc30 [-] FO : #PSCFV-3034 - Add return quantity to order detail 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16312 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-10 14:09:18 +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
fBrignoli 6d3bed914a [-] BO : Undefined tax calculator 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16277 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-09 09:48:58 +00:00
fBrignoli ce3e408315 [-] PDF : Bug Fixed #PSCFV-2735 - Missing tax details in order slip 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16275 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-09 09:35:58 +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
vAugagneur 2128d67569 //small fix on total_paid_real 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16246 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-05 15:23:45 +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
aNiassy 7447131226 [-] FO : #PSCFI-5795 : fixed a bug where the opc freeze when an Order is to 0 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16002 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-13 08:12:16 +00:00
aNiassy 19d6ec53e4 [-] FO : #PSCFI-5795 : fixed a bug where the opc freeze when an Order is to 0 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16001 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-13 08:10:12 +00:00
vAugagneur dd23a5ceaf [-] CLASSES : fixed bug #PSCFV-2786 - Error in getOrderInvoice function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15974 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-12 07:06:45 +00:00
fBrignoli 3f8477682a [-] PDF : Bug Fixed #PSCFV-2724 - Incorrect SQL query for ecotax breakdown 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15925 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-07 13:27:33 +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 3a0031c60e // Normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15827 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 13:25:57 +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
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
fBrignoli 2e1afd8b8b [-] PDF : Bug Fixed #PSCFV-168 - Invoice discount & shipping are now correctly displayed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15313 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 14:22:22 +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
tDidierjean 0c2a5f508b [-] FO : fix bug #PSCFV-737 - cannot download virtual file from order history 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14997 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-02 12:55:53 +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
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
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 9b4aad56a9 [-] BO : #PSFV-797 - Fix bug with order invoice pdf and customized products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14608 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 13:22:47 +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 33caf31dc3 [-] Project : #PSFV-753 - OrderPayment::payment_method must be a genericName and not a name 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14388 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-30 14:43:44 +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
tDidierjean ee8c55d9f8 [-] Classes : PSTEST-1104 - mail for product download is not sent when command state is updated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14335 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-28 13:28:16 +00:00
rMalie f785a54836 // Fix multi shop share order in order invoices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14233 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-23 09:31:04 +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
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
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
aKorczak 5dc30e0954 //missing code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13508 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 15:25:18 +00:00
aKorczak 8967020600 //missing code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13506 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 15:12:48 +00:00
aKorczak 884f9d4948 //norm fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13505 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 15:06:43 +00:00
aKorczak 69e55b06df [-] WS : Add tax for orders inside order_details api entity 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13504 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 15:05:57 +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