 mDeflotte
|
7343f80834
|
// Some translations + Split multi-shipping activation in two differente option (one for allowing multi-delivering and one for allowing to deliver the available products first)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11270 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 15:26:13 +00:00 |
|
|
rMalie
|
b7abb129c8
|
// littlefix on ProductDownload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11269 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 15:18:08 +00:00 |
|
|
vChabot
|
f98bb890cf
|
// little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11268 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 15:07:10 +00:00 |
|
|
jBreux
|
1207ab6607
|
// Fix bad colspan and add form label
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11267 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 15:05:53 +00:00 |
|
|
lLefevre
|
88eb0e2a95
|
// fix bug display image in product.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11266 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 14:34:20 +00:00 |
|
|
lLefevre
|
fd1ad0f57a
|
// FO : enable languages if > 1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11265 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 14:30:05 +00:00 |
|
|
jBreux
|
97a23174af
|
// Fix bad indent
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11264 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 14:28:21 +00:00 |
|
|
lLefevre
|
b13c0c4bae
|
// Bo translation && FO btn add to cart in product.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11263 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 14:22:25 +00:00 |
|
|
dSevere
|
268a14f425
|
// bug fix on cart button disply in frotn office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11261 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 14:08:20 +00:00 |
|
|
rMalie
|
259eeb6c27
|
// Fix lang bug on collections + use definitions on hydrateCollection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11260 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 13:56:15 +00:00 |
|
|
mDeflotte
|
86aa61d3c0
|
// BugFix : Blocklayered little fix with product order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11258 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 13:41:53 +00:00 |
|
|
rMalie
|
13a70e1044
|
[*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11256 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 13:24:03 +00:00 |
|
|
jBreux
|
af2feac665
|
// Add a note on invoice (icon)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11254 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 11:38:51 +00:00 |
|
|
jBreux
|
cb984199fc
|
[+] BO : Add a note on invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11253 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 11:38:01 +00:00 |
|
|
fSerny
|
29a90b29d1
|
[-] BO : Now display a question mark when there is no module logo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11252 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 11:29:59 +00:00 |
|
|
fSerny
|
c3602f3278
|
[-] PROJECT : Replacing some Context::getContext() by $context in class Hook
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11251 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 11:20:32 +00:00 |
|
|
mMarinetti
|
f5aefc80ad
|
// fixed hook::exec when no controller exists, bis
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11250 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 11:09:34 +00:00 |
|
|
mMarinetti
|
5aea0ddca0
|
// fixed hook::exec when no controller exists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11249 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 11:08:17 +00:00 |
|
|
mDeflotte
|
5d941ccc26
|
// BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11247 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 10:50:42 +00:00 |
|
|
fSerny
|
664ab24dd7
|
[-] Project - Fix on hook retrocompatibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11246 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 10:49:10 +00:00 |
|
|
dMetzger
|
6c7337d2cb
|
// Fixed rounding bug on cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11245 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 10:41:00 +00:00 |
|
|
sThiebaut
|
51e342d140
|
// maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11244 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 09:50:56 +00:00 |
|
|
fBrignoli
|
7c2f4774d1
|
[*] PDF : You can now enable diskcache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11241 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 09:05:16 +00:00 |
|
|
fBrignoli
|
c4715dd6a0
|
[*] PDF : TCPDF Tweak
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11240 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-15 09:02:28 +00:00 |
|
|
bMancone
|
89213574d0
|
// Added one field in Product object, so one product can be managed independantly from the stock management (advanced) if necessary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11239 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 18:49:30 +00:00 |
|
|
aFolletete
|
c16aed3424
|
// you can define invoice on payment addition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11238 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 18:42:50 +00:00 |
|
|
tDidierjean
|
92147c45ee
|
// Small changes to product page text/layout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11237 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 18:39:11 +00:00 |
|
|
tDidierjean
|
efd4132415
|
// Fix some XSS
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11236 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 18:34:59 +00:00 |
|
|
mMarinetti
|
3fc8ef3d88
|
[*] BO : optimization of liveEdit system
[+] FO : new theme file for front-office layout.tpl, designers have now more possibilities
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11235 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 18:18:57 +00:00 |
|
|
mMarinetti
|
d905e14fde
|
// removed not useful code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11234 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 18:06:29 +00:00 |
|
|
rMalie
|
49129f85dc
|
// Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11230 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 17:21:18 +00:00 |
|
|
vChabot
|
3f814a3cf0
|
// little fix about generating first John Doe invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11229 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 17:09:52 +00:00 |
|
|
sThiebaut
|
8bb31dc34a
|
// maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11228 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 17:05:22 +00:00 |
|
|
sThiebaut
|
de5977a415
|
// maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11227 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 17:05:07 +00:00 |
|
|
bMancone
|
4e8fa347f7
|
// Updated type in definition for product_supplier_reference (Thanks R.)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11226 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:57:40 +00:00 |
|
|
bMancone
|
2a888cbd8a
|
// Reverted modifications on product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11225 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:55:12 +00:00 |
|
|
bMancone
|
1f74b8a56e
|
// Fixed bugs when editing Warehouses & Suppliers for a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11224 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:54:02 +00:00 |
|
|
fSerny
|
313b46212f
|
[-] Project : fix on template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11223 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:53:50 +00:00 |
|
|
bMancone
|
931d79ac7f
|
// Fixed bugs when editing Warehouses & Suppliers for a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11222 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:52:33 +00:00 |
|
|
aKorczak
|
342f6b58b6
|
// Merge from 1.4.X
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11221 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:48:37 +00:00 |
|
|
aKorczak
|
30b5d4fb82
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11220 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:46:30 +00:00 |
|
|
aFolletete
|
d1fae41a4d
|
// fix bug on product line edition
// put new ressource in getRessources method of Webservice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11216 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:24:35 +00:00 |
|
|
mMarinetti
|
abc215a343
|
// Add missing call of parent::initContent() in all front class (when initContent exists)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11215 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:22:50 +00:00 |
|
|
mDeflotte
|
b48c20d1d5
|
// BugFix : Adding warehouse on order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11214 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 16:19:05 +00:00 |
|
|
lLefevre
|
6d99193df7
|
// added seo.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11213 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 15:59:10 +00:00 |
|
|
lLefevre
|
b73482843a
|
// added tab SEO in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11212 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 15:57:29 +00:00 |
|
|
lLefevre
|
551bce2ac2
|
// Fixed bug save warehouse, supplier, and accounting in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11209 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 15:33:43 +00:00 |
|
|
lLefevre
|
f037bf9ac3
|
// fix bugs save and stay in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11208 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 15:09:05 +00:00 |
|
|
vChabot
|
dc29921f7e
|
[+] BO : You can now have UTF-8 URL Rewriting
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11207 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 15:00:47 +00:00 |
|
|
lLefevre
|
91c95d7146
|
// fix bug tag image in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11206 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-14 14:37:28 +00:00 |
|