From d83763627d6dbfa3d8fbd77a7a769076f8ecdd74 Mon Sep 17 00:00:00 2001 From: Jigar Vaghela Date: Mon, 11 Nov 2019 06:14:00 +0000 Subject: [PATCH] [IMP] l10n_in_sale: Simplify GST sale order GST Treatment: * Is show that how This sale order is treated in GST * Set default value in customer * This is help in GST retrun filing. * Value of treamtmnet as below - Registered Business - Regular - Registered Business - Composition - Unregistered Business - Consumer - Overseas - Special Economic Zone - Deemed Export * GSTIN is required in - Registered Business - Regular - Registered Business - Composition - Special Economic Zone - Deemed Export Shipping GSTIN: * GST identification number or GST number * There can be multiple GSTIN for a single person, being an assessee under the Income Tax Act for every State or Union Territory in which such person operates from * So When specific invoice and delivery addresses is enabled then user can enter able to enter "Shipping GSTIN" on shipping address of partner * Add Validate of this number using regular expression --- addons/l10n_in_sale/__manifest__.py | 3 +- addons/l10n_in_sale/models/__init__.py | 2 ++ addons/l10n_in_sale/models/account_move.py | 16 +++++++++ addons/l10n_in_sale/models/res_partner.py | 18 ++++++++++ addons/l10n_in_sale/models/sale_order.py | 36 ++++++++++++++----- .../l10n_in_sale/views/res_partner_views.xml | 17 +++++++++ addons/l10n_in_sale/views/sale_views.xml | 8 +++-- 7 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 addons/l10n_in_sale/models/account_move.py create mode 100644 addons/l10n_in_sale/models/res_partner.py create mode 100644 addons/l10n_in_sale/views/res_partner_views.xml diff --git a/addons/l10n_in_sale/__manifest__.py b/addons/l10n_in_sale/__manifest__.py index 4a8e07f6f7a..20d5bf11b71 100644 --- a/addons/l10n_in_sale/__manifest__.py +++ b/addons/l10n_in_sale/__manifest__.py @@ -12,7 +12,8 @@ ], 'data': [ 'views/report_sale_order.xml', - 'views/sale_views.xml' + 'views/sale_views.xml', + 'views/res_partner_views.xml', ], 'demo': [ 'data/product_demo.xml', diff --git a/addons/l10n_in_sale/models/__init__.py b/addons/l10n_in_sale/models/__init__.py index 00b62d54b4a..37c5b03ac99 100644 --- a/addons/l10n_in_sale/models/__init__.py +++ b/addons/l10n_in_sale/models/__init__.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from . import res_partner from . import sale_order +from . import account_move diff --git a/addons/l10n_in_sale/models/account_move.py b/addons/l10n_in_sale/models/account_move.py new file mode 100644 index 00000000000..d3c12edee78 --- /dev/null +++ b/addons/l10n_in_sale/models/account_move.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, models + + +class AccountMove(models.Model): + _inherit = "account.move" + + def _l10n_in_get_shipping_partner(self): + shipping_partner = super()._l10n_in_get_shipping_partner() + return self.partner_shipping_id or shipping_partner + + @api.model + def _l10n_in_get_shipping_partner_gstin(self, shipping_partner): + return shipping_partner.l10n_in_shipping_gstin or shipping_partner.vat diff --git a/addons/l10n_in_sale/models/res_partner.py b/addons/l10n_in_sale/models/res_partner.py new file mode 100644 index 00000000000..6e5604897e3 --- /dev/null +++ b/addons/l10n_in_sale/models/res_partner.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import api, fields, models, _ +from odoo.exceptions import ValidationError + + +class ResPartner(models.Model): + _inherit = 'res.partner' + + l10n_in_shipping_gstin = fields.Char("Shipping GSTIN") + + @api.constrains('l10n_in_shipping_gstin') + def _check_l10n_in_shipping_gstin(self): + check_vat_in = self.env['res.partner'].check_vat_in + wrong_shipping_gstin_partner = self.filtered(lambda p: p.l10n_in_shipping_gstin and not check_vat_in(p.l10n_in_shipping_gstin)) + if wrong_shipping_gstin_partner: + raise ValidationError(_("The shipping GSTIN number [%s] does not seem to be valid") %(",".join(p.l10n_in_shipping_gstin for p in wrong_shipping_gstin_partner))) diff --git a/addons/l10n_in_sale/models/sale_order.py b/addons/l10n_in_sale/models/sale_order.py index 7062c0685af..316246e12e4 100644 --- a/addons/l10n_in_sale/models/sale_order.py +++ b/addons/l10n_in_sale/models/sale_order.py @@ -8,20 +8,38 @@ class SaleOrder(models.Model): _inherit = "sale.order" l10n_in_reseller_partner_id = fields.Many2one('res.partner', - string='Reseller', domain="[('vat', '!=', False), '|', ('company_id', '=', False), ('company_id', '=', company_id)]", states={'posted': [('readonly', True)]}) - l10n_in_journal_id = fields.Many2one('account.journal', string="Journal", states={'posted': [('readonly', True)]}) + string='Reseller', domain="[('vat', '!=', False), '|', ('company_id', '=', False), ('company_id', '=', company_id)]", readonly=True, states={'draft': [('readonly', False)]}) + l10n_in_journal_id = fields.Many2one('account.journal', string="Journal", readonly=True, states={'draft': [('readonly', False)]}) + l10n_in_gst_treatment = fields.Selection([ + ('regular', 'Registered Business - Regular'), + ('composition', 'Registered Business - Composition'), + ('unregistered', 'Unregistered Business'), + ('consumer', 'Consumer'), + ('overseas', 'Overseas'), + ('special_economic_zone', 'Special Economic Zone'), + ('deemed_export', 'Deemed Export'), + ], string="GST Treatment", readonly=True, states={'draft': [('readonly', False)]}) + l10n_in_company_country_code = fields.Char(related='company_id.country_id.code', string="Country code") def _prepare_invoice(self): invoice_vals = super(SaleOrder, self)._prepare_invoice() - invoice_vals['l10n_in_reseller_partner_id'] = self.l10n_in_reseller_partner_id.id - if self.l10n_in_journal_id: - invoice_vals['journal_id'] = self.l10n_in_journal_id.id + if self.l10n_in_company_country_code == 'IN': + invoice_vals['l10n_in_reseller_partner_id'] = self.l10n_in_reseller_partner_id.id + if self.l10n_in_journal_id: + invoice_vals['journal_id'] = self.l10n_in_journal_id.id + invoice_vals['l10n_in_gst_treatment'] = self.l10n_in_gst_treatment return invoice_vals @api.onchange('company_id') def l10n_in_onchange_company_id(self): - domain = [('company_id', '=', self.company_id.id), ('type', '=', 'sale')] + if self.l10n_in_company_country_code == 'IN': + domain = [('company_id', '=', self.company_id.id), ('type', '=', 'sale')] + journal = self.env['account.journal'].search(domain, limit=1) + if journal: + self.l10n_in_journal_id = journal.id - journal = self.env['account.journal'].search(domain, limit=1) - if journal: - self.l10n_in_journal_id = journal.id + @api.onchange('partner_id') + def onchange_partner_id(self): + if self.l10n_in_company_country_code == 'IN': + self.l10n_in_gst_treatment = self.partner_id.l10n_in_gst_treatment + return super().onchange_partner_id() diff --git a/addons/l10n_in_sale/views/res_partner_views.xml b/addons/l10n_in_sale/views/res_partner_views.xml new file mode 100644 index 00000000000..862aec46aae --- /dev/null +++ b/addons/l10n_in_sale/views/res_partner_views.xml @@ -0,0 +1,17 @@ + + + + l10n.in.res.partner.vat.inherit + res.partner + + + + + + + + + + + + diff --git a/addons/l10n_in_sale/views/sale_views.xml b/addons/l10n_in_sale/views/sale_views.xml index af9ad82b80e..03f9a0a0a2b 100644 --- a/addons/l10n_in_sale/views/sale_views.xml +++ b/addons/l10n_in_sale/views/sale_views.xml @@ -6,10 +6,14 @@ - + + + - +