lLefevre
|
a61b6a31bc
|
// fixed bug in AdminProductsController for display errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11045 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-08 12:53:32 +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 |
|
vChabot
|
c6fb7aa4f7
|
// little fix about advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11034 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-08 09:22:02 +00:00 |
|
dSevere
|
c23c2d983b
|
// Bugs fix on CSV export on supply order interface
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11030 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-07 18:07:38 +00:00 |
|
rMalie
|
814bb7dcc4
|
// Add again engines in stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11024 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-07 13:52:31 +00:00 |
|
lLefevre
|
a972dae0ae
|
// adding customization template in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11015 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 18:24:08 +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 |
|
lLefevre
|
bfcb15b998
|
// adding attachement template in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11013 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 18:01:14 +00:00 |
|
mDeflotte
|
85b186a956
|
// BugFix : Problem with delivery_option calculation
// @TODO : All the undefined index are now fixed but there is not all the available delivery option
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11007 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 17:35:38 +00:00 |
|
lLefevre
|
2b74e1f59a
|
// fix bug in AdminFeaturesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11004 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 16:37:59 +00:00 |
|
fSerny
|
ef44083253
|
[-] BO : Upload zip module is repaired
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11002 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 16:00:17 +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 |
|
lLefevre
|
53ffa9dace
|
// fixed bug delete img && update back url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10997 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 15:21:22 +00:00 |
|
bMancone
|
1886d7ddfc
|
// Fixed bug when updating address
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10996 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 15:20:50 +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 |
|
vSchoener
|
b07dde4585
|
// Fields aren't set in getPartnersBlock !
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10983 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 14:21:07 +00:00 |
|
rMalie
|
1172e7a8d0
|
// Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10982 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 14:08:48 +00:00 |
|
dSevere
|
5b9e12bba1
|
// Update Stats interface relative to stock available functionnality + retrocompatibility for supplier reference and wholesale_price for a product/product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10980 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 14:02:50 +00:00 |
|
bMancone
|
ec6dc108a9
|
// StockManager: fixed. AdminSupplyOrders: fixed price. AdminStockInstantState: added CSV export per warehouse + valuation field is now displayed per warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10976 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 12:51:10 +00:00 |
|
lLefevre
|
efe13abfd0
|
// fix small bugs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10975 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 12:41:56 +00:00 |
|
aFolletete
|
a96fb0d2e2
|
[-] BO : fixed calculation error on Product addition
[-] BO : fixed notice error on message addition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10973 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 10:50:00 +00:00 |
|
bMancone
|
623303f7ee
|
// Fixed CSV export without pagination. Fixed StockManager, with new Collection object. Fixed StockMvt : id_supply_order was missing.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10967 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 09:37:23 +00:00 |
|
bMancone
|
5788f1f811
|
// AdminStockMvtController: updated button name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10961 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-06 08:53:48 +00:00 |
|
lLefevre
|
a73e408196
|
[-] BO & FO & MO : #PSCFI-4237 : adding id_lang in method l() of class Mail()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10954 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:22:47 +00:00 |
|
dSevere
|
a5c44ac8bc
|
// Update and fix some bugs on stock display on orders in backoffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10949 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 17:17:01 +00:00 |
|
bMancone
|
b94606e103
|
// StockMvt : added the name of the warehouse for the CSV export
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10942 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:50:47 +00:00 |
|
rMalie
|
394aeab269
|
// Fix missing Core suffix for some classes / controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10941 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:49:05 +00:00 |
|
bMancone
|
7576b8f407
|
// SupplyOrders: fixed products loaded under a particular threshold. StockMvt: CSV export
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10940 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 16:46:49 +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 |
|
bMancone
|
07bac9c56b
|
// AdminSupplyOrders: fixed permissions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10926 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:11:24 +00:00 |
|
dSevere
|
a75ca6c40a
|
// Update and fix some bugs on front and admin itnerfaces relative to available quantities functionnality
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10925 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:11:21 +00:00 |
|
bMancone
|
558c008ece
|
// Fixed buttons as asked.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10924 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 15:08:58 +00:00 |
|
bMancone
|
01b6c28569
|
// SupplyOrders: CSV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10920 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:50:48 +00:00 |
|
lLefevre
|
5b7da70eb9
|
// adding edit action for combination in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10918 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 14:24:59 +00:00 |
|
rMalie
|
2644f4b88d
|
// Add Collection in Category::getAllChildren()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10913 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 13:56:24 +00:00 |
|
aFolletete
|
2e8abff9a9
|
// add restriction on addition and edition of an order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10904 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 11:27:26 +00:00 |
|
lLefevre
|
9e6940eb4e
|
// adding button in toolbar for AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10903 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-05 11:15:21 +00:00 |
|
lLefevre
|
efc5ff8390
|
// update tab "attributes" in smarty template + update action in list in ajax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10891 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-04 10:42:05 +00:00 |
|
tDidierjean
|
cdb5de9dd3
|
// Remove prices from information tab and fix price calculation with tax in AdminProducts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10888 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 17:37:13 +00:00 |
|
dSevere
|
468ca00519
|
// Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10886 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 17:31:16 +00:00 |
|
lLefevre
|
4e47e1e227
|
// fix bug in AdminCustomersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10877 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 16:29:25 +00:00 |
|
dSevere
|
10f1a846b7
|
// Some bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10872 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 16:22:45 +00:00 |
|
tDidierjean
|
579d012427
|
// AdminProducts refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10870 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 16:16:36 +00:00 |
|
vChabot
|
ed98703212
|
[*] BO : you can now affect a zone to multiple countries and to multiple states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10865 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 15:41:05 +00:00 |
|
dSevere
|
43654ffba1
|
// StockManager : bugs fix + improvement of StockManager utilisation in fucntion of global configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10861 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 15:23:01 +00:00 |
|
vSchoener
|
8bef192fcb
|
// Update Accounting export working now with new order table relation
// Add retro-compatibility to PaymentCC for module (inherit of OrderPayment and uses parent methods)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10859 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 14:35:35 +00:00 |
|
lLefevre
|
8a62346471
|
// Adding a button to top
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10857 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 14:31:08 +00:00 |
|
lLefevre
|
1123ad3aa1
|
// fix refactoring templates in AdminCustomerThreadsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10852 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 11:19:03 +00:00 |
|
mDeflotte
|
5f3d417441
|
// Fix some problems with getPackageShippingCost
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10850 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 10:48:26 +00:00 |
|
dSevere
|
8b618652bb
|
// Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10843 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-01 19:09:27 +00:00 |
|