From 5aa9a8e41d30ef78457f01c2baf5d77fbb825f17 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Sat, 6 Oct 2012 13:53:37 +0200
Subject: [PATCH] Add changelog entries

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a1de53b75a0..6bf5f9759f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,8 @@ For users:
 - New: Can make one invoice for several orders.
 - New: POS module can works with only one payment method (cach, chq, credit card).
 - New: Add possibility to defined position/job of a user
+- New: [ task #104 ] Can create an invoice from several orders
+- New: [ task #186 ] Warning when stock is too low
 
 New experimental modules:
 - New: Add margin and commissions management module.