[DEL] document_directory_id

sunflowerit · Jun 13, 2019 · 6b8e2ca · 6b8e2ca
1 parent 5ba802d
commit 6b8e2ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/base_delivery_carrier_files/__manifest__.py b/base_delivery_carrier_files/__manifest__.py
@@ -20,10 +20,7 @@
         'wizards/generate_carrier_files_view.xml',
         'security/ir.model.access.csv'
     ],
-    'summary': """
-Base module for creation of carrier files (La Poste, TNT Express Shipper, ...).
-Files are exported as text (csv, ...).
-""",
+    'summary': 'Base module for creation of delivery carrier files',
     'images': [],
     'installable': True,
     'auto_install': False,

diff --git a/base_delivery_carrier_files_document/__manifest__.py b/base_delivery_carrier_files_document/__manifest__.py
@@ -3,11 +3,11 @@
 # Author: Guewen Baconnier
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
-    'name': 'Base module for picking carrier files creation for document',
+    'name': 'Store carrier files as attachments',
     'version': '10.0.1.0.0',
     'category': 'Generic Modules/Warehouse',
     'summary': """
-Allow to store the carrier files in a Document directory.
+Allow to store carrier files as attachments.
 Auto-install when the module Document and
 Base Delivery Carrier Files are installed.
     """,
@@ -18,13 +18,9 @@
         'base_delivery_carrier_files',
         'document'
     ],
-    'data': [
-        'views/carrier_file_view.xml'
-    ],
     'demo': [
         'demo/carrier_file_demo.xml'
     ],
-    'images': [],
     'installable': True,
     'auto_install': True,
 }
diff --git a/base_delivery_carrier_files_document/models/delivery_carrier_file.py b/base_delivery_carrier_files_document/models/delivery_carrier_file.py
@@ -18,14 +18,11 @@ def get_write_mode_selection(self):
             res.append(('document', 'Document'))
         return res
 
-    document_directory_id = fields.Many2one('document.directory')
-
     @api.model
     def _prepare_attachment(self, carrier_file, filename, file_content):
         return {'name': "%s_%s" % (carrier_file.name, filename),
                 'datas_fname': filename,
                 'datas': base64.encodestring(file_content),
-                'parent_id': carrier_file.document_directory_id.id,
                 'type': 'binary'}
 
     @api.multi

diff --git a/base_delivery_carrier_files_document/tests/test_base_delivery_carrier_files_document.py b/base_delivery_carrier_files_document/tests/test_base_delivery_carrier_files_document.py
@@ -10,14 +10,11 @@ class CarrierFilesDocumentTest(TransactionCase):
 
     def test_carrier_file_generation(self):
         """ Test carrier file generation """
-        # I set the system tempfile on the carrier file configuration
-        # to be sure the path will be writable
         carrier_file = self.env.ref(
             'base_delivery_carrier_files.delivery_carrier_file')
-        carrier_file.write({
-            'document_directory_id': self.env.ref('document.dir_root').id,
-            'write_mode': 'document'
-        })
+
+        # Save as attachment
+        carrier_file.write({'write_mode': 'document'})
 
         # I set the carrier file configuration on the carrier
         # 'Free delivery charges'
@@ -53,14 +50,11 @@ def test_carrier_file_generation(self):
 
     def test_manual_carrier_file_generation(self):
         """ Test manual carrier file generation """
-        # I set the system tempfile on the carrier file configuration
-        # to be sure the path will be writable
         carrier_file = self.env.ref(
             'base_delivery_carrier_files.delivery_carrier_file_manual')
-        carrier_file.write({
-            'document_directory_id': self.env.ref('document.dir_root').id,
-            'write_mode': 'document'
-        })
+
+        # Save as attachment
+        carrier_file.write({'write_mode': 'document'})
 
         # I set the carrier file configuration on the carrier
         # 'Free delivery charges'