Viewing all changes in revision 153.
- Committer: mikel
- Date: 2011-08-09 07:08:32 UTC
- Revision ID: mikel.martin@gmail.com-20110809070832-vrw6t486oh9nnj5z
Merge con la 1.4.5, problemas en el sql de instlación
- files added:
- .bzrignore
- imagenes
- imagenes/.fr-WMGaE2
- imagenes/.fr-WMGaE2/da
- upload/.settings
- upload/admin/language/spanish
- upload/admin/language/spanish/catalog
- upload/admin/language/spanish/common
- upload/admin/language/spanish/customer
- upload/admin/language/spanish/error
- upload/admin/language/spanish/extension
- upload/admin/language/spanish/feed
- upload/admin/language/spanish/localisation
- upload/admin/language/spanish/mail
- upload/admin/language/spanish/module
- upload/admin/language/spanish/payment
- upload/admin/language/spanish/report
- upload/admin/language/spanish/sale
- upload/admin/language/spanish/setting
- upload/admin/language/spanish/shipping
- upload/admin/language/spanish/tool
- upload/admin/language/spanish/total
- upload/admin/language/spanish/user
- upload/admin/view/language
- upload/admin/view/language/english
- upload/admin/view/language/english/catalog
- upload/admin/view/language/english/common
- upload/admin/view/language/english/error
- upload/admin/view/language/english/extension
- upload/admin/view/language/english/feed
- upload/admin/view/language/english/localisation
- upload/admin/view/language/english/mail
- upload/admin/view/language/english/module
- upload/admin/view/language/english/payment
- upload/admin/view/language/english/report
- upload/admin/view/language/english/sale
- upload/admin/view/language/english/setting
- upload/admin/view/language/english/shipping
- upload/admin/view/language/english/tool
- upload/admin/view/language/english/total
- upload/admin/view/language/english/user
- upload/admin/view/language/spanish
- upload/admin/view/language/spanish/catalog
- upload/admin/view/language/spanish/common
- upload/admin/view/language/spanish/customer
- upload/admin/view/language/spanish/error
- upload/admin/view/language/spanish/extension
- upload/admin/view/language/spanish/feed
- upload/admin/view/language/spanish/localisation
- upload/admin/view/language/spanish/mail
- upload/admin/view/language/spanish/module
- upload/admin/view/language/spanish/payment
- upload/admin/view/language/spanish/report
- upload/admin/view/language/spanish/sale
- upload/admin/view/language/spanish/setting
- upload/admin/view/language/spanish/shipping
- upload/admin/view/language/spanish/tool
- upload/admin/view/language/spanish/total
- upload/admin/view/language/spanish/user
- upload/catalog/view/javascript/facelift
- upload/catalog/view/javascript/facelift/cache
- upload/catalog/view/javascript/facelift/fonts
- upload/catalog/view/javascript/facelift/js-plugins
- upload/catalog/view/javascript/facelift/plugins
- upload/catalog/view/javascript/facelift/plugins/QuickEffects
- upload/catalog/view/javascript/facelift/plugins/js
- upload/catalog/view/javascript/facelift/plugins/js/copy
- upload/catalog/view/javascript/facelift/plugins/post
- upload/catalog/view/javascript/facelift/plugins/pre
- upload/catalog/view/javascript/facelift/plugins/render
- upload/catalog/view/javascript/facelift/plugins/render/QuickEffects
- upload/catalog/view/theme/mp
- upload/catalog/view/theme/mp/image
- upload/catalog/view/theme/mp/stylesheet
- upload/catalog/view/theme/mp/template
- upload/catalog/view/theme/mp/template/account
- upload/catalog/view/theme/mp/template/checkout
- upload/catalog/view/theme/mp/template/common
- upload/catalog/view/theme/mp/template/error
- upload/catalog/view/theme/mp/template/information
- upload/catalog/view/theme/mp/template/mail
- upload/catalog/view/theme/mp/template/module
- upload/catalog/view/theme/mp/template/payment
- upload/catalog/view/theme/mp/template/product
- files modified:
- upload/admin/model/sale/order.php
expand all
collapse all
added
removed
imagenes/1283169159.ceca-85x85.jpg
imagenes/1297904916.logo-85x85.jpg
imagenes/BBVA-g.png
imagenes/BBVA-m.png
imagenes/Visa_Mastercard_acceptance1.jpg
imagenes/bbva.png
imagenes/boxshot-ceca.gif
imagenes/boxshot-cofidis.png
imagenes/boxshot-servi.png
imagenes/boxshot.png
imagenes/cara-bbva.png
imagenes/cara-ceca.png
imagenes/cara-ceca2.png
imagenes/cara-cofidis.png
imagenes/cara-servi-presta.png
imagenes/cara-servi.png
imagenes/caratula-bbva-mag-g.png
imagenes/ceca.png
imagenes/logo-bbva-300x211.jpg
imagenes/logo-prestashop-500x500.jpg
imagenes/lomo.gif
imagenes/magento.jpg
imagenes/servi.png
imagenes/servired-120x120.jpg
upload/catalog/view/javascript/facelift/plugins/QuickEffects/qe-pattern-fill-texture.jpg
upload/catalog/view/javascript/facelift/plugins/render/QuickEffects/qe-pattern-fill-texture.jpg
upload/catalog/view/javascript/facelift/spacer.png
upload/catalog/view/theme/default/image/openid.gif
upload/catalog/view/theme/mp/image/ajax_load.gif
upload/catalog/view/theme/mp/image/arrow_down.png
upload/catalog/view/theme/mp/image/basket.png
upload/catalog/view/theme/mp/image/bestsellers.png
upload/catalog/view/theme/mp/image/bookmark.png
upload/catalog/view/theme/mp/image/box_bottom.png
upload/catalog/view/theme/mp/image/box_top.png
upload/catalog/view/theme/mp/image/brands.png
upload/catalog/view/theme/mp/image/bullet_1.png
upload/catalog/view/theme/mp/image/bullet_2.png
upload/catalog/view/theme/mp/image/button_add_small.png
upload/catalog/view/theme/mp/image/button_left.gif
upload/catalog/view/theme/mp/image/button_left.png
upload/catalog/view/theme/mp/image/button_right.gif
upload/catalog/view/theme/mp/image/button_right.png
upload/catalog/view/theme/mp/image/category.png
upload/catalog/view/theme/mp/image/chat.png
upload/catalog/view/theme/mp/image/contact.png
upload/catalog/view/theme/mp/image/content_bottom_center.png
upload/catalog/view/theme/mp/image/content_bottom_left.png
upload/catalog/view/theme/mp/image/content_bottom_right.png
upload/catalog/view/theme/mp/image/content_top_center.png
upload/catalog/view/theme/mp/image/content_top_left.png
upload/catalog/view/theme/mp/image/content_top_right.png
upload/catalog/view/theme/mp/image/discount.png
upload/catalog/view/theme/mp/image/featured.png
upload/catalog/view/theme/mp/image/header_1_center.png
upload/catalog/view/theme/mp/image/header_1_left.png
upload/catalog/view/theme/mp/image/header_1_right.png
upload/catalog/view/theme/mp/image/header_2_center.png
upload/catalog/view/theme/mp/image/header_2_left.png
upload/catalog/view/theme/mp/image/header_2_right.png
upload/catalog/view/theme/mp/image/information.png
upload/catalog/view/theme/mp/image/latest.png
upload/catalog/view/theme/mp/image/list_remove_btn.gif
upload/catalog/view/theme/mp/image/loading_1.gif
upload/catalog/view/theme/mp/image/payment.png
upload/catalog/view/theme/mp/image/sitemap.png
upload/catalog/view/theme/mp/image/special.png
upload/catalog/view/theme/mp/image/stars_1.png
upload/catalog/view/theme/mp/image/stars_2.png
upload/catalog/view/theme/mp/image/stars_3.png
upload/catalog/view/theme/mp/image/stars_4.png
upload/catalog/view/theme/mp/image/stars_5.png
upload/catalog/view/theme/mp/image/switcher.png
upload/catalog/view/theme/mp/image/tab_1.png
upload/catalog/view/theme/mp/image/tab_2.png
upload/catalog/view/theme/mp/image/tab_3.png
