mDeflotte
eab460df2d
// BugFix id_carrier in cart not defined + choosing address delivery for multishiping on opc
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10389 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:28:22 +00:00
tDidierjean
e0415ec7e2
// Remove deprecated calls to Tools::addJS/CSS in modules
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10388 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:24:56 +00:00
bMancone
5b4d337cd6
// Warehouse: shops are now correctly associated
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10387 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:23:32 +00:00
fSerny
1723512579
// Change Addons login Position
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:19:41 +00:00
rGaillard
ed19c60ff8
// Fixed redirect link after logout
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10385 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:17:32 +00:00
fBrignoli
e176ea6dd3
// broken due to merge
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:11:30 +00:00
lLefevre
7025caef50
// small fixes to BO and norm
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:03:03 +00:00
rMalie
a4b5aa4251
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10382 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 08:48:49 +00:00
fSerny
620653ce13
[*] BO : AdminModules improved performance
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10381 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 23:42:33 +00:00
fSerny
ef9d7c62b6
// Fix on Module Class
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10380 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 23:21:49 +00:00
fSerny
c333d84530
[*] BO : Admin Modules now works in Ajax :)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10379 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 21:44:52 +00:00
mMarinetti
2ee1dd5813
// AdminProducts informations fix, saveAndStay fix,
...
[+] BO : if json, ajax-layout.tpl can generate json with conf, _errors, warnings, informations and page var
// HelpAccess improvement
// now Product does not require quantity anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10377 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 19:26:30 +00:00
dSevere
e05452c7c4
// Product Warehouse location : Manage multiple warehouses and location associated for a product / product attribute
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10376 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 19:10:27 +00:00
dSevere
a9b5f70767
// Product Warehouse location : Manage multiple warehouses and location associated for a product / product attribute
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10375 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 18:43:04 +00:00
bMancone
de6d9c7bbe
// Supply Orders: the supply order form is now generated (PDF)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10374 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 18:31:44 +00:00
tDidierjean
5dc1c8a71c
// small fixes to BO
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10372 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:49:47 +00:00
vKham
ff30d33e8f
// add new images config checklist dashboard
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10370 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:32:43 +00:00
vKham
2a83293a54
// new bloc homepage configuration checklist, link
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10368 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:24:02 +00:00
lLefevre
20b05a63ee
// delete link of list in AdminTrackingController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10367 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:21:31 +00:00
lLefevre
e902d3e1dd
// added tpl in AdminTrackingController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10366 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:11:51 +00:00
fSerny
2190551536
[*] BO : New module interface tab now connected to PrestaShop Addons
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10365 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:11:01 +00:00
lLefevre
9e74ede928
// fix bug in AdminTrackingController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10364 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 17:09:51 +00:00
tDidierjean
b10fb843b5
// remove smarty translate addslashes for BO
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10363 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 16:53:58 +00:00
vSchoener
b45021c243
// update security injections
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10362 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 16:07:40 +00:00
tDidierjean
7ec7dd4bbe
// Add BO translations
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10360 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:46:40 +00:00
mMarinetti
8a82865591
// fix tracking
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10359 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:46:07 +00:00
rMalie
7a81fbab9c
// Fix supplier_order_state metadata in installer
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10358 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:44:23 +00:00
tDidierjean
e941c6df4a
// Fix escaping in AdminTranslations
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10357 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:39:31 +00:00
fBrignoli
b0247fe0cb
// translations iso code was hard coded
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10356 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 15:36:46 +00:00
tDidierjean
18c81442d1
// Fix AdminCmsControllers
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10355 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:30:26 +00:00
mMarinetti
5c8b5334a8
// removed blank line in layout-ajax.tpl
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:28:27 +00:00
rMalie
ecb6e763ff
// Fix installer
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10353 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:27:29 +00:00
mMarinetti
703e77cae2
// removed blank line
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10352 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:26:51 +00:00
lLefevre
9a175627e6
// fix bug : delete submit button and change css for box info in AdminGeolocationController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10351 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:18:35 +00:00
lLefevre
975bce4de9
// button submit added in toolbar for AdminImportController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10350 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 14:00:24 +00:00
tDidierjean
8a395c2b6e
// Changed AdminPDF to lowercase
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10349 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 13:57:27 +00:00
tDidierjean
b654b56035
// Change CMS controllers to lowercase and restore translations
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10347 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 13:36:45 +00:00
lLefevre
b0fbfbfd88
// fix added leadin link and norm in AdminCategoriesController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10346 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 13:34:08 +00:00
rMalie
a27ac5f6ed
// Fix installer after merge
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10345 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 13:22:23 +00:00
rMalie
c1e4594a22
// Fix Tools class
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10344 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 13:20:51 +00:00
tDidierjean
49a03078ab
// AdminFeatures list position
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10342 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 13:09:00 +00:00
fGaillard
983508dd8b
// BugFix Invoice / Delivery PDF encoding
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10340 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 12:37:59 +00:00
bMancone
d6470b462b
// StockAvailable: synchronizes stock when updating an order (if necessary)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10338 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:52:04 +00:00
lLefevre
595c1384f4
// Fix delete multiple toolbar in AdminPerformanceController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10337 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:42:42 +00:00
rGaillard
52d4292f76
// File missing in last commit
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10335 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:07:37 +00:00
rGaillard
9b6824a825
// Replacement of AdminTab by AdminController on modules
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10334 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:06:35 +00:00
rMalie
9d10de0848
// Merge -> 10309
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
mDeflotte
2537c72189
// BugFix assign var carrier_list on dmin product
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10332 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:04:16 +00:00
bMancone
276f493dd7
// StockAvailable: updated synchronize() and updated its usage within the different stock controllers when necessary
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10331 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:01:33 +00:00
mDeflotte
0ce1e22813
// BugFix with opc and multishipping
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10330 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:42:14 +00:00