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
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
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
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
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
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
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
8671928caf
// added toolbar in cart_rules form.tpl
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10811 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 16:08:30 +00:00
5c61feb04b
// Changes to controller and AdminCustomers refactoring
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10764 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 18:35:17 +00:00
e4654570e9
// Some fix on multishop + stock
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10564 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:00:20 +00:00
1207b5bf40
// Small fixes
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10558 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:31:53 +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
4cc9dc04bf
// fix bug method addGroupsIfNoExist() in class Category
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10185 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-16 17:48:48 +00:00
04e40cbb73
// bugfix class Category + simplification AdminCategoriesController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10106 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 15:04:06 +00:00
581cdc12e9
// added prestashopexception when id_category is wrong when update/save
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9822 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 10:39:46 +00:00
0ba4fe9c7e
[*] PROJECT : New Module API (part 1)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 10:49:01 +00:00
1cebf04794
[*] BO #PSFV-94 : Added AdminCategoriesController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9671 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-27 10:22:31 +00:00
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
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
577221ff08
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 12:18:56 +00:00
14542fea44
// Merge -> revision 9124
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:54:43 +00:00
f9bcf3f84f
[-] Installer : Fix country_to_timezone in last step
...
[+] BO : now AdminProducts and AdminCategories are separated from AdminCatalog
[+] FO : new method Category::getAllChildren() (the return value is an array, but can evolve to a collection
// Uses of Media:: in header.inc.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9097 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:02:24 +00:00
b4d436ca21
// Merge -> revision 9061
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:21:55 +00:00
089a31f32c
//fix correction norm and language in AdminGroups
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8838 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 09:47:33 +00:00
474ef2b3d0
//fixed sql bug
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8819 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 16:06:25 +00:00
1b6d0d1be3
// Merge -> revision 8800
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:30:06 +00:00
4f2a090e24
// Merge -> revision 8720
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 15:45:10 +00:00
87df41c9d6
// Merge -> revision 8552
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8554 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 08:29:10 +00:00
5cae5358fa
[*] BO : Add reduction groups in the categories, and bug fix: reduction that is not an integer or a percentage (TD001 - TD002 - TD003)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8536 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 13:17:32 +00:00
3eff951265
[+] Project : adding Features detachables in order to improve performance
...
// clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-03 17:21:32 +00:00
382584ad35
// Fix all category_lang sql restrictions with multishop
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:21:45 +00:00
f371f3e3bc
[*] Project : US + CA TaxSystem
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8105 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-18 10:10:50 +00:00
7481712923
// Fix display of breadcrumb (dont show categories disabled) + it's now impossible to browse categories outside of root category for shops
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8089 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 12:32:04 +00:00
b8706ddd8a
// Fix homefeatured products for multishop
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8086 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 09:41:28 +00:00
49468717c2
// Fix #PSFV-48
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8032 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 14:42:31 +00:00
3ab2ba9a75
// HTML flag can be used in ObjectModel->getTranslationsFieldsChild() to keep html on language fields
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8026 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 13:39:30 +00:00
03596be790
[+] Add the TinyMCE editor on categories description
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8024 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 12:35:47 +00:00
d1d4d57eca
// Revert normalization
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 10:20:59 +00:00
f62cdb1963
// Normalization
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 09:58:20 +00:00
7411db9a69
// Merge -> revision 7979
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-10 08:36:17 +00:00
653ef8d115
// Context part 29
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7935 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-08 13:17:12 +00:00
f2b5ee338b
// Merge -> revision 7875
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 16:16:49 +00:00
3e298ba94f
// Fix categories (duplicate cause of multishop)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7861 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 08:07:20 +00:00
a875fecb20
// MERGE with 1.4 r7770
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
be4811aa6e
// REVERT MERGE
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 13:35:06 +00:00
e159c925d8
// MERGE with trunk revision 7754
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 12:48:42 +00:00
4ade3a0ea0
// remove 1.4 deprecated functions
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7755 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 09:51:43 +00:00
d05d16d399
// Context part 21
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7742 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-26 16:40:17 +00:00
e62be3d793
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-22 08:57:51 +00:00
4ae81d8acd
// Context part 15
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7658 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 16:17:14 +00:00
rMalie