bzr revid: olt@tinyerp.com-20081028075812-29c4mfksout4wami
This commit is contained in:
Olivier Laurent 2008-10-28 08:58:12 +01:00
commit 559f879c30
68 changed files with 1247 additions and 2840 deletions

View File

@ -851,13 +851,12 @@ class account_invoice_line(osv.osv):
return {'domain':{'product_uom':[]}}
else:
return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
lang=False
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
lang=part.lang
context.update({'lang': lang})
res = self.pool.get('product.product').browse(cr, uid, product, context=context)
taxep=None
lang=self.pool.get('res.partner').read(cr, uid, [partner_id])[0]['lang']
tax_obj = self.pool.get('account.tax')
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
if type in ('out_invoice', 'out_refund'):
tax_id = self.pool.get('account.fiscal.position').map_tax(cr, uid, part, res.taxes_id)
else:

View File

@ -166,7 +166,9 @@ class account_analytic_account(osv.osv):
'type' : lambda *a : 'normal',
'company_id': _default_company,
'state' : lambda *a : 'draft',
'user_id' : lambda self,cr,uid,ctx : uid
'user_id' : lambda self,cr,uid,ctx : uid,
'partner_id': lambda self,cr, uid, ctx: ctx.get('partner_id', False),
'contact_id': lambda self,cr, uid, ctx: ctx.get('contact_id', False),
}
def check_recursion(self, cr, uid, ids, parent=None):

View File

@ -60,7 +60,8 @@
<newline/>
<field name="quantity_max"/>
<field name="user_id"/>
<separator colspan="4" string="Note"/>
</page>
<page string="Description">
<field colspan="4" name="description" nolabel="1"/>
</page>
</notebook>

View File

@ -87,21 +87,22 @@ class account_analytic_account(osv.osv):
WHERE account_analytic_account.id IN (%s) \
AND account_analytic_line.invoice_id is null \
AND account_analytic_line.to_invoice IS NOT NULL \
and account_analytic_journal.type in ('purchase','general') \
GROUP BY account_analytic_account.id;"""%acc_set)
for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2)
# Expense amount and purchase invoice
acc_set = ",".join(map(str, ids2))
cr.execute ("select account_analytic_line.account_id, sum(amount) \
from account_analytic_line \
join account_analytic_journal \
on account_analytic_line.journal_id = account_analytic_journal.id \
where account_analytic_line.account_id IN (%s) \
and account_analytic_journal.type = 'purchase' \
GROUP BY account_analytic_line.account_id;"%acc_set)
for account_id, sum in cr.fetchall():
res2[account_id] = round(sum,2)
#acc_set = ",".join(map(str, ids2))
#cr.execute ("select account_analytic_line.account_id, sum(amount) \
# from account_analytic_line \
# join account_analytic_journal \
# on account_analytic_line.journal_id = account_analytic_journal.id \
# where account_analytic_line.account_id IN (%s) \
# and account_analytic_journal.type = 'purchase' \
# GROUP BY account_analytic_line.account_id;"%acc_set)
#for account_id, sum in cr.fetchall():
# res2[account_id] = round(sum,2)
for obj_id in ids:
res.setdefault(obj_id, 0.0)
res2.setdefault(obj_id, 0.0)
@ -194,27 +195,14 @@ class account_analytic_account(osv.osv):
res2 = {}
ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
if ids2:
acc_set = ",".join(map(str, ids2))
# First part with expense and purchase
cr.execute("""select account_analytic_line.account_id,sum(amount) \
from account_analytic_line \
join account_analytic_journal \
on account_analytic_line.journal_id = account_analytic_journal.id \
where account_analytic_line.account_id IN (%s) \
and account_analytic_journal.type = 'purchase' \
GROUP BY account_analytic_line.account_id"""%acc_set)
for account_id, sum in cr.fetchall():
res[account_id] = round(sum,2)
# Second part with timesheet (with invoice factor)
acc_set = ",".join(map(str, ids2))
cr.execute("""select account_analytic_line.account_id as account_id, \
sum((account_analytic_line.unit_amount * pt.list_price) \
- (account_analytic_line.unit_amount * pt.list_price \
* hr.factor)) as somme
from account_analytic_line \
join account_analytic_journal \
on account_analytic_line.journal_id = account_analytic_journal.id \
left join account_analytic_journal \
on (account_analytic_line.journal_id = account_analytic_journal.id) \
join product_product pp \
on (account_analytic_line.product_id = pp.id) \
join product_template pt \
@ -225,6 +213,7 @@ class account_analytic_account(osv.osv):
on (hr.id=a.to_invoice) \
where account_analytic_line.account_id IN (%s) \
and a.to_invoice IS NOT NULL \
and account_analytic_journal.type in ('purchase','general')
GROUP BY account_analytic_line.account_id"""%acc_set)
for account_id, sum in cr.fetchall():
res2[account_id] = round(sum,2)
@ -350,7 +339,7 @@ class account_analytic_account(osv.osv):
if account.ca_invoiced == 0:
res[account.id]=0.0
elif account.real_margin <> 0.0:
res[account.id] = (account.ca_invoiced / account.real_margin) * 100
res[account.id] = -(account.real_margin / account.total_cost) * 100
else:
res[account.id] = 0.0
for id in ids:
@ -410,19 +399,19 @@ class account_analytic_account(osv.osv):
'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount', help="Total customer invoiced amount for this account."),
'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total Costs', help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets."),
'ca_to_invoice': fields.function(_ca_to_invoice_calc, method=True, type='float', string='Uninvoiced Amount', help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs."),
'ca_theorical': fields.function(_ca_theorical_calc, method=True, type='float', string='Theorical Revenue', help="Based on the costs you had on the project, what would have been the revenue of all these costs have been invoiced at the normal sale price provided by the pricelist."),
'hours_quantity': fields.function(_hours_quantity_calc, method=True, type='float', string='Hours Tot', help="Number of hours on spent on the analytic account (from timesheet). It computes on all journal of type 'general'."),
'ca_theorical': fields.function(_ca_theorical_calc, method=True, type='float', string='Theorical Revenue', help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."),
'hours_quantity': fields.function(_hours_quantity_calc, method=True, type='float', string='Hours Tot', help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."),
'last_invoice_date': fields.function(_last_invoice_date_calc, method=True, type='date', string='Last Invoice Date', help="Date of the last invoice created for this analytic account."),
'last_worked_invoiced_date': fields.function(_last_worked_invoiced_date_calc, method=True, type='date', string='Last Invoiced Worked Date', help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
'last_worked_date': fields.function(_last_worked_date_calc, method=True, type='date', string='Last Worked Date', help="Date of the latest work done on this account."),
'last_worked_invoiced_date': fields.function(_last_worked_invoiced_date_calc, method=True, type='date', string='Date of Last Invoiced Cost', help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."),
'last_worked_date': fields.function(_last_worked_date_calc, method=True, type='date', string='Date of Last Cost/Work', help="Date of the latest work done on this account."),
'hours_qtt_non_invoiced': fields.function(_hours_qtt_non_invoiced_calc, method=True, type='float', string='Uninvoiced Hours', help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."),
'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours', help="Number of hours that already have invoiced. If you don't invoice based on costs, it's the number of hours spent. If you invoice based on hours, it's the hours that have been invoiced."),
'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours', help="Computed using the forumla: Maximum Quantity - Hours Tot."),
'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue', help="If you invoice based on costs, this is the revenue you will invoice to the customer when you will launch the invoicing wizard."),
'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours', help="Number of hours that can be invoiced plus those that already have been invoiced."),
'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours', help="Computed using the formula: Maximum Quantity - Hours Tot."),
'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue', help="Computed using the formula: Max Invoice Price - Invoiced Amount."),
'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per Hours (real)', help="Computed using the formula: Invoiced Amount / Hours Tot."),
'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin', help="Computed using the formula: Invoiced Amount - Total Costs."),
'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin', help="Computed using the formula: (Theorical Revenue / Total Costs) * 100."),
'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Invoiced Amount / Total Costs) * 100."),
'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin', help="Computed using the formula: Theorial Revenue - Total Costs"),
'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Real Margin / Total Costs) * 100."),
'month_ids': fields.function(_month, method=True, type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
'user_ids': fields.function(_user, method=True, type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
}
@ -449,8 +438,7 @@ class account_analytic_account_summary_user(osv.osv):
cr.execute('SELECT id, unit_amount ' \
'FROM account_analytic_analysis_summary_user ' \
'WHERE account_id in (%s) ' \
'AND "user" in (%s) ' % \
(acc_set, user_set))
'AND "user" in (%s) ' % (acc_set, user_set))
for sum_id, unit_amount in cr.fetchall():
res[sum_id] = unit_amount
for obj_id in ids:

View File

@ -53,6 +53,17 @@
</record>
<menuitem action="action_account_analytic_managed_overpassed" id="menu_action_account_analytic_managed_overpassed" parent="account_analytic_analysis.next_id_71"/>
<record id="action_account_analytic_new" model="ir.actions.act_window">
<field name="name">New Analytic Account</field>
<field name="res_model">account.analytic.account</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree,graph</field>
</record>
<menuitem
action="action_account_analytic_new"
id="menu_action_account_analytic_new"
parent="account_analytic_analysis.next_id_71"/>
<record id="action_account_analytic_all" model="ir.actions.act_window">
<field name="name">All Analytic Accounts</field>
<field name="res_model">account.analytic.account</field>
@ -94,7 +105,6 @@
<field name="view_id" ref="account.view_account_analytic_account_list"/>
<field name="domain">[('state','=','pending')]</field>
</record>
<menuitem action="action_account_analytic_all_pending" id="menu_action_account_analytic_all_pending" parent="menu_action_account_analytic_all"/>
<record id="action_account_analytic_all_simplified" model="ir.actions.act_window">
@ -105,7 +115,6 @@
<field name="view_id" ref="view_account_analytic_simplified"/>
<field name="domain">[]</field>
</record>
<menuitem action="action_account_analytic_all_simplified" id="menu_action_account_analytic_all_simplified" parent="menu_action_account_analytic_all"/>
</data>

View File

@ -33,8 +33,8 @@
<field name="revenue_per_hour"/>
<field name="real_margin"/>
<field name="theorical_margin"/>
<field name="real_margin_rate"/>
<field name="theorical_margin"/>
<separator colspan="4" string="Key dates"/>
<field name="last_invoice_date"/>

View File

@ -2,17 +2,17 @@
<openerp>
<data>
<record model="ir.ui.view" id="view_account_journal_form_inherit2">
<field name="name">account.journal.form.inherit2</field>
<field name="model">account.journal</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_journal_form"/>
<field name="arch" type="xml">
<field name="user_id" position="after">
<field name="allow_date" />
</field>
</field>
</record>
<record model="ir.ui.view" id="view_account_journal_form_inherit2">
<field name="name">account.journal.form.inherit2</field>
<field name="model">account.journal</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_journal_form"/>
<field name="arch" type="xml">
<field name="user_id" position="after">
<field name="allow_date" />
</field>
</field>
</record>
</data>
</openerp>

View File

@ -72,8 +72,8 @@
<field name="inherit_id" ref="account.view_move_line_form"/>
<field name="arch" type="xml">
<field name="date_created" position="after">
<field name="followup_date"/>
<field name="followup_line_id"/>
<field name="followup_date"/>
</field>
</field>
</record>

View File

@ -9,8 +9,8 @@
<field name="inherit_id" ref="account.view_tax_form"/>
<field name="arch" type="xml">
<field name="python_compute" position="after">
<field colspan="4" name="python_compute_inv" nolabel="1"/>
<separator colspan="4" string="Compute Code for Taxes included prices"/>
<field colspan="4" name="python_compute_inv" nolabel="1"/>
</field>
</field>
</record>

View File

@ -1,83 +1,83 @@
<?xml version="1.0" ?>
<openerp>
<data>
<data>
<!-- analytic_journal_rate_grid views -->
<record model="ir.ui.view" id="analytic_journal_rate_grid_tree">
<field name="name">analytic_journal_rate_grid.tree</field>
<field name="model">analytic_journal_rate_grid</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Billing Rate per Journal for this Analytic Account" editable="bottom">
<field name="journal_id" required="1"/>
<field name="rate_id" />
</tree>
</field>
</record>
<!-- analytic_journal_rate_grid views -->
<record model="ir.ui.view" id="analytic_journal_rate_grid_tree">
<field name="name">analytic_journal_rate_grid.tree</field>
<field name="model">analytic_journal_rate_grid</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Billing Rate per Journal for this Analytic Account" editable="bottom">
<field name="journal_id" required="1"/>
<field name="rate_id" />
</tree>
</field>
</record>
<record model="ir.ui.view" id="analytic_journal_rate_grid_form">
<field name="name">analytic_journal_rate_grid.form</field>
<field name="model">analytic_journal_rate_grid</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Billing Rate per Journal for this Analytic Account" editable="bottom">
<field name="journal_id" required="1"/>
<field name="rate_id" />
</form>
</field>
</record>
<record model="ir.ui.view" id="analytic_journal_rate_grid_form">
<field name="name">analytic_journal_rate_grid.form</field>
<field name="model">analytic_journal_rate_grid</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Billing Rate per Journal for this Analytic Account" editable="bottom">
<field name="journal_id" required="1"/>
<field name="rate_id" />
</form>
</field>
</record>
<!-- account.analytic.account inherited view -->
<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='to_invoice']" position="after">
<!--<field name="to_invoice" string="Default Invoicing Percentage"/>-->
<field name="journal_rate_ids" colspan="4"/>
</xpath>
</field>
</record>
<!-- account.analytic.account inherited view -->
<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='to_invoice']" position="after">
<!--<field name="to_invoice" string="Default Invoicing Percentage"/>-->
<field name="journal_rate_ids" colspan="4"/>
</xpath>
</field>
</record>
<!-- hr_timesheet_sheet.sheet inherited view -->
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
<field name="name">hr.timesheet.sheet.form</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, journal_id, unit_amount)"/>
</xpath>
</field>
</record>
<!-- hr_timesheet_sheet.sheet inherited view -->
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
<field name="name">hr.timesheet.sheet.form</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, journal_id, unit_amount)"/>
</xpath>
</field>
</record>
<!-- hr.analytic.timesheet inherited views -->
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, journal_id, unit_amount)" select="1"/>
</xpath>
</field>
</record>
<!-- hr.analytic.timesheet inherited views -->
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, journal_id, unit_amount)" select="1"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/field[@name='journal_id']" position="replace">
<field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/field[@name='journal_id']" position="replace">
<field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/>
</xpath>
</field>
</record>
</data>
</data>
</openerp>

View File

@ -1,109 +1,109 @@
<?xml version="1.0" ?>
<openerp>
<data>
<data>
<!-- analytic_user_funct_grid views -->
<record model="ir.ui.view" id="analytic_user_funct_grid_tree">
<field name="name">analytic_user_funct_grid.tree</field>
<field name="model">analytic_user_funct_grid</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="User's Product for this Analytic Account" editable="bottom">
<field name="user_id" required="1"/>
<field name="product_id" required="1" />
</tree>
</field>
</record>
<!-- analytic_user_funct_grid views -->
<record model="ir.ui.view" id="analytic_user_funct_grid_tree">
<field name="name">analytic_user_funct_grid.tree</field>
<field name="model">analytic_user_funct_grid</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="User's Product for this Analytic Account" editable="bottom">
<field name="user_id" required="1"/>
<field name="product_id" required="1" />
</tree>
</field>
</record>
<record model="ir.ui.view" id="analytic_user_funct_grid_form">
<field name="name">analytic_user_funct_grid.form</field>
<field name="model">analytic_user_funct_grid</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User's Product for this Analytic Account">
<field name="user_id" required="1"/>
<field name="product_id" required="1"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="analytic_user_funct_grid_form">
<field name="name">analytic_user_funct_grid.form</field>
<field name="model">analytic_user_funct_grid</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User's Product for this Analytic Account">
<field name="user_id" required="1"/>
<field name="product_id" required="1"/>
</form>
</field>
</record>
<!-- account.analytic.account inherited view -->
<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page" position="after">
<page string="Users/Products Rel.">
<field name="user_product_ids" colspan="4" nolabel="1"/>
</page>
</xpath>
</field>
</record>
<!-- account.analytic.account inherited view -->
<record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page" position="after">
<page string="Users/Products Rel.">
<field name="user_product_ids" colspan="4" nolabel="1"/>
</page>
</xpath>
</field>
</record>
<!-- hr_timesheet_sheet.sheet inherited view -->
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
<field name="name">hr.timesheet.sheet.form</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">form</field>
<field name="priority" eval="18"/>
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)"/>
</xpath>
</field>
</record>
<!-- hr_timesheet_sheet.sheet inherited view -->
<record model="ir.ui.view" id="hr_timesheet_sheet_form_inherit">
<field name="name">hr.timesheet.sheet.form</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">form</field>
<field name="priority" eval="18"/>
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)"/>
</xpath>
</field>
</record>
<!-- hr.analytic.timesheet inherited views -->
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
</xpath>
</field>
</record>
<!-- hr.analytic.timesheet inherited views -->
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/field[@name='user_id']" position="replace">
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_timesheet_line_form_inherit_2">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<xpath expr="/form/field[@name='user_id']" position="replace">
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
<field name="name">hr.analytic.timesheet.tree</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">tree</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit">
<field name="name">hr.analytic.timesheet.tree</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">tree</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(user_id, account_id, unit_amount)" select="1"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
<field name="name">hr.analytic.timesheet.tree</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">tree</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='user_id']" position="replace">
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="hr_timesheet_line_tree_inherit_2">
<field name="name">hr.analytic.timesheet.tree</field>
<field name="model">hr.analytic.timesheet</field>
<field name="type">tree</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
<field name="arch" type="xml">
<xpath expr="/tree/field[@name='user_id']" position="replace">
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
</xpath>
</field>
</record>
</data>
</data>
</openerp>

View File

@ -1,6 +0,0 @@
# -*- encoding: utf-8 -*-
#
# Generated by the Tiny ERP module recorder !
#
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,19 +0,0 @@
# -*- encoding: utf-8 -*-
{
"name" : "Association Verticalisation",
"version" : "Association Verticalisation",
"author" : "Tiny",
"website" : "http://tinyerp.com",
"category" : "Vertical Modules/Parametrization",
"description": """Simplification of the interface for associations.""",
"depends" : ["hr","crm_configuration","event"],
"init_xml" : [],
"demo_xml" : [],
"update_xml" : [
"aso_data.xml",
"aso_vertical_view.xml",
],
"installable": True
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -1,27 +0,0 @@
<?xml version="1.0" ?>
<openerp>
<data><!-- NoOne doesn't exist anymore
<record id="hr.menu_hr_root" model="ir.ui.menu">
<field eval="[(6,0,[ref('base.group_no_one')])]" name="groups_id"/>
</record>
<record id="crm.menu_crm" model="ir.ui.menu">
<field eval="[(6,0,[ref('base.group_no_one')])]" name="groups_id"/>
</record>
<record id="product.menu_product_pricelist_main" model="ir.ui.menu">
<field eval="[(6,0,[ref('base.group_no_one')])]" name="groups_id"/>
</record>
<record id="product.menu_product_price_type_action" model="ir.ui.menu">
<field eval="[(6,0,[ref('base.group_no_one')])]" name="groups_id"/>
</record>
<record id="product.menu_product_pricelist_type_action" model="ir.ui.menu">
<field eval="[(6,0,[ref('base.group_no_one')])]" name="groups_id"/>
</record>
<record id="product.menu_product_variant_action" model="ir.ui.menu">
<field eval="[(6,0,[ref('base.group_no_one')])]" name="groups_id"/>
</record>
<record id="product.menu_product_template_action" model="ir.ui.menu">
<field eval="[(6,0,[ref('base.group_no_one')])]" name="groups_id"/>
</record>
-->
</data>
</openerp>

View File

@ -1,60 +0,0 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record id="crm_configuration.menu_crm_case_category_act_meetings" model="ir.ui.menu">
<field eval="&quot;Calendar of Meetings&quot;" name="name"/>
<field eval="&quot;terp-calendar&quot;" name="icon"/>
<field eval="False" name="parent_id"/>
</record>
<!--<record id="association_vertical.menu_crm_case_fund_raise" model="ir.ui.menu">
<field eval="&quot;Fund Raising&quot;" name="name"/>
<field eval="&quot;terp-account&quot;" name="icon"/>
<field eval="False" name="parent_id"/>
</record>-->
<record id="product.menu_main_product" model="ir.ui.menu">
<field model="ir.ui.menu" name="parent_id" search="[('name','=','Configuration'),('parent_id.name','=','Financial Management')]"/>
</record>
<!-- For Shortcuts menu
-->
<!--
<record model="ir.ui.view_sc" id="ir_ui_view_sc_mymeetings1">
<field name="name">&quot;My Meetings&quot;</field>
<field name="user_id" ref="base.user_admin"/>
<field name="resource">ir.ui.menu</field>
<field name="sequence">4</field>
<field name="res_id" ref="crm_configuration.menu_crm_case_categ_meet_my"/>
</record>
<record model="ir.ui.view_sc" id="ir_ui_view_sc_myopenprojects1">
<field name="name">&quot;My Open Projects&quot;</field>
<field name="user_id" ref="base.user_admin"/>
<field name="resource">ir.ui.menu</field>
<field name="sequence">4</field>
<field name="res_id" ref="project.menu_open_view_my_project_open"/>
</record>
<record id="ir_ui_view_sc_myopenprojects1" model="ir.ui.view_sc">
<field ref="project.menu_open_view_my_project_open" name="res_id"/>
<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
<field eval="&quot;My Open Projects&quot;" name="name"/>
<field name="user_id" ref="base.user_root"/>
</record>
<record id="ir_ui_view_sc_products0" model="ir.ui.view_sc">
<field ref="product.menu_products" name="res_id"/>
<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
<field eval="&quot;Products&quot;" name="name"/>
<field name="user_id" ref="base.user_root"/>
</record>
<record id="ir_ui_view_sc_events0" model="ir.ui.view_sc">
<field ref="event.menu_event_event" name="res_id"/>
<field eval="&quot;ir.ui.menu&quot;" name="resource"/>
<field eval="&quot;Events&quot;" name="name"/>
<field name="user_id" ref="base.user_root"/>
</record>
-->
</data>
</openerp>

View File

@ -1,146 +0,0 @@
<?xml version="1.0" ?>
<openerp>
<data noupdate="1">
<record id="crm_case_helpingstreetchildren0" model="crm.case">
<field eval="0.5" name="probability"/>
<field name="partner_address_id" ref="base.res_partner_address_1"/>
<field eval="1" name="active"/>
<field name="category2_id" ref="association_vertical.categ2_fund3"/>
<field eval="3.0" name="duration"/>
<field name="partner_id" ref="base.res_partner_9"/>
<field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_demo"/>
<field eval="&quot;open&quot;" name="state"/>
<field eval="250000.0" name="planned_cost"/>
<field name="section_id" ref="association_vertical.section_support4"/>
<field eval="time.strftime('%Y-%m-01 10:35:50')" name="date"/>
<field name="categ_id" ref="association_vertical.categ_fund1"/>
<field eval="&quot;Helping Street Children&quot;" name="name"/>
<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
</record>
</data>
<data noupdate="1">
<record id="crm_case_helpingearthquakevictims0" model="crm.case">
<field eval="0.8" name="probability"/>
<field name="partner_address_id" ref="base.main_address"/>
<field eval="1" name="active"/>
<field name="category2_id" ref="association_vertical.categ2_fund4"/>
<field name="partner_id" ref="base.main_partner"/>
<field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/>
<field eval="&quot;draft&quot;" name="state"/>
<field eval="2000000.0" name="planned_cost"/>
<field name="section_id" ref="association_vertical.section_support4"/>
<field eval="time.strftime('%Y-%m-05 12:35:50')" name="date"/>
<field eval="8.0" name="duration"/>
<field name="categ_id" ref="association_vertical.categ_fund1"/>
<field eval="&quot;Helping earthquake victims&quot;" name="name"/>
</record>
</data>
<data noupdate="1">
<record id="crm_case_donatingbookstoschoollibraries0" model="crm.case">
<field name="partner_address_id" ref="base.res_partner_address_zen"/>
<field eval="1" name="active"/>
<field name="category2_id" ref="association_vertical.categ2_fund1"/>
<field eval="5.0" name="duration"/>
<field name="partner_id" ref="base.res_partner_3"/>
<field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/>
<field eval="&quot;open&quot;" name="state"/>
<field eval="500000.0" name="planned_cost"/>
<field name="section_id" ref="association_vertical.section_support4"/>
<field eval="time.strftime('%Y-%m-07 13:50:50')" name="date"/>
<field name="categ_id" ref="association_vertical.categ_fund2"/>
<field eval="&quot;Donating books to school libraries&quot;" name="name"/>
</record>
</data>
<data noupdate="1">
<record id="crm_case_renovatinggovernmentschools0" model="crm.case">
<field name="partner_address_id" ref="base.res_partner_address_7"/>
<field eval="1" name="active"/>
<field name="category2_id" ref="association_vertical.categ2_fund2"/>
<field eval="3.0" name="duration"/>
<field name="partner_id" ref="base.res_partner_4"/>
<field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_demo"/>
<field eval="&quot;draft&quot;" name="state"/>
<field eval="1000000.0" name="planned_cost"/>
<field name="section_id" ref="association_vertical.section_support4"/>
<field eval="time.strftime('%Y-%m-12 15:10:50')" name="date"/>
<field name="categ_id" ref="association_vertical.categ_fund2"/>
<field eval="4.3" name="duration"/>
<field eval="&quot;Renovating government schools&quot;" name="name"/>
</record>
</data>
<data noupdate="1">
<record id="crm_case_donatingambulancestohospitals0" model="crm.case">
<field name="partner_address_id" ref="base.res_partner_address_13"/>
<field eval="1" name="active"/>
<field name="category2_id" ref="association_vertical.categ2_fund4"/>
<field name="partner_id" ref="base.res_partner_14"/>
<field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/>
<field eval="&quot;open&quot;" name="state"/>
<field eval="5000000.0" name="planned_cost"/>
<field name="section_id" ref="association_vertical.section_support4"/>
<field eval="time.strftime('%Y-%m-17 19:00:15')" name="date"/>
<field eval="3" name="duration"/>
<field name="categ_id" ref="association_vertical.categ_fund3"/>
<field eval="&quot;Donating ambulances to hospitals&quot;" name="name"/>
</record>
</data>
<data noupdate="1">
<record id="crm_case_donatinghospitalequipments0" model="crm.case">
<field name="partner_address_id" ref="base.res_partner_address_2"/>
<field eval="1" name="active"/>
<field name="category2_id" ref="association_vertical.categ2_fund3"/>
<field name="partner_id" ref="base.res_partner_10"/>
<field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/>
<field eval="&quot;done&quot;" name="state"/>
<field eval="10000000.0" name="planned_cost"/>
<field name="section_id" ref="association_vertical.section_support4"/>
<field eval="time.strftime('%Y-%m-27 09:00:15')" name="date"/>
<field eval="12" name="duration"/>
<field name="categ_id" ref="association_vertical.categ_fund3"/>
<field eval="&quot;Donating hospital equipments&quot;" name="name"/>
<field eval="&quot;contact@tecsas.fr&quot;" name="email_from"/>
</record>
</data>
<data noupdate="1">
<record id="crm_case_encouragingarts0" model="crm.case">
<field name="partner_address_id" ref="base.res_partner_address_14"/>
<field eval="1" name="active"/>
<field name="category2_id" ref="association_vertical.categ2_fund2"/>
<field eval="7.0" name="duration"/>
<field name="partner_id" ref="base.res_partner_15"/>
<field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_demo"/>
<field eval="&quot;draft&quot;" name="state"/>
<field eval="10000.0" name="planned_cost"/>
<field name="section_id" ref="association_vertical.section_support4"/>
<field eval="time.strftime('%Y-%m-01 10:00:15')" name="date"/>
<field name="categ_id" ref="association_vertical.categ_fund4"/>
<field eval="&quot;Encouraging arts&quot;" name="name"/>
</record>
</data>
<data noupdate="1">
<record id="crm_case_promotingculturalprogramsandpreservingdyingartforms0" model="crm.case">
<field eval="1.0" name="probability"/>
<field name="partner_address_id" ref="base.res_partner_address_1"/>
<field eval="1" name="active"/>
<field name="category2_id" ref="association_vertical.categ2_fund1"/>
<field eval="6.0" name="duration"/>
<field name="partner_id" ref="base.res_partner_9"/>
<field eval="&quot;3&quot;" name="priority"/>
<field name="user_id" ref="base.user_root"/>
<field eval="&quot;open&quot;" name="state"/>
<field eval="800000.0" name="planned_cost"/>
<field name="section_id" ref="association_vertical.section_support4"/>
<field eval="time.strftime('%Y-%m-24 22:00:15')" name="date"/>
<field name="categ_id" ref="association_vertical.categ_fund4"/>
<field eval="&quot;Promoting cultural programs and preserving dying art forms&quot;" name="name"/>
<field eval="&quot;info@opensides.be&quot;" name="email_from"/>
</record>
</data>
</openerp>

View File

@ -1,243 +0,0 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<record model="crm.case.section" id="section_support4">
<field name="name">Fund Raising</field>
<field name="code">funds</field>
</record>
<!-- CASE CATEGORY(categ_id) -->
<record model="crm.case.categ" id="categ_fund1">
<field name="name">Social Rehabilitation And Rural Upliftment</field>
<field name="section_id" ref="section_support4"/>
</record>
<record model="crm.case.categ" id="categ_fund2">
<field name="name">Learning And Education</field>
<field name="section_id" ref="section_support4"/>
</record>
<record model="crm.case.categ" id="categ_fund3">
<field name="name">Healthcare</field>
<field name="section_id" ref="section_support4"/>
</record>
<record model="crm.case.categ" id="categ_fund4">
<field name="name">Arts And Culture</field>
<field name="section_id" ref="section_support4"/>
</record>
<!-- CASE CATEGORY2(category2_id) -->
<record model="crm.case.category2" id="categ2_fund1">
<field name="name">Cash</field>
<field name="section_id" ref="section_support4"/>
</record>
<record model="crm.case.category2" id="categ2_fund2">
<field name="name">Cheque</field>
<field name="section_id" ref="section_support4"/>
</record>
<record model="crm.case.category2" id="categ2_fund3">
<field name="name">Credit Card</field>
<field name="section_id" ref="section_support4"/>
</record>
<record model="crm.case.category2" id="categ2_fund4">
<field name="name">Demand Draft</field>
<field name="section_id" ref="section_support4"/>
</record>
<!-- MENU -->
<menuitem name="Fund Raising" id="menu_crm_case_fund_raise" parent="crm.menu_crm"/>
<record model="ir.actions.act_window" id="crm_case_category_act_fund1">
<field name="name">Funds</field>
<field name="res_model">crm.case</field>
<field name="view_mode">form,graph</field>
<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund1">
<field name="sequence" eval="2"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund1"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund1">
<field name="sequence" eval="1"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund1"/>
</record>
<menuitem name="New Fund Opportunity" id="menu_crm_case_categ0_act_fund" action="crm_case_category_act_fund1" parent="menu_crm_case_fund_raise"/>
<!-- My Funds -->
<record model="ir.actions.act_window" id="crm_case_category_act_fund_my1">
<field name="name">My Funds</field>
<field name="res_model">crm.case</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid)]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my1">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my1">
<field name="sequence" eval="3"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my1">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my1"/>
</record>
<menuitem name="My Funds" id="menu_crm_case_category_act_fund_my1" action="crm_case_category_act_fund_my1" parent="menu_crm_case_fund_raise"/>
<record model="ir.actions.act_window" id="crm_case_category_act_fund_my2">
<field name="name">My Funds Waiting Validation</field>
<field name="res_model">crm.case</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my2">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my2">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my2">
<field name="sequence" eval="3"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my2"/>
</record>
<menuitem name="My Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_my2" action="crm_case_category_act_fund_my2" parent="menu_crm_case_category_act_fund_my1"/>
<record model="ir.actions.act_window" id="crm_case_category_act_fund_my3">
<field name="name">My Funds To Be Processed</field>
<field name="res_model">crm.case</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_my3">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_my3">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_my3">
<field name="sequence" eval="3"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_my3"/>
</record>
<menuitem name="My Funds To Be Processed" id="menu_crm_case_categ0_act_fund_my3" action="crm_case_category_act_fund_my3" parent="menu_crm_case_category_act_fund_my1"/>
<!-- All Funds -->
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all1">
<field name="name">All Funds</field>
<field name="res_model">crm.case</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all1">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all1">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all1">
<field name="sequence" eval="3"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all1"/>
</record>
<menuitem name="All Funds" id="menu_crm_case_categ0_act_fund_all1" action="crm_case_category_act_fund_all1" parent="menu_crm_case_fund_raise"/>
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all2">
<field name="name">All Funds Waiting Validation</field>
<field name="res_model">crm.case</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'draft\')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all2">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all2">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all2">
<field name="sequence" eval="3"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all2"/>
</record>
<menuitem name="All Funds Waiting Validation" id="menu_crm_case_categ0_act_fund_all2" action="crm_case_category_act_fund_all2" parent="menu_crm_case_categ0_act_fund_all1"/>
<record model="ir.actions.act_window" id="crm_case_category_act_fund_all3">
<field name="name">All Funds To Be Processed</field>
<field name="res_model">crm.case</field>
<field name="view_mode">tree,form,graph</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="domain" eval="'[(\'section_id\',\'=\','+str(section_support4)+'),(\'state\',\'=\',\'open\')]'"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_fund_all3">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_configuration.crm_case_tree_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_fund_all3">
<field name="sequence" eval="2"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_configuration.crm_case_form_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_graph_view_fund_all3">
<field name="sequence" eval="3"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="crm_configuration.crm_case_graph_view_fund"/>
<field name="act_window_id" ref="crm_case_category_act_fund_all3"/>
</record>
<menuitem name="All Funds To Be Processed" id="menu_crm_case_categ0_act_fund_all3" action="crm_case_category_act_fund_all3" parent="menu_crm_case_categ0_act_fund_all1"/>
</data>
</openerp>

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:45:09+0000"
"PO-Revision-Date: 2008-09-11 15:45:09+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:40:34+0000"
"PO-Revision-Date: 2008-09-11 15:40:34+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:38:50+0000"
"PO-Revision-Date: 2008-09-11 15:38:50+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:44:00+0000"
"PO-Revision-Date: 2008-09-11 15:44:00+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:41:08+0000"
"PO-Revision-Date: 2008-09-11 15:41:08+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2008-09-05 16:30+0000\n"
"PO-Revision-Date: 2008-10-14 13:35+0000\n"
"Last-Translator: Olivier Laurent <Unknown>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2008-10-14 14:08+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr "Nouvelle Opportunité de Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr "Mes Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr "Mes Fonds à Traiter"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr "Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr "Mes Fonds en attente de Validation"
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr "Levée de Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr "Tous les Fonds"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr "Tous les Fonds en attente de Validation"
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr "Tous les Fonds à Traiter"

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:44:35+0000"
"PO-Revision-Date: 2008-09-11 15:44:35+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:36:31+0000"
"PO-Revision-Date: 2008-09-11 15:36:31+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:40:00+0000"
"PO-Revision-Date: 2008-09-11 15:40:00+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:38:15+0000"
"PO-Revision-Date: 2008-09-11 15:38:15+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:42:18+0000"
"PO-Revision-Date: 2008-09-11 15:42:18+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:43:26+0000"
"PO-Revision-Date: 2008-09-11 15:43:26+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:42:52+0000"
"PO-Revision-Date: 2008-09-11 15:42:52+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:39:25+0000"
"PO-Revision-Date: 2008-09-11 15:39:25+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:37:41+0000"
"PO-Revision-Date: 2008-09-11 15:37:41+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -1,68 +0,0 @@
# Translation of OpenERP Server.
# This file containt the translation of the following modules:
# * association_vertical
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 4.3.0"
"Report-Msgid-Bugs-To: support@openerp.com"
"POT-Creation-Date: 2008-09-11 15:37:06+0000"
"PO-Revision-Date: 2008-09-11 15:37:06+0000"
"Last-Translator: <>"
"Language-Team: "
"MIME-Version: 1.0"
"Content-Type: text/plain; charset=UTF-8"
"Content-Transfer-Encoding: "
"Plural-Forms: "
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
msgid "New Fund Opportunity"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_category_act_fund_my1
msgid "My Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my3
msgid "My Funds To Be Processed"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund1
msgid "Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_my2
msgid "My Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_fund_raise
msgid "Fund Raising"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all1
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all1
msgid "All Funds"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all2
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all2
msgid "All Funds Waiting Validation"
msgstr ""
#. module: association_vertical
#: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_all3
#: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund_all3
msgid "All Funds To Be Processed"
msgstr ""

View File

@ -48,7 +48,7 @@ class res_partner_contact(osv.osv):
'title': fields.selection(_title_get, 'Title'),
'website':fields.char('Website',size=120),
'lang_id':fields.many2one('res.lang','Language'),
'job_ids':fields.one2many('res.partner.job','contact_id','Functions'),
'job_ids':fields.one2many('res.partner.job','contact_id','Functions and Addresses'),
'country_id':fields.many2one('res.country','Nationality'),
'birthdate':fields.date('Birth Date'),
'active' : fields.boolean('Active'),
@ -91,7 +91,7 @@ class res_partner_address(osv.osv):
_inherit='res.partner.address'
_description ='Partner Address'
_columns = {
'job_ids':fields.one2many('res.partner.job', 'address_id', 'Contacts'),
'job_ids':fields.one2many('res.partner.job', 'address_id', 'Functions and Addresses'),
'email': fields.related('job_ids', 'email', type='char', string='Default Email'),
}
res_partner_address()

View File

@ -34,9 +34,8 @@
<field name="website"/>
<field name="lang_id"/>
<field name="active"/>
<separator string="Functions" colspan="4"/>
<field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
<form string="Functions">
<form string="Functions and Addresses">
<field name="function_id"/>
<field name="address_id"/>
<field name="name"/>
@ -47,7 +46,7 @@
<field name="date_stop" />
<field name="state" />
</form>
<tree string="Functions">
<tree string="Functions and Addresses">
<field name="sequence_contact" string="Seq."/>
<field name="function_id"/>
<field name="name"/>

View File

@ -179,7 +179,7 @@ class base_module_record(osv.osv):
# Create the minidom document
self.ids = {}
doc = minidom.Document()
terp = doc.createElement("terp")
terp = doc.createElement("openerp")
doc.appendChild(terp)
for rec in self.recording_data:
if rec[0]=='workflow':

View File

@ -8,11 +8,11 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<field name="property_account_position" position="after">
<field name="vat" nolabel="1" on_change="vat_change(vat)" select="2"/>
<group colspan="1" col="2">
<label string="VAT :" align="1.0"/>
<field name="vat_subjected" nolabel="1"/>
</group>
<field name="vat" nolabel="1" on_change="vat_change(vat)" select="2"/>
</field>
</field>
</record>

View File

@ -34,20 +34,20 @@ from tools.translate import _
class delivery_carrier(osv.osv):
_name = "delivery.carrier"
_description = "Carrier and delivery grids"
_description = "Carrier and delivery grids"
def get_price(self, cr, uid, ids, field_name, arg=None, context={}):
def get_price(self, cr, uid, ids, field_name, arg=None, context={}):
res={}
sale_obj=self.pool.get('sale.order')
grid_obj=self.pool.get('delivery.grid')
for carrier in self.browse(cr,uid,ids,context):
order_id=context.get('order_id',False)
price=False
if order_id:
if order_id:
order = sale_obj.browse(cr, uid, [order_id])[0]
carrier_grid=self.grid_get(cr,uid,[carrier.id],order.partner_shipping_id.id,context)
price=grid_obj.get_price(cr, uid, carrier_grid, order, time.strftime('%Y-%m-%d'), context)
res[carrier.id]=price
price=grid_obj.get_price(cr, uid, carrier_grid, order, time.strftime('%Y-%m-%d'), context)
res[carrier.id]=price
return res
_columns = {
'name': fields.char('Carrier', size=64, required=True),
@ -104,8 +104,8 @@ class delivery_grid(osv.osv):
total = 0
weight = 0
volume = 0
for line in order.order_line:
volume = 0
for line in order.order_line:
if not line.product_id:
continue
total += line.price_subtotal or 0.0

View File

@ -137,8 +137,8 @@
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
<field name="address_id" position="after">
<field name="weight"/>
<field name="carrier_id"/>
<field name="weight"/>
</field>
</field>
</record>
@ -150,8 +150,8 @@
<field name="inherit_id" ref="stock.view_picking_delivery_form"/>
<field name="arch" type="xml">
<field name="address_id" position="after">
<field name="weight"/>
<field name="carrier_id"/>
<field name="weight"/>
</field>
</field>
</record>
@ -161,7 +161,7 @@
<field name="res_model">stock.picking</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
</record>
<menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree"/>

View File

@ -34,12 +34,9 @@ import ir
import pooler
from tools.translate import _
delivery_form = """<?xml version="1.0"?>
<form string="Create deliveries">
<separator colspan="4" string="Delivery Method" />
<field name="carrier_id"/>
</form>
"""
from tools.misc import UpdateableStr
delivery_form = UpdateableStr()
delivery_fields = {
'carrier_id' : {'string':'Delivery Method', 'type':'many2one', 'relation': 'delivery.carrier','required':True}
@ -48,6 +45,13 @@ delivery_fields = {
def _delivery_default(self, cr, uid, data, context):
order_obj = pooler.get_pool(cr.dbname).get('sale.order')
order = order_obj.browse(cr, uid, data['ids'])[0]
delivery_form.string="""<?xml version="1.0"?>
<form string="Create deliveries">
<separator colspan="4" string="Delivery Method" />
<field name="carrier_id" context="{'order_id': %d}"/>
</form>
""" % (data['id'],)
if not order.state in ('draft'):
raise wizard.except_wizard(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
@ -80,7 +84,7 @@ def _delivery_set(self, cr, uid, data, context):
'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context),
'tax_id': [(6,0,taxes_ids)],
'type': 'make_to_stock'
})
})
return {}

View File

@ -134,8 +134,8 @@ class hr_timesheet(osv.osv):
'name' : fields.char("Name", size=64, required=True),
'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week'),
'date_from' : fields.date('Starting date'),
'hour_from' : fields.char('Work from', size=8, required=True),
'hour_to' : fields.char("Work to", size=8, required=True),
'hour_from' : fields.float('Work from', size=8, required=True),
'hour_to' : fields.float("Work to", size=8, required=True),
'tgroup_id' : fields.many2one("hr.timesheet.group", "Employee's timesheet group", select=True),
}
_order = 'dayofweek, hour_from'

View File

@ -5,7 +5,7 @@
<!-- Example employee -->
<record id="timesheet_group1" model="hr.timesheet.group">
<field name="name">Default timesheet</field>
<field name="name">38 Hours/Week</field>
</record>
<record id="employee1" model="hr.employee">
@ -18,71 +18,71 @@
<record model="hr.timesheet">
<field name="name">Monday morning</field>
<field name="dayofweek">0</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Monday evening</field>
<field name="dayofweek">0</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Tuesday morning</field>
<field name="dayofweek">1</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Tuesday evening</field>
<field name="dayofweek">1</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Wednesday morning</field>
<field name="dayofweek">2</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Wednesday evening</field>
<field name="dayofweek">2</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Thursday morning</field>
<field name="dayofweek">3</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Thursday evening</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="dayofweek">3</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Friday morning</field>
<field name="dayofweek">4</field>
<field name="hour_from">08:00</field>
<field name="hour_to">12:00</field>
<field name="hour_from">08</field>
<field name="hour_to">12</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>
<record model="hr.timesheet">
<field name="name">Friday evening</field>
<field name="dayofweek">4</field>
<field name="hour_from">13:00</field>
<field name="hour_to">18:00</field>
<field name="hour_from">13</field>
<field name="hour_to">18</field>
<field name="tgroup_id" ref="timesheet_group1"/>
</record>

View File

@ -196,8 +196,8 @@
<tree string="Working Time">
<field name="name"/>
<field name="dayofweek"/>
<field name="hour_from"/>
<field name="hour_to"/>
<field name="hour_from" widget="float_time"/>
<field name="hour_to" widget="float_time"/>
</tree>
</field>
</record>
@ -210,8 +210,8 @@
<field colspan="4" name="name" select="1"/>
<field name="date_from"/>
<field name="dayofweek" select="1"/>
<field name="hour_from"/>
<field name="hour_to"/>
<field name="hour_from" widget="float_time"/>
<field name="hour_to" widget="float_time"/>
</form>
</field>
</record>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_attendance_form" model="ir.ui.view">
<record id="view_attendance_form" model="ir.ui.view">
<field name="name">hr.attendance.form</field>
<field name="model">hr.attendance</field>
<field name="type">form</field>
@ -91,12 +91,12 @@
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<field name="parent_id" position="after">
<field name="state"/>
<button name="sign_in" states="absent" string="Sign In" type="object"/>
<button name="sign_out" states="present" string="Sign Out" type="object"/>
<field name="state"/>
<button name="sign_in" states="absent" string="Sign In" type="object"/>
<button name="sign_out" states="present" string="Sign Out" type="object"/>
</field>
</field>
</record>
</data>
</data>
</openerp>

View File

@ -37,7 +37,7 @@ _date_form = '''<?xml version="1.0"?>
<field name="init_date"/>
<field name="end_date"/>
<field name="max_delay"/>
<label string="Bellow this delay, the error is considered as volunteer" colspan="2"/>
<label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
</form>'''
_date_fields = {

View File

@ -1,99 +1,99 @@
<?xml version="1.0" ?>
<openerp>
<data>
<data>
<!-- Holidays -->
<record model="ir.ui.view" id="edit_holiday_inherit_new">
<field name="name">hr.holidays.form.inherit</field>
<field name="model">hr.holidays</field>
<field name="type">form</field>
<field name="inherit_id" eval="False"/>
<field name="arch" type="xml">
<!-- Holidays -->
<record model="ir.ui.view" id="edit_holiday_inherit_new">
<field name="name">hr.holidays.form.inherit</field>
<field name="model">hr.holidays</field>
<field name="type">form</field>
<field name="inherit_id" eval="False"/>
<field name="arch" type="xml">
<form string="Employee holidays">
<field colspan="4" name="name" select="1"/>
<field name="date_from" select="1"/>
<field name="date_to" select="1"/>
<newline/>
<field name="holiday_status" select="1"/>
<group col="12" colspan="2">
<button string="Confirm" name="confirm" states="draft" type="workflow"/>
<button string="Validate" name="validate" states="confirm" type="workflow"/>
<button string="Refuse" name="refuse" states="confirm" type="workflow"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
</group>
<field name="state" select="1" colspan="2"/>
<newline />
<field name="notes" col="12" colspan="4"/>
<newline />
<field name="manager_id" colspan="2"/>
<field name="employee_id" select="1" />
<newline />
<field name="number_of_days" colspan="2"/>
<group col="12" colspan="2">
<button string="Confirm" name="confirm" states="draft" type="workflow"/>
<button string="Validate" name="validate" states="confirm" type="workflow"/>
<button string="Refuse" name="refuse" states="confirm" type="workflow"/>
<button string="Cancel" name="cancel" states="validate,refuse" type="workflow"/>
<button string="Set to Draft" name="set_to_draft" states="cancel" type="object"/>
</group>
<field name="state" select="1" colspan="2"/>
<newline />
<field name="notes" col="12" colspan="4"/>
<newline />
<field name="manager_id" colspan="2"/>
<field name="employee_id" select="1" />
<newline />
<field name="number_of_days" colspan="2"/>
</form>
</field>
</record>
</field>
</record>
<record model="ir.ui.view" id="view_holiday">
<field name="name">hr.holidays.tree</field>
<field name="model">hr.holidays</field>
<field name="inherit_id" eval="False"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<record model="ir.ui.view" id="view_holiday">
<field name="name">hr.holidays.tree</field>
<field name="model">hr.holidays</field>
<field name="inherit_id" eval="False"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Employee holidays">
<field name="name"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="holiday_status"/>
<field name="state"/>
<field name="state"/>
</tree>
</field>
</record>
</field>
</record>
<record model="ir.ui.view" id="view_holiday_2">
<field name="name">hr.holidays.tree</field>
<field name="model">hr.holidays</field>
<field name="inherit_id" ref="view_holiday"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="number_of_days" string="Number of Days"/>
<field name="employee_id"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_holiday_2">
<field name="name">hr.holidays.tree</field>
<field name="model">hr.holidays</field>
<field name="inherit_id" ref="view_holiday"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="name" position="after">
<field name="employee_id"/>
<field name="number_of_days" string="Number of Days"/>
</field>
</field>
</record>
<!-- holidays status -->
<record model="ir.ui.view" id="edit_holiday_status_form">
<field name="name">hr.holidays.status.form</field>
<field name="model">hr.holidays.status</field>
<field name="inherit_id" eval="False"/>
<field name="type">form</field>
<field name="arch" type="xml">
<!-- holidays status -->
<record model="ir.ui.view" id="edit_holiday_status_form">
<field name="name">hr.holidays.status.form</field>
<field name="model">hr.holidays.status</field>
<field name="inherit_id" eval="False"/>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Define holiday status">
<field colspan="4" name="name" select="1"/>
<field name="color_name" select="2"/>
<field name="section_id" select="1" />
<field name="limit" select="2"/>
<field name="active" select="2"/>
<field name="color_name" select="2"/>
<field name="section_id" select="1" />
<field name="limit" select="2"/>
<field name="active" select="2"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_holiday_status_tree">
<field name="name">hr.holidays.status.tree</field>
<field name="model">hr.holidays.status</field>
<field name="inherit_id" eval="False"/>
<field name="type">tree</field>
<field name="arch" type="xml">
</field>
</record>
<record model="ir.ui.view" id="view_holiday_status_tree">
<field name="name">hr.holidays.status.tree</field>
<field name="model">hr.holidays.status</field>
<field name="inherit_id" eval="False"/>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Holiday status">
<field name="name"/>
<field name="color_name" />
<field name="section_id" />
<field name="limit" select="2"/>
<field name="active" select="2"/>
<field name="color_name" />
<field name="section_id" />
<field name="limit" select="2"/>
<field name="active" select="2"/>
</tree>
</field>
</record>
</field>
</record>
<record id="open_view_holiday_status" model="ir.actions.act_window">
<field name="name">Holiday Status</field>
<field name="type">ir.actions.act_window</field>
@ -103,155 +103,155 @@
</record>
<menuitem action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
<!-- holidays per user -->
<record model="ir.ui.view" id="view_holidays_per_user_form">
<field name="name">hr.holidays.per.user.form</field>
<field name="model">hr.holidays.per.user</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Holidays Per Employee">
<field name="employee_id" select="1" />
<field name="holiday_status" select="1" />
<newline/>
<field name="max_leaves" select="2" colspan="2" />
<newline/>
<field name="leaves_taken" select="2" colspan="2" />
<field name="active" select="2"/>
<newline/>
<field name="notes" colspan="4" />
</form>
</field>
</record>
<record model="ir.ui.view" id="view_holidays_per_user_tree">
<field name="name">hr.holidays.per.user.tree</field>
<field name="model">hr.holidays.per.user</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Holidays Per Employee">
<field name="employee_id"/>
<field name="holiday_status"/>
<field name="max_leaves"/>
<field name="leaves_taken"/>
<field name="active" select="2"/>
</tree>
</field>
</record>
<!-- holidays per user -->
<record model="ir.ui.view" id="view_holidays_per_user_form">
<field name="name">hr.holidays.per.user.form</field>
<field name="model">hr.holidays.per.user</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Holidays Per Employee">
<field name="employee_id" select="1" />
<field name="holiday_status" select="1" />
<newline/>
<field name="max_leaves" select="2" colspan="2" />
<newline/>
<field name="leaves_taken" select="2" colspan="2" />
<field name="active" select="2"/>
<newline/>
<field name="notes" colspan="4" />
</form>
</field>
</record>
<record model="ir.ui.view" id="view_holidays_per_user_tree">
<field name="name">hr.holidays.per.user.tree</field>
<field name="model">hr.holidays.per.user</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Holidays Per Employee">
<field name="employee_id"/>
<field name="holiday_status"/>
<field name="max_leaves"/>
<field name="leaves_taken"/>
<field name="active" select="2"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="view_holidays_per_user_graph">
<field name="name">hr.holidays.per.user.graph</field>
<field name="model">hr.holidays.per.user</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph type="bar" string="Holidays Allowed">
<field name="employee_id"/>
<field name="max_leaves" operator="+"/>
<field name="leaves_taken" operator="+"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_holidays_per_user_graph">
<field name="name">hr.holidays.per.user.graph</field>
<field name="model">hr.holidays.per.user</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph type="bar" string="Holidays Allowed">
<field name="employee_id"/>
<field name="max_leaves" operator="+"/>
<field name="leaves_taken" operator="+"/>
</graph>
</field>
</record>
<!-- Menu Items -->
<record model="ir.actions.act_window" id="open_ask_holidays">
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_id" ref="edit_holiday_inherit_new" />
</record>
<menuitem name="Holidays Request" parent="hr.menu_hr_root" id="menu_open_ask_holidays" action="open_ask_holidays"/>
<!-- Menu Items -->
<record model="ir.actions.act_window" id="open_ask_holidays">
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_id" ref="edit_holiday_inherit_new" />
</record>
<menuitem name="Holidays Request" parent="hr.menu_hr_root" id="menu_open_ask_holidays" action="open_ask_holidays"/>
<record model="ir.actions.act_window" id="action_all_holiday">
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="All Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_all_holiday" action="action_all_holiday" />
<record model="ir.actions.act_window" id="action_all_holiday">
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem name="All Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_all_holiday" action="action_all_holiday" />
<record model="ir.actions.act_window" id="action_my_holiday">
<field name="name">My Holidays Request</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem name="My Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" />
<record model="ir.actions.act_window" id="action_my_holiday">
<field name="name">My Holidays Request</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem name="My Holidays Requests" parent="menu_open_ask_holidays" id="menu_action_my_holiday" action="action_my_holiday" />
<record model="ir.actions.act_window" id="action_my_holiday_draft">
<field name="name">My Holidays Request Draft</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','draft')]</field>
</record>
<menuitem name="My Draft Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" />
<record model="ir.actions.act_window" id="action_my_holiday_draft">
<field name="name">My Holidays Request Draft</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','draft')]</field>
</record>
<menuitem name="My Draft Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" />
<record model="ir.actions.act_window" id="action_my_holiday_waiting">
<field name="name">My Holidays Request Waiting confirmation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
</record>
<menuitem name="My Awaiting Confirmation Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" />
<record model="ir.actions.act_window" id="action_my_holiday_waiting">
<field name="name">My Holidays Request Waiting confirmation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
</record>
<menuitem name="My Awaiting Confirmation Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" />
<record model="ir.actions.act_window" id="action_my_holiday_validate">
<field name="name">My Holidays Request Validated</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','validate')]</field>
</record>
<menuitem name="My Validated Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" />
<record model="ir.actions.act_window" id="action_my_holiday_validate">
<field name="name">My Holidays Request Validated</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','validate')]</field>
</record>
<menuitem name="My Validated Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_validate" action="action_my_holiday_validate" />
<record model="ir.actions.act_window" id="action_my_holiday_refuse">
<field name="name">My Holidays Request Refused</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','refuse')]</field>
</record>
<menuitem name="My Refused Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" />
<record model="ir.actions.act_window" id="action_my_holiday_refuse">
<field name="name">My Holidays Request Refused</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('user_id','=',uid), ('state','=','refuse')]</field>
</record>
<menuitem name="My Refused Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_refuse" action="action_my_holiday_refuse" />
<record model="ir.actions.act_window" id="action_holiday_waiting">
<field name="name">Requests Awaiting for Validation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','confirm')]</field>
</record>
<menuitem name="Holidays Requests Awaiting for Validation" parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" />
<record model="ir.actions.act_window" id="action_holiday_waiting">
<field name="name">Requests Awaiting for Validation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','confirm')]</field>
</record>
<menuitem name="Holidays Requests Awaiting for Validation" parent="menu_action_all_holiday" id="menu_action_holiday_waiting" action="action_holiday_waiting" />
<record model="ir.actions.act_window" id="action_holidays_per_user">
<field name="name">Holidays Per Employee</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays.per.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
</record>
<menuitem name="Holidays Per Employee" parent="hr.menu_hr_configuration" id="menu_open_holidays_per_user" action="action_holidays_per_user"/>
<record model="ir.actions.act_window" id="action_holidays_per_user">
<field name="name">Holidays Per Employee</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays.per.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form,graph</field>
</record>
<menuitem name="Holidays Per Employee" parent="hr.menu_hr_configuration" id="menu_open_holidays_per_user" action="action_holidays_per_user"/>
<record model="ir.actions.act_window" id="action_my_holiday_available">
<field name="name">My Available Holidays</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays.per.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem name="My Available Holidays" parent="hr.menu_hr_reporting" id="menu_action_my_holiday_available" action="action_my_holiday_available" />
<record model="ir.actions.act_window" id="action_my_holiday_available">
<field name="name">My Available Holidays</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays.per.user</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="domain">[('user_id','=',uid)]</field>
</record>
<menuitem name="My Available Holidays" parent="hr.menu_hr_reporting" id="menu_action_my_holiday_available" action="action_my_holiday_available" />
<!-- Shortcuts -->
<act_window name="My Holiday Requests"
domain="[('employee_id', '=', active_id)]"
res_model="hr.holidays"
src_model="hr.employee"
id="act_hr_employee_holiday_request"/>
<!-- Shortcuts -->
<act_window name="My Holiday Requests"
domain="[('employee_id', '=', active_id)]"
res_model="hr.holidays"
src_model="hr.employee"
id="act_hr_employee_holiday_request"/>
</data>
</data>
</openerp>

View File

@ -12,7 +12,7 @@
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
<field name="name"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
<field name="product_id" required="1"/>
<field name="product_id" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field name="amount" sum="Total cost"/>
<field name="general_account_id"/>
@ -30,7 +30,7 @@
<field name="date" select="1"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<newline/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
@ -86,7 +86,7 @@
<field name="res_model">hr.analytic.timesheet</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('date', '=', time.strftime('%Y-%m-%d'))]</field>
<field name="domain">[('date', '=', time.strftime('%Y-%m-%d'))]</field>
</record>
<menuitem action="act_hr_timesheet_line_evry1_today_form" id="menu_act_hr_timesheet_line_evry1_today_form" parent="menu_act_hr_timesheet_line_evry1_all_form"/>
@ -96,10 +96,10 @@
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<notebook position="inside">
<page string="Timesheets">
<field name="product_id"/>
<field name="journal_id"/>
</page>
<page string="Timesheets">
<field name="product_id" domain="[('type','=','service')]"/>
<field name="journal_id"/>
</page>
</notebook>
</field>
</record>

View File

@ -65,8 +65,14 @@ class account_analytic_account(osv.osv):
_columns = {
'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
'amount_max': fields.float('Max. Invoice Price'),
'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount'),
'to_invoice': fields.many2one('hr_timesheet_invoice.factor','Invoicing'),
'amount_invoiced': fields.function(_invoiced_calc, method=True, string='Invoiced Amount',
help="Total invoiced"),
'to_invoice': fields.many2one('hr_timesheet_invoice.factor','Reinvoice Costs',
help="Check this field if you plan to automatically generate invoices based " \
"on the costs in this analytic account: timesheets, expenses, ..."),
}
_defaults = {
'pricelist_id': lambda self,cr, uid, ctx: ctx.get('pricelist_id', False),
}
account_analytic_account()

View File

@ -8,13 +8,16 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
<field name="arch" type="xml">
<field name="quantity_max" position="before">
<separator colspan="4" string="Invoicing Data"/>
<field name="pricelist_id"/>
<field name="to_invoice"/>
<field name="amount_max"/>
<field name="amount_invoiced"/>
<field name="state"/>
<field name="user_id" position="after">
<group colspan="4" col="4">
<separator colspan="4" string="Invoicing Data"/>
<field name="pricelist_id"/>
<field name="to_invoice"/>
<field name="amount_max"/>
<field name="amount_invoiced"/>
<separator colspan="4" string="Status"/>
<field name="state"/>
</group>
</field>
</field>
</record>

View File

@ -2,7 +2,7 @@
<openerp>
<data>
<wizard id="hr_timesheet_invoice_create" model="account.analytic.line" name="hr.timesheet.invoice.create" string="Invoice analytic lines"/>
<wizard id="hr_timesheet_final_invoice_create" model="account.analytic.account" name="hr.timesheet.final.invoice.create" string="Final invoices"/>
<wizard id="hr_timesheet_final_invoice_create" model="account.analytic.account" name="hr.timesheet.final.invoice.create" string="Final Invoice"/>
</data>
</openerp>

View File

@ -42,10 +42,7 @@ from tools.translate import _
#
class final_invoice_create(wizard.interface):
def _get_defaults(self, cr, uid, data, context):
if not data['ids']:
return {}
account = pooler.get_pool(cr.dbname).get('account.analytic.account').browse(cr, uid, data['ids'], context)[0]
return {'use_amount_max': bool(account.amount_max)}
return {}
def _do_create(self, cr, uid, data, context):
pool = pooler.get_pool(cr.dbname)
@ -93,63 +90,26 @@ class final_invoice_create(wizard.interface):
"WHERE account_id = %d " \
"AND to_invoice IS NOT NULL " \
"GROUP BY product_id, to_invoice", (account.id,))
for product_id,factor_id,qty in cr.fetchall():
product = pool.get('product.product').browse(cr, uid, product_id, context2)
factor_name = ''
factor = pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context2)
if factor.customer_name:
factor_name = product.name+' - '+factor.customer_name
else:
factor_name = product.name
if account.pricelist_id:
pl = account.pricelist_id.id
price = pool.get('product.pricelist').price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id)[pl]
else:
price = 0.0
taxes = product.taxes_id
tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
'price_unit': price,
'quantity': qty,
'discount':factor.factor,
'invoice_line_tax_id': [(6,0,tax )],
'invoice_id': last_invoice,
'name': factor_name,
'product_id': product_id,
'uos_id': product.uom_id.id,
'account_id': account_id,
'account_analytic_id': account.id,
}
amount_total += round((price * ( 1.0 - (factor.factor or 0.0)/100.0)), 2) * qty
#
# Compute for lines
#
cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %d AND product_id=%d and to_invoice=%d" % (account.id, product_id, factor_id))
line_ids = cr.dictfetchall()
note = []
for line in line_ids:
# set invoice_line_note
details = []
if data['form']['date']:
details.append(line['date'])
if data['form']['time']:
details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
if data['form']['name']:
details.append(line['name'])
#if data['form']['price']:
# details.append(abs(line['amount']))
note.append(' - '.join(map(str,details)))
curr_line['note'] = "\n".join(map(str,note))
pool.get('account.invoice.line').create(cr, uid, curr_line)
cr.execute("update account_analytic_line set invoice_id=%d WHERE account_id = %d and invoice_id is null" % (last_invoice,account.id,))
cr.execute("SELECT line.product_id, sum(line.amount), line.account_id, line.product_uom_id, move_line.ref FROM account_analytic_line as line, account_move_line as move_line WHERE line.account_id = %d AND line.move_id IS NOT NULL AND move_line.id = line.move_id GROUP BY line.product_id, line.account_id, line.product_uom_id, move_line.ref" % (account.id))
cr.execute("""SELECT
line.product_id,
sum(line.amount),
line.general_account_id,
line.product_uom_id,
move_line.ref
FROM
account_analytic_line as line
LEFT JOIN account_move_line as move_line on (line.move_id=move_line.id)
LEFT JOIN account_analytic_journal as journal on (line.journal_id=journal.id)
WHERE
line.account_id = %d AND
line.move_id IS NOT NULL AND
journal.type = 'sale'
GROUP BY
line.product_id,
line.general_account_id,
line.product_uom_id,
move_line.ref""" % (account.id))
for product_id, amount, account_id, product_uom_id, ref in cr.fetchall():
product = pool.get('product.product').browse(cr, uid, product_id, context2)
@ -158,7 +118,7 @@ class final_invoice_create(wizard.interface):
else:
taxes = []
tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
tax = pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
curr_line = {
'price_unit': -amount,
'quantity': 1.0,
@ -169,33 +129,33 @@ class final_invoice_create(wizard.interface):
'product_id': product_id,
'uos_id': product_uom_id,
'account_id': account_id,
'account_analytic_id': account.id
}
pool.get('account.invoice.line').create(cr, uid, curr_line)
if data['form']['use_amount_max']:
if abs(account.amount_max - amount_total) > data['form']['balance_amount'] :
if not data['form']['balance_product']:
raise wizard.except_wizard(_('Balance product needed'), _('Please fill a Balance product in the wizard'))
product = pool.get('product.product').browse(cr, uid, data['form']['balance_product'], context2)
if not data['form']['balance_product']:
raise wizard.except_wizard(_('Balance product needed'), _('Please fill a Balance product in the wizard'))
product = pool.get('product.product').browse(cr, uid, data['form']['balance_product'], context2)
taxes = product.taxes_id
tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
'price_unit': account.amount_max - amount_total,
'quantity': 1.0,
'discount': 0.0,
'invoice_line_tax_id': [(6,0,tax)],
'invoice_id': last_invoice,
'name': product.name,
'product_id': product_id,
'uos_id': product.uom_id.id,
'account_id': account_id,
}
pool.get('account.invoice.line').create(cr, uid, curr_line)
if account.amount_max < amount_total:
pool.get('account.invoice').write(cr, uid, [last_invoice], {'type': 'out_refund',})
taxes = product.taxes_id
tax = pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
'price_unit': account.amount_max - amount_total,
'quantity': 1.0,
'discount': 0.0,
'invoice_line_tax_id': [(6,0,tax)],
'invoice_id': last_invoice,
'name': product.name,
'product_id': product_id,
'uos_id': product.uom_id.id,
'account_id': account_id,
'account_analytic_id': account.id
}
pool.get('account.invoice.line').create(cr, uid, curr_line)
if account.amount_max < amount_total:
pool.get('account.invoice').write(cr, uid, [last_invoice], {'type': 'out_refund',})
cr.execute('update account_analytic_line set invoice_id=%d where invoice_id is null and account_id=%d', (last_invoice, account.id))
return {
'domain': "[('id','in', ["+','.join(map(str,invoices))+"])]",
@ -217,19 +177,15 @@ class final_invoice_create(wizard.interface):
<field name="name"/>
<field name="price"/>
<separator string="Invoice Balance amount" colspan="4"/>
<field name="use_amount_max"/>
<field name="balance_amount"/>
<field name="balance_product"/>
<field name="balance_product" required="1"/>
</form>"""
_create_fields = {
'date': {'string':'Date', 'type':'boolean'},
'time': {'string':'Time spent', 'type':'boolean'},
'name': {'string':'Name of entry', 'type':'boolean'},
'price': {'string':'Cost', 'type':'boolean'},
'use_amount_max': {'string':'Use Max. Invoice Price', 'type':'boolean'},
'balance_amount': {'string':'Balance amount', 'type': 'float'},
'balance_product': {'string':'Balance product', 'type': 'many2one', 'relation':'product.product'},
'date': {'string':'Date', 'type':'boolean', 'help':"Display date in the history of works"},
'time': {'string':'Time spent', 'type':'boolean', 'help':"Display time in the history of works"},
'name': {'string':'Name of entry', 'type':'boolean', 'help':"Display detail of work in the invoice line."},
'price': {'string':'Cost', 'type':'boolean', 'help':"Display cost of the item you reinvoice"},
'balance_product': {'string':'Balance product', 'type': 'many2one', 'relation':'product.product', 'help':"The product that will be used to invoice the remaining amount."},
}
states = {

View File

@ -113,7 +113,7 @@ class invoice_create(wizard.interface):
price = 0.0
taxes = product.taxes_id
tax = self.pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
tax = pool.get('account.fiscal.position').map_tax(cr, uid, account.partner_id, taxes)
account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
curr_line = {
@ -167,24 +167,30 @@ class invoice_create(wizard.interface):
_create_form = """<?xml version="1.0"?>
<form title="Invoice on analytic entries">
<separator string="Do you want details for each line of the invoices ?" colspan="4"/>
<field name="date"/>
<field name="time"/>
<field name="name"/>
<field name="price"/>
<separator string="Choose accounts you want to invoice" colspan="4"/>
<field name="accounts" colspan="4"/>
<separator string="Choose a product for intermediary invoice" colspan="4"/>
<field name="product"/>
<notebook>
<page string="Invoicing Data">
<separator string="Do you want to show details of work in invoice ?" colspan="4"/>
<field name="date"/>
<field name="time"/>
<field name="name"/>
<field name="price"/>
<separator string="Force to use a specific product" colspan="4"/>
<field name="product"/>
</page>
<page string="Filter on Accounts" groups="base.group_extended">
<separator string="Choose accounts you want to invoice" colspan="4"/>
<field name="accounts" colspan="4" nolabel="1"/>
</page>
</notebook>
</form>"""
_create_fields = {
'accounts': {'string':'Analytic Accounts', 'type':'many2many', 'required':'true', 'relation':'account.analytic.account'},
'date': {'string':'Date', 'type':'boolean'},
'time': {'string':'Time spent', 'type':'boolean'},
'name': {'string':'Name of entry', 'type':'boolean'},
'price': {'string':'Cost', 'type':'boolean'},
'product': {'string':'Product', 'type':'many2one', 'relation': 'product.product'},
'date': {'string':'Date', 'type':'boolean', 'help':'The real date of each work will be displayed on the invoice'},
'time': {'string':'Time spent', 'type':'boolean', 'help':'The time of each work done will be displayed on the invoice'},
'name': {'string':'Name of entry', 'type':'boolean', 'help':'The detail of each work done will be displayed on the invoice'},
'price': {'string':'Cost', 'type':'boolean', 'help':'The cost of each work done will be displayed on the invoice. You probably don\'t want to check this.'},
'product': {'string':'Product', 'type':'many2one', 'relation': 'product.product', 'help':"Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost."},
}
states = {

View File

@ -284,7 +284,7 @@ class hr_timesheet_sheet(osv.osv):
_constraints = [
(_sheet_date, 'You can not have 2 timesheets that overlaps !', ['date_from','date_to']),
(_sheet_date, 'You can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']),
(_date_current_check, 'You must select a Current date wich is in the timesheet dates !', ['date_current']),
]

File diff suppressed because it is too large Load Diff

View File

@ -133,7 +133,8 @@ class mrp_routing_workcenter(osv.osv):
'workcenter_id': fields.many2one('mrp.workcenter', 'Workcenter', required=True),
'name': fields.char('Name', size=64, required=True),
'sequence': fields.integer('Sequence'),
'cycle_nbr': fields.float('Number of Cycle', required=True),
'cycle_nbr': fields.float('Number of Cycle', required=True,
help="A cycle is defined in the workcenter definition."),
'hour_nbr': fields.float('Number of Hours', required=True),
'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True),
'note': fields.text('Description')
@ -184,7 +185,6 @@ class mrp_bom(osv.osv):
"between the sale order to the picking without going through the production order." \
"The normal BoM will generate one production order per BoM level."),
'method': fields.function(_compute_type, string='Method', method=True, type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
'date_stop': fields.date('Valid Until', help="Validity of this BoM or component. Keep empty if it's always valid."),
'sequence': fields.integer('Sequence'),
@ -194,8 +194,8 @@ class mrp_bom(osv.osv):
'product_uos': fields.many2one('product.uom', 'Product UOS'),
'product_qty': fields.float('Product Qty', required=True),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
'product_rounding': fields.float('Product Rounding'),
'product_efficiency': fields.float('Product Efficiency', required=True),
'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity. For integer only values, put 1.0"),
'product_efficiency': fields.float('Product Efficiency', required=True, help="Efficiency on the production. A factor of 0.9 means a loss of 10% in the production."),
'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of workcenters) to produce the finnished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification."),
@ -214,7 +214,8 @@ class mrp_bom(osv.osv):
}
_order = "sequence"
_sql_constraints = [
('bom_qty_zero', 'CHECK (product_qty>0)', 'All product quantities must be greater than 0 !'),
('bom_qty_zero', 'CHECK (product_qty>0)', 'All product quantities must be greater than 0.\n' \
'You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
]
def _check_recursion(self, cr, uid, ids):
@ -385,8 +386,10 @@ class mrp_production(osv.osv):
'product_uos_qty': fields.float('Product Qty'),
'product_uos': fields.many2one('product.uom', 'Product UOM'),
'location_src_id': fields.many2one('stock.location', 'Raw Products Location', required=True),
'location_dest_id': fields.many2one('stock.location', 'Finnished Products Location', required=True),
'location_src_id': fields.many2one('stock.location', 'Raw Products Location', required=True,
help="Location where the system will look for products used in raw materials."),
'location_dest_id': fields.many2one('stock.location', 'Finnished Products Location', required=True,
help="Location where the system will stock the finnished products."),
'date_planned': fields.datetime('Scheduled date', required=True, select=1),
'date_start': fields.datetime('Start Date'),
@ -394,7 +397,8 @@ class mrp_production(osv.osv):
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
'picking_id': fields.many2one('stock.picking', 'Packing list', readonly=True),
'picking_id': fields.many2one('stock.picking', 'Packing list', readonly=True,
help="This is the internal picking list take bring the raw materials to the production plan."),
'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products Consummed'),
@ -739,7 +743,9 @@ class mrp_procurement(osv.osv):
_description = "Procurement"
_columns = {
'name': fields.char('Name', size=64, required=True),
'origin': fields.char('Origin', size=64),
'origin': fields.char('Origin', size=64,
help="Reference of the document that created this procurement.\n"
"This is automatically completed by Open ERP."),
'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
'date_planned': fields.datetime('Scheduled date', required=True),
'date_close': fields.datetime('Date Closed'),
@ -754,7 +760,9 @@ class mrp_procurement(osv.osv):
'close_move': fields.boolean('Close Move at end', required=True),
'location_id': fields.many2one('stock.location', 'Location', required=True),
'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]}, readonly=True, required=True),
'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
readonly=True, required=True, help="If you encode manually a procurement, you probably want to use" \
" a make to order method."),
'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
'purchase_line_id': fields.many2one('purchase.order.line', 'Purchase Order Line'),
@ -771,6 +779,16 @@ class mrp_procurement(osv.osv):
'close_move': lambda *a: 0,
'procure_method': lambda *a: 'make_to_order',
}
def onchange_product_id(self, cr, uid, ids, product_id, context={}):
if product_id:
w=self.pool.get('product.product').browse(cr,uid,product_id, context)
v = {
'product_uom':w.uom_id.id,
'product_uos':w.uos_id and w.uos_id.id or w.uom_id.id
}
return {'value': v}
return {}
def check_product(self, cr, uid, ids):
for procurement in self.browse(cr, uid, ids):
if procurement.product_id.type in ('product', 'consu'):
@ -1081,9 +1099,14 @@ class stock_warehouse_orderpoint(osv.osv):
'location_id': fields.many2one('stock.location', 'Location', required=True),
'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
'product_min_qty': fields.float('Min Quantity', required=True),
'product_max_qty': fields.float('Max Quantity', required=True),
'qty_multiple': fields.integer('Qty Multiple', required=True),
'product_min_qty': fields.float('Min Quantity', required=True,
help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
"a procurement to bring the virtual stock to the Max Quantity."),
'product_max_qty': fields.float('Max Quantity', required=True,
help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
"a procurement to bring the virtual stock to the Max Quantity."),
'qty_multiple': fields.integer('Qty Multiple', required=True,
help="The procurement quantity will by rounded up to this multiple."),
'procurement_id': fields.many2one('mrp.procurement', 'Purchase Order')
}
_defaults = {

View File

@ -642,12 +642,12 @@
<separator colspan="2" string="Planification"/>
<field name="date_planned" select="1"/>
<field name="procure_method" select="2"/>
<field name="priority"/>
<field name="priority" groups="base.group_extended"/>
</group>
<notebook colspan="4">
<page string="Procurement Details">
<separator colspan="4" string="Product &amp; Location"/>
<field name="product_id" select="1"/>
<field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
<field name="location_id" select="2"/>
<field name="product_qty"/>
<field name="product_uom"/>
@ -709,7 +709,7 @@
<menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action"/>
<record id="mrp_procurement_action5" model="ir.actions.act_window">
<field name="name">Exceptions procurements</field>
<field name="name">Exceptions Procurements</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>
@ -719,7 +719,7 @@
<menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="stock.menu_stock_root"/>
<record id="mrp_procurement_action4" model="ir.actions.act_window">
<field name="name">Exceptions procurements to fix</field>
<field name="name">Exceptions Procurements to Fix</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">mrp.procurement</field>
<field name="view_type">form</field>

View File

@ -2,7 +2,7 @@
<openerp>
<data>
<wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/>
<menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard"/>
<menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="100"/>
<wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Procurements Only" name="mrp.procurement.compute"/>
<menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
@ -20,7 +20,7 @@
<field eval="'ir.actions.wizard,%d'%wizard_price" name="value"/>
<field eval="True" name="object"/>
</record>
<wizard
string="Create Procurement"
model="product.product"

View File

@ -64,7 +64,8 @@ class MakeProcurement(wizard.interface):
<label string="Your procurement request has been sent !"/>
</form>"""
procurement_form = """<?xml version="1.0"?>
<form string="Make Procurement">
<form string="Internal Procurement Request">
<label string="This wizard will planify the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
<field name="product_id"/>
<field name="warehouse_id"/>
<field name="qty"/>
@ -75,7 +76,7 @@ class MakeProcurement(wizard.interface):
'qty': {'string': 'Quantity', 'type': 'float', 'digits':(16,2), 'required': True},
'product_id': {'string': 'product', 'type': 'many2one', 'relation': 'product.product', 'required': True, 'readonly':1},
'uom_id': {'string': 'Unit of Measure', 'type': 'many2one', 'relation': 'product.uom', 'required':True},
'warehouse_id': {'string': 'Location', 'type': 'many2one', 'relation':'stock.warehouse', 'required':True},
'warehouse_id': {'string': 'Warehouse', 'type': 'many2one', 'relation':'stock.warehouse', 'required':True},
'date_planned': {'string': 'Planned Date', 'type': 'date', 'required':True, 'default': lambda *args: time.strftime('%Y-%m-%d')}
}

View File

@ -9,13 +9,13 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<field name="hour" position="after">
<button name="button_done" string="Finished" states="startworking"/>
<button name="button_start_working" string="Start working" states="draft,pause"/>
<field name="uom"/>
<field name="qty"/>
<field name="product"/>
<field name="production_id"/>
<field name="state" />
<field name="production_id"/>
<field name="product"/>
<field name="qty"/>
<field name="uom"/>
<button name="button_start_working" string="Start working" states="draft,pause"/>
<button name="button_done" string="Finished" states="startworking"/>
</field>
</field>
</record>
@ -26,19 +26,19 @@
<field name="type">form</field>
<field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/>
<field name="arch" type="xml">
<field name="hour" position="after">
<group colspan="8" col="8">
<field name="state" select="2"/>
<button name="button_draft" string="Set Draft" states="cancel"/>
<button name="button_start_working" string="Start working" states="draft"/>
<button name="button_resume" string="Resume" states="pause"/>
<button name="button_done" string="Finished" states="startworking"/>
<button name="button_pause" string="Pause" states="startworking"/>
<button name="button_cancel" string="Cancel" states="draft,startworking"/>
</group>
<field name="delay"/>
<field name="production_id"/>
</field>
<field name="hour" position="after">
<field name="production_id"/>
<field name="delay"/>
<group colspan="8" col="8">
<field name="state" select="2"/>
<button name="button_draft" string="Set Draft" states="cancel"/>
<button name="button_start_working" string="Start working" states="draft"/>
<button name="button_resume" string="Resume" states="pause"/>
<button name="button_done" string="Finished" states="startworking"/>
<button name="button_pause" string="Pause" states="startworking"/>
<button name="button_cancel" string="Cancel" states="draft,startworking"/>
</group>
</field>
</field>
</record>

View File

@ -240,7 +240,7 @@ class product_template(osv.osv):
return result
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True, select=True),
'name': fields.char('Name', size=128, required=True, translate=True, select=True),
'product_manager': fields.many2one('res.users','Product Manager'),
'description': fields.text('Description',translate=True),
'description_purchase': fields.text('Purchase Description',translate=True),

View File

@ -4,7 +4,7 @@
"version":"0.1",
"author":"Tiny",
"category":"Profile",
"depends":["membership", "event", "association_vertical", "board_association"],
"depends":["membership", "event", "board_association"],
"demo_xml":[],
"update_xml":[
"security/ir.model.access.csv",

View File

@ -33,11 +33,9 @@ import pooler
class profile_association_config_install_modules_wizard(osv.osv_memory):
_name='profile.association.config.install_modules_wizard'
_columns = {
'crm_configuration':fields.boolean('CRM & Calendars', help="This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."),
'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."),
'project':fields.boolean('Project Management'),
'event' : fields.boolean('Events Organisation'),
'crm' : fields.boolean('Fund Raising'),
}
def action_cancel(self,cr,uid,ids,conect=None):
return {
@ -47,8 +45,6 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
'type': 'ir.actions.act_window',
'target':'new',
}
def action_install(self, cr, uid, ids, context=None):
result=self.read(cr,uid,ids)
mod_obj = self.pool.get('ir.module.module')
@ -66,8 +62,6 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
'type': 'ir.actions.act_window',
'target':'new',
}
profile_association_config_install_modules_wizard()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -109,6 +109,11 @@ class project(osv.osv):
res[id] = prog / tot
return res
def unlink(self, cr, uid, ids, *args, **kwargs):
for proj in self.browse(cr, uid, ids):
if proj.tasks:
raise osv.except_osv(_('Operation Not Permited !'), _('You can not delete a project with tasks. I suggest you to desactivate it.'))
return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
_columns = {
'name': fields.char("Project Name", size=128, required=True),
'active': fields.boolean('Active'),

View File

@ -160,9 +160,9 @@
<field name="arch" type="xml">
<field name="partner_id" position="after">
<newline/>
<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
<field name="context_id" select="2"/>
<separator string="Getting Things Done" colspan="4"/>
<field name="context_id" select="2"/>
<field name="timebox_id" select="1" domain="[('user_id', '=', uid)]"/>
<newline/>
</field>
</field>

View File

@ -107,7 +107,7 @@
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
<field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
<field domain="[('type','=','sale')]" name="pricelist_id"/>
<field name="project_id" select="2"/>
<field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id}"/>
<newline/>
<field colspan="4" mode="tree,graph" name="order_line" nolabel="1" widget="one2many_list">
<form string="Sale Order Lines">
@ -427,7 +427,7 @@
<menuitem action="action_order_line_tree1" id="menu_action_order_line_tree1" parent="sale.menu_sale_root"/>
<record id="action_order_line_tree2" model="ir.actions.act_window">
<field name="name">Uninvoiced lines</field>
<field name="name">Uninvoiced Lines</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.order.line</field>
<field name="view_type">form</field>

View File

@ -135,8 +135,8 @@
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<field name="client_order_ref" position="after">
<field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
<field name="journal_id" select="1"/>
</field>
</field>
</record>
@ -147,8 +147,8 @@
<field name="inherit_id" ref="sale.view_order_tree" />
<field name="arch" type="xml">
<field name="state" position="after">
<field name="journal_id"/>
<field name="invoice_type_id"/>
<field name="journal_id"/>
</field>
</field>
</record>
@ -160,9 +160,9 @@
<field name="inherit_id" ref="stock.view_picking_form" />
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="invoice_type_id" select="1"/>
<field name="sale_journal_id" select="1"/>
<field name="journal_id" select="1"/>
<field name="sale_journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
</field>
</field>
</record>
@ -174,9 +174,9 @@
<field name="inherit_id" ref="stock.vpicktree" />
<field name="arch" type="xml">
<field name="invoice_state" position="after">
<field name="sale_journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
<field name="journal_id" select="1"/>
<field name="invoice_type_id" select="1"/>
<field name="sale_journal_id" select="1"/>
</field>
</field>
</record>

View File

@ -17,10 +17,10 @@
<field name="inherit_id" ref="project.edit_project"/>
<field name="arch" type="xml">
<field name="state" position="after">
<newline/>
<field name="sprint_size"/>
<field name="product_owner_id" required="1" select="1"/>
<separator string="Scrum Data" colspan="4"/>
<field name="product_owner_id" required="1" select="1"/>
<field name="sprint_size"/>
<newline/>
</field>
</field>
</record>

View File

@ -48,8 +48,8 @@
<field name="priority">26</field>
<field name="arch" type="xml">
<field name="property_account_expense" position="after">
<field name="property_stock_account_input"/>
<field name="property_stock_account_output"/>
<field name="property_stock_account_input"/>
</field>
</field>
</record>