dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Preparing partial refund update

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11603 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fSerny committed 2011-12-22 14:01:05 +00:00
1 parent ac441b6ac9
commit ba041f3b20
2 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

install-dev/sql/upgrade/1.5.0.2.sql
+5 -1
View File
@@ -411,4 +411,8 @@ SET `position` = (
FROM `PREFIX_tab` FROM `PREFIX_tab`
WHERE `id_parent` = 0 WHERE `id_parent` = 0
) )
WHERE `class_name` = 'AdminAccounting'; WHERE `class_name` = 'AdminAccounting';
ALTER TABLE `PREFIX_order_slip_detail` CHANGE `amount` `amount_tax_excl` DECIMAL( 10, 2 ) NOT NULL;
ALTER TABLE `PREFIX_order_slip_detail` ADD COLUMN `amount_tax_incl` DECIMAL(10,2) NOT NULL AFTER `amount_tax_excl`;
js/admin_order.js
+2 -2
View File
@@ -768,7 +768,7 @@ function init()
var flagRefund = ''; var flagRefund = '';
$(document).ready(function() { $(document).ready(function() {
$('.standard_refund').click(function() { $('#desc-order-standard_refund').click(function() {
$('.cancel_product_change_link:visible').trigger('click'); $('.cancel_product_change_link:visible').trigger('click');
closeAddProduct(); closeAddProduct();
@@ -791,7 +791,7 @@ $(document).ready(function() {
return false; return false;
}); });
$('.partial_refund').click(function() { $('#desc-order-partial_refund').click(function() {
$('.cancel_product_change_link:visible').trigger('click'); $('.cancel_product_change_link:visible').trigger('click');
closeAddProduct(); closeAddProduct();