Changeset 18531 for branches/version-2_4/html/user_data

Timestamp:

2010/02/02 12:44:45 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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:

[email protected]

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 [email protected]
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:

• branches/version-2_4/html/user_data/packages/default/js/site.js (modified) (1 diff)

branches/version-2_4/html/user_data/packages/default/js/site.js

@@ -127 +127 @@
         }
         break;
+    case 'delete_order':
+        if(!window.confirm('在庫数は手動で戻してください。\n一度削除したデータは、元に戻せません。\n削除しても宜しいですか？')){
+            return;
+        }
+        break;
     case 'confirm':
         if(!window.confirm('登録しても宜しいですか')){