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

93 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
tDidierjean
f9c4410e8d // Rename AdminController methods initForm() initList() etc. to renderForm() renderList() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10799 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-30 11:06:38 +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
tDidierjean
e474dc01b5 // AdminControllers cleanup 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10716 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 16:32:33 +00:00
vKham
9b5f3b8c03 //consistency title page product, description, new form search header, new icon images package fatcow toolbar action 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10709 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 14:45:31 +00:00
lLefevre
4eaf942429 // fix bug added and remove attachement in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10610 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:37:18 +00:00
mMarinetti
e5d25eea83 // fix save and stay in product page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10602 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 20:52:52 +00:00
vSchoener
2490a1def3 // Update Accounting and fix undefined var 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10592 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 19:13:44 +00:00
mMarinetti
c8faf79c15 // fix adminproducts images 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10590 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 18:50:10 +00:00
dSevere
ddcede4ef5 // Product Suppliers : Debug and optimizations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10589 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 18:48:09 +00:00
tDidierjean
9ebe542fdb // fix product live preview and duplication 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10585 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 18:33:11 +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
lLefevre
5660c09d62 // delete btn preview if the shop have not virtual_uri in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10577 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:37:16 +00:00
lLefevre
b365c2befa // delete btn preview if the shop have not virtual_uri in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10570 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:14:19 +00:00
lLefevre
cc50d29cc3 // added link for preview in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10566 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:05:29 +00:00
lLefevre
38d17b447e // Fix bug in AdminProductsController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10562 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 16:49:15 +00:00
tDidierjean
2d3db2e15d // Add actions to product list and fix product duplication 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10560 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 16:45:14 +00:00
dSevere
2d238bbac7 // Stock Management : Show stock interfaces only if the option is active in the configuration + debug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10554 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 16:07:57 +00:00
mMarinetti
668f3676eb // fix redirect 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10531 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 14:01:28 +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
dSevere
844b0f4055 // Product Admin Controller : update toolbar + bugs fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10467 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 19:17:41 +00:00
tDidierjean
c5c479dcb7 // Added toolbar to AdminModulesPositions and added full products list on AdminProducts 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10453 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 16:49:52 +00:00
dSevere
1934e2ef6a // Product Admin Controller : update interfaces for quantities, suppliers and warehouses + bugs fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10451 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 16:41:42 +00:00
rMontagne
f00820e090 //fix UpdateShopAssocImage 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10449 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 16:29:10 +00:00
mMarinetti
3f649efee7 // restored previous changes since r10392. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10419 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 14:06:55 +00:00
dSevere
e095ebccd3 // Stock Available : bug fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10408 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 12:57:09 +00:00
dSevere
d0c1167d6c // Stock Available : bug fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10395 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 12:39:30 +00:00
rMontagne
9159631b27 Refactoring image system 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10393 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 09:46:02 +00:00
rMontagne
b7437fdb3c Refactoring image system 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10391 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 09:34:25 +00:00
mMarinetti
2ee1dd5813 // AdminProducts informations fix, saveAndStay fix, 
[+] BO : if json, ajax-layout.tpl can generate json with conf, _errors, warnings, informations and page var
// HelpAccess improvement
// now Product does not require quantity anymore

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10377 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 19:26:30 +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
rGaillard
9b6824a825 // Replacement of AdminTab by AdminController on modules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10334 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:06:35 +00:00
mDeflotte
2537c72189 // BugFix assign var carrier_list on dmin product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10332 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:04:16 +00:00
bMancone
276f493dd7 // StockAvailable: updated synchronize() and updated its usage within the different stock controllers when necessary 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10331 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:01:33 +00:00
mMarinetti
08a389a760 // fix product edition textarea rte 
// minor fix warning if admin translation file doesnt exists

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10304 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 23:06:45 +00:00
tDidierjean
9e8d16ad6a // fix position in list for products, product images. still need to fix display after change position product images 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10302 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-20 19:47:07 +00:00
mMarinetti
d6ef55b5ed // fix adminProducts > images 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10281 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 16:42:51 +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
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 11:13:31 +00:00