Commit Graph

84 Commits

Author SHA1 Message Date
rMalie
0f87f86203 // Fix some bug on multishop + improve display of shop pages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:09:23 +00:00
vAugagneur
7c7eda3167 //clean header.tpl and footer.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10517 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 12:59:02 +00:00
vAugagneur
aed1e77b94 //clean header.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:28:31 +00:00
vAugagneur
0242329b30 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10468 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 19:33:19 +00:00
vChabot
4334537fe1 // feature position works fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10443 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 15:49:59 +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
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
lLefevre
c47131aa9f // fix bug display message error or success in AdminAccessController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10326 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:11:38 +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
vAugagneur
a48be7ddf3 //fixed css treeview
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10159 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-16 09:45:07 +00:00
mMarinetti
ca652516d9 // treeview.css fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10142 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-15 16:40:43 +00:00
lLefevre
9885ab5324 // fix Update the call of JavaScript and CSS files in the class of HelperForm and controller templates (PSFV-94)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10101 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 14:21:26 +00:00
vAugagneur
834bf6596d git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10097 b9a71923-0436-4b27-9f14-aed3839534dd 2011-11-14 12:48:13 +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
vChabot
4068f50cd2 // cleaning code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10011 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 16:52:26 +00:00
vAugagneur
9e7c542d8a [+] BO : fixed bug on category tree view
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9996 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 15:15:55 +00:00
bMancone
eeefaf3a4f // Added hint box on fieldsDisplay
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9983 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 11:16:36 +00:00
lLefevre
eb6620fabe [*] BO #PSFV-94 : Added AdminAccessController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9896 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-04 15:52:31 +00:00
vAugagneur
c9f065173b [+] BO : Back-office search use now AdminController.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9858 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 17:14:13 +00:00
lLefevre
fb59853cb1 [*] BO #PSFV-94 : Added AdminStatusesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9853 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 16:26:12 +00:00
mMarinetti
e3d03f7e7d // fixed adminproduct > combinations
[*] BO : now if you click on an AdminProduct sub tab (combinations, prices) already selected, this will reload it.


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9823 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 10:51:18 +00:00
vChabot
7c94f13ef7 // attributes positions and groups attributes positions are now working fine with new tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9813 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 09:20:31 +00:00
tDidierjean
20b1786c1a [*] BO : #PSFV-94 - forms now correctly use admin.js::displayFlags function. attributeLang attribute is deprecated in forms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9787 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 10:40:57 +00:00
mMarinetti
4f4609e980 // bugfix url rewrite javascript, fix redirectAdmin token when toggle status
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9715 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 13:37:24 +00:00
mMarinetti
2a74e65fd5 // #PSFV-94 - update AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9645 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 16:48:15 +00:00
vAugagneur
c971fd21cc //fixed bug autocomplete category tree
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9624 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 12:04:16 +00:00
mMarinetti
f5c09af54e // attributeBack.js some replacement getE() by $()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9568 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 07:35:23 +00:00
mDeflotte
2bc17241ca // Add PS_ADVANCED_STOCK_MANAGEMENT configuration in admin product preference
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9561 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-21 15:13:35 +00:00
mMarinetti
d1719fc0e2 [+] BO : Notification autorefresh can be deactivated
// ajaxPreProcess is now called at the end of init() process in admincontroller
// fixed getTranslationsFlags

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 15:18:00 +00:00
dSevere
d588a80b4a // CSS: padding modification for correct display of stock tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9380 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:34:36 +00:00
lLefevre
cf8cb50631 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminOrderMessageController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:01:44 +00:00
jmCollin
c4391df038 // fix bug with virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9325 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:44:33 +00:00
tDidierjean
740419c6ed // fix states selection in form and address format in AdminAddress
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9309 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 09:41:11 +00:00
tDidierjean
53f19438d3 // Added states to HelperForm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9285 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-12 15:27:06 +00:00
vChabot
8e659eb701 [*] BO : carriers are now sortable by position
// Carriers class is now normalized
// Attribute class is now normalized

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9254 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 16:29:34 +00:00
vAugagneur
1cdc37f80d //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9114 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:45:53 +00:00
vAugagneur
4d7bf6f76a //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9102 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:54:33 +00:00
vAugagneur
ef8f39babe //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9101 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:41:24 +00:00
vAugagneur
646eda2e4e //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 12:06:18 +00:00
vAugagneur
e228825648 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9093 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 12:05:37 +00:00
vAugagneur
fda5b287c9 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9076 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:55:57 +00:00
vAugagneur
5423757ab8 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9070 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:35:03 +00:00
rMalie
b4d436ca21 // Merge -> revision 9061
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:21:55 +00:00
vAugagneur
2ea5c7d0ba //fixed small bug on search category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:34:38 +00:00
vAugagneur
99593ce1b5 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9033 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 16:25:08 +00:00
vAugagneur
9391324c8d //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9029 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:54:49 +00:00
vAugagneur
1bb02e3abf [+] Classes : Helper::renderAdminCategorieTree() have new params "$use_search" to add a input search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9026 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:42:56 +00:00
vAugagneur
af180672b1 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8977 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:11:55 +00:00
rMalie
ef17d0b7da // Merge -> revision 8952
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:14:01 +00:00
lBrieu
2a8a547fe3 [-] Fix problem with js files due to the retro compatibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8935 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 15:06:59 +00:00