diff --git a/stock_transport_management/README.rst b/stock_transport_management/README.rst index aeb9a8516..b7160f6dc 100644 --- a/stock_transport_management/README.rst +++ b/stock_transport_management/README.rst @@ -5,7 +5,9 @@ This module was developed to manage the stock .It helps to track transportation Installation ============ -You need **report_xlsx** to install this module. +You need 'report_xlsx' module to install this module. +Make sure you have xlsxwriter Python module installed: +$ pip install xlsxwriter Configuration ============= diff --git a/stock_transport_management/__manifest__.py b/stock_transport_management/__manifest__.py index c9e422924..24d32a6a7 100644 --- a/stock_transport_management/__manifest__.py +++ b/stock_transport_management/__manifest__.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- { 'name': "Stock Transport Management", - 'version': '10.0.1.0.0', + 'version': '10.0.2.0.0', 'summary': """Manage Stock Transport Management With Ease""", 'description': """This Module Manage Transport Management Of Stocks""", 'author': "Cybrosys Techno Solutions", 'company': 'Cybrosys Techno Solutions', 'website': "https://www.cybrosys.com", 'category': 'Tools', - 'depends': ['base', 'sale', 'stock', 'report'], + 'depends': ['base', 'sale', 'stock', 'report_xlsx'], 'data': [ 'views/transport_vehicle_view.xml', 'views/transport_vehicle_status_view.xml', @@ -22,4 +22,4 @@ 'installable': True, 'auto_install': False, 'application': False, -} \ No newline at end of file +} diff --git a/stock_transport_management/__manifest__.py~ b/stock_transport_management/__manifest__.py~ new file mode 100644 index 000000000..c52dc8403 --- /dev/null +++ b/stock_transport_management/__manifest__.py~ @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +{ + 'name': "Stock Transport Management", + 'version': '10.0.1.0.0', + 'summary': """Manage Stock Transport Management With Ease""", + 'description': """This Module Manage Transport Management Of Stocks""", + 'author': "Cybrosys Techno Solutions", + 'company': 'Cybrosys Techno Solutions', + 'website': "https://www.cybrosys.com", + 'category': 'Tools', + 'depends': ['base', 'sale', 'stock', 'report_xlsx'], + 'data': [ + 'views/transport_vehicle_view.xml', + 'views/transport_vehicle_status_view.xml', + 'views/transportation_sale_order_view.xml', + 'views/transport_warehouse_view.xml', + 'views/transport_wizard_view.xml', + 'views/transport_report.xml', + ], + 'images': ['static/description/banner.jpg'], + 'license': 'LGPL-3', + 'installable': True, + 'auto_install': False, + 'application': False, +} \ No newline at end of file diff --git a/stock_transport_management/report/transport_xlsx.py b/stock_transport_management/report/transport_xlsx.py index ed6e3da49..eacf8e184 100644 --- a/stock_transport_management/report/transport_xlsx.py +++ b/stock_transport_management/report/transport_xlsx.py @@ -55,17 +55,12 @@ class TransportReportXls(ReportXlsx): if date_end: sheet.write('C5', "Date To :", format3) sheet.write('C6', date_end, format4) - sheet.write('A8', "Vehicle Name ", format2) - sheet.write('B8', "", format2) - sheet.write('C8', "Date", format2) - sheet.write('D8', "", format2) - sheet.write('E8', "Sale Order", format2) - sheet.write('F8', "", format2) - sheet.write('G8', "Delivery Order", format2) - sheet.write('H8', "", format2) - sheet.write('I8', "No of Parcels", format2) - sheet.write('J8', "", format2) - sheet.write('K8', "Status", format2) + sheet.merge_range('A8:B8', "Vehicle Name ", format2) + sheet.merge_range('C8:D8', "Date", format2) + sheet.merge_range('E8:F8', "Sale Order", format2) + sheet.merge_range('G8:H8', "Delivery Order", format2) + sheet.merge_range('I8:J8', "No of Parcels", format2) + sheet.merge_range('K8', "Status", format2) if date_start and date_end: report_obj = self.env['vehicle.status'].search([('transport_date', ">=", date_start) and ('transport_date', "<=", date_end)]) @@ -74,11 +69,11 @@ class TransportReportXls(ReportXlsx): row_number = 9 col_number = 0 for values in report_obj: - sheet.write(row_number, col_number, values['name'], format3) - sheet.write(row_number, col_number + 2, values['transport_date'], format3) - sheet.write(row_number, col_number + 4, values['sale_order'], format3) - sheet.write(row_number, col_number + 6, values['delivery_order'], format3) - sheet.write(row_number, col_number + 8, values['no_parcels'], format3) + sheet.merge_range(row_number, col_number, row_number, col_number + 1, values['name'], format3) + sheet.merge_range(row_number, col_number + 2, row_number, col_number + 3, values['transport_date'], format3) + sheet.merge_range(row_number, col_number + 4, row_number, col_number + 5, values['sale_order'], format3) + sheet.merge_range(row_number, col_number + 6, row_number, col_number + 7, values['delivery_order'], format3) + sheet.merge_range(row_number, col_number + 8, row_number, col_number + 9, values['no_parcels'], format3) sheet.write(row_number, col_number + 10, values['state'], format3) row_number += 1 diff --git a/stock_transport_management/views/transport_vehicle_view.xml b/stock_transport_management/views/transport_vehicle_view.xml index 2bce8787b..fa240f4ec 100644 --- a/stock_transport_management/views/transport_vehicle_view.xml +++ b/stock_transport_management/views/transport_vehicle_view.xml @@ -11,8 +11,9 @@