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

105 Commits

Author SHA1 Message Date
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
mDeflotte
5a9ba91f12 [-] BO : #PSTEST-575 - Replace a || by a && 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12713 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 13:28:35 +00:00
bMancone
00c7a1f4b6 // Fixed AdminOrdersController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12697 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 18:05:19 +00:00
rMalie
e47d23bfce // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12694 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 17:26:04 +00:00
aFolletete
709dfb5272 // clean code 
[-] BO : fixed bug #PSTEST-510 - Now, you can't define several times the same order status

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12669 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-25 09:55:12 +00:00
rMalie
ebec527630 [*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12596 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-23 10:21:51 +00:00
dMetzger
c09956731c // Code cleaning (norm) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12586 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-20 16:09:37 +00:00
dMetzger
aa402d73bd // Code cleaning 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12585 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-20 15:58:40 +00:00
tDidierjean
ad1fd29cea // Refactor AdminController::_errors to errors 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12331 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 08:58:12 +00:00
tDidierjean
84035510b5 // Move controller templates to subfolder controllers/ 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12287 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 17:23:42 +00:00
aFolletete
a2138c2e4c [-] Classes : fixed bug #PSFV-300 - Bug on Orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12266 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 14:07:44 +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
rMalie
af3107f454 // Set admin display hooks in templates 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12114 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 11:03:51 +00:00
lLefevre
f8004dd6eb [-] BO : fix #PSTEST-134 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12101 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 09:43:09 +00:00
aFolletete
ecc1a41e30 [-] BO : fixed bug on product line edition in order page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12087 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-03 16:50:06 +00:00
bMancone
cb02fc29d4 // Fixed #PSTEST-261 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12079 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-03 16:01:33 +00:00
rMalie
07207496d7 // Rename correctly all hooks 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 15:52:40 +00:00
vKham
af0a718747 // fix bug stylesheet stat conversion and calendar referrer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11932 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-30 12:58:05 +00:00
aFolletete
25a6289a60 [-] BO : add a validation on name of discount in order page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11862 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 15:49:51 +00:00
aFolletete
5a8ad9cb1d // change image for partial and standard refund 
[-] BO : fixed bug on updating of document table when adding a product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11859 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 15:40:03 +00:00
aFolletete
d010933362 [-] BO : fixed bug on product addition 
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11838 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 13:46:42 +00:00
vKham
fbb969c028 // fix table extensible 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11676 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 19:45:23 +00:00
jBreux
f42b9159e5 // Fix payments module list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11669 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 18:53:44 +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
fSerny
71f2f43ca6 [*] BO : Partial refund now handle quantity 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11624 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 15:57:30 +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
mDeflotte
cc7584e340 // Problem with product return 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11566 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 09:39:44 +00:00
aFolletete
083f1baf61 // fix issue on ajax querie on adding product 
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11451 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 09:23:31 +00:00
aFolletete
bb4576c4ab // when you adding a product on order, you can set a specific price 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11444 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 22:52:41 +00:00
aFolletete
5d7a120e50 // management of discount addition when no invoice on current order 
// update the discount form when new invoice is created

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11389 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 18:24:03 +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
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
92805dc869 [+] BO : on order edition, you can add a discount 
[+] BO : on order edition, you can delete a discount
// Adding two new columns in order_cart_rule table: id_order_invoice, value_tax_excl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11330 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-18 17:18:54 +00:00
aFolletete
538cb58556 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11323 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-17 16:26:59 +00:00