C

app/routes/invoices.py

@@ -11,6 +11,7 @@ from app.db.database import get_db
 from app.schemas.invoice import InvoiceCreate, InvoiceResponse
 from app.db.models import Invoice, InvoiceItem
 from app.services.invoice_service import InvoiceService
+from app.services.excel_service import ExcelService
 
 # Set up logging
 logger = logging.getLogger(__name__)
@@ -142,6 +143,48 @@ async def generate_invoice_pdf(
         logger.error(f"Error generating PDF: {str(e)}", exc_info=True)
         raise HTTPException(status_code=500, detail=str(e))
 
+@router.post("/{invoice_id}/generate-excel")
+async def generate_invoice_excel(
+    invoice_id: int,
+    request: Request,
+    db: AsyncSession = Depends(get_db)
+):
+    try:
+        logger.info(f"Starting Excel generation for invoice ID: {invoice_id}")
+        logger.info(f"Request from IP: {request.client.host}")
+        
+        result = await db.execute(
+            select(Invoice)
+            .options(selectinload(Invoice.items))
+            .filter(Invoice.id == invoice_id)
+        )
+        invoice = result.scalar_one_or_none()
+        
+        if not invoice:
+            logger.error(f"Invoice not found: {invoice_id}")
+            raise HTTPException(status_code=404, detail="Invoice not found")
+        
+        logger.info(f"Found invoice: {invoice.invoice_number}")
+        logger.info(f"Client: {invoice.client_name}")
+        logger.info(f"Number of items: {len(invoice.items)}")
+            
+        logger.info("Starting Excel file generation")
+        excel_bytes = ExcelService.generate_excel(invoice)
+        logger.info("Excel file generated successfully")
+        
+        filename = f"devis_{invoice.invoice_number}.xlsx"
+        logger.info(f"Sending Excel file: {filename}")
+        
+        return StreamingResponse(
+            iter([excel_bytes]),
+            media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+            headers={"Content-Disposition": f"attachment; filename={filename}"}
+        )
+    except Exception as e:
+        logger.error(f"Error generating Excel for invoice {invoice_id}: {str(e)}", exc_info=True)
+        logger.error("Stack trace:", exc_info=True)
+        raise HTTPException(status_code=500, detail=str(e))
+
 @router.get("/last-number/{client_type}", response_model=dict)
 async def get_last_invoice_number(
     client_type: str,

app/services/excel_service copy 2.py

@@ -0,0 +1,205 @@
+from openpyxl import Workbook
+from openpyxl.styles import Font, Alignment, Border, Side, PatternFill
+from openpyxl.utils import get_column_letter
+from io import BytesIO
+from app.db.models import Invoice
+import logging
+import os
+import datetime
+
+# Set up logging
+logger = logging.getLogger(__name__)
+
+class ExcelService:
+    @staticmethod
+    def generate_excel(data: Invoice) -> bytes:
+        try:
+            wb = Workbook()
+            ws = wb.active
+            ws.title = "Devis"
+
+            # Constants - Match PDF colors and dimensions
+            HEADER_BLUE = "4A739B"  # Match PDF's HEADER_BLUE
+            WHITE = "FFFFFF"
+            BLACK = "000000"
+            STANDARD_FONT_SIZE = 11
+            
+            # Helper function for cell styling
+            def style_cell(cell, bold=False, color=BLACK, bg_color=None, size=STANDARD_FONT_SIZE, wrap_text=False, align='center'):
+                cell.font = Font(bold=bold, color=color, size=size)
+                cell.alignment = Alignment(horizontal=align, vertical='center', wrap_text=wrap_text)
+                if bg_color:
+                    cell.fill = PatternFill(start_color=bg_color, end_color=bg_color, fill_type="solid")
+
+            # Set fixed column widths to match PDF
+            column_widths = {
+                'A': 40,  # Description
+                'B': 15,  # Unité
+                'C': 15,  # NBRE
+                'D': 15,  # ML/Qté
+                'E': 15,  # P.U
+                'F': 20,  # Total HT
+            }
+            for col, width in column_widths.items():
+                ws.column_dimensions[col].width = width
+
+            # Add logo and company name
+            current_row = 1
+            logo_path = os.path.join(os.path.dirname(__file__), "..", "static", "logo.png")
+            if os.path.exists(logo_path):
+                from openpyxl.drawing.image import Image
+                img = Image(logo_path)
+                img.width = 100
+                img.height = 100
+                ws.add_image(img, 'A1')
+                current_row += 6
+
+            # Add DEVIS header
+            ws.merge_cells(f'E{current_row}:F{current_row}')
+            devis_cell = ws[f'E{current_row}']
+            devis_cell.value = "DEVIS"
+            style_cell(devis_cell, bold=True, size=36, align='right')
+            current_row += 2
+
+            # Client Information Box
+            client_info = [
+                ("Client:", data.client_name),
+                ("Projet:", data.project),
+                ("Adresse:", data.address),
+                ("Ville:", data.ville),
+                ("Tél:", data.client_phone)
+            ]
+            
+            # Style client info as a box
+            client_box_start = current_row
+            for label, value in client_info:
+                ws[f'E{current_row}'].value = label
+                ws[f'F{current_row}'].value = value
+                style_cell(ws[f'E{current_row}'], bold=True)
+                style_cell(ws[f'F{current_row}'])
+                current_row += 1
+
+            # Draw border around client info
+            for row in range(client_box_start, current_row):
+                for col in ['E', 'F']:
+                    ws[f'{col}{row}'].border = Border(
+                        left=Side(style='thin'),
+                        right=Side(style='thin'),
+                        top=Side(style='thin') if row == client_box_start else None,
+                        bottom=Side(style='thin') if row == current_row - 1 else None
+                    )
+
+            current_row += 2
+
+            # Invoice Details Box (Date, N° Devis, PLANCHER)
+            info_rows = [
+                ("Date du devis :", data.date.strftime("%d/%m/%Y")),
+                ("N° Devis :", data.invoice_number),
+                ("PLANCHER :", data.frame_number or "PH RDC")
+            ]
+
+            for label, value in info_rows:
+                ws[f'A{current_row}'].value = label
+                ws[f'B{current_row}'].value = value
+                style_cell(ws[f'A{current_row}'], bold=True, color=WHITE, bg_color=HEADER_BLUE)
+                style_cell(ws[f'B{current_row}'])
+                current_row += 1
+
+            current_row += 1
+
+            # Table Headers
+            headers = ["Description", "Unité", "NBRE", "ML/Qté", "P.U", "Total HT"]
+            for col, header in enumerate(headers, 1):
+                cell = ws.cell(row=current_row, column=col, value=header)
+                style_cell(cell, bold=True, color=WHITE, bg_color=HEADER_BLUE)
+            current_row += 1
+
+            # Sections and Items
+            sections = [
+                ("POUTRELLES", "PCP"),
+                ("HOURDIS", "HOURDIS"),
+                ("PANNEAU TREILLIS SOUDES", "PTS"),
+                ("AGGLOS", "AGGLOS")
+            ]
+
+            for section_name, keyword in sections:
+                items = [i for i in data.items if keyword in i.description]
+                if items:
+                    # Section Header
+                    ws.merge_cells(f'A{current_row}:F{current_row}')
+                    ws[f'A{current_row}'].value = section_name
+                    style_cell(ws[f'A{current_row}'], bold=True)
+                    current_row += 1
+
+                    # Items
+                    for item in items:
+                        ws.cell(row=current_row, column=1).value = item.description
+                        ws.cell(row=current_row, column=2).value = item.unit
+                        ws.cell(row=current_row, column=3).value = item.quantity
+                        ws.cell(row=current_row, column=4).value = item.length
+                        ws.cell(row=current_row, column=5).value = item.unit_price
+                        ws.cell(row=current_row, column=6).value = item.total_price
+                        
+                        # Style each cell in the row
+                        for col in range(1, 7):
+                            style_cell(ws.cell(row=current_row, column=col))
+                        
+                        current_row += 1
+
+            current_row += 1
+
+            # NB Section with wrapped text
+            ws.merge_cells(f'A{current_row}:F{current_row}')
+            nb_cell = ws[f'A{current_row}']
+            nb_cell.value = "NB: Toute modification apportée aux plans BA initialement fournis, entraine automatiquement la modification de ce devis."
+            style_cell(nb_cell, wrap_text=True, align='left')
+            current_row += 2
+
+            # Totals Section
+            totals = [
+                ("Total H.T", data.total_ht),
+                ("TVA 20%", data.tax),
+                ("Total TTC", data.total_ttc)
+            ]
+
+            for label, value in totals:
+                ws[f'E{current_row}'].value = label
+                ws[f'F{current_row}'].value = f"{value:,.2f} DH"
+                style_cell(ws[f'E{current_row}'], bold=True)
+                style_cell(ws[f'F{current_row}'], bold=True)
+                current_row += 1
+
+            # Footer
+            current_row += 1
+            footer_texts = [
+                "CARRIPREFA",
+                "Douar Ait Laarassi Tidili, Cercle El Kelâa, Route de Safi, Km 14-40000 Marrakech",
+                "Tél: 05 24 01 33 34 Fax : 05 24 01 33 29 E-mail : [email protected]"
+            ]
+
+            for text in footer_texts:
+                ws.merge_cells(f'A{current_row}:F{current_row}')
+                footer_cell = ws[f'A{current_row}']
+                footer_cell.value = text
+                style_cell(footer_cell)
+                current_row += 1
+
+            # Commercial information if available
+            if data.commercial and data.commercial.lower() != 'divers':
+                ws.merge_cells(f'A{current_row}:C{current_row}')
+                ws[f'A{current_row}'].value = f"Commercial: {data.commercial.upper()}"
+                style_cell(ws[f'A{current_row}'], align='left')
+                
+                ws.merge_cells(f'D{current_row}:F{current_row}')
+                ws[f'D{current_row}'].value = datetime.datetime.now().strftime("%d/%m/%Y %H:%M")
+                style_cell(ws[f'D{current_row}'], align='right')
+
+            # Save to buffer
+            buffer = BytesIO()
+            wb.save(buffer)
+            buffer.seek(0)
+            return buffer.getvalue()
+
+        except Exception as e:
+            logger.error(f"Error in Excel generation: {str(e)}", exc_info=True)
+            raise

app/services/excel_service copy.py

@@ -0,0 +1,220 @@
+
+from openpyxl import Workbook
+from openpyxl.styles import Font, Alignment, Border, Side, PatternFill
+from openpyxl.utils import get_column_letter
+from io import BytesIO
+from app.db.models import Invoice
+import logging
+import os
+import datetime
+
+# Set up logging
+logger = logging.getLogger(__name__)
+
+class ExcelService:
+    @staticmethod
+    def generate_excel(data: Invoice) -> bytes:
+        try:
+            # Create a workbook and select the active worksheet
+            wb = Workbook()
+            ws = wb.active
+
+            # Constants
+            HEADER_BLUE = "00468B"  # RGB for header blue
+            WHITE = "FFFFFF"
+            BLACK = "000000"
+            MARGIN = 2  # Excel doesn't use pixels, so we simulate margins with empty rows/columns
+            LINE_HEIGHT = 15  # Row height
+            STANDARD_FONT_SIZE = 10
+            BOTTOM_MARGIN = 5  # Minimum margin at the bottom of the sheet
+
+            # Helper function to apply borders to a cell range
+            def apply_border(cell_range):
+                thin_border = Border(
+                    left=Side(style='thin'),
+                    right=Side(style='thin'),
+                    top=Side(style='thin'),
+                    bottom=Side(style='thin')
+                )
+                for row in ws[cell_range]:
+                    for cell in row:
+                        cell.border = thin_border
+
+            # Helper function to merge cells and center text
+            def merge_and_center(cell_range, text, font=None, fill=None):
+                ws.merge_cells(cell_range)
+                cell = ws[cell_range.split(":")[0]]
+                cell.value = text
+                cell.alignment = Alignment(horizontal="center", vertical="center")
+                if font:
+                    cell.font = font
+                if fill:
+                    cell.fill = PatternFill(start_color=fill, end_color=fill, fill_type="solid")
+
+            # Set column widths and row heights
+            ws.column_dimensions['A'].width = 30
+            ws.column_dimensions['B'].width = 10
+            ws.column_dimensions['C'].width = 10
+            ws.column_dimensions['D'].width = 12
+            ws.column_dimensions['E'].width = 12
+            ws.column_dimensions['F'].width = 15
+
+            # Top section layout
+            current_row = 1
+
+            # Add logo (if available)
+            current_dir = os.path.dirname(os.path.abspath(__file__))
+            logo_path = os.path.join(current_dir, "..", "static", "logo.png")
+            if os.path.exists(logo_path):
+                from openpyxl.drawing.image import Image
+                img = Image(logo_path)
+                img.width = 100
+                img.height = 100
+                ws.add_image(img, 'A1')
+                current_row += 6  # Adjust row position after logo
+
+            # Add "DEVIS" text
+            ws.merge_cells(f"F{current_row}:G{current_row}")
+            ws[f"F{current_row}"].value = "DEVIS"
+            ws[f"F{current_row}"].font = Font(bold=True, size=36)
+            ws[f"F{current_row}"].alignment = Alignment(horizontal="right")
+
+            # Client info box
+            current_row += 1
+            client_box_start = f"F{current_row}"
+            client_box_end = f"G{current_row + 4}"
+            apply_border(f"{client_box_start}:{client_box_end}")
+
+            client_info = [
+                data.client_name,
+                data.project,
+                data.address,
+                data.ville,
+                data.client_phone
+            ]
+            for i, info in enumerate(client_info):
+                ws[f"F{current_row + i}"].value = info
+                ws[f"F{current_row + i}"].alignment = Alignment(horizontal="center")
+
+            current_row += 6
+
+            # Info boxes (Date, N° Devis, PLANCHER)
+            for label, value in [
+                ("Date du devis :", data.date.strftime("%d/%m/%Y")),
+                ("N° Devis :", data.invoice_number),
+                ("PLANCHER :", data.frame_number or "PH RDC")
+            ]:
+                ws[f"A{current_row}"].value = label
+                ws[f"A{current_row}"].font = Font(bold=True, color=WHITE)
+                ws[f"A{current_row}"].fill = PatternFill(start_color=HEADER_BLUE, end_color=HEADER_BLUE, fill_type="solid")
+                ws[f"B{current_row}"].value = value
+                apply_border(f"A{current_row}:B{current_row}")
+                current_row += 1
+
+            # Table headers
+            headers = [
+                ("Description", 30),
+                ("Unité", 10),
+                ("NBRE", 10),
+                ("ML/Qté", 12),
+                ("P.U", 12),
+                ("Total HT", 15)
+            ]
+            for col, (title, width) in enumerate(headers, start=1):
+                cell = ws.cell(row=current_row, column=col, value=title)
+                cell.font = Font(bold=True, color=WHITE)
+                cell.fill = PatternFill(start_color=HEADER_BLUE, end_color=HEADER_BLUE, fill_type="solid")
+                cell.alignment = Alignment(horizontal="center")
+            apply_border(f"A{current_row}:F{current_row}")
+            current_row += 1
+
+            # Draw sections and items
+            sections = [
+                ("POUTRELLES", "PCP"),
+                ("HOURDIS", "HOURDIS"),
+                ("PANNEAU TREILLIS SOUDES", "PTS"),
+                ("AGGLOS", "AGGLOS")
+            ]
+
+            for section_title, keyword in sections:
+                items = [i for i in data.items if keyword in i.description]
+                if items:
+                    ws[f"A{current_row}"].value = section_title
+                    ws[f"A{current_row}"].font = Font(bold=True)
+                    current_row += 1
+
+                    for item in items:
+                        ws[f"A{current_row}"].value = item.description
+                        ws[f"B{current_row}"].value = item.unit
+                        ws[f"C{current_row}"].value = item.quantity
+                        ws[f"D{current_row}"].value = item.length
+                        ws[f"E{current_row}"].value = item.unit_price
+                        ws[f"F{current_row}"].value = item.total_price
+                        apply_border(f"A{current_row}:F{current_row}")
+                        current_row += 1
+
+            # NB box with text
+            ws[f"A{current_row}"].value = "NB:"
+            ws[f"A{current_row}"].font = Font(bold=True)
+            ws.merge_cells(f"B{current_row}:F{current_row}")
+            ws[f"B{current_row}"].value = "Toute modification apportée aux plans BA initialement fournis, entraine automatiquement la modification de ce devis."
+            ws[f"B{current_row}"].alignment = Alignment(wrap_text=True)
+            apply_border(f"A{current_row}:F{current_row}")
+            current_row += 2
+
+            # Totals section
+            totals = [
+                ("Total H.T", data.total_ht),
+                ("TVA 20%", data.tax),
+                ("Total TTC", data.total_ttc)
+            ]
+            for label, value in totals:
+                ws[f"E{current_row}"].value = label
+                ws[f"F{current_row}"].value = value
+                ws[f"F{current_row}"].font = Font(bold=True)
+                apply_border(f"E{current_row}:F{current_row}")
+                current_row += 1
+
+            # Footer
+            ws[f"A{current_row}"].value = "CARRIPREFA"
+            ws[f"A{current_row}"].font = Font(bold=True)
+            ws.merge_cells(f"A{current_row}:F{current_row}")
+            ws[f"A{current_row}"].alignment = Alignment(horizontal="center")
+            current_row += 1
+
+            ws[f"A{current_row}"].value = "Douar Ait Laarassi Tidili, Cercle El Kelâa, Route de Safi, Km 14-40000 Marrakech"
+            ws.merge_cells(f"A{current_row}:F{current_row}")
+            ws[f"A{current_row}"].alignment = Alignment(horizontal="center")
+            current_row += 1
+
+            # Commercial info
+            commercial_info = {
+                "salah": "06 62 29 99 78",
+                "khaled": "06 66 24 80 94",
+                "ismail": "06 66 24 50 15",
+                "jamal": "06 70 08 36 50"
+            }
+            if data.commercial and data.commercial.lower() != 'divers':
+                ws[f"A{current_row}"].value = f"Commercial: {data.commercial.upper()}"
+                ws[f"B{current_row}"].value = f"Tél: {commercial_info.get(data.commercial.lower(), '')}"
+                current_row += 1
+
+            ws[f"A{current_row}"].value = "Tél: 05 24 01 33 34 Fax : 05 24 01 33 29 E-mail : [email protected]"
+            ws.merge_cells(f"A{current_row}:F{current_row}")
+            ws[f"A{current_row}"].alignment = Alignment(horizontal="center")
+            current_row += 1
+
+            ws[f"A{current_row}"].value = f"Date: {datetime.datetime.now().strftime('%d/%m/%Y %H:%M')}"
+            ws[f"F{current_row}"].value = f"Page 1/1"
+            apply_border(f"A{current_row}:F{current_row}")
+
+            # Save to BytesIO buffer
+            buffer = BytesIO()
+            wb.save(buffer)
+            buffer.seek(0)
+            return buffer.getvalue()
+
+        except Exception as e:
+            logger.error(f"Error in Excel generation: {str(e)}", exc_info=True)
+            raise
+

app/services/excel_service.py

@@ -0,0 +1,269 @@
+from openpyxl import Workbook
+from openpyxl.styles import Font, Alignment, Border, Side, PatternFill
+from openpyxl.utils import get_column_letter
+from openpyxl.worksheet.pagebreak import Break  # Add this import
+from io import BytesIO
+from app.db.models import Invoice
+import logging
+import os
+import datetime
+
+# Set up logging
+logger = logging.getLogger(__name__)
+
+class ExcelService:
+    @staticmethod
+    def generate_excel(data: Invoice) -> bytes:
+        try:
+            wb = Workbook()
+            ws = wb.active
+            ws.title = "Devis"
+
+            # Constants - Match PDF colors and dimensions
+            HEADER_BLUE = "4A739B"  # Match PDF's HEADER_BLUE
+            WHITE = "FFFFFF"
+            BLACK = "000000"
+            STANDARD_FONT_SIZE = 11
+            
+            # Helper function for cell styling
+            def style_cell(cell, bold=False, color=BLACK, bg_color=None, size=STANDARD_FONT_SIZE, wrap_text=False, align='center'):
+                cell.font = Font(bold=bold, color=color, size=size)
+                cell.alignment = Alignment(horizontal=align, vertical='center', wrap_text=wrap_text)
+                if bg_color:
+                    cell.fill = PatternFill(start_color=bg_color, end_color=bg_color, fill_type="solid")
+
+            # Set fixed column widths to match PDF
+            column_widths = {
+                'A': 40,  # Description
+                'B': 15,  # Unité
+                'C': 15,  # NBRE
+                'D': 15,  # ML/Qté
+                'E': 15,  # P.U
+                'F': 20,  # Total HT
+            }
+            for col, width in column_widths.items():
+                ws.column_dimensions[col].width = width
+
+            # Add logo and company name
+            current_row = 1
+            logo_path = os.path.join(os.path.dirname(__file__), "..", "static", "logo.png")
+            if os.path.exists(logo_path):
+                from openpyxl.drawing.image import Image
+                img = Image(logo_path)
+                img.width = 100
+                img.height = 100
+                ws.add_image(img, 'A1')
+                current_row += 6
+
+            # Add DEVIS header
+            ws.merge_cells(f'E{current_row}:F{current_row}')
+            devis_cell = ws[f'E{current_row}']
+            devis_cell.value = "DEVIS"
+            style_cell(devis_cell, bold=True, size=36, align='right')
+            current_row += 2
+
+            # Client Information Box
+            client_info = [
+                ("Client:", data.client_name),
+                ("Projet:", data.project),
+                ("Adresse:", data.address),
+                ("Ville:", data.ville),
+                ("Tél:", data.client_phone)
+            ]
+            
+            # Style client info as a box
+            client_box_start = current_row
+            for label, value in client_info:
+                ws[f'E{current_row}'].value = label
+                ws[f'F{current_row}'].value = value
+                style_cell(ws[f'E{current_row}'], bold=True)
+                style_cell(ws[f'F{current_row}'])
+                current_row += 1
+
+            # Draw border around client info
+            for row in range(client_box_start, current_row):
+                for col in ['E', 'F']:
+                    ws[f'{col}{row}'].border = Border(
+                        left=Side(style='thin'),
+                        right=Side(style='thin'),
+                        top=Side(style='thin') if row == client_box_start else None,
+                        bottom=Side(style='thin') if row == current_row - 1 else None
+                    )
+
+            current_row += 2
+
+            # Invoice Details Box (Date, N° Devis, PLANCHER)
+            info_rows = [
+                ("Date du devis :", data.date.strftime("%d/%m/%Y")),
+                ("N° Devis :", data.invoice_number),
+                ("PLANCHER :", data.frame_number or "PH RDC")
+            ]
+
+            for label, value in info_rows:
+                ws[f'A{current_row}'].value = label
+                ws[f'B{current_row}'].value = value
+                style_cell(ws[f'A{current_row}'], bold=True, color=WHITE, bg_color=HEADER_BLUE)
+                style_cell(ws[f'B{current_row}'])
+                current_row += 1
+
+            current_row += 1
+
+            # Table Headers
+            headers = ["Description", "Unité", "NBRE", "ML/Qté", "P.U", "Total HT"]
+            for col, header in enumerate(headers, 1):
+                cell = ws.cell(row=current_row, column=col, value=header)
+                style_cell(cell, bold=True, color=WHITE, bg_color=HEADER_BLUE)
+            current_row += 1
+
+            # Sections and Items
+            sections = [
+                ("POUTRELLES", "PCP"),
+                ("HOURDIS", "HOURDIS"),
+                ("PANNEAU TREILLIS SOUDES", "PTS"),
+                ("AGGLOS", "AGGLOS")
+            ]
+
+            for section_name, keyword in sections:
+                items = [i for i in data.items if keyword in i.description]
+                if items:
+                    # Section Header
+                    ws.merge_cells(f'A{current_row}:F{current_row}')
+                    ws[f'A{current_row}'].value = section_name
+                    style_cell(ws[f'A{current_row}'], bold=True)
+                    current_row += 1
+
+                    # Items
+                    for item in items:
+                        ws.cell(row=current_row, column=1).value = item.description
+                        ws.cell(row=current_row, column=2).value = item.unit
+                        ws.cell(row=current_row, column=3).value = item.quantity
+                        ws.cell(row=current_row, column=4).value = item.length
+                        ws.cell(row=current_row, column=5).value = item.unit_price
+                        ws.cell(row=current_row, column=6).value = item.total_price
+                        
+                        # Style each cell in the row
+                        for col in range(1, 7):
+                            style_cell(ws.cell(row=current_row, column=col))
+                        
+                        current_row += 1
+
+            current_row += 1
+
+            # NB Section with wrapped text
+            ws.merge_cells(f'A{current_row}:F{current_row}')
+            nb_cell = ws[f'A{current_row}']
+            nb_cell.value = "NB: Toute modification apportée aux plans BA initialement fournis, entraine automatiquement la modification de ce devis."
+            style_cell(nb_cell, wrap_text=True, align='left')
+            current_row += 2
+
+            # Totals Section
+            totals = [
+                ("Total H.T", data.total_ht),
+                ("TVA 20%", data.tax),
+                ("Total TTC", data.total_ttc)
+            ]
+
+            for label, value in totals:
+                ws[f'E{current_row}'].value = label
+                ws[f'F{current_row}'].value = f"{value:,.2f} DH"
+                style_cell(ws[f'E{current_row}'], bold=True)
+                style_cell(ws[f'F{current_row}'], bold=True)
+                current_row += 1
+
+            # Footer
+            current_row += 1
+            footer_texts = [
+                "CARRIPREFA",
+                "Douar Ait Laarassi Tidili, Cercle El Kelâa, Route de Safi, Km 14-40000 Marrakech",
+                "Tél: 05 24 01 33 34 Fax : 05 24 01 33 29 E-mail : [email protected]"
+            ]
+
+            for text in footer_texts:
+                ws.merge_cells(f'A{current_row}:F{current_row}')
+                footer_cell = ws[f'A{current_row}']
+                footer_cell.value = text
+                style_cell(footer_cell)
+                current_row += 1
+
+            # Commercial information if available
+            if data.commercial and data.commercial.lower() != 'divers':
+                ws.merge_cells(f'A{current_row}:C{current_row}')
+                ws[f'A{current_row}'].value = f"Commercial: {data.commercial.upper()}"
+                style_cell(ws[f'A{current_row}'], align='left')
+                
+                ws.merge_cells(f'D{current_row}:F{current_row}')
+                ws[f'D{current_row}'].value = datetime.datetime.now().strftime("%d/%m/%Y %H:%M")
+                style_cell(ws[f'D{current_row}'], align='right')
+
+
+            # Set print area and page setup
+            ws.page_setup.paperSize = ws.PAPERSIZE_A4
+            ws.page_setup.orientation = ws.ORIENTATION_PORTRAIT
+            ws.page_setup.fitToPage = True
+            ws.page_setup.fitToHeight = 1
+            ws.page_setup.fitToWidth = 1
+            ws.page_margins.left = 0.5
+            ws.page_margins.right = 0.5
+            ws.page_margins.top = 0.5
+            ws.page_margins.bottom = 0.5
+            ws.page_margins.header = 0.3
+            ws.page_margins.footer = 0.3
+
+            # Set row heights for better spacing
+            ws.row_dimensions[1].height = 80  # Logo row
+            for row in range(2, ws.max_row + 1):
+                ws.row_dimensions[row].height = 20  # Standard row height
+
+            # Add page breaks for better printing
+            ws.page_breaks = []
+            
+            # Group rows for better organization
+            # Fix: change start_row/end_row to from_/to_
+            for row in range(client_box_start, current_row):
+                ws.row_dimensions[row].group = True
+                ws.row_dimensions[row].outline_level = 1
+
+            # Freeze panes to keep headers visible
+            ws.freeze_panes = 'A10'  # Freeze after headers
+
+            # Print settings
+            ws.print_options.gridLines = False
+            ws.print_options.horizontalCentered = True
+            ws.print_options.verticalCentered = False
+
+            # Add print titles (repeat rows)
+            ws.print_title_rows = '1:9'  # Repeat first 9 rows on each page
+
+            # Set the print area
+            ws.print_area = [f'A1:F{current_row}']
+
+            # Auto-fit all rows for content
+            for row in ws.rows:
+                max_height = 0
+                for cell in row:
+                    if cell.value:
+                        text_lines = str(cell.value).count('\n') + 1
+                        max_height = max(max_height, text_lines * 15)  # 15 points per line
+                if max_height > 0:
+                    ws.row_dimensions[cell.row].height = max_height
+
+            # Add page break before totals section
+            ws.row_breaks.append(Break(id=current_row - 4))
+
+            # Ensure footer stays together
+            # Fix: Replace the old footer grouping with this
+            # Group footer rows together
+            for row in range(current_row - 3, current_row + 1):
+                ws.row_dimensions[row].group = True
+                ws.row_dimensions[row].outline_level = 1
+                ws.row_dimensions[row].hidden = False
+
+            # Save to buffer
+            buffer = BytesIO()
+            wb.save(buffer)
+            buffer.seek(0)
+            return buffer.getvalue()
+
+        except Exception as e:
+            logger.error(f"Error in Excel generation: {str(e)}", exc_info=True)
+            raise

app/services/invoice_service.py

@@ -43,6 +43,28 @@ class InvoiceService:
                 pdf.setFillColorRGB(*stroke_color)
                 pdf.rect(x, y, width, height, stroke=1)
 
+            # Add this helper function after the existing helper functions
+            def draw_wrapped_text(pdf, text, x, y, width, font="Helvetica", size=STANDARD_FONT_SIZE):
+                """Draw text wrapped to fit within a given width."""
+                pdf.setFont(font, size)
+                words = text.split()
+                lines = []
+                current_line = []
+                
+                for word in words:
+                    current_line.append(word)
+                    line_width = pdf.stringWidth(' '.join(current_line), font, size)
+                    if line_width > width:
+                        current_line.pop()  # Remove last word
+                        if current_line:  # Only add if there are words
+                            lines.append(' '.join(current_line))
+                        current_line = [word]  # Start new line with the word that didn't fit
+                
+                if current_line:  # Add the last line
+                    lines.append(' '.join(current_line))
+                
+                return lines
+
             # Get the absolute path to the logo file
             current_dir = os.path.dirname(os.path.abspath(__file__))
             logo_path = os.path.join(current_dir, "..", "static", "logo.png")
@@ -81,13 +103,25 @@ class InvoiceService:
                 data.client_phone
             ]
 
-            # Center and draw each line of client info
-            line_height = box_height / (len(client_info) + 1)
-            for i, text in enumerate(client_info):
-                text_width = pdf.stringWidth(str(text), "Helvetica", STANDARD_FONT_SIZE)
-                x = box_x + (box_width - text_width) / 2
-                y = box_y + box_height - ((i + 1) * line_height)
-                pdf.drawString(x, y, str(text))
+            available_height = box_height - BOX_PADDING * 2
+            y_position = box_y + box_height - BOX_PADDING
+
+            for text in client_info:
+                if text:
+                    # Calculate available width for text
+                    available_width = box_width - BOX_PADDING * 2
+                    # Get wrapped lines
+                    lines = draw_wrapped_text(pdf, str(text), box_x, y_position, available_width)
+                    
+                    # Draw each line
+                    for line in lines:
+                        text_width = pdf.stringWidth(line, "Helvetica", STANDARD_FONT_SIZE)
+                        x = box_x + (box_width - text_width) / 2
+                        pdf.drawString(x, y_position, line)
+                        y_position -= STANDARD_FONT_SIZE + 2  # Add some spacing between lines
+
+                    # Add extra spacing between different info pieces
+                    y_position -= 2
 
             # Info boxes (Date, N° Devis, PLANCHER) - adjusted starting position
             info_y = top_margin - 50

app/templates/index.html

@@ -422,9 +422,18 @@
 
                             <!-- Submit Button -->
                             <div class="d-grid gap-2 col-md-6 mx-auto mt-4">
-                                <button type="submit" class="btn btn-success btn-lg">
-                                    <i class="fas fa-file-pdf"></i> Générer le Devis
-                                </button>
+                                <div class="row">
+                                    <div class="col-md-6">
+                                        <button type="submit" class="btn btn-success btn-lg w-100">
+                                            <i class="fas fa-file-pdf"></i> Générer PDF
+                                        </button>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <button type="button" class="btn btn-primary btn-lg w-100" id="generateExcel">
+                                            <i class="fas fa-file-excel"></i> Générer Excel
+                                        </button>
+                                    </div>
+                                </div>
                             </div>
                         </form>
                     </div>
@@ -907,6 +916,110 @@
             if (selectedType) {
                 updateInvoiceNumber(selectedType);
             }
+
+            // Replace the Excel generation handler with this updated version
+            document.getElementById('generateExcel').addEventListener('click', async () => {
+                try {
+                    console.log('Starting Excel generation process...');
+                    
+                    // Get all form data
+                    const getAllItems = () => {
+                        const items = [];
+                        [poutrellesTable, hourdisTable, panneauTable, agglosTable].forEach(table => {
+                            const tableItems = Array.from(table.querySelectorAll("tr")).map(row => ({
+                                description: row.querySelector("input[name='description']").value,
+                                unit: row.querySelector("input[name='unit']").value,
+                                quantity: parseInt(row.querySelector("input[name='quantity']").value, 10),
+                                length: parseFloat(row.querySelector("input[name='length']").value),
+                                unit_price: parseFloat(row.querySelector("input[name='unitPrice']").value),
+                                total_price: parseFloat(row.querySelector("input[name='totalHT']").value)
+                            }));
+                            console.log(`Found ${tableItems.length} items in ${table.id}`);
+                            items.push(...tableItems);
+                        });
+                        return items;
+                    };
+
+                    const data = {
+                        invoice_number: document.querySelector("#invoiceNumber").value,
+                        date: new Date(document.querySelector("#date").value).toISOString(),
+                        project: document.querySelector("#project").value,
+                        client_name: document.querySelector("#clientName").value,
+                        client_phone: document.querySelector("#clientPhone").value,
+                        address: document.querySelector("#clientAddress").value,
+                        ville: document.querySelector("#ville").value,
+                        total_ht: parseFloat(document.querySelector("#totalHT").value || 0),
+                        tax: parseFloat(document.querySelector("#tax").value || 0),
+                        total_ttc: parseFloat(document.querySelector("#totalTTC").value || 0),
+                        items: getAllItems(),
+                        frame_number: document.querySelector("#plancher").value || "PH RDC",
+                        status: "pending",
+                        created_at: new Date().toISOString(),
+                        commercial: document.querySelector("#commercial").value || "divers"
+                    };
+
+                    console.log('Form data collected:', {
+                        invoice_number: data.invoice_number,
+                        client_name: data.client_name,
+                        items_count: data.items.length,
+                        total_ttc: data.total_ttc
+                    });
+
+                    // First create the invoice if it doesn't exist
+                    console.log('Creating invoice...');
+                    const createResponse = await fetch("/api/invoices/", {
+                        method: "POST",
+                        headers: { "Content-Type": "application/json" },
+                        body: JSON.stringify(data)
+                    });
+
+                    if (!createResponse.ok) {
+                        throw new Error('Failed to create invoice');
+                    }
+
+                    const invoice = await createResponse.json();
+                    console.log("Created invoice:", invoice.id);
+
+                    // Then generate the Excel file
+                    console.log('Generating Excel file...');
+                    const response = await fetch(`/api/invoices/${invoice.id}/generate-excel`, {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify(invoice)
+                    });
+
+                    if (!response.ok) {
+                        throw new Error('Failed to generate Excel file');
+                    }
+
+                    console.log('Excel file generated successfully');
+
+                    // Handle file download
+                    const blob = await response.blob();
+                    const url = window.URL.createObjectURL(blob);
+                    const a = document.createElement('a');
+                    a.href = url;
+                    a.download = `devis_${invoice.invoice_number}.xlsx`;
+                    document.body.appendChild(a);
+                    a.click();
+                    document.body.removeChild(a);
+                    window.URL.revokeObjectURL(url);
+                    console.log('Excel file downloaded');
+
+                    // Update invoice number after successful generation
+                    const selectedType = document.querySelector('input[name="clientType"]:checked')?.value;
+                    if (selectedType) {
+                        console.log('Updating invoice number...');
+                        await updateInvoiceNumber(selectedType);
+                    }
+
+                    console.log('Excel generation process completed successfully');
+
+                } catch (error) {
+                    console.error('Error in Excel generation:', error);
+                    alert('Error generating Excel file: ' + error.message);
+                }
+            });
         });
     </script>
 </body>

requirements.txt

@@ -9,4 +9,5 @@ python-multipart==0.0.6
 reportlab==4.0.8
 python-jose==3.3.0
 passlib==1.7.4
-alembic==1.13.1
+alembic==1.13.1
+openpyxl