Browse Source

Jan 04 [UPDT] : Updated 'sale_discount_total'

pull/309/head
AjmalCybro 4 months ago
parent
commit
7849ab4d17
  1. 2
      sale_discount_total/__manifest__.py
  2. 6
      sale_discount_total/doc/RELEASE_NOTES.md
  3. 15
      sale_discount_total/models/sale_order.py
  4. 15
      sale_discount_total/static/description/index.html
  5. 1
      sale_discount_total/views/sale_order_views.xml

2
sale_discount_total/__manifest__.py

@ -21,7 +21,7 @@
#############################################################################
{
'name': 'Sale Discount on Total Amount',
'version': '17.0.1.0.0',
'version': '17.0.1.1.0',
'category': 'Sales Management',
'summary': "Discount on Total in Sale and Invoice With Discount Limit "
"and Approval",

6
sale_discount_total/doc/RELEASE_NOTES.md

@ -4,3 +4,9 @@
#### Version 17.0.1.0.0
#### ADD
- Initial commit for Sale Discount On Total Amount
#### 14.03.2024
#### Version 17.0.1.1.0
#### ADD
- Added margin in sale orders

15
sale_discount_total/models/sale_order.py

@ -65,6 +65,21 @@ class SaleOrder(models.Model):
amount_total = fields.Monetary(string='Total', store=True, readonly=True,
compute='_amount_all',
help="Total amount provided.")
margin_test = fields.Float(string="Margin",
compute='_compute_margin_test', )
@api.depends('amount_untaxed', 'amount_tax', 'amount_total')
def _compute_margin_test(self):
# Compute logic for margin if sale_margin is installed
if self.env['ir.module.module'].sudo().search(
[('name', '=', 'sale_margin'), ('state', '=', 'installed')]):
# If sale_margin is installed, calculate margin
for record in self:
print(record.margin, 'll')
record.margin_test = record.margin
else:
for record in self:
record.margin_test = False
def action_confirm(self):
"""This function super action_confirm method"""

15
sale_discount_total/static/description/index.html

@ -270,6 +270,21 @@
</p>
</div>
</div>
<div class="col-mg-12 active" style="padding: 1rem 4rem;">
<div class="py-3"
style="font-weight: 500;background-color: #fff; border-radius: 4px; padding: 1rem; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);">
<div class="d-flex mb-3"
style="font-size: 0.8rem; font-weight: 500;"><span>Version
17.0.1.1.0</span><span
class="px-2">|</span><span
style="color: #714B67;font-weight: 600;">Released on:31st Dec 2024</span>
</div>
<p class="m-0"
style=" color:#718096!important; font-size:1rem !important;line-height: 28px;">
Added Margin on sale orders
</p>
</div>
</div>
</div>
</div>
</div>

1
sale_discount_total/views/sale_order_views.xml

@ -50,6 +50,7 @@
<field name="tax_totals"
widget="account-tax-totals-field" nolabel="1"
colspan="2" readonly="1"/>
<field name="margin_test" invisible="not margin_test"/>
</group>
<div class="clearfix"/>
</group>

Loading…
Cancel
Save