From 2f1555b82fdff765e53e6211e6ea397453350968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 1 Sep 2018 01:02:04 +0200
Subject: [PATCH] Improve ModelStorage.copy

* Allow callable in copy default
* Support dotted notation in copy default
* Use setdefault in copy
* Copy default when needed
* Do not set default state in copy
* Use callable and dotted notation in copy default

issue5576
issue7648
review72291002
---
 subscription.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/subscription.py b/subscription.py
index a1fd0f862d..3a3a465b17 100644
--- a/subscription.py
+++ b/subscription.py
@@ -235,9 +235,8 @@ class Subscription(Workflow, ModelSQL, ModelView):
             default = {}
         else:
             default = default.copy()
-        default.setdefault('state', 'draft')
-        default.setdefault('number')
-        default.setdefault('next_invoice_date')
+        default.setdefault('number', None)
+        default.setdefault('next_invoice_date', None)
         return super(Subscription, cls).copy(subscriptions, default=default)
 
     @classmethod
@@ -702,7 +701,7 @@ class Line(sequence_ordered(), ModelSQL, ModelView):
             default = {}
         else:
             default = default.copy()
-        default.setdefault('consumed')
+        default.setdefault('consumed', None)
         return super(Line, cls).copy(lines, default=default)
 
 
@@ -747,7 +746,7 @@ class LineConsumption(ModelSQL, ModelView):
             default = {}
         else:
             default = default.copy()
-        default.setdefault('invoice_line')
+        default.setdefault('invoice_line', None)
         return super(LineConsumption, cls).copy(consumptions, default=default)
 
     @classmethod