disabling option values ?

[xman888]

Thank you for all your help Kobra.

Yes, the files that are modified by Stock by Attributes:

admin/includes/stylesheet.css
admin/orders.php
includes/classes/order.php
includes/functions/functions_lookups.php
includes/modules/pages/checkout_shipping/header_php.php
includes/modules/pages/shopping_cart/header_php.php

The time zone offset mod has modified 2 of those files above:

admin/orders.php
includes/classes/order.php

So are these the 2 files that I need to merge ?

If that is the case, how do you actually merge them in Winmerge (as far as what do you press with WinMerge to merge the two sets of files) ?

Thanks,
Anthony

[kobra]

So are these the 2 files that I need to merge ?

If that is the case, how do you actually merge them in Winmerge (as far as what do you press with WinMerge to merge the two sets of files) ?

Unfortunately, it is not that automatic and like I stated you must review this line by line to see if either of these has altered the same lines of code as you can not normally combine a do this with a don't do this
Lines that are changed but different lines yu just highlight and paste then save...

Make sure to retain copies of all original files first in case