Commit Graph

37 Commits

Author SHA1 Message Date
vChabot
d9b6c6401a // adding the php upgrade to move every orders into order_carrier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10582 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:10:01 +00:00
vChabot
4b15da6656 // attributes position works fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10433 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:53:50 +00:00
rMalie
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
vChabot
1a76c8975f [*] BO : You have now 3 new default groups. Unidentified group, guest group, and customer group.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10232 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 17:22:15 +00:00
vSchoener
5016b3ca0d - Accounting: Add new tab for product to define the number liable to an existing zone, update upgrader and installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9986 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 14:16:28 +00:00
rMalie
42564ca3d0 // Merge -> revision 9435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +00:00
vChabot
c4e28b117d [*] BO : Carriers are now sortable by position or price
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9276 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-12 14:31:36 +00:00
rMalie
de69396a04 // Merge -> revision 9221
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 12:45:12 +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
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
vChabot
38a23cf978 // refactoring function (delete useless functions)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9123 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:24:44 +00:00
vChabot
5e4eece1de // little correction
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9119 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 07:47:07 +00:00
vChabot
27fc74ffa5 // adding default restrictions on install
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 07:46:49 +00:00
jmCollin
3e9e437ac1 [+] FO : add files for combination
[*] FO : Create virtual products with no associated file

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8901 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:40:44 +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
vChabot
83fc0977c9 [*] BO : Features are now sortable.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8751 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 15:45:40 +00:00
vChabot
d0102a81b7 [*] BO : groups attributes are now sortable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8683 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 10:04:54 +00:00
vChabot
1b836a3920 // add add_attribute_position.php file to update attribute position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8678 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 09:03:53 +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
fBrignoli
13849fc2c8 // update tax rules PHP => SQL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8116 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 12:03:04 +00:00
fBrignoli
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
rMalie
a86e95fc5a // Fix shop_url when no physical_uri + fix shop association when multistore is disactivated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7958 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-09 13:20:26 +00:00
rMalie
b1ea0538a3 // Fix install of shop uri
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7896 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-05 07:51:20 +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
rMalie
e921117581 // Add config/alias.php file + refactoring of DB / MySQL classes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7668 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-20 16:10:12 +00:00
rMalie
fa2fc8b69d // No more mysql_error() hard coded !
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7651 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-19 11:35:33 +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
vAugagneur
35ff645731 //merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 12:34:09 +00:00
tDidierjean
be17931df6 // merge 6036 6069 6071 6093
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 11:32:07 +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
mMarinetti
118f04c0a6 // merge from 1.4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5926 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-15 13:57:25 +00:00
fBrignoli
ca5e60f0b9 // merge 1.4 (5916) => 1.5.x
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5918 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-15 10:30:56 +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