Commit Graph

5386 Commits

Author SHA1 Message Date
vSchoener 941ecdac62 [-] MO : Mondialrelay, merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10901 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:54:40 +00:00
vSchoener a2230b0161 [-] MO : Carriercompare (shipping estimation), merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10900 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:54:01 +00:00
vSchoener 19656ae993 [-] MO : Mondialrelay, merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10898 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:46:33 +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
mMarinetti 863ea0d354 // module newsletter hook fix + added create table in db_settings_extends.sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10896 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 09:37:36 +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
tDidierjean cdb5de9dd3 // Remove prices from information tab and fix price calculation with tax in AdminProducts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10888 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:37:13 +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
mMarinetti c37cf6d657 // fix newsletter block
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10885 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:21:24 +00:00
mMarinetti 22f2208690 // updated default pictures
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10884 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:09:32 +00:00
mMarinetti d0c46a3d3e // added missing blue arrow in homefeatured module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10883 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:03:19 +00:00
mMarinetti 22031f6a57 // fix hookDisplayHeader in blockcontact (module and default install)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10881 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:55:44 +00:00
mMarinetti ca16a8b559 // homefeatured fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10880 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:46:45 +00:00
mMarinetti 1cafb7629b // fix homefeatured
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10879 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:42:26 +00:00
mMarinetti 203b5ae6ad // fix new theme / old php in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10878 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:41:22 +00:00
lLefevre 4e47e1e227 // fix bug in AdminCustomersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:29:25 +00:00
vKham 45132ef7b8 // add class button bt-export, new stylesheets for page stats, forget password login
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10876 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:27:40 +00:00
vKham 57eaa5cddf // add class button bt-export, new stylesheets for page stats, forget password login
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10875 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:27:26 +00:00
vKham ec0bae7a2e // add images sprites for page stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10874 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:26:15 +00:00
mMarinetti 63abc464ac // fix new theme css
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10873 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:22:53 +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 43648c6ca2 // little fix authentication in multiple steps
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10871 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:17:14 +00:00
tDidierjean 579d012427 // AdminProducts refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10870 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:16:36 +00:00
mMarinetti 810dab5d27 // new theme fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10869 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:10:22 +00:00
mDeflotte fc7a452107 // BugFix : Problem in an install file SQL "PREFIX_" need to be used
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10866 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:46:37 +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
fBrignoli 457d9b3e97 // Translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10864 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:31:56 +00:00
mMarinetti 9cc30dc3fe [+] Project : default theme added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:24:40 +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
fSerny 465542aac7 [-] MO : eKomi (1.3) - fix on warnings (PS 1.5)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 11:23: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
vKham 8e2102c8ce // add title h2 all tab page product, stylesheets stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10841 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 17:39:44 +00:00
rMalie 16e07c2766 [*] Project: Improve debuging with new constant _PS_DEBUG_PROFILING_ in defines.inc.php which include debug files from override folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10840 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 17:22:01 +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
mDeflotte 9e72ba7740 // Allow / Disallow multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10837 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 16:34:20 +00:00
mDeflotte 567c23dafc // BugFix on blocklayered and sliders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10836 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 15:49:13 +00:00
fBrignoli 5f103766fc // prefix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10835 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 15:10:10 +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