Commit Graph

980 Commits

Author SHA1 Message Date
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
rMalie 07420a2c0d // Fix comment typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10946 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:03:07 +00:00
rMalie 8d0f1e156d // Test PDO as first choice in Db class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10945 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:01:48 +00:00
sThiebaut 30de26176b // fixed bug on category count
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10944 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:52:27 +00:00
rMalie 394aeab269 // Fix missing Core suffix for some classes / controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10941 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:49:05 +00:00
bMancone 7576b8f407 // SupplyOrders: fixed products loaded under a particular threshold. StockMvt: CSV export
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10940 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:46:49 +00:00
vChabot c0ee7a1306 // removing group_module_restriction table to set every restrictions in an only table : module_group
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10936 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:17:42 +00:00
fBrignoli fc865e4986 // merge trunk r10863
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10935 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:09:08 +00:00
fSerny ce91cd792c [-] PROJECT : You can now execute hook in the tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10932 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:49:56 +00:00
rMalie ca79a68011 // Fix table / identifier for Module class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10929 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:35:21 +00:00
rGaillard dac14bf3be // Fix bug on processSave
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10928 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:33:43 +00:00
mDeflotte db38a475f1 // BugFix in Product compare
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10927 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:30:01 +00:00
dSevere a75ca6c40a // Update and fix some bugs on front and admin itnerfaces relative to available quantities functionnality
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10925 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:11:21 +00:00
bMancone 772e739829 // Updated comment for object definition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10923 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:06:59 +00:00
rMalie 6cefe4465d // Remove $langMultiShop from all classes, and add 'multishop' in $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10922 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:04:09 +00:00
bMancone 01b6c28569 // SupplyOrders: CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10920 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:50:48 +00:00
rMalie d56cb00d8d // Remove Module->templateAssign() from modules (use $this->smarty->assign() instead)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10914 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:04:35 +00:00
rMalie 86683a963e // Remove $table and $identifier property from all classes, and add static $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10912 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:56:03 +00:00
fSerny a50b0af067 [-] PROJECT : isHookableOn function is now retrocompatible with old hook
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10905 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 12:56:43 +00:00
aFolletete f7250f76d5 // fix bug on Order class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10897 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:40:06 +00:00
rMalie 1cce2fd6cb // Fix collections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10893 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 09:05:45 +00:00
lLefevre efc5ff8390 // update tab "attributes" in smarty template + update action in list in ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10891 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-04 10:42:05 +00:00
aFolletete 911c8ad6c4 // Comment useless line in order to clean this
// Add table and identifier to CartRule class

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10889 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-03 09:56:38 +00:00
dSevere c105c81b52 // Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10887 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:32:51 +00:00
dSevere 468ca00519 // Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10886 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:31:16 +00:00
dSevere 10f1a846b7 // Some bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10872 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:22:45 +00:00
vChabot ed98703212 [*] BO : you can now affect a zone to multiple countries and to multiple states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10865 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:41:05 +00:00
dSevere 43654ffba1 // StockManager : bugs fix + improvement of StockManager utilisation in fucntion of global configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10861 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:23:01 +00:00
rMalie d76998340a // Use Collection instead of HydrateCollection in several places
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10860 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:20:47 +00:00
vSchoener 8bef192fcb // Update Accounting export working now with new order table relation
// Add retro-compatibility to PaymentCC for module (inherit of OrderPayment and uses parent methods)



git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10859 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 14:35:35 +00:00
rMalie 975a56d3bd // Fix autoload for classes with several implements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10858 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 14:34:48 +00:00
lLefevre 8a62346471 // Adding a button to top
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10857 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 14:31:08 +00:00
mDeflotte a0a83e9e58 // Code cleanning + Fixing some bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10856 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 12:17:19 +00:00
dSevere 16cf709d52 // Improve StockAvailable requests + code refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10855 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 11:36:04 +00:00
lLefevre 1123ad3aa1 // fix refactoring templates in AdminCustomerThreadsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10852 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 11:19:03 +00:00
mDeflotte 5f3d417441 // Fix some problems with getPackageShippingCost
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10850 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 10:48:26 +00:00
dSevere 8b618652bb // Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10843 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 19:09:27 +00:00
mDeflotte bf9a629c94 // BugFix in "Cart::isAllProductsInStock()"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10839 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 17:16:56 +00:00
mDeflotte 77664f1056 // Fix some bad php doc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10838 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 16:43:07 +00:00
rMalie 10247e8e42 [+] Classes: Add Collection class (synthesis of DbQuery + ObjectModel::hydrateCollection) and add support of static $definition property in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10834 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:47:28 +00:00
rMalie 4e567f3d31 // Report fix of PSCFI-4282 from 1.4 to 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10833 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:45:33 +00:00
mDeflotte 394206e9ef // id_warehouse is now on the order details and not on orders table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10831 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:31:26 +00:00
fBrignoli b2f33740fe // OrderInvoice PDF compliant
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10830 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 14:24:17 +00:00
mDeflotte 1e8ed9d47e // Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10827 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 12:58:35 +00:00
tDidierjean 562adfc172 // AdminCurrencies refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10824 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 09:44:58 +00:00
bMancone 29c75d7798 // Added CSV class. Allows to export supply order details as CSV, for instance
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10820 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:49:51 +00:00
aFolletete 8bbd830446 // fix little bug on AdminOrdersController
[~] Deprecated: Cart::getOrderShippingCost()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10818 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 17:25:27 +00:00
lLefevre c1aee41233 // fix bug link "details" in AdminFeaturesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10815 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:52:23 +00:00