From 6daca5a30784af33e66d7aa02c4f76da48bd92b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Thu, 3 Aug 2023 15:58:57 +0200
Subject: [PATCH] Rename stock package code to number

---
 modules/stock_package/CHANGELOG                  |  1 +
 modules/stock_package/stock.py                   | 16 ++++++++++------
 modules/stock_package/view/package_form.xml      |  4 ++--
 .../stock_package_shipping_sendcloud/stock.py    |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/modules/stock_package/CHANGELOG b/modules/stock_package/CHANGELOG
index 03265dbc52..653e8d29e7 100644
--- a/modules/stock_package/CHANGELOG
+++ b/modules/stock_package/CHANGELOG
@@ -1,3 +1,4 @@
+* Rename package code to number
 
 Version 6.8.0 - 2023-05-01
 --------------------------
diff --git a/modules/stock_package/stock.py b/modules/stock_package/stock.py
index d8a709c0a7..691cee1113 100644
--- a/modules/stock_package/stock.py
+++ b/modules/stock_package/stock.py
@@ -152,8 +152,8 @@ class MeasurementsMixin:
 class Package(tree(), MeasurementsMixin, ModelSQL, ModelView):
     'Stock Package'
     __name__ = 'stock.package'
-    _rec_name = 'code'
-    code = fields.Char('Code', readonly=True, required=True)
+    _rec_name = 'number'
+    number = fields.Char("Number", readonly=True, required=True)
     company = fields.Many2One('company.company', "Company", required=True)
     type = fields.Many2One(
         'stock.package.type', "Type", required=True,
@@ -214,7 +214,7 @@ class Package(tree(), MeasurementsMixin, ModelSQL, ModelView):
 
     @classmethod
     def __setup__(cls):
-        cls.code.search_unaccented = False
+        cls.number.search_unaccented = False
         super().__setup__()
 
     @classmethod
@@ -225,6 +225,10 @@ class Package(tree(), MeasurementsMixin, ModelSQL, ModelView):
         company_exist = table_h.column_exist('company')
         cursor = Transaction().connection.cursor()
 
+        # Migration from 6.8: rename code to number
+        if table_h.column_exist('code'):
+            table_h.column_rename('code', 'number')
+
         super().__register__(module)
 
         # Migration from 5.8: add company
@@ -244,9 +248,9 @@ class Package(tree(), MeasurementsMixin, ModelSQL, ModelView):
                         where=table.shipment.like(name + ',%')))
 
     @classmethod
-    def order_code(cls, tables):
+    def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.code), table.code]
+        return [CharLength(table.number), table.number]
 
     @classmethod
     def default_company(cls):
@@ -319,7 +323,7 @@ class Package(tree(), MeasurementsMixin, ModelSQL, ModelView):
         config = Config(1)
         default_company = cls.default_company()
         for values in vlist:
-            values['code'] = config.get_multivalue(
+            values['number'] = config.get_multivalue(
                 'package_sequence',
                 company=values.get('company', default_company)).get()
         return super(Package, cls).create(vlist)
diff --git a/modules/stock_package/view/package_form.xml b/modules/stock_package/view/package_form.xml
index 9bf54e9df4..d2627bfc27 100644
--- a/modules/stock_package/view/package_form.xml
+++ b/modules/stock_package/view/package_form.xml
@@ -4,8 +4,8 @@ this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="type"/>
     <field name="type" widget="selection"/>
-    <label name="code"/>
-    <field name="code"/>
+    <label name="number"/>
+    <field name="number"/>
     <label name="parent"/>
     <field name="parent"/>
     <label name="company"/>
diff --git a/modules/stock_package_shipping_sendcloud/stock.py b/modules/stock_package_shipping_sendcloud/stock.py
index 64c95a4710..cc0cdb6e65 100644
--- a/modules/stock_package_shipping_sendcloud/stock.py
+++ b/modules/stock_package_shipping_sendcloud/stock.py
@@ -168,7 +168,7 @@ class CreateShippingSendcloud(Wizard):
             'telephone': phone.value if phone else None,
             'email': email.value if email else None,
             'sender_address': credential.get_sender_address(shipment),
-            'external_reference': '/'.join([shipment.number, package.code]),
+            'external_reference': '/'.join([shipment.number, package.number]),
             'quantity': 1,
             'order_number': shipment.number,
             'weight': package.total_weight,