audrius/account-reconcile
1
0
Fork 1
mirror of https://github.com/OCA/account-reconcile.git synced 2025-01-20 12:27:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #179 from vrenaville/9.0_write_off_analytic

Browse Source 
9.0 write off analytic
This commit is contained in:
Guewen Baconnier
2017-11-23 17:07:54 +01:00
committed by GitHub
parent 269a29ec18 c0ead05883
commit b9f943382d
5 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
account_mass_reconcile/i18n/account_easy_reconcile.pot
View File

@@ -600,3 +600,16 @@ msgstr "mass.reconcile.advanced"
#: model:ir.model,name:account_mass_reconcile.model_mass_reconcile_advanced_ref
msgid "mass.reconcile.advanced.ref"
msgstr "mass.reconcile.advanced.ref"
#. module: account_mass_reconcile
#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile_method_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_advanced_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_advanced_ref_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_base_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_options_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_simple_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_simple_name_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_simple_partner_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_simple_reference_analytic_account_id
msgid "Analytic account for write-off"
msgstr ""

13
account_mass_reconcile/i18n/fr.po
View File

@@ -688,3 +688,16 @@ msgstr ""
#: model:ir.model,name:account_mass_reconcile.model_account_mass_reconcile_method
msgid "reconcile method for account_mass_reconcile"
msgstr "Méthode de lettrage"
#. module: account_mass_reconcile
#: model:ir.model.fields,field_description:account_mass_reconcile.field_account_mass_reconcile_method_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_advanced_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_advanced_ref_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_base_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_options_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_simple_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_simple_name_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_simple_partner_analytic_account_id
#: model:ir.model.fields,field_description:account_mass_reconcile.field_mass_reconcile_simple_reference_analytic_account_id
msgid "Analytic account for write-off"
msgstr "Compte analytique pour les écritures d'écart"

3
account_mass_reconcile/models/base_reconciliation.py
View File

@@ -160,6 +160,9 @@ class MassReconcileBase(models.AbstractModel):
else:
writeoff_account = self.account_lost_id
line_rs = ml_obj.browse(line_ids)
if self.analytic_account_id:
line_rs = line_rs.with_context(
analytic_id=self.analytic_account_id.id)
line_rs.reconcile(
writeoff_acc_id=writeoff_account,
writeoff_journal_id=self.journal_id

4
account_mass_reconcile/models/mass_reconcile.py
View File

@@ -48,6 +48,8 @@ class MassReconcileOptions(models.AbstractModel):
expense_exchange_account_id = fields.Many2one('account.account',
string='Loss Exchange '
'Rate Account')
analytic_account_id = fields.Many2one(
'account.analytic.account', string='Analytic account for write-off')
class AccountMassReconcileMethod(models.Model):
@@ -149,6 +151,8 @@ class AccountMassReconcile(models.Model):
'write_off': rec_method.write_off,
'account_lost_id': (rec_method.account_lost_id.id),
'account_profit_id': (rec_method.account_profit_id.id),
'analytic_account_id': (
rec_method.analytic_account_id.id),
'income_exchange_account_id':
(rec_method.income_exchange_account_id.id),
'expense_exchange_account_id':

1
account_mass_reconcile/views/mass_reconcile.xml
View File

@@ -126,6 +126,7 @@ The lines should have the same partner, and the credit entry ref. is matched wit
<field name="income_exchange_account_id" groups="base.group_multi_currency"/>
<field name="expense_exchange_account_id" groups="base.group_multi_currency"/>
<field name="journal_id" attrs="{'required':[('write_off','>',0)]}"/>
<field name="analytic_account_id"/>
<field name="date_base_on"/>
</tree>
</field>