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

4009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vAugagneur
398f3aa8ec //small bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13497 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 13:24:03 +00:00
rMalie
efef0f3f14 // Fix $field['select_multiple'] notice in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13495 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:42:15 +00:00
vAugagneur
329b83e5a3 //small bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13494 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:31:22 +00:00
fGaillard
6074fff2f2 [-] FO : #PSCFI-4892 : BugFix CMS terms and conditions breadcrumb 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13492 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:24:36 +00:00
vAugagneur
8b96582280 [-] BO : Customer Service options/sync mailbox not working - #PSFV-539 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13491 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:19:23 +00:00
mMarinetti
6aec4206cf // fix js bug related to var languages used before page loaded 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13490 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:10:50 +00:00
mMarinetti
66bb55a360 [+] classes : New method ->attachProduct($id_product) 
// Fix #PSTEST-699
// now new attachment are automatically linked to the current product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13489 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:03:32 +00:00
mDeflotte
30cdc8b277 // Don't preselect delivery options 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13488 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:02:56 +00:00
mDeflotte
49450cdf05 [-] Project : #PSCFI-4737 - Add no-cache to header when there are 301 to avoid caching 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13487 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 09:16:27 +00:00
vAugagneur
c4c8ec2898 //trad 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13485 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 08:54:58 +00:00
dMetzger
5face77ed4 // BO : Small optimization on the payment page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13484 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 08:51:10 +00:00
fBrignoli
1cb5d03b7f [-] BO : Bug Fixed #PSTEST-546 - Tax Rules Creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13483 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 08:48:52 +00:00
bMancone
8d5ad0cb0b // Fixed #PSTEST-751 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13482 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 17:46:11 +00:00
mMarinetti
1b91c7da2a // fix in product page edition after deleting pack and save, some javascript function were not loaded 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13481 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 17:32:54 +00:00
dMetzger
609a45f25b [*] BO : you can now choose the combination of the free product of a cart rule 
[*] FO : the free product is now removed from the cart along with the cart rule (where applicable)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13479 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 17:04:41 +00:00
mDeflotte
712ce8a688 [-] FO : #PSCFI-4762 - When cart contains virtuals products and physicals products, use only physicals to calculate shipping cost 
// Product virtuals added before upgrading need to have the column ps_product.is_virtual at 1

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13477 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 16:40:22 +00:00
vAugagneur
a00899b78a [-] BO : Customer Service options/sync mailbox not working - #PSFV-539 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13476 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 16:24:51 +00:00
mMarinetti
4d641d6a7c // fix #PSTEST-701 - added some warnings when informations is missing in product edition / creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13475 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 16:23:43 +00:00
tDidierjean
0753d43376 [-] BO : fix bug #PSFV-535 - AdminAddress : Redirection if errors on add form 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13474 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 16:09:51 +00:00
aFolletete
56f8b70cb9 [-] BO : fixed bug #PSFV-495 - Back-office homepage is not totally translated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13472 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 15:54:41 +00:00
vAugagneur
40274b7a47 //added translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13471 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 15:52:30 +00:00
bMancone
d105569cec // Improvement #PSFV-550 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13470 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 15:37:04 +00:00
aFolletete
5bd54faab9 [-] BO : fixed bug #PSFV-501 - Unable to edit a customer in AdminGroups controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13469 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 15:32:11 +00:00
vAugagneur
6b4f0c8b93 //added translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13468 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 15:11:04 +00:00
aFolletete
3d7267ac10 [-] BO : fixed bug #PSFV-512 - Delivery slip PDFs have the "ITEMS MARKED AS RETURNED" text, but they shouldn't 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13467 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 15:04:57 +00:00
vChabot
2335b53cdd // select associated categories on a shop creation (with the root category shown when you are not in a shop context) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13466 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 14:36:57 +00:00
vAugagneur
8287ff1a84 //added translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13465 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 14:22:57 +00:00
bMancone
8853a86d91 // Fixed #PSFV-526 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13464 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 14:17:12 +00:00
tDidierjean
52d9b4c277 // fix redirection on edit page if errors are present 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13463 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 14:14:39 +00:00
bMancone
5e5ffff0d8 // Fixed #PSFV-526 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13462 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 14:04:35 +00:00
bMancone
8fc5329fe9 // Fixed #PSFV-521 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13461 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 13:58:19 +00:00
rGaillard
5bd4b07db0 // Little fix on BackOffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13459 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 13:36:28 +00:00
rGaillard
dedd988e60 // Little JS fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13458 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 13:31:55 +00:00
rGaillard
49f8d51561 // Improve and debug backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13457 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 13:25:55 +00:00
vAugagneur
92663eee4f [*] BO : add link to Customer messages in tab order #PSFV-514 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13456 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 13:10:16 +00:00
dMetzger
ae8471b7d6 [-] BO : small fixes on AdminCartRules #PSFV-506 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13455 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 10:25:21 +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
bMancone
2145cd543b // Fixed missing parameters when calling Currency::exists 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13450 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 09:22:15 +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
rGaillard
cd20b82227 // Fix bugs on Admin Orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13446 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 17:37:04 +00:00
mDeflotte
5f9b81c3a2 // Remove unuseful lines 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13445 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 16:26:29 +00:00
rGaillard
844dddccfd // Fix little bug in helperform 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13444 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 16:22:16 +00:00
mDeflotte
caf5a6afc3 // Shippping calculation on multishipping did not use package address delivery but the cart address delivery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13442 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:57:37 +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
mMarinetti
2f7d1984a3 // fix category_product index unique in upgrade process 1.4.7.0 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13440 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:34:28 +00:00
tDidierjean
f41fbf40a8 // refactor product attribute ajax actions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13439 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:16:09 +00:00
mMarinetti
650aedd44a // handle query errors in migrate_orders.php 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13438 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:06:47 +00:00
tDidierjean
3ddcf5cfe0 // replace all uses of "combinaison" by "combination" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13437 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:03:56 +00:00
tDidierjean
a0857d3573 // Deprecate function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13436 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 14:54:32 +00:00
mDeflotte
b8fbd8f98f // [-] MO : #PSFV-531 - Removing unused smarty vars 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13435 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 14:51:56 +00:00