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

[MERGE]

Browse Source 
bzr revid: pso@tinyerp.com-20101011104346-0ckf32x7gs40v0ee
This commit is contained in:
pso
2010-10-11 16:13:46 +05:30
parent 7b70982b18 54f0a7dbf5
commit b9ada6ae82
10 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/project/report/analytic_journal.rml
+1 -1
View File
@@ -280,7 +280,7 @@
<para style="terp_default_9">[[ move_a.code ]]</para>
</td>
<td>
<para style="terp_default_9">[[ move_a.name ]] asgfas</para>
<para style="terp_default_9">[[ move_a.name ]] </para>
</td>
<td>
<para style="terp_default_9">[[ move_a.account_id.code ]] - [[ move_a.account_id.name ]]</para>
addons/account_accountant/security/account_security.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<data>
<record id="base.user_admin" model="res.users">
<field name="groups_ids" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
<field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
</record>
</data>
addons/crm/crm_lead_view.xml
+1 -1
View File
@@ -97,7 +97,7 @@
<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" string="Customer"/>
<button
name="%(action_crm_lead2partner)d"
icon="gtk-index" type="action"
icon="terp-partner" type="action"
string="Create"
attrs="{'invisible':[('partner_id','!=',False)]}"/>
</group>
addons/crm/crm_meeting_menu.xml
+1 -1
View File
@@ -92,7 +92,7 @@
sequence="1" />
<record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
<field name="name">Calendar</field>
<field name="name">Meetings</field>
<field name="resource">ir.ui.menu</field>
<field name="user_id" ref="base.user_root"/>
<field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
addons/crm/crm_meeting_view.xml
+1 -1
View File
@@ -268,7 +268,7 @@
<field name="type">calendar</field>
<field name="priority" eval="2"/>
<field name="arch" type="xml">
<calendar string="Meetings" date_start="date" color="user_id" date_delay="duration">
<calendar string="Meetings" date_start="date" color="user_id" date_stop="date_deadline">
<field name="name"/>
<field name="partner_id"/>
<field name="section_id" widget="selection"/>
addons/crm/crm_opportunity_view.xml
+1 -1
View File
@@ -49,7 +49,7 @@
on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
colspan="2" />
<button name="%(action_crm_lead2partner)d"
icon="gtk-index" type="action"
icon="terp-partner" type="action"
string="Create"
attrs="{'invisible':[('partner_id','!=',False)]}"/>
</group>
addons/crm/crm_phonecall_view.xml
+2 -2
View File
@@ -82,7 +82,7 @@
<field name="partner_id"
on_change="onchange_partner_id(partner_id, email_from)" />
<button string="Create a Partner"
icon="gtk-index"
icon="terp-partner"
name="%(action_crm_phonecall2partner)d"
type="action"
attrs="{'invisible':[('partner_id','!=',False)]}" />
@@ -160,7 +160,7 @@
<field name="partner_id"
on_change="onchange_partner_id(partner_id, email_from)" />
<button string="Create a Partner"
icon="gtk-index"
icon="terp-partner"
name="%(action_crm_phonecall2partner)d"
type="action"
attrs="{'invisible':[('partner_id','!=',False)]}" />
addons/hr_payroll_account/__openerp__.py
+1 -1
View File
@@ -24,7 +24,7 @@
'version': '1.0',
'category': 'Generic Modules/Human Resources',
'description': """Generic Payroll system Integrated with Accountings
* Expanse Encoding
* Expense Encoding
* Payment Encoding
* Company Contribution Management
""",
addons/hr_payroll_account/hr_payroll_account.py
+2 -2
View File
@@ -162,7 +162,7 @@ class hr_payslip(osv.osv):
for line in slip.line_ids:
if line.type == 'otherpay' and line.expanse_id.invoice_id:
if not line.expanse_id.invoice_id.move_id:
raise osv.except_osv(_('Warning !'), _('Please Confirm all Expanse Invoice appear for Reimbursement'))
raise osv.except_osv(_('Warning !'), _('Please Confirm all Expense Invoice appear for Reimbursement'))
invids = [line.expanse_id.invoice_id.id]
amount = line.total
acc_id = slip.bank_journal_id.default_credit_account_id and slip.bank_journal_id.default_credit_account_id.id
@@ -487,7 +487,7 @@ class account_move_link_slip(osv.osv):
_description = 'Account Move Link to Pay Slip'
_columns = {
'name':fields.char('Name', size=256, required=True, readonly=False),
'move_id':fields.many2one('account.move', 'Expanse Entries', required=False, readonly=True),
'move_id':fields.many2one('account.move', 'Expense Entries', required=False, readonly=True),
'slip_id':fields.many2one('hr.payslip', 'Pay Slip', required=False),
'sequence': fields.integer('Sequence'),
}
addons/product/product_view.xml
+7
View File
@@ -632,5 +632,12 @@
<field name="view_type">form</field>
<field name="view_id" ref="product_template_tree_view"/>
</record>
<record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
<field name="name">Products</field>
<field name="resource">ir.ui.menu</field>
<field name="user_id" ref="base.user_root"/>
<field name="res_id" ref="product.menu_products"/>
</record>
</data>
</openerp>