Commit Graph

863 Commits

Author SHA1 Message Date
dSevere 2e34e7cadd //Stock : Update Warehouse management - use of new adminController - add the possibility to associate shops and carriers to a warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9389 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 12:51:22 +00:00
dSevere 232c21bd0a //Interface optimisations for form display and menu display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9388 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 12:48:54 +00:00
lLefevre 154c7a9ed9 // Fixed bug tab AdminEmployee
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9387 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 12:10:18 +00:00
rMalie 336fb68ef4 // Merge -> revision 9385
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:55:33 +00:00
rMalie a7bc16dadd // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:46:08 +00:00
dSevere c9c781771a // CSS: padding modification for correct display of stock tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:45:18 +00:00
dSevere 6c9158a305 // Code review and refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9382 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:35:51 +00:00
rMalie 5ef98d7b47 // Fix debug in smarty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9381 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:35:38 +00:00
dSevere d588a80b4a // CSS: padding modification for correct display of stock tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9380 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:34:36 +00:00
lLefevre e1c52879af // fixed bug property currentIndex
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9378 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 08:32:31 +00:00
tDidierjean cbe497ef8c // fix static call to currentIndex
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9377 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 08:20:53 +00:00
tDidierjean 60cea8ce9f // AdminImages now uses HelperForm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9370 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 16:01:13 +00:00
tDidierjean 92565efe43 // Add HelperOptions to generate preferences forms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9369 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 14:30:07 +00:00
dSevere 5bd7821915 // HelperList: add possibility to create custom action for each row
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9368 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 14:19:45 +00:00
mDeflotte d4dfab892f // Normalization + Fix bug with uncorrect attribute call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9367 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 14:01:36 +00:00
tDidierjean c6375f3877 // remove unused function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9365 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 13:45:51 +00:00
lLefevre 50cb82f508 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminGenderController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9364 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 12:59:26 +00:00
rMalie de6dc071fb // Fix ID language from context in preactivation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9363 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 12:59:03 +00:00
fBrignoli da97c9237c [*] CO : Remove last separators
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9360 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 09:23:48 +00:00
vSchoener 6235389101 [*] CORE : AddressFormat, Add the possibility to doesn't specify a patternRules (avoid type) and fix empty content
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9357 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 09:08:15 +00:00
lLefevre b58fb34c97 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminQuickAccessesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9355 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 08:57:52 +00:00
rMalie 45645f1f50 // Merge -> revision 9352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 08:20:54 +00:00
mDeflotte cb175ba261 // Add stock defaut quantities and a default warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9353 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 07:55:45 +00:00
mDeflotte 2ea57df6cb // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9339 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:37:07 +00:00
dSevere 9fbe849930 // stock: add main tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9338 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:32:18 +00:00
dSevere 3863401d0b // stock: add main tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9336 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:30:40 +00:00
dSevere ef6805a8a1 // stock: update stockMvt
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9335 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:25:40 +00:00
dSevere f1c26377a5 // stock: add warehouse tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9334 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:19:10 +00:00
dSevere bc565999d1 // stock: add warehouse tab and update stock mvt tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9332 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:18:09 +00:00
dSevere e16af90d6a // stock: add admin tabs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9331 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:14:40 +00:00
bMancone ae43d7f86b // Stock : updated Stock & StockMvt & StockMvtReason
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9329 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:06:09 +00:00
lLefevre cf8cb50631 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminOrderMessageController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:01:44 +00:00
mDeflotte 205e54c31c // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:58:29 +00:00
jmCollin c4391df038 // fix bug with virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9325 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:44:33 +00:00
bMancone cc24b5abc0 // Stock : removed references to the actual stock management in AdminOrders/Product in order to merge with the new stock management system
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9322 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:32:06 +00:00
mDeflotte da6641ca10 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9321 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:27:41 +00:00
mDeflotte 7d7d3bfdd4 // Replace tab by a space between keyword "function" and the function name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9320 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:26:39 +00:00
fBrignoli 90a56ae920 // todo are done
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9318 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:15:21 +00:00
rMalie 552e264c95 [+] Classes: add PDO support if extension is activated
[*] Classes: add engine check (innodb)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9317 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:00:08 +00:00
bMancone 9984312409 // Warehouse : added productLocation management methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9315 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 14:40:58 +00:00
bMancone 74151b61b2 // Fixed synchronize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9314 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 14:32:02 +00:00
jmCollin 2e67942ba5 // Fix download file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9310 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 11:40:03 +00:00
tDidierjean 740419c6ed // fix states selection in form and address format in AdminAddress
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9309 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 09:41:11 +00:00
lLefevre 502369ee4f [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminGroupShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9308 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 09:07:36 +00:00
lLefevre 278dc40a5e [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminShopUrlController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9307 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 09:06:32 +00:00
fBrignoli 039271f118 [-] FO : TaxRulesTaxManager cache not refreshed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9302 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 08:40:57 +00:00
fBrignoli 2d0bd337b5 [-] FO : Notice undefined tax_rate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9301 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 08:24:10 +00:00
rMalie 543c42430c [*] Smarty: move tools/smarty/compile/ and tools/smarty/cache/ folders to cache/smarty/compile/ and cache/smarty/cache/ folders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9300 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 08:14:03 +00:00
bMancone e0d943f822 // StockAvailable : updated description
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9299 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 08:04:23 +00:00
tDidierjean e372544485 // AdminAddresses now uses HelperForm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9293 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-12 17:01:17 +00:00