Merge 9448f42 into 455be2b

account_cutoff_accrual_base/__manifest__.py

@@ -16,9 +16,9 @@
         'account_cutoff_base',
     ],
     'data': [
-        'views/company_view.xml',
         'views/account_view.xml',
         'views/account_cutoff_view.xml',
+        'views/res_config_settings.xml',
     ],
     'installable': True,
 }

account_cutoff_accrual_base/models/__init__.py

@@ -5,3 +5,4 @@
 from . import company
 from . import account
 from . import account_cutoff
+from . import res_config_settings

account_cutoff_accrual_base/models/res_config_settings.py

@@ -0,0 +1,57 @@
+# Copyright 2018 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+from odoo import api, fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    default_accrued_revenue_account_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Default Account for Accrued Revenues',
+        domain=[('deprecated', '=', False)],
+    )
+
+    default_accrued_expense_account_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Default Account for Accrued Expenses',
+        domain=[('deprecated', '=', False)],
+    )
+
+    default_accrual_revenue_journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        string='Default Journal for Accrued Revenues'
+    )
+
+    default_accrual_expense_journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        string='Default Journal for Accrued Expenses'
+    )
+
+    config_fields = [
+        'default_accrued_revenue_account_id',
+        'default_accrued_expense_account_id',
+        'default_accrual_revenue_journal_id',
+        'default_accrual_expense_journal_id',
+    ]
+
+    @api.multi
+    def get_values(self):
+        res = super(ResConfigSettings, self).get_values()
+        company = self.env.user.company_id
+        values = dict(
+            [(field, company[field].id) for field in self.config_fields]
+        )
+        res.update(values)
+        return res
+
+    @api.multi
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
+        company = self.env.user.company_id
+
+        values = dict(
+            [(field, self[field]) for field in self.config_fields]
+        )
+        company.update(values)

account_cutoff_accrual_base/views/res_config_settings.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+      <field name="name">res.config.settings.view.form.inherit.account</field>
+      <field name="model">res.config.settings</field>
+      <field name="priority" eval="50"/>
+      <field name="inherit_id" ref="account_cutoff_base.res_config_settings_view_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//div[@name='account_closing_cutoffs']" position="inside">
+
+          <div class="col-xs-12 col-md-12 o_setting_box">
+            <div class="o_setting_left_pane">
+            </div>
+            <div class="o_setting_right_pane">
+              <label string="Accruals"/>
+              <div class="content-group">
+                <div class="row mt16">
+
+                  <label string="Account for Accrued Expense" class="col-md-3 o_light_label"/>
+                  <field name="default_accrued_expense_account_id" />
+                  <label string="Account for Accrued Revenue" class="col-md-3 o_light_label"/>
+                  <field name="default_accrued_revenue_account_id" />
+                  <label string="Journal for Accrued Expenses" class="col-md-3 o_light_label"/>
+                  <field name="default_accrual_expense_journal_id" />
+                  <label string="Journal for Accrued Revenues" class="col-md-3 o_light_label"/>
+                  <field name="default_accrual_revenue_journal_id" />
+
+                </div>
+              </div>
+            </div>
+          </div>
+
+        </xpath>
+      </field>
+    </record>
+
+  </data>
+</odoo>

account_cutoff_base/__manifest__.py

@@ -16,8 +16,8 @@
     'data': [
         'security/account_cutoff_base_security.xml',
         'security/ir.model.access.csv',
-        'views/company.xml',
         'views/account_cutoff.xml',
+        'views/res_config_settings.xml',
     ],
     'installable': True,
 }

account_cutoff_base/models/__init__.py

@@ -1,2 +1,3 @@
 from . import account_cutoff
 from . import company
+from . import res_config_settings

account_cutoff_base/models/res_config_settings.py

@@ -0,0 +1,28 @@
+# Copyright 2018 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+from odoo import api, fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    default_cutoff_journal_id = fields.Many2one(
+        'account.journal',
+        string='Default Cut-off Journal'
+    )
+
+    @api.multi
+    def get_values(self):
+        res = super(ResConfigSettings, self).get_values()
+        company = self.env.user.company_id
+        res.update({
+            'default_cutoff_journal_id':company.default_cutoff_journal_id.id
+        })
+        return res
+
+    @api.multi
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
+        company = self.env.user.company_id
+        company.default_cutoff_journal_id = self.default_cutoff_journal_id

account_cutoff_base/views/res_config_settings.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+      <field name="name">res.config.settings.view.form.inherit.account</field>
+      <field name="model">res.config.settings</field>
+      <field name="priority" eval="50"/>
+      <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//div[@id='accounting_reports']" position="after">
+
+          <h2>Account Closing Cut-offs</h2>
+          <div name="account_closing_cutoffs" class="row mt16 o_settings_container" title="">
+            <div class="col-xs-12 col-md-12 o_setting_box">
+              <div class="o_setting_left_pane">
+              </div>
+              <div class="o_setting_right_pane">
+                <div class="content-group">
+                  <div class="row mt16">
+                    <label string="Default Cut-off Journal" class="col-md-3 o_light_label"/>
+                    <field name="default_cutoff_journal_id" />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+        </xpath>
+      </field>
+    </record>
+
+  </data>
+</odoo>

account_cutoff_prepaid/__manifest__.py

@@ -15,8 +15,8 @@
         'account_invoice_start_end_dates',
     ],
     'data': [
-        'views/company.xml',
         'views/account_cutoff.xml',
+        'views/res_config_settings.xml',
     ],
     'images': [
         'images/prepaid_revenue_draft.jpg',

account_cutoff_prepaid/models/__init__.py

@@ -1,2 +1,3 @@
 from . import company
 from . import account_cutoff
+from . import res_config_settings

account_cutoff_prepaid/models/res_config_settings.py

@@ -0,0 +1,36 @@
+# Copyright 2018 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+from odoo import api, fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    default_prepaid_revenue_account_id = fields.Many2one(
+        'account.account',
+        string='Default Account for Prepaid Revenue',
+        domain=[('deprecated', '=', False)]
+    )
+    default_prepaid_expense_account_id = fields.Many2one(
+        'account.account',
+        string='Default Account for Prepaid Expense',
+        domain=[('deprecated', '=', False)]
+    )
+
+    @api.multi
+    def get_values(self):
+        res = super(ResConfigSettings, self).get_values()
+        company = self.env.user.company_id
+        res.update({
+            'default_prepaid_revenue_account_id':company.default_prepaid_revenue_account_id.id,
+            'default_prepaid_expense_account_id':company.default_prepaid_expense_account_id.id,
+        })
+        return res
+
+    @api.multi
+    def set_values(self):
+        super(ResConfigSettings, self).set_values()
+        company = self.env.user.company_id
+        company.default_prepaid_expense_account_id  = self.default_prepaid_expense_account_id
+        company.default_prepaid_revenue_account_id = self.default_prepaid_revenue_account_id

account_cutoff_prepaid/views/res_config_settings.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+      <field name="name">res.config.settings.view.form.inherit.account</field>
+      <field name="model">res.config.settings</field>
+      <field name="priority" eval="50"/>
+      <field name="inherit_id" ref="account_cutoff_base.res_config_settings_view_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//div[@name='account_closing_cutoffs']" position="inside">
+          <div class="col-xs-12 col-md-12 o_setting_box">
+            <div class="o_setting_left_pane">
+            </div>
+            <div class="o_setting_right_pane">
+              <label string="Cutoff prepaid"/>
+              <div class="content-group">
+                <div class="row mt16">
+                  <label string="Account for Prepaid Expense" class="col-md-3 o_light_label"/>
+                  <field name="default_prepaid_expense_account_id" />
+                  <label string="Account for Prepaid Revenue" class="col-md-3 o_light_label"/>
+                  <field name="default_prepaid_revenue_account_id" />
+                </div>
+              </div>
+            </div>
+          </div>
+
+        </xpath>
+      </field>
+    </record>
+
+  </data>
+</odoo>