Merge pull request OCA#310 from yterrettaz/release_golive

[BSSFL-272] Update res.company - Cutoff
sambarros · Dec 22, 2017 · 9a40270 · 9a40270
2 parents 2b9da99 + 5ea4abe
commit 9a40270
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -29,6 +29,7 @@ latest (unreleased)
 * BSSFL-418: Settings email
 * BSSFL-365: Import repair line
 * BSSFL-402: Add date delivered field on DO
+* BSSFL-272 : Update res.company to include account cutoff settings
 
 **Bugfixes**
 

diff --git a/odoo/data/install/res.company.cutoff.csv b/odoo/data/install/res.company.cutoff.csv
@@ -0,0 +1,3 @@
+id,parent_id/id,name,street,street2,city,zip,state_id/id,country_id/id,website,phone,fax,email,vat,company_registry,currency_id/id,rml_header1,default_accrued_expense_account_id/id,default_accrued_revenue_account_id/id,default_prepaid_expense_account_id/id,default_prepaid_revenue_account_id/id,default_cutoff_journal_id/id,default_accrual_expense_journal_id/id,default_accrual_revenue_journal_id/id
+base.main_company,,senseFly SA,Route de Gen??ve 38,,Cheseaux-Lausanne,1033,,base.ch,www.sensefly.com,+41 (0)21 552 04 44,,info@sensefly.com,CHE-115.246.272 MWST,CHE-115.246.272,base.CHF,,__setup__.account_account_416,__setup__.account_account_128,__setup__.account_account_1628,__setup__.account_account_417,__setup__.account_journal_5,__setup__.account_journal_5,__setup__.account_journal_5
+__setup__.company_inc,,senseFly Inc,205 New York Avenue NW,,Washington DC,20001,base.state_us_9,base.us,www.sensefly.com,,,,,26--3264326,base.USD,,__setup__.account_account_2079,,__setup__.account_account_1843,__setup__.account_account_2051,__setup__.account_journal_123,__setup__.account_journal_123,__setup__.account_journal_123
diff --git a/odoo/songs/install/data_all.py b/odoo/songs/install/data_all.py
@@ -111,7 +111,7 @@ def delete_account(ctx):
     records = [
         {k: v for k, v in row.items()}
         for row in csv.DictReader(content, skipinitialspace=True)
-        ]
+    ]
 
     # Delete data
     for record in records:
@@ -151,7 +151,7 @@ def delete_account_journal(ctx):
     records = [
         {k: v for k, v in row.items()}
         for row in csv.DictReader(content, skipinitialspace=True)
-        ]
+    ]
 
     # Delete data
     for record in records:
@@ -254,7 +254,7 @@ def delete_payment_term(ctx):
         'account.account_payment_term_15days',
         'account.account_payment_term_net',
         'account.account_payment_term_immediate'
-        ]
+    ]
 
     # Delete data
     for record in records:
@@ -420,10 +420,10 @@ def create_rma_route(ctx):
                       'name': 'senseFly SA: RMA Pick + Pack + Ship',
                       'warehouse_ids': [
                           (4, ctx.env.ref('stock.warehouse0').id)
-                      ],
-                      'sale_selectable': True,
-                      'sequence': 20,
-                      'pull_ids': [
+                     ],
+                         'sale_selectable': True,
+                         'sequence': 20,
+                         'pull_ids': [
                           (4, ctx.env.ref(
                               '__setup__.procurement_rule_rma_packs_sa')
                            .id),
@@ -433,8 +433,8 @@ def create_rma_route(ctx):
                           (4, ctx.env.ref(
                               '__setup__.'
                               'procurement_rule_rma_pickup_customers_sa').id)
-                      ]
-                      })
+                     ]
+                     })
 
 
 @anthem.log
@@ -451,6 +451,13 @@ def import_currency_rate(ctx):
              'res.currency.rate')
 
 
+@anthem.log
+def import_cutoff_settings(ctx):
+    """ Importing settings cutoff from csv """
+    load_csv(ctx, 's3://prod-sf-odoo-data/install/res.company.cutoff.csv',
+             'res.company')
+
+
 @anthem.log
 def main(ctx):
     """ Loading data """
@@ -486,3 +493,4 @@ def main(ctx):
     create_rma_route(ctx)
     import_delivery_methode(ctx)
     import_currency_rate(ctx)
+    import_cutoff_settings(ctx)