 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 |
|
|
mDeflotte
|
5532f12d80
|
// Multishipping : on opc, on putting multi-shipping to off, the cart is set to one address delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10458 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 17:18:30 +00:00 |
|
|
lLefevre
|
a848e82ae9
|
// fix bug AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10456 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 17:14:11 +00:00 |
|
|
lLefevre
|
cbea65eb66
|
// fix bug in AdminController method initView()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10455 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 17:00:09 +00:00 |
|
|
lLefevre
|
41d593618d
|
// fix bug in HelperView
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10454 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 16:59:03 +00:00 |
|
|
lLefevre
|
62696d85f9
|
// fix added toolbar in AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10444 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 15:54:14 +00:00 |
|
|
mDeflotte
|
642d9b4648
|
// Revert 10430
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10439 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 15:25:47 +00:00 |
|
|
mDeflotte
|
e4361ad56b
|
// BugFix Error on clicking carrier option in cart/opc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10437 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 15:07:08 +00:00 |
|
|
vChabot
|
71cbc22bc0
|
// fix bug from 1.4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10435 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:59:30 +00:00 |
|
|
fSerny
|
c68c8be6e8
|
[-] BO : AdminModules - Fix on GetModulesOnDisk and general ergonomy
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10434 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:53:58 +00:00 |
|
|
vChabot
|
4b15da6656
|
// attributes position works fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10433 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:53:50 +00:00 |
|
|
mDeflotte
|
0d5421a40c
|
// Dont need to set the id_carrier in class Cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10430 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:41:41 +00:00 |
|
|
bMancone
|
bbdf6513a8
|
// Update Supply Order Form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10428 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:37:36 +00:00 |
|
|
mMarinetti
|
2ee0842282
|
// check if PS_MODE_DEV is defined before checking its value
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10426 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:32:58 +00:00 |
|
|
fBrignoli
|
312d93a601
|
// deprecated function replaced
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10424 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:29:12 +00:00 |
|
|
vAugagneur
|
663009b3bb
|
//fixed small bug on live edit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10422 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:11:34 +00:00 |
|
|
mDeflotte
|
da416dea61
|
// Autoset id_carrier on the cart constructor + Replace a hookExec()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10420 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 14:09:52 +00:00 |
|
|
mDeflotte
|
8c0e148b75
|
// Re-put Cart->id_carrier + BugFix with shipping cost calculation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10417 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 13:50:53 +00:00 |
|
|
mMarinetti
|
99e90d5492
|
// fix required fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10415 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 13:29:07 +00:00 |
|
|
vChabot
|
9fef06a9bb
|
// correcting merge problem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10409 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-22 13:07:47 +00:00 |
|