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

37 Commits

Author SHA1 Message Date
rMalie
14c94558a6 // Some fix on objectModel children classes (fields not valid, etc.) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9985 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-09 12:16:37 +00:00
dMetzger
17a8dbc05b // Retro compatibility and updater improved for Discount/CartRules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9798 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 14:23:44 +00:00
dMetzger
cb2307abaf // A few table name replaced 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9772 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-01 19:06:26 +00:00
dMetzger
486622522c [+] Project : Vouchers are now replaced by cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-01 18:50:42 +00:00
dSevere
e6dfc34e68 // stocks : debug and optimisations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9644 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-25 16:31:26 +00:00
aFolletete
ed36aa6971 [*] BO : #PSFV-94 - new controller for AdminOrders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9546 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-21 13:53:54 +00:00
mDeflotte
78ddaa120c // Stock decrementation when order is shipped 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9486 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-20 09:08:59 +00:00
vSchoener
cef6e4f65a [-] CORE: Refactoring of the ValidateOrder method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9479 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 16:33:07 +00:00
lLefevre
74788d0959 // revert commit 9463 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9465 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 14:47:37 +00:00
lLefevre
5f4ee34f0f //FIxed Added Controller AdminCarrierController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9464 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 14:36:25 +00:00
rMalie
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
fBrignoli
2d0bd337b5 [-] FO : Notice undefined tax_rate 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9301 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-13 08:24:10 +00:00
rMalie
798de9aaea // Merge -> revision 9288 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-12 16:04:28 +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
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
lBrieu
4b8ae2693c [*] FO : Hide the download link and download icon if the virtual product do not have files associated with it 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9063 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 14:28:47 +00:00
lBrieu
9eda5d4cdc [*] FO : get the product attribute id for download link 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9059 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 13:57:02 +00:00
lBrieu
79115b2572 [*] FO : Update filename if product has combinations (and files associated to them) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8987 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 15:39:06 +00:00
lBrieu
1193a572c1 [*] FO : Update filename if product has combinations (and files associated to them) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8968 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 13:05:08 +00:00
rMalie
3620f0837f // Merge -> 8910 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 08:17:25 +00:00
fBrignoli
facb2318e5 [*] BO : Taxes are now historized 
[*] BO : Taxes are no longer stored in the order details row



git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8556 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 09:06:20 +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
22d23f8324 // Merge -> revision 8149 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8151 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-22 16:22:16 +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
tDidierjean
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
rMalie
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
35e5efb530 // Context part 13 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7650 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 09:44:10 +00:00
tDidierjean
9f7c369d53 // Context part 3 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7603 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-12 16:25:27 +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
fBrignoli
4a210f98d9 [+] Dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7069 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-06-15 16:32:06 +00:00
fBrignoli
43b6a41bbc // merge 1.4 (5397) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-22 16:00:58 +00:00
aFolletete
5ef57ae0ac [*] Core : clean all deprecated methods 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5882 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-12 18:50:26 +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