twidi committed 279ba4a Merge

merged from upstream

  • Participants
  • Parent commits 26a04bd, 998b294

Comments (0)

Files changed (3)

File satchmo/apps/payment/locale/da/LC_MESSAGES/django.po

 #: templates/shop/checkout/purchaseorder/confirm.html:15
 #, python-format
 msgid "This order will be charged on your account for %(order_total)s."
-msgstr "Denne ordre debiteres din konto for %(ordre_total)s."
+msgstr "Denne ordre debiteres din konto for %(order_total)s."
 #: templates/shop/checkout/purchaseorder/pay_ship.html:9
 msgid "Purchase Order #"

File satchmo/apps/product/modules/configurable/

         pvs = ProductVariation.objects.filter(parent=self.parent)
         pvs = pvs.exclude(product=self.product)
-        for pv in pvs:
-            if pv.unique_option_ids == self.unique_option_ids:
-                return # Don't allow duplicates
+        for option in self.options.all():
+            pvs = pvs.filter(options__option_group__id=option.option_group_id, 
+                options__value=option.value)
+        if pvs.count():
+            return # Don't allow duplicates
         if not
             # will force calculation of default name

File satchmo/apps/satchmo_store/shop/locale/cs/LC_MESSAGES/django.po

 #: templates/shop/email/order_shipped.txt:3
 #, python-format
 msgid "Thank you for ordering with %(shop_name)s."
-msgstr "Děkujeme za Vaši Objednávku z (shop_name)s."
+msgstr "Děkujeme za Vaši Objednávku z %(shop_name)s."
 #: templates/shop/email/order_complete.html:8
 #: templates/shop/email/order_complete.txt:7