pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: remove sale/purchase sequence from res_config

Browse Source
This commit is contained in:
Cedric Snauwaert
2015-06-19 16:06:10 +02:00
committed by qdp-odoo
parent ce8ad842a2
commit 4efb35f2af
2 changed files with 0 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/res_config.py
-22
View File
@@ -67,15 +67,6 @@ class AccountConfigSettings(models.TransientModel):
fiscalyear_last_month = fields.Selection([(1, 'January'), (2, 'February'), (3, 'March'), (4, 'April'), (5, 'May'), (6, 'June'), (7, 'July'), (8, 'August'), (9, 'September'), (10, 'October'), (11, 'November'), (12, 'December')], related='company_id.fiscalyear_last_month', default=12)
period_lock_date = fields.Date(related='company_id.period_lock_date', help="Only users with the 'Adviser' role can edit accounts prior to and inclusive of this date")
fiscalyear_lock_date = fields.Date(string="Fiscal Year lock date", related='company_id.fiscalyear_lock_date', help="No users, including Advisers, can edit accounts prior to and inclusive of this date")
sale_journal_id = fields.Many2one('account.journal', string='Sale journal')
sale_sequence_prefix = fields.Char(related='sale_journal_id.sequence_id.prefix', string='Invoice sequence')
sale_sequence_next = fields.Integer(related='sale_journal_id.sequence_id.number_next',
string='Next invoice number')
purchase_journal_id = fields.Many2one('account.journal', string='Purchase journal')
purchase_sequence_prefix = fields.Char(related='purchase_journal_id.sequence_id.prefix',
string='Supplier bill sequence')
purchase_sequence_next = fields.Integer(related='purchase_journal_id.sequence_id.number_next',
string='Next supplier bill number')
module_account_check_writing = fields.Boolean(string='Pay your suppliers by check',
help='This allows you to check writing and printing.\n'
@@ -171,19 +162,6 @@ class AccountConfigSettings(models.TransientModel):
self.bank_account_code_char = company.bank_account_code_char
self.code_digits = company.accounts_code_digits
# update journals and sequences
self.purchase_journal_id = self.purchase_sequence_prefix = self.purchase_sequence_next = False
self.sale_journal_id = self.sale_sequence_prefix = self.sale_sequence_next = False
journals = self.env['account.journal'].search([('company_id', '=', self.company_id.id)])
for journal in journals:
if journal.type == 'purchase':
self.purchase_journal_id = journal
self.purchase_sequence_prefix = journal.sequence_id.prefix
self.purchase_sequence_next = journal.sequence_id.number_next
elif journal.type == 'sale':
self.sale_journal_id = journal
self.sale_sequence_prefix = journal.sequence_id.prefix
self.sale_sequence_next = journal.sequence_id.number_next
# update taxes
ir_values = self.env['ir.values']
taxes_id = ir_values.get_default('product.template', 'taxes_id', company_id = self.company_id.id)
addons/account/views/res_config_view.xml
-20
View File
@@ -169,15 +169,6 @@
domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]"
class="oe_inline"/>
</div>
<div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
<label for="sale_sequence_next"/>
<field name="sale_sequence_prefix"
class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="sale_sequence_next"
class="oe_inline"
attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</div>
<div>
<field name="group_proforma_invoices" class="oe_inline"/>
<label for="group_proforma_invoices"/>
@@ -205,15 +196,6 @@
domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
class="oe_inline"/>
</div>
<div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
<label for="purchase_sequence_next"/>
<field name="purchase_sequence_prefix"
class="oe_inline"
help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<field name="purchase_sequence_next"
class="oe_inline"
attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</div>
<div>
<field name="module_account_check_writing" class="oe_inline"/>
<label for="module_account_check_writing"/>
@@ -269,8 +251,6 @@
<label for="id" string="Purchase"/>
<div/>
</group>
<field name="sale_journal_id" invisible="1"/>
<field name="purchase_journal_id" invisible="1"/>
</form>
</field>
</record>