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

2244 Commits

Author SHA1 Message Date
mDeflotte
401a1ebcaa [-] BO : #PSCFV-2530 - Change warning message 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15694 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-25 14:51:33 +00:00
rMalie
34d80f945a // Improve multishop code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15691 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-25 13:37:43 +00:00
dMetzger
75430a0b30 // Fixed cart rules analysis for empty carts 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15684 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-25 11:37:43 +00:00
dMetzger
272906de5f [-] FO : Cart products cache fixed (when you remove a product from the cart) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15683 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-25 11:27:33 +00:00
rMalie
4182732c2a // Clean hooks name cache when a hook is added 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-25 09:52:59 +00:00
mDeflotte
1912c4b543 [-] BO : #PSCFV-2562 - Select all categories on creating a new shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15673 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 16:44:00 +00:00
lLefevre
598ffaee32 // Fix translations error 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15672 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 16:27:16 +00:00
fGaillard
49965e89fe // Bug fix payment module (with previous commit) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15661 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 13:04:14 +00:00
fGaillard
989f3b46c1 // Bug fix for payment modules (shops informations on validate order) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15660 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 13:01:35 +00:00
lLefevre
0517f5438d // Fix translations mails errors for each languages 
// Now, Subject for reply_msg.html is translated
// Now use sprintf() in subject mails

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15658 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 09:57:48 +00:00
aFolletete
24f5a6e099 [-] BO : fixed bug #PSCFV-2502 - fixed bug on notification system in back office 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15651 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-23 16:41:02 +00:00
tDidierjean
f0dbfc9003 [-] BO : fix #PSCFV-2545 - can't change product out of stock order status 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15650 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-23 16:38:33 +00:00
lLefevre
3697b4816a // Fix wholesaleprice when you import a combinaison CSV file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15643 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-23 14:27:43 +00:00
mDeflotte
633a32d3ec [-] BO : #PSCFV-2511 - Country visible in all shop 
// Normalize

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15631 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-23 07:53:36 +00:00
rMalie
34c465d642 // Normalize Tools 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15627 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 14:36:46 +00:00
mDeflotte
e76b4408f4 // Fix bug with cart, multishipping and gift product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15625 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 14:07:16 +00:00
tDidierjean
947f98c44e // fix warning with specific price 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15623 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 13:33:45 +00:00
dMetzger
3af54b348e // Oups 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15619 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 13:16:41 +00:00
lLefevre
4708c70a35 [-] BO : fix #PSCFV-2480 : fix translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15615 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 12:42:58 +00:00
lLefevre
943e6bfedf [-] BO : fix #PSCFV-2513 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15613 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 12:20:19 +00:00
rMalie
7d9ca8d486 // Code review for the change paymentModule 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15612 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 12:12:50 +00:00
dMetzger
859f360783 // Autoassignation of the cart rule when log out 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15610 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 10:20:36 +00:00
tDidierjean
59e29fad75 // cleanup 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15608 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 10:10:08 +00:00
fSerny
534b4facb2 [-] BO : Fixing module restrictions in multishop context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15606 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 10:08:21 +00:00
tDidierjean
8398c73e12 // fix redirection 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15604 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 09:46:26 +00:00
tDidierjean
c3bdc25d32 // fix url redirection with multishop secondary urls 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15601 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 09:33:24 +00:00
dMetzger
654b7069c5 // Translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15600 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 09:20:26 +00:00
aKorczak
4f0ae05ba0 [-] WS : id_group_shop is not mandatory 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15595 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 08:01:54 +00:00
rMalie
5bc76bbd14 // Fix share customer on shops 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15589 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 22:03:34 +00:00
rMalie
f969e341c0 // Fix context in multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15585 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 19:33:02 +00:00
rMalie
cb4527a95b // Fix multishop in objectModel (langs were not correctly generated when an employee has not all auths on shops) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15582 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 19:12:35 +00:00
rMalie
233caca6e6 // Fix default context in shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15576 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 18:57:51 +00:00
dMetzger
f1b7e0b834 // Fixed warning when calculating the order total of an empty cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15575 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 18:56:19 +00:00
dMetzger
231a924e31 // Cart display for free shipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15574 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 18:53:30 +00:00
aNiassy
e5e53d54bb [-] BO : Fixed a bug which did not permitted to found a customer in the creation of order in the back office 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15572 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 18:34:36 +00:00
tDidierjean
a84328a595 // fix image file upload for IE 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15563 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:49:28 +00:00
rMalie
9291b9ad1f // Fix list of customers in multishop #PSCFV-2499 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15562 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:44:38 +00:00
dMetzger
477bcc6b58 // Cart display improved with free shipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15560 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:33:51 +00:00
mDeflotte
4b1cce7054 // Fix bug with gift products and multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15558 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:31:43 +00:00
rGaillard
8b589b02c0 [*] BO: Add free shipping to BackOffice Order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15551 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:11:00 +00:00
dMetzger
19b486d1e4 // Norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15550 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:09:21 +00:00
dMetzger
fc33b24f3d [-] FO : wrong calcul of the free shipping in multi-shipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15548 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 17:08:16 +00:00
rMalie
5b1964b812 // Groups with only 1 shop are not disabled anymore in multishop toolbar 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15544 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 16:52:07 +00:00
rMalie
962a641bd9 // Fix multishop on Category->getChildrenWithNbSelectedSubCat() (best name ever) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15543 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 16:51:09 +00:00
dMetzger
8428e228e3 // typo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15539 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 16:17:53 +00:00
mDeflotte
b621e0f9eb [-] BO : #PSCFV-2473 - Fix bug with attribute value and shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15531 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:32:56 +00:00
rMalie
a75cf1475d // Fix multishop management in ObjectModel 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15530 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:29:28 +00:00
aFolletete
6c305ba98c // little optimization in autoloader, we exclude smarty classes of treatement 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15527 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:18:59 +00:00
dMetzger
1d3126f99d // Code cleaning and small fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15524 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:17:21 +00:00
rGaillard
d422dae42a // Delete isXmlHttpRequest 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15523 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:14:29 +00:00