Commit Graph

1027 Commits

Author SHA1 Message Date
tDidierjean 80ecb65475 // Commit new tabs in product edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11079 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:22:46 +00:00
rGaillard 43ff904c57 // Fix little bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:18:13 +00:00
rMalie 5b36a76462 // Revert search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11077 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:10:37 +00:00
rMalie d0c1239c17 // Remove $this->table and $this->identifier from objectModels + normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11076 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:05:24 +00:00
lLefevre dc9fb17b01 // Fix bugs in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11075 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 13:37:08 +00:00
mDeflotte 71b6047692 // Stock decrementation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11074 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 13:09:32 +00:00
rMalie a9670d0f85 // Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11073 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 10:32:49 +00:00
fBrignoli 67643cfc29 [-] FO : Unable to checkout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11072 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 10:24:56 +00:00
rMalie b56d98b66a // Remove unused $tables property from ObjectModel + improve Cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11071 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 10:24:48 +00:00
rMalie c5b7e15eb8 // Fix DbQuery for PHP < 5.2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11060 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:32:59 +00:00
rGaillard 86b65ef6df [+] BO: Add Specific prices bulk generator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11056 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 16:01:10 +00:00
dSevere 12ea52f4f7 // Multiple bugs fix on stock interfaces during tests
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11053 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:22:31 +00:00
vChabot 56c6105c56 // norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11052 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:14:40 +00:00
vChabot af70df72ce // Adding the OrderCarrier class to handle carriers in an order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11051 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 15:12:23 +00:00
rMalie edc0b2c6ca // Improve ObjectModel + normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11049 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 14:13:22 +00:00
rMalie 4924764888 // Improve ObjectModel + normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 13:53:54 +00:00
mDeflotte 0d917153da // Little BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11033 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 09:00:29 +00:00
lLefevre 7873905bb5 // fix norm && added PDO::FETCH_ASSOC in method fetch() for PDO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11029 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 17:30:32 +00:00
rMalie f6cf5ff6ed // Fix Blowfish for autoload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11022 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 10:10:46 +00:00
fGaillard c8fc8d1733 [-] Classes : #PSCFI-3880 : BugFix mbstring overload on Rijndael encrypt-decrypt
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11019 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 09:21:05 +00:00
rMalie 3d1176686f // Fix collection in cartRule
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11018 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 09:11:43 +00:00
tDidierjean d171de204f // BO performance improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11016 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:39:37 +00:00
dSevere 1f42bf8d4e // Bugs fix (Collection, SQL optimizations, Backoffice interfaces improvement, ...) + update db_settings_extends.sql for base datas relative to available quantities and suppliers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11014 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:07:06 +00:00
mDeflotte 85b186a956 // BugFix : Problem with delivery_option calculation
// @TODO : All the undefined index are now fixed but there is not all the available delivery option

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11007 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:35:38 +00:00
rMalie a9fafc5147 // Can add / delete element from Collection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11001 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:59:23 +00:00
rMalie f55a9e04b9 [*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:41:34 +00:00
bMancone bda11e1541 // Supply Orders : added supplier address in the order form (PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10998 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:27:38 +00:00
rMalie 0bf721b108 // Fix return of AssociateTo method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10995 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:59:00 +00:00
bMancone 65f1c44ae6 // Address: added id_warehouse. Supplier: it is now possible to edit the address of a given supplier. Manufacturers: addresses are now correctly displayed. AdminSuppliers: addresses are now editable / when deleting a supplier (if possible <=> no current orders) address is now flaged deleted. AdminWarehouses: when deleting a warehouse, its address is now flagged as deleted.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:28:40 +00:00
vSchoener de36bcb13b // Add getShopProtocol to have the current protocol use by the current shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10984 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:22:03 +00:00
rMalie 1172e7a8d0 // Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10982 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:08:48 +00:00
rMalie 9e7e47847b // Little fix on CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10979 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 13:24:42 +00:00
mDeflotte b6f25900ee // Removing numerics from order reference
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10978 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 13:18:00 +00:00
rMalie 45f0e2227a // Fix fileuploader with autoload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10977 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 13:12:21 +00:00
bMancone ec6dc108a9 // StockManager: fixed. AdminSupplyOrders: fixed price. AdminStockInstantState: added CSV export per warehouse + valuation field is now displayed per warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10976 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 12:51:10 +00:00
lLefevre efe13abfd0 // fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10975 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 12:41:56 +00:00
fBrignoli 187aafaf51 [*] PDF : Licenses + Hook in templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10974 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 10:58:20 +00:00
rMalie 6d792ee52b // Collections can be used as arrays
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10971 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 10:12:02 +00:00
bMancone a12255dd1c // Moved csv class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10969 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 10:00:47 +00:00
rMalie 11ba092bca // Move helper classes in subdirectory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10968 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 09:40:27 +00:00
bMancone 623303f7ee // Fixed CSV export without pagination. Fixed StockManager, with new Collection object. Fixed StockMvt : id_supply_order was missing.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10967 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 09:37:23 +00:00
rMalie 3cf72856ff // Fix a little bug on PDO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10964 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 09:04:40 +00:00
fBrignoli a6779e2057 [*] PDF : Display Hook
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10963 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 08:55:01 +00:00
aFolletete 0d65bf62b2 [-] Classes : fixed notice error on Cart class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10962 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 08:54:07 +00:00
mDeflotte caf0402115 // BugFix: Context->language is not re-setted in switchLanguage method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10956 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:40:54 +00:00
rMalie 01f0ec6a99 // Db::autoExecute() return a boolean
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10955 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:29:45 +00:00
lLefevre a73e408196 [-] BO & FO & MO : #PSCFI-4237 : adding id_lang in method l() of class Mail()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10954 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:22:47 +00:00
fSerny 1a74889015 [*] PROJECT - Dynamic hooks in ObjectModel retrieve object in param - Dynamic hooks have been added to AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10951 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:20:40 +00:00
dSevere a5c44ac8bc // Update and fix some bugs on stock display on orders in backoffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10949 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:17:01 +00:00
mDeflotte 31e90d9031 // Retrocompatibility : Now old 1.4 template works with new chechout process. Multishipping cannot be enabled.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10948 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:11:26 +00:00