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

899 Commits

Author SHA1 Message Date
fBrignoli
0a9889f3af [-] CO : incorrect left join conditions in getTaxRules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10649 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 10:22:58 +00:00
aFolletete
04a3aab393 // WAOW ! Adding change currency feature in AdminOrdersController ! It's amaizing :D Wonderful ;) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10635 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 23:04:33 +00:00
fSerny
f5aadafc92 [-] BO : Partial refund - part 4 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10626 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:42:17 +00:00
tDidierjean
722223c2a4 // fix generateReference() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10624 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:32:16 +00:00
tDidierjean
d8fcdf19fe // fix AdminController translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10622 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:21:25 +00:00
rGaillard
b7c28b8c48 // Fix shop import stock available 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10621 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:19:48 +00:00
mMarinetti
8356cb82cf // strtouper(Tools::passwdGen(12)) replace uniqid, and Alain asked me to add "lol" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10618 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:07:08 +00:00
tDidierjean
a69d737ad8 // Fix bug with product quantity update 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10612 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:45:11 +00:00
fSerny
3c7d9ba53b [*] BO : Partial refund - part 3 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10611 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:42:27 +00:00
vAugagneur
66b1f844e4 [+] BO : login and lost password is now in ajax and convert in AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10608 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:32:11 +00:00
mMarinetti
acc401e3e8 // removed looong looong code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10604 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:18:11 +00:00
dMetzger
7648f8ece0 // Order processing bugs fixed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10603 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:02:51 +00:00
mMarinetti
e5d25eea83 // fix save and stay in product page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10602 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 20:52:52 +00:00
rGaillard
0b3c094698 // Fix PHP notice 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10600 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 20:47:50 +00:00
lLefevre
c4732a431a // fix bug "apply priority management" in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10596 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 20:01:33 +00:00
mDeflotte
f21b8defa1 // BugFix with id_address_delivery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10595 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 19:27:57 +00:00
dMetzger
c604df470d // Cart rules fixed in admin customers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10594 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 19:22:23 +00:00
dSevere
ddcede4ef5 // Product Suppliers : Debug and optimizations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10589 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 18:48:09 +00:00
mMarinetti
fdd72b47fa // admincontroller fix when json 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10586 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 18:36:59 +00:00
dMetzger
f670f7573f [+] BO : add new feature, Order edition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:45:52 +00:00
fBrignoli
ba7ec2dd9d [-] FO : Undefined method getOutOfStock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10571 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:18:09 +00:00
tDidierjean
d84b5b2749 // BO menu now uses the new icons 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10569 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:12:18 +00:00
rMalie
69feff1ee1 // Fix stock for multishop on search 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10568 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:07:46 +00:00
fBrignoli
9c01024080 [-] CO : option "fields" is not required 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10565 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:01:52 +00:00
rMalie
e4654570e9 // Some fix on multishop + stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10564 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:00:20 +00:00
tDidierjean
2d3db2e15d // Add actions to product list and fix product duplication 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10560 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 16:45:14 +00:00
rGaillard
1207b5bf40 // Small fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10558 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 16:31:53 +00:00
mDeflotte
7ac2f24ff3 // BugFix : use current($array instead of $array[0] 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10557 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 16:22:08 +00:00
dSevere
2d238bbac7 // Stock Management : Show stock interfaces only if the option is active in the configuration + debug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10554 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 16:07:57 +00:00
mMarinetti
67ba2e5df5 // phpdoc fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10550 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 15:37:50 +00:00
tDidierjean
5dbd54ff5f // Fix helper translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10548 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 15:28:05 +00:00
tDidierjean
3e39010a9b // fixes to AdminController:translate() performance 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10541 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 15:00:19 +00:00
fSerny
4c83dce8f4 [-] BO : AdminModule Addons Icon now appear in AutoComplete Search 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10527 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 13:49:15 +00:00
lLefevre
a6b66fb288 // Fix bug in AdminPaymentController && added toolbar 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10521 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 13:21:39 +00:00
dSevere
ad6e5b1cb8 // AdminController and stock management : some debug and updates 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10520 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 13:15:40 +00:00
rMalie
0f87f86203 // Fix some bug on multishop + improve display of shop pages 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 13:09:23 +00:00
vAugagneur
7c7eda3167 //clean header.tpl and footer.tpl 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10517 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 12:59:02 +00:00
bMancone
2dbeb55bf1 // AdminProductsController: added new array to translate tabs name. Added translations of fr/admin & SupplyOrderForm(PDF) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10516 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 11:41:25 +00:00
bMancone
9506172dd4 // AdminController: typo (?) in an error message 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10515 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 11:39:51 +00:00
fSerny
79867d0a75 [-] BO : AdminModules fix on Addons Connection 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10514 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 11:31:39 +00:00
rGaillard
ddcdcd571d // Warning is now displayed for shop without url 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10512 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 11:11:45 +00:00
rGaillard
ccaa0542a0 // Configuration feedback is now not displayed when changing shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10505 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 10:19:27 +00:00
rMalie
faa6dda362 // Multishop: redirect 301 to main URL with request uri when a non main URL is triggered 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10504 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 10:18:42 +00:00
rGaillard
335d5cf93d // Fix displaying name of shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10500 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 09:35:30 +00:00
dMetzger
63436b787b // CartRule fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10489 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 08:49:05 +00:00
dMetzger
b854caf867 // Avoid some crashes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10488 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 08:39:49 +00:00
rGaillard
a02f6983f0 // Add multishop association for blocktag module 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10482 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 23:02:24 +00:00
vAugagneur
9aa523fb4d //remove debug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10478 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 22:03:52 +00:00
rGaillard
e02cc320ee // CMS - Add shop filters 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10476 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 21:18:24 +00:00
rGaillard
ad9bf8d324 // Fix blockmanufacturers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10475 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 20:51:40 +00:00