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

rename labels to be more clear

Browse Source 
modify colspan to avoid scrolling on report timesheet

bzr revid: nel@tinyerp.com-20100503091940-ous2eyyz875op1ux
This commit is contained in:
nel@tinyerp.com
2010-05-03 11:19:40 +02:00
parent 7239738c10
commit d73f08c4cb
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_invoice_report.py
+2 -2
View File
@@ -62,8 +62,8 @@ class account_invoice_report(osv.osv):
('cancel','Cancelled')
], 'Order State', readonly=True),
'date_due': fields.date('Due Date', readonly=True),
'address_contact_id': fields.many2one('res.partner.address', 'Contact Address', readonly=True),
'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address', readonly=True),
'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
'account_id': fields.many2one('account.account', 'Account',readonly=True),
'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
'residual':fields.float('Total Residual', readonly=True),
addons/account/report/account_invoice_report_view.xml
+4 -4
View File
@@ -56,7 +56,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Invoices">
<group>
<group col="10" colspan="12">
<filter icon="terp-account" string="This Year"
domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Invoices of the year"/>
@@ -119,7 +119,7 @@
<field name="address_invoice_id"/>
<separator orientation="vertical"/>
<field name="account_id"/>
<field name="partner_bank"/>
<field name="partner_bank" widget="selection"/>
<separator orientation="vertical"/>
<field name="period_id" widget="selection"/>
<field name="fiscal_position" widget="selection"/>
@@ -145,8 +145,8 @@
<filter string="Account" icon="terp-account" context="{'group_by':'account_id'}"/>
<filter string="Bank Account" icon="terp-account" context="{'group_by':'partner_bank'}"/>
<newline/>
<filter string="Contact Address" icon="terp-account" context="{'group_by':'address_contact_id'}"/>
<filter string="Invoice Address" icon="terp-account" context="{'group_by':'address_invoice_id'}"/>
<filter string="Contact Address Name" icon="terp-account" context="{'group_by':'address_contact_id'}"/>
<filter string="Invoice Address Name" icon="terp-account" context="{'group_by':'address_invoice_id'}"/>
<separator orientation="vertical"/>
<filter string="Force Period" icon="terp-account" context="{'group_by':'period_id'}"/>
<filter string="Fiscal Position" icon="terp-account" context="{'group_by':'fiscal_position'}"/>
addons/hr_recruitment/report/hr_recruitment_report.py
+1 -1
View File
@@ -45,7 +45,7 @@ class hr_recruitment_report(osv.osv):
'salary_prop' : fields.float("Salary Proposed"),
'salary_exp' : fields.float("Salary Expected"),
'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact',readonly=True),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
'available' : fields.float("Availability")
}
addons/hr_recruitment/report/hr_recruitment_report_view.xml
+3 -3
View File
@@ -116,8 +116,8 @@
<field name="date_closed"/>
<separator orientation="vertical"/>
<field name="type_id" widget="selection"/>
<field name="partner_id" widget="selection"/>
<field name="partner_address_id" widget="selection"/>
<field name="partner_id"/>
<field name="partner_address_id"/>
</group>
<newline/>
<group expand="1" string="Group By ..." colspan="10" col="12">
@@ -126,7 +126,7 @@
<filter string="Partner" icon="terp-hr" domain="[]" context="{'group_by':'partner_id'}" />
<filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}" />
<separator orientation="vertical"/>
<filter string="Partner Contact" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
<filter string="Partner Contact Name" icon="terp-hr" domain="[]" context="{'group_by':'partner_address_id'}" />
<filter string="Jobs" name="job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/>
<filter string="Department" name="department" icon="terp-hr" domain="[]" context="{'group_by':'department_id'}"/>
<filter string="Degree" name="degree" icon="terp-hr" domain="[]" context="{'group_by':'type_id'}"/>
addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+1 -1
View File
@@ -45,7 +45,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Timesheet">
<group col="10" colspan="4">
<group col="10" colspan="12">
<filter icon="terp-hr" string="This Year"
domain="[('date_current','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_current','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Timesheet in this year"/>