From f9aca7ed1832980c28484844ca61059976290e36 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 28 Aug 2012 17:17:21 +0200
Subject: [PATCH] Fix: changelog and copyright

---
 COPYRIGHT | 1 +
 ChangeLog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/COPYRIGHT b/COPYRIGHT
index 3fcd6507c3e..384fab6fd5c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -52,6 +52,7 @@ Copyright (C) 2012
 - Philippe Grand <philippe.grand@atoo-net.com>
 - Jean Heimburger <jean@tiaris.info>
 - Marcos García <marcosgdf@gmail.com>
+- Christophe Battarel <christophe.battarel@altairis.fr>
 
 Copyright (C) 2011
 - Laurent Destailleur <eldy@users.sourceforge.net>
diff --git a/ChangeLog b/ChangeLog
index f22a34a385a..5c31ad7e3b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,8 @@ For users:
 - New: Add conditional substitution IF/ELSEIF/ENDIF for ODT templates
 - New: Add unit foot2, inch2, foot3 and inch3 for surface and volumes.
 - New: Can select thirdparties into emailing targets, even if module category is not enabled.
+- New: [ task #498 ] Improvement of the block to add products/services lines.
+- New: Add margin and commissions management module.
 - Fix: [ bug #499 ]: Supplier order input method not translated
 - Fix: No images into product description lines as PDF generation does
   not work with this.