Commit Graph

73 Commits

Author SHA1 Message Date
gRoussac
df56d7af42 [-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678 2013-09-04 10:38:14 +02:00
Jérôme Nadaud
c90ba4c406 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:33:51 +02:00
Jérôme Nadaud
066b791cf7 [-] FO : FixBug of total products from supliers and manufacturer 2013-07-18 18:33:35 +02:00
Rémi Gaillard
354622857f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-18 18:31:35 +02:00
Rémi Gaillard
958d92c9fa [*] BO: Add an option to allow iframes on descriptions 2013-07-18 18:31:31 +02:00
Jérôme Nadaud
caf321e691 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer lsit even if products was set as hidden 2013-07-18 18:16:57 +02:00
Jérôme Nadaud
d879fb15a9 [-] FO : FixBug #PSCFV-8018 All products was counted in manufacturer list even hidden products 2013-07-18 18:10:29 +02:00
vAugagneur
7aef793e65 [-] BO : remove deprecated parameter when call Tools::link_rewrite() 2013-05-20 16:33:12 +02:00
raulgundin
e7393dc5d0 [-] CORE: Fix #PSCFV-9185 Wrong product price display on list by manufacturer
Added default_on condition on getProducts() query in Manufacturer class.
2013-05-18 14:38:07 +03:00
Rémi Gaillard
5f181c8e4c [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images 2013-03-20 20:12:28 +01:00
Daniel
09f5879851 Update classes/Manufacturer.php
Fixed issue with not being able to remove manufacturers if they where missing an address. (Possible after an upgrade)
2013-02-06 11:35:15 +08:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
689a10d9bd [-] FO : fixed default order by manufacturer #PSCFV-6105 2012-12-14 10:30:13 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
rGaillard
b9289df687 [-] Core: Fix products duplication when using multiple taxe rule on the same country 2012-11-16 16:08:21 +00:00
rGaillard
de754db5aa [-] FO: Fix #PSCFV-5158 2012-10-22 17:10:58 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
c54e977255 // Some files was missing in last commit............................................ 2012-09-14 14:28:04 +00:00
dMetzger
e1e434ebe1 // Removed useless bit of code (retrieval of the manufacturer address in the constructor, 1 query each time, no use) 2012-08-14 14:26:40 +00:00
dMetzger
f1270e3ab0 [-] BO : cart rules are now cleaned when a component of a product rule (like a product, a category, a supplier...) is deleted 2012-07-24 13:11:56 +00:00
vAugagneur
9e8546946b [-] BO : fixed bug #PSCFV-3261 2012-07-23 14:18:01 +00:00
rMalie
2765d931e9 // Webservice getters are now multishop 2012-06-01 07:45:41 +00:00
rMalie
c557ea05c6 // Remove useless multishop code in manufacturers #PSCFV-2394 2012-05-18 15:35:56 +00:00
rMalie
bf40f77c2f // Remove useless multishop code in manufacturers #PSCFV-2394 2012-05-18 15:30:52 +00:00
vChabot
c082d71b4e [-] BO : BugFix : #PSCFV-2308 : Missing WHERE clause in Manufacturer::getManufacturers() 2012-05-14 07:46:46 +00:00
vChabot
d808652e0a [-] BO : BugFix : #PSCFV-2292 : Column 'price' in order clause is ambiguous by filtering manufacturer product 2012-05-10 16:05:07 +00:00
dMetzger
fcb6462a23 [-] Core : fixed typo in a SQL query #PSCFV-2189 2012-05-03 14:18:01 +00:00
rMalie
eed6286aec // Fix multishop bug on product_attribute list 2012-04-24 13:48:23 +00:00
rMalie
60b281c4e3 // Fix join between product_attribute and product_attribute_shop on getproducts methods 2012-04-17 16:10:51 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
lLefevre
fd6530ab29 [-] BO : fix #PSCFI-5408 2012-04-13 08:02:06 +00:00
dMetzger
16cfca9bff [+] BO : added a new option for the products : do they appear in the catalog, in the search, both or neither 2012-02-27 15:55:40 +00:00
mDeflotte
b487546ec1 // Fix bug with id_tax_roules_group associated to it old table. 2012-02-27 15:38:35 +00:00
rMalie
ab2515b67c // Replace shop->addSqlAssociation() by static call 2012-02-27 13:07:51 +00:00
rMalie
0a3fa7ba14 // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 2012-02-27 12:15:30 +00:00
rGaillard
5793e30caa [+] Core : products and carriers tax rules are associated to shop 2012-02-24 09:26:18 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
vChabot
10168e397b // order_by improved 2012-01-31 15:33:10 +00:00
rMalie
eee9b353c1 [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 2012-01-19 10:14:10 +00:00
rMalie
58d7f37130 [*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead 2011-12-15 13:24:03 +00:00
rMalie
0ab348a81c // Format definitions 2011-12-14 17:21:18 +00:00
rMalie
c022f4e0e5 // Format definitions 2011-12-13 13:41:54 +00:00
rMalie
1c39ab4685 [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead 2011-12-12 18:10:38 +00:00
rMalie
0af197daf3 // Remove $this->table and $this->identifier from objectModels + normalize 2011-12-09 14:05:24 +00:00
rMalie
b59ddba454 // Remove $table and $identifier property from all classes, and add static $definition instead 2011-12-05 13:56:03 +00:00
dSevere
98492b6a36 // Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix 2011-12-02 17:31:16 +00:00
dSevere
52c755f736 // Improve StockAvailable requests + code refactoring 2011-12-02 11:36:04 +00:00
dSevere
4d8fcb347c // Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class 2011-12-01 19:09:27 +00:00
rGaillard
6f4fbbc133 // Fix blockmanufacturers 2011-11-22 20:51:40 +00:00