Merge branch 'main' into rollback

__manifest__.py

@@ -19,7 +19,7 @@
     'version': '17.0.1.0.0',
 
     # any module necessary for this one to work correctly
-    'depends': ['point_of_sale'],
+    'depends': ['point_of_sale', 'pos_discount'],
 
     # always loaded
     'data': [

models/pos_payment_method.py

@@ -11,3 +11,10 @@ class PosPaymentMethod(models.Model):
         domain=[('deprecated', '=', False)],
         help='Account used for income lines when splitting by payment method. '
              'If empty, the default income account from the product will be used.')
+
+    discount_account_id = fields.Many2one(
+        'account.account',
+        string='Discount Account',
+        domain=[('deprecated', '=', False)],
+        help='Account used for discount product lines when splitting by payment method. '
+             'If empty, the default discount account from the product will be used.')

models/pos_session.py

@@ -27,6 +27,9 @@ class PosSession(models.Model):
         # Create new sales data structure split by payment method
         split_sales = defaultdict(lambda: {'amount': 0.0, 'amount_converted': 0.0, 'tax_amount': 0.0})
 
+        # Get discount product ID from config
+        discount_product_id = self.config_id.discount_product_id.id if self.config_id.discount_product_id else None
+
         # For each sale entry, we need to distribute it across payment methods
         for sale_key, sale_amounts in sales.items():
             # Skip if this is a tax key (we only want to split actual sales)
@@ -68,10 +71,22 @@ class PosSession(models.Model):
                     if float_is_zero(payment_amount, precision_rounding=self.currency_id.rounding):
                         continue
 
-                    # Use the payment method's income account if specified, otherwise use original account
+                    # Determine the account to use based on whether this is a discount product
                     income_account_id = sale_key[0]  # default account
-                    if payment.payment_method_id.income_account_id and payment.payment_method_id.income_account_id.id:
-                        income_account_id = payment.payment_method_id.income_account_id.id
+
+                    # Check if this sale key corresponds to a discount product
+                    # We need to check if the account in the sale_key matches the discount product account
+                    if discount_product_id:
+                        # Get the discount product's income account
+                        discount_product = self.env['product.product'].browse(discount_product_id)
+                        discount_account = discount_product._get_product_accounts()['income']
+                        if discount_account and discount_account.id == sale_key[0]:
+                            # This is a discount product, use discount account if configured
+                            if payment.payment_method_id.discount_account_id:
+                                income_account_id = payment.payment_method_id.discount_account_id.id
+                        elif payment.payment_method_id.income_account_id:
+                            # This is a regular product, use income account if configured
+                            income_account_id = payment.payment_method_id.income_account_id.id
 
                     # Ensure we have a valid account ID
                     if not income_account_id:

views/pos_payment_method_views.xml

@@ -7,6 +7,7 @@
         <field name="arch" type="xml">
             <xpath expr="//group[@name='Payment methods']/group" position="inside">
                 <field name="income_account_id" domain="[('deprecated', '=', False)]"/>
+                <field name="discount_account_id" domain="[('deprecated', '=', False)]"/>
             </xpath>
         </field>
     </record>