Commits

Kai Diefenbach committed c8d2808 Merge

Merged 0.6 branch

Comments (0)

Files changed (5)

 0000000000000000000000000000000000000000 0.6.0b3
 0000000000000000000000000000000000000000 0.6.0b3
 33d79725e3df7f66bc18c551a648676e6b5f6292 0.6.0b3
+a10491027d68e40aa92892e55110cc29682b80aa 0.6.0
+a10491027d68e40aa92892e55110cc29682b80aa beta
+a10491027d68e40aa92892e55110cc29682b80aa 4
+a10491027d68e40aa92892e55110cc29682b80aa 0.6.0
+0000000000000000000000000000000000000000 0.6.0
+a10491027d68e40aa92892e55110cc29682b80aa 4
+0000000000000000000000000000000000000000 4
+a10491027d68e40aa92892e55110cc29682b80aa beta
+0000000000000000000000000000000000000000 beta
+4d7cb9b799dbe49a54bf392151f2f544d36c346a 0.6.0b4
 Changes
 =======
 
+0.6.0 beta 4 (2011-11-26)
+-------------------------
+* Bugfix: fixed display of vouchers options tab
+* Bugfix: don't translate label of supplier_id field within lfs_migrate
+* Bugfix: fixed the management of a customer if he has no cart yet
+* Bugfix: fixed cart management interface; issue #113
+
 0.6.0 beta 3 (2011-11-26)
 -------------------------
 

lfs/manage/views/carts.py

 
     total = 0
     for item in cart.get_items():
-        total += item.get_price_gross()
+        total += item.get_price_gross(request)
 
     try:
         if cart.user:

lfs/templates/manage/cart/cart_inline.html

 				---
 			{% endif %}
         </td>
-    </tr>        
+    </tr>
     <tr>
         <td class="label">
             {% trans 'Creation date' %}:
                 	{{ item.product.get_name }}
                 </td>
                 <td class="number">
-                    {{ item.product.get_price|currency }}
+                    {{ item.product|get_price:request|currency }}
                 </td>
                 <td class="number">
                     {{ item.amount }}
                 </td>
                 <td class="number">
-                    {{ item.get_price|currency }}
+                    {{ item|get_price:request|currency }}
                 </td>
             </tr>
         {% endfor %}
File contents unchanged.