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

[MERGE]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-add-report-sgo

Browse Source 
bzr revid: apa@tinyerp.com-20120604104018-ipq5n16plc0cvl6s
This commit is contained in:
Amit Patel (OpenERP)
2012-06-04 16:10:18 +05:30
parent 6c6326cdab 4a864e1ff1
commit 5b756161b8
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_analysis/account_analytic_analysis_view.xml
+2 -2
View File
@@ -109,8 +109,8 @@
</table>
</group>
<group colspan="4" class="oe_form_group_label_border">
<field name="pricelist_id" attrs="{'invisible': ['|',('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
<field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','!=',True),('charge_expenses','!=',True)]}"/>
<field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
</group>
</xpath>
</field>
addons/analytic/analytic_view.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<field name="code"/>
<field name="user_id"/>
<field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
<field name="type" select="2"/>
<field name="type" select="2" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
<field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
</group>
<notebook colspan="4">
addons/project/project.py
+1 -1
View File
@@ -1257,7 +1257,7 @@ class account_analytic_account(osv.osv):
def project_create(self,cr,uid,analytic_account_id,vals,context=None):
res = {}
project_pool = self.pool.get('project.project')
project_id = project_pool.name_search(cr, uid, name=vals.get('name'))
project_id = project_pool.search(cr, uid, [('name','=',vals.get('name'))])
if not project_id:
res['name'] = vals.get('name')
res['analytic_account_id'] = analytic_account_id
addons/project/project_view.xml
+1 -1
View File
@@ -634,7 +634,7 @@
</xpath>
<xpath expr='//separator[@name="description"]' position='before'>
<separator colspan="4" string="Team"/>
<field name="members" colspan="4" nolabel="1"/>
<field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1)]}"/>
</xpath>
<xpath expr='//group[@name="project"]' position='inside'>
<field name="use_tasks" />
addons/project_issue/project_issue_view.xml
+4 -1
View File
@@ -396,7 +396,7 @@
<field name="name">account.analytic.account.issue.form.inherit</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
<field name="inherit_id" ref="project.analytic_account_inherited_form"/>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<xpath expr='//separator[@name="project_sep"]' position='replace'>
@@ -405,6 +405,9 @@
<group name="project" position="inside">
<field name="use_issues"/>
</group>
<xpath expr='//field[@name="members"]' position='replace'>
<field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1),('use_issues','!=',1)]}"/>
</xpath>
</field>
</record>
</data>