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

[IMP] account: usability improvements

Browse Source
This commit is contained in:
qdp-odoo
2015-05-25 22:41:54 +02:00
committed by Quentin De Paoli
parent 94e441a2b5
commit dd3eea09c6
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_journal_dashboard.py
+3 -3
View File
@@ -184,9 +184,9 @@ class account_journal(models.Model):
'number_draft': number_draft,
'number_waiting': number_waiting,
'number_late': number_late,
'sum_draft': formatLang(self.env, sum_draft, currency_obj=self.currency_id or self.company_id.currency_id),
'sum_waiting': formatLang(self.env, sum_waiting, currency_obj=self.currency_id or self.company_id.currency_id),
'sum_late': formatLang(self.env, sum_late, currency_obj=self.currency_id or self.company_id.currency_id),
'sum_draft': formatLang(self.env, sum_draft or 0.0, currency_obj=self.currency_id or self.company_id.currency_id),
'sum_waiting': formatLang(self.env, sum_waiting or 0.0, currency_obj=self.currency_id or self.company_id.currency_id),
'sum_late': formatLang(self.env, sum_late or 0.0, currency_obj=self.currency_id or self.company_id.currency_id),
'currency_id': self.currency_id and self.currency_id.id or self.company_id.currency_id.id,
'show_import': True if self.type in ['bank', 'cash'] and len(ac_bnk_stmt) == 0 and last_balance == 0 else False,
}
addons/account/views/account_invoice_view.xml
+3 -6
View File
@@ -242,17 +242,13 @@
<field string="Supplier" name="partner_id"
context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
domain="[('supplier', '=', True)]"/>
<field name="fiscal_position_id" options="{'no_create': True}"/>
<field name="reference" string="Supplier Reference"/>
</group>
<group>
<field name="reference" string="Supplier Reference"/>
<field name="origin" attrs="{'invisible': [('origin', '=', False)]}"/>
<field name="date_invoice" />
<field name="date_due"/>
<field name="move_name" invisible="1"/>
<field name="journal_id" groups="account.group_account_user"
options="{'no_create': True}"
attrs="{'readonly':[('move_name','!=',False)]}"/>
<field name="currency_id" groups="base.group_multi_currency"/>
<field name="company_currency_id" invisible="1"/>
<field name="check_total" groups="account.group_supplier_inv_check_total"/>
@@ -328,6 +324,7 @@
<field name="payment_term_id" options="{'no_create': True}"/>
</group>
<group>
<field name="fiscal_position_id" options="{'no_create': True}" placeholder="Auto-detect"/>
<field name="move_id" groups="account.group_account_manager" attrs="{'invisible': [('move_id', '=', False)]}"/>
<field name="date" domain="[('state', '=', 'draft'), ('company_id', '=', company_id)]" groups="account.group_account_user"/>
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
@@ -454,7 +451,7 @@
<field name="reconciled" invisible="1"/>
<field name="outstanding_credits_debits_widget" colspan="2" nolabel="1" widget="payment" attrs="{'invisible': [('state', 'not in', 'open')]}"/>
</group>
<field name="comment" class="oe_inline" placeholder="Additional notes..."/>
<field name="comment" class="oe_inline" placeholder="Terms and conditions..."/>
</page>
<page string="Other Info">
<group col="4">
addons/hr_expense/hr_expense_view.xml
+10 -7
View File
@@ -84,13 +84,6 @@
<field name="user_valid" attrs="{'invisible': [('state','=','draft')]}" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_hr_user']}"/>
<field name="currency_id" groups="base.group_multi_currency" on_change="onchange_currency_id(currency_id, company_id)"/>
</group>
<group>
<field name="journal_id" widget="selection" attrs="{'readonly':[('state','=','done')]}" domain="[('type', '=', 'purchase')]" string="Journal" groups="account.group_account_user"/>
<field name="employee_payable_account_id" widget="selection" attrs="{'readonly':[('state','=','done')]}" domain="[('internal_type', '=', 'payable')]" groups="account.group_account_user"/>
</group>
<group>
<label class="oe_grey" groups="account.group_account_user" string="If this field is empty, entries will be generated in the purchase journal."/>
</group>
</group>
<notebook>
<page string="Expense Lines">
@@ -137,6 +130,16 @@
</group>
</group>
</page>
<page string="Accounting Info" groups="account.group_account_user" attrs="{'invisible': [('state', 'not in', ['done', 'paid'])]}">
<group>
<group>
<field name="journal_id" widget="selection" attrs="{'readonly':[('state','=','done')]}" domain="[('type', '=', 'purchase')]" string="Journal"/>
</group>
<group>
<field name="employee_payable_account_id" widget="selection" attrs="{'readonly':[('state','=','done')]}" domain="[('internal_type', '=', 'payable')]"/>
</group>
</group>
</page>
</notebook>
</sheet>
<div class="oe_chatter">