Browse Source

Dec 31: [FIX] Bug Fixed 'sale_discount_total'

pull/358/merge
Cybrosys Technologies 4 months ago
parent
commit
4299283230
  1. 4
      sale_discount_total/__manifest__.py
  2. 5
      sale_discount_total/doc/RELEASE_NOTES.md
  3. 14
      sale_discount_total/models/sale_order.py
  4. 32
      sale_discount_total/static/description/index.html
  5. 1
      sale_discount_total/views/sale_order_views.xml

4
sale_discount_total/__manifest__.py

@ -21,7 +21,7 @@
#############################################################################
{
'name': 'Sale Discount on Total Amount',
'version': '18.0.1.0.0',
'version': '18.0.1.1.0',
'category': 'Sales Management',
'summary': "Discount on Total in Sale and Invoice With Discount Limit "
"and Approval",
@ -36,7 +36,7 @@
'maintainer': 'Cybrosys Techno Solutions',
'website': "https://www.cybrosys.com",
'live_test_url': 'https://www.youtube.com/watch?v=CigmHe9iC4s&feature=youtu.be',
'depends': ['sale_management', 'account'],
'depends': ['sale_management', 'account',],
'data': [
'views/res_config_settings_views.xml',
'views/sale_order_views.xml',

5
sale_discount_total/doc/RELEASE_NOTES.md

@ -4,3 +4,8 @@
#### Version 18.0.1.0.0
#### ADD
- Initial commit for Sale Discount On Total Amount
#### 31.12.2024
#### Version 18.0.1.1.0
#### ADD
- Added margin on sale Orders

14
sale_discount_total/models/sale_order.py

@ -65,6 +65,20 @@ 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"""

32
sale_discount_total/static/description/index.html

@ -729,7 +729,37 @@
style="color:#7A7979;">
<ul class="pl-3 mb-0">
<li>
Initial Commit
Initial commit for Sale Discount On Total Amount
</li>
</ul>
</div>
</div>
<div style="padding:0 0 0; border-bottom:1px solid #E3E3E3">
</div>
</div>
</div>
<div class="row pt-5 m-0">
<div class="col-md-3">
<h4 style="font-size:16px; font-weight:600; color:#514F4F; margin:0; line-height:26px;">
Latest Release 18.0.1.1.0
</h4>
<span style="font-size:14px; color:#7A7979; display:block; margin-bottom:20px;">
31st December, 2024
</span>
</div>
<div class="col-md-8">
<div style="padding:0 0 40px">
<div style="margin:0 0 10px">
<div style="display:inline-block; padding:0px 8px; color:#514F4F; background-color:#FFD8D8; border-radius:20px">
Add
</div>
</div>
<div class="d-flex m-0"
style="color:#7A7979;">
<ul class="pl-3 mb-0">
<li>
Added Margin on sale order
</li>
</ul>

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