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

77 Commits

Author SHA1 Message Date
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
mMarinetti
5ef065bbca [+] BO : #PSFV-94 - AdminProduct form features 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10239 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 18:52:54 +00:00
lBrieu
1f1ca31cda // Bug fix when deleting a file associated to a virtual product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10208 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 13:24:19 +00:00
lBrieu
24a617d922 // Bug fix with fillCombination javascript function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10203 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 11:29:02 +00:00
lBrieu
634934e6cf // bug fix when trying to add files to combinations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10201 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 09:54:49 +00:00
mMarinetti
38f3940d18 // now custom_form smarty var can be empty in subtab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10197 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 09:08:23 +00:00
bMancone
bb55277763 // StockManager: updated getProductRealQuantities(). StockAvailable: fixed. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10186 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 17:55:39 +00:00
vSchoener
adae213cec // Update Accounting for the return display html 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10145 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 17:11:53 +00:00
vSchoener
04ee777109 // Update Accounting for export 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10132 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 14:45:24 +00:00
rGaillard
a1fb08f026 // Improve Specific prices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10118 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-14 17:40:42 +00:00
mMarinetti
27d8e7fa6c // assigned missing var in combination 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10045 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-10 15:49:35 +00:00
mMarinetti
30159bb893 // fixed duplicate content in AdminProduct controller > combination 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10042 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-10 15:06:22 +00:00
mMarinetti
9963c84fd9 // norms on AdminProductController 
// bugfix addfeaturestodb custom values
// uses of smartyV3 features (createTemplate, createData) in AdminProducts + admin products forms now extends base form.tpl
[+] BO : now tiny_mce can be loaded 'onclick' instead of 'onload'
// improvement in adminproduct pages

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10040 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-10 14:57:54 +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
tDidierjean
81e5f72142 [*] BO : #PSFV-94 - added AdminAttributeGeneratorController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9949 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-08 10:09:57 +00:00
rGaillard
77a66c64fd [*] Core : Specific prices can now be applied to combinations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9897 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-04 15:53:53 +00:00
mMarinetti
f44bdde391 // improvements on AdminProducts and leadin 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9883 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-04 11:38:22 +00:00