Commit Graph

1780 Commits

Author SHA1 Message Date
dSevere e095ebccd3 // Stock Available : bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10408 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:57:09 +00:00
bMancone 7b394c6cbd // Product names are now correctly displayed in AdminStockManagement & AdminStockCover
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10398 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:40:56 +00:00
dSevere d0c1167d6c // Stock Available : bug fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 12:39:30 +00:00
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
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
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
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
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
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
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
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
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
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
tDidierjean 5b908a0844 // fix tpl folder detection in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:11:49 +00:00
tDidierjean eb5cea2726 // Fix translations in BO for tpl folders with underscore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10324 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:53:21 +00:00
tDidierjean c16ca27155 // Fix price and required display for options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10320 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:34:37 +00:00
fBrignoli 401722bb0b // missing values for shipping, wrapping, discounts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10315 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:07:57 +00:00
mDeflotte 8add301ef3 // Bug with sql query to duplicate product from the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10308 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 08:12:48 +00:00
mMarinetti 08a389a760 // fix product edition textarea rte
// minor fix warning if admin translation file doesnt exists

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10304 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 23:06:45 +00:00
mMarinetti 70c92e1d38 // fix translations / retrocompat in AdminController and config/smartyadmin.config.inc.php (AdminTranslationsController will follow)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10301 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 19:10:13 +00:00
rGaillard 53d85ae134 // Shop association improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10298 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 17:13:36 +00:00
rGaillard 14cb2b1ef0 // Miss on last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10293 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 16:10:20 +00:00
dMetzger a98752eb22 // Vouchers are shrinkable again (must be tested more thoroughly)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10292 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 15:53:31 +00:00
rGaillard e4096bf943 // Constructor of OrderDetail correctly call parent constructor
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10291 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-20 15:51:33 +00:00
rGaillard a25cc16f28 // Module configuration is now displayed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10289 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-19 15:03:20 +00:00
rGaillard 96b9355d9d // Add method method getGlobalValue on Configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10282 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:46:56 +00:00
mMarinetti d6ef55b5ed // fix adminProducts > images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10281 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:42:51 +00:00
dSevere a24764b9b3 // Suppliers : Manage multiple suppliers for a product / product attribute + integration with supply orders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10279 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:29:50 +00:00
lLefevre 1bf46b362c // fix delete var no_back and multiple call method initToolbarTitle
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10277 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 16:05:46 +00:00
lLefevre 716acbaffa // fix delete assign token in AdminController.php, use function smarty {getAdminToken tab=''}
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10273 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 15:00:58 +00:00
lLefevre ae4a223509 // fix added toolbar in HelperOptions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10271 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 14:22:53 +00:00
mDeflotte eda71ac8fb // BugFix with carrier module and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10267 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 14:14:06 +00:00
tDidierjean 174be2bfce // fix module tab dispatch
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10266 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 14:10:23 +00:00
mDeflotte 107bd4f779 [-] allow_seperated_package need to be an int and not a boolean on class cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10262 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 12:49:25 +00:00
mDeflotte 5e6ab08a00 // Merging multishipping branche on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:13:31 +00:00
tDidierjean 8a1bd2eb2d // Remove <img> from confirmation messages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10258 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:00:37 +00:00
tDidierjean 90a53b4cf1 // Change customer group for unidentified customers when getting carriers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10254 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 10:50:42 +00:00
tDidierjean dd01f32fad // Remove BO themes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10249 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 10:27:07 +00:00
tDidierjean 40339f1add [-] Classes : fix dispatcher for FO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10246 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 10:10:07 +00:00
fBrignoli 7fc0c2330b // additional comment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10243 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 09:32:49 +00:00
mMarinetti b8812a4161 // sql query improvement for $feature->nbFeatures()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10240 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 18:54:17 +00:00
tDidierjean 740ac7c843 // AdminTab compatibility: Dispatcher for BO now search tabs in database, not on the disk. AdminTabs now uses the new BO theme.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10236 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 18:15:07 +00:00
vChabot 1a76c8975f [*] BO : You have now 3 new default groups. Unidentified group, guest group, and customer group.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10232 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 17:22:15 +00:00
fBrignoli e5f3c3ca2a [*] PDF : PDF is now rendered by TCPDF throught HTML template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10231 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 17:15:23 +00:00
lLefevre 4621551acf // fix added form.tpl in AdminWebserviceController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10224 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 16:05:06 +00:00