Ignore:
Timestamp:
2010/02/02 12:44:45 (11 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100202031442-uhsr1elsbcg0adn4
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/default/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/Smarty/templates/default/admin/order/index.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Findex.tpl
data/Smarty/templates/default/admin/order/status.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fstatus.tpl
html/user_data/packages/default/js/site.js 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fjs%2Fsite.js
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100202034440-4y5fjdlxcdtq62zs
bzr:revno:
1901
bzr:revprop:branch-nick:
branches/version-2_4
bzr:root:
branches/version-2_4
bzr:text-parents:

data/Smarty/templates/default/admin/order/edit.tpl ohkouchi@loop-az.jp-20100202021053-53f6wpklom2hsuoe
data/Smarty/templates/default/admin/order/index.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18131
data/Smarty/templates/default/admin/order/status.tpl svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4:18115
html/user_data/packages/default/js/site.js svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/feature-module-update:16708
bzr:timestamp:
2010-02-02 12:44:40.319000006 +0900
bzr:user-agent:
bzr2.0.4+bzr-svn1.0.1
svn:original-date:
2010-02-02T03:44:40.319000Z
Message:

merged r18491

  • 受注キャンセル時, 受注削除時の注意文言を追加(#589, #590)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4/data/Smarty/templates/default/admin/order/edit.tpl

    r18527 r18531  
    169169                                    <option value="">選択してください</option> 
    170170                                    <!--{html_options options=$arrORDERSTATUS selected=$arrForm[$key].value}--> 
    171                                     </select> 
     171                                    </select><br /> 
     172                                    <!--{if $smarty.get.mode != 'add'}--> 
     173                                    <span class="red12">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->に変更時には、在庫数を手動で戻してください。</span> 
     174                                    <!--{/if}--> 
    172175                                </td> 
    173176                            </tr> 
Note: See TracChangeset for help on using the changeset viewer.