Search:
Login
Help/Guide
About Trac
Preferences
Wiki
Browse Source
View Tickets
Search
Timeline
Roadmap
Context Navigation
←
Previous Change
Next Change
→
Changeset
22736
for
branches/version-2_13-dev
Timestamp:
2013/03/15 19:12:17 (
11 years
ago)
Author:
h_yoshimoto
Message:
#2193
税率チームのコミットをマージ(from camp/camp-2_13-tax)
Location:
branches/version-2_13-dev
Files:
21 edited
6 copied
.
(modified)
(
view diffs
)
data/Smarty/templates/admin/basis/index.tpl
(modified)
(
view diffs
)
data/Smarty/templates/admin/basis/subnavi.tpl
(modified)
(
view diffs
)
data/Smarty/templates/admin/basis/tax.tpl
(copied)
(copied from
branches/camp/camp-2_13-tax/data/Smarty/templates/admin/basis/tax.tpl
)
(
view diffs
)
data/Smarty/templates/admin/products/confirm.tpl
(modified)
(
view diffs
)
data/Smarty/templates/admin/products/product.tpl
(modified)
(
view diffs
)
data/Smarty/templates/admin/products/product_class.tpl
(modified)
(
view diffs
)
data/Smarty/templates/admin/products/product_class_confirm.tpl
(modified)
(
view diffs
)
data/Smarty/templates/default/cart/index.tpl
(modified)
(
view diffs
)
data/class/SC_CartSession.php
(modified)
(
view diffs
)
data/class/SC_Product.php
(modified)
(
view diffs
)
data/class/helper/SC_Helper_Customer.php
(modified)
(
view diffs
)
data/class/helper/SC_Helper_Purchase.php
(modified)
(
view diffs
)
data/class/helper/SC_Helper_TaxRule.php
(copied)
(copied from
branches/camp/camp-2_13-tax/data/class/helper/SC_Helper_TaxRule.php
)
(
view diffs
)
data/class/pages/admin/basis/LC_Page_Admin_Basis.php
(modified)
(
view diffs
)
data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php
(copied)
(copied from
branches/camp/camp-2_13-tax/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php
)
(
view diffs
)
data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
(modified)
(
view diffs
)
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
(modified)
(
view diffs
)
data/class/util/SC_Utils.php
(modified)
(
view diffs
)
data/class_extends/helper_extends/SC_Helper_TaxRule_Ex.php
(copied)
(copied from
branches/camp/camp-2_13-tax/data/class_extends/helper_extends/SC_Helper_TaxRule_Ex.php
)
(
view diffs
)
data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tax_Ex.php
(copied)
(copied from
branches/camp/camp-2_13-tax/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tax_Ex.php
)
(
view diffs
)
html/admin/basis/tax.php
(copied)
(copied from
branches/camp/camp-2_13-tax/html/admin/basis/tax.php
)
(
view diffs
)
html/install/index.php
(modified)
(
view diffs
)
html/install/sql/create_table_mysql.sql
(modified)
(
view diffs
)
html/install/sql/create_table_pgsql.sql
(modified)
(
view diffs
)
html/install/sql/drop_table.sql
(modified)
(
view diffs
)
html/install/sql/insert_data.sql
(modified)
(
view diffs
)
branches/version-2_13-dev
Property
svn:mergeinfo
changed
/branches/camp/camp-2_13-tax
(added)
merged:
22619-22621,22623-22624,22626,22628,22631,22636-22640,22642,22644,22651,22653,22666-22667,22669-22672,22686,22691,22693-22694,22696-22697,22700,22702,22705,22708-22709,22715-22718
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive