Interface_Adminhtml_Default

Version Notes

1.8.1.0

Release Info

Developer	Magento Core Team
Extension	Interface_Adminhtml_Default
Version	1.8.1.0
Comparing to
See all releases

Code changes from version 1.8.0.0 to 1.8.1.0

Files changed (35) hide show

app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml +12 -12
app/design/adminhtml/default/default/template/customer/tab/addresses.phtml +0 -1
app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml +200 -93
app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml +187 -81
app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml +191 -87
app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml +184 -81
app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml +200 -97
app/design/adminhtml/default/default/template/email/order/items.phtml +7 -8
app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml +35 -0
app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml +39 -0
app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml +19 -22
app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml +57 -32
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml +159 -142
app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml +10 -10
app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml +149 -135
app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml +149 -135
app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml +156 -141
app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml +12 -11
app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml +155 -140
app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml +10 -10
app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml +22 -4
app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml +1 -1
app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml +6 -6
app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml +58 -39
app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml +10 -10
app/design/adminhtml/default/default/template/system/store/cell.phtml +33 -0
app/design/adminhtml/default/default/template/system/store/container.phtml +37 -0
app/design/adminhtml/default/default/template/system/store/tree.phtml +99 -0
app/design/adminhtml/default/default/template/tax/notifications.phtml +34 -12
package.xml +6 -6
skin/adminhtml/default/default/boxes.css +3 -1

app/design/adminhtml/default/default/template/bundle/sales/creditmemo/create/items/renderer.phtml CHANGED Viewed

	@@ -103,12 +103,12 @@
103	</small>
104	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
105	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
106	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
107	<?php endforeach; ?>
108	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
109	<small>
110	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
112	<?php endforeach; ?>
113	</small>
114	<?php endif; ?>
	@@ -137,7 +137,7 @@
137	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
138
139	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
140	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
141	<?php else: ?>
142	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
143	<?php endif; ?>
	@@ -147,7 +147,7 @@
147	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
148	<small>
149	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
150	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
151	<?php endforeach; ?>
152	</small>
153	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -164,7 +164,7 @@
164
165	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
166	<br />
167	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
168	<?php endif; ?>
169	<?php endif; ?>
170	</span>
	@@ -273,12 +273,12 @@
273	</small>
274	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
275	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
276	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
277	<?php endforeach; ?>
278	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
279	<small>
280	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
281	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
282	<?php endforeach; ?>
283	</small>
284	<?php endif; ?>
	@@ -306,7 +306,7 @@
306	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
307	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
308	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
309	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
310	<?php else: ?>
311	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
312	<?php endif; ?>
	@@ -318,7 +318,7 @@
318	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
319	<small>
320	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
321	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
322	<?php endforeach; ?>
323	</small>
324	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -334,7 +334,7 @@
334	<?php endif; ?>
335
336	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
337	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
338	<?php endif; ?>
339	<?php endif; ?>
340	</span>
	@@ -361,8 +361,8 @@
361	<td class="a-right last">
362	<?php if ($this->canShowPriceInfo($_item)): ?>
363	<?php echo $this->displayPrices(
364	- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
365	- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
366	) ?>
367	<?php else: ?>
368


103	</small>
104	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
105	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
106	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
107	<?php endforeach; ?>
108	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
109	<small>
110	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
112	<?php endforeach; ?>
113	</small>
114	<?php endif; ?>

137	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
138
139	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
140	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
141	<?php else: ?>
142	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
143	<?php endif; ?>

147	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
148	<small>
149	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
150	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
151	<?php endforeach; ?>
152	</small>
153	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

164
165	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
166	<br />
167	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
168	<?php endif; ?>
169	<?php endif; ?>
170	</span>

273	</small>
274	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
275	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
276	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
277	<?php endforeach; ?>
278	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
279	<small>
280	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
281	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
282	<?php endforeach; ?>
283	</small>
284	<?php endif; ?>

306	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
307	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
308	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
309	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
310	<?php else: ?>
311	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
312	<?php endif; ?>

318	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
319	<small>
320	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
321	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
322	<?php endforeach; ?>
323	</small>
324	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

334	<?php endif; ?>
335
336	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
337	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
338	<?php endif; ?>
339	<?php endif; ?>
340	</span>

361	<td class="a-right last">
362	<?php if ($this->canShowPriceInfo($_item)): ?>
363	<?php echo $this->displayPrices(
364	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
365	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
366	) ?>
367	<?php else: ?>
368

app/design/adminhtml/default/default/template/bundle/sales/creditmemo/view/items/renderer.phtml CHANGED Viewed

	@@ -101,12 +101,12 @@
101	</small>
102	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
103	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
105	<?php endforeach; ?>
106	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
107	<small>
108	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
109	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
110	<?php endforeach; ?>
111	</small>
112	<?php endif; ?>
	@@ -135,7 +135,7 @@
135	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
136
137	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
138	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
139	<?php else: ?>
140	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
141	<?php endif; ?>
	@@ -145,7 +145,7 @@
145	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
146	<small>
147	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
148	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
149	<?php endforeach; ?>
150	</small>
151	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -162,7 +162,7 @@
162
163	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
164	<br />
165	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
166	<?php endif; ?>
167	<?php endif; ?>
168	</span>
	@@ -207,12 +207,12 @@
207	</small>
208	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
209	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
210	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
211	<?php endforeach; ?>
212	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
213	<small>
214	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
216	<?php endforeach; ?>
217	</small>
218	<?php endif; ?>
	@@ -240,7 +240,7 @@
240	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
241	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
242	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
243	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
244	<?php else: ?>
245	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
246	<?php endif; ?>
	@@ -252,7 +252,7 @@
252	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
253	<small>
254	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
255	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
256	<?php endforeach; ?>
257	</small>
258	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -268,7 +268,7 @@
268	<?php endif; ?>
269
270	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
271	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
272	<?php endif; ?>
273	<?php endif; ?>
274	</span>
	@@ -295,8 +295,8 @@
295	<td class="a-right last">
296	<?php if ($this->canShowPriceInfo($_item)): ?>
297	<?php echo $this->displayPrices(
298	- $_item->getBaseRowTotal()-$_item->getBaseDiscountAmount()+$_item->getBaseTaxAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
299	- $_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()
300	) ?>
301	<?php else: ?>
302


101	</small>
102	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
103	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
105	<?php endforeach; ?>
106	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
107	<small>
108	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
109	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
110	<?php endforeach; ?>
111	</small>
112	<?php endif; ?>

135	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
136
137	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
138	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
139	<?php else: ?>
140	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
141	<?php endif; ?>

145	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
146	<small>
147	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
148	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
149	<?php endforeach; ?>
150	</small>
151	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

162
163	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
164	<br />
165	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
166	<?php endif; ?>
167	<?php endif; ?>
168	</span>

207	</small>
208	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
209	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
210	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
211	<?php endforeach; ?>
212	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
213	<small>
214	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
216	<?php endforeach; ?>
217	</small>
218	<?php endif; ?>

240	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
241	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
242	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
243	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
244	<?php else: ?>
245	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
246	<?php endif; ?>

252	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
253	<small>
254	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
255	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
256	<?php endforeach; ?>
257	</small>
258	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

268	<?php endif; ?>
269
270	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
271	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
272	<?php endif; ?>
273	<?php endif; ?>
274	</span>

295	<td class="a-right last">
296	<?php if ($this->canShowPriceInfo($_item)): ?>
297	<?php echo $this->displayPrices(
298	+ $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
299	+ $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
300	) ?>
301	<?php else: ?>
302

app/design/adminhtml/default/default/template/bundle/sales/invoice/create/items/renderer.phtml CHANGED Viewed

	@@ -102,12 +102,12 @@
102	</small>
103	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
104	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
106	<?php endforeach; ?>
107	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
108	<small>
109	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
110	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
111	<?php endforeach; ?>
112	</small>
113	<?php endif; ?>
	@@ -136,7 +136,7 @@
136	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
137
138	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
139	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
140	<?php else: ?>
141	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
142	<?php endif; ?>
	@@ -146,7 +146,7 @@
146	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
147	<small>
148	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
149	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
150	<?php endforeach; ?>
151	</small>
152	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -163,7 +163,7 @@
163
164	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
165	<br />
166	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
167	<?php endif; ?>
168	<?php endif; ?>
169	</span>
	@@ -261,12 +261,12 @@
261	</small>
262	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
263	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
264	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
265	<?php endforeach; ?>
266	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
267	<small>
268	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
269	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
270	<?php endforeach; ?>
271	</small>
272	<?php endif; ?>
	@@ -294,7 +294,7 @@
294	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
295	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
296	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
297	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
298	<?php else: ?>
299	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
300	<?php endif; ?>
	@@ -306,7 +306,7 @@
306	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
307	<small>
308	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
309	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
310	<?php endforeach; ?>
311	</small>
312	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -322,7 +322,7 @@
322	<?php endif; ?>
323
324	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
325	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $~~_incl+$~~_item~~->getWeeeTaxAppliedRowAmount(~~)); ?></span>
326	<?php endif; ?>
327	<?php endif; ?>
328	</span>
	@@ -349,8 +349,8 @@
349	<td class="a-right last">
350	<?php if ($this->canShowPriceInfo($_item)): ?>
351	<?php echo $this->displayPrices(
352	- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
353	- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
354	) ?>
355	<?php else: ?>
356


102	</small>
103	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
104	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
106	<?php endforeach; ?>
107	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
108	<small>
109	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
110	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
111	<?php endforeach; ?>
112	</small>
113	<?php endif; ?>

136	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
137
138	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
139	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
140	<?php else: ?>
141	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
142	<?php endif; ?>

146	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
147	<small>
148	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
149	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
150	<?php endforeach; ?>
151	</small>
152	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

163
164	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
165	<br />
166	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
167	<?php endif; ?>
168	<?php endif; ?>
169	</span>

261	</small>
262	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
263	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
264	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
265	<?php endforeach; ?>
266	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
267	<small>
268	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
269	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
270	<?php endforeach; ?>
271	</small>
272	<?php endif; ?>

294	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
295	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
296	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
297	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
298	<?php else: ?>
299	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
300	<?php endif; ?>

306	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
307	<small>
308	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
309	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
310	<?php endforeach; ?>
311	</small>
312	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

322	<?php endif; ?>
323
324	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
325	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item),$_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
326	<?php endif; ?>
327	<?php endif; ?>
328	</span>

349	<td class="a-right last">
350	<?php if ($this->canShowPriceInfo($_item)): ?>
351	<?php echo $this->displayPrices(
352	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
353	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
354	) ?>
355	<?php else: ?>
356

app/design/adminhtml/default/default/template/bundle/sales/invoice/view/items/renderer.phtml CHANGED Viewed

	@@ -100,12 +100,12 @@
100	</small>
101	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
102	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
103	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
104	<?php endforeach; ?>
105	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
106	<small>
107	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
108	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
109	<?php endforeach; ?>
110	</small>
111	<?php endif; ?>
	@@ -134,7 +134,7 @@
134	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
135
136	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
137	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
138	<?php else: ?>
139	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
140	<?php endif; ?>
	@@ -144,7 +144,7 @@
144	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
145	<small>
146	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
147	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
148	<?php endforeach; ?>
149	</small>
150	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -161,7 +161,7 @@
161
162	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
163	<br />
164	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
165	<?php endif; ?>
166	<?php endif; ?>
167	</span>
	@@ -206,12 +206,12 @@
206	</small>
207	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
208	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
209	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
210	<?php endforeach; ?>
211	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
212	<small>
213	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
214	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
215	<?php endforeach; ?>
216	</small>
217	<?php endif; ?>
	@@ -239,7 +239,7 @@
239	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
240	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
241	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
242	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
243	<?php else: ?>
244	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
245	<?php endif; ?>
	@@ -251,7 +251,7 @@
251	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
252	<small>
253	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
254	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
255	<?php endforeach; ?>
256	</small>
257	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -267,7 +267,7 @@
267	<?php endif; ?>
268
269	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
270	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
271	<?php endif; ?>
272	<?php endif; ?>
273	</span>
	@@ -294,8 +294,8 @@
294	<td class="a-right last">
295	<?php if ($this->canShowPriceInfo($_item)): ?>
296	<?php echo $this->displayPrices(
297	- $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
298	- $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
299	) ?>
300	<?php else: ?>
301


100	</small>
101	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
102	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
103	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
104	<?php endforeach; ?>
105	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
106	<small>
107	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
108	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
109	<?php endforeach; ?>
110	</small>
111	<?php endif; ?>

134	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
135
136	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
137	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
138	<?php else: ?>
139	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
140	<?php endif; ?>

144	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
145	<small>
146	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
147	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
148	<?php endforeach; ?>
149	</small>
150	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

161
162	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
163	<br />
164	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
165	<?php endif; ?>
166	<?php endif; ?>
167	</span>

206	</small>
207	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
208	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
209	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
210	<?php endforeach; ?>
211	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
212	<small>
213	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
214	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
215	<?php endforeach; ?>
216	</small>
217	<?php endif; ?>

239	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
240	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
241	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
242	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
243	<?php else: ?>
244	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
245	<?php endif; ?>

251	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
252	<small>
253	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
254	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
255	<?php endforeach; ?>
256	</small>
257	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

267	<?php endif; ?>
268
269	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
270	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
271	<?php endif; ?>
272	<?php endif; ?>
273	</span>

294	<td class="a-right last">
295	<?php if ($this->canShowPriceInfo($_item)): ?>
296	<?php echo $this->displayPrices(
297	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
298	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
299	) ?>
300	<?php else: ?>
301

app/design/adminhtml/default/default/template/bundle/sales/order/view/items/renderer.phtml CHANGED Viewed

	@@ -121,12 +121,12 @@
121	</small>
122	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
123	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
125	<?php endforeach; ?>
126	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
127	<small>
128	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
129	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
130	<?php endforeach; ?>
131	</small>
132	<?php endif; ?>
	@@ -155,7 +155,7 @@
155	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
156
157	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
158	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
159	<?php else: ?>
160	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
161	<?php endif; ?>
	@@ -165,7 +165,7 @@
165	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
166	<small>
167	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
168	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
169	<?php endforeach; ?>
170	</small>
171	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -182,7 +182,7 @@
182
183	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
184	<br />
185	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
186	<?php endif; ?>
187	<?php endif; ?>
188	</span>
	@@ -269,12 +269,12 @@
269	</small>
270	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
271	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
272	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
273	<?php endforeach; ?>
274	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
275	<small>
276	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
277	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
278	<?php endforeach; ?>
279	</small>
280	<?php endif; ?>
	@@ -302,7 +302,7 @@
302	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
303	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
304	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
305	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
306	<?php else: ?>
307	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
308	<?php endif; ?>
	@@ -314,7 +314,7 @@
314	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
315	<small>
316	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
317	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
318	<?php endforeach; ?>
319	</small>
320	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -330,7 +330,7 @@
330	<?php endif; ?>
331
332	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
333	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
334	<?php endif; ?>
335	<?php endif; ?>
336	</span>
	@@ -364,8 +364,8 @@
364	<td class="a-right last">
365	<?php if ($this->canShowPriceInfo($_item)): ?>
366	<?php echo $this->displayPrices(
367	- max(0, $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount()),
368	- max(0, $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount())
369	); ?>
370	<?php else: ?>
371


121	</small>
122	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
123	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
124	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
125	<?php endforeach; ?>
126	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
127	<small>
128	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
129	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
130	<?php endforeach; ?>
131	</small>
132	<?php endif; ?>

155	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
156
157	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
158	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
159	<?php else: ?>
160	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
161	<?php endif; ?>

165	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
166	<small>
167	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
168	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
169	<?php endforeach; ?>
170	</small>
171	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

182
183	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
184	<br />
185	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
186	<?php endif; ?>
187	<?php endif; ?>
188	</span>

269	</small>
270	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
271	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
272	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
273	<?php endforeach; ?>
274	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
275	<small>
276	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
277	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
278	<?php endforeach; ?>
279	</small>
280	<?php endif; ?>

302	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
303	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
304	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
305	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
306	<?php else: ?>
307	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
308	<?php endif; ?>

314	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
315	<small>
316	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
317	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
318	<?php endforeach; ?>
319	</small>
320	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

330	<?php endif; ?>
331
332	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
333	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
334	<?php endif; ?>
335	<?php endif; ?>
336	</span>

364	<td class="a-right last">
365	<?php if ($this->canShowPriceInfo($_item)): ?>
366	<?php echo $this->displayPrices(
367	+ max(0, $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount()),
368	+ max(0, $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount())
369	); ?>
370	<?php else: ?>
371

app/design/adminhtml/default/default/template/customer/tab/addresses.phtml CHANGED Viewed

	@@ -532,7 +532,6 @@ addressesModel.prototype = {
532	if (data.length) {
533	// Create visible selectbox 'region_id' and hidden 'region'
534	var html = '<select name="' + regionIdHtmlName + '" id="' + regionIdHtmlId + '" class="required-entry select" title="' + this.regionElement.title + '">';
535	- html+= '<option value=""></option>';
536	for (var i in data){
537	if(data[i].label) {
538	html+= '<option value="'+data[i].value+'"';


532	if (data.length) {
533	// Create visible selectbox 'region_id' and hidden 'region'
534	var html = '<select name="' + regionIdHtmlName + '" id="' + regionIdHtmlId + '" class="required-entry select" title="' + this.regionElement.title + '">';

535	for (var i in data){
536	if(data[i].label) {
537	html+= '<option value="'+data[i].value+'"';

app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/create/items/renderer/downloadable.phtml CHANGED Viewed

@@ -27,113 +27,220 @@
             <?php $_item = $this->getItem() ?>
             <?php $this->setPriceDataObject($_item); ?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-            -
                <?php if ($this->canParentReturnToStock($_item)) : ?>
-            -
                    <td class="a-center">
                     <?php if ($this->canReturnItemToStock($_item)) : ?>
-            -
                        <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
                     <?php endif; ?>
-            -
                    </td>
-            -
                <?php endif; ?>
-            -
                <td class="a-center">
                 <?php if ($this->canEditQty()) : ?>
-            -
                    <input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>"/>
                 <?php else : ?>
-            -
                    <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right">
-            -
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getWeeeTaxAppliedAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


27	<?php $_item = $this->getItem() ?>
28	<?php $this->setPriceDataObject($_item); ?>
29	<tr class="border">
30	+ <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
31	+ <td class="a-right">
32	+
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	<span class="price-excl-tax">
35	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	+ <?php endif; ?>
38	+
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49	+
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
53	+ <small>
54	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	+ <?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72	+
73	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	+ <?php
77	+ echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	+ );
81	+ ?>
82	+ </span>
83	+ <?php endif; ?>
84	+ <?php endif; ?>
85	+ </span>
86	+ <br/>
87	<?php endif; ?>
88	+
89	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
90	<span class="price-incl-tax">
91	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
92	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
93	+ <?php endif; ?>
94	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
95	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
96	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
97	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
98	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
99	+ <br/>
100	+ <small>
101	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
102	+ <span class="nobr"><?php echo $tax['title']; ?>
103	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
104	+ <br/>
105	+ <?php endforeach; ?>
106	+ </small>
107	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
108	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
109	+ <br/>
110	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	+ <span class="nobr"><small><?php echo $tax['title']; ?>
112	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
113	+ <br/>
114	+ <?php endforeach; ?>
115	+ <span class="nobr">
116	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
117	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
118	+ </span>
119	+ <?php else: // excl. ?>
120	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
121	+ <?php endif; ?>
122	+ </span>
123	<?php endif; ?>
124	+ </td>
125	+ <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
126	+ <?php if ($this->canParentReturnToStock($_item)) : ?>
127	+ <td class="a-center">
128	<?php if ($this->canReturnItemToStock($_item)) : ?>
129	+ <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
130	+ value="1"<?php if ($_item->getBackToStock()): ?> checked<?php endif; ?>/>
131	<?php endif; ?>
132	+ </td>
133	+ <?php endif; ?>
134	+ <td class="a-center">
135	<?php if ($this->canEditQty()) : ?>
136	+ <input type="text" class="input-text qty-input"
137	+ name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
138	+ value="<?php echo $_item->getQty() * 1 ?>"/>
139	<?php else : ?>
140	+ <?php echo $_item->getQty() * 1 ?>
141	<?php endif; ?>
142	+ </td>
143	+ <td class="a-right">

144
145	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
146	<span class="price-excl-tax">
147	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
148	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
149	+ <?php endif; ?>
150	+
151	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
152	+ <?php
153	+ echo $this->displayPrices(
154	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
155	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
156	+ );
157	+ ?>
158	+ <?php else: ?>
159	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
160	+ <?php endif; ?>
161	+
162	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
163	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
164	+ <small>
165	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
166	+ <span class="nobr"><?php echo $tax['title']; ?>
167	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
168	+ <?php endforeach; ?>
169	+ </small>
170	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
171	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
172	+ <span class="nobr"><small><?php echo $tax['title']; ?>
173	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
174	+ <?php endforeach; ?>
175	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
176	+ <small>
177	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
178	+ <span class="nobr"><?php echo $tax['title']; ?>
179	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
180	+ <?php endforeach; ?>
181	+ </small>
182	+ <?php endif; ?>
183	+
184	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
185	+ <br/>
186	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
187	+ <?php
188	+ echo $this->displayPrices(
189	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
190	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
191	+ );
192	+ ?>
193	+ </span>
194	+ <?php endif; ?>
195	+ <?php endif; ?>
196	+ </span>
197	+ <br/>
198	<?php endif; ?>
199	+
200	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
201	<span class="price-incl-tax">
202	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
203	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
204	+ <?php endif; ?>
205	+ <?php $rowWeeeTaxInclTax = Mage::helper('weee')->getRowWeeeTaxInclTax($_item); ?>
206
207	+ <?php if ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
208	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
209	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
210	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
211	+ <br/>
212	+ <small>
213	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
214	+ <span class="nobr"><?php echo $tax['title']; ?>
215	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
216	+ <br/>
217	+ <?php endforeach; ?>
218	+ </small>
219	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
220	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
221	+ <br/>
222	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
223	+ <span class="nobr"><small><?php echo $tax['title']; ?>
224	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
225	+ <br/>
226	+ <?php endforeach; ?>
227	+ <span class="nobr">
228	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
229	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
230	+ </span>
231	+ <?php else: // excl. ?>
232	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
233	+ <?php endif; ?>
234	+ </span>
235	+ <?php endif; ?>
236	+ </td>
237	+
238	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
239	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
240	+ <td class="a-right last">
241	+ <?php echo $this->displayPrices(
242	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
243	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
244	+ ) ?>
245	+ </td>
246	</tr>

app/design/adminhtml/default/default/template/downloadable/sales/order/creditmemo/view/items/renderer/downloadable.phtml CHANGED Viewed

@@ -29,95 +29,201 @@
             <tr class="border">
                 <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
                 <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
-            -
                <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                <?php endif; ?>
                 </td>
-            -
                <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
                 <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
-            -
                <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                <?php endif; ?>
                 </td>
                 <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
                 <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
                 <td class="a-right last">
                     <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()-$_item->getBaseDiscountAmount()+$_item->getBaseTaxAmount(),
-            -
                        $_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedAmount
                     ) ?>
                 </td>
             </tr>


29	<tr class="border">
30	<td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
31	<td class="a-right">
32	+
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	+ <span class="price-excl-tax">
35	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	+ <?php endif; ?>
38	+
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49	+
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
53	+ <small>
54	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	+ <?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72	+
73	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	+ <?php
77	+ echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	+ );
81	+ ?>
82	+ </span>
83	+ <?php endif; ?>
84	+ <?php endif; ?>
85	+ </span>
86	+ <br/>
87	+ <?php endif; ?>
88	+
89	+ <?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
90	+ <span class="price-incl-tax">
91	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
92	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
93	+ <?php endif; ?>
94	+
95	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
96	+
97	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
98	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
99	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
100	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
101	+ <br/>
102	+ <small>
103	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	+ <span class="nobr"><?php echo $tax['title']; ?>
105	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
106	+ <br/>
107	+ <?php endforeach; ?>
108	+ </small>
109	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
110	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
111	+ <br/>
112	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
113	+ <span class="nobr"><small><?php echo $tax['title']; ?>
114	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
115	+ <br/>
116	+ <?php endforeach; ?>
117	+ <span class="nobr">
118	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
119	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
120	+ </span>
121	+ <?php else: // excl. ?>
122	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
123	+ <?php endif; ?>
124	+ </span>
125	+ <?php endif; ?>
126	</td>
127	+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
128	<td class="a-right">













129
130	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
131	+ <span class="price-excl-tax">
132	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
133	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
134	+ <?php endif; ?>
135	+
136	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
137	+ <?php
138	+ echo $this->displayPrices(
139	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
140	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
141	+ );
142	+ ?>
143	+ <?php else: ?>
144	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
145	+ <?php endif; ?>
146	+
147	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
148	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
149	+ <small>
150	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
151	+ <span class="nobr"><?php echo $tax['title']; ?>
152	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
153	+ <?php endforeach; ?>
154	+ </small>
155	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
156	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
157	+ <span class="nobr"><small><?php echo $tax['title']; ?>
158	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
159	+ <?php endforeach; ?>
160	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
161	+ <small>
162	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
163	+ <span class="nobr"><?php echo $tax['title']; ?>
164	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
165	+ <?php endforeach; ?>
166	+ </small>
167	+ <?php endif; ?>
168	+
169	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
170	+ <br/>
171	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
172	+ <?php
173	+ echo $this->displayPrices(
174	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
175	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
176	+ );
177	+ ?>
178	+ </span>
179	+ <?php endif; ?>
180	+ <?php endif; ?>
181	+ </span>
182	+ <br/>
183	+ <?php endif; ?>
184	+
185	+ <?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
186	+ <span class="price-incl-tax">
187	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
188	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
189	+ <?php endif; ?>
190	+ <?php $rowWeeeTaxInclTax = Mage::helper('weee')->getRowWeeeTaxInclTax($_item); ?>
191	+ <?php if ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
192	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
193	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
194	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
195	+ <br/>
196	+ <small>
197	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
198	+ <span class="nobr"><?php echo $tax['title']; ?>
199	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
200	+ <br/>
201	+ <?php endforeach; ?>
202	+ </small>
203	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
204	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
205	+ <br/>
206	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
207	+ <span class="nobr"><small><?php echo $tax['title']; ?>
208	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
209	+ <br/>
210	+ <?php endforeach; ?>
211	+ <span class="nobr">
212	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
213	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
214	+ </span>
215	+ <?php else: // excl. ?>
216	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
217	+ <?php endif; ?>
218	+ </span>
219	+ <?php endif; ?>
220	</td>
221	<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
222	<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
223	<td class="a-right last">
224	<?php echo $this->displayPrices(
225	+ $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
226	+ $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
227	) ?>
228	</td>
229	</tr>

app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/create/items/renderer/downloadable.phtml CHANGED Viewed

@@ -25,109 +25,213 @@
              */
             ?>
             <?php $_item = $this->getItem() ?>
-            -
            <?php $this->setPriceDataObject($_item)?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
                     </span>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-            -
                <td class="a-center">
                 <?php if ($this->canEditQty()) : ?>
-            -
                    <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>"/>
                 <?php else : ?>
-            -
                    <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
                     </span>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


25	*/
26	?>
27	<?php $_item = $this->getItem() ?>
28	+ <?php $this->setPriceDataObject($_item) ?>
29	<tr class="border">
30	+ <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
31	+ <td class="a-right">
32	+
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	<span class="price-excl-tax">
35	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	+ <?php endif; ?>
38	+
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49	+
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
53	+ <small>
54	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	+ <?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72	+
73	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	+ <?php
77	+ echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	+ );
81	+ ?>
82	+ </span>
83	+ <?php endif; ?>
84	+ <?php endif; ?>
85	+ </span>
86	+ <br/>
87	<?php endif; ?>
88	+
89	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
90	<span class="price-incl-tax">
91	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
92	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
93	+ <?php endif; ?>
94	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
95	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
96	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
97	+ <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
98	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
99	+ <br/>
100	+ <small>
101	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
102	+ <span class="nobr"><?php echo $tax['title']; ?>
103	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
104	+ <br/>
105	+ <?php endforeach; ?>
106	+ </small>
107	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
108	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
109	+ <br/>
110	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	+ <span class="nobr"><small><?php echo $tax['title']; ?>
112	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
113	+ <br/>
114	+ <?php endforeach; ?>
115	+ <span class="nobr">
116	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
117	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
118	+ </span>
119	+ <?php else: // excl. ?>
120	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
121	+ <?php endif; ?>
122	</span>
123	<?php endif; ?>
124	+ </td>
125	+ <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
126	+ <td class="a-center">
127	<?php if ($this->canEditQty()) : ?>
128	+ <input type="text" class="input-text qty-input"
129	+ name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
130	+ value="<?php echo $_item->getQty() * 1 ?>"/>
131	<?php else : ?>
132	+ <?php echo $_item->getQty() * 1 ?>
133	<?php endif; ?>
134	+ </td>
135	+ <td class="a-right">
136	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
137	<span class="price-excl-tax">
138	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
139	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
140	+ <?php endif; ?>
141	+
142	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
143	+ <?php
144	+ echo $this->displayPrices(
145	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
146	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
147	+ );
148	+ ?>
149	+ <?php else: ?>
150	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
151	+ <?php endif; ?>
152	+
153	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
154	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
155	+ <small>
156	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
157	+ <span class="nobr"><?php echo $tax['title']; ?>
158	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
159	+ <?php endforeach; ?>
160	+ </small>
161	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
162	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
163	+ <span class="nobr"><small><?php echo $tax['title']; ?>
164	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
165	+ <?php endforeach; ?>
166	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
167	+ <small>
168	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
169	+ <span class="nobr"><?php echo $tax['title']; ?>
170	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
171	+ <?php endforeach; ?>
172	+ </small>
173	+ <?php endif; ?>
174	+
175	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
176	+ <br/>
177	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
178	+ <?php
179	+ echo $this->displayPrices(
180	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
181	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
182	+ );
183	+ ?>
184	+ </span>
185	+ <?php endif; ?>
186	+ <?php endif; ?>
187	+ </span>
188	+ <br/>
189	<?php endif; ?>
190	+
191	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
192	<span class="price-incl-tax">
193	+ <?php $rowWeeeTaxInclTax = Mage::helper('weee')->getRowWeeeTaxInclTax($_item); ?>
194	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
195	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
196	+ <?php endif; ?>
197
198	+ <?php if ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
199	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
200	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
201	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
202	+ <br/>
203	+ <small>
204	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
205	+ <span class="nobr"><?php echo $tax['title']; ?>
206	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
207	+ <br/>
208	+ <?php endforeach; ?>
209	+ </small>
210	+ <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
211	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
212	+ <br/>
213	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
214	+ <span class="nobr"><small><?php echo $tax['title']; ?>
215	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
216	+ <br/>
217	+ <?php endforeach; ?>
218	+ <span class="nobr">
219	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
220	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
221	+ </span>
222	+ <?php else: // excl. ?>
223	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
224	+ <?php endif; ?>


225
226	</span>
227	<?php endif; ?>
228	+ </td>
229	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
230	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
231	+ <td class="a-right last">
232	+ <?php echo $this->displayPrices(
233	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
234	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
235	+ ) ?>
236	+ </td>
237	</tr>

app/design/adminhtml/default/default/template/downloadable/sales/order/invoice/view/items/renderer/downloadable.phtml CHANGED Viewed

@@ -29,95 +29,198 @@
             <tr class="border">
                 <td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
                 <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
-            -
                <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                <?php endif; ?>
                 </td>
-            -
                <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
                 <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
-            -
                <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
-            -
                    <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
-            -
                <?php endif; ?>
                 </td>
                 <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
                 <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
                 <td class="a-right last">
                     <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getWeeeTaxAppliedAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedAmount()
                     ) ?>
                 </td>
             </tr>


29	<tr class="border">
30	<td><?php echo $this->getColumnHtml($_item, 'downloadable') ?></td>
31	<td class="a-right">
32	+
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	+ <span class="price-excl-tax">
35	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	+ <?php endif; ?>
38	+
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49	+
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
53	+ <small>
54	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	+ <?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72	+
73	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	+ <?php
77	+ echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	+ );
81	+ ?>
82	+ </span>
83	+ <?php endif; ?>
84	+ <?php endif; ?>
85	+ </span>
86	+ <br/>
87	+ <?php endif; ?>
88	+
89	+ <?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
90	+ <span class="price-incl-tax">
91	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
92	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
93	+ <?php endif; ?>
94	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
95	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
96	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
97	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
98	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
99	+ <br/>
100	+ <small>
101	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
102	+ <span class="nobr"><?php echo $tax['title']; ?>
103	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
104	+ <br/>
105	+ <?php endforeach; ?>
106	+ </small>
107	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
108	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
109	+ <br/>
110	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
111	+ <span class="nobr"><small><?php echo $tax['title']; ?>
112	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
113	+ <br/>
114	+ <?php endforeach; ?>
115	+ <span class="nobr">
116	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
117	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
118	+ </span>
119	+ <?php else: // excl. ?>
120	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
121	+ <?php endif; ?>
122	+ </span>
123	+ <?php endif; ?>
124	</td>
125	+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
126	<td class="a-right">
127	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
128	+ <span class="price-excl-tax">
129	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
130	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
131	+ <?php endif; ?>
132	+
133	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
134	+ <?php
135	+ echo $this->displayPrices(
136	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
137	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
138	+ );
139	+ ?>
140	+ <?php else: ?>
141	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
142	+ <?php endif; ?>
143	+
144	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
145	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
146	+ <small>
147	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
148	+ <span class="nobr"><?php echo $tax['title']; ?>
149	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
150	+ <?php endforeach; ?>
151	+ </small>
152	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
153	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
154	+ <span class="nobr"><small><?php echo $tax['title']; ?>
155	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
156	+ <?php endforeach; ?>
157	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
158	+ <small>
159	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
160	+ <span class="nobr"><?php echo $tax['title']; ?>
161	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
162	+ <?php endforeach; ?>
163	+ </small>
164	+ <?php endif; ?>
165	+
166	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
167	+ <br/>
168	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
169	+ <?php
170	+ echo $this->displayPrices(
171	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
172	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
173	+ );
174	+ ?>
175	+ </span>
176	+ <?php endif; ?>
177	+ <?php endif; ?>
178	+ </span>
179	+ <br/>
180	+ <?php endif; ?>
181
182	+ <?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
183	+ <span class="price-incl-tax">
184	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
185	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
186	+ <?php endif; ?>
187	+ <?php $rowWeeeTaxInclTax = Mage::helper('weee')->getRowWeeeTaxInclTax($_item); ?>
188	+ <?php if ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
189	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
190	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
191	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
192	+ <br/>
193	+ <small>
194	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
195	+ <span class="nobr"><?php echo $tax['title']; ?>
196	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
197	+ <br/>
198	+ <?php endforeach; ?>
199	+ </small>
200	+ <?php elseif ($rowWeeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
201	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
202	+ <br/>
203	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
204	+ <span class="nobr"><small><?php echo $tax['title']; ?>
205	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
206	+ <br/>
207	+ <?php endforeach; ?>
208	+ <span class="nobr">
209	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
210	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + $rowWeeeTaxInclTax); ?>
211	+ </span>
212	+ <?php else: // excl. ?>
213	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
214	+ <?php endif; ?>
215	+ </span>
216	+ <?php endif; ?>
217	</td>
218	<td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
219	<td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
220	<td class="a-right last">
221	<?php echo $this->displayPrices(
222	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
223	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
224	) ?>
225	</td>
226	</tr>

app/design/adminhtml/default/default/template/downloadable/sales/order/view/items/renderer/downloadable.phtml CHANGED Viewed

@@ -27,120 +27,223 @@
             <?php $_item = $this->getItem() ?>
             <?php $this->setPriceDataObject($_item) ?>
             <tr<?php if ($this->canDisplayGiftmessage()): ?> class="border"<?php endif; ?>>
-            -
                <td class="giftmessage-single-item">
-            -
                    <?php if ($this->canDisplayContainer()): ?>
-            -
                    <div id="<?php echo $this->getHtmlId() ?>" class="item-container">
                     <?php endif; ?>
                     <div class="item-text">
                         <?php echo $this->getColumnHtml($_item, 'downloadable') ?>
                     </div>
                     <?php if ($this->canDisplayContainer()): ?>
-            -
                    </div>
-            -
                    <?php endif ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $_item->getStatus() ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('original_price') ?></td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('price') ?>
-            -
                    </span>
                 <?php endif; ?>
-            -
                <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displayPriceInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
                    </span>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-            -
                <td class="a-right">
-            -
                <?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-excl-tax">
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Excl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displayPriceAttribute('row_total') ?>
-            -
                    </span>
                 <?php endif; ?>
                 <?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
                     <span class="price-incl-tax">
-            -
                      <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          <br />
-            -
                          <small>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr">+ <?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          </small>
-            -
                      <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
-            -
                          <br />
-            -
                          <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                              <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('core')->currency($tax['row_amount'],true,true); ?></small></span><br />
-            -
                          <?php endforeach; ?>
-            -
                          <span class="nobr">
-            -
                          <?php echo Mage::helper('weee')->__('Total'); ?>:
-            -
                          <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                          </span>
-            -
                      <?php else: // excl. ?>
-            -
                          <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
                      <?php endif; ?>
-            -
            <!--
-            -
                                <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
-            -
                          <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
-            -
                      <?php endif; ?>
-            -
                      <?php echo $this->displaySubtotalInclTax($_item); ?>
-            -
            -->
-            -
                    </span>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayTaxPercent($_item) ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount(),
-            -
                        $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
-            -
                    ); ?>
-            -
                </td>
             </tr>


27	<?php $_item = $this->getItem() ?>
28	<?php $this->setPriceDataObject($_item) ?>
29	<tr<?php if ($this->canDisplayGiftmessage()): ?> class="border"<?php endif; ?>>
30	+ <td class="giftmessage-single-item">
31	+ <?php if ($this->canDisplayContainer()): ?>
32	+ <div id="<?php echo $this->getHtmlId() ?>" class="item-container">
33	<?php endif; ?>
34	<div class="item-text">
35	<?php echo $this->getColumnHtml($_item, 'downloadable') ?>
36	</div>
37	<?php if ($this->canDisplayContainer()): ?>
38	+ </div>
39	+ <?php endif ?>
40	+ </td>
41	+ <td class="a-center"><?php echo $_item->getStatus() ?></td>
42	+ <td class="a-right"><?php echo $this->displayPriceAttribute('original_price') ?></td>
43	+ <td class="a-right">
44	+
45	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
46	<span class="price-excl-tax">
47	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
48	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
49	+ <?php endif; ?>
50	+
51	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
52	+ <?php
53	+ echo $this->displayPrices(
54	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
55	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
56	+ );
57	+ ?>
58	+ <?php else: ?>
59	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
60	+ <?php endif; ?>
61	+
62	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
63	+ <br/>
64	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
65	+ <small>
66	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	+ <?php endforeach; ?>
70	+ </small>
71	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
72	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
73	+ <span class="nobr"><small><?php echo $tax['title']; ?>
74	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
75	+ <?php endforeach; ?>
76	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
77	+ <small>
78	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
79	+ <span class="nobr"><?php echo $tax['title']; ?>
80	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
81	+ <?php endforeach; ?>
82	+ </small>
83	+ <?php endif; ?>
84	+
85	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
86	+ <br/>
87	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
88	+ <?php
89	+ echo $this->displayPrices(
90	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
91	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
92	+ );
93	+ ?>
94	+ </span>
95	+ <?php endif; ?>
96	+ <?php endif; ?>
97	+ </span>
98	+ <br/>
99	<?php endif; ?>
100	+
101	+ <?php if ($this->helper('tax')->displaySalesPriceInclTax() \|\| $this->helper('tax')->displaySalesBothPrices()): ?>
102	<span class="price-incl-tax">
103	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
104	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
105	+ <?php endif; ?>
106	+ <?php $weeeTaxInclTax = Mage::helper('weee')->getWeeeTaxInclTax($_item); ?>
107	+ <?php if ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
108	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
109	+ <?php elseif ($weeeTaxInclTax && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
110	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
111	+ <br/>
112	+ <small>
113	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
114	+ <span class="nobr"><?php echo $tax['title']; ?>
115	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></span>
116	+ <br/>
117	+ <?php endforeach; ?>
118	+ </small>
119	+ <?php elseif ($_item->getWeeeTaxAppliedAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
120	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
121	+ <br/>
122	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
123	+ <span class="nobr"><small><?php echo $tax['title']; ?>
124	+ : <?php echo Mage::helper('core')->currency($tax['amount_incl_tax'], true, true); ?></small></span>
125	+ <br/>
126	+ <?php endforeach; ?>
127	+ <span class="nobr">
128	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
129	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item) + $weeeTaxInclTax); ?>
130	+ </span>
131	+ <?php else: // excl. ?>
132	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getPriceInclTax($_item)); ?>
133	+ <?php endif; ?>
134	+ </span>
135	<?php endif; ?>
136	+ </td>
137	+ <td><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
138
139	+ <td class="a-right">
140	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
141	<span class="price-excl-tax">
142	+ <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
143	+ <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
144	+ <?php endif; ?>
145	+
146	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
147	+ <?php
148	+ echo $this->displayPrices(
149	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
150	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
151	+ );
152	+ ?>
153	+ <?php else: ?>
154	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
155	+ <?php endif; ?>
156	+
157	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
158	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
159	+ <small>
160	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
161	+ <span class="nobr"><?php echo $tax['title']; ?>
162	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
163	+ <?php endforeach; ?>
164	+ </small>
165	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
166	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
167	+ <span class="nobr"><small><?php echo $tax['title']; ?>
168	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
169	+ <?php endforeach; ?>
170	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
171	+ <small>
172	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
173	+ <span class="nobr"><?php echo $tax['title']; ?>
174	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
175	+ <?php endforeach; ?>
176	+ </small>
177	+ <?php endif; ?>
178	+
179	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
180	+ <br/>
181	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
182	+ <?php
183	+ echo $this->displayPrices(
184	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
185	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
186	+ );
187	+ ?>
188	+ </span>
189	+ <?php endif; ?>
190	+ <?php endif; ?>
191	+ </span>
192	+ <br/>
193	<?php endif; ?>
194	+
195	<?php if ($this->helper('tax')->displayCartPriceInclTax() \|\| $this->helper('tax')->displayCartBothPrices()): ?>
196	<span class="price-incl-tax">
197
198	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
199	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
200	+ <?php endif; ?>
201
202	+ <?php if ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 0, 'sales')): // including ?>
203	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
204	+ <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): // incl. + weee ?>
205	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
206	+ <br/>
207	+ <small>
208	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
209	+ <span class="nobr"><?php echo $tax['title']; ?>
210	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></span>
211	+ <br/>
212	+ <?php endforeach; ?>
213	+ </small>
214	+ <?php elseif ($_item->getWeeeTaxAppliedRowAmount() && Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): // excl. + weee + final ?>
215	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item)); ?>
216	+ <br/>
217	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
218	+ <span class="nobr"><small><?php echo $tax['title']; ?>
219	+ : <?php echo Mage::helper('core')->currency($tax['row_amount_incl_tax'], true, true); ?></small></span>
220	+ <br/>
221	+ <?php endforeach; ?>
222	+ <span class="nobr">
223	+ <?php echo Mage::helper('weee')->__('Total'); ?>:
224	+ <?php echo $this->helper('checkout')->formatPrice($this->helper('checkout')->getSubtotalInclTax($_item) + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
225	+ </span>
226	+ <?php else: // excl. ?>
227	+ <?php echo $this->displaySubtotalInclTax($_item); ?>
228	+ <?php endif; ?>
229
230	+ <!--
231
232	+ <?php if ($this->helper('tax')->displayCartBothPrices()): ?>
233	+ <span class="label"><?php echo $this->helper('tax')->__('Incl. Tax'); ?>:</span>
234	+ <?php endif; ?>
235	+ <?php echo $this->displaySubtotalInclTax($_item); ?>
236	+ -->
237	+ </span>
238	<?php endif; ?>
239	+ </td>
240	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
241	+ <td class="a-right"><?php echo $this->displayTaxPercent($_item) ?></td>
242	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
243	+ <td class="a-right last">
244	+ <?php echo $this->displayPrices(
245	+ $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
246	+ $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
247	+ ); ?>
248	+ </td>
249	</tr>

app/design/adminhtml/default/default/template/email/order/items.phtml CHANGED Viewed

	@@ -60,12 +60,12 @@
60	</small>
61	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
62	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
63	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['~~row_amount_incl_tax~~'],true,true); ?></small></span><br />
64	<?php endforeach; ?>
65	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
66	<small>
67	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
68	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['~~row_amount_incl_tax~~'],true,true); ?></span><br />
69	<?php endforeach; ?>
70	</small>
71	<?php endif; ?>
	@@ -84,7 +84,7 @@
84	<?php endif; ?>
85	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
86	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
87	- <?php echo $_order->formatPrice($_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
88	<?php else: ?>
89	<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
90	<?php endif; ?>
	@@ -93,23 +93,22 @@
93	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
94	<small>
95	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
96	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['~~row_amount~~'],true,true); ?></span><br />
97	<?php endforeach; ?>
98	</small>
99	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
100	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
101	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
102	<?php endforeach; ?>
103	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
104	<small>
105	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
106	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
107	<?php endforeach; ?>
108	</small>
109	<?php endif; ?>
110	-
111	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
112	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
113	<?php endif; ?>
114	<?php endif; ?>
115	<?php endif; ?>


60	</small>
61	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
62	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
63	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
64	<?php endforeach; ?>
65	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
66	<small>
67	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
68	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
69	<?php endforeach; ?>
70	</small>
71	<?php endif; ?>

84	<?php endif; ?>
85	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
86	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
87	+ <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
88	<?php else: ?>
89	<?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
90	<?php endif; ?>

93	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
94	<small>
95	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
96	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span><br />
97	<?php endforeach; ?>
98	</small>
99	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
100	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
101	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></small></span><br />
102	<?php endforeach; ?>
103	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
104	<small>
105	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
106	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span><br />
107	<?php endforeach; ?>
108	</small>
109	<?php endif; ?>

110	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
111	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
112	<?php endif; ?>
113	<?php endif; ?>
114	<?php endif; ?>

app/design/adminhtml/default/default/template/payment/form/banktransfer.phtml ADDED Viewed

	@@ -0,0 +1,35 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package default_default
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	+ */
26	+ ?>
27	+ <?php if ($instructions = $this->getInstructions()): ?>
28	+ <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
29	+ <li>
30	+ <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
31	+ <?php echo nl2br($instructions) ?>
32	+ </div>
33	+ </li>
34	+ </ul>
35	+ <?php endif; ?>

app/design/adminhtml/default/default/template/payment/form/cashondelivery.phtml ADDED Viewed

	@@ -0,0 +1,39 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package default_default
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	+ */
26	+
27	+ /**
28	+ * @see Saas_Payment_Block_Form_Cashondelivery
29	+ */
30	+ ?>
31	+ <?php if ($this->getInstructions()): ?>
32	+ <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
33	+ <li>
34	+ <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
35	+ <?php echo nl2br($this->getInstructions()) ?>
36	+ </div>
37	+ </li>
38	+ </ul>
39	+ <?php endif; ?>

app/design/adminhtml/default/default/template/sales/order/create/items/grid.phtml CHANGED Viewed

	@@ -146,12 +146,12 @@
146	</small>
147	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
148	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
149	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['~~amount_incl_tax~~'],true,true); ?></small></span><br />
150	<?php endforeach; ?>
151	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
152	<small>
153	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
154	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['~~amount_incl_tax~~'],true,true); ?></span><br />
155	<?php endforeach; ?>
156	</small>
157	<?php endif; ?>
	@@ -170,7 +170,7 @@
170	<?php endif; ?>
171	<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
172	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
173	- <?php echo $this->formatPrice($_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
174	<?php else: ?>
175	<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
176	<?php endif; ?>
	@@ -179,7 +179,7 @@
179	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
180	<small>
181	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
182	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['~~amount~~'],true,true); ?></span><br />
183	<?php endforeach; ?>
184	</small>
185	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -195,7 +195,7 @@
195	<?php endif; ?>
196
197	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
198	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
199	<?php endif; ?>
200	<?php endif; ?>
201	<?php endif; ?>
	@@ -245,12 +245,12 @@
245	</small>
246	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
247	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
248	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['~~row_amount_incl_tax~~'],true,true); ?></small></span><br />
249	<?php endforeach; ?>
250	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
251	<small>
252	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
253	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['~~row_amount_incl_tax~~'],true,true); ?></span><br />
254	<?php endforeach; ?>
255	</small>
256	<?php endif; ?>
	@@ -269,7 +269,7 @@
269	<?php endif; ?>
270	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
271	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
272	- <?php echo $this->formatPrice($_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
273	<?php else: ?>
274	<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
275	<?php endif; ?>
	@@ -278,7 +278,7 @@
278	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
279	<small>
280	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
281	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['~~row_amount~~'],true,true); ?></span><br />
282	<?php endforeach; ?>
283	</small>
284	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -294,7 +294,7 @@
294	<?php endif; ?>
295
296	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
297	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
298	<?php endif; ?>
299	<?php endif; ?>
300	<?php endif; ?>
	@@ -312,18 +312,19 @@
312
313	<?php if ($this->helper('tax')->displayCartPriceExclTax($this->getStore()) \|\| $this->helper('tax')->displayCartBothPrices($this->getStore())): ?>
314	<?php if ($_item->getIsPriceInclTax()): ?>
315	- <?php $~~_rowTotalWithoutDiscount~~ = $_item->getRowTotalInclTax() - $_item->getDiscountAmount() ~~- $_item->getTaxAmount() ?>~~

316	<?php else: ?>
317	- <?php $~~_rowTotalWithoutDiscount~~ = $_item->getRowTotal() - $_item->getDiscountAmount() ?>
318	<?php endif; ?>
319
320	<?php if ($this->helper('tax')->displayCartBothPrices($this->getStore())): ?>
321	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
322	<?php endif; ?>
323	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
324	- <?php echo $this->formatPrice(max(0, $~~_rowTotalWithoutDiscount~~+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition())); ?>
325	<?php else: ?>
326	- <?php echo $this->formatPrice(max(0, $~~_rowTotalWithoutDiscount~~)) ?>
327	<?php endif; ?>
328
329	<?php if (Mage::helper('weee')->getApplied($_item)): ?>
	@@ -359,14 +360,10 @@
359	<br /><span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
360	<?php endif; ?>
361
362	- <?php if ($_item->~~getIsPriceInclTax~~()): ?>
363	- <?php $_incl = $_item->getRowTotalInclTax() - $_item->getDiscountAmount() ?>
364	- <?php else: ?>
365	- <?php $_incl = $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount(); ?>
366	- <?php endif; ?>
367
368	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
369	- <?php echo $this->formatPrice($_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
370	<?php else: ?>
371	<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
372	<?php endif; ?>
	@@ -375,7 +372,7 @@
375	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
376	<small>
377	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
378	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['~~row_amount~~'],true,true); ?></span><br />
379	<?php endforeach; ?>
380	</small>
381	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -391,7 +388,7 @@
391	<?php endif; ?>
392
393	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
394	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
395	<?php endif; ?>
396	<?php endif; ?>
397	<?php endif; ?>


146	</small>
147	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
148	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
149	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount'],true,true); ?></small></span><br />
150	<?php endforeach; ?>
151	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
152	<small>
153	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
154	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount'],true,true); ?></span><br />
155	<?php endforeach; ?>
156	</small>
157	<?php endif; ?>

170	<?php endif; ?>
171	<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
172	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
173	+ <?php echo $this->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
174	<?php else: ?>
175	<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
176	<?php endif; ?>

179	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
180	<small>
181	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
182	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
183	<?php endforeach; ?>
184	</small>
185	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

195	<?php endif; ?>
196
197	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
198	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
199	<?php endif; ?>
200	<?php endif; ?>
201	<?php endif; ?>

245	</small>
246	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
247	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
248	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount'],true,true); ?></small></span><br />
249	<?php endforeach; ?>
250	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
251	<small>
252	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
253	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount'],true,true); ?></span><br />
254	<?php endforeach; ?>
255	</small>
256	<?php endif; ?>

269	<?php endif; ?>
270	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
271	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
272	+ <?php echo $this->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
273	<?php else: ?>
274	<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
275	<?php endif; ?>

278	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
279	<small>
280	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
281	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
282	<?php endforeach; ?>
283	</small>
284	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

294	<?php endif; ?>
295
296	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
297	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
298	<?php endif; ?>
299	<?php endif; ?>
300	<?php endif; ?>

312
313	<?php if ($this->helper('tax')->displayCartPriceExclTax($this->getStore()) \|\| $this->helper('tax')->displayCartBothPrices($this->getStore())): ?>
314	<?php if ($_item->getIsPriceInclTax()): ?>
315	+ <?php $_rowTotalLessDiscount = $_item->getRowTotalInclTax() - $_item->getDiscountAmount()
316	+ - ($_item->getTaxAmount() - Mage::helper('weee')->getTotalRowTaxAppliedForWeeeTax($_item)) ?>
317	<?php else: ?>
318	+ <?php $_rowTotalLessDiscount = $_item->getRowTotal() - $_item->getDiscountAmount() ?>
319	<?php endif; ?>
320
321	<?php if ($this->helper('tax')->displayCartBothPrices($this->getStore())): ?>
322	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
323	<?php endif; ?>
324	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
325	+ <?php echo $this->formatPrice(max(0, $_rowTotalLessDiscount+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition())); ?>
326	<?php else: ?>
327	+ <?php echo $this->formatPrice(max(0, $_rowTotalLessDiscount)) ?>
328	<?php endif; ?>
329
330	<?php if (Mage::helper('weee')->getApplied($_item)): ?>

360	<br /><span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
361	<?php endif; ?>
362
363	+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item) - $_item->getDiscountTaxCompensation() - $_item->getDiscountAmount(); ?>




364
365	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
366	+ <?php echo $this->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
367	<?php else: ?>
368	<?php echo $this->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
369	<?php endif; ?>

372	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
373	<small>
374	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
375	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
376	<?php endforeach; ?>
377	</small>
378	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

388	<?php endif; ?>
389
390	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
391	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->formatPrice($_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
392	<?php endif; ?>
393	<?php endif; ?>
394	<?php endif; ?>

app/design/adminhtml/default/default/template/sales/order/create/totals/tax.phtml CHANGED Viewed

@@ -24,44 +24,69 @@
              * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
              */
             ?>
-            -
            <?php global $taxIter; $taxIter++; ?>
             <?php if ($this->helper('tax')->displayFullSummary()): ?>
-            -
            <?php $isTop = 1; ?>
-            -
                        <?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
-            -
                            <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
-            -
                            <?php $percent = $info['percent']; ?>
-            -
                            <?php $amount = $info['amount']; ?>
-            -
                            <?php $rates = $info['rates']; ?>
-            -
                            <?php $isFirst = 1; ?>
-            -
                            <?php foreach ($rates as $rate): ?>
-            -
                            <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-            -
                                <td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
-            -
                                    <?php echo $this->escapeHtml($rate['title']); ?>
-            -
                                    <?php if (!is_null($rate['percent'])): ?>
-            -
                                        (<?php echo (float)$rate['percent']; ?>%)
-            -
                                    <?php endif; ?>
-            -
                                    <br />
-            -
                                </td>
-            -
                                <?php if ($isFirst): ?>
-            -
                                    <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right" rowspan="<?php echo count($rates); ?>">
-            -
                                        <?php echo $this->formatPrice($amount); ?>
-            -
                                    </td>
                                 <?php endif; ?>
-            -
                            </tr>
-            -
                            <?php $isFirst = 0; ?>
-            -
                            <?php $isTop = 0; ?>
-            -
                            <?php endforeach; ?>
-            -
                        <?php endforeach; ?>
-            -
            <?php endif;?>
-            -
            <?php $class="{$this->getTotal()->getCode()} " . ($this->helper('tax')->displayFullSummary() ? 'summary-total' : ''); ?>
-            -
            <tr<?php if ($this->helper('tax')->displayFullSummary()): ?> onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?> class="<?php echo $class;?>">
-            -
                <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
                     <?php if ($this->helper('tax')->displayFullSummary()): ?>
                         <div class="summary-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
                     <?php else: ?>
                         <?php echo $this->getTotal()->getTitle() ?>
-            -
                    <?php endif;?>
                 </td>
-            -
                <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right"><?php echo $this->formatPrice($this->getTotal()->getValue()) ?></td>
             </tr>


24	* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	*/
26	?>
27	+ <?php
28	+ $_order = $this->getQuote();
29	+ $_weees = $this->helper('tax')->getAllWeee($_order);
30	+ global $taxIter;
31	+ $taxIter++;
32	+ ?>
33	+ <?php global $taxIter;
34	+ $taxIter++; ?>
35	<?php if ($this->helper('tax')->displayFullSummary()): ?>
36	+ <?php $isTop = 1; ?>
37	+ <?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
38	+ <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
39	+ <?php $percent = $info['percent']; ?>
40	+ <?php $amount = $info['amount']; ?>
41	+ <?php $rates = $info['rates']; ?>
42	+ <?php $isFirst = 1; ?>
43
44	+ <?php foreach ($rates as $rate): ?>
45	+ <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"
46	+ style="display:none;">
47	+ <td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>"
48	+ colspan="<?php echo $this->getColspan(); ?>">
49	+ <?php echo $this->escapeHtml($rate['title']); ?>
50	+ <?php if (!is_null($rate['percent'])): ?>
51	+ (<?php echo (float)$rate['percent']; ?>%)





52	<?php endif; ?>
53	+ <br/>
54	+ </td>
55	+ <?php if ($isFirst): ?>
56	+ <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right"
57	+ rowspan="<?php echo count($rates); ?>">
58	+ <?php echo $this->formatPrice($amount); ?>
59	+ </td>
60	+ <?php endif; ?>
61	+ </tr>
62	+ <?php $isFirst = 0; ?>
63	+ <?php $isTop = 0; ?>
64	+ <?php endforeach; ?>
65	+ <?php endforeach; ?>
66	+ <?php foreach ($_weees as $weeeTitle => $weeeAmount): ?>
67	+ <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"
68	+ style="display:none;">
69	+ <td class="a-right" colspan="1">
70	+ <?php echo $this->escapeHtml($weeeTitle); ?>
71	+ <br/>
72	+ </td>
73	+ <td class="a-right" rowspan="1">
74	+ <?php echo $this->helper('checkout')->formatPrice($weeeAmount); ?>
75	+ </td>
76	+ </tr>
77	+ <?php endforeach; ?>
78	+ <?php endif; ?>
79	+ <?php $class = "{$this->getTotal()->getCode()} " . ($this->helper('tax')->displayFullSummary() ? 'summary-total' : ''); ?>
80	+ <tr<?php if ($this->helper('tax')->displayFullSummary()): ?> onclick="expandDetails(this, '.summary-details-<?php echo $taxIter; ?>')"<?php endif; ?>
81	+ class="<?php echo $class; ?>">
82	+ <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right"
83	+ colspan="<?php echo $this->getColspan(); ?>">
84	<?php if ($this->helper('tax')->displayFullSummary()): ?>
85	<div class="summary-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
86	<?php else: ?>
87	<?php echo $this->getTotal()->getTitle() ?>
88	+ <?php endif; ?>
89	</td>
90	+ <td style="<?php echo $this->getTotal()->getStyle() ?>"
91	+ class="a-right"><?php echo $this->formatPrice($this->getTotal()->getValue()) ?></td>
92	</tr>

app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/configurable.phtml CHANGED Viewed

@@ -27,219 +27,236 @@
             <?php $_item = $this->getItem() ?>
             <?php $this->setPriceDataObject($_item); ?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'configurable_name') ?></td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                    $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                        $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-            -
                <?php if ($this->canParentReturnToStock($_item)) : ?>
-            -
                    <td class="a-center">
-            -
                    <?php if ($this->canReturnItemToStock($_item)) : ?>
-            -
                        <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]" value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
-            -
                    <?php endif; ?>
-            -
                    </td>
                 <?php endif; ?>
                 <td class="a-center">
                 <?php if ($this->canEditQty()) : ?>
-            -
                    <input type="text" class="input-text qty-input" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]" value="<?php echo $_item->getQty()*1 ?>"/>
                 <?php else : ?>
-            -
                    <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                    $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                        $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


27	<?php $_item = $this->getItem() ?>
28	<?php $this->setPriceDataObject($_item); ?>
29	<tr class="border">
30	+ <td><?php echo $this->getColumnHtml($_item, 'configurable_name') ?></td>
31	+ <td class="a-right">
32	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
33	+ <span class="price-excl-tax">
34	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
35	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
36	<?php endif; ?>
37
38	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
39	+ <?php
40	+ echo $this->displayPrices(
41	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
42	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
43	+ );
44	+ ?>
45	+ <?php else: ?>
46	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
47	+ <?php endif; ?>
48
49
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
53	+ <small>





54	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	<?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
65	+ <small>
66	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	<?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72
73	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	<?php
77	echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	);
81	?>
82	</span>

83	<?php endif; ?>
84	+ <?php endif; ?>
85	</span>
86	+ <br/>
87	+ <?php endif; ?>
88	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
89	+ <span class="price-incl-tax">
90	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
91	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
92	<?php endif; ?>
93	+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
94	+ <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
95
96	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
97	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
98	+ <?php else: ?>
99	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxDisposition(), $_incl - $_item->getWeeeTaxDisposition()) ?>
100	+ <?php endif; ?>
101
102	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
103	+ <br/>
104	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
105	+ <small>





106	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
107	+ <span class="nobr"><?php echo $tax['title']; ?>
108	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
109	<?php endforeach; ?>
110	+ </small>
111	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
112	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
113	+ <span class="nobr"><small><?php echo $tax['title']; ?>
114	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
115	+ <?php endforeach; ?>
116	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
117	+ <small>
118	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
119	+ <span class="nobr"><?php echo $tax['title']; ?>
120	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
121	<?php endforeach; ?>
122	+ </small>
123	+ <?php endif; ?>
124
125	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
126	+ <br/>
127	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
128	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
129	<?php endif; ?>
130	+ <?php endif; ?>
131	</span>









132	<?php endif; ?>
133	+ </td>
134	+ <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
135	+ <?php if ($this->canParentReturnToStock($_item)) : ?>
136	<td class="a-center">
137	+ <?php if ($this->canReturnItemToStock($_item)) : ?>
138	+ <input type="checkbox" name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
139	+ value="1"<?php if ($_item->getBackToStock()): ?> checked<?php endif; ?>/>
140	+ <?php endif; ?>
141	+ </td>
142	+ <?php endif; ?>
143	+ <td class="a-center">
144	<?php if ($this->canEditQty()) : ?>
145	+ <input type="text" class="input-text qty-input"
146	+ name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
147	+ value="<?php echo $_item->getQty() * 1 ?>"/>
148	<?php else : ?>
149	+ <?php echo $_item->getQty() * 1 ?>
150	<?php endif; ?>
151	+ </td>
152	+ <td class="a-right">
153	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
154	+ <span class="price-excl-tax">
155	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
156	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
157	<?php endif; ?>
158
159	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
160	+ <?php
161	+ echo $this->displayPrices(
162	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
163	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
164	+ );
165	+ ?>
166	+ <?php else: ?>
167	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
168	+ <?php endif; ?>
169
170
171	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
172	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
173	+ <small>





174	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
175	+ <span class="nobr"><?php echo $tax['title']; ?>
176	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
177	<?php endforeach; ?>
178	+ </small>
179	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
180	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
181	+ <span class="nobr"><small><?php echo $tax['title']; ?>
182	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
183	+ <?php endforeach; ?>
184	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
185	+ <small>
186	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
187	+ <span class="nobr"><?php echo $tax['title']; ?>
188	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
189	<?php endforeach; ?>
190	+ </small>
191	+ <?php endif; ?>
192
193	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
194	+ <br/>
195	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
196	<?php
197	echo $this->displayPrices(
198	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
199	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
200	);
201	?>
202	</span>

203	<?php endif; ?>
204	+ <?php endif; ?>
205	</span>
206	+ <br/>
207	+ <?php endif; ?>
208	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
209	+ <span class="price-incl-tax">
210	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
211	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
212	<?php endif; ?>
213	+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
214	+ <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
215	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
216	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
217	+ <?php else: ?>
218	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxRowDisposition(), $_incl - $_item->getWeeeTaxRowDisposition()) ?>
219	+ <?php endif; ?>
220
221
222	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
223
224	+ <br/>
225	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
226	+ <small>





227	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
228	+ <span class="nobr"><?php echo $tax['title']; ?>
229	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
230	<?php endforeach; ?>
231	+ </small>
232	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
233	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
234	+ <span class="nobr"><small><?php echo $tax['title']; ?>
235	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
236	+ <?php endforeach; ?>
237	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
238	+ <small>
239	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
240	+ <span class="nobr"><?php echo $tax['title']; ?>
241	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
242	<?php endforeach; ?>
243	+ </small>
244	+ <?php endif; ?>
245
246	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
247	+ <br/><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
248	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
249	<?php endif; ?>
250	+ <?php endif; ?>
251	</span>
252	+ <?php endif; ?>
253	+ </td>
254	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
255	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
256	+ <td class="a-right last">
257	+ <?php echo $this->displayPrices(
258	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
259	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getWeeeTaxAppliedRowAmount()
260	+ ) ?>
261	+ </td>
262	</tr>

app/design/adminhtml/default/default/template/sales/order/creditmemo/create/items/renderer/default.phtml CHANGED Viewed

	@@ -57,12 +57,12 @@
57	</small>
58	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
59	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
60	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
61	<?php endforeach; ?>
62	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
63	<small>
64	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
65	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
66	<?php endforeach; ?>
67	</small>
68	<?php endif; ?>
	@@ -91,7 +91,7 @@
91	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
92
93	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
94	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
95	<?php else: ?>
96	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
97	<?php endif; ?>
	@@ -101,7 +101,7 @@
101	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
102	<small>
103	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
105	<?php endforeach; ?>
106	</small>
107	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
	@@ -118,7 +118,7 @@
118
119	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
120	<br />
121	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
122	<?php endif; ?>
123	<?php endif; ?>
124	</span>
	@@ -167,12 +167,12 @@
167	</small>
168	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
169	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
170	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
171	<?php endforeach; ?>
172	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
173	<small>
174	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
175	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
176	<?php endforeach; ?>
177	</small>
178	<?php endif; ?>
	@@ -200,7 +200,7 @@
200	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
201	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
202	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
203	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $~~_incl+$~~_item~~->getWeeeTaxAppliedRowAmount(~~)); ?>
204	<?php else: ?>
205	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
206	<?php endif; ?>
	@@ -212,7 +212,7 @@
212	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
213	<small>
214	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
216	<?php endforeach; ?>
217	</small>
218	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
	@@ -228,7 +228,7 @@
228	<?php endif; ?>
229
230	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
231	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
232	<?php endif; ?>
233	<?php endif; ?>
234	</span>


57	</small>
58	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
59	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
60	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
61	<?php endforeach; ?>
62	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
63	<small>
64	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
65	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
66	<?php endforeach; ?>
67	</small>
68	<?php endif; ?>

91	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
92
93	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
94	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
95	<?php else: ?>
96	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
97	<?php endif; ?>

101	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
102	<small>
103	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
105	<?php endforeach; ?>
106	</small>
107	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>

118
119	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
120	<br />
121	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item) , $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
122	<?php endif; ?>
123	<?php endif; ?>
124	</span>

167	</small>
168	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
169	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
170	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
171	<?php endforeach; ?>
172	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
173	<small>
174	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
175	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
176	<?php endforeach; ?>
177	</small>
178	<?php endif; ?>

200	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
201	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
202	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
203	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item),$_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
204	<?php else: ?>
205	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
206	<?php endif; ?>

212	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
213	<small>
214	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
216	<?php endforeach; ?>
217	</small>
218	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>

228	<?php endif; ?>
229
230	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
231	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item) , $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
232	<?php endif; ?>
233	<?php endif; ?>
234	</span>

app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/configurable.phtml CHANGED Viewed

@@ -27,206 +27,220 @@
             <?php $_item = $this->getItem() ?>
             <?php $this->setPriceDataObject($_item) ?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'configurable_name') ?></td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                    $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                        $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                    $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
-            -
                            <?php endif; ?>
-            -
-            -
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                        $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()-$_item->getBaseDiscountAmount()+$_item->getBaseTaxAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
-            -
                        $_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


27	<?php $_item = $this->getItem() ?>
28	<?php $this->setPriceDataObject($_item) ?>
29	<tr class="border">
30	+ <td><?php echo $this->getColumnHtml($_item, 'configurable_name') ?></td>
31	+ <td class="a-right">
32	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
33	+ <span class="price-excl-tax">
34	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
35	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
36	<?php endif; ?>
37
38	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
39	+ <?php
40	+ echo $this->displayPrices(
41	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
42	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
43	+ );
44	+ ?>
45	+ <?php else: ?>
46	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
47	+ <?php endif; ?>
48
49
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
53	+ <small>





54	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	<?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
65	+ <small>
66	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	<?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72
73	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	<?php
77	echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	);
81	?>
82	</span>

83	<?php endif; ?>
84	+ <?php endif; ?>
85	</span>
86	+ <br/>
87	+ <?php endif; ?>
88	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
89	+ <span class="price-incl-tax">
90	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
91	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
92	<?php endif; ?>
93	+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
94	+ <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
95
96	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
97	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
98	+ <?php else: ?>
99	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxDisposition(), $_incl - $_item->getWeeeTaxDisposition()) ?>
100	+ <?php endif; ?>
101
102	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
103	+ <br/>
104	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
105	+ <small>
106	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
107	+ <span class="nobr"><?php echo $tax['title']; ?>
108	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
109	<?php endforeach; ?>
110	+ </small>
111	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
112	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
113	+ <span class="nobr"><small><?php echo $tax['title']; ?>
114	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
115	+ <?php endforeach; ?>
116	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
117	+ <small>
118	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
119	+ <span class="nobr"><?php echo $tax['title']; ?>
120	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
121	<?php endforeach; ?>
122	+ </small>
123	+ <?php endif; ?>





124
125	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
126	+ <br/>
127	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
128	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
129	<?php endif; ?>
130	+ <?php endif; ?>
131	</span>
132	+ <?php endif; ?>
133
134	+ </td>
135	+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
136	+ <td class="a-right">
137	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
138	+ <span class="price-excl-tax">
139	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
140	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
141	<?php endif; ?>
142
143	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
144	+ <?php
145	+ echo $this->displayPrices(
146	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
147	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
148	+ );
149	+ ?>
150	+ <?php else: ?>
151	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
152	+ <?php endif; ?>
153	+
154	+
155	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
156	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
157	+ <small>
158	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
159	+ <span class="nobr"><?php echo $tax['title']; ?>
160	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
161	<?php endforeach; ?>
162	+ </small>
163	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
164	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
165	+ <span class="nobr"><small><?php echo $tax['title']; ?>
166	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
167	+ <?php endforeach; ?>
168	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
169	+ <small>
170	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
171	+ <span class="nobr"><?php echo $tax['title']; ?>
172	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
173	<?php endforeach; ?>
174	+ </small>
175	+ <?php endif; ?>





176
177	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
178	+ <br/>
179	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
180	<?php
181	echo $this->displayPrices(
182	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
183	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
184	);
185	?>
186	</span>

187	<?php endif; ?>
188	+ <?php endif; ?>
189	</span>
190	+ <br/>
191	+ <?php endif; ?>
192	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
193	+ <span class="price-incl-tax">
194	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
195	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
196	<?php endif; ?>
197	+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
198	+ <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
199	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
200	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
201	+ <?php else: ?>
202	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxRowDisposition(), $_incl - $_item->getWeeeTaxRowDisposition()) ?>
203	+ <?php endif; ?>
204
205
206	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
207
208	+ <br/>
209	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
210	+ <small>





211	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
212	+ <span class="nobr"><?php echo $tax['title']; ?>
213	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
214	<?php endforeach; ?>
215	+ </small>
216	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
217	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
218	+ <span class="nobr"><small><?php echo $tax['title']; ?>
219	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
220	+ <?php endforeach; ?>
221	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
222	+ <small>
223	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
224	+ <span class="nobr"><?php echo $tax['title']; ?>
225	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
226	<?php endforeach; ?>
227	+ </small>
228	+ <?php endif; ?>
229
230	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
231	+ <br/><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
232	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
233	<?php endif; ?>
234	+ <?php endif; ?>
235	</span>
236	+ <?php endif; ?>
237	+ </td>
238	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
239	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
240	+ <td class="a-right last">
241	+ <?php echo $this->displayPrices(
242	+ $_item->getBaseRowTotal() - $_item->getBaseDiscountAmount() + $_item->getBaseTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
243	+ $_item->getRowTotal() - $_item->getDiscountAmount() + $_item->getTaxAmount() + $_item->getWeeeTaxAppliedRowAmount()
244	+ ) ?>
245	+ </td>
246	</tr>

app/design/adminhtml/default/default/template/sales/order/creditmemo/view/items/renderer/default.phtml CHANGED Viewed

@@ -28,206 +28,220 @@
             <?php $_item->setStoreId($_item->getCreditMemo()->getStoreId()) ?>
             <?php $this->setPriceDataObject($_item) ?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'name') ?></td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                    $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                        $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                    $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
-            -
                            <?php endif; ?>
-            -
-            -
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                        $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
-            -
                                    <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(),
-            -
                        $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


28	<?php $_item->setStoreId($_item->getCreditMemo()->getStoreId()) ?>
29	<?php $this->setPriceDataObject($_item) ?>
30	<tr class="border">
31	+ <td><?php echo $this->getColumnHtml($_item, 'name') ?></td>
32	+ <td class="a-right">
33	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
34	+ <span class="price-excl-tax">
35	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
36	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
37	<?php endif; ?>
38
39	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
40	+ <?php
41	+ echo $this->displayPrices(
42	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
43	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
44	+ );
45	+ ?>
46	+ <?php else: ?>
47	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
48	+ <?php endif; ?>
49
50
51	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
52	+ <br/>
53	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
54	+ <small>





55	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
56	+ <span class="nobr"><?php echo $tax['title']; ?>
57	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
58	<?php endforeach; ?>
59	+ </small>
60	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
61	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
62	+ <span class="nobr"><small><?php echo $tax['title']; ?>
63	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
64	+ <?php endforeach; ?>
65	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
66	+ <small>
67	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
68	+ <span class="nobr"><?php echo $tax['title']; ?>
69	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
70	<?php endforeach; ?>
71	+ </small>
72	+ <?php endif; ?>
73
74	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
75	+ <br/>
76	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
77	<?php
78	echo $this->displayPrices(
79	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
80	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
81	);
82	?>
83	</span>

84	<?php endif; ?>
85	+ <?php endif; ?>
86	</span>
87	+ <br/>
88	+ <?php endif; ?>
89	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
90	+ <span class="price-incl-tax">
91	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
92	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
93	<?php endif; ?>
94	+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
95	+ <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
96
97	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
98	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
99	+ <?php else: ?>
100	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxDisposition(), $_incl - $_item->getWeeeTaxDisposition()) ?>
101	+ <?php endif; ?>
102
103	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
104	+ <br/>
105	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
106	+ <small>
107	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
108	+ <span class="nobr"><?php echo $tax['title']; ?>
109	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
110	<?php endforeach; ?>
111	+ </small>
112	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
113	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
114	+ <span class="nobr"><small><?php echo $tax['title']; ?>
115	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
116	+ <?php endforeach; ?>
117	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
118	+ <small>
119	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
120	+ <span class="nobr"><?php echo $tax['title']; ?>
121	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
122	<?php endforeach; ?>
123	+ </small>
124	+ <?php endif; ?>





125
126	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
127	+ <br/>
128	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
129	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
130	<?php endif; ?>
131	+ <?php endif; ?>
132	</span>
133	+ <?php endif; ?>
134
135	+ </td>
136	+ <td class="a-center"><?php echo $_item->getQty() * 1 ?></td>
137	+ <td class="a-right">
138	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
139	+ <span class="price-excl-tax">
140	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
141	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
142	<?php endif; ?>
143
144	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
145	+ <?php
146	+ echo $this->displayPrices(
147	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
148	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
149	+ );
150	+ ?>
151	+ <?php else: ?>
152	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
153	+ <?php endif; ?>
154	+
155	+
156	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
157	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
158	+ <small>
159	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
160	+ <span class="nobr"><?php echo $tax['title']; ?>
161	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
162	<?php endforeach; ?>
163	+ </small>
164	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
165	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
166	+ <span class="nobr"><small><?php echo $tax['title']; ?>
167	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
168	+ <?php endforeach; ?>
169	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
170	+ <small>
171	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
172	+ <span class="nobr"><?php echo $tax['title']; ?>
173	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
174	<?php endforeach; ?>
175	+ </small>
176	+ <?php endif; ?>





177
178	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
179	+ <br/>
180	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
181	<?php
182	echo $this->displayPrices(
183	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
184	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
185	);
186	?>
187	</span>

188	<?php endif; ?>
189	+ <?php endif; ?>
190	</span>
191	+ <br/>
192	+ <?php endif; ?>
193	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
194	+ <span class="price-incl-tax">
195	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
196	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
197	<?php endif; ?>
198	+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
199	+ <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
200	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
201	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
202	+ <?php else: ?>
203	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxRowDisposition(), $_incl - $_item->getWeeeTaxRowDisposition()) ?>
204	+ <?php endif; ?>
205
206
207	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
208
209	+ <br/>
210	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
211	+ <small>





212	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
213	+ <span class="nobr"><?php echo $tax['title']; ?>
214	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
215	<?php endforeach; ?>
216	+ </small>
217	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
218	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
219	+ <span class="nobr"><small><?php echo $tax['title']; ?>
220	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
221	+ <?php endforeach; ?>
222	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
223	+ <small>
224	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
225	+ <span class="nobr"><?php echo $tax['title']; ?>
226	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
227	<?php endforeach; ?>
228	+ </small>
229	+ <?php endif; ?>
230
231	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
232	+ <br/><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
233	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
234	<?php endif; ?>
235	+ <?php endif; ?>
236	</span>
237	+ <?php endif; ?>
238	+ </td>
239	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
240	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
241	+ <td class="a-right last">
242	+ <?php echo $this->displayPrices(
243	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() + $_item->getBaseHiddenTaxAmount() + $_item->getBaseWeeeTaxAppliedRowAmount() - $_item->getBaseDiscountAmount(),
244	+ $_item->getRowTotal() + $_item->getTaxAmount() + $_item->getHiddenTaxAmount() + $_item->getWeeeTaxAppliedRowAmount() - $_item->getDiscountAmount()
245	+ ) ?>
246	+ </td>
247	</tr>

app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/configurable.phtml CHANGED Viewed

@@ -25,216 +25,231 @@
              */
             ?>
             <?php $_item = $this->getItem() ?>
-            -
            <?php $this->setPriceDataObject($_item)?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'configurable_name') ?></td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                    $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                        $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-            -
                <td class="a-center">
                 <?php if ($this->canEditQty()) : ?>
-            -
                    <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>"/>
                 <?php else : ?>
-            -
                    <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                    $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
-            -
                            <?php endif; ?>
-            -
-            -
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                        $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


25	*/
26	?>
27	<?php $_item = $this->getItem() ?>
28	+ <?php $this->setPriceDataObject($_item) ?>
29	<tr class="border">
30	+ <td><?php echo $this->getColumnHtml($_item, 'configurable_name') ?></td>
31	+ <td class="a-right">
32	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
33	+ <span class="price-excl-tax">
34	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
35	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
36	<?php endif; ?>
37
38	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
39	+ <?php
40	+ echo $this->displayPrices(
41	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
42	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
43	+ );
44	+ ?>
45	+ <?php else: ?>
46	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
47	+ <?php endif; ?>
48
49
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
53	+ <small>





54	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	<?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
65	+ <small>
66	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	<?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72
73	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	<?php
77	echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	);
81	?>
82	</span>

83	<?php endif; ?>
84	+ <?php endif; ?>
85	</span>
86	+ <br/>
87	+ <?php endif; ?>
88	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
89	+ <span class="price-incl-tax">
90	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
91	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
92	<?php endif; ?>
93	+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
94	+ <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
95
96	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
97	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
98	+ <?php else: ?>
99	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxDisposition(), $_incl - $_item->getWeeeTaxDisposition()) ?>
100	+ <?php endif; ?>
101
102	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
103	+ <br/>
104	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
105	+ <small>
106	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
107	+ <span class="nobr"><?php echo $tax['title']; ?>
108	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
109	<?php endforeach; ?>
110	+ </small>
111	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
112	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
113	+ <span class="nobr"><small><?php echo $tax['title']; ?>
114	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
115	+ <?php endforeach; ?>
116	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
117	+ <small>
118	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
119	+ <span class="nobr"><?php echo $tax['title']; ?>
120	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
121	<?php endforeach; ?>
122	+ </small>
123	+ <?php endif; ?>





124
125	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
126	+ <br/>
127	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
128	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
129	<?php endif; ?>
130	+ <?php endif; ?>
131	</span>
132	+ <?php endif; ?>
133
134	+ </td>
135	+ <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
136	+ <td class="a-center">
137	<?php if ($this->canEditQty()) : ?>
138	+ <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
139	+ value="<?php echo $_item->getQty() * 1 ?>"/>
140	<?php else : ?>
141	+ <?php echo $_item->getQty() * 1 ?>
142	<?php endif; ?>
143	+ </td>
144	+ <td class="a-right">
145	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
146	+ <span class="price-excl-tax">
147	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
148	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
149	<?php endif; ?>
150
151	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
152	+ <?php
153	+ echo $this->displayPrices(
154	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
155	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
156	+ );
157	+ ?>
158	+ <?php else: ?>
159	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
160	+ <?php endif; ?>
161	+
162	+
163	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
164	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
165	+ <small>





166	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
167	+ <span class="nobr"><?php echo $tax['title']; ?>
168	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
169	<?php endforeach; ?>
170	+ </small>
171	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
172	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
173	+ <span class="nobr"><small><?php echo $tax['title']; ?>
174	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
175	+ <?php endforeach; ?>
176	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
177	+ <small>
178	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
179	+ <span class="nobr"><?php echo $tax['title']; ?>
180	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
181	<?php endforeach; ?>
182	+ </small>
183	+ <?php endif; ?>
184
185	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
186	+ <br/>
187	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
188	<?php
189	echo $this->displayPrices(
190	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
191	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
192	);
193	?>
194	</span>

195	<?php endif; ?>
196	+ <?php endif; ?>
197	</span>
198	+ <br/>
199	+ <?php endif; ?>
200	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
201	+ <span class="price-incl-tax">
202	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
203	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
204	<?php endif; ?>
205	+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
206	+ <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
207	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
208	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
209	+ <?php else: ?>
210	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxRowDisposition(), $_incl - $_item->getWeeeTaxRowDisposition()) ?>
211	+ <?php endif; ?>
212
213
214	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
215
216	+ <br/>
217	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
218	+ <small>





219	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
220	+ <span class="nobr"><?php echo $tax['title']; ?>
221	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
222	<?php endforeach; ?>
223	+ </small>
224	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
225	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
226	+ <span class="nobr"><small><?php echo $tax['title']; ?>
227	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
228	+ <?php endforeach; ?>
229	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
230	+ <small>
231	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
232	+ <span class="nobr"><?php echo $tax['title']; ?>
233	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
234	<?php endforeach; ?>
235	+ </small>
236	+ <?php endif; ?>
237
238	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
239	+ <br/><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
240	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
241	<?php endif; ?>
242	+ <?php endif; ?>
243	</span>
244	+ <?php endif; ?>
245	+
246	+ </td>
247	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
248	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
249	+ <td class="a-right last">
250	+ <?php echo $this->displayPrices(
251	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
252	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getWeeeTaxAppliedRowAmount()
253	+ ) ?>
254	+ </td>
255	</tr>

app/design/adminhtml/default/default/template/sales/order/invoice/create/items/renderer/default.phtml CHANGED Viewed

	@@ -57,12 +57,12 @@
57	</small>
58	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
59	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
60	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
61	<?php endforeach; ?>
62	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
63	<small>
64	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
65	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
66	<?php endforeach; ?>
67	</small>
68	<?php endif; ?>
	@@ -91,7 +91,7 @@
91	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
92
93	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
94	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
95	<?php else: ?>
96	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
97	<?php endif; ?>
	@@ -101,7 +101,7 @@
101	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
102	<small>
103	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
105	<?php endforeach; ?>
106	</small>
107	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
	@@ -118,7 +118,7 @@
118
119	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
120	<br />
121	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
122	<?php endif; ?>
123	<?php endif; ?>
124	</span>
	@@ -161,12 +161,12 @@
161	</small>
162	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
163	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
164	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
165	<?php endforeach; ?>
166	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
167	<small>
168	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
169	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
170	<?php endforeach; ?>
171	</small>
172	<?php endif; ?>
	@@ -191,12 +191,13 @@
191	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
192	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
193	<?php endif; ?>

194	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
195	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
196	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
197	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
198	<?php else: ?>
199	- <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
200	<?php endif; ?>
201
202
	@@ -206,7 +207,7 @@
206	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
207	<small>
208	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
209	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
210	<?php endforeach; ?>
211	</small>
212	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
	@@ -222,7 +223,7 @@
222	<?php endif; ?>
223
224	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
225	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
226	<?php endif; ?>
227	<?php endif; ?>
228	</span>


57	</small>
58	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
59	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
60	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
61	<?php endforeach; ?>
62	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
63	<small>
64	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
65	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
66	<?php endforeach; ?>
67	</small>
68	<?php endif; ?>

91	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
92
93	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
94	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
95	<?php else: ?>
96	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
97	<?php endif; ?>

101	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
102	<small>
103	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
104	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
105	<?php endforeach; ?>
106	</small>
107	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>

118
119	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
120	<br />
121	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item) , $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
122	<?php endif; ?>
123	<?php endif; ?>
124	</span>

161	</small>
162	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
163	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
164	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
165	<?php endforeach; ?>
166	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
167	<small>
168	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
169	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
170	<?php endforeach; ?>
171	</small>
172	<?php endif; ?>

191	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
192	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
193	<?php endif; ?>
194	+
195	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
196	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
197	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
198	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
199	<?php else: ?>
200	+ <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
201	<?php endif; ?>
202
203

207	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
208	<small>
209	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
210	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
211	<?php endforeach; ?>
212	</small>
213	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>

223	<?php endif; ?>
224
225	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
226	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item) , $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
227	<?php endif; ?>
228	<?php endif; ?>
229	</span>

app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/configurable.phtml CHANGED Viewed

@@ -25,215 +25,230 @@
              */
             ?>
             <?php $_item = $this->getItem() ?>
-            -
            <?php $this->setPriceDataObject($_item)?>
             <tr class="border">
-            -
                <td><?php echo $this->getColumnHtml($_item, 'configurable_name') ?></td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                    $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBasePrice()+$_item->getBaseWeeeTaxAppliedAmount()+$_item->getBaseWeeeTaxDisposition(),
-            -
                                        $_item->getPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedAmount(), $_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
-            -
                <td class="a-center">
                 <?php if ($this->canEditQty()) : ?>
-            -
                    <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>"/>
                 <?php else : ?>
-            -
                    <?php echo $_item->getQty()*1 ?>
                 <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right">
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceExclTax()): ?>
-            -
                        <span class="price-excl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php
-            -
                                echo $this->displayPrices(
-            -
                                    $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                    $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
-            -
                                );
-            -
                                ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
-            -
                            <?php endif; ?>
-            -
-            -
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br />
-            -
                                    <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br />
                                     <?php
                                     echo $this->displayPrices(
-            -
                                        $_item->getBaseRowTotal()+$_item->getBaseWeeeTaxAppliedRowAmount()+$_item->getBaseWeeeTaxRowDisposition(),
-            -
                                        $_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()
                                     );
                                     ?>
                                     </span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                        <br />
-            -
                    <?php endif; ?>
-            -
                    <?php if ($this->helper('tax')->displaySalesBothPrices() || $this->helper('tax')->displaySalesPriceInclTax()): ?>
-            -
                        <span class="price-incl-tax">
                             <?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
                                 <span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
                             <?php endif; ?>
-            -
                            <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
-            -
                            <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
-            -
                            <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
-            -
                            <?php else: ?>
-            -
                                <?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
-            -
                            <?php endif; ?>
-            -
                            <?php if (Mage::helper('weee')->getApplied($_item)): ?>
-            -
                                <br />
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
-            -
                                    <small>
-            -
                                    <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
-            -
                                    <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
                                     <?php endforeach; ?>
-            -
                                <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
-            -
                                    <small>
                                     <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
-            -
                                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
                                     <?php endforeach; ?>
-            -
                                    </small>
-            -
                                <?php endif; ?>
                                 <?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
-            -
                                    <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl+$_item->getBaseWeeeTaxAppliedRowAmount(), $_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
-            -
                                <?php endif; ?>
                             <?php endif; ?>
                         </span>
-            -
                    <?php endif; ?>
-            -
                </td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
-            -
                <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
-            -
                <td class="a-right last">
-            -
                    <?php echo $this->displayPrices(
-            -
                        $_item->getBaseRowTotal()+$_item->getBaseTaxAmount()-$_item->getBaseDiscountAmount()+$_item->getBaseWeeeTaxAppliedRowAmount(),
-            -
                        $_item->getRowTotal()+$_item->getTaxAmount()-$_item->getDiscountAmount()+$_item->getWeeeTaxAppliedRowAmount()
-            -
                    ) ?>
-            -
                </td>
             </tr>


25	*/
26	?>
27	<?php $_item = $this->getItem() ?>
28	+ <?php $this->setPriceDataObject($_item) ?>
29	<tr class="border">
30	+ <td><?php echo $this->getColumnHtml($_item, 'configurable_name') ?></td>
31	+ <td class="a-right">
32	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
33	+ <span class="price-excl-tax">
34	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
35	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
36	<?php endif; ?>
37
38	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
39	+ <?php
40	+ echo $this->displayPrices(
41	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
42	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
43	+ );
44	+ ?>
45	+ <?php else: ?>
46	+ <?php echo $this->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
47	+ <?php endif; ?>
48
49
50	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
51	+ <br/>
52	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
53	+ <small>





54	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
55	+ <span class="nobr"><?php echo $tax['title']; ?>
56	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
57	<?php endforeach; ?>
58	+ </small>
59	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
60	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>
62	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
63	+ <?php endforeach; ?>
64	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
65	+ <small>
66	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
67	+ <span class="nobr"><?php echo $tax['title']; ?>
68	+ : <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
69	<?php endforeach; ?>
70	+ </small>
71	+ <?php endif; ?>
72
73	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
74	+ <br/>
75	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
76	<?php
77	echo $this->displayPrices(
78	+ $_item->getBasePrice() + $_item->getBaseWeeeTaxAppliedAmount() + $_item->getBaseWeeeTaxDisposition(),
79	+ $_item->getPrice() + $_item->getWeeeTaxAppliedAmount() + $_item->getWeeeTaxDisposition()
80	);
81	?>
82	</span>

83	<?php endif; ?>
84	+ <?php endif; ?>
85	</span>
86	+ <br/>
87	+ <?php endif; ?>
88	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
89	+ <span class="price-incl-tax">
90	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
91	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
92	<?php endif; ?>
93	+ <?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
94	+ <?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
95
96	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
97	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
98	+ <?php else: ?>
99	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxDisposition(), $_incl - $_item->getWeeeTaxDisposition()) ?>
100	+ <?php endif; ?>
101
102	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
103	+ <br/>
104	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
105	+ <small>
106	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
107	+ <span class="nobr"><?php echo $tax['title']; ?>
108	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
109	<?php endforeach; ?>
110	+ </small>
111	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
112	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
113	+ <span class="nobr"><small><?php echo $tax['title']; ?>
114	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></small></span>
115	+ <?php endforeach; ?>
116	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
117	+ <small>
118	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
119	+ <span class="nobr"><?php echo $tax['title']; ?>
120	+ : <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
121	<?php endforeach; ?>
122	+ </small>
123	+ <?php endif; ?>





124
125	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
126	+ <br/>
127	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
128	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
129	<?php endif; ?>
130	+ <?php endif; ?>
131	</span>
132	+ <?php endif; ?>
133
134	+ </td>
135	+ <td class="a-center"><?php echo $this->getColumnHtml($_item, 'qty') ?></td>
136	+ <td class="a-center">
137	<?php if ($this->canEditQty()) : ?>
138	+ <input type="text" class="input-text qty-input" name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
139	+ value="<?php echo $_item->getQty() * 1 ?>"/>
140	<?php else : ?>
141	+ <?php echo $_item->getQty() * 1 ?>
142	<?php endif; ?>
143	+ </td>
144	+ <td class="a-right">
145	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceExclTax()): ?>
146	+ <span class="price-excl-tax">
147	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
148	<span class="label"><?php echo $this->__('Excl. Tax'); ?>:</span>
149	<?php endif; ?>
150
151	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
152	+ <?php
153	+ echo $this->displayPrices(
154	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
155	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
156	+ );
157	+ ?>
158	+ <?php else: ?>
159	+ <?php echo $this->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
160	+ <?php endif; ?>
161	+
162	+
163	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
164	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
165	+ <small>





166	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
167	+ <span class="nobr"><?php echo $tax['title']; ?>
168	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
169	<?php endforeach; ?>
170	+ </small>
171	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
172	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
173	+ <span class="nobr"><small><?php echo $tax['title']; ?>
174	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
175	+ <?php endforeach; ?>
176	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
177	+ <small>
178	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
179	+ <span class="nobr"><?php echo $tax['title']; ?>
180	+ : <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
181	<?php endforeach; ?>
182	+ </small>
183	+ <?php endif; ?>
184
185	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
186	+ <br/>
187	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br/>
188	<?php
189	echo $this->displayPrices(
190	+ $_item->getBaseRowTotal() + $_item->getBaseWeeeTaxAppliedRowAmount() + $_item->getBaseWeeeTaxRowDisposition(),
191	+ $_item->getRowTotal() + $_item->getWeeeTaxAppliedRowAmount() + $_item->getWeeeTaxRowDisposition()
192	);
193	?>
194	</span>

195	<?php endif; ?>
196	+ <?php endif; ?>
197	</span>
198	+ <br/>
199	+ <?php endif; ?>
200	+ <?php if ($this->helper('tax')->displaySalesBothPrices() \|\| $this->helper('tax')->displaySalesPriceInclTax()): ?>
201	+ <span class="price-incl-tax">
202	<?php if ($this->helper('tax')->displaySalesBothPrices()): ?>
203	<span class="label"><?php echo $this->__('Incl. Tax'); ?>:</span>
204	<?php endif; ?>
205	+ <?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
206	+ <?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
207	+ <?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
208	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
209	+ <?php else: ?>
210	+ <?php echo $this->displayPrices($_baseIncl - $_item->getBaseWeeeTaxRowDisposition(), $_incl - $_item->getWeeeTaxRowDisposition()) ?>
211	+ <?php endif; ?>
212
213
214	+ <?php if (Mage::helper('weee')->getApplied($_item)): ?>
215
216	+ <br/>
217	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales')): ?>
218	+ <small>





219	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
220	+ <span class="nobr"><?php echo $tax['title']; ?>
221	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
222	<?php endforeach; ?>
223	+ </small>
224	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
225	+ <?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
226	+ <span class="nobr"><small><?php echo $tax['title']; ?>
227	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></small></span>
228	+ <?php endforeach; ?>
229	+ <?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales')): ?>
230	+ <small>
231	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
232	+ <span class="nobr"><?php echo $tax['title']; ?>
233	+ : <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
234	<?php endforeach; ?>
235	+ </small>
236	+ <?php endif; ?>
237
238	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
239	+ <br/><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>
240	+ :<br/> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
241	<?php endif; ?>
242	+ <?php endif; ?>
243	</span>
244	+ <?php endif; ?>
245	+ </td>
246	+ <td class="a-right"><?php echo $this->displayPriceAttribute('tax_amount') ?></td>
247	+ <td class="a-right"><?php echo $this->displayPriceAttribute('discount_amount') ?></td>
248	+ <td class="a-right last">
249	+ <?php echo $this->displayPrices(
250	+ $_item->getBaseRowTotal() + $_item->getBaseTaxAmount() - $_item->getBaseDiscountAmount() + $_item->getBaseWeeeTaxAppliedRowAmount(),
251	+ $_item->getRowTotal() + $_item->getTaxAmount() - $_item->getDiscountAmount() + $_item->getWeeeTaxAppliedRowAmount()
252	+ ) ?>
253	+ </td>
254	</tr>

app/design/adminhtml/default/default/template/sales/order/invoice/view/items/renderer/default.phtml CHANGED Viewed

	@@ -58,12 +58,12 @@
58	</small>
59	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
62	<?php endforeach; ?>
63	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
64	<small>
65	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
66	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
67	<?php endforeach; ?>
68	</small>
69	<?php endif; ?>
	@@ -92,7 +92,7 @@
92	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
93
94	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
95	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
96	<?php else: ?>
97	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
98	<?php endif; ?>
	@@ -102,7 +102,7 @@
102	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
103	<small>
104	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
106	<?php endforeach; ?>
107	</small>
108	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>
	@@ -119,7 +119,7 @@
119
120	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
121	<br />
122	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
123	<?php endif; ?>
124	<?php endif; ?>
125	</span>
	@@ -155,12 +155,12 @@
155	</small>
156	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
157	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
158	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
159	<?php endforeach; ?>
160	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
161	<small>
162	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
163	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
164	<?php endforeach; ?>
165	</small>
166	<?php endif; ?>
	@@ -188,7 +188,7 @@
188	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
189	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
190	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
191	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
192	<?php else: ?>
193	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
194	<?php endif; ?>
	@@ -200,7 +200,7 @@
200	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
201	<small>
202	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
203	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
204	<?php endforeach; ?>
205	</small>
206	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
	@@ -216,7 +216,7 @@
216	<?php endif; ?>
217
218	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
219	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?></span>
220	<?php endif; ?>
221	<?php endif; ?>
222	</span>


58	</small>
59	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
60	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
61	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
62	<?php endforeach; ?>
63	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
64	<small>
65	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
66	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
67	<?php endforeach; ?>
68	</small>
69	<?php endif; ?>

92	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
93
94	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
95	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
96	<?php else: ?>
97	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
98	<?php endif; ?>

102	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
103	<small>
104	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
105	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
106	<?php endforeach; ?>
107	</small>
108	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales')): ?>

119
120	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
121	<br />
122	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item) , $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
123	<?php endif; ?>
124	<?php endif; ?>
125	</span>

155	</small>
156	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
157	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
158	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
159	<?php endforeach; ?>
160	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
161	<small>
162	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
163	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
164	<?php endforeach; ?>
165	</small>
166	<?php endif; ?>

188	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
189	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
190	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
191	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
192	<?php else: ?>
193	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
194	<?php endif; ?>

200	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
201	<small>
202	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
203	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
204	<?php endforeach; ?>
205	</small>
206	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>

216	<?php endif; ?>
217
218	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
219	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item) , $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
220	<?php endif; ?>
221	<?php endif; ?>
222	</span>

app/design/adminhtml/default/default/template/sales/order/shipment/create/items.phtml CHANGED Viewed

	@@ -104,8 +104,7 @@ if (sendEmailCheckbox) {
104	Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
105	bindSendEmail();
106	}
107	- function bindSendEmail()
108	- {
109	if (sendEmailCheckbox.checked == true) {
110	notifyCustomerCheckbox.disabled = false;
111	//shipmentCommentText.disabled = false;
	@@ -115,7 +114,7 @@ function bindSendEmail()
115	//shipmentCommentText.disabled = true;
116	}
117	}
118	- function toggleCreateLabelCheckbox(){
119	var checkbox = $('create_shipping_label');
120	var submitButton = checkbox.up('.order-totals').select('.submit-button span')[0];
121	if (checkbox.checked) {
	@@ -124,13 +123,32 @@ function toggleCreateLabelCheckbox(){
124	submitButton.innerText = submitButton.innerText.replace(/\.\.\.$/, '');
125	}
126	}
127	- function submitShipment(btn){
128	var checkbox = $(btn).up('.order-totals').select('#create_shipping_label')[0];





129	if (checkbox && checkbox.checked) {
130	packaging.showWindow();
131	} else if(editForm.submit()) {
132	disableElements('submit-button');
133	}
134	}














135	//]]>
136	</script>


104	Event.observe(sendEmailCheckbox, 'change', bindSendEmail);
105	bindSendEmail();
106	}
107	+ function bindSendEmail() {

108	if (sendEmailCheckbox.checked == true) {
109	notifyCustomerCheckbox.disabled = false;
110	//shipmentCommentText.disabled = false;

114	//shipmentCommentText.disabled = true;
115	}
116	}
117	+ function toggleCreateLabelCheckbox() {
118	var checkbox = $('create_shipping_label');
119	var submitButton = checkbox.up('.order-totals').select('.submit-button span')[0];
120	if (checkbox.checked) {

123	submitButton.innerText = submitButton.innerText.replace(/\.\.\.$/, '');
124	}
125	}
126	+ function submitShipment(btn) {
127	var checkbox = $(btn).up('.order-totals').select('#create_shipping_label')[0];
128	+
129	+ if (!validQtyItems()) {
130	+ return;
131	+ }
132	+
133	if (checkbox && checkbox.checked) {
134	packaging.showWindow();
135	} else if(editForm.submit()) {
136	disableElements('submit-button');
137	}
138	}
139	+
140	+ function validQtyItems() {
141	+ var valid = true;
142	+ var errorMessage = '<?php echo $this->helper('sales')->__('Invalid value(s) for Qty to Ship') ?>';
143	+ $$('.qty-item').each(function(item) {
144	+ var val = parseFloat(item.value);
145	+ if (isNaN(val) \|\| val < 0) {
146	+ valid = false;
147	+ alert(errorMessage);
148	+ throw $break;
149	+ }
150	+ });
151	+ return valid;
152	+ }
153	//]]>
154	</script>

app/design/adminhtml/default/default/template/sales/order/shipment/create/items/renderer/default.phtml CHANGED Viewed

	@@ -31,7 +31,7 @@
31
32	<td class="<?php if ($this->isShipmentRegular()): ?>last<?php endif; ?> a-center">
33	<?php if ($this->canShipPartiallyItem()): ?>
34	- <input type="text" class="input-text" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
35	<?php else: ?>
36	<?php echo $_item->getQty()*1 ?>
37	<?php endif; ?>


31
32	<td class="<?php if ($this->isShipmentRegular()): ?>last<?php endif; ?> a-center">
33	<?php if ($this->canShipPartiallyItem()): ?>
34	+ <input type="text" class="input-text qty-item" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" />
35	<?php else: ?>
36	<?php echo $_item->getQty()*1 ?>
37	<?php endif; ?>

app/design/adminhtml/default/default/template/sales/order/shipment/packaging/packed.phtml CHANGED Viewed

	@@ -39,12 +39,12 @@
39	<div class="package-info">
40	<table class="package-options" cellspacing="0">
41	<colgroup>
42	- <col width="~~100~~" />
43	- <col width="*" />
44	- <col width="60" />
45	- <col width="70" />
46	- <col width="70" />
47	- <col width="*" />
48	</colgroup>
49	<tbody>
50	<tr>


39	<div class="package-info">
40	<table class="package-options" cellspacing="0">
41	<colgroup>
42	+ <col width="80"/>
43	+ <col width="*"/>
44	+ <col width="60"/>
45	+ <col width="70"/>
46	+ <col width="140"/>
47	+ <col width="*"/>
48	</colgroup>
49	<tbody>
50	<tr>

app/design/adminhtml/default/default/template/sales/order/totals/tax.phtml CHANGED Viewed

@@ -27,9 +27,12 @@
             ?>
             <?php
             /** @var $_source Mage_Sales_Model_Order_Invoice */
-            -
            $_source    = $this->getSource();
-            -
            $_order     = $this->getOrder();
-            -
            $_fullInfo  = $this->getFullTaxInfo();
             ?>
             <?php if ($this->displayFullSummary()): ?>
@@ -38,66 +41,82 @@ $_fullInfo  = $this->getFullTaxInfo();
                     <?php foreach ($_fullInfo as $info): ?>
                         <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
                         <?php
-            -
                            $percent    = $info['percent'];
-            -
                            $amount     = $info['amount'];
-            -
                            $baseAmount = $info['base_amount'];
-            -
                            $rates      = $info['rates'];
-            -
                            $isFirst    = 1;
                         ?>
                         <?php foreach ($rates as $rate): ?>
-            -
                        <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-            -
                            <?php if (!is_null($rate['percent'])): ?>
-            -
                                <td class="label"><?php echo $rate['title']; ?> (<?php echo (float)$rate['percent']; ?>%)<br /></td>
-            -
                            <?php else: ?>
-            -
                                <td class="label"><?php echo $rate['title']; ?><br /></td>
-            -
                            <?php endif; ?>
-            -
                            <?php if ($isFirst): ?>
-            -
                                <td rowspan="<?php echo count($rates); ?>"><?php echo $this->displayAmount($amount, $baseAmount); ?></td>
-            -
                            <?php endif; ?>
-            -
                        </tr>
-            -
                        <?php
                             $isFirst = 0;
                             $isTop = 0;
-            -
                        ?>
                         <?php endforeach; ?>
                     <?php endforeach; ?>
                 <?php else: ?>
                     <?php foreach ($_fullInfo as $info): ?>
                         <?php
-            -
                            $percent    = $info['percent'];
-            -
                            $amount     = $info['tax_amount'];
-            -
                            $baseAmount = $info['base_tax_amount'];
-            -
                            $isFirst    = 1;
                         ?>
-            -
                        <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
                             <?php if (!is_null($info['percent'])): ?>
-            -
                                <td class="label"><?php echo $this->escapeHtml($info['title']); ?> (<?php echo (float)$info['percent']; ?>%)<br /></td>
                             <?php else: ?>
-            -
                                <td class="label"><?php echo $this->escapeHtml($info['title']); ?><br /></td>
                             <?php endif; ?>
-            -
                                <td><?php echo $this->displayAmount($amount, $baseAmount); ?></td>
                         </tr>
                         <?php
-            -
                            $isFirst = 0;
-            -
                            $isTop = 0;
                         ?>
                     <?php endforeach; ?>
                 <?php endif; ?>
-            -
            <?php endif;?>
-            -
            <?php if ($this->displayFullSummary() && $_fullInfo): ?>
             <tr class="summary-total" onclick="expandDetails(this, '.summary-details')">
-            -
            <?php else: ?>
             <tr>
-            -
            <?php endif; ?>
                 <td class="label">
                     <div class="summary-collapse">
-            -
                    <?php if ($this->helper('tax')->displayFullSummary()): ?>
-            -
                        <?php echo Mage::helper('sales')->__('Total Tax') ?>
-            -
                    <?php else: ?>
-            -
                        <?php echo Mage::helper('sales')->__('Tax') ?>
-            -
                    <?php endif;?>
                     </div>
                 </td>
                 <td>


27	?>
28	<?php
29	/** @var $_source Mage_Sales_Model_Order_Invoice */
30	+ $_source = $this->getSource();
31	+ $_order = $this->getOrder();
32	+ $_fullInfo = $this->getFullTaxInfo();
33	+ $_weees = $this->helper('tax')->getAllWeee($_order);
34	+ global $taxIter;
35	+ $taxIter++;
36	?>
37
38	<?php if ($this->displayFullSummary()): ?>

41	<?php foreach ($_fullInfo as $info): ?>
42	<?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
43	<?php
44	+ $percent = $info['percent'];
45	+ $amount = $info['amount'];
46	+ $baseAmount = $info['base_amount'];
47	+ $rates = $info['rates'];
48	+ $isFirst = 1;
49	?>
50
51	<?php foreach ($rates as $rate): ?>
52	+ <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"
53	+ style="display:none;">
54	+ <?php if (!is_null($rate['percent'])): ?>
55	+ <td class="label"><?php echo $rate['title']; ?> (<?php echo (float)$rate['percent']; ?>%)<br/>
56	+ </td>
57	+ <?php else: ?>
58	+ <td class="label"><?php echo $rate['title']; ?><br/></td>
59	+ <?php endif; ?>
60	+ <?php if ($isFirst): ?>
61	+ <td rowspan="<?php echo count($rates); ?>"><?php echo $this->displayAmount($amount, $baseAmount); ?></td>
62	+ <?php endif; ?>
63	+ </tr>
64	+ <?php
65	$isFirst = 0;
66	$isTop = 0;
67	+ ?>
68	<?php endforeach; ?>
69	<?php endforeach; ?>
70	<?php else: ?>
71	<?php foreach ($_fullInfo as $info): ?>
72	<?php
73	+ $percent = $info['percent'];
74	+ $amount = $info['tax_amount'];
75	+ $baseAmount = $info['base_tax_amount'];
76	+ $isFirst = 1;
77	?>
78
79	+ <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"
80	+ style="display:none;">
81	<?php if (!is_null($info['percent'])): ?>
82	+ <td class="label"><?php echo $this->escapeHtml($info['title']); ?>
83	+ (<?php echo (float)$info['percent']; ?>%)<br/></td>
84	<?php else: ?>
85	+ <td class="label"><?php echo $this->escapeHtml($info['title']); ?><br/></td>
86	<?php endif; ?>
87	+ <td><?php echo $this->displayAmount($amount, $baseAmount); ?></td>
88	</tr>
89	<?php
90	+ $isFirst = 0;
91	+ $isTop = 0;
92	?>
93	<?php endforeach; ?>
94	<?php endif; ?>
95	+ <?php foreach ($_weees as $weeeTitle => $weeeAmount): ?>
96	+ <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"
97	+ style="display:none;">
98	+ <td class="a-right" colspan="1">
99	+ <?php echo $this->escapeHtml($weeeTitle); ?>
100	+ <br/>
101	+ </td>
102	+ <td class="a-right" rowspan="1">
103	+ <?php echo $this->helper('checkout')->formatPrice($weeeAmount); ?>
104	+ </td>
105	+ </tr>
106	+ <?php endforeach; ?>
107	+ <?php endif; ?>
108	+ <?php if ($this->displayFullSummary() && ($_fullInfo \|\| $_weees)): ?>
109	<tr class="summary-total" onclick="expandDetails(this, '.summary-details')">
110	+ <?php else: ?>
111	<tr>
112	+ <?php endif; ?>
113	<td class="label">
114	<div class="summary-collapse">
115	+ <?php if ($this->helper('tax')->displayFullSummary()): ?>
116	+ <?php echo Mage::helper('sales')->__('Total Tax') ?>
117	+ <?php else: ?>
118	+ <?php echo Mage::helper('sales')->__('Tax') ?>
119	+ <?php endif; ?>
120	</div>
121	</td>
122	<td>

app/design/adminhtml/default/default/template/sales/order/view/items/renderer/default.phtml CHANGED Viewed

	@@ -69,12 +69,12 @@
69	</small>
70	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
71	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
72	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></small></span>
73	<?php endforeach; ?>
74	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
75	<small>
76	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
77	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount_incl_tax~~'], $tax['~~amount_incl_tax~~']); ?></span>
78	<?php endforeach; ?>
79	</small>
80	<?php endif; ?>
	@@ -103,7 +103,7 @@
103	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
104
105	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
106	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?>
107	<?php else: ?>
108	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
109	<?php endif; ?>
	@@ -113,7 +113,7 @@
113	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
114	<small>
115	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
116	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_amount~~'], $tax['~~amount~~']); ?></span>
117	<?php endforeach; ?>
118	</small>
119	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
	@@ -130,7 +130,7 @@
130
131	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
132	<br />
133	- <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedAmount~~()); ?></span>
134	<?php endif; ?>
135	<?php endif; ?>
136	</span>
	@@ -167,12 +167,12 @@
167	</small>
168	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
169	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
170	- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></small></span>
171	<?php endforeach; ?>
172	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
173	<small>
174	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
175	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount_incl_tax~~'], $tax['~~row_amount_incl_tax~~']); ?></span>
176	<?php endforeach; ?>
177	</small>
178	<?php endif; ?>
	@@ -200,7 +200,7 @@
200	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
201	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
202	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
203	- <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $_incl~~+$_item~~->~~getWeeeTaxAppliedRowAmount~~()); ?>
204	<?php else: ?>
205	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
206	<?php endif; ?>
	@@ -212,7 +212,7 @@
212	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
213	<small>
214	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215	- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['~~base_row_amount~~'], $tax['~~row_amount~~']); ?></span>
216	<?php endforeach; ?>
217	</small>
218	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
	@@ -228,7 +228,7 @@
228	<?php endif; ?>
229
230	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
231	- <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl~~+$_item~~->~~getBaseWeeeTaxAppliedRowAmount~~(), $~~_incl+$~~_item~~->getWeeeTaxAppliedRowAmount(~~)); ?></span>
232	<?php endif; ?>
233	<?php endif; ?>
234	</span>


69	</small>
70	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
71	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
72	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></small></span>
73	<?php endforeach; ?>
74	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
75	<small>
76	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
77	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
78	<?php endforeach; ?>
79	</small>
80	<?php endif; ?>

103	<?php $_baseIncl = $this->helper('checkout')->getBasePriceInclTax($_item); ?>
104
105	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
106	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?>
107	<?php else: ?>
108	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxDisposition(), $_incl-$_item->getWeeeTaxDisposition()) ?>
109	<?php endif; ?>

113	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
114	<small>
115	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
116	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
117	<?php endforeach; ?>
118	</small>
119	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>

130
131	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
132	<br />
133	+ <span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseWeeeTaxInclTax($_item) , $_incl + Mage::helper('weee')->getWeeeTaxInclTax($_item)); ?></span>
134	<?php endif; ?>
135	<?php endif; ?>
136	</span>

167	</small>
168	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
169	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
170	+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></small></span>
171	<?php endforeach; ?>
172	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales', $_item->getStoreId())): ?>
173	<small>
174	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
175	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
176	<?php endforeach; ?>
177	</small>
178	<?php endif; ?>

200	<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
201	<?php $_baseIncl = $this->helper('checkout')->getBaseSubtotalInclTax($_item); ?>
202	<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales', $_item->getStoreId())): ?>
203	+ <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item), $_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?>
204	<?php else: ?>
205	<?php echo $this->displayPrices($_baseIncl-$_item->getBaseWeeeTaxRowDisposition(), $_incl-$_item->getWeeeTaxRowDisposition()) ?>
206	<?php endif; ?>

212	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales', $_item->getStoreId())): ?>
213	<small>
214	<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
215	+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
216	<?php endforeach; ?>
217	</small>
218	<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>

228	<?php endif; ?>
229
230	<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales', $_item->getStoreId())): ?>
231	+ <br /><span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->displayPrices($_baseIncl + Mage::helper('weee')->getBaseRowWeeeTaxInclTax($_item),$_incl + Mage::helper('weee')->getRowWeeeTaxInclTax($_item)); ?></span>
232	<?php endif; ?>
233	<?php endif; ?>
234	</span>

app/design/adminhtml/default/default/template/system/store/cell.phtml ADDED Viewed

	@@ -0,0 +1,33 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package default_default
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	+ */
26	+ $object = $this->getObject();
27	+ ?>
28	+
29	+ <a href="<?php echo $this->getLinkUrl(); ?>" class="<?php echo $object->getIsDefault() ? 'bold' : '' ?> <?php echo $this->getClass(); ?>" title="<?php echo $this->__('Id') . ': ' . $object->getId()?>">
30	+ <?php echo $this->escapeHtml($object->getName()); ?>
31	+ </a>
32	+ <br />
33	+ <span class="additional-info">(<?php echo $this->getInfo(); ?>)</span>

app/design/adminhtml/default/default/template/system/store/container.phtml ADDED Viewed

	@@ -0,0 +1,37 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package default_default
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	+ */
26	+ ?>
27	+ <div class="content-header">
28	+ <table cellspacing="0">
29	+ <tr>
30	+ <td style="<?php echo $this->getHeaderWidth() ?>"><?php echo $this->getHeaderHtml() ?></td>
31	+ <td class="form-buttons"><?php echo $this->getButtonsHtml() ?></td>
32	+ </tr>
33	+ </table>
34	+ </div>
35	+ <div>
36	+ <?php echo $this->getGridHtml() ?>
37	+ </div>

app/design/adminhtml/default/default/template/system/store/tree.phtml ADDED Viewed

	@@ -0,0 +1,99 @@


1	+ <?php
2	+ /**
3	+ * Magento
4	+ *
5	+ * NOTICE OF LICENSE
6	+ *
7	+ * This source file is subject to the Academic Free License (AFL 3.0)
8	+ * that is bundled with this package in the file LICENSE_AFL.txt.
9	+ * It is also available through the world-wide-web at this URL:
10	+ * http://opensource.org/licenses/afl-3.0.php
11	+ * If you did not receive a copy of the license and are unable to
12	+ * obtain it through the world-wide-web, please send an email
13	+ * to license@magentocommerce.com so we can send you a copy immediately.
14	+ *
15	+ * DISCLAIMER
16	+ *
17	+ * Do not edit or add to this file if you wish to upgrade Magento to newer
18	+ * versions in the future. If you wish to customize Magento for your
19	+ * needs please refer to http://www.magentocommerce.com for more information.
20	+ *
21	+ * @category design
22	+ * @package default_default
23	+ * @copyright Copyright (c) 2013 Magento Inc. (http://www.magentocommerce.com)
24	+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
25	+ */
26	+ ?>
27	+
28	+ <?php
29	+ /* @var $this Mage_Adminhtml_Block_System_Store_Tree */
30	+ ?>
31	+
32	+ <div class="grid">
33	+ <table class="data" cellspacing="0">
34	+ <thead>
35	+ <tr class="headings">
36	+ <th class="no-link"><span class="nobr"><a href="<?php echo $this->getUrl('//newWebsite') ?>"><?php echo Mage::helper('core')->__('Website Name') ?></a></span></th>
37	+ <th class="no-link"><span class="nobr"><a href="<?php echo $this->getUrl('//newGroup') ?>"><?php echo Mage::helper('core')->__('Store Name') ?></a></span></th>
38	+ <th class="no-link"><span class="nobr"><a href="<?php echo $this->getUrl('//newStore') ?>"><?php echo Mage::helper('core')->__('Store View Name') ?></a></span></th>
39	+ </tr>
40	+ </thead>
41	+ <tbody>
42	+ <?php $printedWebsite = false; ?>
43	+ <?php $printedStoreGroup = false; ?>
44	+ <?php foreach ($this->getTableData() as $webSiteId => $webSiteData): ?>
45	+
46	+ <?php if (count($webSiteData['storeGroups']) == 0): ?>
47	+
48	+ <tr>
49	+ <?php if (!$printedWebsite): ?>
50	+ <td class="a-left" rowspan="<?php echo $webSiteData['count'] ?>"><?php echo $this->renderWebsite($webSiteData['object']) ?></td>
51	+ <?php endif ?>
52	+
53	+ <td colspan="2" class="a-left last"><span class="not-available"></span></td>
54	+ </tr>
55	+
56	+ <?php $printedWebsite = false; ?>
57	+ <?php continue ?>
58	+ <?php endif ?>
59	+
60	+ <?php foreach ($webSiteData['storeGroups'] as $storeGroupId => $storeGroupData): ?>
61	+ <?php if (count($storeGroupData['stores']) == 0): ?>
62	+ <tr>
63	+ <?php if (!$printedWebsite): ?>
64	+ <td class="a-left" rowspan="<?php echo $webSiteData['count'] ?>"><?php echo $this->renderWebsite($webSiteData['object']) ?></td>
65	+ <?php $printedWebsite = true; ?>
66	+ <?php endif ?>
67	+
68	+ <?php if (!$printedStoreGroup): ?>
69	+ <td class="a-left" rowspan="<?php echo $storeGroupData['count'] ?>"><?php echo $this->renderStoreGroup($storeGroupData['object']) ?></td>
70	+ <?php endif ?>
71	+
72	+ <td class="a-left last"><span class="not-available"></span></td>
73	+ </tr>
74	+ <?php $printedStoreGroup = false; ?>
75	+ <?php continue ?>
76	+ <?php endif ?>
77	+
78	+ <?php foreach ($storeGroupData['stores'] as $storeId => $storeData): ?>
79	+ <tr>
80	+ <?php if (!$printedWebsite): ?>
81	+ <td class="a-left" rowspan="<?php echo $webSiteData['count'] ?>"><?php echo $this->renderWebsite($webSiteData['object']) ?></td>
82	+ <?php $printedWebsite = true; ?>
83	+ <?php endif ?>
84	+
85	+ <?php if (!$printedStoreGroup): ?>
86	+ <td class="a-left" rowspan="<?php echo $storeGroupData['count'] ?>"><?php echo $this->renderStoreGroup($storeGroupData['object']) ?></td>
87	+ <?php $printedStoreGroup = true; ?>
88	+ <?php endif ?>
89	+
90	+ <td class="a-left last"><?php echo $this->renderStore($storeData['object']); ?></td>
91	+ </tr>
92	+ <?php endforeach; ?>
93	+ <?php $printedStoreGroup = false; ?>
94	+ <?php endforeach; ?>
95	+ <?php $printedWebsite = false; ?>
96	+ <?php endforeach; ?>
97	+ </tbody>
98	+ </table>
99	+ </div>

app/design/adminhtml/default/default/template/tax/notifications.phtml CHANGED Viewed

@@ -26,27 +26,49 @@
             /* @var $this Mage_Tax_Block_Adminhtml_Notifications */
             ?>
             <?php $messageDetails = $this->helper('tax')->__('Please see <a href="%s">source</a> for more details.', $this->getInfoUrl())
-            -
                    . $this->helper('tax')->__('Click here to go to <a href="%s">Tax configuration</a> and change your settings.', $this->getManageUrl());
             ?>
-            -
            <?php $discountStores = $this->getWebsitesWithWrongDiscountSettings()?>
-            -
            <?php if(!Mage::helper('tax')->isWrongDiscountSettingsIgnored() && $discountStores):?>
             <div class="notification-global">
-            -
                <strong><?php echo $this->helper('tax')->__('Warning tax discount configuration might result in different discounts than a customer might expect')?></strong>
-            -
                <?php if(is_array($discountStores)):?><strong><?php echo $this->helper('tax')->__('for store(s)')?>: </strong><?php echo implode(', ', $discountStores)?><?php endif;?>.
                 <?php echo $messageDetails ?>
                 <span class="f-right">
-            -
                    <a href="<?php echo $this->getIgnoreTaxNotificationUrl('discount') ?>"><?php echo $this->helper('tax')->__('Ignore this notification')?></a>
                 </span>
             </div>
-            -
            <?php endif;?>
             <?php $priceDisplayStores = $this->getStoresWithWrongDisplaySettings() ?>
-            -
            <?php if(!Mage::helper('tax')->isWrongDisplaySettingsIgnored() && $priceDisplayStores):?>
             <div class="notification-global">
-            -
                <strong><?php echo $this->helper('tax')->__('Warning tax configuration can result in rounding errors')?></strong>
-            -
                <?php if(is_array($priceDisplayStores)):?><strong><?php echo $this->helper('tax')->__('for store(s)')?>: </strong><?php echo implode(', ', $priceDisplayStores)?><?php endif;?>.
                 <?php echo $messageDetails ?>
                 <span class="f-right">
-            -
                    <a href="<?php echo $this->getIgnoreTaxNotificationUrl('price_display') ?>"><?php echo $this->helper('tax')->__('Ignore this notification')?></a>
                 </span>
             </div>
-            -
            <?php endif;?>


26	/* @var $this Mage_Tax_Block_Adminhtml_Notifications */
27	?>
28	<?php $messageDetails = $this->helper('tax')->__('Please see <a href="%s">source</a> for more details.', $this->getInfoUrl())
29	+ . $this->helper('tax')->__('Click here to go to <a href="%s">Tax configuration</a> and change your settings.', $this->getManageUrl());
30	?>
31	+ <?php $discountStores = $this->getWebsitesWithWrongDiscountSettings() ?>
32	+ <?php if (!Mage::helper('tax')->isWrongDiscountSettingsIgnored() && $discountStores): ?>
33	<div class="notification-global">
34	+ <strong><?php echo $this->helper('tax')->__('Warning tax discount configuration might result in different discounts than a customer might expect') ?></strong>
35	+ <?php if (is_array($discountStores)): ?><strong><?php echo $this->helper('tax')->__('for store(s)') ?>
36	+ : </strong><?php echo implode(', ', $discountStores) ?><?php endif; ?>.
37	<?php echo $messageDetails ?>
38	<span class="f-right">
39	+ <a href="<?php echo $this->getIgnoreTaxNotificationUrl('discount') ?>"><?php echo $this->helper('tax')->__('Ignore this notification') ?></a>
40	</span>
41	</div>
42	+ <?php endif; ?>
43	+
44	<?php $priceDisplayStores = $this->getStoresWithWrongDisplaySettings() ?>
45	+ <?php if (!Mage::helper('tax')->isWrongDisplaySettingsIgnored() && $priceDisplayStores): ?>
46	<div class="notification-global">
47	+ <strong><?php echo $this->helper('tax')->__('Warning tax configuration can result in rounding errors') ?></strong>
48	+ <?php if (is_array($priceDisplayStores)): ?><strong><?php echo $this->helper('tax')->__('for store(s)') ?>
49	+ : </strong><?php echo implode(', ', $priceDisplayStores) ?><?php endif; ?>.
50	<?php echo $messageDetails ?>
51	<span class="f-right">
52	+ <a href="<?php echo $this->getIgnoreTaxNotificationUrl('price_display') ?>"><?php echo $this->helper('tax')->__('Ignore this notification') ?></a>
53	</span>
54	</div>
55	+ <?php endif; ?>
56	+
57	+ <?php $storesWithConflictingFptTaxConfigurationSettings = $this->getStoresWithConflictingFptTaxConfigurationSettings() ?>
58	+ <?php $isDefaultStoreConflictingFptTaxConfigurationSettings = $this->isDefaultStoreWithConflictingFptTaxConfigurationSettings() ?>
59	+
60	+ <?php if (!Mage::helper('tax')->isConflictingFptTaxConfigurationSettingsIgnored() &&
61	+ ($isDefaultStoreConflictingFptTaxConfigurationSettings \|\| $storesWithConflictingFptTaxConfigurationSettings)
62	+ ): ?>
63	+ <div class="notification-global">
64	+ <strong><?php echo $this->helper('tax')->__('Warning tax configuration can result in unexpected FPT prices on applicable devices') ?></strong>
65	+ <!-- If the default store is fine, but the others aren't, list the ones that have conflicting settings-->
66	+ <?php if (empty($storesWithConflictingFptTaxConfigurationSettings) && !$isDefaultStoreConflictingFptTaxConfigurationSettings): ?>
67	+ <strong><?php echo $this->helper('tax')->__('for store(s)') ?>
68	+ : </strong><?php echo implode(', ', $storesWithConflictingFptTaxConfigurationSettings) ?><?php endif; ?>.
69	+ <span class="f-right">
70	+ <a href="<?php echo $this->getIgnoreTaxNotificationUrl('fpt_configuration') ?>"><?php echo $this->helper('tax')->__('Ignore this notification') ?></a>
71	+ </span>
72	+ </div>
73	+ <?php endif; ?>
74	+

package.xml CHANGED Viewed

	@@ -1,18 +1,18 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Interface_Adminhtml_Default</name>
4	- <version>1.8.0.0</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>Default interface for Adminhtml</summary>
10	<description>Default interface for Adminhtml</description>
11	- <notes>1.8.0.0</notes>
12	<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13	- <date>2013-09-24</date>
14	- <time>09:09:39</time>
15	- <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="adminnotification.xml" hash="7acc4e08b1547ebc77d738c167309e21"/><file name="admin.xml" hash="3f67b9113990f8a9fc5064aa8402b1aa"/><file name="api2.xml" hash="a6e09e431f0db34fc54af4c950cf0cba"/><file name="authorizenet.xml" hash="f52103446bbae8227fbf4f4a418b9672"/><file name="bundle.xml" hash="07895a0fe4f3c9c616beb61d4e41b058"/><file name="captcha.xml" hash="57b5f3f6049299f4f47b6272ed38b9f2"/><file name="catalog.xml" hash="9b39b8e3113e0f5ed54abf6593e76995"/><file name="cms.xml" hash="b11e70d2737be5b12a4df97cef693195"/><file name="connect.xml" hash="44f937e1cb116bb4e7a27630e32efb5c"/><file name="currencysymbol.xml" hash="f4332c65caa28d94cf6e39a0107778c7"/><file name="customer.xml" hash="05fa9913be68f1158b18879718b12863"/><file name="dataflow.xml" hash="ed30760c1bda416acdfff76807b9250f"/><file name="downloadable.xml" hash="438b29d90e20c3113c2e5a605c958c47"/><file name="giftmessage.xml" hash="cdbee9efa50093594cb18b4043dd2de5"/><file name="importexport.xml" hash="90833e5f738675aec4d5e3912a243339"/><file name="index.xml" hash="69ba9702acd908708c3e0ac2c9789947"/><file name="main.xml" hash="af6c63aa72fd857703688684306271d2"/><file name="newsletter.xml" hash="907890091132fbddb80360984f32b934"/><file name="oauth.xml" hash="e736d51346a6b4f686d9397d3a721b3d"/><file name="pagecache.xml" hash="fdbd061be983631ce18ebd9fe80ffb94"/><file name="promo.xml" hash="aaa5d244fe1d45d0832bb527e23767e4"/><file name="report.xml" hash="32221b083a21ab7544ece85e4056aae2"/><file name="rss.xml" hash="c7938ce9bc21736f3c1d5a2dcaadb3de"/><file name="sales.xml" hash="0eb2a9f3240dce7d23ae769b8c63a799"/><file name="search.xml" hash="394769515b5419ad9170a41f36a2ea50"/><file name="tag.xml" hash="ebe1533056c85a577d01f409ecd68d68"/><file name="tax.xml" hash="64e9b8b9a207bd1450bb617483cbf47c"/><file name="widget.xml" hash="f174dc0efed5552d90cab15fd55d1a91"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="735c9ec66d1309f1206294f075fdcdd1"/></dir></dir><dir name="template"><file name="access_denied.phtml" hash="92823795c6d1d3150f90e5af6975087c"/><dir name="api"><file name="roleinfo.phtml" hash="a747b610ce1d303e6386699d6be4b124"/><file name="rolesedit.phtml" hash="bc311e31ae20a68f1c925d29378f614f"/><file name="roles.phtml" hash="d68d22cfba21927ecbe95db6ae7cee43"/><file name="rolesusers.phtml" hash="13ef3a4e3f2b9029145d77f5acb7cb7a"/><file name="role_users_grid_js.phtml" hash="4bbeb28571f69d12d2644e90969eaa81"/><file name="userinfo.phtml" hash="ac60e8332ae54b118b3004ac50c5de5d"/><file name="usernroles.phtml" hash="9110a1d0be02818c12f0d76353e6b230"/><file name="user_roles_grid_js.phtml" hash="7fa8d6ebc419f401c8472cb5c5abccda"/><file name="userroles.phtml" hash="2d779269a168d467e1b23dcaaa67b898"/><file name="users.phtml" hash="686451dcc0db658e0f342de6cb651478"/></dir><dir name="api2"><dir name="attribute"><file name="buttons.phtml" hash="3e4b92069b79a54b637f2c4b1c02e13c"/><file name="resource.phtml" hash="d450e1316d17eb7396313f7ccf9948a4"/></dir><dir name="permissions"><dir name="user"><dir name="edit"><dir name="tab"><dir name="roles"><file name="js.phtml" hash="98c0ac357aec9f6a39662016f8bcfff6"/></dir></dir></dir></dir></dir><dir name="role"><file name="buttons.phtml" hash="40e580be13fa41b73ab57fe6a58943c9"/><file name="users_grid_js.phtml" hash="6da62e3a16a1676e7c0c34d756addfef"/></dir></dir><dir name="authorizenet"><dir name="directpost"><file name="iframe.phtml" hash="327f46f045aae43b5d3f5362ad9e2ab9"/><file name="info.phtml" hash="29180c7561a3d53e83cd20f72b8fb9d6"/></dir></dir><dir name="backup"><file name="dialogs.phtml" hash="fc0361f93157b9d6da56419ee5bf8a9f"/><file name="left.phtml" hash="7a2cb973a79adeb20e4b254a9124819b"/><file name="list.phtml" hash="42fa810cc9266b75ebea879e47bf3a45"/></dir><dir name="bundle"><dir name="product"><dir name="composite"><dir name="fieldset"><dir name="options"><file name="bundle.phtml" hash="89499fbf2db2bbdd1f5ee179b854586c"/><dir name="type"><file name="checkbox.phtml" hash="e8f0bfbb365b2f6712f60026c9ce1b18"/><file name="multi.phtml" hash="0988351a515671f9aaa2b792d75c59bb"/><file name="radio.phtml" hash="6234abd48de61d70d1f35db13f689c7b"/><file name="select.phtml" hash="7724c1cf48980f85c6d4599a666cc095"/></dir></dir></dir></dir><dir name="edit"><dir name="bundle"><dir name="option"><file name="search.phtml" hash="a01bc3290a390209ecf388864ce8a2b7"/><file name="selection.phtml" hash="073848dfe3e5e5346cdd226a1cfb8c5f"/></dir><file name="option.phtml" hash="e7063e7b8018a893d4d37edce62b716c"/></dir><file name="bundle.phtml" hash="f9f28eb3f4688403ea4798fc289508a3"/></dir></dir><dir name="sales"><dir name="creditmemo"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="9d9ee98449a3ce34a603108d60a692a6"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="2028751556d03e1a61d54d359f16eb36"/></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="0cb636a29f7362def0c8564368e5a02b"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="ccfc55b4bde21cecb8d3703a9c6df05f"/></dir></dir></dir><dir name="order"><dir name="view"><dir name="items"><file name="renderer.phtml" hash="85d91d7961c8065db6aa624f5951bdc4"/></dir></dir></dir><dir name="shipment"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="9a40c0e11713e9ccd595aefdda832106"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="2784e8c94ea6a46c0145f74f9068e198"/></dir></dir></dir></dir></dir><dir name="captcha"><file name="zend.phtml" hash="fdb5192f0165fbd73020be831773b02f"/></dir><dir name="catalog"><dir name="category"><dir name="checkboxes"><file name="tree.phtml" hash="93341321e660e9315740b668b81b18b1"/></dir><dir name="edit"><file name="form.phtml" hash="64ae6507e31ef4be089c5073d6da8752"/></dir><file name="edit.phtml" hash="3e0737975a3f17b3b7a3a7d37fa346df"/><file name="tree.phtml" hash="a07f8c23d31ecee9b462fc8c10a7477c"/><dir name="widget"><file name="tree.phtml" hash="98c813f4f07624c2c5a6110f51b719cf"/></dir></dir><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="e8d0c3368acc77795b4b7b9c342caa03"/></dir></dir></dir><dir name="product"><dir name="attribute"><file name="js.phtml" hash="02e26715029a70679052ed6d2fa106d3"/><dir name="new"><file name="created.phtml" hash="151a091138128d99742f55d7c1b2110a"/></dir><file name="options.phtml" hash="da86ae5cf4a436ec0d249820dced47ed"/><dir name="set"><dir name="main"><dir name="tree"><file name="attribute.phtml" hash="7a98412b5e02a2337962f1cba1c0926f"/><file name="group.phtml" hash="7327296a5910e134bb27d921ba6faef9"/></dir></dir><file name="main.phtml" hash="000a4dbe286f9d1c197db26e06f96a92"/><dir name="toolbar"><file name="add.phtml" hash="f923b1a243a99ab1e1421016dfece85e"/><file name="main.phtml" hash="69135d84b55225c318764deb86911eb8"/></dir></dir></dir><dir name="composite"><file name="configure.phtml" hash="4691e35f72bc805b4a78cdb10d1b30aa"/><dir name="fieldset"><file name="configurable.phtml" hash="356bc1bda51444b3e689d75050c2546d"/><file name="grouped.phtml" hash="f1916f58ec361a017c66dabbcf828fb3"/><dir name="options"><file name="js.phtml" hash="dddc183fd7c1f9aef5f8956396168371"/><dir name="type"><file name="date.phtml" hash="751dd58c82ff3711b219a359fbbd7dc5"/><file name="default.phtml" hash="9d47d54a3b46055de7dd7d1bc159982d"/><file name="file.phtml" hash="79e6110614250e705ebc245c73b70953"/><file name="select.phtml" hash="dcb71b5942bc011ddc8bab0f143c97b1"/><file name="text.phtml" hash="711bb7e26fd1c912900b3bfd2fe4312e"/></dir></dir><file name="options.phtml" hash="291db960eefe6bc4ee11083cddc7f49b"/><file name="qty.phtml" hash="b2ecd8770549f70510c096155876b2dd"/></dir></dir><file name="created.phtml" hash="7ad824b374c094fce2694f639bbdff07"/><dir name="edit"><dir name="action"><file name="attribute.phtml" hash="135122ecde9c695a82d48c6bb12c58b8"/><file name="inventory.phtml" hash="0a6c1e7c27ec448cddd3c5ed39381976"/><file name="websites.phtml" hash="e70bdd8f8bb4d2837e8e3703dc6a6d8a"/></dir><file name="categories.phtml" hash="1c7e89cbb3b26bdf5e73a0129a02461d"/><dir name="options"><file name="option.phtml" hash="fa1a16330d836f2c726de65f8f83f3bd"/><dir name="type"><file name="date.phtml" hash="fe4dfbe4467eba7efba074e2bee082f6"/><file name="file.phtml" hash="0597a3a119484f1fe6e15985965ac12c"/><file name="select.phtml" hash="259b6fcd60668b02018544edfed0d434"/><file name="text.phtml" hash="99241a0b273953e8e7e5da01f11416af"/></dir></dir><file name="options.phtml" hash="1c83a9b7f656ef0db5350eea9a9921e0"/><dir name="price"><file name="group.phtml" hash="3772ae5ab7ccc1d48017d6c8111cc82e"/><file name="tier.phtml" hash="190db4bba7240e419566d0f4d9ed77f6"/></dir><file name="serializer.phtml" hash="c8277b360460b86e31d49723cb0a2e35"/><dir name="super"><file name="config.phtml" hash="c9d89d1db17c73a6602fb2d2c2a383a0"/></dir><file name="websites.phtml" hash="8828fcb86ab18e113744dbfa7f581e63"/></dir><file name="edit.phtml" hash="f0615d0ba774625beb4de2c4f8e20c39"/><dir name="helper"><file name="gallery.phtml" hash="5bf320f5189fc4b430b842ff5b4de94b"/></dir><file name="js.phtml" hash="0584d9fe8ec9fa4f2aeff8a754b4eda0"/><file name="price.phtml" hash="63805b0ca7598b1261f02cd8676e45c5"/><dir name="tab"><file name="alert.phtml" hash="a5568acabd6f3cfb28977390840646a5"/><file name="inventory.phtml" hash="6759a08e6afe766db7ed54814ea4676b"/></dir><dir name="widget"><dir name="chooser"><file name="container.phtml" hash="3043ccbabb4641105b3f241f156f8c4a"/></dir></dir></dir><file name="product.phtml" hash="7d7d72652c83ea5007431ede860241fe"/><dir name="wysiwyg"><file name="js.phtml" hash="79bf2f95fc47fb369accebab015405fe"/></dir></dir><dir name="cms"><dir name="browser"><dir name="content"><file name="files.phtml" hash="8bca646eb72689b0b9c261a8d43f6261"/><file name="newfolder.phtml" hash="84e15ba19934ba070b39fef40eb5b8c0"/><file name="uploader.phtml" hash="74334f78aadf103650e73cb3aba0cae3"/></dir><file name="content.phtml" hash="011898836d6c1abbaffa754ce6480f10"/><file name="js.phtml" hash="07caa78fabab177f9daded1115947155"/><file name="tree.phtml" hash="e658c33a04ad1c24e4ac66187ac9aebf"/></dir><dir name="page"><dir name="edit"><dir name="form"><dir name="renderer"><file name="content.phtml" hash="0aee2c89cab9c172f7754efb1e97c616"/></dir></dir></dir></dir></dir><file name="coming.phtml" hash="d5b559a738546ced442f00df92fe02d7"/><dir name="connect"><dir name="extension"><dir name="custom"><file name="authors.phtml" hash="f100935c95888e51526c58f384b2d7c4"/><file name="contents.phtml" hash="b7ce10e80c74c050abf341436d665758"/><file name="depends.phtml" hash="dcc96e497bbf24596010023b65a733f6"/><file name="load.phtml" hash="d63a2982e9fe2fe1f283e2b4c4b285dd"/><file name="package.phtml" hash="e8036f32b44fb6314a403b82c011ec01"/><file name="release.phtml" hash="b50329d60d68bff9ff0e8a5a5dc39b5d"/></dir></dir></dir><dir name="currencysymbol"><file name="grid.phtml" hash="d58794138d10de0194e8ddfa2aab43d1"/></dir><dir name="customer"><dir name="edit"><file name="js.phtml" hash="94a3d284e8a0b92789f690feed2a58f1"/><dir name="tab"><dir name="account"><dir name="form"><dir name="renderer"><file name="group.phtml" hash="63f0c218412d3ccae329ce6559eedf85"/></dir></dir></dir><dir name="view"><dir name="grid"><file name="item.phtml" hash="00e1569fba2eb47e193964b4e9a1fe7e"/></dir></dir></dir></dir><file name="online.phtml" hash="2de6f2d49e7e7299fd87021a74dc9b42"/><dir name="sales"><dir name="order"><dir name="create"><dir name="address"><dir name="form"><dir name="renderer"><file name="vat.phtml" hash="9745f3ffd9fef88d7405e4fc94fd2f00"/></dir></dir></dir></dir></dir></dir><dir name="system"><dir name="config"><file name="validatevat.phtml" hash="d66acd187bdfed31c3c2354f546442cd"/></dir></dir><dir name="tab"><file name="addresses.phtml" hash="ffe1db506f0d0b319d895121140eb14d"/><file name="cart.phtml" hash="5f91cd5a9af29c8357d0ecec393866e1"/><file name="newsletter.phtml" hash="217e3adaddfde5eebd69cb0b9ce3137c"/><dir name="view"><file name="sales.phtml" hash="21ccdd0aa155d124e31e9d14221fd2b5"/></dir><file name="view.phtml" hash="8cb1861837a4b6dfc5a928fd308696a1"/><file name="wishlist.phtml" hash="0fdd8fcd370831354501f87cc860fa24"/></dir></dir><dir name="dashboard"><dir name="graph"><file name="disabled.phtml" hash="a9f2f2fe66344d1ab52f2a8846b3ee19"/></dir><file name="graph.phtml" hash="6a61127c70fdb5e5a03cf3d813666919"/><file name="grid.phtml" hash="becc52bd2bdb27ecc64db3ec8c103ca5"/><file name="index.phtml" hash="2710fe9fb5394987de59b3cf8135604e"/><file name="salebar.phtml" hash="0ee90c82d5961b7d11653390ed1410e0"/><file name="searches.phtml" hash="cf00ce9257abcfe21c47d326830f6484"/><dir name="store"><file name="switcher.phtml" hash="70d22485908ab869cefb6e6e3e7adae4"/></dir><file name="totalbar.phtml" hash="16b05457a8d88bfea297010da868f01b"/></dir><dir name="directory"><dir name="js"><file name="optional_zip_countries.phtml" hash="82991cce214f70fd6f3069ffa054bab8"/></dir></dir><dir name="downloadable"><dir name="product"><dir name="composite"><dir name="fieldset"><file name="downloadable.phtml" hash="d6a42cc2317c05cfebceb41a1bb81357"/></dir></dir><dir name="edit"><dir name="downloadable"><file name="links.phtml" hash="ba61ab5dc51a98bb8a15657a7f717fec"/><file name="samples.phtml" hash="b634ad45d24b56dd03c77bd2b6522356"/></dir><file name="downloadable.phtml" hash="ca0899308ee8eb270e49accc9492e9ed"/></dir></dir><dir name="sales"><dir name="items"><dir name="column"><dir name="downloadable"><dir name="creditmemo"><file name="name.phtml" hash="1f3e085fbcca1e58454ea9c6f2d4fc2b"/></dir><dir name="invoice"><file name="name.phtml" hash="c88ad7b48b0e96e873e5e4717473692d"/></dir><file name="name.phtml" hash="dd921b62e3aa82657e557310fccb7657"/></dir></dir></dir><dir name="order"><dir name="creditmemo"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="37b4104928cf082e65303b1253e703bb"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="326c8a28845c398f515f7855454ec345"/></dir></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b36da3d2202cbf5c428c577eebe1f22a"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="45e721ee3f6a352d46db1ed35346afe8"/></dir></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="b37ebef39f0c278edf2982d1b27c9fcf"/></dir></dir></dir></dir></dir></dir><dir name="eav"><dir name="attribute"><dir name="edit"><file name="js.phtml" hash="7a98412b5e02a2337962f1cba1c0926f"/></dir><file name="options.phtml" hash="b256d2cced5639b490fd02f386b856c0"/></dir></dir><dir name="email"><dir name="order"><file name="items.phtml" hash="32d547712ab27288ba48f3409be68848"/></dir></dir><file name="empty.phtml" hash="85b5bcbacf33148afa9cb2e291ed9c29"/><file name="example.phtml" hash="fa6ad939de28c77f97c7661b70ae32b6"/><file name="forgotpassword.phtml" hash="9a6bb0557f28c75a8313be2c8344b30b"/><file name="formkey.phtml" hash="668f8c7327ebc6e52e81837e6d59883e"/><dir name="giftmessage"><file name="form.phtml" hash="8ee516dc74b127343fee0878f0bf9fea"/><file name="giftoptionsform.phtml" hash="63957f638434ce0a8d6db542ddef62dd"/><file name="helper.phtml" hash="bdd78c5dd5b3f8c6982aef0bf972926b"/><file name="popup.phtml" hash="a59c297c518a7b1da339a9a26f282ec1"/><dir name="sales"><dir name="order"><dir name="create"><file name="giftoptions.phtml" hash="093edda5e1e6c70305be5cd6a72a428c"/><file name="items.phtml" hash="de0f3a292bc3300485150c235b3c8baf"/></dir><dir name="view"><file name="giftoptions.phtml" hash="31f1e4a845d664c74167e4aaf8e60d92"/><file name="items.phtml" hash="6e13e1c989e036a70ce63985109ebf4b"/></dir></dir></dir></dir><dir name="googlebase"><file name="captcha.phtml" hash="4c757e7ae89a8d5d6f6a9b9442e9db06"/><file name="items.phtml" hash="6c36149414fdb1429aa538af780bd8cc"/><dir name="types"><dir name="edit"><file name="attributes.phtml" hash="c020a509f199500e302990d93d334cd9"/></dir></dir></dir><dir name="importexport"><file name="busy.phtml" hash="d262675a58d13c07e06758a8289a3835"/><dir name="export"><dir name="form"><file name="after.phtml" hash="3e764cd464cb459e97a83c2290db2211"/><file name="before.phtml" hash="404ce5d37d1a382e2686348e37927562"/></dir></dir><dir name="import"><dir name="form"><file name="after.phtml" hash="9bed43a35ee858d35cbb5ee6c22a7d7a"/><file name="before.phtml" hash="ff9c4f2494f974420f80f3af7f10e5bc"/></dir><dir name="frame"><file name="result.phtml" hash="4916fcf4a49ebd7c3a714c89f799c61a"/></dir></dir></dir><dir name="index"><file name="notifications.phtml" hash="da5caede6028791f5ad4d18f8849a10f"/></dir><file name="login.phtml" hash="06e47e38d714b6dcb0d05a4c58498a24"/><dir name="media"><file name="editor.phtml" hash="7a43efd27957c6af0be487bb9c575a9a"/><file name="uploader.phtml" hash="526fa29bfbe08b7db8a8f0b487a711aa"/></dir><dir name="newsletter"><dir name="preview"><file name="iframeswitcher.phtml" hash="a1fd201e45ac43760cd93cfd008e08b2"/><file name="store.phtml" hash="db953f03978e2c4fefd86060cb569297"/></dir><dir name="problem"><file name="list.phtml" hash="b87e241b95fa68260c6e34ac8ad3dc58"/></dir><dir name="queue"><file name="edit.phtml" hash="75d0bf23bb2a7583f5e8af836b62af93"/><file name="list.phtml" hash="a6a0648a213a57e7ad83f91c96d52717"/><file name="preview.phtml" hash="f1bea98facf19ca2ce34470e6b86cb87"/></dir><dir name="subscriber"><file name="list.phtml" hash="ad47057f0078b902d262d56143c9cade"/></dir><dir name="template"><file name="edit.phtml" hash="2ffe2af188c8c8d30f4993d9d3e8eddd"/><file name="list.phtml" hash="1266bfe62755075fc7f38b4598007a29"/><file name="preview.phtml" hash="f1bea98facf19ca2ce34470e6b86cb87"/></dir></dir><dir name="notification"><file name="baseurl.phtml" hash="1a5a7dffdfc83d740ef2843e54a12dd9"/><file name="security.phtml" hash="83362536d29fe224b474c063de3cd6ab"/><file name="survey.phtml" hash="08aca628ec979a2c69447429771de8df"/><file name="toolbar.phtml" hash="4d39b7bd8e45b04f8e554bf9de6202fb"/><file name="window.phtml" hash="5666027b927a760d0d1ab54fed5d791c"/></dir><dir name="oauth"><dir name="authorize"><file name="button.phtml" hash="8ef4e59f856e200ae9b4df6a9b11040a"/><file name="button-simple.phtml" hash="d9fc19bb662651816023670f0c541473"/><file name="confirm.phtml" hash="3fb68893fe222c965cba7bfe3b1d763f"/><file name="confirm-simple.phtml" hash="c6f9aad0568c1183be7758d4355566e8"/><dir name="form"><file name="login.phtml" hash="02bae281f86f343afbe82899abf2ecc9"/><file name="login-simple.phtml" hash="795a6e6ac738c592a1c6d8cb160107f2"/></dir><file name="head-simple.phtml" hash="025e93a7450094ebb292be787b3a6093"/><file name="reject.phtml" hash="ca1c10dcc85ecfa5803e46ea5960059d"/><file name="reject-simple.phtml" hash="239588bf20e2a78130178c9fe49b7bce"/></dir></dir><file name="overlay_popup.phtml" hash="23a40353e27d75eb0bbda6175f671796"/><dir name="page"><file name="footer.phtml" hash="2462a7315f44a7fd106f4ea5d2347215"/><file name="header.phtml" hash="b22db4d17af45d66789444f39bf427b2"/><file name="head.phtml" hash="5d95792ce437b953557e60e41cff7122"/><dir name="js"><file name="calendar.phtml" hash="34d10b8433102613bb6a4bed72f3e0f5"/><file name="translate.phtml" hash="6ee90249fc539ec676f51d827d42066d"/></dir><file name="menu.phtml" hash="a1b2fc6e23351ec660ebd297924d1cde"/><file name="notices.phtml" hash="3f8f0fb17d8642db0f1392ae239b6b4d"/></dir><dir name="pagecache"><dir name="cache"><file name="additional.phtml" hash="bd00566238cd0f5d38a6a32e8e029075"/></dir></dir><file name="page.phtml" hash="7953efb6d0cb2decb67dfbebf389a751"/><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="b2c9edc6305ecd2d461960979dc6e04d"/></dir><dir name="info"><file name="cc.phtml" hash="a588d97b5f7d01e25da3086bbebbb58e"/><file name="pdf.phtml" hash="d3daafd51a71ac8ad82a5ad135341213"/></dir></dir><dir name="payment"><dir name="form"><file name="cc.phtml" hash="1f6cb5eb01602aad78b06f6d2e616fae"/><file name="ccsave.phtml" hash="b75ba46d35459c9f4eb76459c4230b91"/><file name="checkmo.phtml" hash="f678a5af0f38016946f0d2153d1c1c4c"/><file name="purchaseorder.phtml" hash="5ee44c5a12516febb7ea5e9fce0813e9"/></dir><dir name="info"><file name="banktransfer.phtml" hash="1cc12ea937a83ec7850c3e3c979ae090"/><file name="checkmo.phtml" hash="d60d2fbe95574f7c2ddc710684272044"/><file name="default.phtml" hash="cc873bf7b3e3d9724864ef6cbb3b8551"/><dir name="pdf"><file name="checkmo.phtml" hash="03abba9cccd1f9bee48c9f871970720e"/><file name="default.phtml" hash="70630d0f786194e1efd421a6c555731c"/><file name="purchaseorder.phtml" hash="15bb4ad5666e114e9b125b41fa4f4fff"/></dir><file name="purchaseorder.phtml" hash="f7861e98d8ad6d7bfc652c2e3ce2f9b5"/></dir></dir><dir name="paypal"><dir name="system"><dir name="config"><file name="api_wizard.phtml" hash="dab0fc1b5c82698253a334a81cc25964"/><dir name="fieldset"><file name="global.phtml" hash="637eedd4757ee1a5ad964d378455959c"/><file name="hint.phtml" hash="c0bcddc6efc5638bb5c361cee25bb391"/><file name="store.phtml" hash="6ae39364f3c985351da2d5d4e038b320"/></dir><dir name="payflowlink"><file name="advanced.phtml" hash="434c43cb233834700e474440a53d6fab"/><file name="info.phtml" hash="aa73ddfe78d99c1bd5374197d47c98c4"/></dir></dir></dir></dir><dir name="permissions"><file name="roleinfo.phtml" hash="3f98afc8ff32c5d0d5d72463e3599294"/><file name="rolesedit.phtml" hash="d5d142bdf1b725999eb84b5f40cd776f"/><file name="roles.phtml" hash="d68d22cfba21927ecbe95db6ae7cee43"/><file name="rolesusers.phtml" hash="13ef3a4e3f2b9029145d77f5acb7cb7a"/><file name="role_users_grid_js.phtml" hash="f4cb17fefcca73b09a5f2ae39234f34d"/><file name="userinfo.phtml" hash="ac60e8332ae54b118b3004ac50c5de5d"/><file name="usernroles.phtml" hash="9110a1d0be02818c12f0d76353e6b230"/><file name="user_roles_grid_js.phtml" hash="9267240bc35a6f42f6ade61b5575b137"/><file name="userroles.phtml" hash="2d779269a168d467e1b23dcaaa67b898"/><file name="users.phtml" hash="686451dcc0db658e0f342de6cb651478"/></dir><dir name="poll"><dir name="answers"><file name="list.phtml" hash="28b9547c2c6efdd970a5327413476661"/></dir></dir><file name="popup.phtml" hash="5fccd3a283b7d21c35f367a3974d4947"/><dir name="promo"><file name="fieldset.phtml" hash="d87248d0189fbfd6a00a3a5a245459cf"/><file name="form.phtml" hash="a3f5a0e8001ac56e822866a2fd453c89"/><file name="js.phtml" hash="2eafd0314cd42af30f6a7a08b3bf4ef7"/><file name="salesrulejs.phtml" hash="cec2eff46a015a52fc538609ade12821"/></dir><dir name="rating"><file name="detailed.phtml" hash="852c913d6a79e34aed3e5d05f19db991"/><file name="options.phtml" hash="d30cad80e36feb721ea4753947b3661a"/><dir name="stars"><file name="detailed.phtml" hash="a4ac92a52fa258181b0d708018c62108"/><file name="summary.phtml" hash="a83cfc4d046880aa3ec5f478bad36161"/></dir></dir><dir name="report"><dir name="grid"><file name="container.phtml" hash="8afae1e8f315820ea263abb7901756d0"/></dir><file name="grid.phtml" hash="cbcde35a2594a1d36b20b99291e32b22"/><dir name="refresh"><file name="statistics.phtml" hash="a8b531e672ff17aa78e35473f215739a"/></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="f5f5e64bb1c9dcb59434a4fc811acda2"/></dir><file name="switcher.phtml" hash="947b37780419beabcda34013a261d43d"/></dir><file name="wishlist.phtml" hash="fc6334b08f55a7f3f5f42f401a9a2574"/></dir><file name="resetforgottenpassword.phtml" hash="19e9019c7236f8232d398754be6e0d18"/><dir name="review"><file name="add.phtml" hash="f919e9d005e9982a809cd759bd1fa27a"/></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="form.phtml" hash="c045bc446859e14f1f5096ad44be54de"/><dir name="view"><file name="form.phtml" hash="a38fecb1401080e69fc92e51863bf522"/><dir name="tab"><file name="info.phtml" hash="426577dc27aa90a734aa23f0fe93d673"/></dir></dir></dir></dir><dir name="items"><dir name="column"><file name="name.phtml" hash="d3d1d31a2a0bc7a57801f78756a62ecf"/><file name="qty.phtml" hash="37394503de14c09502b6b8b7542660a6"/></dir><dir name="renderer"><file name="default.phtml" hash="8f9b32e7bbe72e96178d9b6f9c75806a"/></dir></dir><dir name="order"><dir name="address"><file name="form.phtml" hash="14a681b992206d290b708b4df6839c32"/></dir><dir name="comments"><file name="view.phtml" hash="b1d7c4ff5d1d02ef95bc5dbdc789df0a"/></dir><dir name="create"><file name="abstract.phtml" hash="73bb65d4b51bed1be38cb18738cefdd0"/><dir name="billing"><dir name="method"><file name="form.phtml" hash="7f6d2c2571c3e94e882a84391163f2c4"/></dir></dir><file name="comment.phtml" hash="3ff56760d956ee9850fc899a6bf444cc"/><dir name="coupons"><file name="form.phtml" hash="9de66e86ddd6b1d90c5ff57bf1092fa5"/></dir><file name="data.phtml" hash="cfba996cee0ec9e3cb128a338aa97234"/><dir name="form"><file name="account.phtml" hash="4ef4d5d68f31f02cb7ac477804b9c729"/><file name="address.phtml" hash="9c73251984359ab1822c8ee784d0897b"/></dir><file name="form.phtml" hash="9f7e219d35d6f5f39e6c8aefcdee757c"/><file name="giftmessage.phtml" hash="61d994f507fc095324856d0f168dd0a2"/><dir name="items"><file name="grid.phtml" hash="98fdb5f6f50ece23b5ac171f4b338ebc"/></dir><file name="items.phtml" hash="4b8a4bbb55d1f3a10bce5c0f2a77c8c7"/><file name="js.phtml" hash="b135bc5e678ad509b3dcec73a19a8a23"/><dir name="newsletter"><file name="form.phtml" hash="8d924604782ce5b25ea93ba17b3e6b40"/></dir><dir name="shipping"><dir name="method"><file name="form.phtml" hash="baba59c0d805fb14f117d0395715e03c"/></dir></dir><dir name="sidebar"><file name="items.phtml" hash="fe201f2c2e0b9d8c0ab00caf83eba9c7"/></dir><file name="sidebar.phtml" hash="db99134846752d81956d4fa184286fe8"/><dir name="store"><file name="select.phtml" hash="d07c80543627993d8a390528ad173b99"/></dir><dir name="totals"><file name="default.phtml" hash="64c8c771680709c8045f05dee1d18d5b"/><file name="grandtotal.phtml" hash="3249e222a3a30d63afd9262e9cb1a4db"/><file name="shipping.phtml" hash="95bf72407796516b82d7d4fbfda67688"/><file name="subtotal.phtml" hash="60616ad2dc8be1486dbf08f5a833d6ff"/><file name="tax.phtml" hash="aa0d5c82921d7560f656a53c8d898702"/></dir><file name="totals.phtml" hash="e08335a53675cdcd8f59913b505156e5"/></dir><dir name="creditmemo"><dir name="create"><file name="form.phtml" hash="2e8a3360bac63dbbdf7791236abfddeb"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="b2cb388b1a243f99c59191105f96a142"/><file name="default.phtml" hash="d2983cb339c23814e299523804271e6e"/></dir></dir><file name="items.phtml" hash="2c92ec23f30e455369d2a9a3f08883cd"/><dir name="totals"><file name="adjustments.phtml" hash="ef48f10d014988a5854fa758c97b138e"/></dir></dir><dir name="view"><file name="form.phtml" hash="8b7613c7724df167f773733537f5f1ba"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="ede591d9e935ec600d574024a3ae0820"/><file name="default.phtml" hash="eeafd46d6cdaa5df4af4f77869b6cc5a"/></dir></dir><file name="items.phtml" hash="b35fe2e31670ac2801abdc1bcbff0102"/></dir></dir><file name="giftoptions.phtml" hash="b6f4197d3df032819254d0dac3413495"/><dir name="invoice"><dir name="create"><file name="form.phtml" hash="bf7f58f7a32c9bc13d609e24069591cb"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="088b6eea9beadf94e6aa52a1db06ca4c"/><file name="default.phtml" hash="200aa3cd483d1458a97f0a4fb0ee300e"/></dir></dir><file name="items.phtml" hash="4c05e6eb775ea5223ff5456c81304a86"/><file name="tracking.phtml" hash="66faab35a9ff18921bc3e6dbf4bd45f7"/></dir><dir name="view"><file name="form.phtml" hash="f976756a3c4669d424686cc46ea2568d"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="828128fc8ecac9272860c24e22267fd4"/><file name="default.phtml" hash="7e79921b0125ba89698ee9e57ff4d833"/></dir></dir><file name="items.phtml" hash="9e803123162b720873c6e6f4696da31a"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="c9ac15d1ab6833d34a0f768eae781b31"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="dc08d0b624b90949b181c803a450a36e"/><file name="default.phtml" hash="e2a433c941285b671529be0fb3876630"/></dir></dir><file name="items.phtml" hash="0f96e448f542a8e702b7ee214a548e11"/><file name="tracking.phtml" hash="3f8511262d928445696c6319bb2508dc"/></dir><dir name="packaging"><file name="grid.phtml" hash="7d394055313bf36836fd1f468a263b34"/><file name="packed.phtml" hash="ae3f97fb3cd3ded2e15e2a0b2eab50da"/><file name="popup.phtml" hash="b7becfc86ef5bc7935cc08e1814e342e"/></dir><dir name="tracking"><file name="info.phtml" hash="9d088e90071007f8a8408ff4b6bf1578"/></dir><dir name="view"><file name="form.phtml" hash="7307852d350cddf4096d7a78137d147a"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="5dd9560fce1605eb506188ab2810eec8"/><file name="default.phtml" hash="449d5cce4d2baff9737dd143b59f90b7"/></dir></dir><file name="items.phtml" hash="7bd98be6262f041d94d6df9132e6ea36"/><file name="tracking.phtml" hash="94a55a3a5064abbff7790feb76ef5ed4"/></dir></dir><file name="totalbar.phtml" hash="8862b3abf6166a0b106a8e20e5548531"/><dir name="totals"><file name="discount.phtml" hash="4d1ecb9291b25f5c3ab5c5d77f546071"/><file name="due.phtml" hash="3df55bcd0d58a9d72cb44977a03f25de"/><file name="footer.phtml" hash="75322b0a2e4832a1e0d87dde7aad0813"/><file name="grand.phtml" hash="31122d57bcd9d20a616264cf5b8170a3"/><file name="item.phtml" hash="4dfc650dff0e372fbbcbc98cb53bbc8d"/><file name="main.phtml" hash="1785c69f7cae82872bbcbab68b9b5409"/><file name="paid.phtml" hash="3fb004bd20c0d4e39eb8e2ee63c4e7bb"/><file name="refunded.phtml" hash="50bb53757008c84acc968e3afa3782b5"/><file name="shipping.phtml" hash="319fd258f733513d5d5eebf2d3c57d6f"/><file name="subtotal.phtml" hash="dc63cedb53d44617410e60919f1c6673"/><file name="tax.phtml" hash="96abbff5db724fa3eaefc33a78d5df9e"/></dir><file name="totals.phtml" hash="a3badd69a64601237ce416f39d91e3c9"/><dir name="view"><file name="form.phtml" hash="8eb9c9223952d17a1981350cdbc5bdfc"/><file name="giftmessage.phtml" hash="1c4ce68ee0b411f13742aaa11937f15e"/><file name="history.phtml" hash="8165e4cc586574291d6b6e91dd1700a6"/><file name="info.phtml" hash="d474ebaa1a5e310590bf0d17c643e19e"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="eea8a3c81551f4be47365214d3fe75bb"/></dir></dir><file name="items.phtml" hash="2eb186022637b87f7909758b271a52cf"/><dir name="tab"><file name="history.phtml" hash="2477fc121aa58235e0ac937121aa349d"/><file name="info.phtml" hash="175f3b53cdb4c933a9e43ba5e1957a81"/></dir><file name="tracking.phtml" hash="53f1b6e6409abb1c80857af51f2d70d8"/></dir></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="acba45d2b1f6e3c6069ca6c190e1c1cd"/></dir></dir></dir><dir name="recurring"><dir name="profile"><dir name="view"><file name="info.phtml" hash="764e11209b05bd561c6eb18dabef08c2"/></dir><file name="view.phtml" hash="86beef0c2b64e7942a5aaab3b879da88"/></dir></dir><dir name="transactions"><file name="detail.phtml" hash="7bebff6273aa9529f1ec30da31bbb9f2"/></dir></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="40b5f178cc4848725c4990603cb61144"/><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="d2c451e57d76bf1d85344b973e297267"/></dir><file name="fieldset.phtml" hash="6aee098a94a78080f510e8bf4de7e9ab"/></dir></dir></dir><file name="switcher.phtml" hash="374547385cf8c94599416ba39cb5207c"/></dir><dir name="system"><file name="autocomplete.phtml" hash="105da6d2311f0f7b205a3c7648b0be44"/><dir name="cache"><file name="additional.phtml" hash="59abda62641901a75285f1a9977ec5bb"/><file name="edit.phtml" hash="671183173835e10823ef33f5da573945"/><file name="notifications.phtml" hash="24b8f93e727f53d95632e9939ba842f8"/></dir><dir name="config"><file name="edit.phtml" hash="c1aa30cf44b85966407958b3931527e8"/><dir name="form"><dir name="field"><file name="array.phtml" hash="5d30c98d32ca0d89ac210f4f09bc20a2"/></dir></dir><file name="js.phtml" hash="8dd9b8501b4fe8775832b5faa3468045"/><file name="switcher.phtml" hash="f3ca933dc8199972a15c9b6930235066"/><dir name="system"><dir name="storage"><dir name="media"><file name="synchronize.phtml" hash="9d365a0794775cfc80405aa1ed42d3d5"/></dir></dir></dir><file name="tabs.phtml" hash="9421cf5ffc704a0c725d8fe12b3e47e4"/></dir><dir name="convert"><dir name="profile"><file name="process.phtml" hash="3b871eaf96142a6bfc73a228c491a2d9"/><file name="run.phtml" hash="8314278f7c72dd49f72bd1d23260f360"/><file name="upload.phtml" hash="0376f43508fe8248beade715e50b6380"/><file name="wizard.phtml" hash="27a6bf0670cc46eed2795665d75ed809"/></dir></dir><dir name="currency"><dir name="rate"><file name="matrix.phtml" hash="501aa16d089d1a6cc8de851a67ab2f5d"/><file name="services.phtml" hash="21443d86f7f8ecec1c52e1a3c00fca41"/></dir><file name="rates.phtml" hash="00992c94fd98af59bd884cf4a6afc5bf"/></dir><dir name="design"><file name="edit.phtml" hash="7cb45f6fd1822a4313f3d5b9bd2af8c5"/><file name="index.phtml" hash="73e90ef9565c3d65bf225a2d269a6870"/></dir><dir name="email"><dir name="template"><file name="edit.phtml" hash="6e69aa01e5937f09dd709a44e3004e8d"/><file name="list.phtml" hash="6c358ab194467f511a15fb52c11293dc"/><file name="preview.phtml" hash="5f5a1e8c84565775c11403a5cf0fbbf3"/></dir></dir><file name="info.phtml" hash="a6c1164a4c98c694c3e139635c59023b"/><dir name="shipping"><file name="applicable_country.phtml" hash="9dfc89cfd9712877c0b0143c90ab4d79"/><file name="ups.phtml" hash="a4fa51b2eda6290c99b7c0c0c6cfffc3"/></dir><dir name="variable"><file name="js.phtml" hash="8538abff6d312fb701fbbc3550951803"/></dir></dir><dir name="tag"><dir name="edit"><file name="container.phtml" hash="72887e68c2f5a5ec248a5607b4e1801d"/></dir><file name="index.phtml" hash="5bf61c4bc56186630c6889782d2cdc59"/></dir><dir name="tax"><dir name="class"><dir name="page"><file name="edit.phtml" hash="e1d76e3a3c4bde7487108fce74ca9b47"/></dir></dir><file name="importExport.phtml" hash="b6cd95136b50fd2d013e29bf2451bec0"/><file name="notifications.phtml" hash="764d203d842d1093c3bb96d3f6afcce0"/><dir name="rate"><file name="form.phtml" hash="1e2e7785dba03e796406e69ce3a769ae"/><file name="title.phtml" hash="c2eb1ee552f4cea7a102e4fa7ddfd0bb"/></dir><dir name="toolbar"><dir name="class"><file name="add.phtml" hash="4491c9722bd2331a2bdd304f031083b6"/><file name="save.phtml" hash="032714eae5624e7279dd193895e2ed8f"/></dir><dir name="rate"><file name="add.phtml" hash="032d165447fa3fae7e9f2ec9077ad4e7"/><file name="save.phtml" hash="ef208e4f3cc0d17fdb66bbbe91095274"/></dir><dir name="rule"><file name="add.phtml" hash="0dc115c883a8b54ce52a90700bd7ad2f"/><file name="save.phtml" hash="334317a26a36ea08f5a256a6905902ae"/></dir></dir></dir><dir name="urlrewrite"><file name="categories.phtml" hash="6f4495dea9e6cc3ca79b7f17405d21ae"/><file name="edit.phtml" hash="7c0db0d0650e40fee40fecc6edfd8429"/><file name="selector.phtml" hash="6094b7f69056c73542dcc4fb484fd45f"/></dir><dir name="usa"><dir name="dhl"><file name="unitofmeasure.phtml" hash="ab0c1fc151f0960904b72f5925ce72f3"/></dir></dir><dir name="weee"><dir name="renderer"><file name="tax.phtml" hash="1a03a17e003e282f305f5b98b76ec3a3"/></dir></dir><dir name="widget"><file name="accordion.phtml" hash="acf28e43dce33978945ee9a2f313c290"/><file name="breadcrumbs.phtml" hash="0f524150eeb162e84a3e0a2ea337c009"/><dir name="form"><file name="container.phtml" hash="6b7fcfc0cce370bd7dc2ea0d8e8b91df"/><dir name="element"><file name="gallery.phtml" hash="cc88955d39c4dca1c3cae2f1be11df71"/></dir><file name="element.phtml" hash="a9bcd0883785e27a3109e63c26091473"/><dir name="renderer"><file name="element.phtml" hash="3391b6b0186997220da62a58270d03e6"/><dir name="fieldset"><file name="element.phtml" hash="b404ad60631b57098b3fe47614d3c0ad"/></dir><file name="fieldset.phtml" hash="810c50c407a4e4002c38e33be96f9021"/></dir></dir><file name="form.phtml" hash="4ea8b1ce0e38792b8ea0a141e23f89cc"/><dir name="grid"><file name="container.phtml" hash="ddee399b4740f3cd8b16a319d6739825"/><file name="massaction.phtml" hash="35a4ca2a18dc9d0ecec321627619aa6a"/><file name="serializer.phtml" hash="8309b1d770991ade042a867531ccaab3"/></dir><file name="grid.phtml" hash="af5bb924c49ef99616309f0f9c9271a3"/><dir name="instance"><dir name="edit"><file name="layout.phtml" hash="594ee7f23240bb24219ea63b8b59168d"/></dir><file name="js.phtml" hash="f9cd0f08b4a7b12022c6df02e725578d"/></dir><file name="tabshoriz.phtml" hash="4b0d96893f2eb7eddde756d9a9725652"/><file name="tabsleft.phtml" hash="ba203148b588acb37cc4ae2f830f2feb"/><file name="tabs.phtml" hash="ff20c803cfb129521252118b10e23950"/><dir name="view"><file name="container.phtml" hash="25169c263daab90862150a40b7171c9f"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="below_ie7.css" hash="b2bf3a91f389f2ea7912765a814ce10f"/><file name="boxes.css" hash="5903fadb2d1344922df0aafb49791df8"/><file name="custom.css" hash="30ed634c4e5d7521cf9961c880c3cba4"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="ie7.css" hash="15db0c436a5438265a91b2c1e4ac4626"/><file name="iestyles.css" hash="89403be830634339c69a155aa824300d"/><dir name="images"><file name="accordion_close.gif" hash="875409122fc82f5f6705e20dd801fd3d"/><file name="accordion_close.png" hash="6213698b5f69bb2907a5c7bb94b5fe8d"/><file name="accordion_open.gif" hash="d9d50e220b0b676094c6134a9708194e"/><file name="accordion_open.png" hash="9fbc3aba23ce5e0465e4d1cf3f6a7aee"/><file name="add_btn_icon-disabled.gif" hash="c8f6a5cfb455ef121efb56a747821f82"/><file name="add_btn_icon.gif" hash="7300097305b577ee564dc49102822d16"/><file name="address_list_li.gif" hash="79b917b514e35ce0a7833a5e268fd9f7"/><file name="address_list_on_arrow.gif" hash="3a2884ddcc87ebd48883662530b9de1b"/><file name="address_list_over_arrow.gif" hash="e826883c71b1184bd4f29433e39c18ad"/><file name="address_list_over_bg.gif" hash="56291480cc89de9d817205a5f23b66dd"/><file name="ajax-loader.gif" hash="e2a38f1e23288e315af3c55416bc1ce7"/><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="arrow_sort_move.gif" hash="f5ac151a2b0cb1f07d6e771b8aee0ea7"/><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_create_order_totals.gif" hash="ff6ab75c050b959c539cc6a6fdff2934"/><file name="bg_notifications.gif" hash="a365594725a83585d989f722b3d8c458"/><file name="bg_window_mask.png" hash="93d6efad062d24c94c105802b138b6a5"/><file name="bkg_btn-close2.gif" hash="822457d78fb3c21dc12e9777d83eb4f1"/><file name="bkg_btn-close.gif" hash="df3f2332f0bad01e031deb22b81f630c"/><file name="bkg_config-advanced.png" hash="b898594a9f1849bf386c06979ef613a8"/><file name="bkg_config-nested.png" hash="7b0fdbf98746c3c916b432c37321ccc4"/><file name="bkg_config-shaddow.png" hash="9ee4318e3f4afc446d26e7f66d01cfbd"/><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><file name="blank.gif" hash="5722d7bd0f1e1379d0a2005a0a9ea401"/><file name="box_bg.gif" hash="4c501bd6db9d361c18780f106a809b03"/><file name="breadcrumb_bg.gif" hash="72c4adf6c75b4640ca8f7cadffa42266"/><file name="btn_add-image_icon.gif" hash="1d42210fd29fc534d9ed6b41e811d40f"/><file name="btn_add-variable_icon.gif" hash="a2db02e318d107d5b57b444c8d80b8f8"/><file name="btn_add-widget_icon2.gif" hash="467acd3a14fb8be37191f5d2ec5a5b13"/><file name="btn_add-widget_icon.gif" hash="b4f66ca7f6097fbafd672e0b3f076ef4"/><file name="btn_back_bg.gif" hash="8be512788b8044fe31aa8d00cc16ba7b"/><file name="btn_bare_bg.gif" hash="ddbbab8c0d201c3e502d50e7d4a3d64b"/><file name="btn_bg-disabled.gif" hash="079971a9d2c385fe353d35716ec9f26b"/><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="btn_bg.png" hash="6e3b7003381f919e8f6533444afaa978"/><file name="btn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="btn_delete_bg.gif" hash="ad740d0c16f2f6603c8ef023004d6539"/><file name="btn_go.gif" hash="1bd787868713767cc205e2ee25e41f62"/><file name="btn_gr_bg.gif" hash="6cc324b79a512150fee24fb3517d22cb"/><file name="btn_gr_on.gif" hash="820c134df02f7bc12efa5a9ac3b4d3dd"/><file name="btn_gr_over.gif" hash="d4c8b807d64c1f493d17c6c9d2bab69a"/><file name="btn_loading-icon.gif" hash="45f500105be432a12c78fed2b4592cf9"/><file name="btn_login.gif" hash="79fa32d49d3f4e39d3fbf8327f9229e1"/><file name="btn_on_bg.gif" hash="709cf5b0be137db1ef8427688503bf37"/><file name="btn_over_bg.gif" hash="f91641168454c03d1fa72731ec97a2b3"/><file name="btn_show-hide_icon.gif" hash="0238c509b33ba56c25df9513bb48f804"/><file name="btn_task_bg.gif" hash="5e0594bd9cbfcc1e32ffa918d7f9c812"/><file name="button-close.png" hash="04d0907b2d7fc3240693497b199f64f5"/><file name="cancel_btn_active_bg.gif" hash="91ce403d286eef2b4e0c13733875882f"/><file name="cancel_btn_bg.gif" hash="26749cf4949ac27c30f597434d3bde65"/><file name="cancel_btn_icon.gif" hash="97e0cd94ed31d6f2a1181f627e60e9a3"/><file name="cancel_btn_over_bg.gif" hash="45eb4e883b17375961672f5390387c31"/><file name="cancel_icon.gif" hash="70a23b78353f0a7b9b118a937fcb7ea9"/><file name="config_tab_dt_bg.gif" hash="a33f71077ca4078caa794cae01d9fca7"/><file name="dashboard-close.gif" hash="5ae5afd61e937fcd2d5b84641255ee4d"/><file name="db-graph-bg.gif" hash="5d76efb7c3244f5684df2566782124ea"/><file name="db-graph-bottom-bg.gif" hash="b58ced87a38a10891106329ae882aa1c"/><file name="db-graph-line2-bg.gif" hash="744ebfdba20d050f4d252afc216394be"/><file name="db-graph-line-bg.gif" hash="f16bb08e040c2c0a3e23b3f35c54b79b"/><file name="db-graph-x-bg.png" hash="d5c26510718a78d22083916d80ef7a22"/><file name="db-header-bg.png" hash="3976cb6351e167686a501a85cf3a68e9"/><file name="db-menu-bg.gif" hash="ea534c3c09bb309e566b6ae876655e13"/><file name="db-menu-bg-hov.gif" hash="34ea76a6d105d90fcb63bf105aadb8f7"/><file name="db-menu-bg-up.gif" hash="b0f754872dff5f2f0dc57ba193fdfa4c"/><file name="db-menu-sep.gif" hash="7c5ae1cd59a189261cc3244358d5c1ad"/><file name="db-menu-sep-last.gif" hash="a01fe34854e1187e466fd58d462c4106"/><file name="db-menu-start.gif" hash="aa5cac2194d937cc7fa904ccfce70ecc"/><file name="db-scroll-bg.gif" hash="06d2411e3b5f350ab21b625439d2d69d"/><file name="db-scroll-but-bot.png" hash="25c0181e76ff8ceb3c0ec59071b8c72c"/><file name="db-scroll-but-bot-roll.png" hash="6bc5e482f3f6d8fb1fc5014ddea43706"/><file name="db-scroll-but-top.png" hash="de7df96e961596be9ff556924259b98b"/><file name="db-scroll-but-top-roll.png" hash="b7961f2a3b5b641694a9b0b30d58e46b"/><file name="db-scroll-roller.png" hash="e01dde7bd096c52179acf29a425a29e5"/><file name="db-tab-bottom-left-bg.gif" hash="124388d44ac58b029377c6311a4782d5"/><file name="db-tab-bottom-mid-bg.gif" hash="9c48f33aa8907cfcb227bc779c2e1dce"/><file name="db-tab-bottom-right-bg.gif" hash="1db45e6fd8abc67d59f96a676607b412"/><file name="db-tab-footer.gif" hash="cac8928acba75bc1edd73186ced78e5c"/><file name="db-tab-header.gif" hash="fdf493b9477fcff7e7be98405effc33d"/><file name="db-tab-header-sep.gif" hash="580312af7441b6a62f7e32081c40fb0f"/><file name="db-tab-left.gif" hash="3fe3c55267dbbdd1db2ff959ccc9e0be"/><file name="db-tab-right.gif" hash="b7a32c8b03efe2fbdb63215d0446e3be"/><file name="dotted_divider_dark.gif" hash="8bf1de196d9ea048bfb25155cedd2e9e"/><file name="dotted_divider_light.gif" hash="92e562bf2070110f6b0a15e29b845445"/><file name="edit_icon.gif" hash="dbda31751c78d964c04394e9d8533187"/><file name="entry_edit_head_arrow_down2.gif" hash="d68dd0fbc2819858a26ea2835c05df77"/><file name="entry_edit_head_arrow_down.gif" hash="985c3ce4439fbf8bb2216fc7e73a3f0b"/><file name="entry_edit_head_arrow_up.gif" hash="d2b90a1823fff9f3917f19b427410144"/><file name="entry_edit_head_bg.gif" hash="1086b7196e8b33c4f46e49fecef0f35f"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="error-msg.png" hash="3cd27b642416dacdc28907c89d934886"/><file name="fam_account.gif" hash="c910fd1ff41b940d71b0835e02fc143e"/><file name="fam_application_form_delete.png" hash="972c2d998fc19572dd64af6b5e2e898e"/><file name="fam_application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="fam_asterisk_orange.gif" hash="908d44da90de5e54185764d093bbdb77"/><file name="fam_bin.gif" hash="2fb388bc9f1d32d3802db8e91dc238bc"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="fam_bullet_disk.gif" hash="9fe82691d960c18d3d315c3f9164af4f"/><file name="fam_bullet_error.gif" hash="008802f44288b732b59cfe9fdbfecefe"/><file name="fam_bullet_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="fam_calendar.gif" hash="0614207ce4e3e0a9bd631b39e7692e3c"/><file name="fam_cart.gif" hash="1f2fd2c8ac6574488ea78302b6856191"/><file name="fam_comment.gif" hash="5138f9a4b6019a5b14b8ff9a32a3cb89"/><file name="fam_creditcards.gif" hash="b75b8ce2f4fceb58f8082c48344560c7"/><file name="fam_folder_database.gif" hash="e86175ff0f389ade1fc7bf15e03346eb"/><file name="fam_folder_palette.gif" hash="c0941b9145e06d53cc0d17ac4c151764"/><file name="fam_folder_table.gif" hash="e2914ba75944acd2a9e2d338fa339e16"/><file name="fam_group.gif" hash="52d778dddbf48b8d04226bee9370a7ef"/><file name="fam_help.gif" hash="2b5ed4c13a8e24456207b757826c7b2c"/><file name="fam_house.gif" hash="8eb2d580c5a40b7974f4263ca64fb94a"/><file name="fam_layout.gif" hash="5366a5f02260d3a860ef0c4787282ad6"/><file name="fam_leaf.png" hash="078d4f24683331b4557356a59e67b125"/><file name="fam_link.gif" hash="78590d5d8375d1baabe7b66d7b9ceb7d"/><file name="fam_lorry.gif" hash="174e86e45e76e7008fa3510cefa85047"/><file name="fam_money_add.gif" hash="70ceed401fe9913305f2362f7e26225d"/><file name="fam_money.gif" hash="6996bad465222fb6487cab94b4607846"/><file name="fam_monitor.gif" hash="f3bc806ff9d0907320b03018ba2d00ea"/><file name="fam_newspaper_delete.gif" hash="41acabfc19102be92d3ccbc66d1fede3"/><file name="fam_newspaper_error.gif" hash="009bfa425298e1d2e44e38e58cd97938"/><file name="fam_newspaper.gif" hash="9e5fee06a543742045118a95f2debcb8"/><file name="fam_newspaper_go.gif" hash="eb43105f8e13e3a752d7ca33bb086831"/><file name="fam_package.gif" hash="bf9be09ef64d006455baa211b7c03983"/><file name="fam_package_go.gif" hash="e4f8d380c2f8e5a7345e360293433764"/><file name="fam_page_white_edit.gif" hash="a4f88300b74ad592a5c47ed54ff07af9"/><file name="fam_page_white.gif" hash="26940eb67826c5af72b6048c7c5a8335"/><file name="fam_rainbow.gif" hash="e8b04cc945b3582a181d4ddbc2d2325f"/><file name="fam_refresh.gif" hash="01bbef614023c0890812e76bc7ecf7e0"/><file name="fam_server_database.gif" hash="7901fa06ffd68ed730cf43bb560756fd"/><file name="fam_status_online.gif" hash="a80019ffa3a573f709772ed1099343fc"/><file name="fam_tag_orange.gif" hash="6ce735a0e590bda040b6e1614c42e58a"/><file name="fam_user_comment.gif" hash="014dfd31d9af40e3d5960b2b0d900da3"/><file name="fam_user_edit.gif" hash="f5b36e803060c6b82e639a4fad57b9f7"/><file name="fam_user.gif" hash="63bbdd6d9d7a27591907a7b87898e259"/><file name="filter_row_bg.gif" hash="013a0929a7b2ddc6823bdda17d08acc0"/><file name="footer_bg.gif" hash="7724711d3ca07a5e46a6030e86743a71"/><file name="gift-message-collapse.gif" hash="5b710f5faa9c7352a39c10e3ebbee6fc"/><file name="gift-message-expand.gif" hash="fd53a70cbb1ea048754657a63787e9cb"/><file name="gift-message-grid-column-bg.gif" hash="97a8a9b8cc4ab68e7404ccf1320f50a6"/><file name="grid-cal.gif" hash="b1468e5239504974c689eea5d93f86d4"/><file name="grid_sort_asc.gif" hash="b78c3a1a27ac9672a31b7d1bbac60322"/><file name="grid_sort_desc.gif" hash="d958b946eba3dba863d724530a0dba1a"/><file name="grid_th_bg.gif" hash="8f4349fac728858374e17edf03390977"/><file name="grid_th_onclick_bg.gif" hash="7bf331e2a41e5331c4210bdc6adc4383"/><file name="grouped_to_order_icon.png" hash="4bdae9a6199655027b8b8aeee8f80ce4"/><file name="header_bg.gif" hash="cbe510856afa5cb0c32642c1f9a8eceb"/><file name="header_top_bg.gif" hash="8440b04c5cb6b1451bb886bfbef260a5"/><file name="horiz_tabs_ul_bg.gif" hash="58dbd9c45f76993346c2bb788896248e"/><file name="icon_btn_add.gif" hash="7300097305b577ee564dc49102822d16"/><file name="icon_btn_back.gif" hash="89ed97cede3f68241446a62c96e3ce4c"/><file name="icon_btn_delete.gif" hash="dbde0b76d36cfd624bf0de166d0a265e"/><file name="icon_btn_save.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="icon_edit_address.gif" hash="d1ca2bb3a5c86afd379f25d9fc4352e3"/><file name="icon-enabled.png" hash="5fa7c06b312cbea3675e844686e434af"/><file name="icon_export.gif" hash="9a13f20c6a17b41b9c357545c2da5636"/><file name="icon_export.png" hash="fb299dd13df666516eabe16f59193383"/><file name="icon_feed.gif" hash="0366583ed6e285d028442fcdebb05072"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_note_list.gif" hash="8d25ba225ca09b687a78bff510df5d10"/><file name="icon_remove_address.gif" hash="2de2b3d02c19adfb93e9e43a392db178"/><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><file name="ico_success.gif" hash="0afb20898a704a106cb4c598868abf32"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="i_question-mark.png" hash="23201b7ac207eebd9be0776ea44098a4"/><file name="login_box_bg_auth.jpg" hash="d90a81db1064ec37b0cc92436725c24b"/><file name="login_box_bg.gif" hash="e4654826eaa8d5ebc0ab18e9bee71e1d"/><file name="login_box_bg.jpg" hash="404e37f4ee9f4ff9bfcb638741c7581d"/><file name="login_box_bottom.jpg" hash="038f15261e74bc381484f2fcfa45a73b"/><file name="login_box_legal_bg.gif" hash="528ac4dd480c4fc00ac808bf17394c05"/><file name="login_logo.gif" hash="9cc90e7aa1210883000fe5319862ce14"/><file name="logo.gif" hash="c7e9f290d965f707e4c4a61bfdab58cb"/><file name="logo-large.gif" hash="5c77654c424b0a35cc24d28df5166dc4"/><file name="massaction_bg.gif" hash="8b5f4db3ab3ea09cd5bd0164d67c4f0d"/><file name="massaction_button_bg.gif" hash="4c8262817e48d007237124ce0e7f4d18"/><file name="massaction_links_delimiter.gif" hash="9a0337183b5b67c0eed75993d7f14d10"/><file name="middle_bg.gif" hash="ba4f176d2c553201ebab4aba5c6d3d20"/><file name="more_arrow.gif" hash="38bb4c0e9270250151486d0bb36c476f"/><file name="nav1_active.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_bg.gif" hash="a1d4ef5b590ce0a425dc04e45ed06cbe"/><file name="nav1_off.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav1_on.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_over.gif" hash="2c70d6175f1c965c27dda0598a67e63c"/><file name="nav1_sep.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav2_last_li_bg.png" hash="279935c9799679fc5894337eaabc7cf0"/><file name="nav2_last_li_over_bg.png" hash="39536f00824293d11242888a76f40a5f"/><file name="nav2_li_bg.gif" hash="0a4f34b0e4436c519d31203f19503b83"/><file name="nav2_li_bg.png" hash="2fad219d162324e9a19f2745d5b6d562"/><file name="nav2_link_bg.gif" hash="dce00ddad351e72e83bc87274cbaa54a"/><file name="nav2_li_over_bg.png" hash="dc37c4a4aab40ea2ae44dea5ea133a9d"/><file name="nav2_parent_arrow.gif" hash="60e012a14a077bd2257343facc369c0c"/><file name="nav3_bg.png" hash="2bc7af80ad8886013da38401b63ab6df"/><file name="nav_bg.gif" hash="1b857c7d35f35ef9f6cae9e03a4e3dff"/><file name="nav_list_bg.gif" hash="7a4e2bdb887c12d8a1152bbcc8c02a3c"/><file name="nav_nest_link_bg.gif" hash="1d0c6b374bf02ac4b5aa012955c431de"/><file name="nav_nest_link_over_bg.gif" hash="fae3c579a4d432503b1f4f929d070609"/><file name="nav_on_bg.gif" hash="ac624b580cae5a76f6c92abc5a44191d"/><file name="nav_parent_arrow.gif" hash="3a95559263e569dc1c8065cb2d9b3f2c"/><file name="note_bg.gif" hash="105967d7c15ab4610726eea52d862a97"/><file name="note_cell_bg.gif" hash="71e656d42f8ba8c2d477c6866c499b71"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="notice-msg.png" hash="9cd1dfebccec8a2123d543fa49b17bd7"/><file name="pager_arrow_left.gif" hash="6e44f608dac8eb8be1d1ebee5a3285aa"/><file name="pager_arrow_left_off.gif" hash="30f5e56195ab3546b36f4016db5254be"/><file name="pager_arrow_right.gif" hash="cc79526156b7e0c8abce61fad3d53f77"/><file name="pager_arrow_right_off.gif" hash="f01b7dad9acf0180b5c62edbd7ea9939"/><dir name="paypal"><file name="logo-paypal.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="pp-allinone.png" hash="c457fe4bfe28a18c90d0abd36fe3f880"/><file name="pp-alt.png" hash="c262d332b342a2f4063cd82a61d11107"/><file name="pp-gateways.png" hash="90acb72c2f46fa131351efe0492d52cf"/><file name="pp-uk.png" hash="e0830ccb14533051b8b0340471744228"/></dir><file name="paypal_logo.gif" hash="871e205a64292121f4c893373acfb581"/><file name="paypal_section.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="paypal_tick.gif" hash="e8685c1fb7c4c106ae4fd24e9bbf5a27"/><dir name="placeholder"><file name="thumbnail.jpg" hash="5c73b5aa515b1719f7b398f5131f91a8"/></dir><file name="process_spinner.gif" hash="345b30b4d0b6088d0151ecfbdf48c036"/><file name="product_rating_blank_star.gif" hash="5e20a299c0ff16168be38b6dde580eda"/><file name="product_rating_full_star.gif" hash="dd5aae332178d928a7f49dea7691b5f6"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><file name="rule-ajax-loader.gif" hash="32dc1f5901143d36fbd7a6df3950819f"/><file name="rule_chooser_trigger.gif" hash="9c498e789c3ce734f5301c2475e2a04c"/><file name="rule_component_add.gif" hash="7914e57701ca26f5c8bf23c6bc3e1f25"/><file name="rule_component_apply.gif" hash="3f9b9025551da6963a9ecf8d184a204a"/><file name="rule_component_remove.gif" hash="4d785bcecfbe716fa4d749d20738a8f0"/><file name="save_btn_icon.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="sec_nav_bg.gif" hash="99c6741591cdb2a2a128668a1d32d668"/><file name="section_menu_bg.gif" hash="f9edd44c92743a0c9ae9535a7992d6b1"/><file name="section_menu_bottom.gif" hash="167d2ef46ff80158c807b4b916501b28"/><file name="section_menu_link_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="section_menu_link_over_bg.gif" hash="7da7e56567633aab279cf3aec6f49d8d"/><file name="section_menu_over_span_bg.gif" hash="f5ea5292f15ed62b99f0f51d9fff2c66"/><file name="section_menu_span_bg.gif" hash="dbf3916358e794ee809b4cf33903af2c"/><file name="section_menu_ul_bg.gif" hash="3aea6e5452f548438ca34e17954a9d6b"/><file name="side_col_bg.gif" hash="b3691fd62663457af39eaf71dd8cda5a"/><file name="simple_container_bg.gif" hash="56f1ac91169eb4896b8c91384fc8bf15"/><file name="sort-arrow-down.gif" hash="fc2cd9f756ce510c4470478d720f81cd"/><file name="sort-arrow-down.png" hash="dc65160d9d4d6cdd6bfe1b397a931975"/><file name="sort-arrow-up.gif" hash="39026b0ff1f0c18091caa60384491163"/><file name="sort-arrow-up.png" hash="da54e5306bdce67551aa415f5d7f7ea7"/><file name="sort_heading_bg.gif" hash="6066d09f237f556b0a4770e4788e7598"/><file name="sort_on_bg.gif" hash="0cb36788ed4fbf19e657acbc75a3f1b8"/><file name="sort_row_bg.gif" hash="f2e1c5cb26b9f5211419b99d30745244"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="sub_button_bg.gif" hash="e3f66dd60510f9f7e937e2e55442c30a"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="success-msg.png" hash="c64cb2acc3d0eeba48fdea83620913ed"/><file name="tabs_link_bg.gif" hash="34447929f5e6591ba9b5795b983fdfd4"/><file name="tabs_link_over_bg.gif" hash="2cf3f56884096055fb0bdf9474f280c9"/><file name="tabs_span_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="tag_blue_edit.gif" hash="b2163ac3baf7d822b48593342846645a"/><file name="tn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="tooltip_bg.gif" hash="0aa4b866fc067a75f27ab749c1dabf74"/><file name="tooltip_corner.gif" hash="71146534671d5e0751505640b7c59859"/><file name="tooltip_top.gif" hash="032ff52a6ff5714cbdf6c1f62abaf7e5"/><dir name="tree_icons"><file name="joinbottom.gif" hash="4b3daa7f2cc584f1aac0d142275d7cba"/><file name="join.gif" hash="4d5d614e0da056df815a4306d6368692"/><file name="line.gif" hash="63ab38a6203262f15ca46c631232ea2c"/><file name="minusbottom.gif" hash="b09d684cca7135ef728141aaf2464baa"/><file name="minus.gif" hash="d647fbbd0ec410b8f3bb3357b62eedcf"/><file name="nolines_minus.gif" hash="eb2243a354ffcfac93ba0fe948f7167d"/><file name="nolines_plus.gif" hash="ec92b634b63608fb4b0dbf114e3b89e1"/></dir><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/><file name="varien_logo.gif" hash="6f10d0fe572cb012947c164217e9e428"/><file name="warning_msg_icon.gif" hash="4cf6ec7f59ab09f9c18b3a4301714c6d"/><dir name="widget"><file name="catalog__category_widget_link.gif" hash="8435943009f1f774bbd6a4809c719eb8"/><file name="catalog__product_widget_link.gif" hash="62f2d7020143f98ba7514469eb612a7f"/><file name="catalog__product_widget_new.gif" hash="37a5af9f98ae73e180ad0cca05c95324"/><file name="cms__widget_block.gif" hash="b7b0b1517cc38b18b92841b33b312190"/><file name="cms__widget_page_link.gif" hash="b839dee210e61850a5858cc8634cbccd"/><file name="default.gif" hash="684143ae5531aa6ba22215f4fadeea6c"/><file name="reports__product_widget_compared.gif" hash="bd3e5a5015eb2c5c64f1d11835166dc4"/><file name="reports__product_widget_viewed.gif" hash="44d5cd71e4fb7235f9cff0c7e2b2f531"/></dir><file name="widget_placeholder.gif" hash="2bd8d72cf12f8d7d0a6a3268f97786ff"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/><file name="window_content.png" hash="08361df29783d46a2493cf0d8ad733a7"/><file name="window_top.png" hash="555a8db5efa3a252c2ead3d3dadd1075"/><dir name="wysiwyg"><file name="skin_image.png" hash="a521b0c60b001de4a3405e73c4a6cd4a"/></dir></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="a0b153cee7655dad31ee2923657cc08a"/></dir></dir></dir></dir><dir name="media"><file name="editor.swf" hash="259afd515d7b2edee76f67973fea95a6"/><file name="flex.swf" hash="60a8c242ca2ff0e70ed9a038749f4cc1"/><file name="uploaderSingle.swf" hash="304dd960698c5786dcd64b0e138f80ca"/><file name="uploader.swf" hash="1c300001dadd932ef6e33a2fadf941e1"/></dir><file name="menu.css" hash="6f39c760b70b8250c193c5311885193a"/><file name="oauth-simple.css" hash="c8ba6fccc85ce28f4360b10b5b59adb9"/><file name="print.css" hash="db77a54f0e6a7146cad6566eb200a0d5"/><file name="reset.css" hash="d45948716e2dd828a40715b9a43e2115"/></dir></dir></dir></target></contents>
16	<compatible/>
17	- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.8.0.0</min><max>1.9.0.0</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.7.0.0</min><max>1.8.0.0</max></package></required></dependencies>
18	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>Interface_Adminhtml_Default</name>
4	+ <version>1.8.1.0</version>
5	<stability>stable</stability>
6	<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	<summary>Default interface for Adminhtml</summary>
10	<description>Default interface for Adminhtml</description>
11	+ <notes>1.8.1.0</notes>
12	<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13	+ <date>2013-11-22</date>
14	+ <time>04:16:44</time>
15	+ <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="admin.xml" hash="3f67b9113990f8a9fc5064aa8402b1aa"/><file name="adminnotification.xml" hash="7acc4e08b1547ebc77d738c167309e21"/><file name="api2.xml" hash="a6e09e431f0db34fc54af4c950cf0cba"/><file name="authorizenet.xml" hash="f52103446bbae8227fbf4f4a418b9672"/><file name="bundle.xml" hash="07895a0fe4f3c9c616beb61d4e41b058"/><file name="captcha.xml" hash="57b5f3f6049299f4f47b6272ed38b9f2"/><file name="catalog.xml" hash="9b39b8e3113e0f5ed54abf6593e76995"/><file name="cms.xml" hash="b11e70d2737be5b12a4df97cef693195"/><file name="connect.xml" hash="44f937e1cb116bb4e7a27630e32efb5c"/><file name="currencysymbol.xml" hash="f4332c65caa28d94cf6e39a0107778c7"/><file name="customer.xml" hash="05fa9913be68f1158b18879718b12863"/><file name="dataflow.xml" hash="ed30760c1bda416acdfff76807b9250f"/><file name="downloadable.xml" hash="438b29d90e20c3113c2e5a605c958c47"/><file name="giftmessage.xml" hash="cdbee9efa50093594cb18b4043dd2de5"/><file name="importexport.xml" hash="90833e5f738675aec4d5e3912a243339"/><file name="index.xml" hash="69ba9702acd908708c3e0ac2c9789947"/><file name="main.xml" hash="af6c63aa72fd857703688684306271d2"/><file name="newsletter.xml" hash="907890091132fbddb80360984f32b934"/><file name="oauth.xml" hash="e736d51346a6b4f686d9397d3a721b3d"/><file name="pagecache.xml" hash="fdbd061be983631ce18ebd9fe80ffb94"/><file name="promo.xml" hash="aaa5d244fe1d45d0832bb527e23767e4"/><file name="report.xml" hash="32221b083a21ab7544ece85e4056aae2"/><file name="rss.xml" hash="c7938ce9bc21736f3c1d5a2dcaadb3de"/><file name="sales.xml" hash="0eb2a9f3240dce7d23ae769b8c63a799"/><file name="search.xml" hash="394769515b5419ad9170a41f36a2ea50"/><file name="tag.xml" hash="ebe1533056c85a577d01f409ecd68d68"/><file name="tax.xml" hash="64e9b8b9a207bd1450bb617483cbf47c"/><file name="widget.xml" hash="f174dc0efed5552d90cab15fd55d1a91"/></dir><dir name="locale"><dir name="en_US"><file name="translate.csv" hash="735c9ec66d1309f1206294f075fdcdd1"/></dir></dir><dir name="template"><file name="access_denied.phtml" hash="92823795c6d1d3150f90e5af6975087c"/><dir name="api"><file name="role_users_grid_js.phtml" hash="4bbeb28571f69d12d2644e90969eaa81"/><file name="roleinfo.phtml" hash="a747b610ce1d303e6386699d6be4b124"/><file name="roles.phtml" hash="d68d22cfba21927ecbe95db6ae7cee43"/><file name="rolesedit.phtml" hash="bc311e31ae20a68f1c925d29378f614f"/><file name="rolesusers.phtml" hash="13ef3a4e3f2b9029145d77f5acb7cb7a"/><file name="user_roles_grid_js.phtml" hash="7fa8d6ebc419f401c8472cb5c5abccda"/><file name="userinfo.phtml" hash="ac60e8332ae54b118b3004ac50c5de5d"/><file name="usernroles.phtml" hash="9110a1d0be02818c12f0d76353e6b230"/><file name="userroles.phtml" hash="2d779269a168d467e1b23dcaaa67b898"/><file name="users.phtml" hash="686451dcc0db658e0f342de6cb651478"/></dir><dir name="api2"><dir name="attribute"><file name="buttons.phtml" hash="3e4b92069b79a54b637f2c4b1c02e13c"/><file name="resource.phtml" hash="d450e1316d17eb7396313f7ccf9948a4"/></dir><dir name="permissions"><dir name="user"><dir name="edit"><dir name="tab"><dir name="roles"><file name="js.phtml" hash="98c0ac357aec9f6a39662016f8bcfff6"/></dir></dir></dir></dir></dir><dir name="role"><file name="buttons.phtml" hash="40e580be13fa41b73ab57fe6a58943c9"/><file name="users_grid_js.phtml" hash="6da62e3a16a1676e7c0c34d756addfef"/></dir></dir><dir name="authorizenet"><dir name="directpost"><file name="iframe.phtml" hash="327f46f045aae43b5d3f5362ad9e2ab9"/><file name="info.phtml" hash="29180c7561a3d53e83cd20f72b8fb9d6"/></dir></dir><dir name="backup"><file name="dialogs.phtml" hash="fc0361f93157b9d6da56419ee5bf8a9f"/><file name="left.phtml" hash="7a2cb973a79adeb20e4b254a9124819b"/><file name="list.phtml" hash="42fa810cc9266b75ebea879e47bf3a45"/></dir><dir name="bundle"><dir name="product"><dir name="composite"><dir name="fieldset"><dir name="options"><file name="bundle.phtml" hash="89499fbf2db2bbdd1f5ee179b854586c"/><dir name="type"><file name="checkbox.phtml" hash="e8f0bfbb365b2f6712f60026c9ce1b18"/><file name="multi.phtml" hash="0988351a515671f9aaa2b792d75c59bb"/><file name="radio.phtml" hash="6234abd48de61d70d1f35db13f689c7b"/><file name="select.phtml" hash="7724c1cf48980f85c6d4599a666cc095"/></dir></dir></dir></dir><dir name="edit"><dir name="bundle"><dir name="option"><file name="search.phtml" hash="a01bc3290a390209ecf388864ce8a2b7"/><file name="selection.phtml" hash="073848dfe3e5e5346cdd226a1cfb8c5f"/></dir><file name="option.phtml" hash="e7063e7b8018a893d4d37edce62b716c"/></dir><file name="bundle.phtml" hash="f9f28eb3f4688403ea4798fc289508a3"/></dir></dir><dir name="sales"><dir name="creditmemo"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="2a37ff6a45afff543b64d4218c1f9733"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="304e3ef931e741be4c8a7670a3b66c72"/></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="a0ef0a7d9921336401eefae27771c008"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="285a43858c4c4109a83ffa7df5d3d49b"/></dir></dir></dir><dir name="order"><dir name="view"><dir name="items"><file name="renderer.phtml" hash="2ebfb46b876adab7d09ec84451e8bce2"/></dir></dir></dir><dir name="shipment"><dir name="create"><dir name="items"><file name="renderer.phtml" hash="9a40c0e11713e9ccd595aefdda832106"/></dir></dir><dir name="view"><dir name="items"><file name="renderer.phtml" hash="2784e8c94ea6a46c0145f74f9068e198"/></dir></dir></dir></dir></dir><dir name="captcha"><file name="zend.phtml" hash="fdb5192f0165fbd73020be831773b02f"/></dir><dir name="catalog"><dir name="category"><dir name="checkboxes"><file name="tree.phtml" hash="93341321e660e9315740b668b81b18b1"/></dir><dir name="edit"><file name="form.phtml" hash="64ae6507e31ef4be089c5073d6da8752"/></dir><file name="edit.phtml" hash="3e0737975a3f17b3b7a3a7d37fa346df"/><file name="tree.phtml" hash="a07f8c23d31ecee9b462fc8c10a7477c"/><dir name="widget"><file name="tree.phtml" hash="98c813f4f07624c2c5a6110f51b719cf"/></dir></dir><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="e8d0c3368acc77795b4b7b9c342caa03"/></dir></dir></dir><dir name="product"><dir name="attribute"><file name="js.phtml" hash="02e26715029a70679052ed6d2fa106d3"/><dir name="new"><file name="created.phtml" hash="151a091138128d99742f55d7c1b2110a"/></dir><file name="options.phtml" hash="da86ae5cf4a436ec0d249820dced47ed"/><dir name="set"><dir name="main"><dir name="tree"><file name="attribute.phtml" hash="7a98412b5e02a2337962f1cba1c0926f"/><file name="group.phtml" hash="7327296a5910e134bb27d921ba6faef9"/></dir></dir><file name="main.phtml" hash="000a4dbe286f9d1c197db26e06f96a92"/><dir name="toolbar"><file name="add.phtml" hash="f923b1a243a99ab1e1421016dfece85e"/><file name="main.phtml" hash="69135d84b55225c318764deb86911eb8"/></dir></dir></dir><dir name="composite"><file name="configure.phtml" hash="4691e35f72bc805b4a78cdb10d1b30aa"/><dir name="fieldset"><file name="configurable.phtml" hash="356bc1bda51444b3e689d75050c2546d"/><file name="grouped.phtml" hash="f1916f58ec361a017c66dabbcf828fb3"/><dir name="options"><file name="js.phtml" hash="dddc183fd7c1f9aef5f8956396168371"/><dir name="type"><file name="date.phtml" hash="751dd58c82ff3711b219a359fbbd7dc5"/><file name="default.phtml" hash="9d47d54a3b46055de7dd7d1bc159982d"/><file name="file.phtml" hash="79e6110614250e705ebc245c73b70953"/><file name="select.phtml" hash="dcb71b5942bc011ddc8bab0f143c97b1"/><file name="text.phtml" hash="711bb7e26fd1c912900b3bfd2fe4312e"/></dir></dir><file name="options.phtml" hash="291db960eefe6bc4ee11083cddc7f49b"/><file name="qty.phtml" hash="b2ecd8770549f70510c096155876b2dd"/></dir></dir><file name="created.phtml" hash="7ad824b374c094fce2694f639bbdff07"/><dir name="edit"><dir name="action"><file name="attribute.phtml" hash="135122ecde9c695a82d48c6bb12c58b8"/><file name="inventory.phtml" hash="0a6c1e7c27ec448cddd3c5ed39381976"/><file name="websites.phtml" hash="e70bdd8f8bb4d2837e8e3703dc6a6d8a"/></dir><file name="categories.phtml" hash="1c7e89cbb3b26bdf5e73a0129a02461d"/><dir name="options"><file name="option.phtml" hash="fa1a16330d836f2c726de65f8f83f3bd"/><dir name="type"><file name="date.phtml" hash="fe4dfbe4467eba7efba074e2bee082f6"/><file name="file.phtml" hash="0597a3a119484f1fe6e15985965ac12c"/><file name="select.phtml" hash="259b6fcd60668b02018544edfed0d434"/><file name="text.phtml" hash="99241a0b273953e8e7e5da01f11416af"/></dir></dir><file name="options.phtml" hash="1c83a9b7f656ef0db5350eea9a9921e0"/><dir name="price"><file name="group.phtml" hash="3772ae5ab7ccc1d48017d6c8111cc82e"/><file name="tier.phtml" hash="190db4bba7240e419566d0f4d9ed77f6"/></dir><file name="serializer.phtml" hash="c8277b360460b86e31d49723cb0a2e35"/><dir name="super"><file name="config.phtml" hash="c9d89d1db17c73a6602fb2d2c2a383a0"/></dir><file name="websites.phtml" hash="8828fcb86ab18e113744dbfa7f581e63"/></dir><file name="edit.phtml" hash="f0615d0ba774625beb4de2c4f8e20c39"/><dir name="helper"><file name="gallery.phtml" hash="5bf320f5189fc4b430b842ff5b4de94b"/></dir><file name="js.phtml" hash="0584d9fe8ec9fa4f2aeff8a754b4eda0"/><file name="price.phtml" hash="63805b0ca7598b1261f02cd8676e45c5"/><dir name="tab"><file name="alert.phtml" hash="a5568acabd6f3cfb28977390840646a5"/><file name="inventory.phtml" hash="6759a08e6afe766db7ed54814ea4676b"/></dir><dir name="widget"><dir name="chooser"><file name="container.phtml" hash="3043ccbabb4641105b3f241f156f8c4a"/></dir></dir></dir><file name="product.phtml" hash="7d7d72652c83ea5007431ede860241fe"/><dir name="wysiwyg"><file name="js.phtml" hash="79bf2f95fc47fb369accebab015405fe"/></dir></dir><dir name="cms"><dir name="browser"><dir name="content"><file name="files.phtml" hash="8bca646eb72689b0b9c261a8d43f6261"/><file name="newfolder.phtml" hash="84e15ba19934ba070b39fef40eb5b8c0"/><file name="uploader.phtml" hash="74334f78aadf103650e73cb3aba0cae3"/></dir><file name="content.phtml" hash="011898836d6c1abbaffa754ce6480f10"/><file name="js.phtml" hash="07caa78fabab177f9daded1115947155"/><file name="tree.phtml" hash="e658c33a04ad1c24e4ac66187ac9aebf"/></dir><dir name="page"><dir name="edit"><dir name="form"><dir name="renderer"><file name="content.phtml" hash="0aee2c89cab9c172f7754efb1e97c616"/></dir></dir></dir></dir></dir><file name="coming.phtml" hash="d5b559a738546ced442f00df92fe02d7"/><dir name="connect"><dir name="extension"><dir name="custom"><file name="authors.phtml" hash="f100935c95888e51526c58f384b2d7c4"/><file name="contents.phtml" hash="b7ce10e80c74c050abf341436d665758"/><file name="depends.phtml" hash="dcc96e497bbf24596010023b65a733f6"/><file name="load.phtml" hash="d63a2982e9fe2fe1f283e2b4c4b285dd"/><file name="package.phtml" hash="e8036f32b44fb6314a403b82c011ec01"/><file name="release.phtml" hash="b50329d60d68bff9ff0e8a5a5dc39b5d"/></dir></dir></dir><dir name="currencysymbol"><file name="grid.phtml" hash="d58794138d10de0194e8ddfa2aab43d1"/></dir><dir name="customer"><dir name="edit"><file name="js.phtml" hash="94a3d284e8a0b92789f690feed2a58f1"/><dir name="tab"><dir name="account"><dir name="form"><dir name="renderer"><file name="group.phtml" hash="63f0c218412d3ccae329ce6559eedf85"/></dir></dir></dir><dir name="view"><dir name="grid"><file name="item.phtml" hash="00e1569fba2eb47e193964b4e9a1fe7e"/></dir></dir></dir></dir><file name="online.phtml" hash="2de6f2d49e7e7299fd87021a74dc9b42"/><dir name="sales"><dir name="order"><dir name="create"><dir name="address"><dir name="form"><dir name="renderer"><file name="vat.phtml" hash="9745f3ffd9fef88d7405e4fc94fd2f00"/></dir></dir></dir></dir></dir></dir><dir name="system"><dir name="config"><file name="validatevat.phtml" hash="d66acd187bdfed31c3c2354f546442cd"/></dir></dir><dir name="tab"><file name="addresses.phtml" hash="292d308dd2dc486751ae284178fba45b"/><file name="cart.phtml" hash="5f91cd5a9af29c8357d0ecec393866e1"/><file name="newsletter.phtml" hash="217e3adaddfde5eebd69cb0b9ce3137c"/><dir name="view"><file name="sales.phtml" hash="21ccdd0aa155d124e31e9d14221fd2b5"/></dir><file name="view.phtml" hash="8cb1861837a4b6dfc5a928fd308696a1"/><file name="wishlist.phtml" hash="0fdd8fcd370831354501f87cc860fa24"/></dir></dir><dir name="dashboard"><dir name="graph"><file name="disabled.phtml" hash="a9f2f2fe66344d1ab52f2a8846b3ee19"/></dir><file name="graph.phtml" hash="6a61127c70fdb5e5a03cf3d813666919"/><file name="grid.phtml" hash="becc52bd2bdb27ecc64db3ec8c103ca5"/><file name="index.phtml" hash="2710fe9fb5394987de59b3cf8135604e"/><file name="salebar.phtml" hash="0ee90c82d5961b7d11653390ed1410e0"/><file name="searches.phtml" hash="cf00ce9257abcfe21c47d326830f6484"/><dir name="store"><file name="switcher.phtml" hash="70d22485908ab869cefb6e6e3e7adae4"/></dir><file name="totalbar.phtml" hash="16b05457a8d88bfea297010da868f01b"/></dir><dir name="directory"><dir name="js"><file name="optional_zip_countries.phtml" hash="82991cce214f70fd6f3069ffa054bab8"/></dir></dir><dir name="downloadable"><dir name="product"><dir name="composite"><dir name="fieldset"><file name="downloadable.phtml" hash="d6a42cc2317c05cfebceb41a1bb81357"/></dir></dir><dir name="edit"><dir name="downloadable"><file name="links.phtml" hash="ba61ab5dc51a98bb8a15657a7f717fec"/><file name="samples.phtml" hash="b634ad45d24b56dd03c77bd2b6522356"/></dir><file name="downloadable.phtml" hash="ca0899308ee8eb270e49accc9492e9ed"/></dir></dir><dir name="sales"><dir name="items"><dir name="column"><dir name="downloadable"><dir name="creditmemo"><file name="name.phtml" hash="1f3e085fbcca1e58454ea9c6f2d4fc2b"/></dir><dir name="invoice"><file name="name.phtml" hash="c88ad7b48b0e96e873e5e4717473692d"/></dir><file name="name.phtml" hash="dd921b62e3aa82657e557310fccb7657"/></dir></dir></dir><dir name="order"><dir name="creditmemo"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="bf8730d15a2c59f83a5c7db58e4b3c94"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="2e21c1b767f3b530587025e873d5bdab"/></dir></dir></dir></dir><dir name="invoice"><dir name="create"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="dd81921f4b0360338f5616443caa41f8"/></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="d0b1a3f8edc8c586081d234c04315609"/></dir></dir></dir></dir><dir name="view"><dir name="items"><dir name="renderer"><file name="downloadable.phtml" hash="93d62162a83d3d223fb31bf15b5c8967"/></dir></dir></dir></dir></dir></dir><dir name="eav"><dir name="attribute"><dir name="edit"><file name="js.phtml" hash="7a98412b5e02a2337962f1cba1c0926f"/></dir><file name="options.phtml" hash="b256d2cced5639b490fd02f386b856c0"/></dir></dir><dir name="email"><dir name="order"><file name="items.phtml" hash="3d5bdfb03c98df09183b1cae43ab9f5f"/></dir></dir><file name="empty.phtml" hash="85b5bcbacf33148afa9cb2e291ed9c29"/><file name="example.phtml" hash="fa6ad939de28c77f97c7661b70ae32b6"/><file name="forgotpassword.phtml" hash="9a6bb0557f28c75a8313be2c8344b30b"/><file name="formkey.phtml" hash="668f8c7327ebc6e52e81837e6d59883e"/><dir name="giftmessage"><file name="form.phtml" hash="8ee516dc74b127343fee0878f0bf9fea"/><file name="giftoptionsform.phtml" hash="63957f638434ce0a8d6db542ddef62dd"/><file name="helper.phtml" hash="bdd78c5dd5b3f8c6982aef0bf972926b"/><file name="popup.phtml" hash="a59c297c518a7b1da339a9a26f282ec1"/><dir name="sales"><dir name="order"><dir name="create"><file name="giftoptions.phtml" hash="093edda5e1e6c70305be5cd6a72a428c"/><file name="items.phtml" hash="de0f3a292bc3300485150c235b3c8baf"/></dir><dir name="view"><file name="giftoptions.phtml" hash="31f1e4a845d664c74167e4aaf8e60d92"/><file name="items.phtml" hash="6e13e1c989e036a70ce63985109ebf4b"/></dir></dir></dir></dir><dir name="googlebase"><file name="captcha.phtml" hash="4c757e7ae89a8d5d6f6a9b9442e9db06"/><file name="items.phtml" hash="6c36149414fdb1429aa538af780bd8cc"/><dir name="types"><dir name="edit"><file name="attributes.phtml" hash="c020a509f199500e302990d93d334cd9"/></dir></dir></dir><dir name="importexport"><file name="busy.phtml" hash="d262675a58d13c07e06758a8289a3835"/><dir name="export"><dir name="form"><file name="after.phtml" hash="3e764cd464cb459e97a83c2290db2211"/><file name="before.phtml" hash="404ce5d37d1a382e2686348e37927562"/></dir></dir><dir name="import"><dir name="form"><file name="after.phtml" hash="9bed43a35ee858d35cbb5ee6c22a7d7a"/><file name="before.phtml" hash="ff9c4f2494f974420f80f3af7f10e5bc"/></dir><dir name="frame"><file name="result.phtml" hash="4916fcf4a49ebd7c3a714c89f799c61a"/></dir></dir></dir><dir name="index"><file name="notifications.phtml" hash="da5caede6028791f5ad4d18f8849a10f"/></dir><file name="login.phtml" hash="06e47e38d714b6dcb0d05a4c58498a24"/><dir name="media"><file name="editor.phtml" hash="7a43efd27957c6af0be487bb9c575a9a"/><file name="uploader.phtml" hash="526fa29bfbe08b7db8a8f0b487a711aa"/></dir><dir name="newsletter"><dir name="preview"><file name="iframeswitcher.phtml" hash="a1fd201e45ac43760cd93cfd008e08b2"/><file name="store.phtml" hash="db953f03978e2c4fefd86060cb569297"/></dir><dir name="problem"><file name="list.phtml" hash="b87e241b95fa68260c6e34ac8ad3dc58"/></dir><dir name="queue"><file name="edit.phtml" hash="75d0bf23bb2a7583f5e8af836b62af93"/><file name="list.phtml" hash="a6a0648a213a57e7ad83f91c96d52717"/><file name="preview.phtml" hash="f1bea98facf19ca2ce34470e6b86cb87"/></dir><dir name="subscriber"><file name="list.phtml" hash="ad47057f0078b902d262d56143c9cade"/></dir><dir name="template"><file name="edit.phtml" hash="2ffe2af188c8c8d30f4993d9d3e8eddd"/><file name="list.phtml" hash="1266bfe62755075fc7f38b4598007a29"/><file name="preview.phtml" hash="f1bea98facf19ca2ce34470e6b86cb87"/></dir></dir><dir name="notification"><file name="baseurl.phtml" hash="1a5a7dffdfc83d740ef2843e54a12dd9"/><file name="security.phtml" hash="83362536d29fe224b474c063de3cd6ab"/><file name="survey.phtml" hash="08aca628ec979a2c69447429771de8df"/><file name="toolbar.phtml" hash="4d39b7bd8e45b04f8e554bf9de6202fb"/><file name="window.phtml" hash="5666027b927a760d0d1ab54fed5d791c"/></dir><dir name="oauth"><dir name="authorize"><file name="button-simple.phtml" hash="d9fc19bb662651816023670f0c541473"/><file name="button.phtml" hash="8ef4e59f856e200ae9b4df6a9b11040a"/><file name="confirm-simple.phtml" hash="c6f9aad0568c1183be7758d4355566e8"/><file name="confirm.phtml" hash="3fb68893fe222c965cba7bfe3b1d763f"/><dir name="form"><file name="login-simple.phtml" hash="795a6e6ac738c592a1c6d8cb160107f2"/><file name="login.phtml" hash="02bae281f86f343afbe82899abf2ecc9"/></dir><file name="head-simple.phtml" hash="025e93a7450094ebb292be787b3a6093"/><file name="reject-simple.phtml" hash="239588bf20e2a78130178c9fe49b7bce"/><file name="reject.phtml" hash="ca1c10dcc85ecfa5803e46ea5960059d"/></dir></dir><file name="overlay_popup.phtml" hash="23a40353e27d75eb0bbda6175f671796"/><dir name="page"><file name="footer.phtml" hash="2462a7315f44a7fd106f4ea5d2347215"/><file name="head.phtml" hash="5d95792ce437b953557e60e41cff7122"/><file name="header.phtml" hash="b22db4d17af45d66789444f39bf427b2"/><dir name="js"><file name="calendar.phtml" hash="34d10b8433102613bb6a4bed72f3e0f5"/><file name="translate.phtml" hash="6ee90249fc539ec676f51d827d42066d"/></dir><file name="menu.phtml" hash="a1b2fc6e23351ec660ebd297924d1cde"/><file name="notices.phtml" hash="3f8f0fb17d8642db0f1392ae239b6b4d"/></dir><file name="page.phtml" hash="7953efb6d0cb2decb67dfbebf389a751"/><dir name="pagecache"><dir name="cache"><file name="additional.phtml" hash="bd00566238cd0f5d38a6a32e8e029075"/></dir></dir><dir name="paygate"><dir name="form"><file name="cc.phtml" hash="b2c9edc6305ecd2d461960979dc6e04d"/></dir><dir name="info"><file name="cc.phtml" hash="a588d97b5f7d01e25da3086bbebbb58e"/><file name="pdf.phtml" hash="d3daafd51a71ac8ad82a5ad135341213"/></dir></dir><dir name="payment"><dir name="form"><file name="banktransfer.phtml" hash="f5ca517d54f15925165221a6034d1a41"/><file name="cashondelivery.phtml" hash="5a424f8084282cabfc3ec89153af8ebc"/><file name="cc.phtml" hash="1f6cb5eb01602aad78b06f6d2e616fae"/><file name="ccsave.phtml" hash="b75ba46d35459c9f4eb76459c4230b91"/><file name="checkmo.phtml" hash="f678a5af0f38016946f0d2153d1c1c4c"/><file name="purchaseorder.phtml" hash="5ee44c5a12516febb7ea5e9fce0813e9"/></dir><dir name="info"><file name="banktransfer.phtml" hash="1cc12ea937a83ec7850c3e3c979ae090"/><file name="checkmo.phtml" hash="d60d2fbe95574f7c2ddc710684272044"/><file name="default.phtml" hash="cc873bf7b3e3d9724864ef6cbb3b8551"/><dir name="pdf"><file name="checkmo.phtml" hash="03abba9cccd1f9bee48c9f871970720e"/><file name="default.phtml" hash="70630d0f786194e1efd421a6c555731c"/><file name="purchaseorder.phtml" hash="15bb4ad5666e114e9b125b41fa4f4fff"/></dir><file name="purchaseorder.phtml" hash="f7861e98d8ad6d7bfc652c2e3ce2f9b5"/></dir></dir><dir name="paypal"><dir name="system"><dir name="config"><file name="api_wizard.phtml" hash="dab0fc1b5c82698253a334a81cc25964"/><dir name="fieldset"><file name="global.phtml" hash="637eedd4757ee1a5ad964d378455959c"/><file name="hint.phtml" hash="c0bcddc6efc5638bb5c361cee25bb391"/><file name="store.phtml" hash="6ae39364f3c985351da2d5d4e038b320"/></dir><dir name="payflowlink"><file name="advanced.phtml" hash="434c43cb233834700e474440a53d6fab"/><file name="info.phtml" hash="aa73ddfe78d99c1bd5374197d47c98c4"/></dir></dir></dir></dir><dir name="permissions"><file name="role_users_grid_js.phtml" hash="f4cb17fefcca73b09a5f2ae39234f34d"/><file name="roleinfo.phtml" hash="3f98afc8ff32c5d0d5d72463e3599294"/><file name="roles.phtml" hash="d68d22cfba21927ecbe95db6ae7cee43"/><file name="rolesedit.phtml" hash="d5d142bdf1b725999eb84b5f40cd776f"/><file name="rolesusers.phtml" hash="13ef3a4e3f2b9029145d77f5acb7cb7a"/><file name="user_roles_grid_js.phtml" hash="9267240bc35a6f42f6ade61b5575b137"/><file name="userinfo.phtml" hash="ac60e8332ae54b118b3004ac50c5de5d"/><file name="usernroles.phtml" hash="9110a1d0be02818c12f0d76353e6b230"/><file name="userroles.phtml" hash="2d779269a168d467e1b23dcaaa67b898"/><file name="users.phtml" hash="686451dcc0db658e0f342de6cb651478"/></dir><dir name="poll"><dir name="answers"><file name="list.phtml" hash="28b9547c2c6efdd970a5327413476661"/></dir></dir><file name="popup.phtml" hash="5fccd3a283b7d21c35f367a3974d4947"/><dir name="promo"><file name="fieldset.phtml" hash="d87248d0189fbfd6a00a3a5a245459cf"/><file name="form.phtml" hash="a3f5a0e8001ac56e822866a2fd453c89"/><file name="js.phtml" hash="2eafd0314cd42af30f6a7a08b3bf4ef7"/><file name="salesrulejs.phtml" hash="cec2eff46a015a52fc538609ade12821"/></dir><dir name="rating"><file name="detailed.phtml" hash="852c913d6a79e34aed3e5d05f19db991"/><file name="options.phtml" hash="d30cad80e36feb721ea4753947b3661a"/><dir name="stars"><file name="detailed.phtml" hash="a4ac92a52fa258181b0d708018c62108"/><file name="summary.phtml" hash="a83cfc4d046880aa3ec5f478bad36161"/></dir></dir><dir name="report"><dir name="grid"><file name="container.phtml" hash="8afae1e8f315820ea263abb7901756d0"/></dir><file name="grid.phtml" hash="cbcde35a2594a1d36b20b99291e32b22"/><dir name="refresh"><file name="statistics.phtml" hash="a8b531e672ff17aa78e35473f215739a"/></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="f5f5e64bb1c9dcb59434a4fc811acda2"/></dir><file name="switcher.phtml" hash="947b37780419beabcda34013a261d43d"/></dir><file name="wishlist.phtml" hash="fc6334b08f55a7f3f5f42f401a9a2574"/></dir><file name="resetforgottenpassword.phtml" hash="19e9019c7236f8232d398754be6e0d18"/><dir name="review"><file name="add.phtml" hash="f919e9d005e9982a809cd759bd1fa27a"/></dir><dir name="sales"><dir name="billing"><dir name="agreement"><file name="form.phtml" hash="c045bc446859e14f1f5096ad44be54de"/><dir name="view"><file name="form.phtml" hash="a38fecb1401080e69fc92e51863bf522"/><dir name="tab"><file name="info.phtml" hash="426577dc27aa90a734aa23f0fe93d673"/></dir></dir></dir></dir><dir name="items"><dir name="column"><file name="name.phtml" hash="d3d1d31a2a0bc7a57801f78756a62ecf"/><file name="qty.phtml" hash="37394503de14c09502b6b8b7542660a6"/></dir><dir name="renderer"><file name="default.phtml" hash="8f9b32e7bbe72e96178d9b6f9c75806a"/></dir></dir><dir name="order"><dir name="address"><file name="form.phtml" hash="14a681b992206d290b708b4df6839c32"/></dir><dir name="comments"><file name="view.phtml" hash="b1d7c4ff5d1d02ef95bc5dbdc789df0a"/></dir><dir name="create"><file name="abstract.phtml" hash="73bb65d4b51bed1be38cb18738cefdd0"/><dir name="billing"><dir name="method"><file name="form.phtml" hash="7f6d2c2571c3e94e882a84391163f2c4"/></dir></dir><file name="comment.phtml" hash="3ff56760d956ee9850fc899a6bf444cc"/><dir name="coupons"><file name="form.phtml" hash="9de66e86ddd6b1d90c5ff57bf1092fa5"/></dir><file name="data.phtml" hash="cfba996cee0ec9e3cb128a338aa97234"/><dir name="form"><file name="account.phtml" hash="4ef4d5d68f31f02cb7ac477804b9c729"/><file name="address.phtml" hash="9c73251984359ab1822c8ee784d0897b"/></dir><file name="form.phtml" hash="9f7e219d35d6f5f39e6c8aefcdee757c"/><file name="giftmessage.phtml" hash="61d994f507fc095324856d0f168dd0a2"/><dir name="items"><file name="grid.phtml" hash="b1f9cda82ff0072a658c282ea8f7d625"/></dir><file name="items.phtml" hash="4b8a4bbb55d1f3a10bce5c0f2a77c8c7"/><file name="js.phtml" hash="b135bc5e678ad509b3dcec73a19a8a23"/><dir name="newsletter"><file name="form.phtml" hash="8d924604782ce5b25ea93ba17b3e6b40"/></dir><dir name="shipping"><dir name="method"><file name="form.phtml" hash="baba59c0d805fb14f117d0395715e03c"/></dir></dir><dir name="sidebar"><file name="items.phtml" hash="fe201f2c2e0b9d8c0ab00caf83eba9c7"/></dir><file name="sidebar.phtml" hash="db99134846752d81956d4fa184286fe8"/><dir name="store"><file name="select.phtml" hash="d07c80543627993d8a390528ad173b99"/></dir><dir name="totals"><file name="default.phtml" hash="64c8c771680709c8045f05dee1d18d5b"/><file name="grandtotal.phtml" hash="3249e222a3a30d63afd9262e9cb1a4db"/><file name="shipping.phtml" hash="95bf72407796516b82d7d4fbfda67688"/><file name="subtotal.phtml" hash="60616ad2dc8be1486dbf08f5a833d6ff"/><file name="tax.phtml" hash="74fc8266eeb87c93033fbb2f78ed1345"/></dir><file name="totals.phtml" hash="e08335a53675cdcd8f59913b505156e5"/></dir><dir name="creditmemo"><dir name="create"><file name="form.phtml" hash="2e8a3360bac63dbbdf7791236abfddeb"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="73be8682fb113fb48c007da2048dcf19"/><file name="default.phtml" hash="45c7dba8a188492a1898d326050ed879"/></dir></dir><file name="items.phtml" hash="2c92ec23f30e455369d2a9a3f08883cd"/><dir name="totals"><file name="adjustments.phtml" hash="ef48f10d014988a5854fa758c97b138e"/></dir></dir><dir name="view"><file name="form.phtml" hash="8b7613c7724df167f773733537f5f1ba"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="d7473c61ac4ddcb78a67333bd93cebc5"/><file name="default.phtml" hash="f375604bcdd6b5a908107e418a67fdf6"/></dir></dir><file name="items.phtml" hash="b35fe2e31670ac2801abdc1bcbff0102"/></dir></dir><file name="giftoptions.phtml" hash="b6f4197d3df032819254d0dac3413495"/><dir name="invoice"><dir name="create"><file name="form.phtml" hash="bf7f58f7a32c9bc13d609e24069591cb"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="b22515ce703f8db8cfbfb60f145da438"/><file name="default.phtml" hash="6c643dc3288b0c94b32abe563d1fa493"/></dir></dir><file name="items.phtml" hash="4c05e6eb775ea5223ff5456c81304a86"/><file name="tracking.phtml" hash="66faab35a9ff18921bc3e6dbf4bd45f7"/></dir><dir name="view"><file name="form.phtml" hash="f976756a3c4669d424686cc46ea2568d"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="b3b37f21f5c3b714f8bbe22ef099af56"/><file name="default.phtml" hash="76403ccf7899267162ad3b5839401c0a"/></dir></dir><file name="items.phtml" hash="9e803123162b720873c6e6f4696da31a"/></dir></dir><dir name="shipment"><dir name="create"><file name="form.phtml" hash="c9ac15d1ab6833d34a0f768eae781b31"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="dc08d0b624b90949b181c803a450a36e"/><file name="default.phtml" hash="962f4dd0a8ec540f52f0f13c14ab3e08"/></dir></dir><file name="items.phtml" hash="c9dd1fdc524322c5e60fc6b894434b60"/><file name="tracking.phtml" hash="3f8511262d928445696c6319bb2508dc"/></dir><dir name="packaging"><file name="grid.phtml" hash="7d394055313bf36836fd1f468a263b34"/><file name="packed.phtml" hash="941ae030da21bb54a1d6d101d7dd1af7"/><file name="popup.phtml" hash="b7becfc86ef5bc7935cc08e1814e342e"/></dir><dir name="tracking"><file name="info.phtml" hash="9d088e90071007f8a8408ff4b6bf1578"/></dir><dir name="view"><file name="form.phtml" hash="7307852d350cddf4096d7a78137d147a"/><dir name="items"><dir name="renderer"><file name="configurable.phtml" hash="5dd9560fce1605eb506188ab2810eec8"/><file name="default.phtml" hash="449d5cce4d2baff9737dd143b59f90b7"/></dir></dir><file name="items.phtml" hash="7bd98be6262f041d94d6df9132e6ea36"/><file name="tracking.phtml" hash="94a55a3a5064abbff7790feb76ef5ed4"/></dir></dir><file name="totalbar.phtml" hash="8862b3abf6166a0b106a8e20e5548531"/><dir name="totals"><file name="discount.phtml" hash="4d1ecb9291b25f5c3ab5c5d77f546071"/><file name="due.phtml" hash="3df55bcd0d58a9d72cb44977a03f25de"/><file name="footer.phtml" hash="75322b0a2e4832a1e0d87dde7aad0813"/><file name="grand.phtml" hash="31122d57bcd9d20a616264cf5b8170a3"/><file name="item.phtml" hash="4dfc650dff0e372fbbcbc98cb53bbc8d"/><file name="main.phtml" hash="1785c69f7cae82872bbcbab68b9b5409"/><file name="paid.phtml" hash="3fb004bd20c0d4e39eb8e2ee63c4e7bb"/><file name="refunded.phtml" hash="50bb53757008c84acc968e3afa3782b5"/><file name="shipping.phtml" hash="319fd258f733513d5d5eebf2d3c57d6f"/><file name="subtotal.phtml" hash="dc63cedb53d44617410e60919f1c6673"/><file name="tax.phtml" hash="8e3579a628574f9ab9a7b936d6fd7c78"/></dir><file name="totals.phtml" hash="a3badd69a64601237ce416f39d91e3c9"/><dir name="view"><file name="form.phtml" hash="8eb9c9223952d17a1981350cdbc5bdfc"/><file name="giftmessage.phtml" hash="1c4ce68ee0b411f13742aaa11937f15e"/><file name="history.phtml" hash="8165e4cc586574291d6b6e91dd1700a6"/><file name="info.phtml" hash="d474ebaa1a5e310590bf0d17c643e19e"/><dir name="items"><dir name="renderer"><file name="default.phtml" hash="27a21ebb63d923cee9eb5fa871956fcd"/></dir></dir><file name="items.phtml" hash="2eb186022637b87f7909758b271a52cf"/><dir name="tab"><file name="history.phtml" hash="2477fc121aa58235e0ac937121aa349d"/><file name="info.phtml" hash="175f3b53cdb4c933a9e43ba5e1957a81"/></dir><file name="tracking.phtml" hash="53f1b6e6409abb1c80857af51f2d70d8"/></dir></dir><dir name="payment"><dir name="form"><dir name="billing"><file name="agreement.phtml" hash="acba45d2b1f6e3c6069ca6c190e1c1cd"/></dir></dir></dir><dir name="recurring"><dir name="profile"><dir name="view"><file name="info.phtml" hash="764e11209b05bd561c6eb18dabef08c2"/></dir><file name="view.phtml" hash="86beef0c2b64e7942a5aaab3b879da88"/></dir></dir><dir name="transactions"><file name="detail.phtml" hash="7bebff6273aa9529f1ec30da31bbb9f2"/></dir></dir><dir name="store"><dir name="switcher"><file name="enhanced.phtml" hash="40b5f178cc4848725c4990603cb61144"/><dir name="form"><dir name="renderer"><dir name="fieldset"><file name="element.phtml" hash="d2c451e57d76bf1d85344b973e297267"/></dir><file name="fieldset.phtml" hash="6aee098a94a78080f510e8bf4de7e9ab"/></dir></dir></dir><file name="switcher.phtml" hash="374547385cf8c94599416ba39cb5207c"/></dir><dir name="system"><file name="autocomplete.phtml" hash="105da6d2311f0f7b205a3c7648b0be44"/><dir name="cache"><file name="additional.phtml" hash="59abda62641901a75285f1a9977ec5bb"/><file name="edit.phtml" hash="671183173835e10823ef33f5da573945"/><file name="notifications.phtml" hash="24b8f93e727f53d95632e9939ba842f8"/></dir><dir name="config"><file name="edit.phtml" hash="c1aa30cf44b85966407958b3931527e8"/><dir name="form"><dir name="field"><file name="array.phtml" hash="5d30c98d32ca0d89ac210f4f09bc20a2"/></dir></dir><file name="js.phtml" hash="8dd9b8501b4fe8775832b5faa3468045"/><file name="switcher.phtml" hash="f3ca933dc8199972a15c9b6930235066"/><dir name="system"><dir name="storage"><dir name="media"><file name="synchronize.phtml" hash="9d365a0794775cfc80405aa1ed42d3d5"/></dir></dir></dir><file name="tabs.phtml" hash="9421cf5ffc704a0c725d8fe12b3e47e4"/></dir><dir name="convert"><dir name="profile"><file name="process.phtml" hash="3b871eaf96142a6bfc73a228c491a2d9"/><file name="run.phtml" hash="8314278f7c72dd49f72bd1d23260f360"/><file name="upload.phtml" hash="0376f43508fe8248beade715e50b6380"/><file name="wizard.phtml" hash="27a6bf0670cc46eed2795665d75ed809"/></dir></dir><dir name="currency"><dir name="rate"><file name="matrix.phtml" hash="501aa16d089d1a6cc8de851a67ab2f5d"/><file name="services.phtml" hash="21443d86f7f8ecec1c52e1a3c00fca41"/></dir><file name="rates.phtml" hash="00992c94fd98af59bd884cf4a6afc5bf"/></dir><dir name="design"><file name="edit.phtml" hash="7cb45f6fd1822a4313f3d5b9bd2af8c5"/><file name="index.phtml" hash="73e90ef9565c3d65bf225a2d269a6870"/></dir><dir name="email"><dir name="template"><file name="edit.phtml" hash="6e69aa01e5937f09dd709a44e3004e8d"/><file name="list.phtml" hash="6c358ab194467f511a15fb52c11293dc"/><file name="preview.phtml" hash="5f5a1e8c84565775c11403a5cf0fbbf3"/></dir></dir><file name="info.phtml" hash="a6c1164a4c98c694c3e139635c59023b"/><dir name="shipping"><file name="applicable_country.phtml" hash="9dfc89cfd9712877c0b0143c90ab4d79"/><file name="ups.phtml" hash="a4fa51b2eda6290c99b7c0c0c6cfffc3"/></dir><dir name="store"><file name="cell.phtml" hash="1e73f208e7c568388b1dbf478bd433d4"/><file name="container.phtml" hash="ddee399b4740f3cd8b16a319d6739825"/><file name="tree.phtml" hash="d5af84bef10198d74c7718dfc8763a96"/></dir><dir name="variable"><file name="js.phtml" hash="8538abff6d312fb701fbbc3550951803"/></dir></dir><dir name="tag"><dir name="edit"><file name="container.phtml" hash="72887e68c2f5a5ec248a5607b4e1801d"/></dir><file name="index.phtml" hash="5bf61c4bc56186630c6889782d2cdc59"/></dir><dir name="tax"><dir name="class"><dir name="page"><file name="edit.phtml" hash="e1d76e3a3c4bde7487108fce74ca9b47"/></dir></dir><file name="importExport.phtml" hash="b6cd95136b50fd2d013e29bf2451bec0"/><file name="notifications.phtml" hash="b6510fcce4230812e84234926498df3e"/><dir name="rate"><file name="form.phtml" hash="1e2e7785dba03e796406e69ce3a769ae"/><file name="title.phtml" hash="c2eb1ee552f4cea7a102e4fa7ddfd0bb"/></dir><dir name="toolbar"><dir name="class"><file name="add.phtml" hash="4491c9722bd2331a2bdd304f031083b6"/><file name="save.phtml" hash="032714eae5624e7279dd193895e2ed8f"/></dir><dir name="rate"><file name="add.phtml" hash="032d165447fa3fae7e9f2ec9077ad4e7"/><file name="save.phtml" hash="ef208e4f3cc0d17fdb66bbbe91095274"/></dir><dir name="rule"><file name="add.phtml" hash="0dc115c883a8b54ce52a90700bd7ad2f"/><file name="save.phtml" hash="334317a26a36ea08f5a256a6905902ae"/></dir></dir></dir><dir name="urlrewrite"><file name="categories.phtml" hash="6f4495dea9e6cc3ca79b7f17405d21ae"/><file name="edit.phtml" hash="7c0db0d0650e40fee40fecc6edfd8429"/><file name="selector.phtml" hash="6094b7f69056c73542dcc4fb484fd45f"/></dir><dir name="usa"><dir name="dhl"><file name="unitofmeasure.phtml" hash="ab0c1fc151f0960904b72f5925ce72f3"/></dir></dir><dir name="weee"><dir name="renderer"><file name="tax.phtml" hash="1a03a17e003e282f305f5b98b76ec3a3"/></dir></dir><dir name="widget"><file name="accordion.phtml" hash="acf28e43dce33978945ee9a2f313c290"/><file name="breadcrumbs.phtml" hash="0f524150eeb162e84a3e0a2ea337c009"/><dir name="form"><file name="container.phtml" hash="6b7fcfc0cce370bd7dc2ea0d8e8b91df"/><dir name="element"><file name="gallery.phtml" hash="cc88955d39c4dca1c3cae2f1be11df71"/></dir><file name="element.phtml" hash="a9bcd0883785e27a3109e63c26091473"/><dir name="renderer"><file name="element.phtml" hash="3391b6b0186997220da62a58270d03e6"/><dir name="fieldset"><file name="element.phtml" hash="b404ad60631b57098b3fe47614d3c0ad"/></dir><file name="fieldset.phtml" hash="810c50c407a4e4002c38e33be96f9021"/></dir></dir><file name="form.phtml" hash="4ea8b1ce0e38792b8ea0a141e23f89cc"/><dir name="grid"><file name="container.phtml" hash="ddee399b4740f3cd8b16a319d6739825"/><file name="massaction.phtml" hash="35a4ca2a18dc9d0ecec321627619aa6a"/><file name="serializer.phtml" hash="8309b1d770991ade042a867531ccaab3"/></dir><file name="grid.phtml" hash="af5bb924c49ef99616309f0f9c9271a3"/><dir name="instance"><dir name="edit"><file name="layout.phtml" hash="594ee7f23240bb24219ea63b8b59168d"/></dir><file name="js.phtml" hash="f9cd0f08b4a7b12022c6df02e725578d"/></dir><file name="tabs.phtml" hash="ff20c803cfb129521252118b10e23950"/><file name="tabshoriz.phtml" hash="4b0d96893f2eb7eddde756d9a9725652"/><file name="tabsleft.phtml" hash="ba203148b588acb37cc4ae2f830f2feb"/><dir name="view"><file name="container.phtml" hash="25169c263daab90862150a40b7171c9f"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="below_ie7.css" hash="b2bf3a91f389f2ea7912765a814ce10f"/><file name="boxes.css" hash="4124f1904f8c3fb40675bbff6268d017"/><file name="custom.css" hash="30ed634c4e5d7521cf9961c880c3cba4"/><file name="favicon.ico" hash="88733ee53676a47fc354a61c32516e82"/><file name="ie7.css" hash="15db0c436a5438265a91b2c1e4ac4626"/><file name="iestyles.css" hash="89403be830634339c69a155aa824300d"/><dir name="images"><file name="accordion_close.gif" hash="875409122fc82f5f6705e20dd801fd3d"/><file name="accordion_close.png" hash="6213698b5f69bb2907a5c7bb94b5fe8d"/><file name="accordion_open.gif" hash="d9d50e220b0b676094c6134a9708194e"/><file name="accordion_open.png" hash="9fbc3aba23ce5e0465e4d1cf3f6a7aee"/><file name="add_btn_icon-disabled.gif" hash="c8f6a5cfb455ef121efb56a747821f82"/><file name="add_btn_icon.gif" hash="7300097305b577ee564dc49102822d16"/><file name="address_list_li.gif" hash="79b917b514e35ce0a7833a5e268fd9f7"/><file name="address_list_on_arrow.gif" hash="3a2884ddcc87ebd48883662530b9de1b"/><file name="address_list_over_arrow.gif" hash="e826883c71b1184bd4f29433e39c18ad"/><file name="address_list_over_bg.gif" hash="56291480cc89de9d817205a5f23b66dd"/><file name="ajax-loader-tr.gif" hash="1ae32bc8232ff2527c627e5b38eb319a"/><file name="ajax-loader.gif" hash="e2a38f1e23288e315af3c55416bc1ce7"/><file name="application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="arrow_sort_move.gif" hash="f5ac151a2b0cb1f07d6e771b8aee0ea7"/><file name="bg_collapse.gif" hash="2333c68e38163ed4656da82b9bcf362b"/><file name="bg_create_order_totals.gif" hash="ff6ab75c050b959c539cc6a6fdff2934"/><file name="bg_notifications.gif" hash="a365594725a83585d989f722b3d8c458"/><file name="bg_window_mask.png" hash="93d6efad062d24c94c105802b138b6a5"/><file name="bkg_btn-close.gif" hash="df3f2332f0bad01e031deb22b81f630c"/><file name="bkg_btn-close2.gif" hash="822457d78fb3c21dc12e9777d83eb4f1"/><file name="bkg_config-advanced.png" hash="b898594a9f1849bf386c06979ef613a8"/><file name="bkg_config-nested.png" hash="7b0fdbf98746c3c916b432c37321ccc4"/><file name="bkg_config-shaddow.png" hash="9ee4318e3f4afc446d26e7f66d01cfbd"/><file name="bkg_tooltip.png" hash="56cfed3ed8a65b19f8de88946d1a0a01"/><file name="blank.gif" hash="5722d7bd0f1e1379d0a2005a0a9ea401"/><file name="box_bg.gif" hash="4c501bd6db9d361c18780f106a809b03"/><file name="breadcrumb_bg.gif" hash="72c4adf6c75b4640ca8f7cadffa42266"/><file name="btn_add-image_icon.gif" hash="1d42210fd29fc534d9ed6b41e811d40f"/><file name="btn_add-variable_icon.gif" hash="a2db02e318d107d5b57b444c8d80b8f8"/><file name="btn_add-widget_icon.gif" hash="b4f66ca7f6097fbafd672e0b3f076ef4"/><file name="btn_add-widget_icon2.gif" hash="467acd3a14fb8be37191f5d2ec5a5b13"/><file name="btn_back_bg.gif" hash="8be512788b8044fe31aa8d00cc16ba7b"/><file name="btn_bare_bg.gif" hash="ddbbab8c0d201c3e502d50e7d4a3d64b"/><file name="btn_bg-disabled.gif" hash="079971a9d2c385fe353d35716ec9f26b"/><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="btn_bg.png" hash="6e3b7003381f919e8f6533444afaa978"/><file name="btn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="btn_delete_bg.gif" hash="ad740d0c16f2f6603c8ef023004d6539"/><file name="btn_go.gif" hash="1bd787868713767cc205e2ee25e41f62"/><file name="btn_gr_bg.gif" hash="6cc324b79a512150fee24fb3517d22cb"/><file name="btn_gr_on.gif" hash="820c134df02f7bc12efa5a9ac3b4d3dd"/><file name="btn_gr_over.gif" hash="d4c8b807d64c1f493d17c6c9d2bab69a"/><file name="btn_loading-icon.gif" hash="45f500105be432a12c78fed2b4592cf9"/><file name="btn_login.gif" hash="79fa32d49d3f4e39d3fbf8327f9229e1"/><file name="btn_on_bg.gif" hash="709cf5b0be137db1ef8427688503bf37"/><file name="btn_over_bg.gif" hash="f91641168454c03d1fa72731ec97a2b3"/><file name="btn_show-hide_icon.gif" hash="0238c509b33ba56c25df9513bb48f804"/><file name="btn_task_bg.gif" hash="5e0594bd9cbfcc1e32ffa918d7f9c812"/><file name="button-close.png" hash="04d0907b2d7fc3240693497b199f64f5"/><file name="cancel_btn_active_bg.gif" hash="91ce403d286eef2b4e0c13733875882f"/><file name="cancel_btn_bg.gif" hash="26749cf4949ac27c30f597434d3bde65"/><file name="cancel_btn_icon.gif" hash="97e0cd94ed31d6f2a1181f627e60e9a3"/><file name="cancel_btn_over_bg.gif" hash="45eb4e883b17375961672f5390387c31"/><file name="cancel_icon.gif" hash="70a23b78353f0a7b9b118a937fcb7ea9"/><file name="config_tab_dt_bg.gif" hash="a33f71077ca4078caa794cae01d9fca7"/><file name="dashboard-close.gif" hash="5ae5afd61e937fcd2d5b84641255ee4d"/><file name="db-graph-bg.gif" hash="5d76efb7c3244f5684df2566782124ea"/><file name="db-graph-bottom-bg.gif" hash="b58ced87a38a10891106329ae882aa1c"/><file name="db-graph-line-bg.gif" hash="f16bb08e040c2c0a3e23b3f35c54b79b"/><file name="db-graph-line2-bg.gif" hash="744ebfdba20d050f4d252afc216394be"/><file name="db-graph-x-bg.png" hash="d5c26510718a78d22083916d80ef7a22"/><file name="db-header-bg.png" hash="3976cb6351e167686a501a85cf3a68e9"/><file name="db-menu-bg-hov.gif" hash="34ea76a6d105d90fcb63bf105aadb8f7"/><file name="db-menu-bg-up.gif" hash="b0f754872dff5f2f0dc57ba193fdfa4c"/><file name="db-menu-bg.gif" hash="ea534c3c09bb309e566b6ae876655e13"/><file name="db-menu-sep-last.gif" hash="a01fe34854e1187e466fd58d462c4106"/><file name="db-menu-sep.gif" hash="7c5ae1cd59a189261cc3244358d5c1ad"/><file name="db-menu-start.gif" hash="aa5cac2194d937cc7fa904ccfce70ecc"/><file name="db-scroll-bg.gif" hash="06d2411e3b5f350ab21b625439d2d69d"/><file name="db-scroll-but-bot-roll.png" hash="6bc5e482f3f6d8fb1fc5014ddea43706"/><file name="db-scroll-but-bot.png" hash="25c0181e76ff8ceb3c0ec59071b8c72c"/><file name="db-scroll-but-top-roll.png" hash="b7961f2a3b5b641694a9b0b30d58e46b"/><file name="db-scroll-but-top.png" hash="de7df96e961596be9ff556924259b98b"/><file name="db-scroll-roller.png" hash="e01dde7bd096c52179acf29a425a29e5"/><file name="db-tab-bottom-left-bg.gif" hash="124388d44ac58b029377c6311a4782d5"/><file name="db-tab-bottom-mid-bg.gif" hash="9c48f33aa8907cfcb227bc779c2e1dce"/><file name="db-tab-bottom-right-bg.gif" hash="1db45e6fd8abc67d59f96a676607b412"/><file name="db-tab-footer.gif" hash="cac8928acba75bc1edd73186ced78e5c"/><file name="db-tab-header-sep.gif" hash="580312af7441b6a62f7e32081c40fb0f"/><file name="db-tab-header.gif" hash="fdf493b9477fcff7e7be98405effc33d"/><file name="db-tab-left.gif" hash="3fe3c55267dbbdd1db2ff959ccc9e0be"/><file name="db-tab-right.gif" hash="b7a32c8b03efe2fbdb63215d0446e3be"/><file name="dotted_divider_dark.gif" hash="8bf1de196d9ea048bfb25155cedd2e9e"/><file name="dotted_divider_light.gif" hash="92e562bf2070110f6b0a15e29b845445"/><file name="edit_icon.gif" hash="dbda31751c78d964c04394e9d8533187"/><file name="entry_edit_head_arrow_down.gif" hash="985c3ce4439fbf8bb2216fc7e73a3f0b"/><file name="entry_edit_head_arrow_down2.gif" hash="d68dd0fbc2819858a26ea2835c05df77"/><file name="entry_edit_head_arrow_up.gif" hash="d2b90a1823fff9f3917f19b427410144"/><file name="entry_edit_head_bg.gif" hash="1086b7196e8b33c4f46e49fecef0f35f"/><file name="error-msg.png" hash="3cd27b642416dacdc28907c89d934886"/><file name="error_msg_icon.gif" hash="e4f28607f075a105e53fa3113d84bd26"/><file name="fam_account.gif" hash="c910fd1ff41b940d71b0835e02fc143e"/><file name="fam_application_form_delete.png" hash="972c2d998fc19572dd64af6b5e2e898e"/><file name="fam_application_view_tile.gif" hash="f595a133bf466cb91be23d9686fe6281"/><file name="fam_asterisk_orange.gif" hash="908d44da90de5e54185764d093bbdb77"/><file name="fam_bin.gif" hash="2fb388bc9f1d32d3802db8e91dc238bc"/><file name="fam_book_open.png" hash="0ba89b9fbe7e88d4c6896ed0a1f495aa"/><file name="fam_bullet_disk.gif" hash="9fe82691d960c18d3d315c3f9164af4f"/><file name="fam_bullet_error.gif" hash="008802f44288b732b59cfe9fdbfecefe"/><file name="fam_bullet_success.gif" hash="465a056a3ba3d94367f51c3c0b751391"/><file name="fam_calendar.gif" hash="0614207ce4e3e0a9bd631b39e7692e3c"/><file name="fam_cart.gif" hash="1f2fd2c8ac6574488ea78302b6856191"/><file name="fam_comment.gif" hash="5138f9a4b6019a5b14b8ff9a32a3cb89"/><file name="fam_creditcards.gif" hash="b75b8ce2f4fceb58f8082c48344560c7"/><file name="fam_folder_database.gif" hash="e86175ff0f389ade1fc7bf15e03346eb"/><file name="fam_folder_palette.gif" hash="c0941b9145e06d53cc0d17ac4c151764"/><file name="fam_folder_table.gif" hash="e2914ba75944acd2a9e2d338fa339e16"/><file name="fam_group.gif" hash="52d778dddbf48b8d04226bee9370a7ef"/><file name="fam_help.gif" hash="2b5ed4c13a8e24456207b757826c7b2c"/><file name="fam_house.gif" hash="8eb2d580c5a40b7974f4263ca64fb94a"/><file name="fam_layout.gif" hash="5366a5f02260d3a860ef0c4787282ad6"/><file name="fam_leaf.png" hash="078d4f24683331b4557356a59e67b125"/><file name="fam_link.gif" hash="78590d5d8375d1baabe7b66d7b9ceb7d"/><file name="fam_lorry.gif" hash="174e86e45e76e7008fa3510cefa85047"/><file name="fam_money.gif" hash="6996bad465222fb6487cab94b4607846"/><file name="fam_money_add.gif" hash="70ceed401fe9913305f2362f7e26225d"/><file name="fam_monitor.gif" hash="f3bc806ff9d0907320b03018ba2d00ea"/><file name="fam_newspaper.gif" hash="9e5fee06a543742045118a95f2debcb8"/><file name="fam_newspaper_delete.gif" hash="41acabfc19102be92d3ccbc66d1fede3"/><file name="fam_newspaper_error.gif" hash="009bfa425298e1d2e44e38e58cd97938"/><file name="fam_newspaper_go.gif" hash="eb43105f8e13e3a752d7ca33bb086831"/><file name="fam_package.gif" hash="bf9be09ef64d006455baa211b7c03983"/><file name="fam_package_go.gif" hash="e4f8d380c2f8e5a7345e360293433764"/><file name="fam_page_white.gif" hash="26940eb67826c5af72b6048c7c5a8335"/><file name="fam_page_white_edit.gif" hash="a4f88300b74ad592a5c47ed54ff07af9"/><file name="fam_rainbow.gif" hash="e8b04cc945b3582a181d4ddbc2d2325f"/><file name="fam_refresh.gif" hash="01bbef614023c0890812e76bc7ecf7e0"/><file name="fam_server_database.gif" hash="7901fa06ffd68ed730cf43bb560756fd"/><file name="fam_status_online.gif" hash="a80019ffa3a573f709772ed1099343fc"/><file name="fam_tag_orange.gif" hash="6ce735a0e590bda040b6e1614c42e58a"/><file name="fam_user.gif" hash="63bbdd6d9d7a27591907a7b87898e259"/><file name="fam_user_comment.gif" hash="014dfd31d9af40e3d5960b2b0d900da3"/><file name="fam_user_edit.gif" hash="f5b36e803060c6b82e639a4fad57b9f7"/><file name="filter_row_bg.gif" hash="013a0929a7b2ddc6823bdda17d08acc0"/><file name="footer_bg.gif" hash="7724711d3ca07a5e46a6030e86743a71"/><file name="gift-message-collapse.gif" hash="5b710f5faa9c7352a39c10e3ebbee6fc"/><file name="gift-message-expand.gif" hash="fd53a70cbb1ea048754657a63787e9cb"/><file name="gift-message-grid-column-bg.gif" hash="97a8a9b8cc4ab68e7404ccf1320f50a6"/><file name="grid-cal.gif" hash="b1468e5239504974c689eea5d93f86d4"/><file name="grid_sort_asc.gif" hash="b78c3a1a27ac9672a31b7d1bbac60322"/><file name="grid_sort_desc.gif" hash="d958b946eba3dba863d724530a0dba1a"/><file name="grid_th_bg.gif" hash="8f4349fac728858374e17edf03390977"/><file name="grid_th_onclick_bg.gif" hash="7bf331e2a41e5331c4210bdc6adc4383"/><file name="grouped_to_order_icon.png" hash="4bdae9a6199655027b8b8aeee8f80ce4"/><file name="header_bg.gif" hash="cbe510856afa5cb0c32642c1f9a8eceb"/><file name="header_top_bg.gif" hash="8440b04c5cb6b1451bb886bfbef260a5"/><file name="horiz_tabs_ul_bg.gif" hash="58dbd9c45f76993346c2bb788896248e"/><file name="i_notice.gif" hash="ebd56dc80b8346e10e93628bc0e6c372"/><file name="i_question-mark.png" hash="23201b7ac207eebd9be0776ea44098a4"/><file name="ico_success.gif" hash="0afb20898a704a106cb4c598868abf32"/><file name="icon-enabled.png" hash="5fa7c06b312cbea3675e844686e434af"/><file name="icon-tooltip.png" hash="5767601cd66b23d0b6fe8defc10dd48d"/><file name="icon_btn_add.gif" hash="7300097305b577ee564dc49102822d16"/><file name="icon_btn_back.gif" hash="89ed97cede3f68241446a62c96e3ce4c"/><file name="icon_btn_delete.gif" hash="dbde0b76d36cfd624bf0de166d0a265e"/><file name="icon_btn_save.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="icon_edit_address.gif" hash="d1ca2bb3a5c86afd379f25d9fc4352e3"/><file name="icon_export.gif" hash="9a13f20c6a17b41b9c357545c2da5636"/><file name="icon_export.png" hash="fb299dd13df666516eabe16f59193383"/><file name="icon_feed.gif" hash="0366583ed6e285d028442fcdebb05072"/><file name="icon_feed.png" hash="8537f6f88fcff4aac793247143d14e42"/><file name="icon_note_list.gif" hash="8d25ba225ca09b687a78bff510df5d10"/><file name="icon_remove_address.gif" hash="2de2b3d02c19adfb93e9e43a392db178"/><file name="login_box_bg.gif" hash="e4654826eaa8d5ebc0ab18e9bee71e1d"/><file name="login_box_bg.jpg" hash="404e37f4ee9f4ff9bfcb638741c7581d"/><file name="login_box_bg_auth.jpg" hash="d90a81db1064ec37b0cc92436725c24b"/><file name="login_box_bottom.jpg" hash="038f15261e74bc381484f2fcfa45a73b"/><file name="login_box_legal_bg.gif" hash="528ac4dd480c4fc00ac808bf17394c05"/><file name="login_logo.gif" hash="9cc90e7aa1210883000fe5319862ce14"/><file name="logo-large.gif" hash="5c77654c424b0a35cc24d28df5166dc4"/><file name="logo.gif" hash="c7e9f290d965f707e4c4a61bfdab58cb"/><file name="massaction_bg.gif" hash="8b5f4db3ab3ea09cd5bd0164d67c4f0d"/><file name="massaction_button_bg.gif" hash="4c8262817e48d007237124ce0e7f4d18"/><file name="massaction_links_delimiter.gif" hash="9a0337183b5b67c0eed75993d7f14d10"/><file name="middle_bg.gif" hash="ba4f176d2c553201ebab4aba5c6d3d20"/><file name="more_arrow.gif" hash="38bb4c0e9270250151486d0bb36c476f"/><file name="nav1_active.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_bg.gif" hash="a1d4ef5b590ce0a425dc04e45ed06cbe"/><file name="nav1_off.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav1_on.gif" hash="a7f9ec7689a65c6b796f0d9b97582d01"/><file name="nav1_over.gif" hash="2c70d6175f1c965c27dda0598a67e63c"/><file name="nav1_sep.gif" hash="5286cbd5ac9ec1b6c027d5b48a74bdab"/><file name="nav2_last_li_bg.png" hash="279935c9799679fc5894337eaabc7cf0"/><file name="nav2_last_li_over_bg.png" hash="39536f00824293d11242888a76f40a5f"/><file name="nav2_li_bg.gif" hash="0a4f34b0e4436c519d31203f19503b83"/><file name="nav2_li_bg.png" hash="2fad219d162324e9a19f2745d5b6d562"/><file name="nav2_li_over_bg.png" hash="dc37c4a4aab40ea2ae44dea5ea133a9d"/><file name="nav2_link_bg.gif" hash="dce00ddad351e72e83bc87274cbaa54a"/><file name="nav2_parent_arrow.gif" hash="60e012a14a077bd2257343facc369c0c"/><file name="nav3_bg.png" hash="2bc7af80ad8886013da38401b63ab6df"/><file name="nav_bg.gif" hash="1b857c7d35f35ef9f6cae9e03a4e3dff"/><file name="nav_list_bg.gif" hash="7a4e2bdb887c12d8a1152bbcc8c02a3c"/><file name="nav_nest_link_bg.gif" hash="1d0c6b374bf02ac4b5aa012955c431de"/><file name="nav_nest_link_over_bg.gif" hash="fae3c579a4d432503b1f4f929d070609"/><file name="nav_on_bg.gif" hash="ac624b580cae5a76f6c92abc5a44191d"/><file name="nav_parent_arrow.gif" hash="3a95559263e569dc1c8065cb2d9b3f2c"/><file name="note_bg.gif" hash="105967d7c15ab4610726eea52d862a97"/><file name="note_cell_bg.gif" hash="71e656d42f8ba8c2d477c6866c499b71"/><file name="note_msg_icon.gif" hash="e774ee481a2820789c1a77112377c4e0"/><file name="notice-msg.png" hash="9cd1dfebccec8a2123d543fa49b17bd7"/><file name="pager_arrow_left.gif" hash="6e44f608dac8eb8be1d1ebee5a3285aa"/><file name="pager_arrow_left_off.gif" hash="30f5e56195ab3546b36f4016db5254be"/><file name="pager_arrow_right.gif" hash="cc79526156b7e0c8abce61fad3d53f77"/><file name="pager_arrow_right_off.gif" hash="f01b7dad9acf0180b5c62edbd7ea9939"/><dir name="paypal"><file name="logo-paypal.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="pp-allinone.png" hash="c457fe4bfe28a18c90d0abd36fe3f880"/><file name="pp-alt.png" hash="c262d332b342a2f4063cd82a61d11107"/><file name="pp-gateways.png" hash="90acb72c2f46fa131351efe0492d52cf"/><file name="pp-uk.png" hash="e0830ccb14533051b8b0340471744228"/></dir><file name="paypal_logo.gif" hash="871e205a64292121f4c893373acfb581"/><file name="paypal_section.png" hash="d032551b47e48dced277c4fa344ac7f6"/><file name="paypal_tick.gif" hash="e8685c1fb7c4c106ae4fd24e9bbf5a27"/><dir name="placeholder"><file name="thumbnail.jpg" hash="5c73b5aa515b1719f7b398f5131f91a8"/></dir><file name="process_spinner.gif" hash="345b30b4d0b6088d0151ecfbdf48c036"/><file name="product_rating_blank_star.gif" hash="5e20a299c0ff16168be38b6dde580eda"/><file name="product_rating_full_star.gif" hash="dd5aae332178d928a7f49dea7691b5f6"/><file name="reload.png" hash="84cc4883f78ef850814ea9b53989b2a7"/><file name="rule-ajax-loader.gif" hash="32dc1f5901143d36fbd7a6df3950819f"/><file name="rule_chooser_trigger.gif" hash="9c498e789c3ce734f5301c2475e2a04c"/><file name="rule_component_add.gif" hash="7914e57701ca26f5c8bf23c6bc3e1f25"/><file name="rule_component_apply.gif" hash="3f9b9025551da6963a9ecf8d184a204a"/><file name="rule_component_remove.gif" hash="4d785bcecfbe716fa4d749d20738a8f0"/><file name="save_btn_icon.gif" hash="f5da95ac65efff5f5cf9c8830202764d"/><file name="sec_nav_bg.gif" hash="99c6741591cdb2a2a128668a1d32d668"/><file name="section_menu_bg.gif" hash="f9edd44c92743a0c9ae9535a7992d6b1"/><file name="section_menu_bottom.gif" hash="167d2ef46ff80158c807b4b916501b28"/><file name="section_menu_link_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="section_menu_link_over_bg.gif" hash="7da7e56567633aab279cf3aec6f49d8d"/><file name="section_menu_over_span_bg.gif" hash="f5ea5292f15ed62b99f0f51d9fff2c66"/><file name="section_menu_span_bg.gif" hash="dbf3916358e794ee809b4cf33903af2c"/><file name="section_menu_ul_bg.gif" hash="3aea6e5452f548438ca34e17954a9d6b"/><file name="side_col_bg.gif" hash="b3691fd62663457af39eaf71dd8cda5a"/><file name="simple_container_bg.gif" hash="56f1ac91169eb4896b8c91384fc8bf15"/><file name="sort-arrow-down.gif" hash="fc2cd9f756ce510c4470478d720f81cd"/><file name="sort-arrow-down.png" hash="dc65160d9d4d6cdd6bfe1b397a931975"/><file name="sort-arrow-up.gif" hash="39026b0ff1f0c18091caa60384491163"/><file name="sort-arrow-up.png" hash="da54e5306bdce67551aa415f5d7f7ea7"/><file name="sort_heading_bg.gif" hash="6066d09f237f556b0a4770e4788e7598"/><file name="sort_on_bg.gif" hash="0cb36788ed4fbf19e657acbc75a3f1b8"/><file name="sort_row_bg.gif" hash="f2e1c5cb26b9f5211419b99d30745244"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><file name="sub_button_bg.gif" hash="e3f66dd60510f9f7e937e2e55442c30a"/><file name="success-msg.png" hash="c64cb2acc3d0eeba48fdea83620913ed"/><file name="success_msg_icon.gif" hash="834dfafd5f8b44c4b24a4c00add56fcf"/><file name="tabs_link_bg.gif" hash="34447929f5e6591ba9b5795b983fdfd4"/><file name="tabs_link_over_bg.gif" hash="2cf3f56884096055fb0bdf9474f280c9"/><file name="tabs_span_bg.gif" hash="bcabd4fea0d67b181f21779564c2284b"/><file name="tag_blue_edit.gif" hash="b2163ac3baf7d822b48593342846645a"/><file name="tn_cancel_bg.gif" hash="fcb3506858fcfa8d1778b0683dc89f54"/><file name="tooltip_bg.gif" hash="0aa4b866fc067a75f27ab749c1dabf74"/><file name="tooltip_corner.gif" hash="71146534671d5e0751505640b7c59859"/><file name="tooltip_top.gif" hash="032ff52a6ff5714cbdf6c1f62abaf7e5"/><dir name="tree_icons"><file name="join.gif" hash="4d5d614e0da056df815a4306d6368692"/><file name="joinbottom.gif" hash="4b3daa7f2cc584f1aac0d142275d7cba"/><file name="line.gif" hash="63ab38a6203262f15ca46c631232ea2c"/><file name="minus.gif" hash="d647fbbd0ec410b8f3bb3357b62eedcf"/><file name="minusbottom.gif" hash="b09d684cca7135ef728141aaf2464baa"/><file name="nolines_minus.gif" hash="eb2243a354ffcfac93ba0fe948f7167d"/><file name="nolines_plus.gif" hash="ec92b634b63608fb4b0dbf114e3b89e1"/></dir><file name="validation_advice_bg.gif" hash="b85432906de8985a8b14eeb2dc652d3c"/><file name="varien_logo.gif" hash="6f10d0fe572cb012947c164217e9e428"/><file name="warning_msg_icon.gif" hash="4cf6ec7f59ab09f9c18b3a4301714c6d"/><dir name="widget"><file name="catalog__category_widget_link.gif" hash="8435943009f1f774bbd6a4809c719eb8"/><file name="catalog__product_widget_link.gif" hash="62f2d7020143f98ba7514469eb612a7f"/><file name="catalog__product_widget_new.gif" hash="37a5af9f98ae73e180ad0cca05c95324"/><file name="cms__widget_block.gif" hash="b7b0b1517cc38b18b92841b33b312190"/><file name="cms__widget_page_link.gif" hash="b839dee210e61850a5858cc8634cbccd"/><file name="default.gif" hash="684143ae5531aa6ba22215f4fadeea6c"/><file name="reports__product_widget_compared.gif" hash="bd3e5a5015eb2c5c64f1d11835166dc4"/><file name="reports__product_widget_viewed.gif" hash="44d5cd71e4fb7235f9cff0c7e2b2f531"/></dir><file name="widget_placeholder.gif" hash="2bd8d72cf12f8d7d0a6a3268f97786ff"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/><file name="window_content.png" hash="08361df29783d46a2493cf0d8ad733a7"/><file name="window_top.png" hash="555a8db5efa3a252c2ead3d3dadd1075"/><dir name="wysiwyg"><file name="skin_image.png" hash="a521b0c60b001de4a3405e73c4a6cd4a"/></dir></dir><dir name="lib"><dir name="prototype"><dir name="windows"><dir name="themes"><dir name="magento"><file name="btn_bg.gif" hash="37c51a4d48a92da9648dcd3ca011039f"/><file name="content_bg.gif" hash="21278ea0da2d4256f4ced96b6080ba2e"/><file name="top_bg.gif" hash="26f28090de87d64f9b01bf624f89bfe2"/><file name="window_close.png" hash="3af14f053f360bf31f8ba2df73ec7f1e"/></dir><file name="magento.css" hash="a0b153cee7655dad31ee2923657cc08a"/></dir></dir></dir></dir><dir name="media"><file name="editor.swf" hash="259afd515d7b2edee76f67973fea95a6"/><file name="flex.swf" hash="60a8c242ca2ff0e70ed9a038749f4cc1"/><file name="uploader.swf" hash="1c300001dadd932ef6e33a2fadf941e1"/><file name="uploaderSingle.swf" hash="304dd960698c5786dcd64b0e138f80ca"/></dir><file name="menu.css" hash="6f39c760b70b8250c193c5311885193a"/><file name="oauth-simple.css" hash="c8ba6fccc85ce28f4360b10b5b59adb9"/><file name="print.css" hash="db77a54f0e6a7146cad6566eb200a0d5"/><file name="reset.css" hash="d45948716e2dd828a40715b9a43e2115"/></dir></dir></dir></target></contents>
16	<compatible/>
17	+ <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Mage_Core_Adminhtml</name><channel>community</channel><min>1.8.1.0</min><max>1.9.0.0</max></package><package><name>Lib_Js_Ext</name><channel>community</channel><min>1.7.0.0</min><max>1.8.1.0</max></package></required></dependencies>
18	</package>

skin/adminhtml/default/default/boxes.css CHANGED Viewed

	@@ -1025,7 +1025,8 @@ ul.item-options li { padding-left:.7em; }
1025	.x-tree-node { margin:0 !important; }
1026	.x-tree-node .leaf .x-tree-node-icon { background-image:url(images/fam_leaf.png); }
1027	.x-tree-node .system-leaf .x-tree-node-icon { background-image:url(images/fam_application_form_delete.png); }
1028	- ~~.x-tree-node-ct { overflow:hidden; }~~

1029
1030	/* Product - Websites */
1031	.website-name .checkbox { vertical-align:top; margin-top:2px; }
	@@ -1601,6 +1602,7 @@ ul.super-product-attributes { padding-left:15px; }
1601	/* Font */
1602	.bold { font-weight:bold !important; }
1603	.normal { font-weight:normal !important; }

1604
1605	/* Clear / / This keeps our HTML free of buncha clearing elements */
1606	.config-heading:after,


1025	.x-tree-node { margin:0 !important; }
1026	.x-tree-node .leaf .x-tree-node-icon { background-image:url(images/fam_leaf.png); }
1027	.x-tree-node .system-leaf .x-tree-node-icon { background-image:url(images/fam_application_form_delete.png); }
1028	+
1029	+ .adminhtml-catalog-category-edit .x-tree-node-ct { overflow: visible; }
1030
1031	/* Product - Websites */
1032	.website-name .checkbox { vertical-align:top; margin-top:2px; }

1602	/* Font */
1603	.bold { font-weight:bold !important; }
1604	.normal { font-weight:normal !important; }
1605	+ .strike { text-decoration: line-through; }
1606
1607	/* Clear / / This keeps our HTML free of buncha clearing elements */
1608	.config-heading:after,

Interface_Adminhtml_Default - Version 1.8.1.0

Version Notes

Release Info

Code changes from version 1.8.0.0 to 1.8.1.0