diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_documenteditor_main_app_controller_Main_js.js b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_documenteditor_main_app_controller_Main_js.js
index 4764e239050c68f4e35c223af5cf277a111b86ba..9e5a483ddd7541512e3e307cb5dd818e7431eb9b 100644
--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_documenteditor_main_app_controller_Main_js.js
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_documenteditor_main_app_controller_Main_js.js
@@ -885,9 +885,13 @@ define([
                 Common.Gateway.on('processmouse',           _.bind(me.onProcessMouse, me));
                 Common.Gateway.on('refreshhistory',         _.bind(me.onRefreshHistory, me));
                 Common.Gateway.on('save', function () {
+                    var g = Common.Gateway;
                     if (me.api.isDocumentModified()) {
                         me.api.asc_Save();
                     }
+                    if (g.props.save_defer) {
+                      g.props.save_defer.resolve(undefined);
+                    }
                 });
                 Common.Gateway.on('downloadas',             _.bind(me.onDownloadAs, me));
 
diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_documenteditor_main_app_controller_Main_js.xml b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_documenteditor_main_app_controller_Main_js.xml
index 971905ba9fb96be788880e545c9cfdd7da5fec48..ad80c0560d39c5ab5b9d860b7328f1c7f02284f0 100644
--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_documenteditor_main_app_controller_Main_js.xml
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_documenteditor_main_app_controller_Main_js.xml
@@ -220,7 +220,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>956.37205.45053.30037</string> </value>
+                <value> <string>961.31926.50683.29252</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -238,7 +238,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1486024275.69</float>
+                        <float>1503045227.0</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_presentationeditor_main_app_controller_Main_js.js b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_presentationeditor_main_app_controller_Main_js.js
index a9c9d1b781cb8fccbd6e419336e8c6aaaced688a..bea1a9c733b77d05466079174a66246bc39f8494 100644
--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_presentationeditor_main_app_controller_Main_js.js
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_presentationeditor_main_app_controller_Main_js.js
@@ -668,9 +668,13 @@ define([
                 Common.Gateway.on('processrightschange',    _.bind(me.onProcessRightsChange, me));
                 Common.Gateway.on('processmouse',           _.bind(me.onProcessMouse, me));
                 Common.Gateway.on('save', function () {
+                    var g = Common.Gateway;
                     if (me.api.isDocumentModified()) {
                         me.api.asc_Save();
                     }
+                    if (g.props.save_defer) {
+                      g.props.save_defer.resolve(undefined);
+                    }
                 });
                 Common.Gateway.on('downloadas',             _.bind(me.onDownloadAs, me));
                 
diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_presentationeditor_main_app_controller_Main_js.xml b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_presentationeditor_main_app_controller_Main_js.xml
index eff7370c94e1def50ff9c8a9c58bc97360f439e7..fad2437e65707afab280332b0e2374fdc6b050c9 100644
--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_presentationeditor_main_app_controller_Main_js.xml
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_presentationeditor_main_app_controller_Main_js.xml
@@ -220,7 +220,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>956.37205.45053.30037</string> </value>
+                <value> <string>961.31925.26684.9898</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -238,7 +238,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1486024308.4</float>
+                        <float>1503045344.71</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_spreadsheeteditor_main_app_controller_Main_js.js b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_spreadsheeteditor_main_app_controller_Main_js.js
index 1d5d068909c773eaa86f85284339be99efeb5615..a35b1f77283e057912aadfc7bdf3b9f1c19ab0c1 100644
--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_spreadsheeteditor_main_app_controller_Main_js.js
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_spreadsheeteditor_main_app_controller_Main_js.js
@@ -676,9 +676,13 @@ define([
                 Common.Gateway.on('processrightschange', _.bind(me.onProcessRightsChange, me));
                 Common.Gateway.on('processmouse', _.bind(me.onProcessMouse, me));
                 Common.Gateway.on('save', function () {
+                    var g = Common.Gateway;
                     if (me.api.asc_isDocumentModified()) {
                         me.api.asc_Save();
                     }
+                    if (g.props.save_defer) {
+                      g.props.save_defer.resolve(undefined);
+                    }
                 });
                 Common.Gateway.on('downloadas',   _.bind(me.onDownloadAs, me));
                 Common.Gateway.sendInfo({mode:me.appOptions.isEdit?'edit':'view'});
diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_spreadsheeteditor_main_app_controller_Main_js.xml b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_spreadsheeteditor_main_app_controller_Main_js.xml
index 647338cf4c7a9b0a10c30d9078fd4dd00734c00c..02815315d4ff5684ce7c7b0c5a024188d1d54669 100644
--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_spreadsheeteditor_main_app_controller_Main_js.xml
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_apps_spreadsheeteditor_main_app_controller_Main_js.xml
@@ -246,7 +246,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>958.18339.3430.47257</string> </value>
+                <value> <string>961.31905.4301.26982</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -264,7 +264,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1490605671.4</float>
+                        <float>1503044440.28</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_gadget_ooffice_js.js b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_gadget_ooffice_js.js
index 9edfd1c32a421dfcdc10cb79a2d634a6a8c60e82..0ec9a8cb87984f091dcf01eeec797932bcc92c0a 100644
--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_gadget_ooffice_js.js
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_gadget_ooffice_js.js
@@ -548,8 +548,10 @@ if (Common === undefined) {
         return save_defer.promise;
       })
         .push(function (data) {
-          var body = data[g.props.key];
-          return zip.putAttachment('/', 'body.txt', body);
+          if (data) {
+            var body = data[g.props.key];
+            return zip.putAttachment('/', 'body.txt', body);
+          }
         })
         .push(function () {
           return zip.getAttachment('/', '/');
diff --git a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_gadget_ooffice_js.xml b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_gadget_ooffice_js.xml
index a966fce8a7ddfd992821b1cf71b4a87325899cd7..eb89a67fad5d10e50bd01ca7cd49df5bcadd9540 100644
--- a/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_gadget_ooffice_js.xml
+++ b/bt5/erp5_officejs_ooffice/PathTemplateItem/web_page_module/ooffice_gadget_ooffice_js.xml
@@ -233,7 +233,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>961.660.18881.18705</string> </value>
+                <value> <string>961.10686.10882.5973</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -251,7 +251,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1501231192.91</float>
+                        <float>1503043242.86</float>
                         <string>UTC</string>
                       </tuple>
                     </state>