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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
mDeflotte