Skip to content

Commit 6b8e2ca

Browse files
author
Tom Blauwendraat
committed
[DEL] document_directory_id
1 parent 5ba802d commit 6b8e2ca

File tree

4 files changed

+9
-25
lines changed

4 files changed

+9
-25
lines changed

base_delivery_carrier_files/__manifest__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
'wizards/generate_carrier_files_view.xml',
2121
'security/ir.model.access.csv'
2222
],
23-
'summary': """
24-
Base module for creation of carrier files (La Poste, TNT Express Shipper, ...).
25-
Files are exported as text (csv, ...).
26-
""",
23+
'summary': 'Base module for creation of delivery carrier files',
2724
'images': [],
2825
'installable': True,
2926
'auto_install': False,

base_delivery_carrier_files_document/__manifest__.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Author: Guewen Baconnier
44
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
55
{
6-
'name': 'Base module for picking carrier files creation for document',
6+
'name': 'Store carrier files as attachments',
77
'version': '10.0.1.0.0',
88
'category': 'Generic Modules/Warehouse',
99
'summary': """
10-
Allow to store the carrier files in a Document directory.
10+
Allow to store carrier files as attachments.
1111
Auto-install when the module Document and
1212
Base Delivery Carrier Files are installed.
1313
""",
@@ -18,13 +18,9 @@
1818
'base_delivery_carrier_files',
1919
'document'
2020
],
21-
'data': [
22-
'views/carrier_file_view.xml'
23-
],
2421
'demo': [
2522
'demo/carrier_file_demo.xml'
2623
],
27-
'images': [],
2824
'installable': True,
2925
'auto_install': True,
3026
}

base_delivery_carrier_files_document/models/delivery_carrier_file.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ def get_write_mode_selection(self):
1818
res.append(('document', 'Document'))
1919
return res
2020

21-
document_directory_id = fields.Many2one('document.directory')
22-
2321
@api.model
2422
def _prepare_attachment(self, carrier_file, filename, file_content):
2523
return {'name': "%s_%s" % (carrier_file.name, filename),
2624
'datas_fname': filename,
2725
'datas': base64.encodestring(file_content),
28-
'parent_id': carrier_file.document_directory_id.id,
2926
'type': 'binary'}
3027

3128
@api.multi

base_delivery_carrier_files_document/tests/test_base_delivery_carrier_files_document.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ class CarrierFilesDocumentTest(TransactionCase):
1010

1111
def test_carrier_file_generation(self):
1212
""" Test carrier file generation """
13-
# I set the system tempfile on the carrier file configuration
14-
# to be sure the path will be writable
1513
carrier_file = self.env.ref(
1614
'base_delivery_carrier_files.delivery_carrier_file')
17-
carrier_file.write({
18-
'document_directory_id': self.env.ref('document.dir_root').id,
19-
'write_mode': 'document'
20-
})
15+
16+
# Save as attachment
17+
carrier_file.write({'write_mode': 'document'})
2118

2219
# I set the carrier file configuration on the carrier
2320
# 'Free delivery charges'
@@ -53,14 +50,11 @@ def test_carrier_file_generation(self):
5350

5451
def test_manual_carrier_file_generation(self):
5552
""" Test manual carrier file generation """
56-
# I set the system tempfile on the carrier file configuration
57-
# to be sure the path will be writable
5853
carrier_file = self.env.ref(
5954
'base_delivery_carrier_files.delivery_carrier_file_manual')
60-
carrier_file.write({
61-
'document_directory_id': self.env.ref('document.dir_root').id,
62-
'write_mode': 'document'
63-
})
55+
56+
# Save as attachment
57+
carrier_file.write({'write_mode': 'document'})
6458

6559
# I set the carrier file configuration on the carrier
6660
# 'Free delivery charges'

0 commit comments

Comments
 (0)