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

42 Commits

Author SHA1 Message Date
rGaillard
18e8b087d3 [-] Core: Fix PSCFV-3092 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16687 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-08-03 14:40:31 +00:00
rGaillard
b37a36eba5 [*] Core: you can now associate modules to order states in order to add extra mail vars 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16618 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-31 09:18:41 +00:00
lLefevre
ff0bdb5532 [-] Bo : replace constant _PS_THEME_DIR_ by _PS_MAIL_DIR_ when send a email 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16562 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-25 08:34:17 +00:00
lLefevre
f2233e08d0 [-] BO : fix #PSCFV-3278 : add a parameter id_shop in a method Mail::send() && normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16549 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-24 14:13:11 +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
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
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
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
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
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
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
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
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
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
fSerny
da7ff75852 [+] BO : New hooks added (helpers + order history) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13349 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:54:50 +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
bMancone
1db3cf3fd5 // Fixed norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12428 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-16 12:57:15 +00:00
bMancone
ca23737c04 // #PSTEST-473 Fixed OrderHistory 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12427 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-16 11:34:46 +00:00
bMancone
57b0bd86d4 // #PSTEST-473 Fixed OrderHistory 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12426 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-16 11:29:19 +00:00
bMancone
7492cd60f8 // Fixed OrderHistory for Packs 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12343 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 10:11:24 +00:00
bMancone
c0523a2f74 // Improved Pack management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12317 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-10 15:40:46 +00:00
bMancone
4af34a28b3 // updated stock for Pack 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12292 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 18:23:01 +00:00
rMalie
50e4dff4e5 // Refactoring of Hook class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11998 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 14:42:05 +00:00
bMancone
0d0f43f783 // Orders : fixed stock (available quantity & Stock) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11491 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 14:24:34 +00:00
bMancone
09c22d9083 // OrderHistory : fixed r11441 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11471 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 11:10:52 +00:00
mMarinetti
e813ea996d // minor notice fix when new order, related to OrderHistory::getLastOrderState() returning false instead of an object 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11441 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 19:04:56 +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
aFolletete
8415b8136d // fixed bug on automatic payment addition when put the order to a paid status 
// fix "Free shipping" when create a new invoice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11321 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 17:17:13 +00:00
jBreux
8a73986a76 [*] BO : Improvement invoices management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11291 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-16 09:14:11 +00:00
rMalie
03bd438c7d // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11173 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 13:41:54 +00:00
bMancone
9329793e65 // Updated OrderHistory / StockManager. Added feature to StockCover: it is now possible to display the number of sales per product / and highlight products which coverage is less than a given threshold 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11163 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 09:48:52 +00:00
rMalie
fddf4fb89b [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11155 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 18:10:38 +00:00
rMalie
c97bac9160 // Remove useless code in OrderHistory 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11154 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 18:08:09 +00:00
bMancone
0a533f970f // OrderHistory: fixed synchronize/updateQuantity conflits 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11140 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 15:39:48 +00:00
bMancone
6f80da5b2b // Updated re-stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11139 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 15:25:51 +00:00
bMancone
85dd573402 // Re-stock (Prices fixed/warehouse fixed) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11136 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 13:54:17 +00:00
mDeflotte
71b6047692 // Stock decrementation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11074 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 13:09:32 +00:00
rMalie
b56d98b66a // Remove unused $tables property from ObjectModel + improve Cache 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11071 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 10:24:48 +00:00
rMalie
86683a963e // Remove $table and $identifier property from all classes, and add static $definition instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10912 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 13:56:03 +00:00
dSevere
43654ffba1 // StockManager : bugs fix + improvement of StockManager utilisation in fucntion of global configuration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10861 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 15:23:01 +00:00
rMalie
9d10de0848 // Merge -> 10309 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:05:10 +00:00
rGaillard
e4096bf943 // Constructor of OrderDetail correctly call parent constructor 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10291 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 15:51:33 +00:00