[IMP] l10n_in: Improve Demo data

5 files changed, 81 insertions, 33 deletions

diff --git a/addons/l10n_in/__manifest__.py b/addons/l10n_in/__manifest__.py
index 324703939fa..8163ddaafda 100644
--- a/addons/l10n_in/__manifest__.py
+++ b/addons/l10n_in/__manifest__.py
@@ -47,10 +47,10 @@ Sheet, now only Vertical format has been permitted Which is Supported By Odoo.
         'data/account_chart_template_data.xml'
     ],
     'demo': [
+        'demo/demo_company.xml',
         'demo/res_partner_demo.xml',
         'demo/product_demo.xml',
         'demo/account_payment_demo.xml',
         'demo/account_invoice_demo.xml',
-        'demo/demo_company.xml',
     ],
 }
diff --git a/addons/l10n_in/demo/account_invoice_demo.xml b/addons/l10n_in/demo/account_invoice_demo.xml
index f4607661fd2..753b3213c5c 100644
--- a/addons/l10n_in/demo/account_invoice_demo.xml
+++ b/addons/l10n_in/demo/account_invoice_demo.xml
@@ -9,12 +9,18 @@
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
+        <field name="l10n_in_gst_treatment">regular</field>
+        <field name="journal_id" model="account.journal"
+            eval="obj().search([
+                ('type', '=', 'sale'),
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="invoice_line_ids" model="account.move.line" eval="[
             (0, 0, {
                 'product_id': ref('product.product_product_8'),
                 'quantity': 2,
                 'price_unit': 40000.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 28),
                     ('tax_group_id', '=', ref('l10n_in.gst_group'))], limit=1).ids)]
@@ -24,6 +30,7 @@
                 'quantity': 3,
                 'price_unit': 400.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 18),
                     ('tax_group_id', '=', ref('l10n_in.gst_group'))], limit=1).ids)]
@@ -33,6 +40,7 @@
                 'quantity': 4,
                 'price_unit': 300.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                        ('company_id', '=', ref('l10n_in.demo_company_in')),
                         ('type_tax_use', '=', 'sale'),
                     '|',
                         '&amp;',
@@ -53,12 +61,18 @@
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
+        <field name="l10n_in_gst_treatment">consumer</field>
+        <field name="journal_id" model="account.journal"
+            eval="obj().search([
+                ('type', '=', 'sale'),
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="invoice_line_ids" model="account.move.line" eval="[
             (0, 0, {
                 'product_id': ref('product.product_product_16'),
                 'quantity': 1,
                 'price_unit': 1500.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 18),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.gst_group').id)], limit=1).ids)]
@@ -68,6 +82,7 @@
                 'quantity': 1,
                 'price_unit': 2300.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 18),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.gst_group').id)], limit=1).ids)]
@@ -77,6 +92,7 @@
                 'quantity': 1,
                 'price_unit': 2600.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 5),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.gst_group').id)], limit=1).ids)]
@@ -86,6 +102,7 @@
                 'quantity': 2,
                 'price_unit': 1655.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 5),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.gst_group').id)], limit=1).ids)]
@@ -100,12 +117,18 @@
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
+        <field name="l10n_in_gst_treatment">consumer</field>
+        <field name="journal_id" model="account.journal"
+            eval="obj().search([
+                ('type', '=', 'sale'),
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="invoice_line_ids" model="account.move.line" eval="[
             (0, 0, {
                 'product_id': ref('product.consu_delivery_01'),
                 'quantity': 3,
                 'price_unit': 90000.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 18),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.igst_group').id)], limit=1).ids)]
@@ -120,22 +143,21 @@
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
-        <field name="l10n_in_export_type">export_with_igst</field>
-        <field name="journal_id" model="account.journal"
-            eval="obj().search([
-                ('type', '=', 'sale'),
-                ('l10n_in_import_export', '=', True),
-                ('company_id', '=', obj().env.company.id)], limit=1).id
-                or obj().search([('type', '=', 'sale')], limit=1).id"/>
+        <field name="l10n_in_gst_treatment">overseas</field>
         <field name="l10n_in_shipping_bill_number">999704</field>
         <field name="l10n_in_shipping_bill_date" eval="time.strftime('%Y-%m')+'-02'"/>
         <field name="l10n_in_shipping_port_code_id" ref="l10n_in.port_code_inixy1"/>
+        <field name="journal_id" model="account.journal"
+            eval="obj().search([
+                ('type', '=', 'sale'),
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="invoice_line_ids" model="account.move.line" eval="[
             (0, 0, {
                 'product_id': ref('product.product_product_4'),
                 'quantity': 30,
                 'price_unit': 8000.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 18),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.igst_group').id)], limit=1).ids)]
@@ -150,12 +172,18 @@
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
+        <field name="l10n_in_gst_treatment">regular</field>
+        <field name="journal_id" model="account.journal"
+            eval="obj().search([
+                ('type', '=', 'sale'),
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="invoice_line_ids" model="account.move.line" eval="[
             (0, 0, {
                 'product_id': ref('product.product_product_1'),
                 'quantity': 2,
                 'price_unit': 25000.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.exempt_group').id)], limit=1).ids)]
             }),
@@ -164,6 +192,7 @@
                 'quantity': 1,
                 'price_unit': 400.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.nil_rated_group').id)], limit=1).ids)]
             }),
@@ -179,12 +208,18 @@
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-02'"/>
         <field name="reversed_entry_id" ref="l10n_in.demo_invoice_b2b"/>
+        <field name="l10n_in_gst_treatment">regular</field>
+        <field name="journal_id" model="account.journal"
+            eval="obj().search([
+                ('type', '=', 'sale'),
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="invoice_line_ids" model="account.move.line" eval="[
             (0, 0, {
                 'product_id': ref('product.product_product_8'),
                 'quantity': 2,
                 'price_unit': 40000.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 28),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.gst_group').id)], limit=1).ids)]
@@ -194,6 +229,7 @@
                 'quantity': 3,
                 'price_unit': 400.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 18),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.gst_group').id)], limit=1).ids)]
@@ -203,6 +239,7 @@
                 'quantity': 3,
                 'price_unit': 400.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                        ('company_id', '=', ref('l10n_in.demo_company_in')),
                         ('type_tax_use', '=', 'sale'),
                     '|',
                         '&amp;',
@@ -219,20 +256,26 @@
     <!-- Demo of cdnr(Credit/ Debit Note for unregistered person). Create credit note for demo b2cl invoice.-->
     <record id="demo_invoice_cdnur" model="account.move">
         <field name="move_type">out_refund</field>
-        <field name="partner_id" ref="l10n_in.res_partner_unregistered_customer"/>
+        <field name="partner_id" ref="l10n_in.res_partner_unregistered_customer_out_state"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-02'"/>
         <field name="reversed_entry_id" ref="l10n_in.demo_invoice_b2cl"/>
+        <field name="l10n_in_gst_treatment">consumer</field>
+        <field name="journal_id" model="account.journal"
+            eval="obj().search([
+                ('type', '=', 'sale'),
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="invoice_line_ids" model="account.move.line" eval="[
             (0, 0, {
                 'product_id': ref('product.consu_delivery_01'),
                 'quantity': 3,
                 'price_unit': 90000.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 18),
-                    ('tax_group_id', '=', obj().env.ref('l10n_in.gst_group').id)], limit=1).ids)]
+                    ('tax_group_id', '=', obj().env.ref('l10n_in.igst_group').id)], limit=1).ids)]
             }),
         ]"/>
     </record>
@@ -245,12 +288,18 @@
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="invoice_date" eval="(datetime.now() + relativedelta(months=1)).strftime('%Y-%m-01')"/>
+        <field name="l10n_in_gst_treatment">regular</field>
+        <field name="journal_id" model="account.journal"
+            eval="obj().search([
+                ('type', '=', 'sale'),
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="invoice_line_ids" model="account.move.line" eval="[
             (0, 0, {
                 'product_id': ref('product.consu_delivery_01'),
                 'quantity': 3,
                 'price_unit': 2000.0,
                 'tax_ids': [(6, 0, obj().tax_ids.search([
+                    ('company_id', '=', ref('l10n_in.demo_company_in')),
                     ('type_tax_use', '=', 'sale'),
                     ('amount','=', 18),
                     ('tax_group_id', '=', obj().env.ref('l10n_in.gst_group').id)], limit=1).ids)]
diff --git a/addons/l10n_in/demo/account_payment_demo.xml b/addons/l10n_in/demo/account_payment_demo.xml
index ecc544ef920..54bfc1f7bd1 100644
--- a/addons/l10n_in/demo/account_payment_demo.xml
+++ b/addons/l10n_in/demo/account_payment_demo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
     <!-- Demo of at(Tax liability on advances). Advance payment need to consideration for which invoices have not been issued in the same month.-->
-	<record id="demo_payment_at" model="account.payment">
+    <record id="demo_payment_at" model="account.payment">
         <field name="partner_id" ref="l10n_in.res_partner_registered_customer"/>
         <field name="partner_type">customer</field>
         <field name="amount">10000</field>
@@ -10,11 +10,11 @@
         <field name="journal_id" model="account.journal"
             eval="obj().search([
                 ('type', '=', 'cash'),
-                ('company_id', '=', obj().env.company.id)], limit=1).id"/>
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).id"/>
         <field name="payment_method_id" model="account.journal"
             eval="obj().search([
                 ('type', '=', 'cash'),
-                ('company_id', '=', obj().env.company.id)], limit=1).inbound_payment_method_ids[0].id"/>
+                ('company_id', '=', ref('l10n_in.demo_company_in'))], limit=1).inbound_payment_method_ids[0].id"/>
     </record>
 
     <function model="account.payment" name="action_post">
diff --git a/addons/l10n_in/demo/product_demo.xml b/addons/l10n_in/demo/product_demo.xml
index a1e705a7765..ee79304e707 100644
--- a/addons/l10n_in/demo/product_demo.xml
+++ b/addons/l10n_in/demo/product_demo.xml
@@ -37,7 +37,7 @@
         <field name="l10n_in_hsn_description">Other furniture and parts thereof.</field>
     </record>
     <record id="product.product_product_7" model="product.product">
-        <field name="l10n_in_hsn_code">4819.60.00</field>
+        <field name="l10n_in_hsn_code">48196000</field>
         <field name="l10n_in_hsn_description">Box files, letter trays, storage boxes and similar articles, of a kind used in offices, shops or the like</field>
     </record>
     <record id="product.product_product_8" model="product.product">
@@ -49,19 +49,19 @@
         <field name="l10n_in_hsn_description">Table, kitchen or other household articles and parts thereof, of iron or steel; iron or steel wool; pot scourers and scouring or polishing pads, gloves and the like, of iron or steel.</field>
     </record>
     <record id="product.product_product_10" model="product.product">
-        <field name="l10n_in_hsn_code">8418.50.00</field>
+        <field name="l10n_in_hsn_code">84185000</field>
         <field name="l10n_in_hsn_description">Other furniture (chests, cabinets, display counters, show-cases and the like) for storage and display, incorporating refrigerating or freezing equipment</field>
     </record>
     <record id="product.product_product_11" model="product.product">
-        <field name="l10n_in_hsn_code">9401.80.00</field>
+        <field name="l10n_in_hsn_code">94018000</field>
         <field name="l10n_in_hsn_description">Seats (other than those of heading 9402), whether or not convertible into beds, and parts thereof</field>
     </record>
     <record id="product.product_product_11b" model="product.product">
-        <field name="l10n_in_hsn_code">9401.80.00</field>
+        <field name="l10n_in_hsn_code">94018000</field>
         <field name="l10n_in_hsn_description">Seats (other than those of heading 9402), whether or not convertible into beds, and parts thereof</field>
     </record>
     <record id="product.product_product_12" model="product.product">
-        <field name="l10n_in_hsn_code">9401.80.00</field>
+        <field name="l10n_in_hsn_code">94018000</field>
         <field name="l10n_in_hsn_description">Seats (other than those of heading 9402), whether or not convertible into beds, and parts thereof</field>
     </record>
     <record id="product.product_product_13" model="product.product">
@@ -69,11 +69,11 @@
         <field name="l10n_in_hsn_description">Other furniture and parts thereof.</field>
     </record>
     <record id="product.product_product_16" model="product.product">
-        <field name="l10n_in_hsn_code">9403.10.90</field>
+        <field name="l10n_in_hsn_code">94031090</field>
         <field name="l10n_in_hsn_description">Metal furniture of a kind used in offices</field>
     </record>
     <record id="product.product_product_20" model="product.product">
-        <field name="l10n_in_hsn_code">3701.10.90</field>
+        <field name="l10n_in_hsn_code">37011090</field>
         <field name="l10n_in_hsn_description">Photographic plates and film in the flat, sensitised, unexposed, of any material other than paper, paperboard or textiles; instant print film in the flat, sensitised, unexposed, whether or not in packs.</field>
     </record>
     <record id="product.product_product_22" model="product.product">
@@ -81,15 +81,15 @@
         <field name="l10n_in_hsn_description">Other furniture and parts thereof.</field>
     </record>
     <record id="product.product_product_24" model="product.product">
-        <field name="l10n_in_hsn_code">9403.10.90</field>
+        <field name="l10n_in_hsn_code">94031090</field>
         <field name="l10n_in_hsn_description">Metal furniture of a kind used in offices</field>
     </record>
     <record id="product.product_product_25" model="product.product">
-        <field name="l10n_in_hsn_code">9403.10.90</field>
+        <field name="l10n_in_hsn_code">94031090</field>
         <field name="l10n_in_hsn_description">Metal furniture of a kind used in offices</field>
     </record>
     <record id="product.product_product_27" model="product.product">
-        <field name="l10n_in_hsn_code">9403.10.90</field>
+        <field name="l10n_in_hsn_code">94031090</field>
         <field name="l10n_in_hsn_description">Metal furniture of a kind used in offices</field>
     </record>
 
@@ -106,11 +106,11 @@
 
     <!-- Physical Products -->
     <record id="product.product_delivery_01" model="product.product">
-        <field name="l10n_in_hsn_code">9401.80.00</field>
+        <field name="l10n_in_hsn_code">94018000</field>
         <field name="l10n_in_hsn_description">Seats (other than those of heading 9402), whether or not convertible into beds, and parts thereof</field>
     </record>
     <record id="product.product_delivery_02" model="product.product">
-        <field name="l10n_in_hsn_code">9405.10.90</field>
+        <field name="l10n_in_hsn_code">94051090</field>
         <field name="l10n_in_hsn_description">Lamps and lighting fittings including searchlights and spotlights and parts thereof, not elsewhere specified or included; illuminated signs, illuminated name-plates and the like, having a permanently fixed light source, and parts thereof not elsewhere specified or included</field>
     </record>
     <record id="product.product_order_01" model="product.product">
diff --git a/addons/l10n_in/demo/res_partner_demo.xml b/addons/l10n_in/demo/res_partner_demo.xml
index 9876146414e..3562e34824d 100644
--- a/addons/l10n_in/demo/res_partner_demo.xml
+++ b/addons/l10n_in/demo/res_partner_demo.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo noupdate="1">
-	<!-- Update main company -->
-    <record id="base.main_company" model="res.company">
-        <field name="state_id" ref="base.state_in_gj"/>
-        <field name="vat">24BBBFF5679L8ZR</field>
-    </record>
-
     <record id="res_partner_category_registered" model="res.partner.category">
         <field name="name">Registered</field>
         <field name="color" eval="2"/>
@@ -24,6 +18,7 @@
         <field name="name">Registered Customer</field>
         <field eval="[(6, 0, [ref('l10n_in.res_partner_category_registered')])]" name="category_id"/>
         <field name="is_company">1</field>
+        <field name="l10n_in_gst_treatment">regular</field>
         <field name="street">201, Second Floor, IT Tower 4</field>
         <field name="street2">InfoCity Gate - 1, Infocity</field>
         <field name="city">Gandhinagar</field>
@@ -36,6 +31,7 @@
     <!-- Unregistered Customer -->
     <record id="res_partner_unregistered_customer" model="res.partner">
         <field name="name">Unregistered Customer</field>
+        <field name="l10n_in_gst_treatment">unregistered</field>
         <field eval="[(6, 0, [ref('l10n_in.res_partner_category_unregistered')])]" name="category_id"/>
         <field name="is_company">1</field>
         <field name="street">B105, yogeshwar Tower</field>
@@ -60,6 +56,7 @@
     <!-- Registered Customer -->
     <record id="res_partner_registered_supplier" model="res.partner">
         <field name="name">Registered Supplier</field>
+        <field name="l10n_in_gst_treatment">regular</field>
         <field eval="[(6, 0, [ref('l10n_in.res_partner_category_registered')])]" name="category_id"/>
         <field name="is_company">1</field>
         <field name="street">201, Second Floor, IT Tower 4</field>
@@ -68,13 +65,14 @@
         <field name="zip">382007</field>
         <field name="state_id" ref="base.state_in_gj"/>
         <field name="country_id" ref="base.in"/>
-        <field name="vat">12GEOPS0823BBZH</field>
+        <field name="vat">12GEOPS0823BBZ1</field>
     </record>
 
     <!-- Unregistered Customer -->
     <record id="res_partner_unregistered_supplier" model="res.partner">
         <field name="name">Unregistered Supplier</field>
         <field eval="[(6, 0, [ref('l10n_in.res_partner_category_unregistered')])]" name="category_id"/>
+        <field name="l10n_in_gst_treatment">unregistered</field>
         <field name="street">B105, yogeshwar Tower</field>
         <field name="city">Veraval</field>
         <field name="zip">362266</field>
@@ -88,10 +86,11 @@
         <field eval="[(6, 0, [ref('l10n_in.res_partner_category_reseller'),
             ref('l10n_in.res_partner_category_registered')])]" name="category_id"/>
         <field name="street">4/001 Ground Floor, 16th Main Rd,</field>
+        <field name="l10n_in_gst_treatment">regular</field>
         <field name="city">Bengaluru</field>
         <field name="zip">560001</field>
         <field name="state_id" ref="base.state_in_ka"/>
         <field name="country_id" ref="base.in"/>
-        <field name="vat">12AJIPA1572E1C7</field>
+        <field name="vat">29AJIPA1572E1ZR</field>
     </record>
 </odoo>