dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,105 Commits 9 Branches 19 Tags
7b10cf02a2e7912ee58ab643c0eb79d9d5ec00b2
Commit Graph

239 Commits

Author SHA1 Message Date
tDidierjean
f006cfa526 // Fix missing id_address in demo supplier 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11119 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 11:06:22 +00:00
tDidierjean
b2c36c562b // Copy fix from trunk: #PSCFI-4397 - Missing unique index on PREFIX_category_product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11106 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 09:41:44 +00:00
mMarinetti
a551a424b6 // new modules hooked for default theme, fixed hook names 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11087 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 15:52:37 +00:00
dSevere
f34e06c20f // Bug on Prefix fix in db_settings.sql 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11068 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 17:17:50 +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
vChabot
af70df72ce // Adding the OrderCarrier class to handle carriers in an order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11051 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 15:12:23 +00:00
rMalie
1c2347ddab // Remove AdminStatsConf controller (conf is already in AdminStatsTab) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11035 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 09:25:10 +00:00
fGaillard
4aa4094808 [-] Installer : #PSCFI-4383 : BugFix SQL installation script corrected, unique key for specific_price_priority 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11028 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-07 17:09:38 +00:00
dSevere
1f42bf8d4e // Bugs fix (Collection, SQL optimizations, Backoffice interfaces improvement, ...) + update db_settings_extends.sql for base datas relative to available quantities and suppliers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11014 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 18:07:06 +00:00
mMarinetti
f6bad7e3b6 // fix in db_settings_extends 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11012 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 17:56:39 +00:00
mMarinetti
eae123dbeb [+] MO : homeslider is now replacing editorial in default installation 
[-] MO : homeslider bugfix multishop + add samples
[-] MO : blocksupplier updated hookname

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11011 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 17:53:23 +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
mMarinetti
33589430f7 // bugfix db.sql 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10993 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 14:49:32 +00:00
vChabot
5a438d1849 // little fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10992 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 14:47:00 +00:00
vChabot
a0f69ae398 // adding configuration when upgrade to the three new groups 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10991 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 14:43:39 +00:00
bMancone
65f1c44ae6 // Address: added id_warehouse. Supplier: it is now possible to edit the address of a given supplier. Manufacturers: addresses are now correctly displayed. AdminSuppliers: addresses are now editable / when deleting a supplier (if possible <=> no current orders) address is now flaged deleted. AdminWarehouses: when deleting a warehouse, its address is now flagged as deleted. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10988 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 14:28:40 +00:00
vChabot
c0ee7a1306 // removing group_module_restriction table to set every restrictions in an only table : module_group 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10936 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 16:17:42 +00:00
tDidierjean
b25401ce9e // Fix missing values in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10916 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 14:10:09 +00:00
mMarinetti
863ea0d354 // module newsletter hook fix + added create table in db_settings_extends.sql 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10896 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 09:37:36 +00:00
mMarinetti
c37cf6d657 // fix newsletter block 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10885 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 17:21:24 +00:00
mMarinetti
22031f6a57 // fix hookDisplayHeader in blockcontact (module and default install) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10881 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 16:55:44 +00:00
mDeflotte
fc7a452107 // BugFix : Problem in an install file SQL "PREFIX_" need to be used 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10866 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 15:46:37 +00:00
mMarinetti
9cc30dc3fe [+] Project : default theme added 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 15:24:40 +00:00
fBrignoli
5f103766fc // prefix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10835 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 15:10:10 +00:00
mDeflotte
394206e9ef // id_warehouse is now on the order details and not on orders table 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10831 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 14:31:26 +00:00
fBrignoli
2ae9a4281b // ps_ => PREFIX_ 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10829 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 14:08:49 +00:00
dSevere
577aa781bc // Stock Available : Add shared management for group of shops 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10812 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-30 16:28:06 +00:00
lLefevre
f787bbd3e6 // added 1.5.0.2 version in install script + fix deleted Adminlogin accesses 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10762 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-29 17:47:14 +00:00
bMancone
5beb66f50a // Supply Order : it is now possible to automatically load products, for a given supplier, which physical quantity is equal or less to a given threshold 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10730 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-29 10:07:51 +00:00
dSevere
37d215522a // Product Suppliers : Add wholesale price management for each supplier 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10719 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 17:16:39 +00:00
bMancone
e62214adaa // CRUD for StockMvtLabels & SupplyOrderStatus are now in AdminStockConfigurationController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10713 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 15:44:06 +00:00
vAugagneur
f9bde30d5c //added missing upgrade SQL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10691 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 08:18:14 +00:00
rGaillard
3a5a061717 // Change URLs calling for prestashop.com 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10686 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 18:45:07 +00:00
fBrignoli
49b2efe3a5 // John Doe is now "reglo" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10627 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:43:34 +00:00
fSerny
f5aadafc92 [-] BO : Partial refund - part 4 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10626 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:42:17 +00:00
fBrignoli
0ebcc6cb67 // John DOE's order is back! 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10620 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:17:25 +00:00
vAugagneur
66b1f844e4 [+] BO : login and lost password is now in ajax and convert in AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10608 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:32:11 +00:00
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
dMetzger
f670f7573f [+] BO : add new feature, Order edition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:45:52 +00:00
dMetzger
dce036f929 // 2 bug fixes for the cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10523 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 13:24:15 +00:00
bMancone
2dbeb55bf1 // AdminProductsController: added new array to translate tabs name. Added translations of fr/admin & SupplyOrderForm(PDF) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10516 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 11:41:25 +00:00
vAugagneur
2a0dcf9692 //remove debug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10486 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 08:35:38 +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
dSevere
a9b5f70767 // Product Warehouse location : Manage multiple warehouses and location associated for a product / product attribute 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10375 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 18:43:04 +00:00
rMalie
ecb6e763ff // Fix installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10353 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 14:27:29 +00:00
tDidierjean
8a395c2b6e // Changed AdminPDF to lowercase 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10349 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 13:57:27 +00:00
tDidierjean
b654b56035 // Change CMS controllers to lowercase and restore translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10347 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 13:36:45 +00:00
rMalie
a27ac5f6ed // Fix installer after merge 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10345 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 13:22:23 +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
dSevere
a24764b9b3 // Suppliers : Manage multiple suppliers for a product / product attribute + integration with supply orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10279 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 16:29:50 +00:00