From bd6f1cdfc53aef7448747da0341a92b108133c50 Mon Sep 17 00:00:00 2001
From: eLBati <elbaddy@gmail.com>
Date: Tue, 11 Mar 2025 17:35:10 +0100
Subject: [PATCH 1/2] [IMP] subscription_oca adding analytic_distribution
 Propagating from sale orders and to invoices

---
 subscription_oca/models/sale_order_line.py         | 5 +++++
 subscription_oca/models/sale_subscription_line.py  | 3 +++
 subscription_oca/views/sale_subscription_views.xml | 7 +++++++
 3 files changed, 15 insertions(+)

diff --git a/subscription_oca/models/sale_order_line.py b/subscription_oca/models/sale_order_line.py
index b843e48f7f..8bf4f639e2 100644
--- a/subscription_oca/models/sale_order_line.py
+++ b/subscription_oca/models/sale_order_line.py
@@ -14,4 +14,9 @@ def get_subscription_line_values(self):
             "price_unit": self.price_unit,
             "discount": self.discount,
             "price_subtotal": self.price_subtotal,
+            "analytic_distribution": self.analytic_distribution
+            if self.analytic_distribution
+            else {self.project_id.analytic_account_id.id: 100}
+            if self.project_id.analytic_account_id
+            else False,
         }
diff --git a/subscription_oca/models/sale_subscription_line.py b/subscription_oca/models/sale_subscription_line.py
index a780e4075b..a843361025 100644
--- a/subscription_oca/models/sale_subscription_line.py
+++ b/subscription_oca/models/sale_subscription_line.py
@@ -6,6 +6,7 @@
 
 class SaleSubscriptionLine(models.Model):
     _name = "sale.subscription.line"
+    _inherit = "analytic.mixin"
     _description = "Subscription lines added to a given subscription"
 
     product_id = fields.Many2one(
@@ -298,6 +299,7 @@ def _prepare_sale_order_line(self):
             "price_subtotal": self.price_subtotal,
             "tax_id": self.tax_ids,
             "product_uom": self.product_id.uom_id.id,
+            "analytic_distribution": self.analytic_distribution,
         }
 
     def _prepare_account_move_line(self):
@@ -316,4 +318,5 @@ def _prepare_account_move_line(self):
             "tax_ids": [(6, 0, self.tax_ids.ids)],
             "product_uom_id": self.product_id.uom_id.id,
             "account_id": account.id,
+            "analytic_distribution": self.analytic_distribution,
         }
diff --git a/subscription_oca/views/sale_subscription_views.xml b/subscription_oca/views/sale_subscription_views.xml
index 912aab2eb7..04c5719750 100644
--- a/subscription_oca/views/sale_subscription_views.xml
+++ b/subscription_oca/views/sale_subscription_views.xml
@@ -126,6 +126,13 @@
                                         required="True"
                                         widget="section_and_note_text"
                                     />
+                                    <field
+                                        name="analytic_distribution"
+                                        widget="analytic_distribution"
+                                        optional="hide"
+                                        groups="analytic.group_analytic_accounting"
+                                        options="{'product_field': 'product_id', 'business_domain': 'sale_order'}"
+                                    />
                                     <field name="currency_id" invisible="1" />
                                     <field name="product_uom_qty" required="True" />
                                     <field name="price_unit" required="True" />

From 4657b20cc51b1d8b3afb2a7faa595464375f2472 Mon Sep 17 00:00:00 2001
From: Lorenzo <99982085+LorenzoC0@users.noreply.github.com>
Date: Wed, 2 Jul 2025 10:01:25 +0200
Subject: [PATCH 2/2] Remove project dep Fix for PR #1210

---
 subscription_oca/models/sale_order_line.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/subscription_oca/models/sale_order_line.py b/subscription_oca/models/sale_order_line.py
index 8bf4f639e2..ab865c3644 100644
--- a/subscription_oca/models/sale_order_line.py
+++ b/subscription_oca/models/sale_order_line.py
@@ -14,9 +14,5 @@ def get_subscription_line_values(self):
             "price_unit": self.price_unit,
             "discount": self.discount,
             "price_subtotal": self.price_subtotal,
-            "analytic_distribution": self.analytic_distribution
-            if self.analytic_distribution
-            else {self.project_id.analytic_account_id.id: 100}
-            if self.project_id.analytic_account_id
-            else False,
+            "analytic_distribution": self.analytic_distribution,
         }