c

app/db/models.py

@@ -16,6 +16,7 @@ class Invoice(Base):
     client_name = Column(String)
     client_phone = Column(String)
     address = Column(String)
+    ville = Column(String)  # Add ville field
     total_ht = Column(Float)
     tax = Column(Float)
     total_ttc = Column(Float)
@@ -40,4 +41,4 @@ class InvoiceItem(Base):
     unit_price = Column(Float)
     total_price = Column(Float)
 
-    invoice = relationship("Invoice", back_populates="items") 
+    invoice = relationship("Invoice", back_populates="items")

app/routes/invoices.py

@@ -44,6 +44,7 @@ async def create_new_invoice(
             client_name=invoice.client_name,
             client_phone=invoice.client_phone,
             address=invoice.address,
+            ville=invoice.ville,  # Add ville field
             total_ht=invoice.total_ht,
             tax=invoice.tax,
             total_ttc=invoice.total_ttc,
@@ -175,4 +176,4 @@ def reset_invoice_sequence(db: Session = Depends(get_db)):
         return {"message": "Sequence reset successfully"}
     except Exception as e:
         db.rollback()
-        raise HTTPException(status_code=500, detail=str(e)) 
+        raise HTTPException(status_code=500, detail=str(e))

app/schemas/invoice.py

@@ -20,6 +20,7 @@ class InvoiceCreate(BaseModel):
     client_name: str
     client_phone: str
     address: str
+    ville: str  # Add ville field
     total_ht: float
     tax: float
     total_ttc: float
@@ -47,4 +48,4 @@ class InvoiceResponse(InvoiceCreate):
     items: List[InvoiceItemResponse]
 
     class Config:
-        from_attributes = True 
+        from_attributes = True

app/services/invoice_service.py

@@ -77,6 +77,7 @@ class InvoiceService:
                 data.client_name,
                 data.project,
                 data.address,
+                data.ville,  # Add ville here
                 data.client_phone
             ]
 
@@ -114,7 +115,7 @@ class InvoiceService:
                 ("Description", 150),
                 ("Unité", 50),
                 ("NBRE", 50),
-                ("LNG/Qté", 60),
+                ("ML/Qté", 60),
                 ("P.U", 60),
                 ("Total HT", 170)
             ]
@@ -204,10 +205,13 @@ class InvoiceService:
             ]
 
             for section_title, keyword in sections:
-                draw_section_header2(section_title)
+                # Get items for this section
                 items = [i for i in data.items if keyword in i.description]
-                for item in items:
-                    draw_item_row(item, indent=(keyword != "lfflflflf"))
+                # Only draw section if it has items
+                if items:
+                    draw_section_header2(section_title)
+                    for item in items:
+                        draw_item_row(item, indent=(keyword != "lfflflflf"))
 
             # NB box with text
             nb_box_width = 200

app/templates/index.html

@@ -145,7 +145,7 @@
         .modal-header {
             background-color: var(--primary-color);
             color: white;
-            border-radius: var(--border-radius) var(--border-radius) 0 0;
+            border-radius: var(--border-radius) var (--border-radius) 0 0;
         }
 
         .btn-close {
@@ -223,6 +223,10 @@
                                                 <label for="clientAddress" class="form-label">Adresse</label>
                                                 <input type="text" class="form-control" id="clientAddress" required>
                                             </div>
+                                            <div class="mb-3">
+                                                <label for="ville" class="form-label">Ville</label>
+                                                <input type="text" class="form-control" id="ville" required>
+                                            </div>
                                             <div class="mb-3">
                                                 <label for="plancher" class="form-label">PLANCHER</label>
                                                 <input type="text" class="form-control" id="plancher" placeholder="PH RDC" value="PH RDC">
@@ -795,6 +799,7 @@
                     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),