dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,640 Commits 9 Branches 19 Tags
c0c3986e7f4a7dbf4fd471ba700e10e85fada708
Commit Graph

46 Commits

Author SHA1 Message Date
rGaillard
1bd51177f8 [-] Core: Fix PSCFV-2109 specific prices when updating product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15451 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 14:55:28 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
rMalie
48e9590cf4 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-09 09:19:30 +00:00
rGaillard
5b36649f62 [-] FO: Fix PSFV-533 combinations specificprices and blockspecial 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13807 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-01 17:27:21 +00:00
rGaillard
4a9e286ec9 // Fix bug which allow to create multi specific price with same parameters 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13627 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 15:32:57 +00:00
rMalie
2454cd7863 // Welcome 2012² 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 16:33:10 +00:00
rMalie
1cd38d2621 // Fix SpecificPrice::update() #PSFV-473 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13155 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 08:57:52 +00:00
aKorczak
c891bbc049 [*] WS : Add entity specific_prices 
[*] WS : Add entity specific_price_rules


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 16:46:57 +00:00
fGaillard
10ff23f804 [*] FO : Better gesture of product discounts. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12904 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-01 15:12:26 +00:00
rGaillard
735b3c07c0 // Small fixes on AdminProduct tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12711 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 12:50:41 +00:00
rMalie
a04b2af73b // Normalize some classes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12612 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-23 15:25:43 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-19 10:14:10 +00:00
mBertholino
3b5be15831 [-] BO : PSFV-365 - fixed bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12330 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 08:48:45 +00:00
fBrignoli
bdfa25bc86 // Norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11571 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 10:11:45 +00:00
fBrignoli
b907210950 [-] FO : Specific price + id_cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11568 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 09:54:50 +00:00
rGaillard
739e51ce9a // Add specific_price management for backoffice order && fix installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11520 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 17:16:46 +00:00
fBrignoli
1ff57cb314 // OrderDetails migration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11512 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 16:37:23 +00:00
aFolletete
083f1baf61 // fix issue on ajax querie on adding product 
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11451 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 09:23:31 +00:00
aFolletete
bb4576c4ab // when you adding a product on order, you can set a specific price 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11444 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 22:52:41 +00:00
mDeflotte
8fb44e6892 // BugFix - PSTEST-64 - Duplication de produit dans la liste et la fiche 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11396 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 09:43:56 +00:00
jBreux
4e810c850c [+] Project : Add specific prices to a specific customer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11364 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 15:31:18 +00:00
tDidierjean
dac7c7795c // Fix bug with specific prices creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11358 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 13:53:56 +00:00
rMalie
03bd438c7d // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11173 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 13:41:54 +00:00
rMalie
fddf4fb89b [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11155 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 18:10:38 +00:00
rMalie
d0c1239c17 // Remove $this->table and $this->identifier from objectModels + normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11076 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 14:05:24 +00:00
rGaillard
86b65ef6df [+] BO: Add Specific prices bulk generator 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11056 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 16:01:10 +00:00
rMalie
f55a9e04b9 [*] Classes: Db->execute() now return always a boolean. Use Db->query() instead. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 15:41:34 +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
lLefevre
c4732a431a // fix bug "apply priority management" in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10596 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 20:01:33 +00:00
rGaillard
a1fb08f026 // Improve Specific prices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10118 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-14 17:40:42 +00:00
rGaillard
77a66c64fd [*] Core : Specific prices can now be applied to combinations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9897 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-04 15:53:53 +00:00
rMalie
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
rMalie
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
aFolletete
78f6a4e20a [*] Classes : improve performances of "Feature detachable" feature 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8754 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-24 15:03:21 +00:00
aFolletete
738590890e // clean conflict lines in SpecificPrice file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8653 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-20 08:38:43 +00:00
aFolletete
c3cc90a191 // Many improvements for Feature Detachable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8648 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-19 15:55:52 +00:00
rMalie
42d996ec94 // Merge -> revision 8624 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8626 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-16 15:02:29 +00:00
aFolletete
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
tDidierjean
c2258ae8e9 //// Merge -> revision 8290 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-01 09:53:43 +00:00
rMalie
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
rMalie
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
rMalie
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
rMalie
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
rGaillard
8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00
rGaillard
69f2f09dc5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:10:43 +00:00
aFolletete
10445ad61d // 1.5 branche creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-12 18:24:40 +00:00