bzr revid: mra@mra-laptop-20100722063430-u4jk6ahgt5oxirut
This commit is contained in:
Mustufa Rangwala 2010-07-22 12:04:30 +05:30
commit 9c58c305ba
68 changed files with 2941 additions and 982 deletions

View File

@ -8,6 +8,7 @@
<field name="view_type">form</field>
<field name="domain">[('state','=','draft')]</field>
<field name="view_id" ref="view_account_period_tree"/>
<field name="help"> After closing a period, you will no longer be able to post entries to the period once it has been closed.</field>
</record>
<menuitem
action="action_account_period_tree"

View File

@ -424,6 +424,7 @@
<field name="domain">[('type','=','out_invoice')]</field>
<field name="context">{'type':'out_invoice'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">Most of customer invoices are automatically generate in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund yours customers invoices here. A manual invoice can be created here.</field>
</record>
<record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
@ -449,6 +450,7 @@
<field name="domain">[('type','=','in_invoice')]</field>
<field name="context">{'type':'in_invoice'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">Proposal for vendor invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
</record>
<menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
@ -461,6 +463,7 @@
<field name="domain">[('type','=','out_refund')]</field>
<field name="context">{'type':'out_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">A customer refund is a credit note to your customer that cancel invoice or a part of it.</field>
</record>
<record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@ -486,6 +489,7 @@
<field name="domain">[('type','=','in_refund')]</field>
<field name="context">{'type':'in_refund'}</field>
<field name="search_view_id" ref="view_account_invoice_filter"/>
<field name="help">A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you.</field>
</record>
<menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>

View File

@ -850,6 +850,7 @@
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_id" ref="view_tax_code_tree"/>
<field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. Its presented in a hierarchical structure, which can be modified to fit your needs.</field>
</record>
<menuitem
action="action_tax_code_tree"
@ -1432,6 +1433,7 @@
<field name="name">Journals</field>
<field name="res_model">account.journal.period</field>
<field name="view_type">tree</field>
<field name="help">You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line.</field>
</record>
<menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>

File diff suppressed because it is too large Load Diff

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-18 14:54+0000\n"
"PO-Revision-Date: 2010-07-21 07:21+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -3719,7 +3719,7 @@ msgstr "Wprowadzanie zapisów"
#: wizard_view:account.invoice.refund,init:0
#: model:ir.actions.wizard,name:account.wizard_invoice_refund
msgid "Credit Note"
msgstr "Nota kredytowa"
msgstr "Korekta"
#. module: account
#: model:ir.actions.todo,note:account.config_fiscalyear
@ -4426,7 +4426,7 @@ msgstr "Zaksięgowano"
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Credit Notes"
msgstr "Nota kredytowa"
msgstr "Korekty"
#. module: account
#: field:account.config.wizard,date2:0

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-16 01:13+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"PO-Revision-Date: 2010-07-22 01:32+0000\n"
"Last-Translator: digitalsatori <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-17 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -35,7 +35,7 @@ msgstr "未支付的采购发票"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Entries Encoding"
msgstr "录入的记录"
msgstr "分录录入"
#. module: account
#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@ -55,7 +55,7 @@ msgstr "资产"
#. module: account
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "在动作定义使用了无效的模块名。"
msgstr "在动作定义使用了无效的模式名称。"
#. module: account
#: help:account.journal,currency:0
@ -87,14 +87,14 @@ msgstr "对账结果"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
msgid "Unreconciled entries"
msgstr "取消核销"
msgstr "未对账分录"
#. module: account
#: field:account.invoice.tax,base_code_id:0
#: field:account.tax,base_code_id:0
#: field:account.tax.template,base_code_id:0
msgid "Base Code"
msgstr "基于的税务"
msgstr ""
#. module: account
#: view:account.account:0
@ -115,7 +115,7 @@ msgstr "上级科目"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
msgstr "原始凭证集合"
msgstr ""
#. module: account
#: field:account.invoice,residual:0

View File

@ -890,7 +890,9 @@ class account_invoice(osv.osv):
new_move_name = self.pool.get('account.move').browse(cr, uid, move_id).name
# make the invoice point to that move
self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
self.pool.get('account.move').post(cr, uid, [move_id])
# Pass invoice in context in method post: used if you want to get the same
# account move reference when creating the same invoice after a cancelled one:
self.pool.get('account.move').post(cr, uid, [move_id], context={'invoice':inv})
self._log_event(cr, uid, ids)
return True

View File

@ -63,7 +63,7 @@
<field name="quantity_max"/>
<field name="parent_id" invisible="1"/>
<field name="type" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="user_id" invisible="1"/>
</tree>
</field>
@ -131,8 +131,9 @@
<field name="res_model">account.analytic.account</field>
<field name="domain">[('parent_id','=',False)]</field>
<field name="view_type">tree</field>
<field name="view_mode">form,graph</field>
<field name="view_mode">form,graph</field>
<field name="view_id" ref="view_account_analytic_account_tree"/>
<field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
</record>
<!-- <menuitem-->
<!-- action="action_account_analytic_account_tree2"-->
@ -376,6 +377,7 @@
<field name="name">Print Analytic Journals</field>
<field name="res_model">account.analytic.journal</field>
<field name="view_type">tree</field>
<field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
</record>
<menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>

View File

@ -104,6 +104,7 @@
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_analytic_entries_report_search"/>
<field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
</record>
<menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement" sequence="4"/>

View File

@ -126,6 +126,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_profit': 1,'search_default_group_account':1,'search_default_group_month': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
<field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
</record>
<menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
</data>

View File

@ -138,6 +138,8 @@
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_month':1,'search_default_product':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_account_invoice_report_search"/>
<field name="help">A tool search lets you know statistics on invoices that match your needs.</field>
</record>
<menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/>

View File

@ -44,6 +44,7 @@
<field name="view_id" ref="account_automatic_reconcile_view"/>
<field name="context">{'record_id':active_id}</field>
<field name="target">new</field>
<field name="help">For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP make its own search for entries to reconcile in a series of accounts. It tries to find entries for each partner where the amounts correspond.</field>
</record>
<menuitem

View File

@ -25,9 +25,10 @@
<field name="res_model">account.move.bank.reconcile</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_move_bank_reconcile"/>
<field name="target">new</field>
<field name="view_id" ref="view_account_move_bank_reconcile"/>
<field name="target">new</field>
<field name="help">Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system.</field>
</record>
</data>
</openerp>
</openerp>

View File

@ -27,8 +27,8 @@
<field name="res_model">account.period.close</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_period_close"/>
<field name="target">new</field>
<field name="view_id" ref="view_account_period_close"/>
<field name="target">new</field>
</record>
<record id="action_idea_post_vote_values" model="ir.values">
@ -42,4 +42,4 @@
</record>
</data>
</openerp>
</openerp>

View File

@ -35,6 +35,7 @@
<field name="view_id" ref="account_aged_balance_view"/>
<field name="context">{'record_id':active_id}</field>
<field name="target">new</field>
<field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, Open ERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). Open ERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
</record>
<menuitem

View File

@ -25,6 +25,7 @@
<field name="view_id" ref="account_partner_balance_view"/>
<field name="context">{'record_id':active_id}</field>
<field name="target">new</field>
<field name="help">This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance.</field>
</record>
<menuitem icon="STOCK_PRINT"
@ -34,4 +35,4 @@
parent="account.next_id_22"/>
</data>
</openerp>
</openerp>

View File

@ -28,6 +28,7 @@
<field name="view_id" ref="account_partner_ledger_view"/>
<field name="context">{'record_id':active_id}</field>
<field name="target">new</field>
<field name="help">To get detailed information about a partner you can ask for the Partner Ledgers.</field>
</record>
<menuitem icon="STOCK_PRINT"

View File

@ -27,8 +27,9 @@
<field name="res_model">validate.account.move</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="validate_account_move_view"/>
<field name="target">new</field>
<field name="view_id" ref="validate_account_move_view"/>
<field name="target">new</field>
<field name="help">The process of ledger is the process of transferring debit and credit amounts from a journal of original entry to a ledger book.</field>
</record>
<menuitem

View File

@ -28,6 +28,7 @@
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
<field name="help">This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by Open ERP from invoices (or payments, in some countries). This data is updated in real time. Thats very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
</record>
<menuitem

View File

@ -208,7 +208,8 @@ class account_coda_import(osv.osv_memory):
line=lines[value]
reconcile_id = False
if line['toreconcile']:
rec_id = move_line_obj.search(cr, uid, [('name', '=', line['name']), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)])
name = line['name'][:3] + '/' + line['name'][3:7] + '/' + line['name'][7:]
rec_id = pool.get('account.move.line').search(cr, uid, [('name','=', name),('reconcile_id','=',False),('account_id.reconcile','=',True)])
if rec_id:
reconcile_id = statement_reconcile_obj.create(cr, uid, {
'line_ids': [(6, 0, rec_id)]
@ -296,4 +297,4 @@ class account_coda_import(osv.osv_memory):
account_coda_import()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -124,6 +124,17 @@ the rule to mark CC(mail to any other person defined in actions)."),
_order = 'sequence'
def onchange_model_id(self, cr, uid, ids, name):
res = {'domain':{'filter_id':[]}}
if name:
model_name = self.pool.get('ir.model').read(cr, uid, [name], ['model'])
if model_name:
mod_name = model_name[0]['model']
res['domain'] = {'filter_id': [('model_id','=',mod_name)]}
else:
res['value'] = {'filter_id':False}
return res
def pre_action(self, cr, uid, ids, model, context=None):
# Searching for action rules
cr.execute("SELECT model.model, rule.id FROM base_action_rule rule \

View File

@ -14,7 +14,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Action Rule">
<field name="name" select="1"/>
<field name="name" select="1" on_change="onchange_model_id(name)"/>
<field name="active"/>
<field name="sequence"/>
<field name="filter_id"/>

View File

@ -1,43 +1,43 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_contact
#
# * base_contact
# Giedrius Slavinskas <giedrius.slavinskas@gmail.com>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-20 21:26+0000\n"
"PO-Revision-Date: 2010-07-21 07:52+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
#. module: base_contact
#: field:res.partner.job,sequence_contact:0
msgid "Contact Seq."
msgstr "Kontaktų seka"
msgstr "Kontakto seka"
#. module: base_contact
#: model:ir.model,name:base_contact.model_res_partner_contact
msgid "res.partner.contact"
msgstr "res.partner.contact"
msgstr "Partnerių kontaktai"
#. module: base_contact
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialių "
"simbolių!"
"Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių !"
#. module: base_contact
#: field:res.partner.job,function_id:0
msgid "Partner Function"
msgstr ""
msgstr "Partnerio pareigos"
#. module: base_contact
#: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@ -52,7 +52,7 @@ msgstr "Kontaktai"
#. module: base_contact
#: field:res.partner.job,sequence_partner:0
msgid "Partner Seq."
msgstr "Partnerių seka"
msgstr "Partnerio seka"
#. module: base_contact
#: selection:res.partner.job,state:0
@ -92,22 +92,22 @@ msgstr ""
#. module: base_contact
#: view:res.partner.address:0
msgid "# of Contacts"
msgstr ""
msgstr "Kontaktai"
#. module: base_contact
#: help:res.partner.job,other:0
msgid "Additional phone field"
msgstr ""
msgstr "Papildomos informacijos laukas"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_function0
msgid "Function"
msgstr "Funkcija"
msgstr "Adresas"
#. module: base_contact
#: field:res.partner.job,fax:0
msgid "Fax"
msgstr ""
msgstr "Faksas"
#. module: base_contact
#: field:res.partner.contact,lang_id:0
@ -117,7 +117,7 @@ msgstr "Kalba"
#. module: base_contact
#: field:res.partner.job,phone:0
msgid "Phone"
msgstr "Tel. Nr."
msgstr "Telefonas"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_contacttofunction0
@ -127,12 +127,12 @@ msgstr ""
#. module: base_contact
#: field:res.partner.contact,title:0
msgid "Title"
msgstr ""
msgstr "Antraštė"
#. module: base_contact
#: view:res.partner.job:0
msgid "Contact Functions"
msgstr ""
msgstr "Kontaktų pareigos"
#. module: base_contact
#: model:ir.module.module,shortdesc:base_contact.module_meta_information
@ -144,7 +144,7 @@ msgstr ""
msgid ""
"Order of importance of this job title in the list of job title of the linked "
"partner"
msgstr ""
msgstr "Pareigos pagal svarbumą susijusiam partneriui."
#. module: base_contact
#: field:res.partner.contact,email:0
@ -155,7 +155,7 @@ msgstr "El. paštas"
#. module: base_contact
#: field:res.partner.job,date_stop:0
msgid "Date Stop"
msgstr ""
msgstr "Pabaigos data"
#. module: base_contact
#: view:res.partner:0
@ -167,25 +167,25 @@ msgstr "Adresas"
#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
#: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
msgid "Contact's Jobs"
msgstr ""
msgstr "Kontaktų pareigos"
#. module: base_contact
#: field:res.partner.contact,country_id:0
msgid "Nationality"
msgstr ""
msgstr "Tautybė"
#. module: base_contact
#: help:res.partner.job,sequence_contact:0
msgid ""
"Order of importance of this address in the list of addresses of the linked "
"contact"
msgstr ""
msgstr "Adresai pagal svarbumą sąraše."
#. module: base_contact
#: field:res.partner.address,job_id:0
#: field:res.partner.contact,job_id:0
msgid "Main Job"
msgstr ""
msgstr "Pagrindinės pareigos"
#. module: base_contact
#: view:res.partner:0
@ -195,17 +195,17 @@ msgstr "Kategorijos"
#. module: base_contact
#: field:res.partner.contact,function_id:0
msgid "Main Function"
msgstr ""
msgstr "Pagrindinė funkcija"
#. module: base_contact
#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
msgid "Define partners and their addresses."
msgstr ""
msgstr "Pasirinkite partnerius ir jų adresus"
#. module: base_contact
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "Netinkamas XML peržiūros struktūrai!"
#. module: base_contact
#: model:process.process,name:base_contact.process_process_basecontactprocess0
@ -215,58 +215,58 @@ msgstr ""
#. module: base_contact
#: view:res.partner.contact:0
msgid "Seq."
msgstr ""
msgstr "Seka"
#. module: base_contact
#: field:res.partner.job,extension:0
msgid "Extension"
msgstr ""
msgstr "Papildomas telefonas"
#. module: base_contact
#: field:res.partner.contact,mobile:0
msgid "Mobile"
msgstr "Mob. tel."
msgstr "Mobilus telefonas"
#. module: base_contact
#: help:res.partner.job,extension:0
msgid "Internal/External extension phone number"
msgstr ""
msgstr "Vidinis/išorinis papildomas telefono numeris"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_contacts0
msgid "People you work with."
msgstr ""
msgstr "Bendradarbiai"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Extra Information"
msgstr ""
msgstr "Papildoma informacija"
#. module: base_contact
#: view:res.partner.contact:0
#: field:res.partner.contact,job_ids:0
msgid "Functions and Addresses"
msgstr ""
msgstr "Pareigos ir adresai"
#. module: base_contact
#: field:res.partner.contact,active:0
msgid "Active"
msgstr ""
msgstr "Aktyvus"
#. module: base_contact
#: field:res.partner.job,contact_id:0
msgid "Contact"
msgstr "Kontaktai"
msgstr "Kontaktas"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_partners0
msgid "Companies you work with."
msgstr ""
msgstr "Įmonė kurioje jūs dirbate."
#. module: base_contact
#: field:res.partner.contact,partner_id:0
msgid "Main Employer"
msgstr ""
msgstr "Pagrindinis darbdavys"
#. module: base_contact
#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
@ -281,7 +281,7 @@ msgstr "Partnerių kontaktai"
#. module: base_contact
#: view:res.partner.contact:0
msgid "Partner Contact"
msgstr "Partnerio kontaktas"
msgstr "Partnerio kontaktai"
#. module: base_contact
#: model:process.node,name:base_contact.process_node_partners0
@ -297,12 +297,12 @@ msgstr "Adresai"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_addresses0
msgid "Working and private addresses."
msgstr ""
msgstr "Darbo ir asmeninis adresai."
#. module: base_contact
#: field:res.partner.contact,name:0
msgid "Last Name"
msgstr ""
msgstr "Pavardė"
#. module: base_contact
#: field:res.partner.job,state:0
@ -313,22 +313,22 @@ msgstr "Būsena"
#: view:res.partner.contact:0
#: view:res.partner.job:0
msgid "General"
msgstr "Bendras"
msgstr "Bendrasis"
#. module: base_contact
#: selection:res.partner.job,state:0
msgid "Past"
msgstr ""
msgstr "Buvęs"
#. module: base_contact
#: view:res.partner.contact:0
msgid "General Information"
msgstr "Bendra informacija"
msgstr "Bendroji informacija"
#. module: base_contact
#: model:process.node,note:base_contact.process_node_function0
msgid "Jobs at a same partner address."
msgstr ""
msgstr "Darbai su to paties partnerio adresu."
#. module: base_contact
#: field:res.partner.job,name:0
@ -348,7 +348,7 @@ msgstr ""
#. module: base_contact
#: field:res.partner.contact,website:0
msgid "Website"
msgstr "Interneto svetainė"
msgstr "Svetainė"
#. module: base_contact
#: field:res.partner.contact,birthdate:0

View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board

File diff suppressed because it is too large Load Diff

View File

@ -302,7 +302,7 @@
<filter string="Partner" icon="terp-personal" domain="[]"
context="{'group_by':'partner_id'}" groups="base.group_extended"/>
<filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Type" domain="[]" context="{'group_by':'type'}" groups="base.group_extended"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_extended"/>
<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
</group>

View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document

View File

@ -48,9 +48,9 @@
],
'demo_xml': [
'hr_demo.xml',
'hr_department_demo.xml'
],
'test': ['test/test_hr.yml'],
'hr_department_demo.xml',
],
'test': ['test/test_hr.yml'],
'installable': True,
'active': False,
'certificate': '0086710558965',

View File

@ -78,7 +78,7 @@ class hr_job(osv.osv):
'requirements': fields.text('Requirements'),
'department_id': fields.many2one('hr.department', 'Department'),
'company_id': fields.many2one('res.company', 'Company'),
'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', required=True),
'state': fields.selection([('open', 'Open'),('old', 'Old'),('recruit', 'In Recruitement')], 'State', readonly=True, required=True),
}
_defaults = {
'expected_employees': 1,
@ -86,6 +86,18 @@ class hr_job(osv.osv):
'state': 'open'
}
def job_old(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'old'})
return True
def job_recruitement(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'recruit'})
return True
def job_open(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state': 'open'})
return True
hr_job()
class hr_employee(osv.osv):
@ -102,7 +114,7 @@ class hr_employee(osv.osv):
'marital': fields.many2one('hr.employee.marital.status', 'Marital Status'),
'bank_account': fields.char('Bank Account', size=64),
'partner_id': fields.related('company_id', 'partner_id', type='many2one', relation='res.partner', readonly=True),
'department_id':fields.many2one('hr.department','Department'),
'department_id':fields.many2one('hr.department', 'Department'),
'address_id': fields.many2one('res.partner.address', 'Working Address'),
'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
'work_phone': fields.related('address_id', 'phone', type='char', string='Work Phone', readonly=True),
@ -110,10 +122,12 @@ class hr_employee(osv.osv):
'work_location': fields.char('Office Location', size=32),
'notes': fields.text('Notes'),
'parent_id': fields.many2one('hr.employee', 'Manager', select=True),
'category_id': fields.many2one('hr.employee.category', 'Category'),
# 'parent_id': fields.related('department_id', 'manager_id', string='Manager', type='many2one'),
# 'category_id': fields.many2one('hr.employee.category', 'Category'),
'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel','category_id','emp_id','Category'),
'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade'),
'coach_id': fields.many2one('res.users', 'Coach'),
'coach_id': fields.many2one('hr.employee', 'Coach'),
'job_id': fields.many2one('hr.job', 'Job'),
'photo': fields.binary('Photo')
}
@ -129,6 +143,8 @@ class hr_employee(osv.osv):
}
def _check_recursion(self, cr, uid, ids, context=None):
if context is None:
context = {}
level = 100
while len(ids):
cr.execute('select distinct parent_id from hr_employee where id IN %s',(tuple(ids),))
@ -144,4 +160,17 @@ class hr_employee(osv.osv):
hr_employee()
class hr_department(osv.osv):
_description = "Department"
_inherit = 'hr.department'
_columns = {
'manager_id': fields.many2one('hr.employee', 'Manager'),
# 'member_ids': fields.many2many('hr.employee', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'),
# finding problem to implement one2many field as "hr_departmen_user_rel" is used in another module query
}
hr_department()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -4,38 +4,38 @@
<!-- Employee Category -->
<record id="category1" model="hr.employee.category">
<record id="category_ceo" model="hr.employee.category">
<field name="name">CEO</field>
</record>
<record id="category2" model="hr.employee.category">
<record id="category_cto" model="hr.employee.category">
<field name="name">CTO</field>
<field name="parent_id" ref="category1"/>
<field name="parent_id" ref="category_ceo"/>
</record>
<record id="category3" model="hr.employee.category">
<record id="category_managers" model="hr.employee.category">
<field name="name">Managers(Tech. Heads)</field>
<field name="parent_id" ref="category2"/>
<field name="parent_id" ref="category_cto"/>
</record>
<record id="category4" model="hr.employee.category">
<record id="category_project_managers" model="hr.employee.category">
<field name="name">Project Managers</field>
<field name="parent_id" ref="category3"/>
<field name="parent_id" ref="category_managers"/>
</record>
<record id="category5" model="hr.employee.category">
<record id="category_sr_exec" model="hr.employee.category">
<field name="name">Sr. Executives(Team Leads)</field>
<field name="parent_id" ref="category4"/>
<field name="parent_id" ref="category_project_managers"/>
</record>
<record id="category6" model="hr.employee.category">
<record id="category_jr_exec" model="hr.employee.category">
<field name="name">Jr. Executives(Developers)</field>
<field name="parent_id" ref="category5"/>
<field name="parent_id" ref="category_sr_exec"/>
</record>
<record id="category7" model="hr.employee.category">
<record id="category_trainee" model="hr.employee.category">
<field name="name">Trainee(Intership)</field>
<field name="parent_id" ref="category6"/>
<field name="parent_id" ref="category_jr_exec"/>
</record>
@ -46,9 +46,10 @@
<field name="calendar_id" ref="resource.timesheet_group1"/>
<!--<field name="regime">45</field>-->
<field name="user_id" ref="base.user_root"/>
<field name="category_id" ref="hr.category1"/>
<field name="category_id" ref="hr.category_ceo"/>
<!--<field name="holiday_max">25</field>-->
</record>
</data>
</openerp>

View File

@ -50,8 +50,8 @@ class hr_department(osv.osv):
'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
'child_ids': fields.one2many('hr.department', 'parent_id', 'Child Departments'),
'note': fields.text('Note'),
'manager_id': fields.many2one('res.users', 'Manager', required=True),
'member_ids': fields.many2many('res.users', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
# 'manager_id': fields.many2one('res.users', 'Manager'),
# 'member_ids': fields.many2many('res.users', 'hr_department_user_rel', 'department_id', 'user_id', 'Members'),
}
_defaults = {

View File

@ -5,57 +5,105 @@
<record id="dep_management" model="hr.department">
<field name="name">Management</field>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="base.user_root"/>
<field name="manager_id" ref="employee1"/>
</record>
<record id="dep_administration" model="hr.department">
<field name="name">Administration</field>
<field name="parent_id" ref="dep_management"/>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="base.user_root"/>
<field name="manager_id" ref="employee1"/>
</record>
<record id="dep_technical" model="hr.department">
<field name="name">Technical department</field>
<field name="parent_id" ref="dep_management"/>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="base.user_root"/>
<field name="manager_id" ref="employee1"/>
</record>
<record id="dep_it" model="hr.department">
<field name="name">IT</field>
<field name="parent_id" ref="dep_technical"/>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="base.user_root"/>
<field name="manager_id" ref="employee1"/>
</record>
<record id="dep_marketing" model="hr.department">
<field name="name">Marketing</field>
<field name="parent_id" ref="dep_management"/>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="base.user_root"/>
<field name="manager_id" ref="employee1"/>
</record>
<record id="dep_sales" model="hr.department">
<field name="name">Sales</field>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="base.user_root"/>
<field name="manager_id" ref="employee1"/>
<field name="parent_id" ref="dep_management"/>
</record>
<record id="dep_sales_europe" model="hr.department">
<field name="name">Sales Europe</field>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="base.user_root"/>
<field name="manager_id" ref="employee1"/>
<field name="parent_id" ref="dep_sales"/>
</record>
<record id="dep_sales_america" model="hr.department">
<field name="name">Sales America</field>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="base.user_root"/>
<field name="manager_id" ref="employee1"/>
<field name="parent_id" ref="dep_sales"/>
</record>
<!-- HR Jobs -->
<record id="job_ceo" model="hr.job">
<field name="name">CEO</field>
<field name="department_id" ref="dep_management"/>
</record>
<record id="job_cto" model="hr.job">
<field name="name">CTO</field>
<field name="department_id" ref="dep_technical"/>
</record>
<record id="job_hr_manager" model="hr.job">
<field name="name">HR Manager</field>
<field name="department_id" ref="dep_management"/>
</record>
<record id="job_project_managers" model="hr.job">
<field name="name">Project Managers</field>
<field name="department_id" ref="dep_it"/>
</record>
<record id="job_sr_appli" model="hr.job">
<field name="name">Senior Application Analyst</field>
<field name="department_id" ref="dep_it"/>
</record>
<record id="job_jr_appli" model="hr.job">
<field name="name">Junior Application Analyst</field>
<field name="department_id" ref="dep_it"/>
</record>
<record id="job_sr_developers" model="hr.job">
<field name="name">Senior Developers</field>
<field name="department_id" ref="dep_it"/>
</record>
<record id="job_jr_developers" model="hr.job">
<field name="name">Junior Developers</field>
<field name="department_id" ref="dep_it"/>
</record>
<record id="job_trainee" model="hr.job">
<field name="name">Trainee</field>
<field name="department_id" ref="dep_it"/>
</record>
</data>
</openerp>

View File

@ -62,12 +62,14 @@
<separator string="Position" colspan="2"/>
<field name="job_id" widget="selection"/>
<field name="department_id" widget="selection"/>
<field name="category_id" widget="selection"/>
<!--<separator string="Managers" colspan="2"/>
<field name="parent_id" />
<field name="coach_id" />-->
</group>
</page>
<page string="Categories">
<field name="category_ids" nolabel="1"/>
</page>
<page string="Notes">
<field colspan="4" nolabel="1" name="notes"/>
</page>
@ -88,7 +90,6 @@
<field name="work_email"/>
<field name="department_id"/>
<field name="job_id"/>
<field name="category_id"/>
<field name="parent_id"/>
<field name="coach_id" invisible="1" />
</tree>
@ -341,7 +342,12 @@
<field name="employee_ids" colspan='4' nolabel="1" mode="tree,form"/>
</page>
</notebook>
<field name="state"/>
<group col="6" colspan="4">
<field name="state"/>
<button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
<button name="job_open" string="Open" states="old" type="object" icon="terp-camera_test"/>
<button name="job_old" string="Old" states="open,recruit" type="object" icon="gtk-cancel"/>
</group>
</form>
</field>
</record>

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-02-14 11:31+0000\n"
"Last-Translator: Paulius Sladkevičius <Unknown>\n"
"PO-Revision-Date: 2010-07-21 07:35+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:15+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr
@ -31,7 +31,7 @@ msgstr "Darbo laiko kategorijos"
#. module: hr
#: constraint:hr.department:0
msgid "Error! You can not create recursive departments."
msgstr "Klaida ! Jūs negalite sukurti pasikartojančių padalinių"
msgstr "Klaida! Negalima sukurti pasikartojančių padalinių."
#. module: hr
#: field:hr.employee,sinid:0
@ -179,7 +179,7 @@ msgstr "Pavaldiniai"
#. module: hr
#: model:ir.ui.menu,name:hr.menu_hr_reporting
msgid "Reporting"
msgstr "Ataskaitos"
msgstr ""
#. module: hr
#: field:hr.department,member_ids:0
@ -199,7 +199,7 @@ msgstr "Užpildyti kontaktine informaciją"
#. module: hr
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr ""
msgstr "Netinkamas XML peržiūros architektūrai!"
#. module: hr
#: selection:hr.employee,marital:0
@ -242,7 +242,7 @@ msgstr "Vyras"
#. module: hr
#: model:process.transition,note:hr.process_transition_employeeuser0
msgid "Create openerp user"
msgstr "Sukurti OpenERP vartotoją"
msgstr "Sukurti OpenERP naudotoją"
#. module: hr
#: view:hr.employee.category:0
@ -366,7 +366,7 @@ msgstr "Darbovietės adresas"
#. module: hr
#: field:hr.employee,marital:0
msgid "Marital Status"
msgstr "Šeiminė padėtis"
msgstr "Šeimyninė padėtis"
#. module: hr
#: model:ir.model,name:hr.model_hr_timesheet
@ -383,8 +383,8 @@ msgstr "Asmeninė informacija"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialių "
"simbolių!"
"Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialių "
"ženklų!"
#. module: hr
#: view:hr.timesheet:0

View File

@ -1,68 +1,63 @@
- |
-
In order to test hr module in OpenERP, I will create new Employee , Department and Job Position.
-
|
I create "R & D" Department in Department form.
-
I create "R&D Department" in Department form.
-
!record {model: hr.department, id: hr_department_rd0}:
manager_id: base.user_root
name: 'R & D '
-
|
Now, I create a new employee “Mark Johnson”.
select "R & D" Department which I had created.
name: 'R & D'
-
!record {model: hr.employee, id: hr_employee_employee0}:
Now, I create a new employee “Mark Johnson”, and select department as "R&D Department".
-
!record {model: hr.employee, id: hr_employee_mark}:
address_home_id: base.res_partner_address_1
company_id: base.main_company
gender: male
marital: hr.hr_employee_marital_status_single
name: employee1
name: Mark Johnson
user_id: base.user_root
department_id: 'hr_department_rd0'
- |
In order to check the wizard “Employee Hierarchy” , I will create new employee “Phil Graves ” and select "Mark Johnson" as
Manager.
-
!record {model: hr.employee, id: hr_employee_employee1}:
-
In order to check the wizard “Employee Hierarchy” , I will create new employee “Phil Graves ” and select "Mark Johnson" as
Manager.
-
!record {model: hr.employee, id: hr_employee_phil}:
address_home_id: base.res_partner_address_3000
company_id: base.main_company
gender: male
name: employee2
name: Phil Graves
user_id: base.user_demo
parent_id: 'hr_employee_employee0'
- |
parent_id: 'hr_employee_mark'
-
I will open up form view of “Mark Johnson” and test the wizard “Employee Hierarchy” so it display the employee
hierarchy starting from “Mark Johnson”.
- |
hierarchy starting from “Mark Johnson”.
-
I will create new Job Position. I will check successfull creation of new Job Position by adding the information.
-
-
!record {model: hr.job, id: hr_job_jea0}:
department_id: 'hr_department_rd0'
description: 'Position of Junier Application Engineer '
description: 'Position of Junior Application Engineer'
expected_employees: 5
name: 'JEA '
- |
name: 'JAE'
-
I check that Employee form is in "Open" state.
-
!assert {model: hr.job, id: hr_job_jea0}:
- state == 'open'
- |
- state == 'open'
-
I create Employee for job position.
-
-
!record {model: hr.job, id: hr_job_jea0}:
employee_ids:
- address_home_id: base.res_partner_address_1
name: Manuel Lehba
department_id: 'hr_department_rd0'
gender: male
parent_id: 'hr_employee_employee0'
- |
I check that "Number of Employees" field have some value.
parent_id: 'hr_employee_mark'
-
I check that "Number of Employees" field have some value.
-
!assert {model: hr.job, id: hr_job_jea0}:
- no_of_employee != False
- no_of_employee != False

View File

@ -88,6 +88,8 @@ def emp_create_xml(self, cr, uid, dept, holiday_type, row_id, empid, name, som,
class report_custom(report_rml):
def create_xml(self, cr, uid, ids, data, context):
obj_dept = pooler.get_pool(cr.dbname).get('hr.department')
obj_emp = pooler.get_pool(cr.dbname).get('hr.employee')
depts=[]
emp_id={}
# done={}
@ -211,31 +213,24 @@ class report_custom(report_rml):
if data['model']=='hr.employee':
for id in data['form']['emp']:
items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, id, ['id','name'])
items = obj_emp.read(cr, uid, id, ['id','name'])
emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, items['id'], items['name'], som, eom)
row_id = row_id +1
elif data['model']=='ir.ui.menu':
for id in data['form']['depts']:
dept = pooler.get_pool(cr.dbname).get('hr.department').browse(cr, uid, id, context.copy())
depts.append(dept)
dept_ids = tuple(data['form']['depts'])
cr.execute("""select dept_user.user_id \
from hr_department_user_rel dept_user \
where dept_user.department_id = %s\
union\
select dept.manager_id from hr_department dept\
where dept.id = %s""", (id, id))
dept = obj_dept.browse(cr, uid, id, context=context)
cr.execute("""select dept.manager_id from hr_department dept\
where dept.id = %s""", (id,))
result=cr.fetchall()
if result==[]:
continue
dept_done=0
for d in range(0,len(result)):
emp_id[d]=pooler.get_pool(cr.dbname).get('hr.employee').search(cr, uid, [('user_id', '=', result[d][0])])
items = pooler.get_pool(cr.dbname).get('hr.employee').read(cr, uid, emp_id[d], ['id', 'name'])
emp_id[d] = obj_emp.search(cr, uid, [('user_id', '=', result[d][0])])
items = obj_emp.read(cr, uid, emp_id[d], ['id', 'name'])
for item in items:
# if item['id'] in done:
# continue
@ -244,11 +239,9 @@ class report_custom(report_rml):
emp_xml += emp_create_xml(self, cr, uid, 1, holiday_type, row_id, dept.id, dept.name, som, eom)
row_id = row_id +1
dept_done=1
# done[item['id']] = 1
emp_xml += emp_create_xml(self, cr, uid, 0, holiday_type, row_id, item['id'], item['name'], som, eom)
row_id = row_id +1
# Computing the xml
xml='''<?xml version="1.0" encoding="UTF-8" ?>
<report>

View File

@ -39,6 +39,8 @@ class hr_holidays_summary_dept(osv.osv_memory):
}
def print_report(self, cr, uid, ids, context=None):
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
if not data['depts']:
raise osv.except_osv(_('Error'), _('You have to select at least 1 Department. And try again'))
@ -51,7 +53,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
'type': 'ir.actions.report.xml',
'report_name': 'holidays.summary',
'datas': datas,
'nodestroy': True,
}
hr_holidays_summary_dept()

View File

@ -38,6 +38,8 @@ class hr_holidays_summary_employee(osv.osv_memory):
}
def print_report(self, cr, uid, ids, context=None):
if context is None:
context = {}
data = self.read(cr, uid, ids, [])[0]
data['emp'] = context['active_ids']
datas = {

View File

@ -1,112 +1,130 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data noupdate="1">
<record id="HRA" model="hr.allounce.deduction.categoty">
<field name="code">HRA</field>
<field name="type">allowance</field>
<field name="name">House Rant Allowance</field>
<field name="sequence" eval="5"/>
</record>
<record id="CA" model="hr.allounce.deduction.categoty">
<field name="code">CA</field>
<field name="type">allowance</field>
<field name="name">Convance Allowance</field>
<field name="sequence" eval="10"/>
</record>
<record id="MA" model="hr.allounce.deduction.categoty">
<field name="code">MA</field>
<field name="type">allowance</field>
<field name="name">Meducal Allowance</field>
<field name="sequence" eval="15"/>
</record>
<record id="TELA" model="hr.allounce.deduction.categoty">
<field name="code">TELA</field>
<field name="type">allowance</field>
<field name="name">Telephone Allowance</field>
<field name="sequence" eval="20"/>
</record>
<record id="LTA" model="hr.allounce.deduction.categoty">
<field name="code">LTA</field>
<field name="type">allowance</field>
<field name="name">Leave Travel Allowance</field>
<field name="sequence" eval="25"/>
</record>
<record id="NA" model="hr.allounce.deduction.categoty">
<field name="code">NA</field>
<field name="type">allowance</field>
<field name="name">Newspaper Allowance</field>
<field name="sequence" eval="30"/>
</record>
<record id="TA" model="hr.allounce.deduction.categoty">
<field name="code">TA</field>
<field name="type">allowance</field>
<field name="name">Traveling Allowance</field>
<field name="sequence" eval="35"/>
</record>
<record id="FA" model="hr.allounce.deduction.categoty">
<field name="code">FA</field>
<field name="type">allowance</field>
<field name="name">Food Allowance</field>
<field name="sequence" eval="40"/>
</record>
<record id="DA" model="hr.allounce.deduction.categoty">
<field name="code">DA</field>
<field name="type">allowance</field>
<field name="name">Dearness Allowance</field>
<field name="sequence" eval="45"/>
</record>
<record id="PF" model="hr.allounce.deduction.categoty">
<field name="code">PF</field>
<field name="type">deduction</field>
<field name="name">Provident Fund</field>
<field name="sequence" eval="50"/>
</record>
<record id="PT" model="hr.allounce.deduction.categoty">
<field name="code">PT</field>
<field name="type">deduction</field>
<field name="name">Professional Tax</field>
<field name="sequence" eval="55"/>
</record>
<record id="WF" model="hr.allounce.deduction.categoty">
<field name="code">WF</field>
<field name="type">deduction</field>
<field name="name">Welfare</field>
<field name="sequence" eval="60"/>
</record>
<record id="TDS" model="hr.allounce.deduction.categoty">
<field name="code">TDS</field>
<field name="type">deduction</field>
<field name="name">Tax Deduct at Source</field>
<field name="sequence" eval="65"/>
</record>
<record id="LWP" model="hr.allounce.deduction.categoty">
<field name="code">LWP</field>
<field name="type">deduction</field>
<field name="name">Leave without pay</field>
<field name="sequence" eval="70"/>
</record>
<record id="FC" model="hr.allounce.deduction.categoty">
<field name="code">FC</field>
<field name="type">deduction</field>
<field name="name">Food Coupons</field>
<field name="sequence" eval="75"/>
</record>
<record id="ESI" model="hr.allounce.deduction.categoty">
<field name="code">ESI</field>
<field name="type">deduction</field>
<field name="name">Employee's State Insurance</field>
<field name="sequence" eval="80"/>
</record>
<record id="OTHERD" model="hr.allounce.deduction.categoty">
<field name="code">OTHERD</field>
<field name="type">deduction</field>
<field name="name">Other Deduction</field>
<field name="sequence" eval="85"/>
</record>
<record id="OTHERA" model="hr.allounce.deduction.categoty">
<field name="code">OTHERA</field>
<field name="type">allowance</field>
<field name="name">Other Taxable Allowance</field>
<field name="sequence" eval="90"/>
</record>
</data>
</openerp>

View File

@ -6,7 +6,6 @@
<menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
<menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll"/>
<!-- Passport Views -->
<record id="hr_passport_form" model="ir.ui.view">
<field name="name">hr.passport.form</field>
@ -508,6 +507,7 @@
<button string="Approve Sheet" icon="terp-camera_test" name="final_verify_sheet" states="hr_check"/>
<button string="Pay Salary" icon="terp-dolar_ok!" name="process_sheet" states="confirm"/>
<button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm"/>
<button string="Re-Open" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="draft,hr_check,confirm"/>
<button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="set_to_draft" states="cancel"/>
</group>
</form>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="product_consultant" model="product.product">
<field name="default_code">DEV</field>
<field name="list_price">75.0</field>
@ -15,11 +15,25 @@
<field name="procure_method">make_to_order</field>
<field eval="False" name="purchase_ok"/>
</record>
<!-- complete our example employee -->
<record id="hr.employee1" model="hr.employee">
<field name="product_id" ref="product_consultant"/>
<field name="journal_id" ref="analytic_journal"/>
</record>
<record id="working_hours" model="hr.analytic.timesheet">
<field name="name">Working Hours For OpenERP SA</field>
<field name="user_id" ref="base.user_root"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
<field eval="0.00" name="unit_amount"/>
<field name="product_id" ref="product_consultant"/>
<field name="product_uom_id" ref="product.uom_hour"/>
<field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
<field eval="0.00" name="amount"/>
<field name="general_account_id" model="account.account" ref="account.a_expense"/>
<field name="journal_id" ref="analytic_journal"/>
</record>
</data>
</openerp>

View File

@ -83,6 +83,7 @@
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_user_id":uid}</field>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
<field name="help">This functionality gives you a list of work done by user, product and analytic account (or project). A search tool allows you to make fine-grained analysis.</field>
</record>
<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-21 03:42+0000\n"
"PO-Revision-Date: 2010-07-21 03:44+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet
@ -444,7 +444,7 @@ msgstr "用户"
#. module: hr_timesheet
#: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
msgid "Working Time"
msgstr "工作时间"
msgstr "工作时间"
#. module: hr_timesheet
#: view:account.analytic.account:0

View File

@ -117,6 +117,7 @@
<field name="view_mode">tree,form</field>
<field name="domain">[('to_invoice','&lt;&gt;',False)]</field>
<field name="context">{"search_default_user_id":uid}</field>
<field name="help">OpenERP automatically group the entries to be invoiced so you can keep an eye on them on real time in one glance.</field>
<!-- <field name="search_view_id" ref="account.view_account_analytic_account_search"/> -->
</record>
<menuitem

View File

@ -1,19 +1,19 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * hr_timesheet_invoice
# * hr_timesheet_invoice
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 08:29+0000\n"
"PO-Revision-Date: 2010-07-21 06:01+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:11+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
@ -34,7 +34,7 @@ msgstr "强制使用特定产品"
#. module: hr_timesheet_invoice
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "在这动作定义中有无效的模块名"
msgstr "在动作定义中使用了无效的模快名。"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
@ -49,14 +49,14 @@ msgstr "可见的名称"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1:0
msgid "Start of period"
msgstr "期初日期"
msgstr "开始会计期间"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create,init,price:0
msgid ""
"The cost of each work done will be displayed on the invoice. You probably "
"don't want to check this."
msgstr "每个工作的成本将显示在发票上.你可能不想检查它"
msgstr "每个完成工作的成本将显示在发票上. 你可能不想核对它"
#. module: hr_timesheet_invoice
#: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
@ -72,7 +72,7 @@ msgstr "显示时间在工作日志"
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_draft_analytic_accounts
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_draft_analytic_accounts
msgid "Draft Analytic Accounts"
msgstr "辅助核算项草稿"
msgstr "辅助核算项草稿"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.final.invoice.create,init,time:0
@ -83,7 +83,7 @@ msgstr "花费的时间"
#. module: hr_timesheet_invoice
#: field:account.analytic.account,amount_invoiced:0
msgid "Invoiced Amount"
msgstr "开票金额"
msgstr "开票金额"
#. module: hr_timesheet_invoice
#: help:account.analytic.account,to_invoice:0
@ -91,24 +91,22 @@ msgid ""
"Check this field if you plan to automatically generate invoices based on the "
"costs in this analytic account: timesheets, expenses, ...You can configure "
"an automatic invoice rate on analytic accounts."
msgstr ""
"如果你计划自动生成发票基于成本在辅助核算项目:时间表、费用....选择这字段你能设"
"定自动发票的辅助核算项目"
msgstr "勾选此项, 如果你打算根据在辅助核算项目:时间表、费用....的花费自动生成发票. 你能设定辅助核算项的花费生成发票."
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create,init,name:0
msgid "The detail of each work done will be displayed on the invoice"
msgstr "每个工作的详情将显示在发票上"
msgstr "每个完成工作的细节将显示在发票上"
#. module: hr_timesheet_invoice
#: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0
msgid "Select period"
msgstr "销售周期"
msgstr "选择会计期间"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "Period to enddate"
msgstr "周期的结束日期"
msgstr "会计期间的结束日期"
#. module: hr_timesheet_invoice
#: wizard_button:hr.timesheet.invoice.create,init,create:0
@ -118,12 +116,12 @@ msgstr "创建发票"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "Period from startdate"
msgstr "周期的开始日期"
msgstr "会计期间的开始日期"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create,init,time:0
msgid "The time of each work done will be displayed on the invoice"
msgstr "每个工作完成的时间将显示在发票上"
msgstr "每个完成工作的时间将显示在发票上"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.final.invoice.create,init,balance_product:0
@ -143,13 +141,13 @@ msgstr "你想看详情每一发票行?"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Date or Code"
msgstr "日期代码"
msgstr "日期或者代码"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree
msgid "Entries to invoice"
msgstr "凭证开发票"
msgstr "分录开发票"
#. module: hr_timesheet_invoice
#: wizard_view:account.analytic.profit,init:0
@ -171,7 +169,7 @@ msgstr "打印"
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_analytic_accounts
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_analytic_accounts
msgid "Open Analytic Accounts"
msgstr "待处理辅助核算项"
msgstr "待处理辅助核算项"
#. module: hr_timesheet_invoice
#: wizard_view:hr.timesheet.invoice.create,init:0
@ -193,12 +191,12 @@ msgstr "销售价格表"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.final.invoice.create,init,name:0
msgid "Display detail of work in the invoice line."
msgstr "显示发票行的工作详情"
msgstr "显示发票行的工作细节"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "J.C. or Move name"
msgstr "成本分类账或凭证名称"
msgstr "成本分录集合或凭证名称"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@ -208,7 +206,7 @@ msgstr "打印日期"
#. module: hr_timesheet_invoice
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效XML视图结构!"
msgstr "无效的视图结构xml文件!"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@ -225,18 +223,18 @@ msgstr "理论"
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced_my
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced_my
msgid "My Uninvoiced Entries"
msgstr "我未开票项目"
msgstr "未开发票条目"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.final.invoice.create,init,name:0
#: wizard_field:hr.timesheet.invoice.create,init,name:0
msgid "Name of entry"
msgstr "凭证名称"
msgstr "条目名称"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "Employee or Journal Name"
msgstr "员工或分类帐名称"
msgstr "员工或记录集合名称"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
@ -248,7 +246,7 @@ msgstr "货币"
msgid ""
"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."
msgstr "如果你想强制使用特定的产品只有完成这字段如果留空使用实际产品来自成本"
msgstr "如果你想强制使用特定的产品只有填入该字段. 留空使用来自成本的实际产品"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced
@ -289,7 +287,7 @@ msgstr "状态"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Period to"
msgstr "周期到"
msgstr "会计期间到"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.final.invoice.create,init,balance_product:0
@ -306,7 +304,7 @@ msgstr "成本分类账"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.final.invoice.create,init,date:0
msgid "Display date in the history of works"
msgstr "显示这工作的日志日期"
msgstr "在这工作日志显示日期"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.final.invoice.create,init,date:0
@ -327,7 +325,7 @@ msgstr "有效"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.invoice.create,init,accounts:0
msgid "Analytic Accounts"
msgstr "辅助核算项"
msgstr "辅助核算项"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@ -342,12 +340,12 @@ msgstr "贷方"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0
msgid "End of period"
msgstr "周期结束日期"
msgstr "会计期间结束"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Balance"
msgstr "结余"
msgstr "差额"
#. module: hr_timesheet_invoice
#: field:account.analytic.account,to_invoice:0
@ -372,7 +370,7 @@ msgstr "你想显示这工作发票的详细资料"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Period from"
msgstr "周期从"
msgstr "会计期间从"
#. module: hr_timesheet_invoice
#: field:account.analytic.account,amount_max:0
@ -416,7 +414,7 @@ msgstr "显示这项成本在你再开的发票"
#. module: hr_timesheet_invoice
#: wizard_view:hr.timesheet.invoice.create,init:0
msgid "Choose accounts you want to invoice"
msgstr "选择你想要开发票的目"
msgstr "选择你想要开发票的目"
#. module: hr_timesheet_invoice
#: wizard_field:hr.timesheet.invoice.create,init,product:0
@ -426,7 +424,7 @@ msgstr "产品"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
msgid "%"
msgstr ""
msgstr "%"
#. module: hr_timesheet_invoice
#: field:hr_timesheet_invoice.factor,name:0
@ -436,7 +434,7 @@ msgstr "内部名称"
#. module: hr_timesheet_invoice
#: wizard_field:account.analytic.profit,init,journal_ids:0
msgid "Journal"
msgstr "分类帐"
msgstr "记录集合"
#. module: hr_timesheet_invoice
#: rml:account.analytic.profit:0
@ -446,13 +444,13 @@ msgstr "单位"
#. module: hr_timesheet_invoice
#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
msgid "Invoice on analytic lines"
msgstr "辅助核算的发票"
msgstr "辅助核算明细的发票"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_pending_analytic_accounts
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_pending_analytic_accounts
msgid "Pending Analytic Accounts"
msgstr "未决的辅助核算项"
msgstr "未决的辅助核算项"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
@ -473,7 +471,7 @@ msgstr "发票类型"
#. module: hr_timesheet_invoice
#: field:account.analytic.line,to_invoice:0
msgid "Invoicing"
msgstr "计价折扣"
msgstr "开发票"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts
@ -511,7 +509,7 @@ msgstr "状态"
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,date_deadline:0
msgid "Deadline"
msgstr "截止期"
msgstr "截止期"
#. module: hr_timesheet_invoice
#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
@ -538,7 +536,7 @@ msgstr "数量"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
msgid "Lines to Invoice"
msgstr "辅助核算开发票"
msgstr "开发票"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
@ -560,7 +558,7 @@ msgstr "辅助核算 - 报表"
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,name:0
msgid "Month"
msgstr "月"
msgstr "月"
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,amount:0
@ -581,7 +579,7 @@ msgstr "计量单位"
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
msgid "My daily timesheets by account"
msgstr "我的科目每天时间表"
msgstr "按科目(项)我的每天时间表"
#. module: hr_timesheet_invoice
#: view:report_timesheet.user:0
@ -592,18 +590,18 @@ msgstr "用户时间表"
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
msgid "Timesheet by Account"
msgstr "科目时间表"
msgstr "科目(项)时间表"
#. module: hr_timesheet_invoice
#: view:report_timesheet.account:0
msgid "Timesheet by account"
msgstr "科目时间表"
msgstr "科目(项)时间表"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
msgid "Costs to invoice"
msgstr "成本发票"
msgstr "成本发票"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
@ -625,12 +623,12 @@ msgstr "时间表"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
msgid "Timesheets per account"
msgstr "每科目时间表"
msgstr "每科目(项)时间表"
#. module: hr_timesheet_invoice
#: view:report_timesheet.invoice:0
msgid "Timesheets to invoice"
msgstr "时间表发票"
msgstr "时间表发票"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
@ -641,7 +639,7 @@ msgstr "每天时间表"
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
msgid "Daily Timesheet by Account"
msgstr "科目每日时间表"
msgstr "科目(项)每日时间表"
#. module: hr_timesheet_invoice
#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
@ -652,7 +650,7 @@ msgstr "说明"
#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
#: view:report_timesheet.account:0
msgid "Timesheet per account"
msgstr "每科目时间表"
msgstr "每科目(项)时间表"
#. module: hr_timesheet_invoice
#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
@ -667,13 +665,13 @@ msgstr "发票时间表"
#. module: hr_timesheet_invoice
#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
msgid "This Month"
msgstr "月"
msgstr "月"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_my
msgid "My timesheets by account"
msgstr "我的科目时间表"
msgstr "我的科目(项)时间表"
#. module: hr_timesheet_invoice
#: model:ir.model,name:report_timesheet_invoice.model_report_random_timesheet
@ -698,7 +696,7 @@ msgstr "任意时间表"
#. module: hr_timesheet_invoice
#: view:report_timesheet.account.date:0
msgid "Daily timesheet by account"
msgstr "科目每日时间表"
msgstr "科目(项)每日时间表"
#. module: hr_timesheet_invoice
#: view:random.timesheet.lines:0
@ -746,20 +744,20 @@ msgstr "每天时间表"
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_my
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_my
msgid "My timesheets to invoice"
msgstr "我的时间表发票"
msgstr "我的时间表发票"
#. module: hr_timesheet_invoice
#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account_date
#: view:report_timesheet.account.date:0
msgid "Daily timesheet per account"
msgstr "科目每日时间表"
msgstr "科目(项)每日时间表"
#. module: hr_timesheet_invoice
#: model:ir.module.module,description:report_timesheet.module_meta_information
msgid ""
"Module to add timesheet views like\n"
" All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
msgstr "模块增加时间表视图如:所有月份,用户时间表,月度时间表,科目时间表"
msgstr "模块增加时间表视图如: 所有月份, 用户时间表, 月度时间表, 科目时间表"
#. module: hr_timesheet_invoice
#: field:random.timesheet.lines,analytic_account_id:0
@ -767,12 +765,12 @@ msgstr "模块增加时间表视图如:所有月份,用户时间表,月度时间
#: field:report_timesheet.account,account_id:0
#: field:report_timesheet.account.date,account_id:0
msgid "Analytic Account"
msgstr "辅助核算项"
msgstr "辅助核算项"
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,manager_id:0
msgid "Manager"
msgstr "管理者"
msgstr "经理"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
@ -782,8 +780,8 @@ msgstr "用户时间表(这月)"
#~ msgid ""
#~ "\n"
#~ "Module to generate invoices based on costs (human resources, "
#~ "expenses, ...).\n"
#~ "Module to generate invoices based on costs (human resources, expenses, "
#~ "...).\n"
#~ "You can define price lists in analytic account, make some theoretical "
#~ "revenue\n"
#~ "reports, eso."
@ -794,9 +792,3 @@ msgstr "用户时间表(这月)"
#~ msgid "Invoice on analytic entries"
#~ msgstr "辅助核算凭证发票"
#~ msgid "A report on analytic lines, costs by products, months and accounts."
#~ msgstr "辅助核算明细的报表:产品成本,月度和科目"
#~ msgid "All Months"
#~ msgstr "所有月份"

View File

@ -254,9 +254,9 @@ class report_random_timsheet(osv.osv):
line.id as id, line.account_id as analytic_account_id, line.name as name,
line.unit_amount as quantity, line.date as date, line.user_id as user_id
from
account_analytic_line line, hr_department dept,hr_department_user_rel dept_user
account_analytic_line line, hr_department dept,hr_employee dept_user
where
(dept.id = dept_user.department_id AND dept_user.user_id=line.user_id AND line.user_id is not null)
(dept.id = dept_user.department_id AND dept_user.id=line.user_id AND line.user_id is not null)
AND (dept.manager_id = """ + str(uid) + """ )
AND (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-3))
LIMIT 10

View File

@ -95,8 +95,10 @@ class hr_timesheet_sheet(osv.osv):
_table = 'hr_timesheet_sheet_sheet'
_order = "id desc"
def _total_day(self, cr, uid, ids, name, args, context):
def _total_day(self, cr, uid, ids, name, args, context=None):
res = {}
if context is None:
context = {}
cr.execute('SELECT sheet.id, day.total_attendance, day.total_timesheet, day.total_difference\
FROM hr_timesheet_sheet_sheet AS sheet \
LEFT JOIN hr_timesheet_sheet_sheet_day AS day \
@ -564,7 +566,9 @@ class hr_attendance(osv.osv):
'name': _get_default_date,
}
def create(self, cr, uid, vals, context={}):
def create(self, cr, uid, vals, context=None):
if context is None:
context = {}
if 'sheet_id' in context:
ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'])
if ts.state not in ('draft', 'new'):
@ -581,6 +585,8 @@ class hr_attendance(osv.osv):
return super(hr_attendance,self).unlink(cr, uid, ids,*args, **kwargs)
def write(self, cr, uid, ids, vals, context={}):
if context is None:
context = {}
self._check(cr, uid, ids)
res = super(hr_attendance,self).write(cr, uid, ids, vals, context=context)
if 'sheet_id' in context:

View File

@ -222,6 +222,7 @@
<field name="view_id" eval="False"/>
<field name="context">{'search_default_my_timesheet':1, 'search_default_user_id':uid }</field>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
<field name="help">Employees can encode their time spent on the different projects. A project is an analytic account and the time spent on a project generate costs on the analytic account.</field>
</record>
<!--Time Tracking menu in project Management-->

View File

@ -7,26 +7,26 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 08:29+0000\n"
"PO-Revision-Date: 2010-07-21 08:13+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_review0
msgid "Review end of day check day is complete"
msgstr "审查结束每天检查完成"
msgstr "完成每天检查审查结束"
#. module: hr_timesheet_sheet
#: constraint:hr_timesheet_sheet.sheet:0
msgid ""
"You can not have 2 timesheets that overlaps !\n"
"Please use the menu 'My Current Timesheet' to avoid this problem."
msgstr "你不能有两个重叠的时间表请使用菜单\"我的当前时间表\"来避免这问题"
msgstr "你不能有两个重叠的时间表! 请使用菜单\"我的当前时间表\"来避免这问题"
#. module: hr_timesheet_sheet
#: field:hr.analytic.timesheet,sheet_id:0
@ -39,7 +39,7 @@ msgstr "表"
#. module: hr_timesheet_sheet
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "在这动作定义中有无效的模块名"
msgstr "在动作定义中使用了无效的模快名。"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,total_attendance:0
@ -106,7 +106,7 @@ msgstr "确认"
#. module: hr_timesheet_sheet
#: selection:res.company,timesheet_range:0
msgid "Day"
msgstr ""
msgstr ""
#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state_attendance:0
@ -132,7 +132,7 @@ msgstr "你必须选择一个当前日期是在时间表的日期中"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.day:0
msgid "Total Difference"
msgstr "差合计"
msgstr "差合计"
#. module: hr_timesheet_sheet
#: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0
@ -159,7 +159,7 @@ msgstr "允许在签出签入的差和计算时间表.如果你不想控制设
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.day:0
msgid "Timesheet by Days"
msgstr "时间表按天"
msgstr "时间表按的多天"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
@ -169,7 +169,7 @@ msgstr "时间表确认结束在这周/月"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.account,name:0
msgid "Analytic Account"
msgstr "辅助核算项"
msgstr "辅助核算项"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
@ -184,7 +184,7 @@ msgstr "日期从"
#. module: hr_timesheet_sheet
#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
msgid "Hr Timesheet Process"
msgstr "人力资源时间表处理"
msgstr "人力资源时间表进程"
#. module: hr_timesheet_sheet
#: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0
@ -194,7 +194,7 @@ msgstr "辅助核算成本"
#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state:0
msgid "Confirmed"
msgstr "确认"
msgstr "确认"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
@ -217,7 +217,7 @@ msgstr "时间表明细"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0
msgid "Encode your timesheet line"
msgstr "编码你的时间表明细"
msgstr "你的时间表明细编码"
#. module: hr_timesheet_sheet
#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
@ -237,7 +237,7 @@ msgstr "新的"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_timesheetconfirming0
msgid "Timesheet sheet confirm at the end of the period"
msgstr "时间表表确认的结束期"
msgstr "时间表表确认的结束期"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.account,total:0
@ -252,7 +252,7 @@ msgstr "时间表明细"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
msgid "Confirm timesheet at the end of the period"
msgstr "确认时间表周期的结束"
msgstr "确认时间表的结束期间"
#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state_attendance:0
@ -277,7 +277,7 @@ msgstr "周"
#. module: hr_timesheet_sheet
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效XML视图结构!"
msgstr "无效的视图结构xml文件!"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@ -288,7 +288,7 @@ msgstr "每天视图"
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
msgid "Timesheets by period"
msgstr "时间表期"
msgstr "时间表期"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@ -331,7 +331,7 @@ msgstr "在这周的发票"
#. module: hr_timesheet_sheet
#: selection:res.company,timesheet_range:0
msgid "Month"
msgstr "月"
msgstr "月"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
@ -383,7 +383,7 @@ msgstr "当前状态"
#. module: hr_timesheet_sheet
#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
msgid "Invoice on timesheet"
msgstr "时间表的发票"
msgstr "时间表的发票"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
@ -393,7 +393,7 @@ msgstr "发票基于时间表"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
msgid "Timesheet by Account"
msgstr "科目时间表"
msgstr "科目(项)时间表"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.day,name:0
@ -419,13 +419,13 @@ msgstr "时间表批准"
#. module: hr_timesheet_sheet
#: field:res.company,timesheet_max_difference:0
msgid "Timesheet allowed difference"
msgstr "时间表允许差"
msgstr "时间表允许差"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
#: field:hr_timesheet_sheet.sheet,period_ids:0
msgid "Period"
msgstr "期"
msgstr "期"
#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state:0
@ -450,7 +450,7 @@ msgstr "时间表明细"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.account:0
msgid "Timesheet by Accounts"
msgstr "时间表科目"
msgstr "时间表"
#. module: hr_timesheet_sheet
#: constraint:ir.model:0
@ -466,7 +466,7 @@ msgstr "项目管理批准的时间表"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0
msgid "Whatever time u spent for phone call"
msgstr "无论什么时间你花费的电话呼叫"
msgstr "你花费的电话呼叫时间"
#. module: hr_timesheet_sheet
#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@ -504,14 +504,14 @@ msgstr "签出"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "By Day"
msgstr "日间"
msgstr "按天"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,total_difference:0
#: field:hr_timesheet_sheet.sheet,total_difference_day:0
#: field:hr_timesheet_sheet.sheet.day,total_difference:0
msgid "Difference"
msgstr "差"
msgstr "差"
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
@ -526,7 +526,7 @@ msgstr "缺席"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
msgid "At the end of the period (week/month)"
msgstr "在此期结束:周/月"
msgstr "在此期结束周/月"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@ -541,7 +541,7 @@ msgstr "已创建的辅助核算成本"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
msgid "Invoice rate"
msgstr "发票率"
msgstr "发票率"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
@ -556,7 +556,7 @@ msgstr "你工作审查结束日期"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,account_ids:0
msgid "Analytic accounts"
msgstr "辅助核算项"
msgstr "辅助核算项"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my
@ -578,7 +578,7 @@ msgstr "当前日期"
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_sheet_unvalidate
msgid "Unvalidated Timesheets"
msgstr "不可用的时间表"
msgstr "不确认的时间表"
#. module: hr_timesheet_sheet
#: selection:res.company,timesheet_range:0
@ -594,7 +594,7 @@ msgstr "合计"
#: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_validate
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
msgid "My Department's Timesheet to Validate"
msgstr "批准我部门的时间表"
msgstr "确认我部门的时间表"
#~ msgid ""
#~ "\n"

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-20 08:31+0000\n"
"PO-Revision-Date: 2010-07-21 08:35+0000\n"
"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-06-22 04:08+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: idea
@ -39,12 +39,12 @@ msgstr "统计"
#: model:ir.actions.act_window,name:idea.action_idea_idea_my_idea
#: model:ir.ui.menu,name:idea.menu_idea_idea_my_idea
msgid "My Ideas"
msgstr "我的创意"
msgstr "我的构想"
#. module: idea
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "在这动作定义中有无效的模块名"
msgstr "在动作定义中使用了无效的模快名。"
#. module: idea
#: selection:idea.idea,my_vote:0
@ -57,14 +57,14 @@ msgstr "没投票"
#: model:ir.actions.act_window,name:idea.action_idea_idea_open_my
#: model:ir.ui.menu,name:idea.menu_idea_idea_open_my
msgid "My Open Ideas"
msgstr "我待处理的创意"
msgstr "我的待处理构想"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_idea
#: model:ir.ui.menu,name:idea.menu_ideas
#: model:ir.ui.menu,name:idea.menu_ideas1
msgid "Ideas"
msgstr "创意"
msgstr "构想"
#. module: idea
#: field:idea.category,child_ids:0
@ -74,19 +74,19 @@ msgstr "子分类"
#. module: idea
#: view:idea.idea:0
msgid "New Idea"
msgstr "新的创意"
msgstr "新的构想"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_category_tree
#: model:ir.ui.menu,name:idea.menu_idea_category_tree
msgid "Ideas by Categories"
msgstr "创意分类"
msgstr "构想分类"
#. module: idea
#: field:idea.vote,score:0
#: field:idea.vote.stat,score:0
msgid "Score"
msgstr "分"
msgstr "分"
#. module: idea
#: selection:idea.idea,state:0
@ -96,7 +96,7 @@ msgstr "草稿"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_vote
msgid "Idea's vote"
msgstr "创意投票"
msgstr "构想投票"
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_vote_stat
@ -107,17 +107,17 @@ msgstr "统计投票"
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符"
#. module: idea
#: model:ir.model,name:idea.model_idea_category
msgid "Category for an idea"
msgstr "创意分类"
msgstr "构想分类"
#. module: idea
#: model:ir.module.module,shortdesc:idea.module_meta_information
msgid "Idea Manager"
msgstr "创意管理"
msgstr "构想管理"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_idea_vote_stat
@ -156,17 +156,17 @@ msgstr "一般"
#. module: idea
#: model:ir.ui.menu,name:idea.menu_reporting
msgid "Reporting"
msgstr "内部报表"
msgstr "报表"
#. module: idea
#: model:ir.model,name:idea.model_idea_vote_stat
msgid "Idea Votes Statistics"
msgstr "创意投票统计"
msgstr "构想投票统计"
#. module: idea
#: model:ir.model,name:idea.model_idea_vote
msgid "idea.vote"
msgstr "创意投票"
msgstr "构想投票"
#. module: idea
#: field:idea.comment,user_id:0
@ -203,7 +203,7 @@ msgstr "我的投票"
#. module: idea
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效XML视图结构!"
msgstr "无效的视图结构xml文件!"
#. module: idea
#: view:idea.vote:0
@ -220,14 +220,15 @@ msgid ""
"managers can obtain an easy view on best ideas from all the users. Once "
"installed, check the menu 'Ideas' in the 'Tools' main menu."
msgstr ""
"这模块允许你在创新的企业里简单和有效地使用.它允许每个人去表达不同的主题,其他用户能评价这些创意和对特定的创意进行投票.每个创意所得投票决定得分.\n"
"管理人员可以很容易得到所有用户创意.一旦安装,在工具主菜单查看创意菜单."
"这模块允许你在企业创新里简单和有效地使用.\r\n"
"它允许每个人对不同注意表达构想, 其它用户能评价这些构想和对具体的构想进行投票. 每个构想根据不同投票决定得分.\r\n"
"管理人员可以很容易得到所有用户对构想的评价."
#. module: idea
#: field:idea.comment,create_date:0
#: field:idea.idea,create_date:0
msgid "Creation date"
msgstr "建日期"
msgstr "建日期"
#. module: idea
#: field:idea.idea,count_votes:0
@ -242,13 +243,13 @@ msgstr "投票数"
#. module: idea
#: model:ir.model,name:idea.model_idea_idea
msgid "idea.idea"
msgstr "创意"
msgstr ""
#. module: idea
#: model:ir.actions.act_window,name:idea.action_idea_idea_draft_my
#: model:ir.ui.menu,name:idea.menu_idea_idea_draft_my
msgid "My Draft Ideas"
msgstr "我的创意草稿"
msgstr "我的构想草稿"
#. module: idea
#: field:idea.idea,vote_ids:0
@ -266,7 +267,7 @@ msgstr "坏"
#: view:idea.idea:0
#: model:ir.ui.menu,name:idea.menu_idea_idea
msgid "All Ideas"
msgstr "所有创意"
msgstr "所有构想"
#. module: idea
#: view:idea.comment:0
@ -284,12 +285,12 @@ msgstr "评论数"
#. module: idea
#: field:idea.idea,title:0
msgid "Idea Summary"
msgstr "创意摘要"
msgstr "构想摘要"
#. module: idea
#: view:idea.category:0
msgid "Category of ideas"
msgstr "创意分类"
msgstr "构想分类"
#. module: idea
#: field:idea.category,summary:0
@ -301,13 +302,13 @@ msgstr "摘要"
#: model:ir.actions.act_window,name:idea.action_idea_idea_open
#: model:ir.ui.menu,name:idea.menu_idea_idea_open
msgid "Open Ideas"
msgstr "待处理的创意"
msgstr "待处理的构想"
#. module: idea
#: view:idea.idea:0
#: view:idea.vote.stat:0
msgid "vote_stat of ideas"
msgstr "开始对创意投票"
msgstr "开始对构想投票"
#. module: idea
#: view:idea.comment:0
@ -337,7 +338,7 @@ msgstr "工具"
#: field:idea.vote,idea_id:0
#: field:idea.vote.stat,idea_id:0
msgid "Idea"
msgstr "创意"
msgstr "构想"
#. module: idea
#: selection:idea.idea,my_vote:0
@ -364,7 +365,7 @@ msgstr "取消"
#. module: idea
#: view:idea.idea:0
msgid "Close"
msgstr "结束"
msgstr "关闭"
#. module: idea
#: field:idea.idea,vote_avg:0
@ -379,7 +380,7 @@ msgstr "待处理"
#. module: idea
#: help:idea.idea,description:0
msgid "Content of the idea"
msgstr "这创意的内容"
msgstr "构想的内容"
#~ msgid "Accepted"
#~ msgstr "已同意"

View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-07-18 15:01+0000\n"
"PO-Revision-Date: 2010-07-21 18:55+0000\n"
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@ -33,9 +33,9 @@ msgid ""
"under 0. You should probably not use this option, we suggest using a MTO "
"configuration on products."
msgstr ""
"Wyzwala automatyczne nabycie dla wszystkich produktów o zapasie poniżej 0. "
"Prawdopodobnie nie powinieneś stosować tej opcji. Sugerujemy ustawienie "
"konfiguracji produktów 'Na zamówienie'."
"Wyzwala automatyczne zapotrzebowanie dla wszystkich produktów o zapasie "
"poniżej 0. Prawdopodobnie nie powinieneś stosować tej opcji. Sugerujemy "
"ustawienie konfiguracji produktów 'Na zamówienie'."
#. module: mrp
#: model:ir.module.module,shortdesc:mrp.module_meta_information
@ -62,7 +62,7 @@ msgstr "Oblicz tylko reguły minimalnych zapasów"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
msgid "Exceptions Procurements"
msgstr "Wyjątki nabycia"
msgstr "Wyjątki zapotrzebowania"
#. module: mrp
#: view:mrp.routing.workcenter:0
@ -173,7 +173,7 @@ msgstr "Pytaj o nowe produkty"
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_reordering
msgid "Automatic Procurements"
msgstr "Automatyczne nabycia"
msgstr "Automatyczne zapotrzebowania"
#. module: mrp
#: wizard_field:change_production_qty,confirm,product_qty:0
@ -257,7 +257,7 @@ msgstr "Zestaw / Fantom"
#. module: mrp
#: wizard_view:mrp.procurement.compute,init:0
msgid "This wizard will schedule procurements."
msgstr "Ten kreator zaplanuje nabycia."
msgstr "Ten kreator zaplanuje zapotrzebowania."
#. module: mrp
#: field:mrp.bom,position:0
@ -299,7 +299,7 @@ msgid ""
"procurement to bring the virtual stock to the Max Quantity."
msgstr ""
"Kiedy zapas wirtualny będzie poniżej ilości minimalnej, to Open ERP "
"wygeneruje nabycie, aby zapas wzrósł do wartości maksymalnej."
"wygeneruje zapotrzebowanie, aby zapas wzrósł do wartości maksymalnej."
#. module: mrp
#: model:process.transition,name:mrp.process_transition_stockmts0
@ -330,7 +330,7 @@ msgstr "Nie pilne"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_procureserviceproduct0
msgid "Procure Service Product"
msgstr "Nabycie usługi"
msgstr "Zapotrzebowanie na usługę"
#. module: mrp
#: view:mrp.production:0
@ -341,7 +341,7 @@ msgstr "Potwierdź produkcję"
#: model:process.node,name:mrp.process_node_purchaseprocure0
#: field:stock.move,procurements:0
msgid "Procurements"
msgstr "Nabycia"
msgstr "Zapotrzebowania"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production_product_line
@ -361,7 +361,7 @@ msgstr "Szczegóły"
#. module: mrp
#: model:process.process,name:mrp.process_process_procurementprocess0
msgid "Procurement Process"
msgstr "Proces nabycia"
msgstr "Proces zapotrzebowania"
#. module: mrp
#: field:mrp.production,date_planned_date:0
@ -431,7 +431,7 @@ msgstr "Drukuj cenę produktu"
#. module: mrp
#: wizard_view:product.product.procurement,done:0
msgid "Make Procurement"
msgstr "Wykonaj nabycie"
msgstr "Wykonaj zapotrzebowanie"
#. module: mrp
#: field:mrp.bom.revision,date:0
@ -494,7 +494,7 @@ msgstr "JS produktu"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
msgid "Production Procure Products"
msgstr "Nabycie z produkcji"
msgstr "Zapotrzebowanie produktów z produkcji"
#. module: mrp
#: model:process.process,name:mrp.process_process_serviceproductprocess0
@ -504,7 +504,7 @@ msgstr "Proces usługi"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_purchaseprocure0
msgid "Procurement convert into the draft purchase order."
msgstr "Nabycie zmienia się w projekt zamówienia zakupu."
msgstr "Zapotrzebowanie zmienia się w projekt zamówienia zakupu."
#. module: mrp
#: field:mrp.procurement,message:0
@ -553,7 +553,7 @@ msgstr "Czas produkcji"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action4
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action4
msgid "Exceptions Procurements to Fix"
msgstr "Wyjątki nabycia do poprawienia"
msgstr "Wyjątki zapotrzebowania do poprawienia"
#. module: mrp
#: selection:mrp.procurement,state:0
@ -695,7 +695,7 @@ msgstr "Hierarchia Zest. Mat."
#. module: mrp
#: view:mrp.procurement:0
msgid "Procurement Lines"
msgstr "Pozycje nabycia"
msgstr "Pozycje zapotrzebowania"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_servicemts0
@ -745,8 +745,8 @@ msgid ""
"This wizard will planify the procurement for this product. This procurement "
"may generate task, production orders or purchase orders."
msgstr ""
"Ten kreator zaplanuje nabycie dla tego produktu. Nabycie może wygenerować "
"zadania, zamówienia produkcji lub zamówienia zakupu."
"Ten kreator zaplanuje zapotrzebowanie dla tego produktu. Zapotrzebowanie "
"może wygenerować zadania, zamówienia produkcji lub zamówienia zakupu."
#. module: mrp
#: model:process.node,note:mrp.process_node_mts0
@ -761,7 +761,7 @@ msgstr "Zamówienie usług Rejestrowanych"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_minimumstockprocure0
msgid "From minimum stock rules, it goes for procure product."
msgstr "Z reguł minimalnych zapasów jest tworzone nabycie produktu."
msgstr "Z reguł minimalnych zapasów jest tworzone zapotrzebowanie produktu."
#. module: mrp
#: model:process.node,name:mrp.process_node_stockproduct0
@ -918,7 +918,7 @@ msgstr "Jednostka miary wielkości"
#. module: mrp
#: view:mrp.procurement:0
msgid "Run procurement"
msgstr "Uruchom nabycie"
msgstr "Uruchom zapotrzebowanie"
#. module: mrp
#: help:res.company,schedule_range:0
@ -927,9 +927,9 @@ msgid ""
"procurements. All procurement that are not between today and today+range are "
"skipped for futur computation."
msgstr ""
"To jest rama czasowa do obliczeń planisty. Wszystkie babycia, które nie "
"znajdują się dzisiaj a dzisiaj + zakres planowania są pomijane w "
"obliczeniach."
"To jest rama czasowa do obliczeń planisty. Wszystkie zapotrzebowania, "
"których daty są poza zakresem od (dzisiaj) do (dzisiaj + zakres planowania) "
"są pomijane w obliczeniach."
#. module: mrp
#: field:mrp.workcenter,time_efficiency:0
@ -969,7 +969,7 @@ msgstr "Jednostka miary"
#. module: mrp
#: field:mrp.procurement,procure_method:0
msgid "Procurement Method"
msgstr "Metoda nabycia"
msgstr "Metoda zpotrzebowania"
#. module: mrp
#: field:mrp.workcenter,costs_journal_id:0
@ -986,7 +986,7 @@ msgstr "Na tydzień"
#: wizard_button:mrp.procurement.compute.all,init,compute:0
#: wizard_button:mrp.procurement.orderpoint.compute,init,compute:0
msgid "Compute Procurements"
msgstr "Oblicz nabycia"
msgstr "Oblicz zapotrzebowania"
#. module: mrp
#: model:process.node,note:mrp.process_node_stock0
@ -1001,7 +1001,7 @@ msgstr "Zatwierdź"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_purchaseprocure0
msgid "Procurement Purchase"
msgstr "Nabycie przez zakup"
msgstr "Zapotrzebowanie zakupu"
#. module: mrp
#: field:mrp.production.workcenter.line,hour:0
@ -1092,7 +1092,7 @@ msgstr "Strefa magazynowa"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_new
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_new
msgid "New Procurement"
msgstr "Nowe nabycie"
msgstr "Nowe zapotrzebowanie"
#. module: mrp
#: rml:mrp.production.order:0
@ -1120,7 +1120,7 @@ msgstr "Planowana data"
#. module: mrp
#: model:process.node,note:mrp.process_node_purchaseprocure0
msgid "Procurement orders"
msgstr "Zamówienia nabycia"
msgstr "Zapotrzebowania"
#. module: mrp
#: model:process.node,name:mrp.process_node_mts0
@ -1146,12 +1146,12 @@ msgstr "Ilość maks."
#: model:ir.model,name:mrp.model_mrp_procurement
#: view:mrp.procurement:0
msgid "Procurement"
msgstr "Nabycie"
msgstr "Zapotrzebowanie"
#. module: mrp
#: model:ir.actions.wizard,name:mrp.product_procurement_wizard
msgid "Procurement Request"
msgstr ""
msgstr "Utwórz zapotrzebowanie"
#. module: mrp
#: model:ir.actions.wizard,name:mrp.wizard_price
@ -1161,7 +1161,7 @@ msgstr "Struktura kosztów produktu"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
msgid "Minimum Stock Procure"
msgstr "Nabycie zapasu minimalnego"
msgstr "Zapotrzebowanie z zapasu minimalnego"
#. module: mrp
#: help:res.company,po_lead:0
@ -1191,7 +1191,7 @@ msgstr ""
#. module: mrp
#: model:process.node,note:mrp.process_node_productionorder0
msgid "Procurement for raw materials."
msgstr "Nabycie dla materiałów do produkcji."
msgstr "Zapotrzebowanie na materiały do produkcji."
#. module: mrp
#: view:mrp.procurement:0
@ -1203,7 +1203,7 @@ msgstr "Uwaga"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
msgid "Procure Stockable Product"
msgstr ""
msgstr "Zapotrzebowanie na produkty rejestrowane"
#. module: mrp
#: field:mrp.bom,method:0
@ -1231,7 +1231,7 @@ msgstr "Aktywne"
#. module: mrp
#: model:process.node,name:mrp.process_node_procureproducts0
msgid "Procure Products"
msgstr "Nabądź produkty"
msgstr "Zapotrzebowanie na produkty"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_property_action
@ -1267,7 +1267,8 @@ msgstr "Definiuj strukturę produktu z produktami ubocznymi lub komponentami."
msgid ""
"Procurement is created if the product quantity is lower than the minimum "
"limit."
msgstr "Nabycie jest tworzone gdy ilość produktu jest niższa niż minimum."
msgstr ""
"Zapotrzebowanie jest tworzone, gdy ilość produktu jest niższa niż minimum."
#. module: mrp
#: field:mrp.procurement,date_close:0
@ -1309,7 +1310,7 @@ msgstr "Wykonano"
#. module: mrp
#: help:stock.warehouse.orderpoint,qty_multiple:0
msgid "The procurement quantity will by rounded up to this multiple."
msgstr "Ilość nabycia będzie zaokrąglona do tej wielokrotności."
msgstr "Ilość zapotrzebowania będzie zaokrąglona do tej wielokrotności."
#. module: mrp
#: field:stock.warehouse.orderpoint,logic:0
@ -1327,7 +1328,7 @@ msgstr ""
#. module: mrp
#: model:process.node,note:mrp.process_node_procureproducts0
msgid "Central document to procure products"
msgstr "Centralny dokument do nabycia produktów"
msgstr "Centralny dokument na zapotrzebowanie produktów"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action3
@ -1389,7 +1390,7 @@ msgid ""
"Reference of the document that created this procurement.\n"
"This is automatically completed by Open ERP."
msgstr ""
"Oznaczenie dokumentu, który utworzył to nabycie\n"
"Oznaczenie dokumentu, który utworzył to zapotrzebowanie\n"
"Jest automatycznie wypełniane przez OpenERP."
#. module: mrp
@ -1457,8 +1458,8 @@ msgid ""
"If you encode manually a procurement, you probably want to use a make to "
"order method."
msgstr ""
"Jeśli wprowadziłeś nabycie ręcznie, to prawdopodobnie chcesz zastosowac "
"metodę 'Na zamówienie'."
"Jeśli wprowadziłeś zapotrzebowanie ręcznie, to prawdopodobnie chcesz "
"zastosować metodę 'Na zamówienie'."
#. module: mrp
#: rml:mrp.production.order:0
@ -1495,7 +1496,7 @@ msgstr ""
#. module: mrp
#: model:process.transition,note:mrp.process_transition_procurestockableproduct0
msgid "if Product type is Stockable in procurement order"
msgstr "Jeśli w zamówieniu nabycia produkt jest typu Rejestrowany."
msgstr "Jeśli w zapotrzebowaniu produkt jest typu Rejestrowany."
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
@ -1582,7 +1583,7 @@ msgstr "Kategorie właściwości"
#: model:ir.actions.wizard,name:mrp.wiz_mrp_proc1
#: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc1
msgid "Compute Procurements Only"
msgstr "Oblicz tylko nabycia"
msgstr "Oblicz tylko zapotrzebowania"
#. module: mrp
#: field:mrp.production,product_uos_qty:0
@ -1604,7 +1605,7 @@ msgstr "Ważne do"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action11
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action11
msgid "Temporary Procurement Exceptions"
msgstr "Tymczasowe wyjątki nabycia"
msgstr "Tymczasowe wyjątki zapotrzebowania"
#. module: mrp
#: field:mrp.bom,date_start:0
@ -1711,7 +1712,7 @@ msgstr "Liczba godzin"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action
msgid "Procurement Orders"
msgstr "Zamówienia nabycia"
msgstr "Zapotrzebowania"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_property
@ -1809,7 +1810,7 @@ msgstr "Normalne"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_productionprocureproducts0
msgid "When any procuere products, it comes into the prpcurement orders"
msgstr "Wszystkie nabycia produktów stają się zamówieniami nabycia"
msgstr "Kiedy produkt jest potrzebny, to powstaje zapotrzebowanie"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action2
@ -1820,7 +1821,7 @@ msgstr "Zamówienia produkcji do rozpoczęcia"
#. module: mrp
#: view:mrp.procurement:0
msgid "Procurement Reason"
msgstr "Powód nabycia"
msgstr "Powód zapotrzebowania"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@ -1848,7 +1849,7 @@ msgstr "Zestawienia materiałowe"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_procureserviceproduct0
msgid "In procurement order, if product type is service"
msgstr "W zamówieniach nabycia, jeśli typ produktu jest Usługa"
msgstr "W zapotrzebowaniach, jeśli typ produktu jest Usługa"
#. module: mrp
#: selection:mrp.procurement,procure_method:0
@ -1939,7 +1940,7 @@ msgstr "Produkowanie"
#: model:ir.actions.act_window,name:mrp.mrp_procurement_action3
#: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action3
msgid "Unscheduled procurements"
msgstr "Nabycia nie zaplanowane"
msgstr "Zapotrzebowania nie zaplanowane"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_bom_tree_action
@ -1960,7 +1961,7 @@ msgstr "Czas czyszczenia w godzinach"
#. module: mrp
#: view:mrp.procurement:0
msgid "Procurement Details"
msgstr "Szczegóły nabycia"
msgstr "Szczegóły zapotrzebowania"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_bom0

View File

@ -201,7 +201,6 @@ class mrp_bom(osv.osv):
'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production planning."),
'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
'revision_type': fields.selection([('numeric','numeric indices'),('alpha','alphabetical indices')], 'Index type'),
'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
'company_id': fields.many2one('res.company','Company',required=True),
}
@ -326,25 +325,6 @@ class mrp_bom(osv.osv):
result2 = result2 + res[1]
return result, result2
def set_indices(self, cr, uid, ids, context={}):
""" Sets Indices.
@return: True
"""
if not ids or (ids and not ids[0]):
return True
res = self.read(cr, uid, ids, ['revision_ids', 'revision_type'])
rev_ids = res[0]['revision_ids']
idx = 1
new_idx = []
bom_rev_obj = self.pool.get('mrp.bom.revision')
for rev_id in rev_ids:
if res[0]['revision_type'] == 'numeric':
bom_rev_obj.write(cr, uid, [rev_id], {'indice': idx})
else:
bom_rev_obj.write(cr, uid, [rev_id], {'indice': "%c" %(idx+96,)})
idx += 1
return True
mrp_bom()
class mrp_bom_revision(osv.osv):

View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"

View File

@ -166,6 +166,7 @@
<field name="view_id" ref="view_project"/>
<field name="search_view_id" ref="view_project_project_filter"/>
<field name="context">{'search_default_Current':1}</field>
<field name="help"> Consult and define yours projects here. A project content a set of related activities that will be performed by your company. Any project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure very useful for work organization.</field>
</record>
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
@ -461,7 +462,10 @@
<field name="view_id" ref="view_task_tree2"/>
<field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid, 'search_default_current': 1}</field>
<field name="search_view_id" ref="view_task_search_form"/>
<field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion.A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.
Issues like bugs in a system, client complain, materials breakdown are collected here.A list view allows the manager to quickly check for them, assign them, make their status evolved.
</field>
</record>
<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
@ -648,6 +652,7 @@
<field name="view_id" ref="view_project_message_tree"/>
<field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid}</field>
<field name="search_view_id" ref="view_project_message_search"/>
<field name="help">An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis.</field>
</record>
<menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>

View File

@ -144,6 +144,7 @@
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_task_project_user_search"/>
<field name="context">{'search_default_month':1,'search_default_project':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="help">Get detailed analysis by task</field>
</record>
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>

View File

@ -257,8 +257,9 @@
<field name="res_model">project.phase</field>
<field name="view_type">form</field>
<field name="view_mode">gantt,tree,form,calendar</field>
<field name="context">{'search_default_responsible_id':uid}</field>
<field name="context">{'search_default_responsible_id':uid}</field>
<field name="search_view_id" ref="view_project_phase_search"/>
<field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
</record>
<record id="act_project_phase_list" model="ir.actions.act_window">

View File

@ -37,6 +37,8 @@
<field name="view_id" ref="view_project_compute_phases_select"/>
<field name="context">{'record_id': active_id}</field>
<field name="target">new</field>
<field name="help">To schedule phases of all or a specified project. It then open a gantt view.
</field>
</record>
<menuitem id="menu_compute_phase" name="Compute Phase Scheduling"

View File

@ -216,6 +216,7 @@
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_user_id":uid}</field>
<field name="search_view_id" ref="account_analytic_planning_view_search"/>
<field name="help">With its commun system for scheduling all resources of a company (people and materials), OpenERP allows you to encode then compute automatically tasks and phases scheduling, track resources allocation and availibility.</field>
</record>
<!-- <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>-->
<menuitem id="base.menu_project_long_term" name="Long Term Planning"

File diff suppressed because it is too large Load Diff

View File

@ -198,6 +198,7 @@
<field name="view_mode">tree,form</field>
<field name="context">{"search_default_user_id":uid}</field>
<field name="search_view_id" ref="view_resource_resource_search"/>
<field name="help">There you can find clusters of your resources type involved in a specific project phase as well as their workload.</field>
</record>
<record id="resource_calendar_leave_form" model="ir.ui.view">

View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale

View File

@ -79,7 +79,7 @@ class sale_advance_payment_inv(osv.osv_memory):
})
create_ids.append(line_id)
inv = {
'name': sale.name,
'name': sale.client_order_ref or sale.name,
'origin': sale.name,
'type': 'out_invoice',
'reference': False,

View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"

View File

@ -422,9 +422,11 @@ class stock_sale_forecast(osv.osv):
dept_id = obj.analyzed_dept_id.id and [obj.analyzed_dept_id.id] or []
dept_ids = dept_obj.search(cr,uid,[('parent_id','child_of',dept_id)])
# dept_ids_set = ','.join(map(str,dept_ids))
cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN %s)" ,(tuple(dept_ids),))
# cr.execute("SELECT user_id FROM hr_department_user_rel WHERE (department_id IN %s)" ,(tuple(dept_ids),))
cr.execute("SELECT id FROM hr_employee WHERE (department_id IN %s)" ,(tuple(dept_ids),))
dept_users = [x for x, in cr.fetchall()]
dept_users_set = ','.join(map(str,dept_users))
# dept_users_set = ','.join(map(str,dept_users))
dept_users_set = map(str,dept_users)
else:
dept_users = False
factor, round_value = self._from_default_uom_factor(cr, uid, obj, obj.product_uom.id, context=context)

View File

@ -0,0 +1,86 @@
# Serbian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-26 06:05+0000\n"
"PO-Revision-Date: 2010-07-21 07:40+0000\n"
"Last-Translator: novta <Unknown>\n"
"Language-Team: Serbian <sr@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: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: thunderbird
#: field:tinythunderbird.partner,copy_to:0
msgid "Copy To"
msgstr "Kopiraj u"
#. module: thunderbird
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
#. module: thunderbird
#: field:tinythunderbird.partner,description:0
msgid "Description"
msgstr "Opis"
#. module: thunderbird
#: field:tinythunderbird.partner,reference:0
msgid "Reference"
msgstr "Referenca"
#. module: thunderbird
#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
msgid "Thunderbid mails"
msgstr "Thunderbird pisma"
#. module: thunderbird
#: field:tinythunderbird.partner,attachments:0
msgid "Attached Files"
msgstr "Prikačeni fajlovi"
#. module: thunderbird
#: field:tinythunderbird.partner,res_user_id:0
msgid "User"
msgstr "Korisnik"
#. module: thunderbird
#: field:tinythunderbird.partner,receiver:0
msgid "Receiver"
msgstr "Primalac"
#. module: thunderbird
#: field:tinythunderbird.partner,date:0
msgid "Date"
msgstr "Datum"
#. module: thunderbird
#: field:tinythunderbird.partner,title:0
msgid "Subject"
msgstr "Tema"
#. module: thunderbird
#: code:addons/thunderbird/partner/partner.py:0
#, python-format
msgid "Archive"
msgstr "Arhiva"
#. module: thunderbird
#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
msgid "Thunderbird Interface"
msgstr "Thunderbird interfejs"
#. module: thunderbird
#: field:tinythunderbird.partner,sender:0
msgid "Sender"
msgstr "Pošiljalac"

View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"

View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-09-08 12:13+0000\n"
"Last-Translator: Dragan Životić <dragan_zivotic@yahoo.com>\n"
"PO-Revision-Date: 2010-07-21 08:12+0000\n"
"Last-Translator: novta <Unknown>\n"
"Language-Team: Serbian <sr@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: 2010-06-22 04:17+0000\n"
"X-Launchpad-Export-Date: 2010-07-22 03:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: wiki
@ -90,7 +90,7 @@ msgstr "Wiki Konfiguracija"
#. module: wiki
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Pogrešno ime modela u definiciji akcije."
#. module: wiki
#: field:wiki.groups,name:0