Kai Diefenbach avatar Kai Diefenbach committed 212d8d0 Merge

Merged 0.7 branch

Comments (0)

Files changed (16)

 0000000000000000000000000000000000000000 0.7.0
 0000000000000000000000000000000000000000 0.7.0
 2e54f7e63014101b548918754c1d185a9638bb1e 0.7.0
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 Added
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 documentation
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 for
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 Price
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 Calculation
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 field
+826e27d14c1388ba7c358ef0cff801e88a39c65c 0.7.1
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 Added
+0000000000000000000000000000000000000000 Added
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 Calculation
+0000000000000000000000000000000000000000 Calculation
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 Price
+0000000000000000000000000000000000000000 Price
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 documentation
+0000000000000000000000000000000000000000 documentation
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 field
+0000000000000000000000000000000000000000 field
+9c017a036aa7d5c4da19c7c2cff7ad0ae72d8385 for
+0000000000000000000000000000000000000000 for
+802da71343148b2d20075e7fd7745427e32add33 0.7.2
 Changes
 =======
 
+0.7.2 (2012-04-29)
+-------------------
+
+* Added: CSS and JS files for custamization by integrators (naro)
+* Bugfix: fixed calculation of packages for order items (within packages filter tag)
+* Bugfix: fixed management of criteria
+* Bugfix: fixed problem with locale.atof (naro)
+* Bugfix: fixed display of image for category sub-categories view
+* Bugfix: fixed order_detail mail template field names (naro)
+* Changed: added order-state-X css class to the orders_inline (naro)
+* Changed: allow passing custom paginator object to the search results template (naro)
+* Changed: added 100x100px box to search results to prevent content jumping from left to right when the page is loaded (naro)
+* Changed: show product image on order detail page (naro)
+* Changed: clean up display of package result
+* Updated Czech translation (naro)
+
+0.7.1 (2012-04-21)
+------------------
+
+* Bugfix: fixed display prices for properties (Maciej Wiśniowski)
+* Bugfix: fixed TinyMCE for several browsers (Maciej Wiśniowski)
+* Bugfix: display credit card fields if the type of the selected payment method is credit card; issue: #191
+* Bugfix: fixed sorting of actions; issue #192 (Maciej Wiśniowski)
+* Bugfix: fixed typos in docs; issue #193
+* Added: added documentation for Price Calculation field; issue #188
+* Updated: Polish translations (Maciej Wiśniowski)
+
 0.7.0 (2012-04-14)
 ------------------
 

lfs/cart/views.py

         raise Http404()
 
     try:
-        quantity = locale.atof(request.POST.get("quantity", "1.0"))
+        value = request.POST.get("quantity", "1.0")
+        if isinstance(value, unicode):
+            # atof() on unicode string fails in some environments, like Czech
+            value = value.encode("utf-8")
+        quantity = locale.atof(value)
     except (TypeError, ValueError):
         quantity = 1.0
 
 
                 if property.is_number_field:
                     try:
+                        if isinstance(value, unicode):
+                            # atof() on unicode string fails in some environments, like Czech
+                            value = value.encode("utf-8")
                         value = locale.atof(value)
                     except ValueError:
                         value = locale.atof("0.0")
     message = ""
     for item in cart.get_items():
         try:
-            amount = locale.atof(request.POST.get("amount-cart-item_%s" % item.id, "0.0"))
+            value = request.POST.get("amount-cart-item_%s" % item.id, "0.0")
+            if isinstance(value, unicode):
+                # atof() on unicode string fails in some environments, like Czech
+                value = value.encode("utf-8")
+            amount = locale.atof(value)
         except (TypeError, ValueError):
             amount = 1.0
 

lfs/core/templatetags/lfs_tags.py

     amount.
     """
     if cart_item.product.packing_unit:
-        return int(math.ceil(cart_item.amount / cart_item.product.packing_unit))
+        return int(math.ceil(float(cart_item.amount) / cart_item.product.packing_unit))
     return 0
 
 
             context["base_price_starting_from"] = False
 
         if product.get_active_packing_unit():
-            context["base_packing_price_gross"] = product.get_base_packing_price_gross(request)
+            context["base_packing_price"] = product.get_base_packing_price_gross(request)
 
         return ""
 

lfs/criteria/models/criteria.py

         template = "manage/criteria/%s_criterion.html" % self.content_type
 
         return render_to_string(template, RequestContext(request, {
-            "id": "ex%s" % self.id,
+            "id": "%s%s" % (self.content_type, self.id),
             "operator": self.operator,
             "value": self.value,
             "position": position,
             })
 
         return render_to_string("manage/criteria/country_criterion.html", RequestContext(request, {
-            "id": "ex%s" % self.id,
+            "id": "%s%s" % (self.content_type, self.id),
             "operator": self.operator,
             "value": self.value,
             "position": position,
             })
 
         return render_to_string("manage/criteria/payment_method_criterion.html", RequestContext(request, {
-            "id": "ex%s" % self.id,
+            "id": "%s%s" % (self.content_type, self.id),
             "operator": self.operator,
             "value": self.value,
             "position": position,
             })
 
         return render_to_string("manage/criteria/shipping_method_criterion.html", RequestContext(request, {
-            "id": "ex%s" % self.id,
+            "id": "%s%s" % (self.content_type, self.id),
             "operator": self.operator,
             "value": self.value,
             "position": position,
Add a comment to this file

lfs/locale/cs/LC_MESSAGES/django.mo

Binary file modified.

lfs/locale/cs/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: lfstheme\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-09 16:03+0200\n"
+"POT-Creation-Date: 2012-04-21 13:57+0200\n"
 "PO-Revision-Date: 2012-04-09 18:27+0100\n"
 "Last-Translator: Radim Novotny <novotny.radim@gmail.com>\n"
 "Language-Team: Czech <info@dms4u.cz>\n"
 msgid "Last Order Number"
 msgstr "Číslo poslední objednávky"
 
-#: other_translations.py:11
-#: templates/manage/shop/default_values_tab.html:27
+#: other_translations.py:11 templates/manage/shop/default_values_tab.html:27
 msgid "Format"
 msgstr "Formát"
 
-#: cart/models.py:48
-#: criteria/models/criteria.py:597
-#: order/models.py:48
+#: cart/models.py:48 criteria/models/criteria.py:597 order/models.py:48
 #: templates/manage/cart/carts_inline.html:16
 msgid "User"
 msgstr "Uživatel"
 
-#: cart/models.py:49
-#: order/models.py:49
+#: cart/models.py:49 order/models.py:49
 msgid "Session"
 msgstr "Sezení"
 
-#: cart/models.py:50
-#: cart/models.py:238
-#: catalog/models.py:598
+#: cart/models.py:50 cart/models.py:238 catalog/models.py:598
 #: templates/manage/cart/cart_inline.html:58
 #: templates/manage/cart/cart_inline.html:97
 #: templates/manage/cart/carts_inline.html:10
 msgid "Creation date"
 msgstr "Datum vytvoření"
 
-#: cart/models.py:51
-#: cart/models.py:239
+#: cart/models.py:51 cart/models.py:239
 #: templates/manage/cart/cart_inline.html:66
 #: templates/manage/cart/carts_inline.html:13
 #: templates/manage/customer/customer_inline.html:173
 msgid "Modification date"
 msgstr "Datum změny"
 
-#: cart/models.py:235
-#: portlet/templatetags/lfs_portlets_tags.py:92
+#: cart/models.py:235 portlet/templatetags/lfs_portlets_tags.py:92
 #: templates/manage/cart/cart.html:26
 #: templates/manage/customer/customer_inline.html:165
 #: templates/manage/customer/customers_inline.html:35
 msgid "Cart"
 msgstr "Košík"
 
-#: cart/models.py:236
-#: catalog/models.py:1741
-#: catalog/models.py:1996
-#: catalog/models.py:2062
-#: catalog/models.py:2400
-#: marketing/models.py:13
-#: marketing/models.py:26
-#: marketing/models.py:33
+#: cart/models.py:236 catalog/models.py:1746 catalog/models.py:2001
+#: catalog/models.py:2067 catalog/models.py:2405 marketing/models.py:13
+#: marketing/models.py:26 marketing/models.py:33
 #: templates/manage/cart/cart_inline.html:100
 #: templates/manage/reviews/review_inline.html:78
 #: templates/manage/reviews/reviews_inline.html:38
 msgid "Product"
 msgstr "Produkt"
 
-#: cart/models.py:237
-#: catalog/models.py:1744
+#: cart/models.py:237 catalog/models.py:1749
 #: templates/manage/product/accessories_inline.html:116
 msgid "Quantity"
 msgstr "Množství"
 msgid "Cart item"
 msgstr "Položka"
 
-#: cart/models.py:396
-#: catalog/models.py:1949
-#: catalog/models.py:1974
-#: catalog/models.py:1997
-#: catalog/models.py:2022
-#: catalog/models.py:2064
-#: order/models.py:211
-#: templates/manage/properties/property.html:32
+#: cart/models.py:396 catalog/models.py:1954 catalog/models.py:1979
+#: catalog/models.py:2002 catalog/models.py:2027 catalog/models.py:2069
+#: order/models.py:211 templates/manage/properties/property.html:32
 msgid "Property"
 msgstr "Vlastnost"
 
-#: cart/views.py:268
+#: cart/views.py:275
 #, python-format
 msgid "%(name)s must be between %(min)s and %(max)s %(unit)s."
 msgstr "%(name)s musí být mezi %(min)s a %(max)s %(unit)s."
 
-#: cart/views.py:282
+#: cart/views.py:289
 #, python-format
-msgid "Your entered value for %(name)s (%(value)s) is not in valid step width, which is %(step)s."
-msgstr "Your entered value for %(name)s (%(value)s) is not in valid step width, which is %(step)s."
-
-#: cart/views.py:298
-#: cart/views.py:402
+msgid ""
+"Your entered value for %(name)s (%(value)s) is not in valid step width, "
+"which is %(step)s."
+msgstr ""
+"Your entered value for %(name)s (%(value)s) is not in valid step width, "
+"which is %(step)s."
+
+#: cart/views.py:305 cart/views.py:413
 #, python-format
 msgid "Sorry, but '%(product)s' is not available anymore."
 msgstr "Je nám líto, ale '%(product)s' byl vyřazen z našeho katalogu."
 
-#: cart/views.py:300
-#: cart/views.py:404
+#: cart/views.py:307 cart/views.py:415
 #, python-format
 msgid "Sorry, but '%(product)s' is only one time available."
 msgstr "Je nám líto, ale '%(product)s' je k dispozici pouze jednou."
 
-#: cart/views.py:302
-#: cart/views.py:406
+#: cart/views.py:309 cart/views.py:417
 #, python-format
 msgid "Sorry, but '%(product)s' is only %(amount)s times available."
 msgstr "Je nám líto, ale '%(product)s' je k dispozici pouze %(amount)s krát."
 
-#: catalog/models.py:160
-#: catalog/models.py:569
-#: catalog/models.py:1774
-#: catalog/models.py:1868
-#: catalog/models.py:2024
-#: catalog/models.py:2188
-#: core/models.py:19
-#: core/models.py:38
-#: core/models.py:154
-#: discounts/models.py:41
-#: export/models.py:16
-#: manufacturer/models.py:10
-#: payment/models.py:73
-#: shipping/models.py:71
+#: catalog/models.py:160 catalog/models.py:569 catalog/models.py:1779
+#: catalog/models.py:1873 catalog/models.py:2029 catalog/models.py:2193
+#: core/models.py:19 core/models.py:38 core/models.py:154
+#: discounts/models.py:41 export/models.py:16 manufacturer/models.py:10
+#: payment/models.py:73 shipping/models.py:71
 #: templates/manage/category/products_inline.html:47
 #: templates/manage/category/selected_products.html:42
 #: templates/manage/customer/customer_filters_inline.html:12
 msgid "Name"
 msgstr "Název"
 
-#: catalog/models.py:161
-#: catalog/models.py:570
-#: export/models.py:17
-#: page/models.py:17
-#: supplier/models.py:14
+#: catalog/models.py:161 catalog/models.py:570 export/models.py:17
+#: page/models.py:17 supplier/models.py:14
 #: templates/manage/product/products_inline.html:20
 #: templates/manage/product/variants.html:104
 msgid "Slug"
 msgstr "Slug"
 
-#: catalog/models.py:162
-#: catalog/models.py:636
-#: catalog/models.py:2063
+#: catalog/models.py:162 catalog/models.py:636 catalog/models.py:2068
 #: core/models.py:80
 msgid "Parent"
 msgstr "Nadřazená položka"
 msgid "Show all products"
 msgstr "Zobrazit všechny produkty"
 
-#: catalog/models.py:168
-#: catalog/models.py:1775
-#: catalog/models.py:1871
-#: catalog/settings.py:70
-#: export/models.py:18
+#: catalog/models.py:168 catalog/models.py:1780 catalog/models.py:1876
+#: catalog/settings.py:70 export/models.py:18
 #: templates/manage/manage_base.html:87
 #: templates/manage/cart/carts_inline.html:25
 #: templates/manage/category/manage_category.html:44
 msgid "Products"
 msgstr "Produkty"
 
-#: catalog/models.py:169
-#: catalog/models.py:579
+#: catalog/models.py:169 catalog/models.py:579
 msgid "Short description"
 msgstr "Krátký popis"
 
-#: catalog/models.py:170
-#: catalog/models.py:580
-#: catalog/models.py:2217
-#: catalog/models.py:2398
-#: core/models.py:159
-#: customer_tax/models.py:24
-#: payment/models.py:74
-#: shipping/models.py:72
-#: tax/models.py:18
+#: catalog/models.py:170 catalog/models.py:580 catalog/models.py:2222
+#: catalog/models.py:2403 core/models.py:159 customer_tax/models.py:24
+#: payment/models.py:74 shipping/models.py:72 tax/models.py:18
 #: templates/manage/product/attachments.html:21
 msgid "Description"
 msgstr "Popis"
 
-#: catalog/models.py:171
-#: catalog/models.py:2113
-#: core/models.py:160
-#: payment/models.py:76
-#: shipping/models.py:74
+#: catalog/models.py:171 catalog/models.py:2118 core/models.py:160
+#: payment/models.py:76 shipping/models.py:74
 #: templates/manage/category/data.html:83
 #: templates/manage/product/images.html:34
 msgid "Image"
 msgstr "Obrázek"
 
-#: catalog/models.py:172
-#: catalog/models.py:1743
-#: catalog/models.py:1872
-#: catalog/models.py:1975
-#: catalog/models.py:1998
-#: catalog/models.py:2026
-#: catalog/models.py:2114
-#: catalog/models.py:2192
-#: catalog/models.py:2401
-#: core/models.py:79
-#: core/management/commands/lfs_migrate.py:123
-#: criteria/models/criteria_objects.py:24
-#: marketing/models.py:14
-#: marketing/models.py:34
-#: page/models.py:18
+#: catalog/models.py:172 catalog/models.py:1748 catalog/models.py:1877
+#: catalog/models.py:1980 catalog/models.py:2003 catalog/models.py:2031
+#: catalog/models.py:2119 catalog/models.py:2197 catalog/models.py:2406
+#: core/models.py:79 core/management/commands/lfs_migrate.py:123
+#: criteria/models/criteria_objects.py:24 marketing/models.py:14
+#: marketing/models.py:34 page/models.py:18
 #: templates/manage/marketing/featured_inline.html:108
 #: templates/manage/marketing/topseller_inline.html:109
 #: templates/manage/product/accessories_inline.html:113
 msgid "Position"
 msgstr "Pozice"
 
-#: catalog/models.py:173
-#: page/models.py:19
+#: catalog/models.py:173 page/models.py:19
 msgid "Exclude from navigation"
 msgstr "Vyloučit z navigace"
 
-#: catalog/models.py:175
-#: catalog/models.py:614
-#: core/models.py:161
+#: catalog/models.py:175 catalog/models.py:614 core/models.py:161
 msgid "Static block"
 msgstr "Statický blok"
 
 msgid "Active formats"
 msgstr "Aktivní formáty"
 
-#: catalog/models.py:179
-#: core/models.py:164
+#: catalog/models.py:179 core/models.py:164
 msgid "Product rows"
 msgstr "Počet řádků s produkty"
 
-#: catalog/models.py:180
-#: core/models.py:163
+#: catalog/models.py:180 core/models.py:163
 msgid "Product cols"
 msgstr "Počet sloupců s produkty"
 
-#: catalog/models.py:181
-#: core/models.py:165
+#: catalog/models.py:181 core/models.py:165
 msgid "Category cols"
 msgstr "Počet sloupců kategorií"
 
-#: catalog/models.py:183
-#: catalog/models.py:584
-#: core/models.py:184
+#: catalog/models.py:183 catalog/models.py:584 core/models.py:184
 #: core/management/commands/lfs_migrate.py:75
-#: core/management/commands/lfs_migrate.py:99
-#: page/models.py:24
+#: core/management/commands/lfs_migrate.py:99 page/models.py:24
 msgid "Meta title"
 msgstr "Meta nadpis"
 
-#: catalog/models.py:184
-#: catalog/models.py:585
-#: core/models.py:185
+#: catalog/models.py:184 catalog/models.py:585 core/models.py:185
 #: core/management/commands/lfs_migrate.py:76
-#: core/management/commands/lfs_migrate.py:100
-#: page/models.py:25
+#: core/management/commands/lfs_migrate.py:100 page/models.py:25
 msgid "Meta keywords"
 msgstr "Meta klíčová slova"
 
-#: catalog/models.py:185
-#: catalog/models.py:586
-#: core/models.py:186
+#: catalog/models.py:185 catalog/models.py:586 core/models.py:186
 #: core/management/commands/lfs_migrate.py:77
-#: core/management/commands/lfs_migrate.py:101
-#: page/models.py:26
+#: core/management/commands/lfs_migrate.py:101 page/models.py:26
 msgid "Meta description"
 msgstr "Meta popis"
 
 msgid "The unique last part of the Product's URL."
 msgstr "Unikátní poslední část URL produktu."
 
-#: catalog/models.py:571
-#: discounts/models.py:45
+#: catalog/models.py:571 discounts/models.py:45
 #: templates/manage/category/products_inline.html:50
 #: templates/manage/category/selected_products.html:45
 #: templates/manage/marketing/featured_inline.html:47
 msgid "Your unique article number of the product."
 msgstr "Unikátní číslo produktu"
 
-#: catalog/models.py:572
-#: catalog/models.py:576
-#: catalog/models.py:1880
-#: catalog/models.py:2025
-#: criteria/models/criteria.py:52
-#: order/models.py:56
-#: payment/models.py:78
-#: payment/models.py:122
-#: shipping/models.py:76
-#: shipping/models.py:165
-#: templates/manage/cart/cart_inline.html:103
+#: catalog/models.py:572 catalog/models.py:576 catalog/models.py:1885
+#: catalog/models.py:2030 criteria/models/criteria.py:52 order/models.py:56
+#: payment/models.py:78 payment/models.py:122 shipping/models.py:76
+#: shipping/models.py:165 templates/manage/cart/cart_inline.html:103
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:14
 #: templates/manage/criteria/country_criterion.html:14
 #: templates/manage/criteria/distance_criterion.html:14
 msgid "Price"
 msgstr "Cena"
 
-#: catalog/models.py:573
-#: core/models.py:179
+#: catalog/models.py:573 core/models.py:179
 msgid "Price calculator"
 msgstr "Výpočet ceny"
 
 msgid "Quanity field unit"
 msgstr "Jednotka množství"
 
-#: catalog/models.py:581
-#: templates/manage/manage_base.html:80
+#: catalog/models.py:581 templates/manage/manage_base.html:80
 #: templates/manage/product/images.html:3
 #: templates/manage/product/product.html:99
 msgid "Images"
 msgstr "Obrázky"
 
-#: catalog/models.py:588
-#: templates/manage/product/related_products.html:4
+#: catalog/models.py:588 templates/manage/product/related_products.html:4
 msgid "Related products"
 msgstr "Příbuzné produkty"
 
 msgid "For sale price"
 msgstr "Akční cena"
 
-#: catalog/models.py:597
-#: core/models.py:75
-#: marketing/models.py:35
-#: page/models.py:15
-#: payment/models.py:71
-#: payment/models.py:124
-#: shipping/models.py:69
-#: shipping/models.py:167
+#: catalog/models.py:597 core/models.py:75 marketing/models.py:35
+#: page/models.py:15 payment/models.py:71 payment/models.py:124
+#: shipping/models.py:69 shipping/models.py:167
 #: templates/manage/category/products_inline.html:53
 #: templates/manage/category/selected_products.html:48
 #: templates/manage/marketing/featured_inline.html:50
 msgid "Manual delivery time"
 msgstr "Vlastní doba dodání"
 
-#: catalog/models.py:604
-#: shipping/models.py:77
+#: catalog/models.py:604 shipping/models.py:77
 msgid "Delivery time"
 msgstr "Doba dodání"
 
 msgid "Stock amount"
 msgstr "Počet položek skladem"
 
-#: catalog/models.py:610
-#: core/management/commands/lfs_migrate.py:67
+#: catalog/models.py:610 core/management/commands/lfs_migrate.py:67
 msgid "Active packing"
 msgstr "Aktivní balení"
 
 msgid "Packing unit"
 msgstr "Jednotka balení"
 
-#: catalog/models.py:617
-#: criteria/models/criteria.py:615
+#: catalog/models.py:617 criteria/models/criteria.py:615
 #: criteria/models/criteria.py:634
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:17
 #: templates/manage/criteria/country_criterion.html:17
 msgid "Weight"
 msgstr "Váha"
 
-#: catalog/models.py:618
-#: criteria/models/criteria.py:259
-#: criteria/models/criteria.py:278
-#: criteria/models/criteria.py:698
+#: catalog/models.py:618 criteria/models/criteria.py:259
+#: criteria/models/criteria.py:278 criteria/models/criteria.py:698
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:11
 #: templates/manage/criteria/country_criterion.html:11
 #: templates/manage/criteria/distance_criterion.html:11
 msgid "Height"
 msgstr "Výška"
 
-#: catalog/models.py:619
-#: criteria/models/criteria.py:322
+#: catalog/models.py:619 criteria/models/criteria.py:322
 #: criteria/models/criteria.py:341
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:12
 #: templates/manage/criteria/country_criterion.html:12
 msgid "Length"
 msgstr "Délka"
 
-#: catalog/models.py:620
-#: criteria/models/criteria.py:113
+#: catalog/models.py:620 criteria/models/criteria.py:113
 #: criteria/models/criteria.py:679
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:16
 #: templates/manage/criteria/country_criterion.html:16
 msgid "Width"
 msgstr "Šířka"
 
-#: catalog/models.py:623
-#: discounts/models.py:44
-#: manage/voucher/forms.py:45
-#: order/models.py:57
-#: order/models.py:137
-#: payment/models.py:77
-#: shipping/models.py:75
-#: templates/manage/voucher/vouchers_inline.html:76
+#: catalog/models.py:623 discounts/models.py:44 manage/voucher/forms.py:45
+#: order/models.py:57 order/models.py:137 payment/models.py:77
+#: shipping/models.py:75 templates/manage/voucher/vouchers_inline.html:76
 #: voucher/models.py:102
 msgid "Tax"
 msgstr "Daň"
 msgid "Default variant"
 msgstr "Výchozí kombinace"
 
-#: catalog/models.py:629
-#: core/management/commands/lfs_migrate.py:59
+#: catalog/models.py:629 core/management/commands/lfs_migrate.py:59
 #: templates/manage/product/variants.html:251
 msgid "Category variant"
 msgstr "Kombinace zobrazená na stránce výpisu kategorie"
 msgid "Active Images"
 msgstr "Aktuální obrázky"
 
-#: catalog/models.py:646
-#: templates/manage/product/related_products.html:14
+#: catalog/models.py:646 templates/manage/product/related_products.html:14
 msgid "Active related products"
 msgstr "Aktuální příbuzné produkty"
 
-#: catalog/models.py:647
-#: templates/manage/product/accessories.html:14
+#: catalog/models.py:647 templates/manage/product/accessories.html:14
 msgid "Active accessories"
 msgstr "Aktuální příslušenství"
 
 msgid "Price Calculation"
 msgstr "Výpočet ceny"
 
-#: catalog/models.py:659
-#: core/management/commands/lfs_migrate.py:60
+#: catalog/models.py:659 core/management/commands/lfs_migrate.py:60
 msgid "Active base price"
 msgstr "Zobrazit základní cenu"
 
-#: catalog/models.py:660
-#: core/management/commands/lfs_migrate.py:61
+#: catalog/models.py:660 core/management/commands/lfs_migrate.py:61
 msgid "Base price unit"
 msgstr "Jednotka základní ceny"
 
-#: catalog/models.py:661
-#: core/management/commands/lfs_migrate.py:62
+#: catalog/models.py:661 core/management/commands/lfs_migrate.py:62
 msgid "Base price amount"
 msgstr "Základní cena (hodnota)"
 
 msgid "Manufacturer"
 msgstr "Výrobce"
 
-#: catalog/models.py:666
-#: core/management/commands/lfs_migrate.py:58
+#: catalog/models.py:666 core/management/commands/lfs_migrate.py:58
 msgid "Type of quantity field"
 msgstr "Typ pole množství"
 
-#: catalog/models.py:1742
+#: catalog/models.py:1747
 msgid "Accessory"
 msgstr "Přislušenství"
 
-#: catalog/models.py:1869
-#: catalog/models.py:2112
-#: catalog/models.py:2397
-#: core/models.py:76
-#: page/models.py:16
+#: catalog/models.py:1874 catalog/models.py:2117 catalog/models.py:2402
+#: core/models.py:76 page/models.py:16
 #: templates/manage/portlets/portlets_inline.html:40
 #: templates/manage/product/attachments.html:18
 #: templates/manage/product/images.html:37
 msgid "Title"
 msgstr "Nadpis"
 
-#: catalog/models.py:1870
-#: catalog/models.py:1973
-#: core/models.py:78
+#: catalog/models.py:1875 catalog/models.py:1978 core/models.py:78
 msgid "Group"
 msgstr "Skupina"
 
-#: catalog/models.py:1873
-#: catalog/models.py:2216
+#: catalog/models.py:1878 catalog/models.py:2221
 msgid "Unit"
 msgstr "Jednotka"
 
-#: catalog/models.py:1874
+#: catalog/models.py:1879
 msgid "Display on product"
 msgstr "Zobrazit u produktu"
 
-#: catalog/models.py:1875
+#: catalog/models.py:1880
 msgid "Local"
 msgstr "Lokální"
 
-#: catalog/models.py:1876
+#: catalog/models.py:1881
 msgid "Filterable"
 msgstr "Filtrovatelné"
 
-#: catalog/models.py:1877
+#: catalog/models.py:1882
 msgid "Display no results"
 msgstr "Zobrazit, i když nejsou žádné položky"
 
-#: catalog/models.py:1878
+#: catalog/models.py:1883
 msgid "Configurable"
 msgstr "Konfigurovatelné"
 
-#: catalog/models.py:1879
-#: catalog/models.py:2067
-#: customer/models.py:105
-#: discounts/models.py:43
-#: payment/models.py:81
+#: catalog/models.py:1884 catalog/models.py:2072 customer/models.py:105
+#: discounts/models.py:43 payment/models.py:81
 #: templates/manage/portlets/portlets_inline.html:37
 #: templates/manage/voucher/vouchers_inline.html:70
 msgid "Type"
 msgstr "Typ"
 
-#: catalog/models.py:1881
+#: catalog/models.py:1886
 msgid "Display price"
 msgstr "Zobrazit cenu"
 
-#: catalog/models.py:1882
+#: catalog/models.py:1887
 #: templates/manage/payment/payment_method_prices.html:9
 #: templates/manage/shipping_methods/shipping_method_prices.html:9
 msgid "Add price"
 msgstr "Navýšit cenu"
 
-#: catalog/models.py:1885
-#: catalog/models.py:2214
+#: catalog/models.py:1890 catalog/models.py:2219
 msgid "Min"
 msgstr "Min"
 
-#: catalog/models.py:1886
-#: catalog/models.py:2215
+#: catalog/models.py:1891 catalog/models.py:2220
 msgid "Max"
 msgstr "Max"
 
-#: catalog/models.py:1887
-#: catalog/models.py:1893
+#: catalog/models.py:1892 catalog/models.py:1898
 msgid "Step"
 msgstr "Krok"
 
-#: catalog/models.py:1888
+#: catalog/models.py:1893
 msgid "Decimal places"
 msgstr "Počet desetinných míst"
 
-#: catalog/models.py:1890
+#: catalog/models.py:1895
 msgid "Required"
 msgstr "Vyžadováno"
 
-#: catalog/models.py:1892
-#: templates/manage/properties/step_inline.html:2
+#: catalog/models.py:1897 templates/manage/properties/step_inline.html:2
 msgid "Step type"
 msgstr "Typ kroku"
 
-#: catalog/models.py:1898
-#: templates/manage/manage_base.html:91
+#: catalog/models.py:1903 templates/manage/manage_base.html:91
 #: templates/manage/manage_base.html:93
 #: templates/manage/product/product.html:111
 #: templates/manage/properties/no_properties.html:11
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: catalog/models.py:2065
-#: discounts/models.py:42
-#: manage/voucher/forms.py:40
+#: catalog/models.py:2070 discounts/models.py:42 manage/voucher/forms.py:40
 #: templates/manage/voucher/vouchers_inline.html:73
 msgid "Value"
 msgstr "Hodnota"
 
-#: catalog/models.py:2066
+#: catalog/models.py:2071
 msgid "Value as float"
 msgstr "Hodnota (desetinné číslo)"
 
-#: catalog/models.py:2108
-#: catalog/models.py:2150
+#: catalog/models.py:2113 catalog/models.py:2155
 #: criteria/models/criteria_objects.py:20
 msgid "Content type"
 msgstr "Typ položky"
 
-#: catalog/models.py:2109
-#: catalog/models.py:2151
+#: catalog/models.py:2114 catalog/models.py:2156
 #: criteria/models/criteria_objects.py:17
 #: criteria/models/criteria_objects.py:21
 msgid "Content id"
 msgstr "ID položky"
 
-#: catalog/models.py:2189
+#: catalog/models.py:2194
 msgid "Display files"
 msgstr "Zobrazit soubory"
 
-#: catalog/models.py:2190
-#: templates/manage/manage_base.html:98
+#: catalog/models.py:2195 templates/manage/manage_base.html:98
 msgid "HTML"
 msgstr "HTML"
 
-#: catalog/models.py:2191
-#: templates/manage/static_block/files.html:2
+#: catalog/models.py:2196 templates/manage/static_block/files.html:2
 #: templates/manage/static_block/static_block.html:42
 msgid "Files"
 msgstr "Soubory"
 msgid "Decimal 0.01"
 msgstr "Desetinné 0.01"
 
-#: catalog/settings.py:18
-#: catalog/settings.py:29
-#: catalog/settings.py:36
+#: catalog/settings.py:18 catalog/settings.py:29 catalog/settings.py:36
 #: catalog/settings.py:43
 #: templates/manage/product/product_filters_inline.html:56
 #: templates/manage/product/products_inline.html:84
 msgid "Standard"
 msgstr "Výchozí"
 
-#: catalog/settings.py:19
-#: templates/manage/manage_base.html:176
+#: catalog/settings.py:19 templates/manage/manage_base.html:176
 #: templates/manage/customer/customer_inline.html:30
 #: templates/manage/order/orders_inline.html:50
 #: templates/manage/product/data.html:227
 msgid "Yes"
 msgstr "Ano"
 
-#: catalog/settings.py:20
-#: templates/manage/manage_base.html:177
+#: catalog/settings.py:20 templates/manage/manage_base.html:177
 #: templates/manage/customer/customer_inline.html:32
 #: templates/manage/order/orders_inline.html:52
 #: templates/manage/product/data.html:229
 msgid "No"
 msgstr "Ne"
 
-#: catalog/settings.py:30
-#: catalog/settings.py:37
-#: catalog/settings.py:44
+#: catalog/settings.py:30 catalog/settings.py:37 catalog/settings.py:44
 #: templates/manage/product/product_filters_inline.html:57
 #: templates/manage/product/products_inline.html:85
 msgid "Product with variants"
 msgstr "Produkt s kombinacemi"
 
-#: catalog/settings.py:31
-#: catalog/settings.py:38
-#: export/models.py:72
+#: catalog/settings.py:31 catalog/settings.py:38 export/models.py:72
 #: templates/manage/product/product_filters_inline.html:58
 #: templates/manage/product/products_inline.html:86
 msgid "Variant"
 msgstr "Varianta"
 
-#: catalog/settings.py:32
-#: catalog/settings.py:39
-#: catalog/settings.py:45
+#: catalog/settings.py:32 catalog/settings.py:39 catalog/settings.py:45
 #: templates/manage/product/product_filters_inline.html:59
 #: templates/manage/product/products_inline.html:87
 msgid "Configurable product"
 msgstr "Konfigurovatelný produkt"
 
-#: catalog/settings.py:53
-#: catalog/settings.py:141
-#: export/settings.py:11
+#: catalog/settings.py:53 catalog/settings.py:141 export/settings.py:11
 #: templates/manage/product/variants.html:188
 msgid "Default"
 msgstr "Výchozí"
 msgid "Select"
 msgstr "Výběr"
 
-#: catalog/settings.py:71
-#: portlet/templatetags/lfs_portlets_tags.py:107
+#: catalog/settings.py:71 portlet/templatetags/lfs_portlets_tags.py:107
 #: templates/manage/manage_base.html:86
 #: templates/manage/category/manage_categories_portlet.html:2
 #: templates/manage/category/no_categories.html:11
 msgid "Category with subcategories"
 msgstr "Kategorie s podkategoriemi"
 
-#: catalog/views.py:57
-#: catalog/views.py:171
+#: catalog/views.py:57 catalog/views.py:171
 msgid "The product has been changed according to your selection."
 msgstr "Nastavení produktu bylo změněno podle vašeho výběru"
 
 msgid "Price has been changed according to your selection."
 msgstr "Cena byla změněna podle vašeho výběru"
 
-#: catalog/views.py:168
-#: catalog/views.py:611
+#: catalog/views.py:168 catalog/views.py:611
 msgid "The choosen combination of properties is not deliverable."
 msgstr "Vybraná kombinace vlastností není dostupná"
 
-#: checkout/forms.py:20
-#: checkout/forms.py:26
-#: customer/forms.py:13
+#: checkout/forms.py:20 checkout/forms.py:26 customer/forms.py:13
 #: customer/forms.py:18
 msgid "First Name"
 msgstr "Jméno"
 
-#: checkout/forms.py:21
-#: checkout/forms.py:27
-#: customer/forms.py:14
+#: checkout/forms.py:21 checkout/forms.py:27 customer/forms.py:14
 #: customer/forms.py:19
 msgid "Last Name"
 msgstr "Příjmení"
 
-#: checkout/forms.py:22
-#: customer/forms.py:15
+#: checkout/forms.py:22 customer/forms.py:15
 msgid "Invoice Phone"
 msgstr "Telefon"
 
-#: checkout/forms.py:23
-#: customer/forms.py:16
+#: checkout/forms.py:23 customer/forms.py:16
 msgid "Invoice E-mail"
 msgstr "E-mail"
 
-#: checkout/forms.py:24
-#: checkout/forms.py:30
-#: customer/forms.py:17
-#: customer/forms.py:22
-#: customer/models.py:72
+#: checkout/forms.py:24 checkout/forms.py:30 customer/forms.py:17
+#: customer/forms.py:22 customer/models.py:72
 msgid "Company name"
 msgstr "Firma"
 
-#: checkout/forms.py:28
-#: customer/forms.py:20
+#: checkout/forms.py:28 customer/forms.py:20
 msgid "Shipping Phone"
 msgstr "Telefon"
 
-#: checkout/forms.py:29
-#: customer/forms.py:21
+#: checkout/forms.py:29 customer/forms.py:21
 msgid "Shipping E-mail"
 msgstr "Email"
 
 msgid "Bankname"
 msgstr "Název banky"
 
-#: checkout/forms.py:37
-#: customer/models.py:94
-#: order/models.py:96
+#: checkout/forms.py:37 customer/models.py:94 order/models.py:96
 msgid "Depositor"
 msgstr "Deponent"
 
 msgid "Your message to us"
 msgstr "Vaše zpráva pro nás"
 
-#: checkout/forms.py:61
-#: manage/product/product.py:96
-#: manage/product/product.py:128
-#: manage/product/product.py:156
+#: checkout/forms.py:61 manage/product/product.py:96
+#: manage/product/product.py:128 manage/product/product.py:156
 msgid "This field is required."
 msgstr "Pole je povinné"
 
 msgid "Authenticated only"
 msgstr "Pouze registrovaní"
 
-#: checkout/views.py:65
-#: customer/models.py:80
-#: customer/views.py:56
+#: checkout/views.py:65 customer/models.py:80 customer/views.py:56
 #: templates/manage/customer/customers_inline.html:28
 #: templates/manage/marketing/rating_mails.html:51
 #: templates/manage/reviews/review_inline.html:54
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: checkout/views.py:75
-#: customer/views.py:72
+#: checkout/views.py:75 customer/views.py:72
 msgid "You have been logged in."
 msgstr "Proběhlo vaše přihlášení"
 
-#: checkout/views.py:98
-#: customer/views.py:104
+#: checkout/views.py:98 customer/views.py:104
 msgid "You have been registered and logged in."
 msgstr "Proběhla vaše registrace i přihlášení."
 
 msgid "Default shipping country"
 msgstr "Výchozí země dodání"
 
-#: core/models.py:175
-#: core/management/commands/lfs_migrate.py:173
+#: core/models.py:175 core/management/commands/lfs_migrate.py:173
 msgid "Default Shop Locale"
 msgstr "Výchozí národní nastavení"
 
-#: core/models.py:176
-#: core/management/commands/lfs_migrate.py:175
+#: core/models.py:176 core/management/commands/lfs_migrate.py:175
 msgid "Use international currency codes"
 msgstr "Použít mezinárodní kódy měn"
 
 msgid "Footer"
 msgstr "Patička"
 
-#: core/management/commands/lfs_migrate.py:126
-#: customer/models.py:73
+#: core/management/commands/lfs_migrate.py:126 customer/models.py:73
 msgid "Line 1"
 msgstr "Řádek 1"
 
-#: core/management/commands/lfs_migrate.py:127
-#: customer/models.py:74
+#: core/management/commands/lfs_migrate.py:127 customer/models.py:74
 msgid "Line 2"
 msgstr "Řádek 2"
 
 msgid "%s tag needs group id as argument"
 msgstr "Značka %s vyžaduje jako parametr id skupiny."
 
-#: core/templatetags/lfs_tags.py:397
-#: core/templatetags/lfs_tags.py:427
+#: core/templatetags/lfs_tags.py:397 core/templatetags/lfs_tags.py:427
 #, python-format
 msgid "%s tag needs no argument"
 msgstr "Značka %s nemá žádné parametry"
 msgid "Delete image"
 msgstr "Smazat obrázek"
 
-#: criteria/settings.py:16
-#: criteria/settings.py:24
+#: criteria/settings.py:16 criteria/settings.py:24
 msgid "Equal to"
 msgstr "je stejné jako"
 
-#: criteria/settings.py:17
-#: templates/manage/criteria/number_operators.html:4
+#: criteria/settings.py:17 templates/manage/criteria/number_operators.html:4
 msgid "Less than"
 msgstr "je menší než"
 
 msgid "Less than or equal to"
 msgstr "je menší nebo stejné než"
 
-#: criteria/settings.py:19
-#: templates/manage/criteria/number_operators.html:6
+#: criteria/settings.py:19 templates/manage/criteria/number_operators.html:6
 msgid "Greater than"
 msgstr "je větší než"
 
 msgid "Is not valid"
 msgstr "není platné"
 
-#: criteria/models/criteria.py:51
-#: criteria/models/criteria.py:112
-#: criteria/models/criteria.py:186
-#: criteria/models/criteria.py:321
-#: criteria/models/criteria.py:385
-#: criteria/models/criteria.py:480
-#: criteria/models/criteria.py:614
-#: criteria/models/criteria.py:678
+#: criteria/models/criteria.py:51 criteria/models/criteria.py:112
+#: criteria/models/criteria.py:186 criteria/models/criteria.py:321
+#: criteria/models/criteria.py:385 criteria/models/criteria.py:480
+#: criteria/models/criteria.py:614 criteria/models/criteria.py:678
 #: criteria/models/criteria.py:742
 msgid "Operator"
 msgstr "Operace"
 msgid "Combined length and girth"
 msgstr "Velikost (2xšířka + 2xvýška + délka)"
 
-#: criteria/models/criteria.py:187
-#: customer_tax/models.py:25
+#: criteria/models/criteria.py:187 customer_tax/models.py:25
 #: templates/manage/shop/default_values_tab.html:81
 msgid "Countries"
 msgstr "Seznam zemí"
 msgid "Country: %(operator)s %(countries)s"
 msgstr "Země: %(operator)s %(countries)s"
 
-#: criteria/models/criteria.py:210
-#: customer/models.py:78
+#: criteria/models/criteria.py:210 customer/models.py:78
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:8
 #: templates/manage/criteria/country_criterion.html:8
 #: templates/manage/criteria/distance_criterion.html:8
 msgid "Payment: %(operator)s %(payments)s"
 msgstr "Platba: %(operator)s %(payments)s"
 
-#: criteria/models/criteria.py:412
-#: payment/models.py:121
+#: criteria/models/criteria.py:412 payment/models.py:121
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:13
 #: templates/manage/criteria/country_criterion.html:13
 #: templates/manage/criteria/distance_criterion.html:13
 msgid "Width: %(operator)s %(width)s"
 msgstr "Šířka: %(operator)s %(width)s"
 
-#: criteria/models/criteria.py:743
-#: criteria/models/criteria.py:763
+#: criteria/models/criteria.py:743 criteria/models/criteria.py:763
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:10
 #: templates/manage/criteria/country_criterion.html:10
 #: templates/manage/criteria/distance_criterion.html:10
 msgid "Criterion type"
 msgstr "Typ podmínky"
 
-#: customer/forms.py:36
-#: customer/forms.py:42
+#: customer/forms.py:36 customer/forms.py:42
 #: templates/manage/order/order_inline.html:27
 msgid "E-mail"
 msgstr "E-mail"
 msgid "Selected country"
 msgstr "Vybraná země"
 
-#: customer/models.py:68
-#: customer/models.py:89
-#: customer/models.py:103
+#: customer/models.py:68 customer/models.py:89 customer/models.py:103
 #: templates/manage/cart/cart_inline.html:21
 #: templates/manage/customer/customer.html:23
 msgid "Customer"
 msgstr "Zákazník"
 
-#: customer/models.py:70
-#: templates/manage/customer/customers_inline.html:16
+#: customer/models.py:70 templates/manage/customer/customers_inline.html:16
 msgid "Firstname"
 msgstr "Jméno"
 
-#: customer/models.py:71
-#: templates/manage/customer/customers_inline.html:22
+#: customer/models.py:71 templates/manage/customer/customers_inline.html:22
 msgid "Lastname"
 msgstr "Příjmení"
 
 msgid "City"
 msgstr "Město"
 
-#: customer/models.py:77
-#: order/models.py:53
+#: customer/models.py:77 order/models.py:53
 #: templates/manage/customer/customer_inline.html:128
 #: templates/manage/order/order.html:34
 #: templates/manage/order/order_filters_inline.html:16
 msgid "State"
 msgstr "Stát"
 
-#: customer/models.py:79
-#: templates/manage/order/order_inline.html:43
+#: customer/models.py:79 templates/manage/order/order_inline.html:43
 msgid "Phone"
 msgstr "Telefon"
 
-#: customer/models.py:91
-#: order/models.py:93
+#: customer/models.py:91 order/models.py:93
 msgid "Account number"
 msgstr "Číslo účtu"
 
 msgid "Bank identification code"
 msgstr "Kód banky"
 
-#: customer/models.py:93
-#: order/models.py:95
+#: customer/models.py:93 order/models.py:95
 msgid "Bank name"
 msgstr "Název banky"
 
 msgid "Owner"
 msgstr "Majitel"
 
-#: customer/models.py:107
-#: templates/manage/order/orders_inline.html:12
+#: customer/models.py:107 templates/manage/order/orders_inline.html:12
 #: templates/manage/voucher/vouchers_inline.html:67
 msgid "Number"
 msgstr "Číslo"
 msgid "You have been logged out."
 msgstr "Proběhlo vaše odhlášení"
 
-#: customer_tax/models.py:23
-#: tax/models.py:17
+#: customer_tax/models.py:23 tax/models.py:17
 msgid "Rate"
 msgstr "Sazba"
 
-#: discounts/settings.py:7
-#: voucher/settings.py:7
+#: discounts/settings.py:7 voucher/settings.py:7
 msgid "Absolute"
 msgstr "Absolutně"
 
-#: discounts/settings.py:8
-#: voucher/settings.py:8
+#: discounts/settings.py:8 voucher/settings.py:8
 msgid "Percentage"
 msgstr "Percentuelně"
 
 msgid "Script"
 msgstr "Skript"
 
-#: export/models.py:20
-#: templates/manage/product/product.html:103
+#: export/models.py:20 templates/manage/product/product.html:103
 #: templates/manage/product/variants.html:97
 msgid "Variants"
 msgstr "Kombinace"
 
-#: export/models.py:70
-#: templates/manage/product/product_filters_inline.html:15
+#: export/models.py:70 templates/manage/product/product_filters_inline.html:15
 msgid "Category"
 msgstr "Kategorie"
 
-#: export/models.py:71
-#: templates/manage/manage_base.html:123
+#: export/models.py:71 templates/manage/manage_base.html:123
 msgid "Export"
 msgstr "Export"
 
 msgid "Cheapest"
 msgstr "Nejlevnější"
 
-#: export/settings.py:13
-#: templates/manage/category/category_filter.html:5
+#: export/settings.py:13 templates/manage/category/category_filter.html:5
 #: templates/manage/order/order_filters_inline.html:50
 #: templates/manage/order/orders_filter.html:98
 #: templates/manage/order/orders_filters_inline.html:100
 msgid "The action has been saved."
 msgstr "Akce byla uložena."
 
-#: manage/actions/views.py:98
-#: manage/categories/category.py:129
-#: manage/categories/seo.py:42
-#: manage/categories/view.py:46
-#: manage/product/product.py:224
-#: manage/product/product.py:440
-#: manage/views/shop.py:142
-#: manage/views/shop.py:165
-#: manage/views/shop.py:188
+#: manage/actions/views.py:98 manage/categories/category.py:129
+#: manage/categories/seo.py:42 manage/categories/view.py:46
+#: manage/product/product.py:224 manage/product/product.py:440
+#: manage/views/shop.py:142 manage/views/shop.py:165 manage/views/shop.py:188
 #: manage/views/shop.py:214
 msgid "Please correct the indicated errors."
 msgstr "Opravte prosím vyznačené chyby"
 
 #: manage/categories/category.py:83
 #, python-format
-msgid "Do you really want to delete the category <b>'%(name)s'</b> and all its sub categories?"
-msgstr "Opravdu chcete smazat kategorii <b>'%(name)s'</b> a všechny její podkategorie?"
+msgid ""
+"Do you really want to delete the category <b>'%(name)s'</b> and all its sub "
+"categories?"
+msgstr ""
+"Opravdu chcete smazat kategorii <b>'%(name)s'</b> a všechny její "
+"podkategorie?"
 
 #: manage/categories/category.py:127
 msgid "Category data have been saved."
 msgid "Selected products have been removed from category."
 msgstr "Vybrané produkty byly odebrány z kategorie."
 
-#: manage/categories/seo.py:40
-#: manage/pages/views.py:154
+#: manage/categories/seo.py:40 manage/pages/views.py:154
 msgid "SEO data has been saved."
 msgstr "SEO data uložena"
 
 
 #: manage/customer_tax/forms.py:25
 #, python-format
-msgid "There is already a customer tax with country %(country)s, see %(customer_tax)s %% "
-msgstr "Zákaznická daň pro zemi %(country)s již existuje. Viz. %(customer_tax)s %% "
+msgid ""
+"There is already a customer tax with country %(country)s, see %(customer_tax)"
+"s %% "
+msgstr ""
+"Zákaznická daň pro zemi %(country)s již existuje. Viz. %(customer_tax)s %% "
 
 #: manage/customer_tax/views.py:43
 msgid "Customer tax has been saved."
 msgid "Customer tax has been deleted."
 msgstr "Zákaznická daň byla smazána."
 
-#: manage/delivery_times/views.py:44
-#: manage/views/delivery_times.py:58
+#: manage/delivery_times/views.py:44 manage/views/delivery_times.py:58
 msgid "Delivery time has been saved."
 msgstr "Doba dodání uložena"
 
-#: manage/delivery_times/views.py:75
-#: manage/views/delivery_times.py:82
+#: manage/delivery_times/views.py:75 manage/views/delivery_times.py:82
 msgid "Delivery time has been added."
 msgstr "Doba dodání přidána"
 
-#: manage/delivery_times/views.py:108
-#: manage/views/delivery_times.py:115
+#: manage/delivery_times/views.py:108 manage/views/delivery_times.py:115
 msgid "Delivery time has been deleted."
 msgstr "Doba dodání smazána"
 
 msgid "Discount method has been added."
 msgstr "Způsob slevy přidán"
 
-#: manage/discounts/views.py:151
-#: manage/shipping_methods/views.py:212
-#: manage/shipping_methods/views.py:234
-#: manage/views/payment.py:223
+#: manage/discounts/views.py:151 manage/shipping_methods/views.py:212
+#: manage/shipping_methods/views.py:234 manage/views/payment.py:223
 #: manage/views/payment.py:245
 msgid "Modifications have been changed."
 msgstr "Modifikace byly změněny."
 msgid "Accessories have been removed."
 msgstr "Příslušenství bylo odebráno"
 
-#: manage/product/accessories.py:224
-#: manage/product/accessories.py:244
+#: manage/product/accessories.py:224 manage/product/accessories.py:244
 msgid "Accessories have been updated."
 msgstr "Příslušenství bylo aktualizováno"
 
 msgid "Attachments have been added."
 msgstr "Přílohy byly přidány."
 
-#: manage/product/attachments.py:68
-#: manage/product/attachments.py:80
+#: manage/product/attachments.py:68 manage/product/attachments.py:80
 msgid "Attachment has been updated."
 msgstr "Přílohy byly aktualizovány."
 
 msgid "Seo data has been saved."
 msgstr "SEO data byla uložena"
 
-#: manage/product/variants.py:221
-#: manage/property/views.py:283
+#: manage/product/variants.py:221 manage/property/views.py:283
 msgid "Property has been added."
 msgstr "Vlastnost byla přidána"
 
-#: manage/product/variants.py:243
-#: manage/product/variants.py:332
+#: manage/product/variants.py:243 manage/product/variants.py:332
 msgid "Property has been deleted."
 msgstr "Vlastnost byla smazána."
 
-#: manage/product/variants.py:310
-#: manage/property/views.py:329
+#: manage/product/variants.py:310 manage/property/views.py:329
 msgid "Option has been added."
 msgstr "Volba přidána"
 
-#: manage/product/variants.py:395
-#: manage/product/variants.py:397
+#: manage/product/variants.py:395 manage/product/variants.py:397
 msgid "That slug is already in use. Please use another."
 msgstr "Tento krátký název je již použit. Zvolte prosím jiný."
 
 msgid "Shipping method has been added."
 msgstr "Způsob dodání byl přidán"
 
-#: manage/shipping_methods/views.py:256
-#: manage/views/payment.py:271
+#: manage/shipping_methods/views.py:256 manage/views/payment.py:271
 msgid "Price has been added"
 msgstr "Cena byla přidána"
 
-#: manage/shipping_methods/views.py:276
-#: manage/views/payment.py:286
+#: manage/shipping_methods/views.py:276 manage/views/payment.py:286
 msgid "Prices have been deleted"
 msgstr "Ceny byly smazány"
 
-#: manage/shipping_methods/views.py:288
-#: manage/views/payment.py:297
+#: manage/shipping_methods/views.py:288 manage/views/payment.py:297
 msgid "Prices have been updated"
 msgstr "Ceny byly aktualizovány"
 
 msgid "Portlet has been saved."
 msgstr "Porltet byl uložen"
 
-#: manage/views/orders.py:247
-#: manage/views/orders.py:283
+#: manage/views/orders.py:247 manage/views/orders.py:283
 msgid "Filters has been set"
 msgstr "Filtry byly nastaveny"
 
 msgid "Topseller have been updated."
 msgstr "Položka byla aktualizována"
 
-#: manage/voucher/forms.py:39
-#: templates/manage/cart/cart_inline.html:106
+#: manage/voucher/forms.py:39 templates/manage/cart/cart_inline.html:106
 #: templates/manage/order/order_inline.html:166
 #: templates/manage/product/product_filters_inline.html:13
 msgid "Amount"
 msgstr "Množství"
 
-#: manage/voucher/forms.py:41
-#: templates/manage/voucher/vouchers_inline.html:79
+#: manage/voucher/forms.py:41 templates/manage/voucher/vouchers_inline.html:79
 msgid "Start date"
 msgstr "Datum začátku"
 
-#: manage/voucher/forms.py:42
-#: templates/manage/voucher/vouchers_inline.html:82
+#: manage/voucher/forms.py:42 templates/manage/voucher/vouchers_inline.html:82
 msgid "End date"
 msgstr "Datum konce"
 
 msgid "Kind of"
 msgstr "Druh"
 
-#: manage/voucher/forms.py:44
-#: templates/manage/voucher/vouchers_inline.html:85
+#: manage/voucher/forms.py:44 templates/manage/voucher/vouchers_inline.html:85
 msgid "Effective from"
 msgstr "Platné od"
 
-#: manage/voucher/forms.py:46
-#: portlet/models/featured.py:26
+#: manage/voucher/forms.py:46 portlet/models/featured.py:26
 #: portlet/models/forsale.py:27
 #: templates/manage/voucher/vouchers_inline.html:94
 msgid "Limit"
 msgid "sales"
 msgstr "Prodáno"
 
-#: marketing/models.py:47
-#: templates/manage/order/order.html:59
+#: marketing/models.py:47 templates/manage/order/order.html:59
 msgid "Order"
 msgstr "Objednávka"
 
 msgid "Voucher tax"
 msgstr "Daň kupónu"
 
-#: order/models.py:102
-#: templates/manage/customer/customer_inline.html:134
+#: order/models.py:102 templates/manage/customer/customer_inline.html:134
 #: templates/manage/order/orders_inline.html:27
 msgid "Message"
 msgstr "Zpráva"
 msgid "Short text"
 msgstr "Krátký text"
 
-#: page/models.py:21
-#: portlet/models/text.py:15
+#: page/models.py:21 portlet/models/text.py:15
 msgid "Text"
 msgstr "Text"
 
 msgid "File"
 msgstr "Soubor"
 
-#: payment/models.py:72
-#: payment/models.py:123
-#: shipping/models.py:70
+#: payment/models.py:72 payment/models.py:123 shipping/models.py:70
 #: shipping/models.py:166
 #: templates/manage/payment/payment_method_prices.html:24
 #: templates/manage/shipping_methods/shipping_method_prices.html:24
 msgid "Featured products"
 msgstr "Oblíbené produkty"
 
-#: portlet/models/featured.py:27
-#: portlet/models/forsale.py:28
+#: portlet/models/featured.py:27 portlet/models/forsale.py:28
 msgid "Use current category"
 msgstr "Použít aktuální kategorii"
 
-#: portlet/models/featured.py:28
-#: portlet/models/forsale.py:29
+#: portlet/models/featured.py:28 portlet/models/forsale.py:29
 msgid "Slideshow"
 msgstr "Slideshow"
 
 msgid "Note"
 msgstr "Poznámka"
 
-#: shipping/models.py:79
-#: templates/manage/shop/default_values_tab.html:9
+#: shipping/models.py:79 templates/manage/shop/default_values_tab.html:9
 msgid "Price Calculator"
 msgstr "Výpočet ceny"
 
 msgid "Login"
 msgstr "Přihlášení"
 
-#: templates/manage/manage_base.html:70
-#: templates/manage/shop/shop.html:10
+#: templates/manage/manage_base.html:70 templates/manage/shop/shop.html:10
 msgid "Shop"
 msgstr "Obchod"
 
-#: templates/manage/manage_base.html:72
-#: templates/manage/actions/action.html:9
+#: templates/manage/manage_base.html:72 templates/manage/actions/action.html:9
 #: templates/manage/actions/no_actions.html:10
 msgid "Actions"
 msgstr "Akce (záložky)"
 msgid "Static blocks"
 msgstr "Statické bloky"
 
-#: templates/manage/manage_base.html:104
-#: templates/manage/manage_base.html:107
+#: templates/manage/manage_base.html:104 templates/manage/manage_base.html:107
 #: templates/manage/customer/customers.html:16
 #: templates/manage/customer/customers_inline.html:4
 msgid "Customers"
 msgstr "Zákazníci"
 
-#: templates/manage/manage_base.html:106
-#: templates/manage/cart/carts.html:17
+#: templates/manage/manage_base.html:106 templates/manage/cart/carts.html:17
 #: templates/manage/cart/carts.html:20
 msgid "Carts"
 msgstr "Košíky"
 msgid "Do you really want to delete this object?"
 msgstr "Opravdu chcete smazat tento objekt?"
 
-#: templates/manage/utils.html:12
-#: templates/manage/utils.html.py:17
+#: templates/manage/utils.html:12 templates/manage/utils.html.py:17
 msgid "Utilities"
 msgstr "Nástroje"
 
 #: templates/manage/manufacturers/manufacturer.html:28
 #: templates/manage/manufacturers/manufacturer_data_inline.html:2
 #: templates/manage/pages/add_page.html:14
-#: templates/manage/pages/data_tab.html:2
-#: templates/manage/pages/page.html:32
+#: templates/manage/pages/data_tab.html:2 templates/manage/pages/page.html:32
 #: templates/manage/payment/add_payment_method.html:16
 #: templates/manage/payment/manage_payment.html:28
 #: templates/manage/payment/payment_method_data.html:3
 msgstr "Zobrazit"
 
 #: templates/manage/category/manage_category.html:45
-#: templates/manage/category/seo.html:3
-#: templates/manage/pages/page.html:33
+#: templates/manage/category/seo.html:3 templates/manage/pages/page.html:33
 #: templates/manage/pages/seo_tab.html:2
 #: templates/manage/product/product.html:109
-#: templates/manage/product/seo.html:3
-#: templates/manage/shop/seo_tab.html:3
+#: templates/manage/product/seo.html:3 templates/manage/shop/seo_tab.html:3
 #: templates/manage/shop/shop.html:13
 msgid "SEO"
 msgstr "SEO"
 msgstr "Odebrat z kategorie"
 
 #: templates/manage/category/seo.html:12
-#: templates/manage/pages/seo_tab.html:11
-#: templates/manage/product/seo.html:71
+#: templates/manage/pages/seo_tab.html:11 templates/manage/product/seo.html:71
 #: templates/manage/shop/seo_tab.html:12
 msgid "Save SEO"
 msgstr "Uložit SEO"
 msgstr "Odeslat kopii"
 
 #: templates/manage/marketing/rating_mails.html:30
-msgid "The mails will also send to the shop notification email adresses (if not in test mode)"
-msgstr "Testovací emaily budou zaslány také na notifikační adresy (pokud se nejdná o testovací režim)"
+msgid ""
+"The mails will also send to the shop notification email adresses (if not in "
+"test mode)"
+msgstr ""
+"Testovací emaily budou zaslány také na notifikační adresy (pokud se nejdná o "
+"testovací režim)"
 
 #: templates/manage/marketing/rating_mails.html:40
 msgid "Rating mails sent"
 
 #: templates/manage/order/order_inline.html:174
 msgid "Included VAT"
-msgstr "včetně DPH"
-
-#: templates/manage/order/order_inline.html:242
+msgstr "DPH"
+
+#: templates/manage/order/order_inline.html:251
 msgid "Voucher"
 msgstr "Kopón"
 
-#: templates/manage/order/order_inline.html:259
+#: templates/manage/order/order_inline.html:268
 msgid "Shipping"
 msgstr "Dodání"
 
-#: templates/manage/order/order_inline.html:275
+#: templates/manage/order/order_inline.html:284
 msgid "Payment"
 msgstr "Platba"
 
-#: templates/manage/order/order_inline.html:297
+#: templates/manage/order/order_inline.html:306
 msgid "Inclusive VAT"
 msgstr "DPH"
 
-#: templates/manage/order/order_inline.html:306
+#: templates/manage/order/order_inline.html:315
 msgid "Message from the customer"
 msgstr "Zpráva od zákazníka"
 
-#: templates/manage/order/order_inline.html:320
+#: templates/manage/order/order_inline.html:329
 msgid "Paypal Transaction ID"
 msgstr "Číslo Paypal transakce"
 
 
 #: templates/manage/product/properties.html:204
 msgid "Please go to the variants to assign property values."
-msgstr "Pokud chcete přiřadit hodnoty vlastností, přejděte prosím na záložku Kombinace"
+msgstr ""
+"Pokud chcete přiřadit hodnoty vlastností, přejděte prosím na záložku "
+"Kombinace"
 
 #: templates/manage/product/related_products_inline.html:89
 msgid "Add to related products"

lfs/manufacturer/admin.py

+from django.contrib import admin
+from lfs.catalog.models import Manufacturer
+
+
+admin.site.register(Manufacturer)

lfs/search/views.py

 # django imports
 from django.db.models import Q
+from django.core.exceptions import FieldError
 from django.http import HttpResponse
 from django.shortcuts import render_to_response
 from django.template import RequestContext
     # Sorting
     sorting = request.session.get("sorting")
     if sorting:
-        products = products.order_by(sorting)
+        try:
+            products = products.order_by(sorting)
+        except FieldError:
+            # this should not happen but I experienced it when
+            # switching on/off lfs_solr which uses different
+            # field specification for sorting but the same session key
+            del request.session["sorting"]
 
     total = 0
     if products:
         "products": products,
         "q": q,
         "total": total,
-    }))
+    }))

lfs/static/css/lfs.manage-custom.css

+/*
+This file is intentionally left blank. 
+Feel free to create a custom version in your LFS theme package 
+to customize LFS management interface
+*/
Add a comment to this file

lfs/static/css/lfs.manage.css

File contents unchanged.

lfs/static/js/lfs.manage-custom.js

+// This file is intentionally left blank. 
+// Feel free to create a custom version in your LFS theme package 
+// to customize LFS management interface

lfs/templates/manage/manage_base.html

             <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}jquery-ui-1.8.13.custom/css/smoothness/jquery-ui-1.8.13.custom.css" />
             <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}jquery/jquery.jgrowl.css" />
             <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}jquery/superfish/superfish.css" />
+            <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/lfs.manage-custom.css" />
         {% endcompress %}
         <script type="text/javascript">
             var LFS_MANAGE_IMAGEBROWSER_URL = '{% url lfs_manage_imagebrowser %}';
             <script type="text/javascript" src="{{ STATIC_URL }}jquery/superfish/superfish.js"></script>
             <script type="text/javascript" src="{{ STATIC_URL }}js/lfs.manage.js"></script>
             <script type="text/javascript" src="{{ STATIC_URL }}js/urlify.js"></script>
+            <script type="text/javascript" src="{{ STATIC_URL }}js/lfs.manage-custom.js"></script>
         {% endcompress %}
         {% block javascript %}{% endblock %}
     </head>

lfs/templates/manage/order/order_inline.html

     </tr>
 </table>
 
-<table class="lfs-manage-table">
+<table class="lfs-manage-table order-inline">
     <tr>
-        <th width="200px">
+        <th width="100px">
+            {% trans 'Image' %}
+        </th>
+        <th width="100px">
             {% trans 'SKU' %}
         </th>
         <th>
         </th>
     </tr>
     {% for item in current_order.items.all %}
-        <tr>
-            <td>
+        <tr class="product-row">
+            <td class="top">
+                {% if item.product.get_image.image %}
+                <a href="{% url lfs_manage_product item.product.id %}">
+                    <img alt="{{ item.product_name }}"
+                         src="{{ item.product.get_image.image.url_100x100 }}" />
+                 </a>
+                {% else %}
+                &nbsp;
+                {% endif %}
+            </td>
+            <td class="top">
                 {{ item.product_sku }}
             </td>
-            <td>
+            <td class="top">
                 {% if item.product %}
                     <a href="{% url lfs_manage_product item.product.id %}">
                         {{ item.product_name }}
                 {% endif %}
             </td>
 
-            <td class="number">
+            <td class="number top">
                {{ item.amount }} {{ item.product.unit }}
                 {% if item.product.active_packing_unit %}
                     <span class="packing-unit">
                 {% endif %}
 
             </td>
-            <td class="number">
+            <td class="number top">
                {{ item.product_price_gross|currency:request }}{% if item.product.price_unit %} / {{ item.product.price_unit }}{% endif %}
             </td>
-            <td class="number">
+            <td class="number top">
                ({{ item.product_tax|currency:request }})
             </td>
-            <td class="number">
+            <td class="number top">
                {{ item.price_gross|currency:request }}
             </td>
         </tr>

lfs/templates/manage/order/orders_inline.html

             </th>
         </tr>
             {% for order in page.object_list %}
-                <tr class="clickable {% cycle 'even' 'odd' %}"
-                    onclick="window.location='{% url lfs_manage_order order.id %}'">
+                <tr class="clickable {% cycle 'even' 'odd' %} order-state-{{ order.state }}"
+                    onclick="window.location='{% url lfs.manage.views.order_view order.id %}'">
                     <td>
                         {{ order.number|default_if_none:"-" }}
                     </td>

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.