diff options
| author | rpa (Open ERP) <rpa@tinyerp.com> | 2010-05-13 18:56:30 +0530 |
|---|---|---|
| committer | rpa (Open ERP) <rpa@tinyerp.com> | 2010-05-13 18:56:30 +0530 |
| commit | 8866e54ca92fe03e29fa9d8f31db9e9d2f8b0d37 (patch) | |
| tree | e1985c74f18f182e95b83b469e5b646f6521d8bd | |
| parent | 2331abec581a06108daf81b60377d439149f4ba7 (diff) | |
| parent | d7c1fcbf7b7e33eb09c1bfd2bae0a8359d3b23df (diff) | |
[MERGE]: Merge with lp:openobject-addons
bzr revid: rpa@tinyerp.com-20100513132630-9d4y5ucn35m7tbvj
160 files changed, 2508 insertions, 1261 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index eca8bf9b397..969f843bec9 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1763,52 +1763,6 @@ class account_subscription_line(osv.osv): _rec_name = 'date' account_subscription_line() - -class account_config_wizard(osv.osv_memory): - _name = 'account.config.wizard' - _inherit = 'res.config' - - _columns = { - 'name':fields.char( - 'Name', required=True, size=64, - help="Name of the fiscal year as displayed on screens."), - 'code':fields.char( - 'Code', required=True, size=64, - help="Name of the fiscal year as displayed in reports."), - 'date1': fields.date('Start Date', required=True), - 'date2': fields.date('End Date', required=True), - 'period':fields.selection([('month','Month'), ('3months','3 Months')], - 'Periods', required=True), - } - _defaults = { - 'code': lambda *a: time.strftime('%Y'), - 'name': lambda *a: time.strftime('%Y'), - 'date1': lambda *a: time.strftime('%Y-01-01'), - 'date2': lambda *a: time.strftime('%Y-12-31'), - 'period':lambda *a:'month', - } - - def execute(self, cr, uid, ids, context=None): - for res in self.read(cr,uid,ids): - if 'date1' in res and 'date2' in res: - res_obj = self.pool.get('account.fiscalyear') - start_date=res['date1'] - end_date=res['date2'] - name=res['name']#DateTime.strptime(start_date, '%Y-%m-%d').strftime('%m.%Y') + '-' + DateTime.strptime(end_date, '%Y-%m-%d').strftime('%m.%Y') - vals={ - 'name':name, - 'code':name, - 'date_start':start_date, - 'date_stop':end_date, - } - new_id=res_obj.create(cr, uid, vals, context=context) - if res['period']=='month': - res_obj.create_period(cr,uid,[new_id]) - elif res['period']=='3months': - res_obj.create_period3(cr,uid,[new_id]) -account_config_wizard() - - # --------------------------------------------------------------- # Account Templates : Account, Tax, Tax Code and chart. + Wizard # --------------------------------------------------------------- @@ -2163,6 +2117,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr,uid,[uid],c)[0].company_id.id, 'chart_template_id': _get_chart, 'code_digits': lambda *a:6, + 'seq_journal': True } def execute(self, cr, uid, ids, context=None): @@ -2435,10 +2390,14 @@ class account_bank_accounts_wizard(osv.osv_memory): _name='account.bank.accounts.wizard' _columns = { - 'acc_no':fields.many2one('res.partner.bank','Account No.',required=True), + 'acc_name':fields.char('Account Name.', size=64, required=True), 'bank_account_id':fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True), 'currency_id':fields.many2one('res.currency', 'Currency'), + 'account_type':fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32), } + _defaults = { + 'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, + } account_bank_accounts_wizard() diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 4c9742fd127..4c6faae9e19 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -17,17 +17,51 @@ </separator> <xpath expr="//label[@string='description']" position="attributes"> - <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications</attribute> + <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute> </xpath> - - <group colspan="8"> - <separator string="Accounting" colspan="4"/> + <xpath expr="//button[@string='Install Modules']" position="attributes"> + <attribute name="string">Configure</attribute> + </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='rowspan'>23</attribute> + <attribute name='string'></attribute> + </xpath> + <group colspan="8"> + <group colspan="4" height="450" width="600"> <field name="charts"/> - <field name="account_analytic_default"/> - <field name="account_analytic_plans"/> - <field name="account_payment"/> - <field name="account_followup"/> - <field name="account_asset"/> + <group colspan="4"> + <separator col="4" colspan="4" string="Configure Fiscal Year"/> + <field name="date_start" on_change="on_change_start_date(date_start)"/> + <field name="date_stop"/> + <field name="period" colspan="4"/> + </group> + <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}"> + <separator col="4" colspan="4" string="Bank and Cost Account"/> + <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list"> + <form string=""> + <field name="acc_name"/> + <field name="account_type"/> + <field name="currency_id" widget="selection"/> + </form> + <tree editable="bottom" string=""> + <field name="acc_name"/> + <field name="account_type"/> + <field name="currency_id" widget="selection"/> + </tree> + </field> + </group> + <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}"> + <field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/> + <field name="purchase_tax" colspan="2" /> + </group> + <group colspan="4" groups="base.group_extended"> + <separator col="4" colspan="4" string="Install Extra Account Module"/> + <field name="account_analytic_plans"/> + <field name="account_payment"/> + <field name="account_followup"/> + <field name="account_asset"/> + </group> + </group> </group> </data> </field> @@ -46,6 +80,20 @@ <record id="account_installer_todo" model="ir.actions.todo"> <field name="action_id" ref="action_account_installer"/> <field name="sequence">3</field> + <field name="restart">onskip</field> </record> + + <record id="account_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">account_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_account_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> + </data> </openerp> diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 9ace27294fa..38b628ab594 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1445,49 +1445,6 @@ <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All account entries" res_model="account.move.line" src_model="res.partner"/> - - - <!-- configuration wizard view --> - - <record id="view_account_config_wizard_form" model="ir.ui.view"> - <field name="name">Account Configure wizard</field> - <field name="model">account.config.wizard</field> - <field name="type">form</field> - <field name="inherit_id" ref="base.res_config_view_base"/> - <field name="arch" type="xml"> - <data> - <form position="attributes"> - <attribute name="string">Account Configure</attribute> - </form> - <group string="res_config_contents" position="replace"> - <separator col="4" colspan="4" string="Create a Fiscal Year"/> - <field name="name"/> - <field name="code"/> - <field name="date1"/> - <field name="date2"/> - <field name="period" colspan="4"/> - </group> - <xpath expr='//button[@name="action_skip"]' position="replace"/> - </data> - </field> - </record> - - <record id="action_account_config_wizard_form" model="ir.actions.act_window"> - <field name="name">Account Configure Wizard </field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">account.config.wizard</field> - <field name="view_id" ref="view_account_config_wizard_form"/> - <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="target">new</field> - </record> - - <!-- register configuration wizard --> - <record id="config_fiscalyear" model="ir.actions.todo"> - <field name="action_id" ref="action_account_config_wizard_form"/> - <field name="restart">onskip</field> - </record> - <record id="view_account_addtmpl_wizard_form" model="ir.ui.view"> <field name="name">Account Add wizard</field> <field name="model">account.addtmpl.wizard</field> @@ -1741,25 +1698,35 @@ <form position="attributes"> <attribute name="string">Generate Chart of Accounts from a Chart Template</attribute> </form> + <separator string="title" position="attributes"> + <attribute name="string" + >Generate Chart of Accounts from a Chart Template</attribute> + </separator> + <xpath expr="//label[@string='description']" position="attributes"> + <attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute> + <attribute name="width">150</attribute> + </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='rowspan'>15</attribute> + <attribute name='string'></attribute> + </xpath> <group string="res_config_contents" position="replace"> - <separator col="4" colspan="4" string=" - Generate Chart of Accounts from a Chart Template"/> - <label align="0.0" colspan="4" - string="This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"/> <field name="company_id" widget="selection" - groups="base.group_multi_company"/> + /> <field name ="code_digits" /> <field name="chart_template_id"/> <field name ="seq_journal" /> <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list"> <form string="Bank Information"> - <field name="acc_no"/> - <field name="currency_id"/> + <field name="acc_name"/> + <field name="account_type"/> + <field name="currency_id" widget="selection"/> </form> <tree editable="bottom" string="Bank Information"> - <field name="acc_no"/> - <field name="currency_id"/> + <field name="acc_name"/> + <field name="account_type"/> + <field name="currency_id" widget="selection"/> </tree> </field> </group> diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml new file mode 100644 index 00000000000..658cf2907af --- /dev/null +++ b/addons/account/configurable_account_chart.xml @@ -0,0 +1,516 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data noupdate="1"> + + <!-- Types --> + <record model="account.account.type" id="conf_account_type_receivable" > + <field name="name">Receivable</field> + <field name="code">receivable</field> + <field name="close_method">unreconciled</field> + </record> + + <record model="account.account.type" id="conf_account_type_payable" > + <field name="name">Payable</field> + <field name="code">payable</field> + <field name="close_method">unreconciled</field> + </record> + + <record model="account.account.type" id="conf_account_type_view"> + <field name="name">View</field> + <field name="code">view</field> + <field name="close_method">none</field> + </record> + + <record model="account.account.type" id="conf_account_type_income" > + <field name="name">Income</field> + <field name="code">income</field> + <field name="close_method">none</field> + </record> + + <record model="account.account.type" id="conf_account_type_expense"> + <field name="name">Expense</field> + <field name="code">expense</field> + <field name="close_method">none</field> + </record> + + <record model="account.account.type" id="conf_account_type_tax"> + <field name="name">Tax</field> + <field name="code">tax</field> + <field name="close_method">unreconciled</field> + </record> + + <record model="account.account.type" id="conf_account_type_cash"> + <field name="name">Cash</field> + <field name="code">cash</field> + <field name="close_method">balance</field> + </record> + + <record model="account.account.type" id="conf_account_type_asset"> + <field name="name">Asset</field> + <field name="code">asset</field> + <field name="close_method">balance</field> + </record> + + <record model="account.account.type" id="conf_account_type_equity"> + <field name="name">Equity</field> + <field name="code">equity</field> + <field name="close_method">balance</field> + </record> + + <record model="account.account.type" id="conf_account_type_bnk"> + <field name="name">Bank</field> + <field name="code">bank</field> + <field name="close_method">balance</field> + </record> + <record model="account.account.type" id="conf_account_type_chk"> + <field name="name">Check</field> + <field name="code">check</field> + <field name="close_method">balance</field> + </record> + + + + <!-- Account Templates--> + <record id="conf_chart0" model="account.account.template"> + <field name="code">0</field> + <field name="name">Configurable Account Chart</field> + <field eval="0" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <!-- Balance Sheet --> + + <record id="conf_bal" model="account.account.template"> + <field name="code">1</field> + <field name="name">Balance Sheet</field> + <field ref="conf_chart0" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_fas" model="account.account.template"> + <field name="code">10</field> + <field name="name">Fixed Assets</field> + <field ref="conf_bal" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_xfa" model="account.account.template"> + <field name="code">100</field> + <field name="name">Fixed Asset Account</field> + <field ref="conf_fas" name="parent_id"/> + <field name="type">other</field> + <field name="user_type" ref="conf_account_type_asset"/> + </record> + + <record id="conf_nca" model="account.account.template"> + <field name="code">11</field> + <field name="name">Net Current Assets</field> + <field ref="conf_bal" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_cas" model="account.account.template"> + <field name="code">110</field> + <field name="name">Current Assets</field> + <field ref="conf_nca" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_stk" model="account.account.template"> + <field name="code">1101</field> + <field name="name">Purchased Stocks</field> + <field ref="conf_cas" name="parent_id"/> + <field name="type">other</field> + <field name="user_type" ref="conf_account_type_asset"/> + </record> + + <record id="conf_a_recv" model="account.account.template"> + <field name="code">1102</field> + <field name="name">Debtors</field> + <field ref="conf_cas" name="parent_id"/> + <field name="type">receivable</field> + <field eval="True" name="reconcile"/> + <field name="user_type" ref="conf_account_type_receivable"/> + </record> + + <!-- <record id="account.property_account_receivable" model="ir.property"> + <field eval="'account.account,'+str(a_recv)" name="value"/> + </record> --> + + <record id="conf_ova" model="account.account.template"> + <field name="code">1103</field> + <field name="name">Output VAT</field> + <field ref="conf_cas" name="parent_id"/> + <field name="type">other</field> + <field name="user_type" ref="conf_account_type_tax"/> + </record> + + <record id="conf_bnk" model="account.account.template"> + <field name="code">1104</field> + <field name="name">Bank Current Account</field> + <field ref="conf_cas" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_cash"/> + </record> + + <record id="conf_cash" model="account.account.template"> + <field name="code">1105</field> + <field name="name">Cash</field> + <field ref="conf_cas" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_cash"/> + </record> + + <record id="conf_cli" model="account.account.template"> + <field name="code">111</field> + <field name="name">Current Liabilities</field> + <field ref="conf_nca" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_a_pay" model="account.account.template"> + <field name="code">1111</field> + <field name="name">Creditors</field> + <field ref="conf_cli" name="parent_id"/> + <field name="type">payable</field> + <field eval="True" name="reconcile"/> + <field name="user_type" ref="conf_account_type_payable"/> + </record> + + <!-- <record id="account.property_account_payable" model="ir.property"> + <field eval="'account.account,'+str(a_pay)" name="value"/> + </record>--> + + <record id="conf_iva" model="account.account.template"> + <field name="code">1112</field> + <field name="name">Input VAT</field> + <field ref="conf_cli" name="parent_id"/> + <field name="type">other</field> + <field name="user_type" ref="conf_account_type_tax"/> + </record> + + <!-- Profit and Loss --> + + <record id="conf_gpf" model="account.account.template"> + <field name="code">2</field> + <field name="name">Profit and Loss</field> + <field ref="conf_chart0" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_rev" model="account.account.template"> + <field name="code">20</field> + <field name="name">Revenue</field> + <field ref="conf_gpf" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_a_sale" model="account.account.template"> + <field name="code">200</field> + <field name="name">Product Sales</field> + <field ref="conf_rev" name="parent_id"/> + <field name="type">other</field> + <field name="user_type" ref="conf_account_type_income"/> + </record> + + <!-- <record id="account.property_account_income_categ" model="ir.property"> + <field eval="'account.account,'+str(a_sale)" name="value"/> + </record> --> + + <record id="conf_cos" model="account.account.template"> + <field name="code">21</field> + <field name="name">Cost of Sales</field> + <field ref="conf_gpf" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_cog" model="account.account.template"> + <field name="code">210</field> + <field name="name">Cost of Goods Sold</field> + <field ref="conf_cos" name="parent_id"/> + <field name="type">other</field> + <field name="user_type" ref="conf_account_type_expense"/> + </record> + + <record id="conf_ovr" model="account.account.template"> + <field name="code">22</field> + <field name="name">Overheads</field> + <field ref="conf_gpf" name="parent_id"/> + <field name="type">view</field> + <field name="user_type" ref="conf_account_type_view"/> + </record> + + <record id="conf_a_expense" model="account.account.template"> + <field name="code">220</field> + <field name="name">Expenses</field> + <field ref="conf_ovr" name="parent_id"/> + <field name="type">other</field> + <field name="user_type" ref="conf_account_type_expense"/> + </record> + + <!-- <record id="account.property_account_expense_categ" model="ir.property"> + <field eval="'account.account,'+str(a_expense)" name="value"/> + </record> --> + + <!-- Taxes --> + <!-- VAT Code Definitions --> + + <!-- Invoiced VAT --> + + <!-- Input VAT --> + + <record id="vat_code_chart_root" model="account.tax.code.template"> + <field name="name">Plan Fees </field> + </record> + + <record id="vat_code_balance_net" model="account.tax.code.template"> + <field name="name">VAT Balance to Pay</field> + <field name="parent_id" ref="vat_code_chart_root"/> + </record> + + <record id="vat_code_input" model="account.tax.code.template"> + <field name="name">Input VAT</field> + <field name="parent_id" ref="vat_code_balance_net"/> + <field eval="-1" name="sign"/> + </record> + + <record id="vat_code_input_S" model="account.tax.code.template"> + <field name="name">Input VAT Rate S (15%)</field> + <field name="parent_id" ref="vat_code_input"/> + </record> + + <record id="vat_code_input_R" model="account.tax.code.template"> + <field name="name">Input VAT Rate R (5%)</field> + <field name="parent_id" ref="vat_code_input"/> + </record> + + <!-- Output VAT --> + + <record id="vat_code_output" model="account.tax.code.template"> + <field name="name">Output VAT</field> + <field name="parent_id" ref="vat_code_balance_net"/> + </record> + + <record id="vat_code_output_S" model="account.tax.code.template"> + <field name="name">Output VAT Rate S (15%)</field> + <field name="parent_id" ref="vat_code_output"/> + </record> + + <record id="vat_code_output_R" model="account.tax.code.template"> + <field name="name">Output VAT Rate R (5%)</field> + <field name="parent_id" ref="vat_code_output"/> + </record> + + <!-- Invoiced Base of VAT --> + + <!-- Purchases --> + + <record id="vat_code_base_net" model="account.tax.code.template"> + <field name="name">Tax Bases</field> + <field name="parent_id" ref="vat_code_chart_root"/> + </record> + + <record id="vat_code_base_purchases" model="account.tax.code.template"> + <field name="name">Taxable Purchases Base</field> + <field name="parent_id" ref="vat_code_base_net"/> + </record> + + <record id="vat_code_purch_S" model="account.tax.code.template"> + <field name="name">Taxable Purchases Rated S (15%)</field> + <field name="parent_id" ref="vat_code_base_purchases"/> + </record> + + <record id="vat_code_purch_R" model="account.tax.code.template"> + <field name="name">Taxable Purchases Rated R (5%)</field> + <field name="parent_id" ref="vat_code_base_purchases"/> + </record> + + <record id="vat_code_purch_Z" model="account.tax.code.template"> + <field name="name">Taxable Purchases Rated Z (0%)</field> + <field name="parent_id" ref="vat_code_base_purchases"/> + </record> + + <record id="vat_code_purch_X" model="account.tax.code.template"> + <field name="name">Taxable Purchases Type X (Exempt)</field> + <field name="parent_id" ref="vat_code_base_purchases"/> + </record> + + <record id="vat_code_purch_O" model="account.tax.code.template"> + <field name="name">Taxable Purchases Type O (Out of scope)</field> + <field name="parent_id" ref="vat_code_base_purchases"/> + </record> + + <!-- Sales --> + + <record id="vat_code_base_sales" model="account.tax.code.template"> + <field name="name">Base of Taxable Sales</field> + <field name="parent_id" ref="vat_code_base_net"/> + </record> + + <record id="vat_code_sales_S" model="account.tax.code.template"> + <field name="name">Taxable Sales Rated S (15%)</field> + <field name="parent_id" ref="vat_code_base_sales"/> + </record> + + <record id="vat_code_sales_R" model="account.tax.code.template"> + <field name="name">Taxable Sales Rated R (5%)</field> + <field name="parent_id" ref="vat_code_base_sales"/> + </record> + + <record id="vat_code_sales_Z" model="account.tax.code.template"> + <field name="name">Taxable Sales Rated Z (0%)</field> + <field name="parent_id" ref="vat_code_base_sales"/> + </record> + + <record id="vat_code_sales_X" model="account.tax.code.template"> + <field name="name">Taxable Sales Type X (Exempt)</field> + <field name="parent_id" ref="vat_code_base_sales"/> + </record> + + <record id="vat_code_sales_O" model="account.tax.code.template"> + <field name="name">Taxable Sales Type O (Out of scope)</field> + <field name="parent_id" ref="vat_code_base_sales"/> + </record> + + <record id="configurable_chart_template" model="account.chart.template"> + <field name="name">Configurable Account Chart Template</field> + <field name="account_root_id" ref="conf_chart0"/> + <field name="tax_code_root_id" ref="vat_code_chart_root"/> + <field name="bank_account_view_id" ref="conf_bnk"/> + <field name="property_account_receivable" ref="conf_a_recv"/> + <field name="property_account_payable" ref="conf_a_pay"/> + <field name="property_account_expense_categ" ref="conf_a_expense"/> + <field name="property_account_income_categ" ref="conf_a_sale"/> + </record> + + <!-- VAT Codes --> + <!-- Purchases + Input VAT --> + + <record id="ivats" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">IVAT S</field> + <field eval="0.15" name="amount"/> + <field name="type">percent</field> + <field name="account_collected_id" ref="conf_iva"/> + <field name="account_paid_id" ref="conf_iva"/> + <field name="base_code_id" ref="vat_code_purch_S"/> + <field name="tax_code_id" ref="vat_code_input_S"/> + <field name="ref_base_code_id" ref="vat_code_purch_S"/> + <field name="ref_tax_code_id" ref="vat_code_input_S"/> + <field name="type_tax_use">purchase</field> + </record> + + <record id="ivatr" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">IVAT R</field> + <field eval="0.005" name="amount"/> + <field name="type">percent</field> + <field name="account_collected_id" ref="conf_iva"/> + <field name="account_paid_id" ref="conf_iva"/> + <field name="base_code_id" ref="vat_code_purch_R"/> + <field name="tax_code_id" ref="vat_code_input_R"/> + <field name="ref_base_code_id" ref="vat_code_purch_R"/> + <field name="ref_tax_code_id" ref="vat_code_input_R"/> + <field name="type_tax_use">purchase</field> + </record> + + <record id="ivatz" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">IVAT Z</field> + <field eval="0.0" name="amount"/> + <field name="type">percent</field> + <field name="base_code_id" ref="vat_code_purch_Z"/> + <field name="ref_base_code_id" ref="vat_code_purch_Z"/> + <field name="type_tax_use">purchase</field> + </record> + + <record id="ivatx" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">IVAT X</field> + <field eval="0.0" name="amount"/> + <field name="type">percent</field> + <field name="base_code_id" ref="vat_code_purch_X"/> + <field name="ref_base_code_id" ref="vat_code_purch_X"/> + <field name="type_tax_use">purchase</field> + </record> + + <record id="ivato" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">IVAT O</field> + <field eval="0.0" name="amount"/> + <field name="type">percent</field> + <field name="base_code_id" ref="vat_code_purch_O"/> + <field name="ref_base_code_id" ref="vat_code_purch_O"/> + <field name="type_tax_use">purchase</field> + </record> + + <!-- Sales + Output VAT --> + + <record id="ovats" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">OVAT S</field> + <field eval="0.15" name="amount"/> + <field name="type">percent</field> + <field name="account_collected_id" ref="conf_ova"/> + <field name="account_paid_id" ref="conf_ova"/> + <field name="base_code_id" ref="vat_code_sales_S"/> + <field name="tax_code_id" ref="vat_code_output_S"/> + <field name="ref_base_code_id" ref="vat_code_sales_S"/> + <field name="ref_tax_code_id" ref="vat_code_output_S"/> + <field name="type_tax_use">sale</field> + </record> + + <record id="ovatr" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">OVAT R</field> + <field eval="0.005" name="amount"/> + <field name="type">percent</field> + <field name="account_collected_id" ref="conf_ova"/> + <field name="account_paid_id" ref="conf_ova"/> + <field name="base_code_id" ref="vat_code_sales_R"/> + <field name="tax_code_id" ref="vat_code_output_R"/> + <field name="ref_base_code_id" ref="vat_code_sales_R"/> + <field name="ref_tax_code_id" ref="vat_code_output_R"/> + <field name="type_tax_use">sale</field> + </record> + + <record id="ovatz" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">OVAT Z</field> + <field eval="0.0" name="amount"/> + <field name="type">percent</field> + <field name="base_code_id" ref="vat_code_sales_Z"/> + <field name="ref_base_code_id" ref="vat_code_sales_Z"/> + <field name="type_tax_use">sale</field> + </record> + + <record id="ovatx" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">OVAT X</field> + <field eval="0.0" name="amount"/> + <field name="type">percent</field> + <field name="base_code_id" ref="vat_code_sales_X"/> + <field name="ref_base_code_id" ref="vat_code_sales_X"/> + <field name="type_tax_use">sale</field> + </record> + + <record id="ovato" model="account.tax.template"> + <field name="chart_template_id" ref="configurable_chart_template"/> + <field name="name">OVAT O</field> + <field eval="0.0" name="amount"/> + <field name="type">percent</field> + <field name="base_code_id" ref="vat_code_sales_O"/> + <field name="ref_base_code_id" ref="vat_code_sales_O"/> + <field name="type_tax_use">sale</field> + </record> + </data> +</openerp> diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index a777acb9c5c..ef00056ee8e 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -785,10 +785,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index f69b3246eff..e838f3bce27 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -805,10 +805,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po index 91dfbca2279..56befb5c212 100644 --- a/addons/account/i18n/bg.po +++ b/addons/account/i18n/bg.po @@ -820,11 +820,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po index d1da22ef906..36cd444b21d 100644 --- a/addons/account/i18n/bs.po +++ b/addons/account/i18n/bs.po @@ -817,11 +817,6 @@ msgid "Move Lines" msgstr "Retci prijenosa" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po index 9f2c82ec366..6a5f47dfb24 100644 --- a/addons/account/i18n/ca.po +++ b/addons/account/i18n/ca.po @@ -830,11 +830,6 @@ msgid "Move Lines" msgstr "Línies moviment" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.assistent" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 8d393298e01..be9a9612f42 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -810,11 +810,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 55cb096e90e..e27b080077d 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -812,11 +812,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index e978a71d610..4f9893960bf 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -828,11 +828,6 @@ msgid "Move Lines" msgstr "Buchungszeilen" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po index f2e5ed77ea6..af0ca7265c3 100644 --- a/addons/account/i18n/el.po +++ b/addons/account/i18n/el.po @@ -830,11 +830,6 @@ msgid "Move Lines" msgstr "Μετακίνηση Γραμμών" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 0a2b2c626d6..21becbd9c99 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -829,11 +829,6 @@ msgid "Move Lines" msgstr "Líneas movimiento" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.asistente" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po index f578cbc7493..cbdf13eb4b0 100644 --- a/addons/account/i18n/es_AR.po +++ b/addons/account/i18n/es_AR.po @@ -828,11 +828,6 @@ msgid "Move Lines" msgstr "Líneas del movimiento" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "asistente.configuracion.contable" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index 0f0f933abdb..bed04b5b069 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -827,11 +827,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po index 69a3ef62f7a..db92507f36d 100644 --- a/addons/account/i18n/et.po +++ b/addons/account/i18n/et.po @@ -808,11 +808,6 @@ msgid "Move Lines" msgstr "Liiguta read" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po index 95af7a94323..3dace56df79 100644 --- a/addons/account/i18n/fa.po +++ b/addons/account/i18n/fa.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po index b5274399fea..1f1de60a69e 100644 --- a/addons/account/i18n/fi.po +++ b/addons/account/i18n/fi.po @@ -827,11 +827,6 @@ msgid "Move Lines" msgstr "Siirron rivit" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index ffb5f882d9b..1785d79bf38 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -1241,11 +1241,6 @@ msgid "Move Lines" msgstr "Lignes de mouvements" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po index 65856053bdd..6bcd627b0bf 100644 --- a/addons/account/i18n/gl.po +++ b/addons/account/i18n/gl.po @@ -806,10 +806,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po index 3a997d3000f..ecd36932d38 100644 --- a/addons/account/i18n/gu.po +++ b/addons/account/i18n/gu.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index e6b360683ea..e01b198f2d5 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.po @@ -806,11 +806,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index c8349d8f0c5..8f70c2fd083 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -806,11 +806,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po index 1d999f12888..c7c2f143c8b 100644 --- a/addons/account/i18n/id.po +++ b/addons/account/i18n/id.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 3e1cac8d4b5..6d5e5fd6f4a 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -827,11 +827,6 @@ msgid "Move Lines" msgstr "Righe Movimentate" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po index 67801be10cf..383cf564a8b 100644 --- a/addons/account/i18n/kab.po +++ b/addons/account/i18n/kab.po @@ -806,10 +806,7 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" + #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index e97724467c6..4391aa7bb08 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po index 0adf15c8787..4558f305972 100644 --- a/addons/account/i18n/lt.po +++ b/addons/account/i18n/lt.po @@ -810,11 +810,6 @@ msgid "Move Lines" msgstr "Didžiosios knygos įrašai" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po index e17722af03f..67a585f4a57 100644 --- a/addons/account/i18n/lv.po +++ b/addons/account/i18n/lv.po @@ -819,11 +819,6 @@ msgid "Move Lines" msgstr "Grāmatojumu Rindas" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 11bab9eed81..52512785a61 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po index e27d8cc9677..1041a90be21 100644 --- a/addons/account/i18n/nb.po +++ b/addons/account/i18n/nb.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index ea10f588dc6..ac1f183a5fa 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -828,11 +828,6 @@ msgid "Move Lines" msgstr "Verplaats boekingsregels" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po index c9fda154dab..f298c31854d 100644 --- a/addons/account/i18n/nl_BE.po +++ b/addons/account/i18n/nl_BE.po @@ -806,11 +806,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po index a322bf511b0..53532fba0ac 100644 --- a/addons/account/i18n/oc.po +++ b/addons/account/i18n/oc.po @@ -808,10 +808,6 @@ msgstr "" msgid "Move Lines" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" #. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 075000596c9..c1632caa35b 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -826,11 +826,6 @@ msgid "Move Lines" msgstr "Pozycje zapisów" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po index 2f23e7ccc7e..1f006f5ba61 100644 --- a/addons/account/i18n/pt.po +++ b/addons/account/i18n/pt.po @@ -824,11 +824,6 @@ msgid "Move Lines" msgstr "Linhas de movimentos" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index deb3ee9afb8..95117f2d96e 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -827,11 +827,6 @@ msgid "Move Lines" msgstr "Mover Linhas" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index 30c07e9f381..d70c8ee4c69 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -828,11 +828,6 @@ msgid "Move Lines" msgstr "Linii mişcări" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 9e34bba0b59..7c0acebc4bc 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -821,11 +821,6 @@ msgid "Move Lines" msgstr "Строки финансового документа" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "Мастер конфигурации" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po index b717c4bfcec..e7d7718f9e6 100644 --- a/addons/account/i18n/si.po +++ b/addons/account/i18n/si.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po index 7d8c17aee9a..cbe99fcfee3 100644 --- a/addons/account/i18n/sk.po +++ b/addons/account/i18n/sk.po @@ -810,11 +810,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po index ae98b095426..6eb777a8261 100644 --- a/addons/account/i18n/sl.po +++ b/addons/account/i18n/sl.po @@ -819,11 +819,6 @@ msgid "Move Lines" msgstr "Postavke knjižb" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po index de0b5913aa6..e82be2f3bc9 100644 --- a/addons/account/i18n/sq.po +++ b/addons/account/i18n/sq.po @@ -829,11 +829,6 @@ msgid "Move Lines" msgstr "Lëviz Linjat" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po index 99cda7934ad..c2a3d8276ae 100644 --- a/addons/account/i18n/sr.po +++ b/addons/account/i18n/sr.po @@ -810,11 +810,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 5959bd7abbe..085cc58caba 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -816,11 +816,6 @@ msgid "Move Lines" msgstr "Flytta rader" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "account.config.wizard" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po index 53daa3531e5..eaa42f35d86 100644 --- a/addons/account/i18n/te.po +++ b/addons/account/i18n/te.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po index 3c3e7026dea..320fdc82290 100644 --- a/addons/account/i18n/th.po +++ b/addons/account/i18n/th.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po index dbda43952e8..41390d44aac 100644 --- a/addons/account/i18n/tlh.po +++ b/addons/account/i18n/tlh.po @@ -806,11 +806,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 6f445a81528..a203f350368 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -806,11 +806,6 @@ msgid "Move Lines" msgstr "Hareket Kalemleri" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po index fb52db34f13..02020dd4cb8 100644 --- a/addons/account/i18n/uk.po +++ b/addons/account/i18n/uk.po @@ -806,11 +806,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index b83ea120c76..6e5a40ad057 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.po @@ -818,11 +818,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index c89e2e107cf..93b325d879e 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -809,11 +809,6 @@ msgid "Move Lines" msgstr "凭证明细" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "科目.设置.向导" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po index fa207ddcf49..7ca8d6548e9 100644 --- a/addons/account/i18n/zh_HK.po +++ b/addons/account/i18n/zh_HK.po @@ -807,11 +807,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index 0b8bfac659b..c73c4d65323 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -806,11 +806,6 @@ msgid "Move Lines" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_config_wizard -msgid "account.config.wizard" -msgstr "" - -#. module: account #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree #: model:ir.ui.menu,name:account.report_account_analytic_journal_print msgid "Account cost and revenue by journal" diff --git a/addons/account/installer.py b/addons/account/installer.py index 35a09406891..44eb081d7be 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -18,22 +18,34 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## +import time +import datetime +from dateutil.relativedelta import relativedelta +from tools.translate import _ from operator import itemgetter - from osv import fields, osv import netsvc +import tools +from os.path import join as opj class account_installer(osv.osv_memory): _name = 'account.installer' _inherit = 'res.config.installer' + def _get_default_accounts(self, cr, uid, context=None): + accounts = [{'acc_name':'Current','account_type':'cash'}, + {'acc_name':'Deposit','account_type':'cash'}] + return accounts + def _get_charts(self, cr, uid, context=None): modules = self.pool.get('ir.module.module') ids = modules.search(cr, uid, [('category_id','=','Account Charts')]) - return list( + charts = list( sorted(((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids)), key=itemgetter(1))) + charts.insert(0,('configurable','Generic Chart Of Account')) + return charts _columns = { # Accounting @@ -42,9 +54,6 @@ class account_installer(osv.osv_memory): help="Installs localized accounting charts to match as closely as " "possible the accounting needs of your company based on your " "country."), - 'account_analytic_default':fields.boolean('Analytic Accounting', - help="Automatically selects analytic accounts based on various " - "criteria."), 'account_analytic_plans':fields.boolean('Multiple Analytic Plans', help="Allows invoice lines to impact multiple analytic accounts " "simultaneously."), @@ -57,16 +66,423 @@ class account_installer(osv.osv_memory): "per-partner policies."), 'account_asset':fields.boolean('Assets Management', help="Enables asset management in the accounting application, " - "including asset categories and usage periods.") + "including asset categories and usage periods."), + 'date_start': fields.date('Start Date', required=True), + 'date_stop': fields.date('End Date', required=True), + 'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')], + 'Periods', required=True), + 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts',required=True), + 'sale_tax':fields.float('Sale Tax(%)'), + 'purchase_tax':fields.float('Purchase Tax(%)') } _defaults = { - 'account_analytic_default':True, + 'date_start': lambda *a: time.strftime('%Y-01-01'), + 'date_stop': lambda *a: time.strftime('%Y-12-31'), + 'period':lambda *a:'month', + 'sale_tax':lambda *a:0.0, + 'purchase_tax':lambda *a:0.0, + #'charts':'configurable', + 'bank_accounts_id':_get_default_accounts } + def on_change_tax(self, cr, uid, id, tax): + return{'value':{'purchase_tax':tax}} + + def on_change_start_date(self, cr, uid, id, start_date): + if start_date: + start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d") + end_date = (start_date + relativedelta(months=12)) - relativedelta(days=1) + return {'value':{'date_stop':end_date.strftime('%Y-%m-%d')}} + return {} + + def generate_configurable_chart(self, cr, uid, ids, context=None): + mod_obj = self.pool.get('ir.model.data') + result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template') + id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] + obj_multi = self.pool.get('account.chart.template').browse(cr,uid, id) + + obj_acc = self.pool.get('account.account') + obj_acc_tax = self.pool.get('account.tax') + obj_journal = self.pool.get('account.journal') + obj_sequence = self.pool.get('ir.sequence') + obj_acc_template = self.pool.get('account.account.template') + obj_fiscal_position_template = self.pool.get('account.fiscal.position.template') + obj_fiscal_position = self.pool.get('account.fiscal.position') + company_id = self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id + seq_journal = True + + # Creating Account + obj_acc_root = obj_multi.account_root_id + tax_code_root_id = obj_multi.tax_code_root_id.id + + #new code + acc_template_ref = {} + tax_template_ref = {} + tax_code_template_ref = {} + todo_dict = {} + + #create all the tax code + children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id') + children_tax_code_template.sort() + for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template): + vals={ + 'name': (tax_code_root_id == tax_code_template.id) and company_id.name or tax_code_template.name, + 'code': tax_code_template.code, + 'info': tax_code_template.info, + 'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False, + 'company_id': company_id.id, + 'sign': tax_code_template.sign, + } + new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals) + #recording the new tax code to do the mapping + tax_code_template_ref[tax_code_template.id] = new_tax_code + + #create all the tax + for tax in obj_multi.tax_template_ids: + #create it + vals_tax = { + 'name':tax.name, + 'sequence': tax.sequence, + 'amount':tax.amount, + 'type':tax.type, + 'applicable_type': tax.applicable_type, + 'domain':tax.domain, + 'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False, + 'child_depend': tax.child_depend, + 'python_compute': tax.python_compute, + 'python_compute_inv': tax.python_compute_inv, + 'python_applicable': tax.python_applicable, + 'tax_group':tax.tax_group, + 'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False, + 'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False, + 'base_sign': tax.base_sign, + 'tax_sign': tax.tax_sign, + 'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False, + 'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False, + 'ref_base_sign': tax.ref_base_sign, + 'ref_tax_sign': tax.ref_tax_sign, + 'include_base_amount': tax.include_base_amount, + 'description':tax.description, + 'company_id': company_id.id, + 'type_tax_use': tax.type_tax_use + } + new_tax = obj_acc_tax.create(cr,uid,vals_tax) + #as the accounts have not been created yet, we have to wait before filling these fields + todo_dict[new_tax] = { + 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False, + 'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False, + } + tax_template_ref[tax.id] = new_tax + + #deactivate the parent_store functionnality on account_account for rapidity purpose + self.pool._init = True + + children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)]) + children_acc_template.sort() + for account_template in obj_acc_template.browse(cr, uid, children_acc_template): + tax_ids = [] + for tax in account_template.tax_ids: + tax_ids.append(tax_template_ref[tax.id]) + #create the account_account + + dig = 6 + code_main = account_template.code and len(account_template.code) or 0 + code_acc = account_template.code or '' + if code_main>0 and code_main<=dig and account_template.type != 'view': + code_acc=str(code_acc) + (str('0'*(dig-code_main))) + vals={ + 'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name, + #'sign': account_template.sign, + 'currency_id': account_template.currency_id and account_template.currency_id.id or False, + 'code': code_acc, + 'type': account_template.type, + 'user_type': account_template.user_type and account_template.user_type.id or False, + 'reconcile': account_template.reconcile, + 'shortcut': account_template.shortcut, + 'note': account_template.note, + 'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False, + 'tax_ids': [(6,0,tax_ids)], + 'company_id': company_id.id, + } + new_account = obj_acc.create(cr,uid,vals) + acc_template_ref[account_template.id] = new_account + if account_template.name == 'Bank Current Account': + view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Cash Journal View')])[0] + view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Multi-Currency Cash Journal View')])[0] + ref_acc_bank = obj_multi.bank_account_view_id + + cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash') + cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id'] + + bank_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_bnk') + bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'])[0]['res_id'] + + check_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_chk') + check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'])[0]['res_id'] + + record = self.browse(cr, uid, ids, context=context)[0] + code_cnt = 1 + vals_seq = { + 'name': _('Bank Journal '), + 'code': 'account.journal', + } + seq_id = obj_sequence.create(cr,uid,vals_seq) + + #create the bank journal + vals_journal = {} + vals_journal['name']= _('Bank Journal ') + vals_journal['code']= _('BNK') + vals_journal['sequence_id'] = seq_id + vals_journal['type'] = 'cash' + if vals.get('currency_id', False): + vals_journal['view_id'] = view_id_cur + vals_journal['currency'] = vals.get('currency_id', False) + else: + vals_journal['view_id'] = view_id_cash + vals_journal['default_credit_account_id'] = new_account + vals_journal['default_debit_account_id'] = new_account + obj_journal.create(cr,uid,vals_journal) + + for val in record.bank_accounts_id: + if val.account_type == 'cash':type = cash_type_id + elif val.account_type == 'bank':type = bank_type_id + else:type = check_type_id + vals_bnk = {'name': val.acc_name or '', + 'currency_id': val.currency_id.id or False, + 'code': str(110400 + code_cnt), + 'type': 'other', + 'user_type': type, + 'parent_id':new_account, + 'company_id': company_id.id } + child_bnk_acc = obj_acc.create(cr, uid, vals_bnk) + vals_seq_child = { + 'name': _(vals_bnk['name']), + 'code': 'account.journal', + } + seq_id = obj_sequence.create(cr, uid, vals_seq_child) + + #create the bank journal + vals_journal = {} + vals_journal['name']= vals_bnk['name'] + ' Journal' + vals_journal['code']= _(vals_bnk['name'][:3]) + vals_journal['sequence_id'] = seq_id + vals_journal['type'] = 'cash' + if vals.get('currency_id', False): + vals_journal['view_id'] = view_id_cur + vals_journal['currency'] = vals_bnk.get('currency_id', False) + else: + vals_journal['view_id'] = view_id_cash + vals_journal['default_credit_account_id'] = child_bnk_acc + vals_journal['default_debit_account_id'] = child_bnk_acc + obj_journal.create(cr,uid,vals_journal) + code_cnt += 1 + + + #reactivate the parent_store functionnality on account_account + self.pool._init = False + self.pool.get('account.account')._parent_store_compute(cr) + + for key,value in todo_dict.items(): + if value['account_collected_id'] or value['account_paid_id']: + obj_acc_tax.write(cr, uid, [key], { + 'account_collected_id': acc_template_ref[value['account_collected_id']], + 'account_paid_id': acc_template_ref[value['account_paid_id']], + }) + + # Creating Journals + vals_journal={} + view_id = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Journal View')])[0] + seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0] + + if seq_journal: + seq_id_sale = obj_sequence.search(cr,uid,[('name','=','Sale Journal')])[0] + seq_id_purchase = obj_sequence.search(cr,uid,[('name','=','Purchase Journal')])[0] + else: + seq_id_sale = seq_id + seq_id_purchase = seq_id + + vals_journal['view_id'] = view_id + + #Sales Journal + vals_journal['name'] = _('Sales Journal') + vals_journal['type'] = 'sale' + vals_journal['code'] = _('SAJ') + vals_journal['sequence_id'] = seq_id_sale + + if obj_multi.property_account_receivable: + vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] + vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] + + obj_journal.create(cr,uid,vals_journal) + + # Purchase Journal + vals_journal['name'] = _('Purchase Journal') + vals_journal['type'] = 'purchase' + vals_journal['code'] = _('EXJ') + vals_journal['sequence_id'] = seq_id_purchase + + if obj_multi.property_account_payable: + vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] + vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] + + obj_journal.create(cr,uid,vals_journal) + + # Bank Journals + view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Cash Journal View')])[0] + view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Multi-Currency Cash Journal View')])[0] + ref_acc_bank = obj_multi.bank_account_view_id + + + #create the properties + property_obj = self.pool.get('ir.property') + fields_obj = self.pool.get('ir.model.fields') + + todo_list = [ + ('property_account_receivable','res.partner','account.account'), + ('property_account_payable','res.partner','account.account'), + ('property_account_expense_categ','product.category','account.account'), + ('property_account_income_categ','product.category','account.account'), + ('property_account_expense','product.template','account.account'), + ('property_account_income','product.template','account.account') + ] + for record in todo_list: + r = [] + r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id.id)]) + account = getattr(obj_multi, record[0]) + field = fields_obj.search(cr, uid, [('name','=',record[0]),('model','=',record[1]),('relation','=',record[2])]) + vals = { + 'name': record[0], + 'company_id': company_id.id, + 'fields_id': field[0], + 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False, + } + if r: + #the property exist: modify it + property_obj.write(cr, uid, r, vals) + else: + #create the property + property_obj.create(cr, uid, vals) + + fp_ids = obj_fiscal_position_template.search(cr, uid,[('chart_template_id', '=', obj_multi.id)]) + + if fp_ids: + for position in obj_fiscal_position_template.browse(cr, uid, fp_ids): + + vals_fp = { + 'company_id' : company_id.id, + 'name' : position.name, + } + new_fp = obj_fiscal_position.create(cr, uid, vals_fp) + + obj_tax_fp = self.pool.get('account.fiscal.position.tax') + obj_ac_fp = self.pool.get('account.fiscal.position.account') + + for tax in position.tax_ids: + vals_tax = { + 'tax_src_id' : tax_template_ref[tax.tax_src_id.id], + 'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False, + 'position_id' : new_fp, + } + obj_tax_fp.create(cr, uid, vals_tax) + + for acc in position.account_ids: + vals_acc = { + 'account_src_id' : acc_template_ref[acc.account_src_id.id], + 'account_dest_id' : acc_template_ref[acc.account_dest_id.id], + 'position_id' : new_fp, + } + obj_ac_fp.create(cr, uid, vals_acc) + + def execute(self, cr, uid, ids, context=None): + super(account_installer, self).execute(cr, uid, ids, context=context) + record = self.browse(cr, uid, ids, context=context)[0] + company_id = self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id + for res in self.read(cr,uid,ids): + if record.charts == 'configurable': + mod_obj = self.pool.get('ir.model.data') + fp = tools.file_open(opj('account','configurable_account_chart.xml')) + tools.convert_xml_import(cr, 'account', fp, {}, 'init',True, None) + fp.close() + self.generate_configurable_chart(cr, uid, ids, context=context) + obj_tax = self.pool.get('account.tax') + obj_product = self.pool.get('product.product') + ir_values = self.pool.get('ir.values') + s_tax = (res.get('sale_tax',0.0))/100 + p_tax = (res.get('purchase_tax',0.0))/100 + tax_val = {} + default_tax = [] + + pur_tax_parent = mod_obj._get_id(cr, uid, 'account', 'vat_code_base_purchases') + pur_tax_parent_id = mod_obj.read(cr, uid, [pur_tax_parent], ['res_id'])[0]['res_id'] + + sal_tax_parent = mod_obj._get_id(cr, uid, 'account', 'vat_code_base_sales') + sal_tax_parent_id = mod_obj.read(cr, uid, [sal_tax_parent], ['res_id'])[0]['res_id'] + + if s_tax*100 > 0.0: + vals_tax_code = { + 'name': 'VAT%s%%'%(s_tax*100), + 'code': 'VAT%s%%'%(s_tax*100), + 'company_id': company_id.id, + 'sign': 1, + 'parent_id':sal_tax_parent_id + } + new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals_tax_code) + sales_tax = obj_tax.create(cr, uid, + {'name':'VAT%s%%'%(s_tax*100), + 'description':'VAT%s%%'%(s_tax*100), + 'amount':s_tax, + 'base_code_id':new_tax_code, + 'tax_code_id':new_tax_code, + 'type_tax_use':'sale' + }) + tax_val.update({'taxes_id':[(6,0,[sales_tax])]}) + default_tax.append(('taxes_id',sales_tax)) + if p_tax*100 > 0.0: + vals_tax_code = { + 'name': 'VAT%s%%'%(p_tax*100), + 'code': 'VAT%s%%'%(p_tax*100), + 'company_id': company_id.id, + 'sign': 1, + 'parent_id':pur_tax_parent_id + } + new_tax_code = self.pool.get('account.tax.code').create(cr,uid,vals_tax_code) + purchase_tax = obj_tax.create(cr, uid, + {'name':'VAT%s%%'%(p_tax*100), + 'description':'VAT%s%%'%(p_tax*100), + 'amount':p_tax, + 'base_code_id':new_tax_code, + 'tax_code_id':new_tax_code, + 'type_tax_use':'purchase' + }) + tax_val.update({'supplier_taxes_id':[(6,0,[purchase_tax])]}) + default_tax.append(('supplier_taxes_id',purchase_tax)) + if len(tax_val): + product_ids = obj_product.search(cr,uid, []) + for product in obj_product.browse(cr, uid, product_ids): + obj_product.write(cr, uid, product.id, tax_val) + for name, value in default_tax: + ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value]) + + if 'date_start' in res and 'date_stop' in res: + name = code = res['date_start'][:4] + if int(name) != int(res['date_stop'][:4]): + name = res['date_start'][:4] +'-'+ res['date_stop'][:4] + code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4] + res_obj = self.pool.get('account.fiscalyear') + vals = {'name':name, + 'code':code, + 'date_start':res['date_start'], + 'date_stop':res['date_stop'], + } + period_id = res_obj.create(cr, uid, vals, context=context) + if res['period'] == 'month': + res_obj.create_period(cr, uid, [period_id]) + elif res['period'] == '3months': + res_obj.create_period3(cr, uid, [period_id]) + def modules_to_install(self, cr, uid, ids, context=None): modules = super(account_installer, self).modules_to_install( cr, uid, ids, context=context) - chart = self.read(cr, uid, ids, ['charts'], context=context)[0]['charts'] self.logger.notifyChannel( @@ -76,3 +492,18 @@ class account_installer(osv.osv_memory): account_installer() + +class account_bank_accounts_wizard(osv.osv_memory): + _name='account.bank.accounts.wizard' + + _columns = { + 'acc_name':fields.char('Account Name.', size=64, required=True), + 'bank_account_id':fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True), + 'currency_id':fields.many2one('res.currency', 'Currency'), + 'account_type':fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32), + } + _defaults = { + 'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id, + } + +account_bank_accounts_wizard() diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml index bb0738dbb65..98fcb8fa370 100644 --- a/addons/account/project/analytic_account_demo.xml +++ b/addons/account/project/analytic_account_demo.xml @@ -1,26 +1,35 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> + <record id="analytic_root" model="account.analytic.account"> + <field name="name">Analytic Chart</field> + <field name="code">0</field> + </record> <record id="analytic_absences" model="account.analytic.account"> <field name="name">Leaves</field> <field name="code">1</field> + <field name="parent_id" ref="analytic_root"/> </record> <record id="analytic_internal" model="account.analytic.account"> <field name="name">Internal</field> <field name="code">2</field> + <field name="parent_id" ref="analytic_root"/> </record> <record id="analytic_our_super_product" model="account.analytic.account"> <field name="name">Our Super Product</field> <field name="code">100</field> <field name="state">open</field> + <field name="parent_id" ref="analytic_root"/> </record> <record id="analytic_project_1" model="account.analytic.account"> <field name="name">Project 1</field> <field name="code">101</field> + <field name="parent_id" ref="analytic_root"/> </record> <record id="analytic_project_2" model="account.analytic.account"> <field name="name">Project 2</field> <field name="code">102</field> + <field name="parent_id" ref="analytic_root"/> </record> <record id="analytic_journal_trainings" model="account.analytic.account"> <field name="name">Training</field> diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 656e05e2a9b..e1aa3b6510a 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -65,8 +65,6 @@ "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0 "access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1 -"access_account_config_wizard_account_manager","account.config.wizard account manager","model_account_config_wizard","group_account_manager",1,1,1,1 -"access_account_config_wizard_system_manager","account.config.wizard system manager","model_account_config_wizard","base.group_system",1,1,1,1 "access_account_add_tmpl_wizard_account_manager","account.addtmpl.wizard account manager","model_account_addtmpl_wizard","group_account_manager",1,1,1,1 "access_account_add_tmpl_wizard_system_manager","account.addtmpl.wizard system manager","model_account_addtmpl_wizard","base.group_system",1,1,1,1 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0 diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml index ebf304100fd..b94afdc9292 100644 --- a/addons/account_analytic_default/account_analytic_default_view.xml +++ b/addons/account_analytic_default/account_analytic_default_view.xml @@ -54,7 +54,8 @@ id="analytic_rule_action_partner" res_model="account.analytic.default" src_model="res.partner" - domain="[('partner_id','=',active_id)]"/> + domain="[('partner_id','=',active_id)]" + groups="base.group_extended"/> <act_window name="Analytic Rules" id="analytic_rule_action_user" @@ -66,7 +67,8 @@ res_model="account.analytic.default" id="analytic_rule_action_product" src_model="product.product" - domain="[('product_id','=',active_id)]"/> + domain="[('product_id','=',active_id)]" + groups="base.group_extended"/> </data> </openerp> diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 0f376ea4069..0d0a65b3644 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -11,6 +11,9 @@ <form position="attributes"> <attribute name="string">Install Extra Modules</attribute> </form> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string">Install more modules. A few modules are proposed according to the Association Profile you selected. You will be able to install them based on our requirements.</attribute> @@ -45,5 +48,16 @@ <field name="action_id" ref="action_config_install_module"/> <field name="sequence">3</field> </record> + <record id="association_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">association_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py index e4a4c3c80d8..3b78c6cb557 100644 --- a/addons/base_setup/__init__.py +++ b/addons/base_setup/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). # @@ -15,16 +15,21 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## import installer import todo +import gtk_contact_form import wizard - -from osv import osv +import os +import base64 +import random +import tools +from osv import fields, osv import netsvc +from tools.translate import _ class base_setup_config_choice(osv.osv_memory): """ @@ -32,6 +37,29 @@ class base_setup_config_choice(osv.osv_memory): _name = 'base.setup.config' logger = netsvc.Logger() + def _get_image(self, cr, uid, context=None): + file_no = str(random.randint(1,3)) + path = os.path.join('base','res','config_pixmaps/%s.png'%file_no) + file_data = tools.file_open(path,'rb').read() + return base64.encodestring(file_data) + + def get_users(self, cr, uid, context={}): + user_obj = self.pool.get('res.users') + user_ids = user_obj.search(cr, uid, []) + users = user_obj.browse(cr, uid, user_ids) + user_str = '\n'.join(map(lambda x: ' - %s: %s / %s' % (x.name, x.login, x.password), users)) + return _('The following users have been installed on your database: \n')+ user_str + + _columns = { + 'installed_users':fields.text('Installed Users', readonly=True), + 'config_logo' : fields.binary('Image', readonly=True), + } + + _defaults = { + 'installed_users':get_users, + 'config_logo' : _get_image + } + def set_default_menu(self, cr, uid, menu, context=None): user = self.pool.get('res.users')\ .browse(cr, uid, uid, context=context) diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index c6dd64d7bcc..ee0cc6a8f56 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -43,7 +43,7 @@ 'init_xml': ['base_setup_data.xml'], 'update_xml': ['security/ir.model.access.csv', 'base_setup_installer.xml', - 'base_setup_todo.xml',], + 'base_setup_todo.xml','gtk_contact_form.xml'], 'demo_xml': ['base_setup_demo.xml'], 'installable': True, 'active': True, diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml index 0feb39bd563..024accc77ce 100644 --- a/addons/base_setup/base_setup_data.xml +++ b/addons/base_setup/base_setup_data.xml @@ -6,25 +6,29 @@ <field name="model">base.setup.config</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Setup"> - <group colspan="4"> - <image name="gtk-dialog-info"/> - <group colspan="2" col="4"> - <separator colspan="4" string="Installation Done"/> - <label align="0.0" colspan="4" - string="Your new database is now fully installed."/> - <label align="0.0" colspan="4" - string="You can start configuring the system or connect directly to the database using the default setup."/> - </group> - </group> - <separator string="" colspan="4"/> - <button name="menu" icon="gtk-ok" type="object" - string="Use Directly"/> - <button name="config" icon="gtk-go-forward" type="object" - string="Start Configuration"/> - </form> - </field> - </record> + <form string="Setup"> + <group colspan="4" col="8"> + <group colspan="3" width="200"> + <field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/> + <newline/> + <label align="0.0" string="You can start configuring the system or connect directly to the database as an administrator." width="200" colspan="2"/> + </group> + <separator string="" position="vertical" colspan="1" rowspan="8"/> + <group colspan="4" width="400"> + <separator string="Installation Done" colspan="4"/> + <label align="0.0" string="Your new database is now fully installed." colspan="4"/> + <field name="installed_users" nolabel= "1" colspan="4"/> + </group> + </group> + <group colspan="8" col="8"> + <separator string="" colspan="8"/> + <label string="" colspan="6"/> + <button name="menu" icon="gtk-ok" type="object" string="Use Directly" colspan="1"/> + <button name="config" icon="gtk-go-forward" type="object" string="Start Configuration" colspan="1"/> + </group> + </form> + </field> + </record> <record id="action_base_setup" model="ir.actions.act_window"> <field name="name">Setup</field> diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index 108004d4a93..7a543f5466f 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -8,31 +8,34 @@ <field name="arch" type="xml"> <data> <form position="attributes"> - <attribute name="string">Base Setup Modules Installation</attribute> + <attribute name="string">Install OpenERP Modules</attribute> </form> - <separator string="title" position="attributes"> - <attribute name="string">Install Modules</attribute> - </separator> <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string" - >Now that OpenERP is installed, we have selected applications commonly useful to users which you can install directly, as well as sets of applications for more specific types or groups of businesses (the vertical modules). + >Now that OpenERP is installed, We have selected applications commonly useful to users which you can install directly, as well as sets of applications for more specific types or groups of businesses (the vertical modules). If you don't think you need any of these right now, you can easily install them later on.</attribute> </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + <attribute name='rowspan'>15</attribute> + </xpath> + <separator string="title" position="attributes"> + <attribute name="string">Install Generic Modules</attribute> + </separator> <group colspan="8"> - <separator string="Generic Modules" colspan="4"/> - <field name="crm"/> <field name="sale"/> - <field name="project"/> <field name="knowledge"/> - <field name="stock"/> <field name="mrp"/> - <field name="account"/> <field name="purchase"/> - <field name="hr"/> <field name="point_of_sale"/> - <field name="marketing"/> <field name="misc_tools"/> - <field name="report_designer"/> <field name="thunderbird"/> - <separator string="Vertical Modules" colspan="4"/> - <field name="profile_association"/> - <field name="profile_auction"/> - <field name="profile_bookstore"/> + <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)" groups="base.group_extended"/> + <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)" groups="base.group_extended"/> <field name="misc_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <separator string="Install Specific Business Modules" colspan="4"/> + <field name="profile_association" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <field name="profile_auction" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> + <field name="profile_bookstore" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,misc_tools,report_designer,profile_association,profile_auction,profile_bookstore)"/> </group> </data> </field> @@ -52,5 +55,16 @@ If you don't think you need any of these right now, you can easily install them <field name="action_id" ref="action_base_setup_installer"/> <field name="sequence">2</field> </record> + <record id="base_setup_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">base_setup_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_base_setup_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 08691e60d35..97c9ea0d301 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -10,33 +10,45 @@ <form position="attributes"> <attribute name="string">Main Company Setup</attribute> </form> - + <xpath expr="//label[@string='description']" position="attributes"> + <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute> + </xpath> + <xpath expr='//separator[@string="title"]' position='attributes'> + <attribute name='string'>Configure Your Company</attribute> + </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='rowspan'>25</attribute> + <attribute name='string'></attribute> + </xpath> <group string="res_config_contents" position="replace"> - <field name="company_id" invisible="1"/> - - <separator string="Configure Your Company" colspan="4"/> - <field name="name" colspan="4" required="True"/> - <newline/> - <field name="street"/> - <field name="street2"/> - <field name="zip"/> - <field name="city"/> - <field name="country_id"/> - <field name="state_id"/> - <field name="email"/> - <field name="phone"/> - <field name="currency"/> - - <separator string="Report Information" colspan="4"/> - <field name="rml_header1" colspan="4"/> - <field name="rml_footer1" colspan="4"/> - <field name="rml_footer2" colspan="4"/> + <group colspan="5"> + <group colspan="2"> + <field name="company_id" invisible="1"/> + <field name="name" required="True"/><field name="account_no"/> + <field name="currency" widget="selection"/><field name="street"/> + <field name="zip"/> + <field name="street2"/> + <field name="city"/> + <field name="country_id"/> + <field name="state_id"/> + <field name="email"/> + <field name="phone"/> + <field name="website"/> + </group> + <newline/> + <group colspan="2" groups="base.group_extended"> + <separator string="Report Information" colspan="4"/> + <field name="rml_header1" colspan="5"/> + <field name="rml_footer1" colspan="5"/> + <field name="rml_footer2" colspan="5"/> - <separator colspan="4" - string="Your Logo - Use a size of about 450x150 pixels."/> - <field colspan="4" name="logo" widget="image" - nolabel="1"/> - </group> + <separator colspan="4" + string="Your Logo - Use a size of about 450x150 pixels."/> + <field colspan="5" name="logo" widget="image" + nolabel="1"/> + </group> + </group> + </group> <xpath expr='//button[@name="action_skip"]' position='replace'/> </data> diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py new file mode 100644 index 00000000000..c13ae39aee3 --- /dev/null +++ b/addons/base_setup/gtk_contact_form.py @@ -0,0 +1,100 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## +from operator import itemgetter + +from osv import osv, fields +import netsvc +import tools +from tools import misc + +class base_gtkcontactform(osv.osv_memory): + """ + """ + _name = 'base.gtkcontactform' + _inherit = 'res.config' + logger = netsvc.Logger() + + def default_get(self, cr, uid, fields_list=None, context=None): + ''' set email and phone number selected in the previous company information + form ''' + defaults = super(base_gtkcontactform, self)\ + .default_get(cr, uid, fields_list=fields_list, context=context) + company_id = self.pool.get('base.setup.company').search(cr, uid, []) + company = self.pool.get('base.setup.company').read(cr, uid, company_id) + company = company and company[0] or False + if company: + defaults.update({'email':company.get('email',''), + 'phone': company.get('phone','')}) + return defaults + + _columns = { + 'name':fields.char('Your Name', size=64), + 'job':fields.char('Job Title', size=64,), + 'email':fields.char('E-mail', size=64), + 'phone':fields.char('Phone', size=64), + 'total_employees':fields.selection([('1-5','1-5'),('5-20','5-20'),('20-100','20-100'),('100-500','100-500'),('500','500+')], 'No Of Employees', size=32), + 'industry':fields.selection([('apparel','Apparel'),('banking','Banking'),('biotechnology','Biotechnology'),('chemicals','Chemicals'),('communications','Communications'), + ('construction','Construction'),('consulting','Consulting'),('education','Education'),('electronics','Electronics'),('energy','Energy'),('engineering','Engineering'), + ('entertainment','Entertainment'),('environmental','Environmental'),('finance','Finance'),('government','Government'),('healthcare','Healthcare'),('hospitality','Hospitality'), + ('insurance','Insurance'),('machinery','Machinery'),('manufacturing','Manufacturing'),('media','Media'),('notforprofit','Not For Profit'), + ('recreation','Recreation'),('retail','Retail'),('shipping','Shipping'),('technology','Technology'),('telecommunications','Telecommunications'), + ('transportation','Transportation'),('utilities','Utilities'),('other','Other'), + ], 'Industry', size=32), + 'use_openerp':fields.boolean('We plan to use OpenERP'), + 'already_using_openerp':fields.boolean('Already using OpenERP'), + 'sell_openerp':fields.boolean('Plan to sell OpenERP'), + 'already_selling__openerp':fields.boolean('Already selling OpenERP'), + + 'features':fields.boolean('The features of OpenERP'), + 'saas':fields.boolean('OpenERP Online Solutions (SaaS)'), + 'partners_program':fields.boolean('OpenERP Partners Program (for integrators)'), + 'support':fields.boolean('Support and Maintenance Solutions'), + 'training':fields.boolean('OpenERP Training Program'), + 'other':fields.boolean('Other'), + 'ebook':fields.boolean('ebook'), + 'updates':fields.boolean('Updates'), + 'contact_me':fields.boolean('Contact Me'), + } + def execute(self, cr, uid, ids, context=None): + company_id = self.pool.get('base.setup.company').search(cr, uid, []) + company_data = self.pool.get('base.setup.company').read(cr, uid, company_id) + company_data = company_data and company_data[0] or False + country1 = '' + if company_data and company_data.get('country_id', False): + country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'])['name'] + for res in self.read(cr, uid, ids): + email = res.get('email','') + result = "\ncompany: "+ str(company_data.get('name','')) + result += "\nname: " + str(res.get('name','')) + result += "\nphone: " + str(res.get('phone','')) + result += "\ncity: " + str(company_data.get('city','')) + result += "\ncountry: " + str(country) + result += "\nindustry: " + str(res.get('industry', '')) + result += "\ntotal_employees: " + str(res.get('total_employees', '')) + result += "\nplan_use: " + str(res.get('use_openerp', False)) + result += "\nsell_openerp: " + str(res.get('sell_openerp', False)) + result += "\nebook: " + str(res.get('ebook',False)) + result += "\ngtk: " + str(True) + misc.upload_data(email, result, type='SURVEY') + + + +base_gtkcontactform()
\ No newline at end of file diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml new file mode 100644 index 00000000000..c5578f9bc9a --- /dev/null +++ b/addons/base_setup/gtk_contact_form.xml @@ -0,0 +1,79 @@ +<openerp> + <data> + <record id="view_base_setup_contact" model="ir.ui.view"> + <field name="name">Contact information</field> + <field name="model">base.gtkcontactform</field> + <field name="type">form</field> + <field name="inherit_id" ref="base.res_config_view_base"/> + <field name="arch" type="xml"> + <data> + <form position="attributes"> + <attribute name="string">Contact Information</attribute> + </form> + <xpath expr="//label[@string='description']" position="attributes"> + <attribute name="string">Information about you and the company you are related too. The Basic information related to the company has already been collected and some more information required by you to fill.</attribute> + </xpath> + <xpath expr='//separator[@string="title"]' position='attributes'> + <attribute name='string'>Would you like more information or documentation ?</attribute> + <attribute name='colspan'>4</attribute> + </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='rowspan'>22</attribute> + <attribute name='string'></attribute> + </xpath> + <group string="res_config_contents" position="replace"> + <group colspan="4" height="450" width="600"> + <group colspan="4"> + <field name="contact_me" nolabel="1"/> + <label align="0.0" string="I accept to be contacted by OpenERP." colspan="3"/> + <field name="ebook" nolabel="1"/> + <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/> + <field name="updates" nolabel="1"/> + <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/> + </group> + <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}"> + <separator colspan="4" string="About You"/> + <field name="name" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/> + <field name="job" colspan="2"/> + <field name="email" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/> + <field name="phone" colspan="2" attrs="{'required':[('ebook','=',True),('updates','=',True)]}"/> + <field name="total_employees" colspan="2"/> + <field name="industry" colspan="2"/> + </group> + <group colspan="4" attrs="{'invisible':[('ebook','=',False),('updates','=',False)]}"> + <separator string="Your projects with OpenERP" colspan="4"/> + <field name="use_openerp" align="0.0" colspan="1"/> + <field name="already_using_openerp" align="0.0" colspan="1"/> + <field name="sell_openerp" align="0.0" colspan="1"/> + <field name="already_selling__openerp" align="0.0" colspan="1"/> + <separator colspan="4" string="You would like to know more about"/> + <field name="features" align="0.0" colspan="1"/> + <field name="training" align="0.0" colspan="1"/> + <field name="saas" align="0.0" colspan="1"/> + <field name="support" align="0.0" colspan="1"/> + <field name="partners_program" align="0.0" colspan="1"/> + <field name="other" align="0.0" colspan="1"/> + </group> + </group> + </group> + </data> + </field> + </record> + + <record id="action_base_contact" model="ir.actions.act_window"> + <field name="name">Setup contact information</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">base.gtkcontactform</field> + <field name="view_id" ref="view_base_setup_contact"/> + <field name="view_type">form</field> + <field name="view_mode">form</field> + <field name="target">new</field> + </record> + + <record id="base_setup_contact_todo" model="ir.actions.todo"> + <field name="action_id" ref="action_base_contact"/> + <field name="sequence">1</field> + <field name="restart">never</field> + </record> + </data> +</openerp> diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 07c95957176..b7123b1ba38 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -69,7 +69,7 @@ class base_setup_installer(osv.osv_memory): help="Helps you manage your marketing campaigns step by step."), 'misc_tools':fields.boolean('Miscellaneous Tools', help="Lets you install various interesting but non-essential " - "tools."), + "tools like Survey, Lunch,..."), 'report_designer':fields.boolean('Advanced Reporting', help="Lets you install various tools to simplify and enhance " "OpenERP's report creation."), @@ -91,5 +91,25 @@ class base_setup_installer(osv.osv_memory): _defaults = { 'crm': True, } + + + def onchange_moduleselection(self, cr, uid, ids, *args): + progress = self._progress(cr, uid) - round((len(filter(lambda x: x==1, args)))*80/len(args)) + if progress <= 10.0: + progress = 10.0 + return {'value':{'progress':progress}} + + def modules_to_install(self, cr, uid, ids, context=None): + modules = super(base_setup_installer, self).modules_to_install(cr, uid, ids, context=context) + interface_id = self.pool.get('res.config.view').search(cr, uid, []) + interface = self.pool.get('res.config.view').read(cr, uid, interface_id)[0] + modules_selected = self.read(cr, uid, ids)[0] + added_modules = [] + if interface.get('view', '') == 'simple' : + if modules_selected.get('mrp', False): + added_modules.append('mrp_jit') + if modules_selected.get('knowledge', False): + added_modules.append('document_ftp') + return modules | set(added_modules) base_setup_installer() diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py index d23ac71d60b..c072891179a 100644 --- a/addons/base_setup/todo.py +++ b/addons/base_setup/todo.py @@ -48,23 +48,23 @@ class base_setup_company(osv.osv_memory): cr, uid, 'res.country.state', context=context) def _get_all_countries(self, cr, uid, context=None): return self._get_all(cr, uid, 'res.country', context=context) - def _get_all_currencies(self, cr, uid, context=None): - return self._get_all(cr, uid, 'res.currency', context=context) def default_get(self, cr, uid, fields_list=None, context=None): """ get default company if any, and the various other fields from the company's fields """ + base_mod = self.pool.get('ir.module.module').search(cr, uid, [('name','ilike','base')]) + base_mod_rec = self.pool.get('ir.module.module').browse(cr, uid, base_mod)[0] defaults = super(base_setup_company, self)\ .default_get(cr, uid, fields_list=fields_list, context=context) - companies = self.pool.get('res.company') company_id = companies.search(cr, uid, [], limit=1, order="id") if not company_id or 'company_id' not in fields_list: return defaults company = companies.browse(cr, uid, company_id[0]) - defaults['company_id'] = company.id + if not base_mod_rec.demo: + return defaults defaults['currency'] = company.currency_id.id for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']: defaults[field] = company[field] @@ -86,11 +86,11 @@ class base_setup_company(osv.osv_memory): 'street2':fields.char('Street 2', size=128), 'zip':fields.char('Zip Code', size=24), 'city':fields.char('City', size=128), - 'state_id':fields.selection(_get_all_states, 'States'), - 'country_id':fields.selection(_get_all_countries, 'Countries'), + 'state_id':fields.selection(_get_all_states, 'State'), + 'country_id':fields.selection(_get_all_countries, 'Country'), 'email':fields.char('E-mail', size=64), 'phone':fields.char('Phone', size=64), - 'currency':fields.selection(_get_all_currencies, 'Currency', required=True), + 'currency':fields.many2one('res.currency', 'Currency', required=True), 'rml_header1':fields.char('Report Header', size=200, help='''This sentence will appear at the top right corner of your reports. We suggest you to put a slogan here: @@ -104,6 +104,8 @@ Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07''') We suggest you to put bank information here: IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), 'logo':fields.binary('Logo'), + 'account_no':fields.char('Account No', size=64), + 'website': fields.char('Web', size=64), } def execute(self, cr, uid, ids, context=None): @@ -112,7 +114,6 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), if not getattr(payload, 'company_id', None): raise ValueError('Case where no default main company is setup ' 'not handled yet') - company = payload.company_id company.write({ 'name':payload.name, @@ -120,10 +121,13 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701'''), 'rml_footer1':payload.rml_footer1, 'rml_footer2':payload.rml_footer2, 'logo':payload.logo, + 'currency_id':payload.currency.id, + 'account_no':payload.account_no, }) company.partner_id.write({ 'name':payload.name, + 'website':payload.website, }) address_data = { diff --git a/addons/board_crm/board_crm_statistical_view.xml b/addons/board_crm/board_crm_statistical_view.xml index 002bd48448f..ba952a87e70 100644 --- a/addons/board_crm/board_crm_statistical_view.xml +++ b/addons/board_crm/board_crm_statistical_view.xml @@ -21,7 +21,7 @@ <field name="model">crm.lead.report</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Opportunity by Sections and Categories" type="bar" orientation="horizontal"> + <graph string="Opportunity by Sales Team and Categories" type="bar" orientation="horizontal"> <field name="categ_id"/> <field name="nbr" operator="+"/> </graph> diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 42d7a9f9721..992fe2464c5 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -517,7 +517,7 @@ class crm_case_log(osv.osv): _columns = { 'name': fields.char('Status', size=64), 'date': fields.datetime('Date'), - 'section_id': fields.many2one('crm.case.section', 'Section'), + 'section_id': fields.many2one('crm.case.section', 'Sales Team'), 'user_id': fields.many2one('res.users', 'User Responsible', readonly=True), 'model_id': fields.many2one('ir.model', "Model"), 'res_id': fields.integer('Resource ID'), diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index 562274ee301..3f8e1bd1fde 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -91,6 +91,12 @@ action="crm_case_categ_meet" parent="menu_meeting_sale" sequence="1" /> + <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc"> + <field name="name">Calendar</field> + <field name="resource">ir.ui.menu</field> + <field name="user_id" ref="base.user_root"/> + <field name="res_id" ref="crm.menu_crm_case_categ_meet"/> + </record> <record id="action_view_attendee_form" model="ir.actions.act_window"> <field name="name">Meeting Invitations</field> <field name="type">ir.actions.act_window</field> diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index 0413e18d7b9..edf10eaae18 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -101,7 +101,7 @@ <group col="2" colspan="2"> <separator colspan="2" string="Categorization"/> <field name="section_id" colspan="1" widget="selection"/> - <field name="categ_id" select="1" + <field name="categ_id" select="1" groups="base.group_extended" string="Category" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]" /> </group> @@ -225,7 +225,7 @@ <field name="planned_revenue" sum="Total of Planned Revenue"/> <field name="probability" widget="progressbar" avg="Avg. of Probability"/> <field name="date_action"/> - <field name="section_id"/> + <field name="section_id" groups="base.group_extended"/> <field name="user_id"/> <field name="priority"/> <field name="state"/> @@ -289,7 +289,6 @@ /> <separator orientation="vertical"/> <field name="name" string="Opportunity"/> - <field name="partner_id"/> <field name="user_id" widget="selection"> <filter icon="terp-partner" domain="[('user_id','=',uid)]" @@ -319,7 +318,7 @@ <filter string="Partner" icon="terp-crm" domain="[]" context="{'group_by':'partner_id'}" /> <filter string="Salesman" icon="terp-crm" - domain="[]" context="{'group_by':'user_id'}" /> + domain="[('user_id','=',uid)]" context="{'group_by':'user_id'}" /> <separator orientation="vertical" /> <filter string="Creation" icon="terp-project" domain="[]" context="{'group_by':'create_date'}" /> diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml index 9535992ab6a..2992959bdd0 100644 --- a/addons/crm/crm_report_view.xml +++ b/addons/crm/crm_report_view.xml @@ -9,7 +9,7 @@ <field name="model">report.crm.case.section.categ2</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Cases by Section and Type"> + <tree string="Cases by Team and Type"> <field name="name"/> <field name="month"/> <field name="user_id"/> @@ -31,7 +31,7 @@ <field name="model">report.crm.case.section.categ2</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Cases by Section and Category2"> + <form string="Cases by Team and Category2"> <field name="name"/> <field name="month"/> <field name="user_id"/> @@ -49,11 +49,11 @@ <!-- Cases by section and category2 of case Graph View --> <record model="ir.ui.view" id="view_crm_case_section_categ_graph"> - <field name="name">CRM Report - Sections and Type(Graph)</field> + <field name="name">CRM Report - Teams and Type(Graph)</field> <field name="model">report.crm.case.section.categ2</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Cases by Section and Type" type="bar" orientation="horizontal"> + <graph string="Cases by Teams and Type" type="bar" orientation="horizontal"> <field name="category2_id"/> <field name="amount_revenue" operator="+"/> <field name="section_id" group="True"/> @@ -64,18 +64,18 @@ <!-- Cases by section and category2 of case Search View --> <record id="view_crm_case_section_categ_filter" model="ir.ui.view"> - <field name="name">CRM Report - Sections and Type(Select)</field> + <field name="name">CRM Report - Teams and Type(Select)</field> <field name="model">report.crm.case.section.categ2</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Cases by Section and Type"> + <search string="Cases by Team and Type"> <group col="10" colspan="4"> <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" - help="Cases by Section and Type for this year" /> + help="Cases by Team and Type for this year" /> <filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" - help="Cases by Section and Type for this month" /> + help="Cases by Team and Type for this month" /> <separator orientation="vertical"/> <field name="section_id" select="1" widget="selection" /> @@ -99,11 +99,11 @@ <!-- Cases by section and stage Tree View --> <record model="ir.ui.view" id="view_crm_case_section_stage_tree"> - <field name="name">CRM Report - Sections and Stage(Tree)</field> + <field name="name">CRM Report - Teams and Stage(Tree)</field> <field name="model">report.crm.case.section.stage</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Cases by Section and Stage"> + <tree string="Cases by Team and Stage"> <field name="name"/> <field name="month"/> <field name="user_id"/> @@ -120,11 +120,11 @@ <!-- Cases by section and stage Form View --> <record model="ir.ui.view" id="view_crm_case_section_stage_form"> - <field name="name">CRM Report - Sections and Stage(Form)</field> + <field name="name">CRM Report - Teams and Stage(Form)</field> <field name="model">report.crm.case.section.stage</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Cases by Section and Stage"> + <form string="Cases by Team and Stage"> <field name="name"/> <field name="month"/> <field name="user_id"/> @@ -141,11 +141,11 @@ <!-- Cases by section and stage Graph View --> <record model="ir.ui.view" id="view_crm_case_section_stage_graph"> - <field name="name">CRM Report - Sections and Stage(Graph)</field> + <field name="name">CRM Report - Teams and Stage(Graph)</field> <field name="model">report.crm.case.section.stage</field> <field name="type">graph</field> <field name="arch" type="xml"> - <graph string="Cases by Section and Stage" type="bar" orientation="horizontal"> + <graph string="Cases by Team and Stage" type="bar" orientation="horizontal"> <field name="stage_id"/> <field name="amount_revenue" operator="+"/> <field name="section_id" group="True"/> @@ -156,18 +156,18 @@ <!-- Cases by section and stage Search View --> <record id="view_crm_case_section_stage_filter" model="ir.ui.view"> - <field name="name">CRM Report - Sections and Stage(Select)</field> + <field name="name">CRM Report - Teams and Stage(Select)</field> <field name="model">report.crm.case.section.stage</field> <field name="type">search</field> <field name="arch" type="xml"> - <search string="Cases by Section and Stage"> + <search string="Cases by Team and Stage"> <group col="8" colspan="4"> <filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" - help="Cases by Section and Stage for this year" /> + help="Cases by Team and Stage for this year" /> <filter string="This Month" icon="terp-hr" domain="[('month','=',time.localtime()[1])]" - help="Cases by Section and Stage for this month" /> + help="Cases by Team and Stage for this month" /> <separator orientation="vertical"/> <field name="section_id" select="1" widget="selection"/> <field name="nbr" select="1"/> @@ -189,11 +189,11 @@ <!-- Cases by section, category and stage Tree View --> <record model="ir.ui.view" id="view_crm_case_section_categ_stage_tree"> - <field name="name">CRM Report - Section, Category and Stage(Tree)</field> + <field name="name">CRM Report - Team, Category and Stage(Tree)</field> <field name="model">report.crm.case.section.categ.stage</field> <field name="type">tree</field> <field name="arch" type="xml"> - <tree string="Cases by Section, Category and Stage"> + <tree string="Cases by Team, Category and Stage"> <field name="name"/> <field name="month"/> <field name="user_id"/> @@ -210,7 +210,7 @@ <!-- Cases by section, category and stage Form View --> <record model="ir.ui.view" id="view_crm_case_section_categ_stage_form"> - <field name="name">CRM Report - Section, Category and Stage(Form)</field> + <field name="name">CRM Report - Team, Category and Stage(Form)</field> <field name="model">report.crm.case.section.categ.stage</field> <field name="type">form</field> <field name="arch" type="xml"> diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 4e8366ae29e..3f308f3cd6d 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -2,7 +2,7 @@ <openerp> <data> <menuitem id="base.menu_crm_configuration" name="Cases" - parent="base.menu_base_config" sequence="0"/> + parent="base.menu_base_config" sequence="0" groups="base.group_extended"/> <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8" /> @@ -120,7 +120,7 @@ <field name="view_id" ref="crm_case_stage_tree"/> </record> - <menuitem id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration"/> + <menuitem id="menu_crm_case_stage" name="Stages" parent="base.menu_crm_configuration" groups="base.group_extended"/> <!-- Case Categories Form View --> @@ -160,7 +160,7 @@ <field name="view_type">form</field> <field name="view_id" ref="crm_case_categ_tree-view"/> </record> - <menuitem id="menu_crm_case_categ" name="Categories" parent="base.menu_crm_configuration"/> + <menuitem id="menu_crm_case_categ" name="Categories" parent="base.menu_crm_configuration" groups="base.group_extended"/> <menuitem action="crm_case_section_act" id="menu_crm_case_section_act" @@ -206,7 +206,7 @@ <field name="view_id" ref="crm_case_resource_type_tree"/> </record> <menuitem id="menu_crm_case_resource_type" name="Resource Type" - parent="base.menu_crm_configuration" /> + parent="base.menu_crm_configuration" groups="base.group_extended" /> <record id="crm_case_section_act_tree" model="ir.actions.act_window"> <field name="name">Cases by section</field> diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po index aa4282ecc39..33979fe06f8 100644 --- a/addons/crm/i18n/pl.po +++ b/addons/crm/i18n/pl.po @@ -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: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-04-12 19:39+0000\n" -"Last-Translator: drygal <Unknown>\n" +"PO-Revision-Date: 2010-05-12 20:13+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-04-17 04:02+0000\n" +"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -307,7 +307,7 @@ msgstr "" #. module: crm #: view:crm.meeting:0 msgid "Exception Dates" -msgstr "" +msgstr "Daty wyjątków" #. module: crm #: selection:crm.case.rule,trg_date_type:0 @@ -365,12 +365,12 @@ msgstr "Potencjalny partner" #: view:crm.fundraising:0 #: view:crm.opportunity:0 msgid "Description Information" -msgstr "" +msgstr "Informacja opisowa" #. module: crm #: view:crm.lead:0 msgid "Contact Name" -msgstr "" +msgstr "Nazwa kontaktu" #. module: crm #: selection:crm.lead.opportunity_set,create_partner,action:0 @@ -391,12 +391,12 @@ msgstr "" #: view:crm.opportunity:0 #: view:crm.phonecall:0 msgid "Contact" -msgstr "" +msgstr "Kontakt" #. module: crm #: view:crm.job:0 msgid "Next Interview" -msgstr "" +msgstr "Następna rozmowa kwalifikacyjna" #. module: crm #: field:crm.case.rule,regex_history:0 @@ -457,18 +457,18 @@ msgstr "" #. module: crm #: model:crm.case.stage,name:crm.stage_lead6 msgid "Dead" -msgstr "" +msgstr "Martwe" #. module: crm #: view:crm.meeting:0 msgid "Confirm Meeting" -msgstr "" +msgstr "Potwierdź spotkanie" #. module: crm #: model:crm.case.categ,name:crm.categ_lead1 #: model:crm.case.categ,name:crm.categ_oppor1 msgid "Existing Customer" -msgstr "" +msgstr "Istniejący klient" #. module: crm #: model:crm.case.category2,name:crm.category_meet2 @@ -504,7 +504,7 @@ msgstr "" #. module: crm #: field:crm.meeting,class:0 msgid "Privacy" -msgstr "" +msgstr "Prywatność" #. module: crm #: view:crm.case.rule:0 @@ -519,7 +519,7 @@ msgstr "" #: view:crm.lead:0 #: view:crm.opportunity:0 msgid "Action Information" -msgstr "" +msgstr "Informacja o akcji" #. module: crm #: view:crm.case.rule:0 @@ -537,7 +537,7 @@ msgstr "" #. module: crm #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: crm #: view:crm.case.rule:0 @@ -572,12 +572,12 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "August" -msgstr "" +msgstr "Sierpień" #. module: crm #: view:crm.meeting:0 msgid "Meetings Tree" -msgstr "" +msgstr "Drzewo spotkań" #. module: crm #: code:addons/crm/crm.py:0 @@ -594,7 +594,7 @@ msgstr "" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_case_categ_meet msgid "All Meetings" -msgstr "" +msgstr "Wszystkie spotkania" #. module: crm #: model:ir.module.module,shortdesc:crm.module_meta_information @@ -613,7 +613,7 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "June" -msgstr "" +msgstr "Czerwiec" #. module: crm #: field:crm.segmentation,som_interval_default:0 @@ -641,7 +641,7 @@ msgstr "Pozwól usuwać" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "October" -msgstr "" +msgstr "Październik" #. module: crm #: model:crm.case.stage,name:crm.stage_oppor3 @@ -666,7 +666,7 @@ msgstr "" #. module: crm #: help:crm.case.section,calendar:0 msgid "Allows to show calendar" -msgstr "" +msgstr "Pozwala pokazać kalendarz" #. module: crm #: view:crm.job:0 @@ -674,13 +674,13 @@ msgstr "" #: view:crm.opportunity:0 #: view:crm.phonecall:0 msgid " Today " -msgstr "" +msgstr " Dzisiaj " #. module: crm #: wizard_view:crm.job.reschedule_phone_call,init:0 #: wizard_view:crm.opportunity.reschedule_phone_call,init:0 msgid "Phone Call Description" -msgstr "" +msgstr "Opis rozmowy telefonicznej" #. module: crm #: view:crm.case.categ:0 @@ -714,7 +714,7 @@ msgstr "" #. module: crm #: view:crm.phonecall:0 msgid "Assigned to" -msgstr "" +msgstr "Przypisano do" #. module: crm #: view:res.partner.events:0 @@ -729,7 +729,7 @@ msgstr "" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main msgid "Jobs - Hiring Process" -msgstr "" +msgstr "Praca - proces zatrudnienia" #. module: crm #: view:crm.case:0 @@ -745,7 +745,7 @@ msgstr "" #: selection:report.crm.case.section.categ2,month:0 #: selection:report.crm.case.section.stage,month:0 msgid "September" -msgstr "" +msgstr "Wrzesień" #. module: crm #: view:crm.case:0 @@ -765,7 +765,7 @@ msgstr "" #. module: crm #: view:crm.meeting:0 msgid "Meetings Form" -msgstr "" +msgstr "Formularz spotkań" #. module: crm #: model:crm.case.stage,name:crm.stage_oppor5 @@ -812,7 +812,7 @@ msgstr "" #. module: crm #: model:crm.case.stage,name:crm.stage_job5 msgid "Contract Signed" -msgstr "" +msgstr "Umowę podpisano" #. module: crm #: wizard_view:caldav.crm.subscribe,init:0 @@ -873,7 +873,7 @@ msgstr "" #. module: crm #: model:crm.case.category2,name:crm.category_lead7 msgid "Television" -msgstr "" +msgstr "Telewizja" #. module: crm #: view:crm.segmentation:0 diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index f83a8177369..f78044ea38e 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -25,6 +25,7 @@ "access_crm_phonecall2partner","crm.phonecall2partner","model_crm_phonecall2partner","crm.group_crm_user",1,1,1,1 "access_crm_phonecall2opportunity","crm.phonecall2opportunity","model_crm_phonecall2opportunity","crm.group_crm_user",1,1,1,1 "access_crm_send_mail","crm.send.mail","model_crm_send_mail","crm.group_crm_user",1,1,1,1 +"access_crm_send_mail_attachment","crm.send.mail.attachment","model_crm_send_mail_attachment","crm.group_crm_user",1,1,1,1 "access_crm_partner2opportunity","crm.partner2opportunity","model_crm_partner2opportunity","crm.group_crm_user",1,1,1,1 "access_crm_lead2opportunity_partner","crm.lead2opportunity.partner","model_crm_lead2opportunity_partner","crm.group_crm_user",1,1,1,1 "access_crm_installer","crm.installer.rule","model_crm_installer","crm.group_crm_user",1,1,1,1 diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index f0557827220..f9b3a2e64dc 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -216,6 +216,9 @@ class crm_send_new_email(osv.osv_memory): (case.user_id and case.user_id.address_id and \ case.user_id.address_id.email) or hist.email_to or tools.config.get('email_from',False)}) + signature = '\n' + (case.user_id.signature or '') + original = [signature] + if include_original == True and 'text' in fields: header = '-------- Original Message --------' sender = 'From: %s' %(hist.email_from or '') @@ -223,13 +226,10 @@ class crm_send_new_email(osv.osv_memory): sentdate = 'Date: %s' % (hist.date) desc = '\n%s'%(hist.description) - signature = '' - if case.user_id.signature: - signature = '--\n' + case.user_id.signature - original = [header, sender, to, sentdate, desc, signature] - original = '\n'.join(original) - res['text']=original + + res['text']= '\n'.join(original) + if 'subject' in fields: res.update({'subject': '[%s] %s' %(str(case.id), case.name or '')}) if 'state' in fields: diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index f14d45c79de..6a8058ff8bc 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -61,14 +61,16 @@ <field name="name" select="1"/> <field name="active" select="1"/> <field name="carrier_id" select="1"/> - <field name="sequence" select="1"/> + <field name="sequence" groups="base.group_extended" select="1"/> <notebook colspan="4"> <page string="Grid definition"> <field colspan="4" name="line_ids" nolabel="1" select="1"/> </page> <page string="Destination"> - <field colspan="4" name="country_ids"/> - <field colspan="4" name="state_ids"/> + <separator colspan="4" string="Countries"/> + <field colspan="4" name="country_ids" nolabel="1"/> + <separator colspan="4" string="States"/> + <field colspan="4" name="state_ids" nolabel="1"/> <field name="zip_from"/> <field name="zip_to"/> </page> diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 341fe6ceb79..720ab6de69f 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -316,7 +316,8 @@ <act_window domain="[('partner_id', '=', active_id)]" id="act_res_partner_document" name="Related Documents" res_model="ir.attachment" - src_model="res.partner"/> + src_model="res.partner" + groups="base.group_extended"/> <act_window domain="[('parent_id', '=', active_id)]" id="zoom_directory" name="Related Documents" diff --git a/addons/document_ftp/document_ftp_view.xml b/addons/document_ftp/document_ftp_view.xml index 9cec3715bae..d3f4c09498c 100644 --- a/addons/document_ftp/document_ftp_view.xml +++ b/addons/document_ftp/document_ftp_view.xml @@ -24,10 +24,17 @@ <form position="attributes"> <attribute name="string">Auto Configure</attribute> </form> + <separator string="title" position="attributes"> + <attribute name="string">FTP Server Configuration</attribute> + </separator> + <xpath expr="//label[@string='description']" position="attributes"> + <attribute name="string">Choose the address for the Document Management System's FTP server.</attribute> + </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='rowspan'>12</attribute> + <attribute name='string'></attribute> + </xpath> <group string="res_config_contents" position="replace"> - <separator string="FTP Server Configuration." colspan="4"/> - <label align="0.0" colspan="4" - string="Choose the address for the Document Management System's FTP server."/> <field name="host"/> </group> <xpath expr="//button[@name='action_skip']" position="replace"/> @@ -47,6 +54,7 @@ <record model="ir.actions.todo" id="config_auto_directory"> <field name="action_id" ref="action_config_auto_directory"/> + <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/> </record> </data> </openerp> diff --git a/addons/event/event_sequence.xml b/addons/event/event_sequence.xml index 52a41c11688..eb8d45137cf 100644 --- a/addons/event/event_sequence.xml +++ b/addons/event/event_sequence.xml @@ -2,20 +2,20 @@ <openerp> <data> - # - # Sequences for crm.case.section - # + # + # Sequences for crm.case.section + # - <record model="ir.sequence.type" id="seq_section_code"> - <field name="name">Section Code</field> - <field name="code">event.event</field> - </record> - <record model="ir.sequence" id="seq_section_code1"> - <field name="name">Section Code</field> - <field name="code">event.event</field> - <field name="prefix">C/</field> - <field name="padding">3</field> - </record> + <record model="ir.sequence.type" id="seq_section_code"> + <field name="name">Section Code</field> + <field name="code">event.event</field> + </record> + <record model="ir.sequence" id="seq_section_code1"> + <field name="name">Section Code</field> + <field name="code">event.event</field> + <field name="prefix">C/</field> + <field name="padding">3</field> + </record> </data> </openerp> diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index a66951e9f45..977cc22f005 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -73,7 +73,7 @@ </record> <menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/> - <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/> + <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_root" sequence="5"/> <record model="ir.ui.view" id="view_users_form_inherit"> <field name="name">res.users.form</field> diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml index ff6025cda64..3ce73f07b12 100644 --- a/addons/hr/hr_installer.xml +++ b/addons/hr/hr_installer.xml @@ -8,18 +8,20 @@ <field name="arch" type="xml"> <data> <form position="attributes"> - <attribute name="string">Human Resources Modules Installation</attribute> + <attribute name="string">Select Human Resources Modules To Install</attribute> </form> <separator string="title" position="attributes"> - <attribute name="string">Configure Human Resources"</attribute> + <attribute name="string">Select Human Resources Modules To Install</attribute> </separator> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <xpath expr="//label[@string='description']" position="attributes"> - <attribute name="string">The base Human Resources addon will help you manage your employee roster, but your can enhance it even further by installing a few HR-related applications.</attribute> + <attribute name="string">The base Human Resources addon will help you manage your employee roster, but you can enhance it even further by installing a few HR-related applications.</attribute> </xpath> <group colspan="8"> - <separator string="Human Resources Management" colspan="4"/> <field name="hr_holidays"/> <field name="hr_expense"/> <field name="hr_recruitment"/> @@ -28,6 +30,9 @@ <field name="hr_evaluation"/> <field name="hr_attendance"/> </group> + <xpath expr="//button[@string='Install Modules']" position="attributes"> + <attribute name="string">Configure</attribute> + </xpath> </data> </field> </record> @@ -46,5 +51,16 @@ <field name="action_id" ref="action_hr_installer"/> <field name="sequence">3</field> </record> + <record id="hr_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">hr_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_hr_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 5e04cf1aaad..47efc17825e 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -2,7 +2,7 @@ <openerp> <data> <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/> - <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/> + <menuitem id="menu_hr_human_resources" sequence="2" name="Human Resources" parent="menu_hr_root"/> <menuitem id="menu_hr_configuration" name="Configuration" @@ -58,7 +58,7 @@ <group col="2" colspan="2"> <separator string="Status" colspan="2"/> <field name="gender"/> - <field name="marital"/> + <field name="marital" widget="selection"/> <field name="country_id"/> <field name="birthday"/> </group> @@ -103,7 +103,7 @@ <newline /> <group expand="1" string="Group By..." colspan="11" col="11"> <filter string="Manager" icon="terp-sale" domain="[]" context="{'group_by':'parent_id'}"/> - <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}"/> + <filter string="Coach" icon="terp-sale" domain="[]" context="{'group_by':'coach_id'}" groups="base.group_extended"/> <separator orientation="vertical" /> <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/> <filter string="Job" icon="terp-sale" domain="[]" context="{'group_by':'job_id'}"/> @@ -141,13 +141,15 @@ <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" - parent="menu_hr_human_resources"/> + sequence="3" + parent="menu_hr_root"/> + <!-- ======================= Employee marital status - ======================= - --> + ======================= --> + <record id="hr_hr_employee_marital_status_form" model="ir.ui.view"> <field name="name">hr.hr.employee.marital.status</field> <field name="model">hr.employee.marital.status</field> @@ -172,6 +174,7 @@ id="hr_menu_marital_status" parent="hr.menu_view_employee_category_configuration_form" sequence="3"/> + <!-- ======================= Employee architecture @@ -257,9 +260,10 @@ <field name="view_mode">tree,form</field> </record> - <menuitem action="open_view_categ_form" - id="menu_view_employee_category_form" - parent="menu_view_employee_category_configuration_form" sequence="1"/> + <menuitem action="open_view_categ_form" + id="menu_view_employee_category_form" + parent="menu_view_employee_category_configuration_form" sequence="1" + groups="base.group_extended"/> <record id="open_view_categ_tree" model="ir.actions.act_window"> <field name="name">Categories structure</field> @@ -287,8 +291,8 @@ <field eval="True" name="object"/> </record> - <menuitem - action="open_view_categ_tree" + <menuitem + action="open_view_categ_tree" groups="base.group_extended" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/> @@ -375,9 +379,9 @@ name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root"/> - <menuitem - parent="base.menu_crm_case_job_req_main" - id="menu_hr_job" + <menuitem + parent="base.menu_crm_case_job_req_main" + id="menu_hr_job" action="action_hr_job" sequence="2"/> </data> diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po index 2fd27f35df1..11884c53d2f 100644 --- a/addons/hr/i18n/pl.po +++ b/addons/hr/i18n/pl.po @@ -7,31 +7,31 @@ 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: 2009-11-09 17:36+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-05-12 20:04+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-04-17 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr #: model:process.node,name:hr.process_node_openerpuser0 #: model:process.transition,name:hr.process_transition_employeeuser0 msgid "Openerp user" -msgstr "" +msgstr "Użytkownik OpenERP" #. module: hr #: model:ir.actions.act_window,name:hr.edit_workgroup #: model:ir.ui.menu,name:hr.menu_edit_workgroup msgid "Working Time Categories" -msgstr "" +msgstr "Kategorie czasu pracy" #. module: hr #: constraint:hr.department:0 msgid "Error! You can not create recursive departments." -msgstr "" +msgstr "Błąd! Nie możesz tworzyć rekurencyjnych działów" #. module: hr #: field:hr.employee,sinid:0 @@ -42,7 +42,7 @@ msgstr "" #: model:ir.module.module,shortdesc:hr.module_meta_information #: model:ir.ui.menu,name:hr.menu_hr_root msgid "Human Resources" -msgstr "" +msgstr "Zasoby ludzkie" #. module: hr #: selection:hr.timesheet,dayofweek:0 @@ -57,7 +57,7 @@ msgstr "Nadrzędne" #. module: hr #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: hr #: view:hr.department:0 @@ -67,17 +67,17 @@ msgstr "Dział" #. module: hr #: model:process.transition,name:hr.process_transition_contactofemployee0 msgid "Contact of employee" -msgstr "" +msgstr "Kontakt do pracownika" #. module: hr #: field:hr.employee,work_email:0 msgid "Work Email" -msgstr "" +msgstr "Służbowy e-mail" #. module: hr #: field:hr.timesheet.group,name:0 msgid "Group name" -msgstr "" +msgstr "Nazwa grupy" #. module: hr #: field:hr.department,company_id:0 @@ -93,7 +93,7 @@ msgstr "Piątek" #. module: hr #: field:hr.department,parent_id:0 msgid "Parent Department" -msgstr "" +msgstr "Dział nadrzędny" #. module: hr #: view:hr.department:0 @@ -105,22 +105,22 @@ msgstr "Uwagi" #. module: hr #: field:hr.timesheet,hour_from:0 msgid "Work from" -msgstr "" +msgstr "Pracuje od" #. module: hr #: model:ir.actions.act_window,name:hr.action2 msgid "Employee Hierarchy" -msgstr "" +msgstr "Hierarchia pracowników" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_configuration msgid "Configuration" -msgstr "Ustawienia" +msgstr "Konfiguracja" #. module: hr #: selection:hr.employee,marital:0 msgid "Unmaried" -msgstr "" +msgstr "Wolny(a)" #. module: hr #: selection:hr.employee,gender:0 @@ -130,13 +130,13 @@ msgstr "Kobieta" #. module: hr #: view:hr.timesheet.group:0 msgid "Working Time Category" -msgstr "" +msgstr "Kategoria czasu pracy" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_employee_tree #: model:ir.ui.menu,name:hr.menu_open_view_employee_tree msgid "Employees Structure" -msgstr "" +msgstr "Struktura pracowników" #. module: hr #: view:hr.employee:0 @@ -151,12 +151,12 @@ msgstr "Telefon do pracy" #. module: hr #: field:hr.employee.category,child_ids:0 msgid "Child Categories" -msgstr "" +msgstr "Kategorie podrzędne" #. module: hr #: field:hr.employee,work_location:0 msgid "Office Location" -msgstr "" +msgstr "Położenia biura" #. module: hr #: view:hr.employee:0 @@ -169,12 +169,12 @@ msgstr "Pracownik" #. module: hr #: field:hr.timesheet.group,manager:0 msgid "Workgroup manager" -msgstr "" +msgstr "Kierownik grupy" #. module: hr #: field:hr.employee,child_ids:0 msgid "Subordinates" -msgstr "" +msgstr "Podlegli" #. module: hr #: model:ir.ui.menu,name:hr.menu_hr_reporting @@ -194,7 +194,7 @@ msgstr "" #. module: hr #: model:process.transition,note:hr.process_transition_contactofemployee0 msgid "Fill up contact information" -msgstr "" +msgstr "Wypełnij informacje o kontakcie" #. module: hr #: constraint:ir.ui.view:0 @@ -209,7 +209,7 @@ msgstr "Rozwiedziony" #. module: hr #: field:hr.employee.category,parent_id:0 msgid "Parent Category" -msgstr "" +msgstr "Kategoria nadrzędna" #. module: hr #: model:ir.actions.act_window,name:hr.open_module_tree_department @@ -222,17 +222,17 @@ msgstr "Działy" #. module: hr #: model:process.node,name:hr.process_node_employeecontact0 msgid "Employee Contact" -msgstr "" +msgstr "Kontakt do pracownika" #. module: hr #: selection:hr.employee,marital:0 msgid "Maried" -msgstr "" +msgstr "Żonaty (Zamężna)" #. module: hr #: field:hr.timesheet,tgroup_id:0 msgid "Employee's timesheet group" -msgstr "" +msgstr "Grupa kart czasu pracy pracowników" #. module: hr #: selection:hr.employee,gender:0 @@ -242,18 +242,18 @@ msgstr "Mężczyzna" #. module: hr #: model:process.transition,note:hr.process_transition_employeeuser0 msgid "Create openerp user" -msgstr "" +msgstr "Utwórz użytkownika OpenERP" #. module: hr #: view:hr.employee.category:0 #: model:ir.model,name:hr.model_hr_employee_category msgid "Employee Category" -msgstr "" +msgstr "Kategoria pracownika" #. module: hr #: selection:hr.timesheet,dayofweek:0 msgid "Tuesday" -msgstr "" +msgstr "Wtorek" #. module: hr #: model:ir.model,name:hr.model_hr_department @@ -269,63 +269,63 @@ msgstr "" #: field:hr.employee,category_id:0 #: field:hr.employee.category,name:0 msgid "Category" -msgstr "" +msgstr "Kategoria" #. module: hr #: field:hr.department,note:0 msgid "Note" -msgstr "" +msgstr "Notatka" #. module: hr #: view:hr.employee:0 msgid "Contact Information" -msgstr "" +msgstr "Informacje kontaktowe" #. module: hr #: view:hr.employee:0 msgid "Status" -msgstr "" +msgstr "Stan" #. module: hr #: selection:hr.timesheet,dayofweek:0 msgid "Monday" -msgstr "" +msgstr "Poniedziałek" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_categ_tree #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree msgid "Categories structure" -msgstr "" +msgstr "Struktura kategorii" #. module: hr #: field:hr.timesheet,dayofweek:0 msgid "Day of week" -msgstr "" +msgstr "Dzień tygodnia" #. module: hr #: field:hr.employee,birthday:0 msgid "Birthday" -msgstr "" +msgstr "Data urodzenia" #. module: hr #: field:hr.employee,active:0 msgid "Active" -msgstr "" +msgstr "Aktywny" #. module: hr #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "" +msgstr "Błąd ! Nie mozesz tworzyć rekurencyjnych hierarchii pracowników" #. module: hr #: model:process.process,name:hr.process_process_employeecontractprocess0 msgid "Employee Contract Process" -msgstr "" +msgstr "Proces umowy pracownika" #. module: hr #: model:process.node,note:hr.process_node_openerpuser0 msgid "Create OpenERP User" -msgstr "" +msgstr "Utwórz użytkownika OpenERP" #. module: hr #: model:process.node,note:hr.process_node_employee0 @@ -335,23 +335,23 @@ msgstr "" #. module: hr #: view:hr.department:0 msgid "Companies" -msgstr "" +msgstr "Firmy" #. module: hr #: selection:hr.timesheet,dayofweek:0 msgid "Wednesday" -msgstr "" +msgstr "Środa" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_categ_form #: model:ir.ui.menu,name:hr.menu_view_employee_category_form msgid "Categories of Employee" -msgstr "" +msgstr "Kategorie pracowników" #. module: hr #: field:hr.timesheet,date_from:0 msgid "Starting date" -msgstr "" +msgstr "Data rozpoczęcia" #. module: hr #: field:res.users,parent_id:0 @@ -361,22 +361,22 @@ msgstr "Użytkownik nadrzędny" #. module: hr #: field:hr.employee,address_id:0 msgid "Working Address" -msgstr "" +msgstr "Adres do pracy" #. module: hr #: field:hr.employee,marital:0 msgid "Marital Status" -msgstr "" +msgstr "Stan cywilny" #. module: hr #: model:ir.model,name:hr.model_hr_timesheet msgid "Timesheet Line" -msgstr "" +msgstr "Pozycja karty czasu pracy" #. module: hr #: view:hr.employee:0 msgid "Personal Information" -msgstr "" +msgstr "Informacje osobiste" #. module: hr #: constraint:ir.model:0 @@ -391,42 +391,42 @@ msgstr "" #: field:hr.timesheet.group,timesheet_id:0 #: model:ir.model,name:hr.model_hr_timesheet_group msgid "Working Time" -msgstr "" +msgstr "Czas pracy" #. module: hr #: selection:hr.timesheet,dayofweek:0 msgid "Thursday" -msgstr "" +msgstr "Czwartek" #. module: hr #: field:hr.timesheet,hour_to:0 msgid "Work to" -msgstr "" +msgstr "Pracuje do" #. module: hr #: selection:hr.employee,marital:0 msgid "Other" -msgstr "" +msgstr "Inny" #. module: hr #: view:hr.employee.category:0 msgid "Employees Categories" -msgstr "" +msgstr "Kategorie pracowników" #. module: hr #: field:hr.employee,address_home_id:0 msgid "Home Address" -msgstr "" +msgstr "Adres domowy" #. module: hr #: view:hr.department:0 msgid "department" -msgstr "" +msgstr "dział" #. module: hr #: field:hr.employee,country_id:0 msgid "Nationality" -msgstr "" +msgstr "Narodowość" #. module: hr #: field:hr.employee,otherid:0 @@ -436,59 +436,59 @@ msgstr "" #. module: hr #: field:hr.timesheet,name:0 msgid "Name" -msgstr "" +msgstr "Nazwa" #. module: hr #: field:hr.employee,gender:0 msgid "Gender" -msgstr "" +msgstr "Płeć" #. module: hr #: view:hr.employee:0 #: model:ir.actions.act_window,name:hr.open_view_employee_list #: model:ir.ui.menu,name:hr.menu_open_view_employee_list msgid "Employees" -msgstr "" +msgstr "Pracownicy" #. module: hr #: field:hr.department,name:0 msgid "Department Name" -msgstr "" +msgstr "Nazwa departamentu" #. module: hr #: field:hr.department,child_ids:0 msgid "Child Departments" -msgstr "" +msgstr "Działy podrzędne" #. module: hr #: view:hr.employee:0 msgid "Job Information" -msgstr "" +msgstr "Informacja o pracy" #. module: hr #: model:process.node,note:hr.process_node_employeecontact0 msgid "Fill up employee's contact information" -msgstr "" +msgstr "Wypełnij informacje kontaktowe pracownika" #. module: hr #: field:hr.department,manager_id:0 #: field:hr.employee,parent_id:0 msgid "Manager" -msgstr "" +msgstr "Menedżer" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_employee_list_my #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my msgid "All Employees" -msgstr "" +msgstr "Wszyscy pracownicy" #. module: hr #: selection:hr.timesheet,dayofweek:0 msgid "Saturday" -msgstr "" +msgstr "Sobota" #. module: hr #: model:ir.actions.act_window,name:hr.open_view_employee_new #: model:ir.ui.menu,name:hr.menu_open_view_employee_new msgid "New Employee" -msgstr "" +msgstr "Nowy pracownik" diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index cc2bfd97efe..2ea2d325867 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -56,18 +56,19 @@ <field name="action" select="1" /> <newline/> <group expand="1" string="Group By..." colspan="11" col="11"> - <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/> + <filter name="employee" string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'employee_id'}"/> <filter string="Day" icon="terp-sale" domain="[]" context="{'group_by':'day'}"/> </group> </search> </field> </record> - + <record id="open_view_attendance" model="ir.actions.act_window"> <field name="name">Attendances</field> <field name="res_model">hr.attendance</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> + <field name="context">{"search_default_employee":1}</field> <field name="search_view_id" ref="view_hr_attendance_filter" /> </record> @@ -76,7 +77,7 @@ <menuitem id="menu_hr_time_tracking" name="Time Tracking" - parent="hr.menu_hr_root" sequence="5"/> + parent="hr.menu_hr_root" sequence="7"/> <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/> diff --git a/addons/hr_attendance/i18n/pl.po b/addons/hr_attendance/i18n/pl.po index 70e11c4a599..9ff8dade21b 100644 --- a/addons/hr_attendance/i18n/pl.po +++ b/addons/hr_attendance/i18n/pl.po @@ -7,20 +7,20 @@ 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: 2009-09-16 15:47+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-05-12 19:58+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-04-17 04:18+0000\n" +"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_attendance #: field:hr.employee,state:0 #: model:ir.model,name:hr_attendance.model_hr_attendance msgid "Attendance" -msgstr "Frekwencja" +msgstr "Obecności" #. module: hr_attendance #: constraint:ir.model:0 @@ -48,7 +48,7 @@ msgstr "" #. module: hr_attendance #: view:hr.attendance:0 msgid "Employee attendances" -msgstr "" +msgstr "Obecności pracownika" #. module: hr_attendance #: constraint:ir.ui.view:0 @@ -77,28 +77,28 @@ msgstr "Opóźnienie" #: wizard_field:hr.si_so,si_ask_so,name:0 #: wizard_field:hr.si_so,so_ask_si,name:0 msgid "Employee's name" -msgstr "" +msgstr "Nazwisko pracownika" #. module: hr_attendance #: wizard_button:hr.attendance.print_month,init,print:0 #: wizard_button:hr.attendance.print_week,init,print:0 msgid "Print Timesheet" -msgstr "" +msgstr "Drukuj kartę czasu pracy" #. module: hr_attendance #: model:ir.actions.wizard,name:hr_attendance.wizard_attendance_error msgid "Print Attendance Error Report" -msgstr "" +msgstr "Drukuj raport błędów obecności" #. module: hr_attendance #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: hr_attendance #: model:ir.actions.wizard,name:hr_attendance.print_week msgid "Print Timesheet by week" -msgstr "" +msgstr "Drukuj kartę czasu pracy wg tygodni" #. module: hr_attendance #: field:hr.attendance,employee_id:0 @@ -109,12 +109,12 @@ msgstr "Pracownik" #: wizard_view:hr.attendance.print_week,init:0 #: wizard_view:hr.attendance.report,init:0 msgid "Select a time span" -msgstr "" +msgstr "Wybierz odstęp czasu" #. module: hr_attendance #: rml:report.hr.timesheet.attendance.error:0 msgid "Date Recorded" -msgstr "" +msgstr "Data zapisu" #. module: hr_attendance #: selection:hr.attendance,action:0 @@ -131,22 +131,22 @@ msgstr "" #: field:hr.attendance,action_desc:0 #: model:ir.model,name:hr_attendance.model_hr_action_reason msgid "Action reason" -msgstr "" +msgstr "Powód akcji" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "March" -msgstr "" +msgstr "Marzec" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "August" -msgstr "" +msgstr "Sierpień" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "May" -msgstr "" +msgstr "Maj" #. module: hr_attendance #: wizard_field:hr.si_so,so_ask_si,last_time:0 @@ -156,12 +156,12 @@ msgstr "" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "June" -msgstr "" +msgstr "Czerwiec" #. module: hr_attendance #: model:ir.actions.wizard,name:hr_attendance.print_month msgid "Print Timesheet by month" -msgstr "" +msgstr "Drukuj kartę czasu pracy wg miesięcy" #. module: hr_attendance #: selection:hr.attendance,action:0 @@ -172,7 +172,7 @@ msgstr "Wyloguj się" #. module: hr_attendance #: model:ir.module.module,shortdesc:hr_attendance.module_meta_information msgid "Attendances Of Employees" -msgstr "" +msgstr "Obecności pracowników" #. module: hr_attendance #: field:hr.action.reason,name:0 @@ -187,17 +187,17 @@ msgstr "" #. module: hr_attendance #: rml:report.hr.timesheet.attendance.error:0 msgid "Date Signed" -msgstr "" +msgstr "Data podpisu" #. module: hr_attendance #: field:hr.attendance,name:0 msgid "Date" -msgstr "" +msgstr "Data" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "July" -msgstr "" +msgstr "Lipiec" #. module: hr_attendance #: wizard_view:hr.si_so,si_ask_so:0 @@ -209,33 +209,33 @@ msgstr "" #. module: hr_attendance #: view:hr.action.reason:0 msgid "Attendance reasons" -msgstr "" +msgstr "Powody obecności" #. module: hr_attendance #: wizard_field:hr.attendance.print_week,init,init_date:0 #: wizard_field:hr.attendance.report,init,init_date:0 msgid "Starting Date" -msgstr "" +msgstr "Data rozpoczęcia" #. module: hr_attendance #: selection:hr.employee,state:0 msgid "Present" -msgstr "" +msgstr "Obecny(a)" #. module: hr_attendance #: selection:hr.employee,state:0 msgid "Absent" -msgstr "" +msgstr "Nieobecny(a)" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "February" -msgstr "" +msgstr "Luty" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "October" -msgstr "" +msgstr "Październik" #. module: hr_attendance #: wizard_field:hr.si_so,si_ask_so,last_time:0 @@ -250,19 +250,19 @@ msgstr "" #. module: hr_attendance #: field:hr.action.reason,action_type:0 msgid "Action's type" -msgstr "" +msgstr "Typ akcji" #. module: hr_attendance #: view:hr.action.reason:0 msgid "Define attendance reason" -msgstr "" +msgstr "Definiuj powody obecności" #. module: hr_attendance #: selection:hr.action.reason,action_type:0 #: wizard_button:hr.si_so,init,si_test:0 #: wizard_button:hr.si_so,si_ask_so,si:0 msgid "Sign in" -msgstr "" +msgstr "Zaloguj się" #. module: hr_attendance #: wizard_view:hr.attendance.report,init:0 @@ -272,29 +272,29 @@ msgstr "" #. module: hr_attendance #: wizard_field:hr.si_so,init,state:0 msgid "Current state" -msgstr "" +msgstr "Bieżący stan" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "January" -msgstr "" +msgstr "Styczeń" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "April" -msgstr "" +msgstr "Kwiecień" #. module: hr_attendance #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance msgid "Attendances" -msgstr "" +msgstr "Obecności" #. module: hr_attendance #: rml:report.hr.timesheet.attendance.error:0 msgid "Attendance Errors" -msgstr "" +msgstr "Błąd obecności" #. module: hr_attendance #: field:hr.attendance,action:0 @@ -305,18 +305,18 @@ msgstr "Akcja" #. module: hr_attendance #: wizard_button:hr.attendance.report,init,print:0 msgid "Print Attendance Report" -msgstr "" +msgstr "Drukuj raport obecności" #. module: hr_attendance #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason msgid "Attendance Reasons" -msgstr "" +msgstr "Powód obecności" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "November" -msgstr "" +msgstr "Listopad" #. module: hr_attendance #: wizard_view:hr.attendance.report,init:0 @@ -331,13 +331,13 @@ msgstr "" #. module: hr_attendance #: wizard_view:hr.attendance.print_week,init:0 msgid "Select a starting and a end date" -msgstr "" +msgstr "Wybierz datę rozpoczęcia i zakończenia" #. module: hr_attendance #: wizard_field:hr.attendance.print_week,init,end_date:0 #: wizard_field:hr.attendance.report,init,end_date:0 msgid "Ending Date" -msgstr "" +msgstr "Data końcowa" #. module: hr_attendance #: wizard_view:hr.si_so,so_ask_si:0 @@ -349,32 +349,32 @@ msgstr "" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "September" -msgstr "" +msgstr "Wrzesień" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "December" -msgstr "" +msgstr "Grudzień" #. module: hr_attendance #: view:hr.attendance:0 msgid "Employee attendance" -msgstr "" +msgstr "Obecności pracownika" #. module: hr_attendance #: wizard_view:hr.attendance.print_month,init:0 msgid "Select a month" -msgstr "" +msgstr "Wybierz miesiąc" #. module: hr_attendance #: wizard_field:hr.attendance.print_month,init,month:0 msgid "Month" -msgstr "" +msgstr "Miesiąc" #. module: hr_attendance #: model:ir.module.module,description:hr_attendance.module_meta_information msgid "This module aims to manage employee's attendances." -msgstr "" +msgstr "Ten moduł służy do kontroli obecności" #. module: hr_attendance #: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report @@ -384,7 +384,7 @@ msgstr "" #. module: hr_attendance #: wizard_field:hr.attendance.print_month,init,year:0 msgid "Year" -msgstr "" +msgstr "Rok" #. module: hr_attendance #: wizard_button:hr.attendance.print_month,init,end:0 @@ -394,9 +394,9 @@ msgstr "" #: wizard_button:hr.si_so,si_ask_so,end:0 #: wizard_button:hr.si_so,so_ask_si,end:0 msgid "Cancel" -msgstr "" +msgstr "Anuluj" #. module: hr_attendance #: rml:report.hr.timesheet.attendance.error:0 msgid "Operation" -msgstr "" +msgstr "Operacja" diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml index 89272706eee..725ce7b5004 100644 --- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml @@ -16,7 +16,7 @@ <separator colspan="4"/> <group col="2" colspan="4"> <button special="cancel" string="Cancel" icon='gtk-cancel'/> - <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> + <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/> </group> </form> </field> diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml index 618217a1a66..220ceef2e48 100644 --- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml @@ -17,7 +17,7 @@ <separator colspan="4"/> <group col="2" colspan="4"> <button special="cancel" string="Cancel" icon='gtk-cancel'/> - <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> + <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/> </group> </form> </field> diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml index 16769f66df0..3061c263687 100644 --- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml @@ -19,7 +19,7 @@ <separator colspan="4"/> <group col="2" colspan="4"> <button special="cancel" string="Cancel" icon='gtk-cancel'/> - <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> + <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/> </group> </form> </field> diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml index 62cffa720a9..d5253dffa25 100644 --- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml @@ -46,7 +46,7 @@ <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out" - parent="menu_hr_time_tracking" groups="group_hr_attendance" /> + parent="menu_hr_time_tracking" groups="base.group_extended" /> <record id="view_hr_attendance_so_ask" model="ir.ui.view"> <field name="name">hr.sign.in.out.ask.form</field> diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 7578d66e98b..9951a9e3982 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -21,7 +21,7 @@ <field name="arch" type="xml"> <form string="Wage Type"> <field colspan="4" name="name"/> - <field name="period_id"/> + <field name="period_id" widget="selection"/> <field name="type"/> <separator colspan="4" string="Hourly cost computation"/> <field name="factor_type"/> @@ -70,7 +70,7 @@ <field name="arch" type="xml"> <notebook position="inside"> <page string="Contracts"> - <field colspan="4" name="contract_ids" nolabel="1"> + <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1"> <tree string="Contracts"> <field name="name"/> <field name="job_id"/> @@ -133,14 +133,24 @@ </field> </record> - <record id="hr_contract_type_view_form" model="ir.ui.view"> - <field name="name">hr.contract.type.view.form</field> - <field name="model">hr.contract.type</field> - <field name="type">form</field> + <record id="hr_contract_view_search" model="ir.ui.view"> + <field name="name">hr.contract.view.search</field> + <field name="model">hr.contract</field> + <field name="type">search</field> <field name="arch" type="xml"> - <form string="Contract Type"> - <field colspan="4" name="name" select="1"/> - </form> + <search string="Search Contract"> + <group col='15' colspan='4'> + <field name="name"/> + <field name="employee_id"/> + <field name="department_id"/> + <field name="date_start"/> + <field name="date_end"/> + </group> + <newline/> + <group expand="1" string="Group By..." colspan="4" col="20"> + <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/> + </group> + </search> </field> </record> @@ -180,17 +190,6 @@ </field> </record> - <record id="hr_contract_type_view_tree" model="ir.ui.view"> - <field name="name">hr.contract.type.view.tree</field> - <field name="model">hr.contract.type</field> - <field name="type">tree</field> - <field name="arch" type="xml"> - <tree string="Contract Type"> - <field colspan="4" name="name"/> - </tree> - </field> - </record> - <record id="hr_contract_view_tree" model="ir.ui.view"> <field name="name">hr.contract.view.tree</field> <field name="model">hr.contract</field> @@ -216,9 +215,30 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> <field name="domain">[]</field> + <field name="search_view_id" ref="hr_contract_view_search"/> </record> + <record id="hr_contract_type_view_form" model="ir.ui.view"> + <field name="name">hr.contract.type.view.form</field> + <field name="model">hr.contract.type</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Contract Type"> + <field colspan="4" name="name" select="1"/> + </form> + </field> + </record> + <record id="hr_contract_type_view_tree" model="ir.ui.view"> + <field name="name">hr.contract.type.view.tree</field> + <field name="model">hr.contract.type</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Contract Type"> + <field colspan="4" name="name"/> + </tree> + </field> + </record> <record id="action_hr_contract_type" model="ir.actions.act_window"> <field name="name">Contract Types</field> <field name="res_model">hr.contract.type</field> @@ -227,8 +247,8 @@ </record> <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56"/> - <menuitem id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/> - <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/> + <!--<menuitem id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/> --> + <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_root" name="Contracts" sequence="4"/> <!-- Contracts Button on Employee Form --> <act_window domain="[('employee_id', '=', active_id)]" id="act_hr_employee_2_hr_contract" name="Contracts" res_model="hr.contract" src_model="hr.employee"/> diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index cff66266686..e2b1532d17f 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -1,6 +1,25 @@ <?xml version="1.0" ?> <openerp> <data> + + <record id="view_hr_evaluation_plan_search" model="ir.ui.view"> + <field name="name">hr_evaluation.plan.search</field> + <field name="model">hr_evaluation.plan</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Search Evaluation Plan"> + <group col='15' colspan='4'> + <field name="name"/> + <field name="company_id" widget="selection"/> + </group> + <newline/> + <group expand="1" string="Group By..." colspan="4" col="20"> + <filter string="Company" icon="terp-project" domain="[]" context="{'group_by':'company_id'}"/> + </group> + </search> + </field> + </record> + <record model="ir.ui.view" id="view_hr_evaluation_plan_form"> <field name="name">hr_evaluation.plan.form</field> <field name="model">hr_evaluation.plan</field> @@ -42,7 +61,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="3"/> + <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/> <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="3"/> @@ -169,19 +188,23 @@ <button name="button_plan_in_progress" string="Start Evaluation" states="draft" - type="object"/> + type="object" + icon="gtk-execute"/> <button name="button_final_validation" string="Final Validation" states="wait" - type="object"/> + type="object" + icon="gtk-execute"/> <button name="button_done" string="Done" states="progress" - type="object"/> + type="object" + icon="gtk-jump-to"/> <button name="button_cancel" string="Cancel" states="draft,wait,progress" - type="object"/> + type="object" + icon="gtk-cancel"/> </group> </form> </field> @@ -279,7 +302,7 @@ <field name="date_deadline"/> <field name="response" readonly="1"/> <field name="user_to_review_id"/> - <field name="user_id"/> + <field name="user_id" string="Interviewer"/> </group> <newline/> <separator string="State" colspan="4"/> @@ -328,7 +351,7 @@ <filter icon="terp-stock" string="Late" domain="[('date_deadline','<',current_date)]"/> <separator orientation="vertical"/> <field name="user_to_review_id" widget="selection"/> - <field name="user_id" widget="selection"/> + <field name="user_id" string="Interviewer" widget="selection"/> </group> </search> </field> diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 0417fb0ffd2..0dacc90c53c 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -112,8 +112,8 @@ <field name="search_view_id" ref="view_evaluation_report_search"/> </record> - <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="8"/> - <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="0"/> + <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/> + <menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3"/> </data> </openerp> diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml index fff55095712..3769efcdfa8 100644 --- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml +++ b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml @@ -10,8 +10,8 @@ <form string="Evaluation Reminders"> <field name="evaluation_id"/> <newline/> - <button special="cancel" string="Cancel" /> - <button name="send_mail" string="Send Mail" type="object"/> + <button special="cancel" string="Cancel" icon="gtk-cancel"/> + <button name="send_mail" string="Send Mail" type="object" icon="gtk-ok"/> </form> </field> </record> diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 292cbf6f027..cb74901fc4e 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -30,8 +30,8 @@ <field name="date"/> <field name="employee_id"/> <field name="department_id" groups="base.group_extended"/> - <field name="name"/> <field name="ref"/> + <field name="name"/> <field name="amount"/> <field name="state"/> <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/> @@ -49,8 +49,8 @@ <field name="date"/> <field name="employee_id"/> <field name="department_id" groups="base.group_extended"/> - <field name="name"/> <field name="ref"/> + <field name="name"/> <field name="amount"/> <field name="state"/> <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/> @@ -68,8 +68,7 @@ <group colspan="4" col="6"> <field name="employee_id" select="1"/> <field name="name" select="1"/> - <field name="employee_id" select="1"/> - <field name="ref"/> + <field name="ref" groups="base.group_extended"/> <field name="date" select="1"/> <field name="amount"/> <field name="currency_id"/> @@ -82,7 +81,7 @@ <field colspan="4" name="line_ids" nolabel="1"> <form string="Expense Lines"> <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/> - <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)"/> + <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" widget="selection"/> <field name="name" select="1"/> <field name="date_value" select="1"/> <field name="unit_quantity"/> @@ -133,6 +132,12 @@ domain="[('state','=','draft')]" string="Draft" help="Draft Expense"/> + <filter + icon="terp-hr" + string="My Expenses" + default="1" + domain="[('user_id','=',uid)]"/> + <separator orientation="vertical"/> <filter icon="terp-hr" domain="[('state','=','confirm')]" @@ -146,12 +151,7 @@ <separator orientation="vertical"/> <field name="name" select='1'/> <field name="date" select='1'/> - <field name="user_id" select="1" widget="selection"> - <filter - icon="gtk-execute" - help="My Expenses" - default="1" - domain="[('user_id','=',uid)]"/> + <field name="user_id" select="1" widget="selection" string="User"> <filter icon="terp-hr" domain="[('department_id','=',context.get('department_id',False))]" string="Expenses of My Department"/> @@ -161,9 +161,9 @@ <newline /> <group expand="1" string="Group By..." colspan="11" col="11"> <filter string="Department" icon="terp-sale" domain="[]" context="{'group_by':'department_id'}"/> - <filter string="Employee" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="User" icon="terp-sale" domain="[]" context="{'group_by':'user_id'}"/> <separator orientation="vertical"/> - <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/> + <filter string="Month" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/> </group> </search> </field> @@ -176,7 +176,7 @@ <field name="search_view_id" ref="view_hr_expense_filter"/> </record> - <menuitem id="next_id_49" name="Expenses" sequence="6" + <menuitem id="next_id_49" name="Expenses" sequence="8" parent="hr.menu_hr_root"/> <menuitem action="expense_all" id="menu_expense_all" name="Expenses" diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 972557edd0c..c376df3e4d7 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -137,8 +137,8 @@ <field name="search_view_id" ref="view_hr_expense_report_search"/> </record> - <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="8"/> - <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="0"/> + <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/> + <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/> </data> </openerp> diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index cd0d86457d9..412d4218df8 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -73,7 +73,7 @@ class hr_holidays_status(osv.osv): 'name' : fields.char('Name', size=64, required=True, translate=True), 'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'), 'color_name' : fields.selection([('red', 'Red'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'), - 'limit' : fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'), + 'limit' : fields.boolean('Allow to Override Limit', help='If you thick this checkbox, the system will allow, for this team, the employees to take more leaves than the available ones.'), 'active' : fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."), 'max_leaves' : fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'), 'leaves_taken' : fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'), @@ -200,7 +200,7 @@ class hr_holidays(osv.osv): if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink: warning = { 'title': "Warning for ", - 'message': "You won\'t be able to cancel this leave request because the CRM Section of the leave type disallows." + 'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows." } return {'warning': warning} diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index d5e0602e5bb..5004635f59c 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -198,7 +198,8 @@ <menuitem name="Holidays Management" parent="hr.menu_hr_root" - id="menu_open_ask_holidays"/> + id="menu_open_ask_holidays" + sequence="9"/> <record model="ir.actions.act_window" id="open_ask_holidays"> <field name="name">Leave Requests</field> diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml index 244668ec719..c2873ed9ace 100644 --- a/addons/hr_holidays/hr_holidays_wizard.xml +++ b/addons/hr_holidays/hr_holidays_wizard.xml @@ -5,12 +5,12 @@ id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" - sequence="40" /> + sequence="10" /> <menuitem id="menu_hr_reporting_holidays" name="Holidays" parent="hr.menu_hr_reporting" - sequence="3" /> + sequence="6" /> <!--<wizard string="Holidays by Departement" name="hr.holidays.summary" id="holidays_summary"/>--> diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po index 19df489b338..792a2db7db6 100644 --- a/addons/hr_holidays/i18n/pl.po +++ b/addons/hr_holidays/i18n/pl.po @@ -7,71 +7,71 @@ 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: 2009-11-09 13:38+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-05-12 20:13+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-04-17 04:15+0000\n" +"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new msgid "New Holidays Request" -msgstr "" +msgstr "Nowy wniosek o urlop" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday msgid "All Holidays Requests" -msgstr "" +msgstr "Wszystkie wnioski o urlop" #. module: hr_holidays #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: hr_holidays #: field:hr.holidays.per.user,remaining_leaves:0 msgid "Remaining Leaves" -msgstr "" +msgstr "Pozostało dni wolnych" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" -msgstr "" +msgstr "Wnioski oczekujące na zatwierdzenie" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Blue" -msgstr "" +msgstr "Jasnoniebieski" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Brown" -msgstr "" +msgstr "Brązowy" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "of the" -msgstr "" +msgstr "z" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "Off-Days' Summary" -msgstr "" +msgstr "Suma dni wolnych" #. module: hr_holidays #: view:hr.holidays:0 #: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" -msgstr "" +msgstr "Urlopy pracownika" #. module: hr_holidays #: view:hr.holidays:0 msgid "Set to Draft" -msgstr "" +msgstr "Ustaw na projekt" #. module: hr_holidays #: view:hr.holidays.per.user:0 @@ -79,54 +79,54 @@ msgstr "" #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" -msgstr "" +msgstr "Dni wolne od pracy" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "to" -msgstr "" +msgstr "do" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Cyan" -msgstr "" +msgstr "Jasnoseledynowy" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Green" -msgstr "" +msgstr "Jasnozielony" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0 msgid "Employee Declaration" -msgstr "" +msgstr "Deklaracja pracownika" #. module: hr_holidays #: view:hr.holidays:0 #: selection:hr.holidays,state:0 #: model:process.transition.action,name:hr_holidays.process_transition_action_validate0 msgid "Validate" -msgstr "" +msgstr "Zatwierdź" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_refusedrequest0 msgid "Refused Request" -msgstr "" +msgstr "Wniosek odrzucony" #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_approved0 msgid "Approved" -msgstr "Zatwierdzone" +msgstr "Zaaprobowane" #. module: hr_holidays #: selection:hr.holidays.summary.employee,init,holiday_type:0 msgid "Both" -msgstr "" +msgstr "Oba" #. module: hr_holidays #: view:hr.holidays:0 msgid "Refuse" -msgstr "" +msgstr "Odmów" #. module: hr_holidays #: wizard_button:hr.holidays.summary,notify,end:0 @@ -137,65 +137,65 @@ msgstr "" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday msgid "My Holidays Requests" -msgstr "" +msgstr "Moje wnioski o urlop" #. module: hr_holidays #: field:hr.holidays,notes:0 #: field:hr.holidays.per.user,notes:0 msgid "Notes" -msgstr "" +msgstr "Uwagi" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 #: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" -msgstr "" +msgstr "Stan dni wolnych" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0 msgid "Request is refused." -msgstr "" +msgstr "Wniosek został odrzucony" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays msgid "Holidays Management" -msgstr "" +msgstr "Urlopy" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "Analyze from" -msgstr "" +msgstr "Analizuj od" #. module: hr_holidays #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary msgid "Summary Of Holidays" -msgstr "" +msgstr "Podsumowanie urlopów" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_calendar0 msgid "The holiday is set in the calendar" -msgstr "" +msgstr "Urlop został ustawiony w kalendarzu" #. module: hr_holidays #: view:hr.holidays.status:0 msgid "Holiday status" -msgstr "" +msgstr "Stan urlopu" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_status msgid "Holidays Status" -msgstr "" +msgstr "Stany urlopów" #. module: hr_holidays #: field:hr.holidays,date_to:0 msgid "Vacation end day" -msgstr "" +msgstr "Ostatni dzień urlopu" #. module: hr_holidays #: view:hr.holidays.per.user:0 msgid "Holidays Allowed" -msgstr "" +msgstr "Dozwolone urlopy" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 @@ -205,29 +205,29 @@ msgstr "" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Magenta" -msgstr "" +msgstr "Purpurowy" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user msgid "Holidays Per User" -msgstr "" +msgstr "Urlopy na użytkownika" #. module: hr_holidays #: view:hr.holidays.status:0 msgid "Define holiday status" -msgstr "" +msgstr "Zdefiniuj stan urlopu" #. module: hr_holidays #: selection:hr.holidays.summary,init,holiday_type:0 #: selection:hr.holidays.summary.employee,init,holiday_type:0 msgid "Confirmed" -msgstr "" +msgstr "Potwierdzone" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,date_from:0 #: wizard_field:hr.holidays.summary.employee,init,date_from:0 msgid "From" -msgstr "" +msgstr "Od" #. module: hr_holidays #: view:hr.holidays:0 @@ -239,7 +239,7 @@ msgstr "Potwierdź" #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting msgid "My Awaiting Confirmation Holidays Requests" -msgstr "" +msgstr "Moje wnioski o urlop oczekujące na potwierdzenie" #. module: hr_holidays #: field:hr.holidays,user_id:0 @@ -249,24 +249,24 @@ msgstr "" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_holidaysdefinition0 msgid "Encoding of annual available holidays." -msgstr "" +msgstr "Wprowadzanie urlopów przysługujących w roku" #. module: hr_holidays #: field:hr.holidays,employee_id:0 #: field:hr.holidays.log,employee_id:0 #: field:hr.holidays.per.user,employee_id:0 msgid "Employee" -msgstr "" +msgstr "Pracownik" #. module: hr_holidays #: selection:hr.holidays,state:0 msgid "Waiting Validation" -msgstr "" +msgstr "Oczekujące na zatwierdzenie" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeeholidays0 msgid "Employee get holidays" -msgstr "" +msgstr "Pracownik dostaje urlop" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 @@ -276,36 +276,36 @@ msgstr "" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Wheat" -msgstr "" +msgstr "Pszenny" #. module: hr_holidays #: field:hr.holidays.log,nb_holidays:0 msgid "Number of Holidays Requested" -msgstr "" +msgstr "Liczba wnioskowanych dni urlopu" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request msgid "My Holiday Requests" -msgstr "" +msgstr "Moje wnioski o urlop" #. module: hr_holidays #: view:hr.holidays:0 #: view:hr.holidays.per.user:0 msgid "Number of Days" -msgstr "" +msgstr "Liczba dni" #. module: hr_holidays #: field:hr.holidays.status,name:0 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status msgid "Holiday Status" -msgstr "" +msgstr "Stan urlopu" #. module: hr_holidays #: wizard_view:hr.holidays.summary,init:0 #: wizard_view:hr.holidays.summary.employee,init:0 msgid "Report Options" -msgstr "" +msgstr "Opcje raportu" #. module: hr_holidays #: constraint:ir.ui.view:0 @@ -315,7 +315,7 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_approved0 msgid "His manager approves the request" -msgstr "" +msgstr "Jego zwierzchnik zaaprobował wniosek" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0 @@ -325,7 +325,7 @@ msgstr "" #. module: hr_holidays #: wizard_view:hr.holidays.summary.employee,notify:0 msgid "You have to select at least 1 Employee. Try again." -msgstr "" +msgstr "Musisz wybrać co najmniej jednego pracownika. Spróbuj ponownie." #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate @@ -335,24 +335,24 @@ msgstr "" #. module: hr_holidays #: wizard_field:hr.holidays.summary.employee,init,emp:0 msgid "Employee(s)" -msgstr "" +msgstr "Pracowników" #. module: hr_holidays #: field:hr.holidays,number_of_days:0 msgid "Number of Days in this Holiday Request" -msgstr "" +msgstr "Liczba wnioskowanych dni urlopu" #. module: hr_holidays #: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" -msgstr "" +msgstr "Urlopy wg pracowników" #. module: hr_holidays #: field:hr.holidays.status,limit:0 msgid "Allow to override Limit" -msgstr "" +msgstr "Pozwól przekroczyć limit" #. module: hr_holidays #: field:hr.holidays.log,holiday_user_id:0 @@ -362,7 +362,7 @@ msgstr "" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Lavender" -msgstr "" +msgstr "Lawendowy" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_log @@ -372,17 +372,17 @@ msgstr "" #. module: hr_holidays #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary msgid "Print Summary of Employee's Holidays" -msgstr "" +msgstr "Drukuj podsumowanie urlopów" #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_calendar0 msgid "Calendar" -msgstr "" +msgstr "Kalendarz" #. module: hr_holidays #: field:hr.holidays,date_from:0 msgid "Vacation start day" -msgstr "" +msgstr "Dzień rozpoczęcia urlopu" #. module: hr_holidays #: model:ir.module.module,description:hr_holidays.module_meta_information @@ -425,88 +425,88 @@ msgstr "" #: wizard_view:hr.holidays.summary,notify:0 #: wizard_view:hr.holidays.summary.employee,notify:0 msgid "Notification" -msgstr "" +msgstr "Powiadomienie" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_holidaysrequest0 msgid "Employee fills in a request for holidays" -msgstr "" +msgstr "Pracownik wypełnia wniosek o urlop" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_setholiday0 msgid "Holiday is set in the calendar." -msgstr "" +msgstr "Urlop został ustawiony w kalendarzu" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Coral" -msgstr "" +msgstr "Jasny koralowy" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available msgid "My Available Holidays" -msgstr "" +msgstr "Moje przysługujące urlopy" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Black" -msgstr "" +msgstr "Czarny" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse msgid "My Refused Holidays Requests" -msgstr "" +msgstr "Moje odrzucone wnioski o urlop" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_setholiday0 msgid "Set Holiday" -msgstr "" +msgstr "Ustaw urlop" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft msgid "My Draft Holidays Requests" -msgstr "" +msgstr "Moje projekty wniosków urlopowych" #. module: hr_holidays #: field:hr.holidays.per.user,max_leaves:0 msgid "Maximum Leaves Allowed" -msgstr "" +msgstr "Maksymalna liczba dni urlopowych" #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" -msgstr "" +msgstr "Stan" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Ivory" -msgstr "" +msgstr "Kość słoniowa" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday msgid "My Holidays Request" -msgstr "" +msgstr "Moje wnioski urlopowe" #. module: hr_holidays #: field:hr.holidays.status,color_name:0 msgid "Color of the status" -msgstr "" +msgstr "Kolor stanu" #. module: hr_holidays #: selection:hr.holidays.summary,init,holiday_type:0 msgid "Both Validated and Confirmed" -msgstr "" +msgstr "Zarówno potwierdzone jak i zatwierdzone" #. module: hr_holidays #: field:hr.holidays.per.user,leaves_taken:0 msgid "Leaves Already Taken" -msgstr "" +msgstr "Wykorzystane nieobecności" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." -msgstr "" +msgstr "urlopy." #. module: hr_holidays #: selection:hr.holidays,state:0 @@ -516,68 +516,68 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays.per.user,user_id:0 msgid "User" -msgstr "" +msgstr "Użytkownik" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" -msgstr "" +msgstr "Dokument dla pracownika" #. module: hr_holidays #: field:hr.holidays.log,date:0 msgid "Date" -msgstr "" +msgstr "Data" #. module: hr_holidays #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0 msgid "Reufse" -msgstr "" +msgstr "Odmów" #. module: hr_holidays #: field:hr.holidays.status,section_id:0 msgid "Section" -msgstr "" +msgstr "Sekcja" #. module: hr_holidays #: field:hr.holidays,manager_id:0 msgid "Holiday manager" -msgstr "" +msgstr "Menedżer urlopów" #. module: hr_holidays #: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" -msgstr "" +msgstr "Aktywny" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft msgid "My Holidays Request Draft" -msgstr "" +msgstr "Moje projekty wniosków urlopowych" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0 msgid "Approved Request" -msgstr "" +msgstr "Zaaprobowane wnioski." #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_holidaysrequest0 msgid "Holidays Request" -msgstr "" +msgstr "Wnioski urlopowe." #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting msgid "Holidays Requests Awaiting for Validation" -msgstr "" +msgstr "Wnioski urlopowe oczekujące na zatwierdzenie" #. module: hr_holidays #: view:hr.holidays:0 msgid "General" -msgstr "" +msgstr "Ogólne" #. module: hr_holidays #: view:hr.holidays.per.user:0 msgid "General Information" -msgstr "" +msgstr "Informacje ogólne" #. module: hr_holidays #: view:hr.holidays:0 @@ -585,7 +585,7 @@ msgstr "" #: wizard_button:hr.holidays.summary,init,end:0 #: wizard_button:hr.holidays.summary.employee,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Anuluj" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0 @@ -596,12 +596,12 @@ msgstr "" #: selection:hr.holidays.summary,init,holiday_type:0 #: selection:hr.holidays.summary.employee,init,holiday_type:0 msgid "Validated" -msgstr "" +msgstr "Zatwierdzony" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse msgid "My Holidays Request Refused" -msgstr "" +msgstr "Moje odrzucone wnioski o urlop" #. module: hr_holidays #: constraint:ir.model:0 @@ -615,60 +615,60 @@ msgstr "" #: wizard_button:hr.holidays.summary,init,checkdept:0 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0 msgid "Print" -msgstr "" +msgstr "Drukuj" #. module: hr_holidays #: model:ir.actions.wizard,name:hr_holidays.holidays_summary #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary msgid "Print Summary of Holidays" -msgstr "" +msgstr "Drukuj podsumowanie urlopów" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,depts:0 msgid "Department(s)" -msgstr "" +msgstr "Dział(y)" #. module: hr_holidays #: field:hr.holidays,name:0 msgid "Description" -msgstr "" +msgstr "Opis" #. module: hr_holidays #: selection:hr.holidays,state:0 #: model:process.node,name:hr_holidays.process_node_refused0 msgid "Refused" -msgstr "" +msgstr "Odrzucone" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0 msgid "Request is approved." -msgstr "" +msgstr "Wniosek aprobowano." #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_holidaysdefinition0 msgid "Holidays Definition" -msgstr "" +msgstr "Definicje urlopów" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,holiday_type:0 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0 msgid "Select Holiday Type" -msgstr "" +msgstr "Wybierz typ urlopu" #. module: hr_holidays #: field:hr.holidays,case_id:0 msgid "Case" -msgstr "" +msgstr "Przypadek" #. module: hr_holidays #: field:hr.holidays,holiday_user_id:0 msgid "Holiday per user" -msgstr "" +msgstr "Urlopy na użytkownika" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_holidays0 msgid "Encode number of available holidays" -msgstr "" +msgstr "Wprowadź liczbę przysługujących dni urlopu" #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_legaldeclaration0 @@ -678,49 +678,49 @@ msgstr "" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Violet" -msgstr "" +msgstr "Fioletowy" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Red" -msgstr "" +msgstr "Czerwony" #. module: hr_holidays #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information msgid "Human Resources: Holidays management" -msgstr "" +msgstr "Zasoby ludzkie: zarządzanie urlopami" #. module: hr_holidays #: model:process.process,name:hr_holidays.process_process_holidaysprocess0 msgid "Holidays Process" -msgstr "" +msgstr "Proces urlopów" #. module: hr_holidays #: wizard_view:hr.holidays.summary,notify:0 msgid "You have to select at least 1 Department. Try again." -msgstr "" +msgstr "Musisz wybrac co najmniej jeden dział. Spróbuj ponownie." #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate msgid "My Holidays Request Validated" -msgstr "" +msgstr "Moje zatwierdzone wnioski urlopowe" #. module: hr_holidays #: field:hr.holidays.log,holiday_req_id:0 msgid "Holiday Request ID" -msgstr "" +msgstr "ID wniosku urlopowego" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Yellow" -msgstr "" +msgstr "Jasnożółty" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Pink" -msgstr "" +msgstr "Jasnoróżowy" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_refused0 msgid "His manager refuses the request" -msgstr "" +msgstr "Jego (Jej) zwierzchnik odrzucił wniosek" diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml index e9e0e6aae36..a5502b9450d 100644 --- a/addons/hr_holidays/report/hr_holidays_report_view.xml +++ b/addons/hr_holidays/report/hr_holidays_report_view.xml @@ -67,6 +67,7 @@ default="1" domain="[('user_id','=',uid)]"/> </field> + <field name="date"/> <newline/> <group expand="1" string="Group By..." colspan="10" col="12"> <filter string="Employee" name="employee" icon="terp-hr" context="{'group_by':'employee_id'}"/> diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml index fabc11d6021..01d3f4372ce 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml @@ -7,7 +7,7 @@ <field name="model">hr.holidays.summary.dept</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Holidays by Departement"> + <form string="Holidays by Department"> <group col="4" colspan="6"> <field name="date_from"/> <newline/> @@ -18,14 +18,14 @@ <separator colspan="4"/> <group col="2" colspan="4"> <button special="cancel" string="Cancel" icon='gtk-cancel'/> - <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-ok"/> + <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/> </group> </form> </field> </record> <record id="action_hr_holidays_summary_dept" model="ir.actions.act_window"> - <field name="name">Holidays by Departement</field> + <field name="name">Holidays by Department</field> <field name="type">ir.actions.act_window</field> <field name="res_model">hr.holidays.summary.dept</field> <field name="view_type">form</field> @@ -34,10 +34,11 @@ </record> <menuitem - name="Leaves by Departement" + name="Leaves by Department" parent="menu_hr_reporting_holidays" action="action_hr_holidays_summary_dept" id="menu_account_central_journal" + groups="base.group_extended" icon="STOCK_PRINT"/> </data> diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml index 0957083a136..ce87b1172b1 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml @@ -18,7 +18,7 @@ <separator colspan="4"/> <group col="2" colspan="4"> <button special="cancel" string="Cancel" icon='gtk-cancel'/> - <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-ok"/> + <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/> </group> </form> </field> diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index a86d430a36f..eac882874c7 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -90,6 +90,14 @@ class hr_applicant(osv.osv, crm.crm_case): 'response' : fields.integer("Response"), } + def onchange_job(self,cr, uid, ids, job, context={}): + result = {} + if job: + job_obj = self.pool.get('hr.job') + result['department_id'] = job_obj.browse(cr, uid, job).department_id.id + return {'value': result} + return {'value': {'department_id': []}} + def stage_previous(self, cr, uid, ids, context=None): """This function computes previous stage for case from its current stage using available stage for that case type diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml index ba3278b3c66..760c7f08f2f 100644 --- a/addons/hr_recruitment/hr_recruitment_menu.xml +++ b/addons/hr_recruitment/hr_recruitment_menu.xml @@ -37,7 +37,8 @@ <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" - parent="base.menu_hr"/> + parent="base.menu_hr" + sequence="1"/> <!-- ALL JOBS REQUESTS diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 4fba762dedf..617bcea4dbe 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -69,27 +69,27 @@ <field name="arch" type="xml"> <form string="Jobs - Recruitment Form"> <group colspan="4" col="8"> - <field name="name" string="Subject"/> - <label string="Stage: " align="1.0"/> - <group colspan="1" col="3"> - <field name="stage_id" nolabel="1"/> + <group colspan="3" col="6"> + <field name="name" string="Subject"/> + <field name="stage_id"/> <button name="stage_previous" string="" type="object" icon="gtk-go-back"/> <button icon="gtk-go-forward" string="" name="stage_next" type="object"/> </group> - <field name="user_id"/> - <button string="Schedule a Phone Call" - name="%(action_hr_recruitment_phonecall)d" icon="gtk-redo" type="action"/> - <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" - icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}"/> <newline/> - <field name="partner_name"/> - <field name="job_id"/> - <field name="department_id" widget="selection"/> - <button name="action_makeMeeting" type="object" - string="Schedule Meeting" icon="terp-hr" /> - <button name="action_print_survey" string="Print Interview" type="object" - icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/> - </group> + <group colspan="3" col="6"> + <field name="partner_name"/> + <field name="job_id" on_change="onchange_job(job_id)"/> + <button string="Schedule a Phone Call" name="223" icon="gtk-redo" type="action"/> + </group> + <newline/> + <group colspan="3" col="6"> + <field name="user_id"/> + <field name="department_id" widget="selection"/> + <button name="action_makeMeeting" type="object" string="Schedule Meeting" icon="terp-hr"/> + </group> + <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/> + <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant', 'cur_id' :active_id}" attrs="{'readonly':[('survey','=',False)]}" groups="base.group_extended"/> + </group> <notebook colspan="4"> <page string="Job Info"> <group col="2" colspan="2"> diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 98ff0721988..8e0c3f0845a 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -139,8 +139,8 @@ <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_hr_recruitment_report_search"/> </record> - <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/> - <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="0"/> + <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/> + <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="2"/> </data> </openerp> diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index e89d52659f4..25c61483391 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -43,7 +43,8 @@ class hr_analytic_timesheet(osv.osv): _inherits = {'account.analytic.line': 'line_id'} _order = "id desc" _columns = { - 'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'), + 'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'), + 'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id',relation='account.analytic.account',store=True), } def unlink(self, cr, uid, ids, context={}): diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml index 6fa7185c7e9..f161c8c07f9 100644 --- a/addons/hr_timesheet/hr_timesheet_report.xml +++ b/addons/hr_timesheet/hr_timesheet_report.xml @@ -5,12 +5,12 @@ id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" - sequence="40" /> + sequence="10" /> <menuitem id="menu_hr_reporting_timesheet" name="Timesheet" parent="hr.menu_hr_reporting" - sequence="1" /> + sequence="4" /> <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/> <!--<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/> diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po index 25e13552267..8cec04074d3 100644 --- a/addons/hr_timesheet/i18n/pl.po +++ b/addons/hr_timesheet/i18n/pl.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 14:48+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-05-12 20:02+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-04-17 04:11+0000\n" +"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet #: wizard_view:hr.analytical.timesheet,init:0 #: wizard_view:hr.analytical.timesheet.my,init:0 msgid "Choose your month" -msgstr "" +msgstr "Wybierz miesiąc" #. module: hr_timesheet #: constraint:ir.model:0 @@ -33,7 +33,7 @@ msgstr "" #. module: hr_timesheet #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet msgid "Employee timesheet" -msgstr "" +msgstr "Karta czasu pracy pracownika" #. module: hr_timesheet #: model:ir.actions.wizard,name:hr_timesheet.si_so @@ -44,18 +44,18 @@ msgstr "" #. module: hr_timesheet #: wizard_button:hr_timesheet.si_so,sign_in,so_result_end:0 msgid "Stop Working" -msgstr "" +msgstr "Skończ pracę" #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_in:0 msgid "(Keep empty for current_time)" -msgstr "" +msgstr "(Zostaw puste dla bieżącego czasu)" #. module: hr_timesheet #: constraint:product.template:0 msgid "" "Error: The default UOM and the purchase UOM must be in the same category." -msgstr "" +msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii." #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_in:0 @@ -65,24 +65,24 @@ msgstr "" #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_out:0 msgid "(Keep empty for current time)" -msgstr "" +msgstr "(Pozostaw puste dla bieżącego czasu)" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_out,server_date:0 msgid "Current Date" -msgstr "" +msgstr "Bieżąca data" #. module: hr_timesheet #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: hr_timesheet #: wizard_button:hr.analytical.timesheet,init,report:0 #: wizard_button:hr.analytical.timesheet.my,init,report:0 #: wizard_button:hr.analytical.timesheet_users,init,report:0 msgid "Print" -msgstr "" +msgstr "Drukuj" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,analytic_amount:0 @@ -92,18 +92,18 @@ msgstr "" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,server_date:0 msgid "Current Server Date" -msgstr "" +msgstr "Bieżąca data na serwerze" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,date_start:0 #: wizard_field:hr_timesheet.si_so,sign_out,date:0 msgid "Starting Date" -msgstr "" +msgstr "Data rozpoczęcia" #. module: hr_timesheet #: field:hr.employee,product_id:0 msgid "Product" -msgstr "" +msgstr "Produkt" #. module: hr_timesheet #: selection:hr.analytical.timesheet,init,month:0 @@ -115,18 +115,18 @@ msgstr "" #. module: hr_timesheet #: field:hr.employee,journal_id:0 msgid "Analytic Journal" -msgstr "" +msgstr "Dziennik analityczny" #. module: hr_timesheet #: model:product.uom,name:hr_timesheet.uom_hour msgid "Hour" -msgstr "" +msgstr "Godzina" #. module: hr_timesheet #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet msgid "Employee Timesheet" -msgstr "" +msgstr "Karta czasu pracy pracownika" #. module: hr_timesheet #: view:account.analytic.account:0 @@ -138,17 +138,17 @@ msgstr "" #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_all_form #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_today_form msgid "Working Hours" -msgstr "" +msgstr "Godziny pracy" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Timesheet Lines" -msgstr "" +msgstr "Pozycje karty czasu pracy" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Total time" -msgstr "" +msgstr "Całkowity czas" #. module: hr_timesheet #: selection:hr.analytical.timesheet,init,month:0 @@ -162,7 +162,7 @@ msgstr "" #: xsl:hr.analytical.timesheet_users:0 #: model:ir.ui.menu,name:hr_timesheet.next_id_48 msgid "Timesheet" -msgstr "" +msgstr "Karta czasu pracy" #. module: hr_timesheet #: selection:hr.analytical.timesheet,init,month:0 @@ -188,7 +188,7 @@ msgstr "" #: wizard_field:hr.analytical.timesheet,init,user_id:0 #: wizard_field:hr.analytical.timesheet.my,init,user_id:0 msgid "User" -msgstr "" +msgstr "Użytkownik" #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_out:0 @@ -199,27 +199,27 @@ msgstr "" #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form msgid "Working Hours of The Day" -msgstr "" +msgstr "Godziny robocze dnia" #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_out:0 msgid "(local time on the server side)" -msgstr "" +msgstr "(czas lokalny na serwerze)" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Total cost" -msgstr "" +msgstr "Suma kasztów" #. module: hr_timesheet #: model:product.uom,name:hr_timesheet.uom_day msgid "Day" -msgstr "" +msgstr "Dzień" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,date:0 msgid "Closing Date" -msgstr "" +msgstr "Data zamknięcia" #. module: hr_timesheet #: constraint:ir.ui.view:0 @@ -236,17 +236,17 @@ msgstr "" #. module: hr_timesheet #: field:hr.analytic.timesheet,line_id:0 msgid "Analytic line" -msgstr "" +msgstr "Pozycja analityczna" #. module: hr_timesheet #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" -msgstr "" +msgstr "Błąd: JS musi być innej kategorii niż JM." #. module: hr_timesheet #: wizard_view:hr.analytical.timesheet_users,init:0 msgid "Choose Users" -msgstr "" +msgstr "Wybierz użytkowników" #. module: hr_timesheet #: selection:hr.analytical.timesheet,init,month:0 @@ -263,18 +263,18 @@ msgstr "" #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_in:0 msgid "Work done in the last period" -msgstr "" +msgstr "Praca wykonana w ostatnim okresie" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Key dates" -msgstr "" +msgstr "Kluczowe daty" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,state:0 #: wizard_field:hr_timesheet.si_so,sign_out,state:0 msgid "Current state" -msgstr "" +msgstr "Bieżący stan" #. module: hr_timesheet #: selection:hr.analytical.timesheet,init,month:0 @@ -298,13 +298,13 @@ msgstr "" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,info:0 msgid "Work Description" -msgstr "" +msgstr "Opis pracy" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,name:0 #: wizard_field:hr_timesheet.si_so,sign_out,name:0 msgid "Employee's name" -msgstr "" +msgstr "Nazwisko pracownika" #. module: hr_timesheet #: model:product.template,name:hr_timesheet.product_consultant_product_template @@ -315,23 +315,23 @@ msgstr "" #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_me_all_form #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_me_all_form msgid "My Working Hours" -msgstr "" +msgstr "Moje godziny robocze" #. module: hr_timesheet #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet msgid "Timesheet line" -msgstr "" +msgstr "Pozycja karty czasu pracy" #. module: hr_timesheet #: xsl:hr.analytical.timesheet:0 msgid "Sum" -msgstr "" +msgstr "Suma" #. module: hr_timesheet #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_today_form_my #: model:ir.ui.menu,name:hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form_my msgid "My Working Hours of The Day" -msgstr "" +msgstr "Moje godziny robocze w dniu" #. module: hr_timesheet #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information @@ -349,7 +349,7 @@ msgstr "" #: xsl:hr.analytical.timesheet:0 #: xsl:hr.analytical.timesheet_users:0 msgid "Total" -msgstr "" +msgstr "Suma" #. module: hr_timesheet #: selection:hr.analytical.timesheet,init,month:0 @@ -361,12 +361,12 @@ msgstr "" #. module: hr_timesheet #: wizard_button:hr_timesheet.si_so,sign_out,si_result:0 msgid "Start Working" -msgstr "" +msgstr "Rozpocznij pracę" #. module: hr_timesheet #: wizard_button:hr_timesheet.si_so,sign_in,so_result:0 msgid "Change Work" -msgstr "" +msgstr "Zmień pracę" #. module: hr_timesheet #: selection:hr.analytical.timesheet,init,month:0 @@ -386,27 +386,27 @@ msgstr "" #: wizard_field:hr.analytical.timesheet.my,init,month:0 #: wizard_field:hr.analytical.timesheet_users,init,month:0 msgid "Month" -msgstr "" +msgstr "Miesiąc" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Konto analityczne" #. module: hr_timesheet #: wizard_view:hr_timesheet.si_so,sign_in:0 msgid "General Information" -msgstr "" +msgstr "Informacje ogólne" #. module: hr_timesheet #: model:process.process,name:hr_timesheet.process_process_timesheetprocess0 msgid "Timesheet Process" -msgstr "" +msgstr "Proces karty czasu pracy" #. module: hr_timesheet #: constraint:product.product:0 msgid "Error: Invalid ean code" -msgstr "" +msgstr "Błąd: Niedozwolony kod EAN" #. module: hr_timesheet #: view:account.analytic.account:0 @@ -416,19 +416,19 @@ msgstr "" #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Timesheet Line" -msgstr "" +msgstr "Pozycja karty czasu pracy" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "Analysis summary" -msgstr "" +msgstr "Podsumowanie analizy" #. module: hr_timesheet #: wizard_field:hr.analytical.timesheet,init,year:0 #: wizard_field:hr.analytical.timesheet.my,init,year:0 #: wizard_field:hr.analytical.timesheet_users,init,year:0 msgid "Year" -msgstr "" +msgstr "Rok" #. module: hr_timesheet #: wizard_button:hr.analytical.timesheet,init,end:0 @@ -437,30 +437,30 @@ msgstr "" #: wizard_button:hr_timesheet.si_so,sign_in,end:0 #: wizard_button:hr_timesheet.si_so,sign_out,end:0 msgid "Cancel" -msgstr "" +msgstr "Anuluj" #. module: hr_timesheet #: view:account.analytic.account:0 #: wizard_field:hr.analytical.timesheet_users,init,user_ids:0 msgid "Users" -msgstr "" +msgstr "Użytkownicy" #. module: hr_timesheet #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime msgid "Working Time" -msgstr "" +msgstr "Czas pracy" #. module: hr_timesheet #: view:account.analytic.account:0 msgid "To be invoiced" -msgstr "" +msgstr "Do zafakturowania" #. module: hr_timesheet #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users #: model:ir.ui.menu,name:hr_timesheet.menu_wizard_hr_timesheet_users msgid "Employees Timesheet" -msgstr "" +msgstr "Karty czasu pracy pracowników" #. module: hr_timesheet #: selection:hr.analytical.timesheet,init,month:0 @@ -472,4 +472,4 @@ msgstr "" #. module: hr_timesheet #: view:hr.employee:0 msgid "Timesheets" -msgstr "" +msgstr "Karty czasu pracy" diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml index a3b53a05d22..d6c7398864a 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml @@ -16,7 +16,7 @@ </group> <group colspan="4" col="6"> <button icon="gtk-cancel" special="cancel" string="Cancel"/> - <button icon="gtk-print" string="Print" name="print_report" type="object"/> + <button icon="gtk-yes" string="Print" name="print_report" type="object"/> </group> </form> </field> @@ -34,7 +34,7 @@ <menuitem action="action_hr_timesheet_employee" id="menu_hr_timesheet_employee" parent="menu_hr_reporting_timesheet" - groups="hr.group_hr_manager" /> + groups="base.group_extended"/> <!-- Print My Timesheet --> @@ -47,11 +47,10 @@ <group colspan="4" > <field name="month" /> <field name="year" /> - <field name="user_id" colspan="3" readonly="1" /> </group> <group colspan="4" col="6"> <button icon="gtk-cancel" special="cancel" string="Cancel"/> - <button icon="gtk-print" string="Print" name="print_report" type="object"/> + <button icon="gtk-yes" string="Print" name="print_report" type="object"/> </group> </form> </field> diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml index 4e12f4f2333..de834621c23 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml @@ -16,7 +16,7 @@ </group> <group colspan="4" col="6"> <button icon="gtk-cancel" special="cancel" string="Cancel"/> - <button icon="gtk-print" string="Print" name="print_report" type="object"/> + <button icon="gtk-yes" string="Print" name="print_report" type="object"/> </group> </form> </field> diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml index 487208bfbf6..6f6ce56b091 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml @@ -52,6 +52,7 @@ <menuitem action="action_hr_timesheet_sign_in" id="menu_hr_timesheet_sign_in" + groups="base.group_extended" parent="hr_attendance.menu_hr_time_tracking" /> diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml index f2d9f5a8c4a..a801e21082b 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml @@ -5,12 +5,12 @@ id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" - sequence="40" /> + sequence="10" /> <menuitem id="menu_hr_reporting_timesheet_invoice" name="Timesheet Invoice" parent="hr.menu_hr_reporting" - sequence="2" /> + sequence="5" /> <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/> <!--<wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>--> diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po index 03cc490b8ca..3d50077a2ef 100644 --- a/addons/hr_timesheet_invoice/i18n/pl.po +++ b/addons/hr_timesheet_invoice/i18n/pl.po @@ -7,49 +7,49 @@ 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: 2009-09-08 16:18+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-05-12 20:08+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-04-17 04:12+0000\n" +"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet_invoice #: view:hr_timesheet_invoice.factor:0 msgid "Type of invoicing" -msgstr "" +msgstr "Typ fakturowania" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Profit" -msgstr "" +msgstr "Zysk" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.invoice.create,init:0 msgid "Force to use a specific product" -msgstr "" +msgstr "Wymuś stosowanie konkretnego produktu" #. module: hr_timesheet_invoice #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Income" -msgstr "" +msgstr "Przychód" #. module: hr_timesheet_invoice #: field:hr_timesheet_invoice.factor,customer_name:0 msgid "Visible name" -msgstr "" +msgstr "Nazwa widoczna" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date1:0 msgid "Start of period" -msgstr "" +msgstr "Początek okresu" #. module: hr_timesheet_invoice #: help:hr.timesheet.invoice.create,init,price:0 @@ -57,33 +57,35 @@ msgid "" "The cost of each work done will be displayed on the invoice. You probably " "don't want to check this." msgstr "" +"Koszt każdej wykonanej pracy będzie widoczny na fakturze. Prawdopodobnie nie " +"chcesz tego zaznaczyć." #. module: hr_timesheet_invoice #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create msgid "Invoice analytic lines" -msgstr "" +msgstr "Analityczne pozycje faktury" #. module: hr_timesheet_invoice #: help:hr.timesheet.final.invoice.create,init,time:0 msgid "Display time in the history of works" -msgstr "" +msgstr "Wyświetlaj czas w historii prac" #. module: hr_timesheet_invoice #: 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 "Projekt kont analitycznych" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.final.invoice.create,init,time:0 #: wizard_field:hr.timesheet.invoice.create,init,time:0 msgid "Time spent" -msgstr "" +msgstr "Spędzony czas" #. module: hr_timesheet_invoice #: field:account.analytic.account,amount_invoiced:0 msgid "Invoiced Amount" -msgstr "" +msgstr "Kwota zafakturowana" #. module: hr_timesheet_invoice #: help:account.analytic.account,to_invoice:0 @@ -92,106 +94,109 @@ msgid "" "costs in this analytic account: timesheets, expenses, ...You can configure " "an automatic invoice rate on analytic accounts." msgstr "" +"Zaznacz to pole, jeśli planujesz automatyczną generację faktur na podstawie " +"kosztów z konta analitycznego: kart czasu pracy, wydatków,,,. Możesz " +"skonfigurować współczynnik automatycznych faktur wg kont analitycznych." #. 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 "Szczegóły każdej wykonanej pracy będą widoczne w fakturze" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init:0 msgid "Select period" -msgstr "" +msgstr "Wybierz okres" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Period to enddate" -msgstr "" +msgstr "Okres do daty końcowej" #. module: hr_timesheet_invoice #: wizard_button:hr.timesheet.invoice.create,init,create:0 msgid "Create Invoices" -msgstr "" +msgstr "Utwórz faktury" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Period from startdate" -msgstr "" +msgstr "Okres od daty rozpoczęcia" #. 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 "Czas każdej wykonanej pracy będzie widoczny w fakturze" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.final.invoice.create,init,balance_product:0 msgid "Balance product" -msgstr "" +msgstr "Saldo produktu" #. module: hr_timesheet_invoice #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_final_invoice_create msgid "Final Invoice" -msgstr "" +msgstr "Faktura końcowa" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.final.invoice.create,init:0 msgid "Do you want details for each line of the invoices ?" -msgstr "" +msgstr "Czy chcesz szczegóły dla każdej pozycji faktury?" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Date or Code" -msgstr "" +msgstr "Data lub kod" #. 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 "Zapisy do zafakturowania" #. module: hr_timesheet_invoice #: wizard_view:account.analytic.profit,init:0 msgid "Choose" -msgstr "" +msgstr "Wybierz" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Debit" -msgstr "" +msgstr "Winien" #. module: hr_timesheet_invoice #: wizard_button:account.analytic.profit,init,report:0 #: wizard_button:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,report:0 msgid "Print" -msgstr "" +msgstr "Drukuj" #. module: hr_timesheet_invoice #: 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 "Otwórz konta analityczne" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.invoice.create,init:0 msgid "Filter on Accounts" -msgstr "" +msgstr "Filtruj wg kont" #. module: hr_timesheet_invoice #: model:ir.actions.report.xml,name:hr_timesheet_invoice.report_analytical_profit #: model:ir.actions.wizard,name:hr_timesheet_invoice.account_analytic_profit #: model:ir.ui.menu,name:hr_timesheet_invoice.print_account_analytic_profit msgid "Timesheet Profit" -msgstr "" +msgstr "Zysk karty czasu pracy" #. module: hr_timesheet_invoice #: field:account.analytic.account,pricelist_id:0 msgid "Sale Pricelist" -msgstr "" +msgstr "Cennik sprzedaży" #. module: hr_timesheet_invoice #: help:hr.timesheet.final.invoice.create,init,name:0 msgid "Display detail of work in the invoice line." -msgstr "" +msgstr "Wyświetl szczegóły pracy w pozycjach faktury." #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 @@ -201,7 +206,7 @@ msgstr "" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Printing date" -msgstr "" +msgstr "Data druku" #. module: hr_timesheet_invoice #: constraint:ir.ui.view:0 @@ -212,34 +217,34 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!" #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form #: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view msgid "Types of Invoicing" -msgstr "" +msgstr "Typy fakturowań" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Theorical" -msgstr "" +msgstr "Teoretyczny" #. module: hr_timesheet_invoice #: 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 "Moje niezafakturowane zapisy" #. 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 "Nazwa zapisu" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Employee or Journal Name" -msgstr "" +msgstr "Pracownik lub nazwa dziennika" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Currency" -msgstr "" +msgstr "Waluta" #. module: hr_timesheet_invoice #: help:hr.timesheet.invoice.create,init,product:0 @@ -247,75 +252,77 @@ 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 "" +"Wypełnij to pole, jeśli chcesz wymusić stosowanie konkretnego produktu. " +"Pozostaw puste, by stosować pierwotny produkt pochodzący z kosztu." #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced msgid "Uninvoiced Entries" -msgstr "" +msgstr "Niezafakturowane zapisy." #. module: hr_timesheet_invoice #: wizard_button:hr.timesheet.final.invoice.create,init,create:0 msgid "Create invoices" -msgstr "" +msgstr "Utwórz faktury" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.final.invoice.create,init:0 msgid "Invoice Balance amount" -msgstr "" +msgstr "Kwota salda faktury" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Invoice rate by user" -msgstr "" +msgstr "Kurs faktury wg użytkownika" #. module: hr_timesheet_invoice #: wizard_field:account.analytic.profit,init,date_from:0 msgid "From" -msgstr "" +msgstr "Od" #. module: hr_timesheet_invoice #: help:account.analytic.account,amount_invoiced:0 msgid "Total invoiced" -msgstr "" +msgstr "Suma zafakturowana" #. module: hr_timesheet_invoice #: view:account.analytic.account:0 msgid "Status" -msgstr "" +msgstr "Stan" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Period to" -msgstr "" +msgstr "Okres do" #. module: hr_timesheet_invoice #: help:hr.timesheet.final.invoice.create,init,balance_product:0 msgid "The product that will be used to invoice the remaining amount." -msgstr "" +msgstr "Produkt, który będzie zastosowany do fakturowania pozostałej kwoty." #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 #: model:ir.actions.report.xml,name:hr_timesheet_invoice.account_analytic_account_cost_ledger #: model:ir.actions.wizard,name:hr_timesheet_invoice.account_analytic_account_cost_ledger_report msgid "Cost Ledger" -msgstr "" +msgstr "Rejestr kosztów" #. module: hr_timesheet_invoice #: help:hr.timesheet.final.invoice.create,init,date:0 msgid "Display date in the history of works" -msgstr "" +msgstr "Wyświetl daty w historii prac" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.final.invoice.create,init,date:0 #: wizard_field:hr.timesheet.invoice.create,init,date:0 msgid "Date" -msgstr "" +msgstr "Data" #. module: hr_timesheet_invoice #: field:hr_timesheet_invoice.factor,factor:0 msgid "Discount (%)" -msgstr "" +msgstr "Upust (%)" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 @@ -325,62 +332,62 @@ msgstr "" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.invoice.create,init,accounts:0 msgid "Analytic Accounts" -msgstr "" +msgstr "Konta analityczne" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Total:" -msgstr "" +msgstr "Suma:" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Credit" -msgstr "" +msgstr "Ma" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,date2:0 msgid "End of period" -msgstr "" +msgstr "Koniec okresu" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Balance" -msgstr "" +msgstr "Saldo" #. module: hr_timesheet_invoice #: field:account.analytic.account,to_invoice:0 msgid "Reinvoice Costs" -msgstr "" +msgstr "Refakturuj koszty" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Totals:" -msgstr "" +msgstr "Sumy:" #. module: hr_timesheet_invoice #: wizard_field:account.analytic.profit,init,date_to:0 msgid "To" -msgstr "" +msgstr "Do" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.invoice.create,init:0 msgid "Do you want to show details of work in invoice ?" -msgstr "" +msgstr "Czy chcesz pokazać szczegóły pracy w fakturze ?" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Period from" -msgstr "" +msgstr "Okres od" #. module: hr_timesheet_invoice #: field:account.analytic.account,amount_max:0 msgid "Max. Invoice Price" -msgstr "" +msgstr "Maks. cena faktury" #. module: hr_timesheet_invoice #: field:account.analytic.line,invoice_id:0 msgid "Invoice" -msgstr "" +msgstr "Faktura" #. module: hr_timesheet_invoice #: wizard_button:account.analytic.profit,init,end:0 @@ -388,7 +395,7 @@ msgstr "" #: wizard_button:hr.timesheet.invoice.account.analytic.account.cost_ledger.report,init,end:0 #: wizard_button:hr.timesheet.invoice.create,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Anuluj" #. module: hr_timesheet_invoice #: constraint:ir.model:0 @@ -401,27 +408,27 @@ msgstr "" #. module: hr_timesheet_invoice #: wizard_field:account.analytic.profit,init,employee_ids:0 msgid "Employee" -msgstr "" +msgstr "Pracownik" #. module: hr_timesheet_invoice #: help:hr.timesheet.invoice.create,init,date:0 msgid "The real date of each work will be displayed on the invoice" -msgstr "" +msgstr "Rzeczywista data każdej pracy będzie widoczna w fakturze" #. module: hr_timesheet_invoice #: help:hr.timesheet.final.invoice.create,init,price:0 msgid "Display cost of the item you reinvoice" -msgstr "" +msgstr "Wyświetl koszt elementu, który refakturujesz" #. module: hr_timesheet_invoice #: wizard_view:hr.timesheet.invoice.create,init:0 msgid "Choose accounts you want to invoice" -msgstr "" +msgstr "Wybierz konta do fakturowania" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.invoice.create,init,product:0 msgid "Product" -msgstr "" +msgstr "Produkt" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 @@ -431,17 +438,17 @@ msgstr "" #. module: hr_timesheet_invoice #: field:hr_timesheet_invoice.factor,name:0 msgid "Internal name" -msgstr "" +msgstr "Nazwa wewnętrzna" #. module: hr_timesheet_invoice #: wizard_field:account.analytic.profit,init,journal_ids:0 msgid "Journal" -msgstr "" +msgstr "Dziennik" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Units" -msgstr "" +msgstr "Jednostki" #. module: hr_timesheet_invoice #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information @@ -452,38 +459,38 @@ msgstr "" #: 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 "Oczekujące konta analityczne" #. module: hr_timesheet_invoice #: view:account.analytic.account:0 #: wizard_view:hr.timesheet.invoice.create,init:0 msgid "Invoicing Data" -msgstr "" +msgstr "Dane fakturowane" #. module: hr_timesheet_invoice #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor msgid "Invoice rate" -msgstr "" +msgstr "Współczynnik fakturowania" #. module: hr_timesheet_invoice #: view:hr_timesheet_invoice.factor:0 msgid "Types of invoicing" -msgstr "" +msgstr "Typy fakturowań" #. module: hr_timesheet_invoice #: field:account.analytic.line,to_invoice:0 msgid "Invoicing" -msgstr "" +msgstr "Fakturowanie" #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_open_invoice_analytic_accounts #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_open_invoice_analytic_accounts msgid "Unclosed Invoiceable Accounts" -msgstr "" +msgstr "Nie zamknięte konta fakturowalne" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 #: wizard_field:hr.timesheet.final.invoice.create,init,price:0 #: wizard_field:hr.timesheet.invoice.create,init,price:0 msgid "Cost" -msgstr "" +msgstr "Koszt" diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 4de60162d1a..cb6c8d5771c 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -441,6 +441,30 @@ <!-- Random Timesheet Lines of random activities --> + <record id="view_random_timesheet_lines_search" model="ir.ui.view"> + <field name="name">random.timesheet.lines.search</field> + <field name="model">random.timesheet.lines</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Search Timesheet Lines"> + <group col='15' colspan='4'> + <field name="date"/> + <field name="user_id" widget="selection"/> + <field name="product_id" widget="selection"/> + <field name="analytic_account_id" widget="selection"/> + <field name="general_account_id" widget="selection"/> + </group> + <newline/> + <group expand="1" string="Group By..." colspan="4" col="20"> + <filter string="User" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="Product" icon="terp-project" domain="[]" context="{'group_by':'product_id'}"/> + <filter string="Analytic Account" icon="terp-project" domain="[]" context="{'group_by':'analytic_account_id'}"/> + <filter string="General Account" icon="terp-project" domain="[]" context="{'group_by':'general_account_id'}"/> + </group> + </search> + </field> + </record> + <record model="ir.ui.view" id="view_random_timesheet_lines_tree"> <field name="name">random.timesheet.lines.tree</field> <field name="model">random.timesheet.lines</field> @@ -448,7 +472,7 @@ <field name="arch" type="xml"> <tree string="Random Timesheets Lines"> <field name="date" select="1"/> - <field name="user_id" /> + <field name="user_id"/> <field name="name" select="1"/> <field name="quantity" /> <field name="product_id" select="1"/> diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml index f79cae2eef8..b68112a5a38 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml @@ -17,7 +17,7 @@ <separator colspan="4"/> <group col="2" colspan="4"> <button special="cancel" string="Cancel" icon='gtk-cancel'/> - <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> + <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/> </group> </form> </field> @@ -34,7 +34,7 @@ <menuitem action="action_hr_timesheet_analytic_profit" id="menu_hr_timesheet_analytic_profit" - parent="menu_hr_reporting_timesheet_invoice" groups="hr.group_hr_manager" /> + parent="menu_hr_reporting_timesheet_invoice" groups="base.group_extended"/> </data> </openerp>
\ No newline at end of file diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml index c8f9806a309..ea14e52ed52 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml @@ -15,7 +15,7 @@ <separator colspan="4"/> <group col="2" colspan="4"> <button special="cancel" string="Cancel" icon='gtk-cancel'/> - <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> + <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/> </group> </form> </field> diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 1a8b110d690..eae4e8e1e9a 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -114,7 +114,7 @@ </group> <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance"> - <tree string="Attendances"> + <tree string="Attendances" editable="bottom"> <field name="name"/> <field name="action"/> <field invisible="1" name="employee_id"/> @@ -192,7 +192,7 @@ <field name="arch" type="xml"> <search string="Search Timesheet"> <group col="10" colspan="4"> - <filter icon="terp-partner" string="My Timesheet" domain="[('user_id','=',uid)]" help="My Timesheets" /> + <filter name="my_timesheet" icon="terp-partner" string="My Timesheet" domain="[('user_id','=',uid)]" help="My Timesheets" /> <separator orientation="vertical"/> <filter icon="terp-crm" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/> <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/> @@ -220,8 +220,10 @@ <field name="res_model">hr_timesheet_sheet.sheet</field> <field name="view_type">form</field> <field name="view_id" eval="False"/> + <field name="context">{'search_default_my_timesheet':1}</field> <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/> </record> + <!--Time Tracking menu in project Management--> <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/> <menuitem diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po index 8df3f40f7de..794f74a1fa4 100644 --- a/addons/hr_timesheet_sheet/i18n/pl.po +++ b/addons/hr_timesheet_sheet/i18n/pl.po @@ -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: 2009-09-16 16:02+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-05-12 20:09+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-04-17 04:13+0000\n" +"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet_sheet @@ -27,6 +27,8 @@ msgid "" "You can not have 2 timesheets that overlaps !\n" "Please use the menu 'My Current Timesheet' to avoid this problem." msgstr "" +"Nie możesz mieć dwóch kart czasu pracy nachodzących na siebie !\n" +"Stosuj menu 'Moje bieżące karty czasu pracy', żeby nie mieć tego problemu." #. module: hr_timesheet_sheet #: field:hr.analytic.timesheet,sheet_id:0 @@ -34,40 +36,40 @@ msgstr "" #: field:hr_timesheet_sheet.sheet.account,sheet_id:0 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0 msgid "Sheet" -msgstr "" +msgstr "Karta" #. module: hr_timesheet_sheet #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,total_attendance:0 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0 #: view:hr_timesheet_sheet.sheet.day:0 msgid "Total Attendance" -msgstr "" +msgstr "Suma obecności" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_confirm #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_confirm msgid "My timesheets to confirm" -msgstr "" +msgstr "Moje karty czasu pracy do zatwierdzenia" #. module: hr_timesheet_sheet #: field:res.company,timesheet_range:0 msgid "Timeshet range" -msgstr "" +msgstr "Zakres karty czasu pracy" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Today" -msgstr "" +msgstr "Dziś" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0 msgid "Confirm timesheet sheet" -msgstr "" +msgstr "Potwierdź kartę czasu pracy" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -75,12 +77,12 @@ msgstr "" #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetconfirming0 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0 msgid "Timesheet" -msgstr "" +msgstr "Karta czasu pracy" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Set to Draft" -msgstr "" +msgstr "Ustaw na projekt" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0 @@ -90,28 +92,28 @@ msgstr "" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0 msgid "Draft Timesheet sheet" -msgstr "" +msgstr "Projekt zestawień kart czasu pracy" #. module: hr_timesheet_sheet #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my_current #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current msgid "My Current Timesheet" -msgstr "" +msgstr "Moja bieżąca karta czasu pracy" #. module: hr_timesheet_sheet #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0 msgid "Validate" -msgstr "" +msgstr "Zatwierdź" #. module: hr_timesheet_sheet #: selection:res.company,timesheet_range:0 msgid "Day" -msgstr "" +msgstr "Dzień" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state_attendance:0 msgid "Present" -msgstr "" +msgstr "Obecny(a)" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -122,17 +124,17 @@ msgstr "Odmów" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0 msgid "Validated Timesheet" -msgstr "" +msgstr "Zatwierdzona karta czasu pracy" #. module: hr_timesheet_sheet #: constraint:hr_timesheet_sheet.sheet:0 msgid "You must select a Current date wich is in the timesheet dates !" -msgstr "" +msgstr "Musisz wybrac datę bieżącą, która jest w karcie czasu pracy !" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.day:0 msgid "Total Difference" -msgstr "" +msgstr "Suma różnic" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_phonecallencoding0 @@ -142,12 +144,12 @@ msgstr "" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account msgid "Timesheet by Day" -msgstr "" +msgstr "Karta czasu pracy wg dni" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0 msgid "Defines the task work entry into timesheet line" -msgstr "" +msgstr "Definiuje pracę zadania do pozycji karty czasu pracy" #. module: hr_timesheet_sheet #: help:res.company,timesheet_max_difference:0 @@ -159,49 +161,49 @@ msgstr "" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.day:0 msgid "Timesheet by Days" -msgstr "" +msgstr "Karta czasu pracy wg dni" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0 msgid "timesheet is confirmed at the end of the week / month" -msgstr "" +msgstr "karta czasu pracy jest zatwierdzana na koniec tygodnia / miesiąca" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.account,name:0 msgid "Analytic Account" -msgstr "" +msgstr "Konto analityczne" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0 msgid "Project Timesheet" -msgstr "" +msgstr "karta czasu pracy projektu" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_from:0 msgid "Date from" -msgstr "" +msgstr "Data od" #. module: hr_timesheet_sheet #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0 msgid "Hr Timesheet Process" -msgstr "" +msgstr "Proces karty czasu pracy Zas. Ludz." #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_analyticcost0 msgid "Analytic cost" -msgstr "" +msgstr "Koszt analityczny" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 msgid "Confirmed" -msgstr "" +msgstr "Potwierdzone" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.day,total_attendance:0 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0 msgid "Attendance" -msgstr "" +msgstr "Obecności" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -212,67 +214,67 @@ msgstr "Potwierdź" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,timesheet_ids:0 msgid "Timesheet lines" -msgstr "" +msgstr "Pozycje karty czasu pracy" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_timesheetline0 msgid "Encode your timesheet line" -msgstr "" +msgstr "Wporwadź twoją pozycje karty czasu pracy" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0 msgid "Confirm Timesheet" -msgstr "" +msgstr "Zatwierdź kartę czasu pracy" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0 msgid "Control by the project manager" -msgstr "" +msgstr "Sprawdzane przez menedżera projektu" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 msgid "New" -msgstr "" +msgstr "Nowa" #. 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 "Zestawienie kart czasu pracy zatwierdzane na koniec okresu" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.account,total:0 msgid "Total Time" -msgstr "" +msgstr "Czas całkowity" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet msgid "Timesheet Lines" -msgstr "" +msgstr "Pozycje karty czasu pracy" #. 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 "Zatwierdź kartę czasu pracy na koniec okresu" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state_attendance:0 msgid "No employee defined" -msgstr "" +msgstr "Nie zdefiniowano pracownika" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0 msgid "Confirmed Timesheet" -msgstr "" +msgstr "Karta czasu pracy zatwierdzona" #. module: hr_timesheet_sheet #: view:res.company:0 msgid "Configuration" -msgstr "Ustawienia" +msgstr "Konfiguracja" #. module: hr_timesheet_sheet #: selection:res.company,timesheet_range:0 msgid "Week" -msgstr "" +msgstr "Tydzień" #. module: hr_timesheet_sheet #: constraint:ir.ui.view:0 @@ -282,56 +284,56 @@ msgstr "XML niewłaściwy dla tej architektury wyświetlania!" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Daily View" -msgstr "" +msgstr "Widok dniowy" #. module: hr_timesheet_sheet #: 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 "Karty czasu pracy wg okresu" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Sign In" -msgstr "" +msgstr "Zaloguj się" #. module: hr_timesheet_sheet #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_current #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current msgid "My Department's Timesheet" -msgstr "" +msgstr "Karta czasu pracy mojego działu" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Go to:" -msgstr "" +msgstr "Idź do:" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0 msgid "Phone call" -msgstr "" +msgstr "Rozmowa telefoniczna" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,total_timesheet:0 #: field:hr_timesheet_sheet.sheet,total_timesheet_day:0 #: view:hr_timesheet_sheet.sheet.day:0 msgid "Total Timesheet" -msgstr "" +msgstr "Suma karty czasu pracy" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_reviewofwork0 msgid "Review of work" -msgstr "" +msgstr "Przegląd pracy" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0 msgid "Invoice on Work" -msgstr "" +msgstr "Faktura za pracę" #. module: hr_timesheet_sheet #: selection:res.company,timesheet_range:0 msgid "Month" -msgstr "" +msgstr "Miesiąc" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0 @@ -342,12 +344,12 @@ msgstr "" #: model:process.node,name:hr_timesheet_sheet.process_node_review0 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0 msgid "Review" -msgstr "" +msgstr "Przegląd" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 msgid "Draft" -msgstr "" +msgstr "Projekt" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 @@ -357,58 +359,58 @@ msgstr "" #: model:ir.ui.menu,name:hr_timesheet_sheet.next_id_60 #: view:res.company:0 msgid "Timesheets" -msgstr "" +msgstr "Karty czasu pracy" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_confirm #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_all_confirm msgid "Timesheets To Confirm" -msgstr "" +msgstr "Karty czasu pracy do zatwierdzenia" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,state:0 msgid "Status" -msgstr "" +msgstr "Stan" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_to:0 msgid "Date to" -msgstr "" +msgstr "Data do" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,state_attendance:0 msgid "Current Status" -msgstr "" +msgstr "Bieżący stan" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0 msgid "Invoice on timesheet" -msgstr "" +msgstr "Faktura z karty czasu pracy" #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0 msgid "Invoice based on timesheet" -msgstr "" +msgstr "Faktura oparta o kartę czasu pracy" #. 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 "Karta czasu pracy wg kont" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.day,name:0 msgid "Date" -msgstr "" +msgstr "Data" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,user_id:0 msgid "User" -msgstr "" +msgstr "Użytkownik" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0 msgid "Creates invoice based on timesheet" -msgstr "" +msgstr "Tworzy fakturę w oparciu o kartę czasu pracy" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_all_valid @@ -419,38 +421,38 @@ msgstr "" #. module: hr_timesheet_sheet #: field:res.company,timesheet_max_difference:0 msgid "Timesheet allowed difference" -msgstr "" +msgstr "Dozowolone różnice w karcie czasu pracy" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 #: field:hr_timesheet_sheet.sheet,period_ids:0 msgid "Period" -msgstr "" +msgstr "Okres" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 msgid "Done" -msgstr "" +msgstr "Wykonano" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0 msgid "Attendance entry moves into the timesheet" -msgstr "" +msgstr "Przenoszenie zapisów obecności do karty czasu pracy" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_createanalyticcose0 msgid "Creates your analytic cost accoording to quantity" -msgstr "" +msgstr "Tworzy twoje koszty analityczne według ilości" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0 msgid "Timesheet Line" -msgstr "" +msgstr "Pozycja karty czasu pracy" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 msgid "Timesheet by Accounts" -msgstr "" +msgstr "Karta czasu pracy wg kont" #. module: hr_timesheet_sheet #: constraint:ir.model:0 @@ -463,57 +465,57 @@ msgstr "" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0 msgid "Timesheet is validate by project manager." -msgstr "" +msgstr "Karta czasu pracy została zatwierdzona przez menedżera." #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_phonecall0 msgid "Whatever time u spent for phone call" -msgstr "" +msgstr "Czas spędzony na rozmowach telefonicznych" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0 msgid "Validate Timesheet" -msgstr "" +msgstr "Zatwierdź kartę czasu pracy" #. module: hr_timesheet_sheet #: model:ir.actions.wizard,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_department_confirm #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_confirm msgid "My Department's Timesheet to Confirm" -msgstr "" +msgstr "Karta czasu pracy mojego działu do zatwierdzenia" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 #: field:hr_timesheet_sheet.sheet,attendances_ids:0 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance msgid "Attendances" -msgstr "" +msgstr "Obecności" #. module: hr_timesheet_sheet #: model:process.transition,name:hr_timesheet_sheet.process_transition_createanalyticcose0 msgid "Create Analytic cost" -msgstr "" +msgstr "Utwórz koszt analityczny" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,name:0 msgid "Description" -msgstr "" +msgstr "Opis" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Sign Out" -msgstr "" +msgstr "Wyloguj się" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "By Day" -msgstr "" +msgstr "Wg dni" #. 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 "Różnica" #. module: hr_timesheet_sheet #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet @@ -523,58 +525,58 @@ msgstr "" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state_attendance:0 msgid "Absent" -msgstr "" +msgstr "Nieobecny(a)" #. 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 "Na koniec okresu (tygodnia/miesiąca)" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0 msgid "timesheet entry is into draft state." -msgstr "" +msgstr "zapis karty czasu pracy jest w stanie projekt." #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_analyticcost0 msgid "Analytic cost is created" -msgstr "" +msgstr "Utworzono koszt analityczny" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0 msgid "Invoice rate" -msgstr "" +msgstr "Współczynnik fakturowania" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0 msgid "Encode how much time u spent on phone call" -msgstr "" +msgstr "Wprowadź ile czasu spędziłaś(eś) na rozmowach telefonicznych" #. module: hr_timesheet_sheet #: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0 msgid "Review of your work at the end of the day" -msgstr "" +msgstr "Przejrzyj swoją pracę na koniec dnia" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,account_ids:0 msgid "Analytic accounts" -msgstr "" +msgstr "Konta analityczne" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form_my #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my msgid "My timesheets" -msgstr "" +msgstr "Moje karty czasu pracy" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet:0 msgid "Accept" -msgstr "" +msgstr "Akceptuj" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,date_current:0 msgid "Current date" -msgstr "" +msgstr "Bieżąca data" #. module: hr_timesheet_sheet #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_unvalidate @@ -585,15 +587,15 @@ msgstr "" #. module: hr_timesheet_sheet #: selection:res.company,timesheet_range:0 msgid "Year" -msgstr "" +msgstr "Rok" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 msgid "Total" -msgstr "" +msgstr "Suma" #. module: hr_timesheet_sheet #: 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 "Karty czasu pracy mojego działu do zatwierdzenia" diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml index cd991ac3459..e1da251fb9a 100644 --- a/addons/knowledge/knowledge_installer.xml +++ b/addons/knowledge/knowledge_installer.xml @@ -13,14 +13,17 @@ <separator string="title" position="attributes"> <attribute name="string" - >Configure Your Knowledge Management System</attribute> + >Knowledge Management</attribute> </separator> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string">From this screen, you can select various OpenERP applications which will help employees store information, distribute it and share it with one another.</attribute> </xpath> - <group colspan="8"> - <separator string="Knowledge Management" colspan="4"/> + <group colspan="8" position="replace"> + <group colspan="4"> <field name="document_ftp"/> <field name="document_webdav"/> <field name="wiki"/> @@ -28,6 +31,10 @@ <field name="wiki_faq"/> <field name="wiki_quality_manual"/> </group> + </group> + <xpath expr="//button[@string='Install Modules']" position="attributes"> + <attribute name="string">Configure</attribute> + </xpath> </data> </field> </record> @@ -45,6 +52,19 @@ <record id="knowledge_installer_todo" model="ir.actions.todo"> <field name="action_id" ref="action_knowledge_installer"/> <field name="sequence">3</field> + <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/> </record> + + <record id="knowledge_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">knowledge_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_knowledge_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py index 5775319ee0a..a865443c1b9 100755 --- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py +++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py @@ -315,7 +315,8 @@ class email_parser(object): 'res_id': id } self.rpc('ir.attachment', 'create', data_attach) - self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['From']), body['body']) + + self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['To']), body['body'], self._decode_header(msg['From']), False, {'model' : self.model}) return id def msg_send(self, msg, emails, priority=None): @@ -358,7 +359,8 @@ class email_parser(object): 'res_id': id } self.rpc('ir.attachment', 'create', data_attach) - self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['From']), message['body']) + + self.rpc(self.model, 'history', [id], 'Send', True, self._decode_header(msg['To']), message['body'], self._decode_header(msg['From']), False, {'model' : self.model}) return id def msg_test(self, msg, case_str): diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml index 3e42ec2840e..fe4fb6b8348 100644 --- a/addons/mrp/mrp_installer.xml +++ b/addons/mrp/mrp_installer.xml @@ -12,14 +12,16 @@ </form> <separator string="title" position="attributes"> - <attribute name="string">Configure Your Manufacturing</attribute> + <attribute name="string">Manufacturing Resource Planning</attribute> </separator> <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string">After having installed the core manufacturing application, you can extend it with a few more depending on the needs of your organization</attribute> </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <group colspan="8"> - <separator string="Manufacturing Resource Planning" colspan="4"/> <field name="stock_location"/> <field name="mrp_jit"/> <field name="mrp_operations"/> @@ -43,6 +45,19 @@ <record id="mrp_installer_todo" model="ir.actions.todo"> <field name="action_id" ref="action_mrp_installer"/> <field name="sequence">3</field> + <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/> </record> + + <record id="mrp_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">mrp_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_mrp_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index ba86fc1facc..dcea7ac4f9e 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -12,7 +12,7 @@ id="menu_mrp_bom" parent="base.menu_mrp_root" sequence="5" /> - + <!-- Property / Property Group --> @@ -379,24 +379,24 @@ </form> </field> </record> - + <!-- Procurement --> - + <menuitem action="mrp_procurement.mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing" sequence="2" /> - <menuitem action="mrp_procurement.mrp_procurement_action5" id="menu_mrp_procurement_exception_action" + <menuitem action="mrp_procurement.mrp_procurement_action5" id="menu_mrp_procurement_exception_action" parent="mrp.menu_mrp_control" sequence="1" /> - + <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/> <menuitem action="mrp_procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/> - - <!-- - Order Point - --> + + <!-- + Order Point + --> <menuitem action="mrp_procurement.action_orderpoint_form" id="menu_action_orderpoint_form" parent="mrp.menu_mrp_reordering"/> - + <!-- Production Management --> @@ -783,11 +783,11 @@ </tree> </field> </record> - - <!-- + + <!-- Procurements --> - + <record id="view_procurement_form_inherit" model="ir.ui.view"> <field name="name">mrp.procurement.form.inherit</field> <field name="model">mrp.procurement</field> @@ -799,7 +799,6 @@ </xpath> </field> </record> - <act_window id="action_product_bom_structure" name="Product BoM Structure" diff --git a/addons/mrp_procurement/wizard/make_procurement_view.xml b/addons/mrp_procurement/wizard/make_procurement_view.xml index c60f2818ab2..e98f1c013a0 100644 --- a/addons/mrp_procurement/wizard/make_procurement_view.xml +++ b/addons/mrp_procurement/wizard/make_procurement_view.xml @@ -33,7 +33,8 @@ view_mode="form" target="new" key2="client_action_multi" - id="act_make_procurement"/> + id="act_make_procurement" + groups="base.group_extended"/> </data> </openerp> diff --git a/addons/partner_crm/__init__.py b/addons/partner_infotab/__init__.py index 4dd1f496527..a0a034ec9c5 100644 --- a/addons/partner_crm/__init__.py +++ b/addons/partner_infotab/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -import partner_crm +import partner_infotab # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/partner_crm/__openerp__.py b/addons/partner_infotab/__openerp__.py index d5bc49b1e5c..db44ac70762 100644 --- a/addons/partner_crm/__openerp__.py +++ b/addons/partner_infotab/__openerp__.py @@ -21,7 +21,7 @@ { - 'name': 'Detailed info on partner form', + 'name': 'Detailed information on partner form', 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ @@ -44,7 +44,7 @@ It adds the following fields on the partner form: 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', - 'partner_crm_view.xml' + 'partner_infotab_view.xml' ], 'demo_xml': [], 'installable': True, diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_infotab/partner_infotab.py index 2f5101871fe..a66e901e9c2 100644 --- a/addons/partner_crm/partner_crm.py +++ b/addons/partner_infotab/partner_infotab.py @@ -33,6 +33,8 @@ class res_partner(osv.osv): 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'), 'contract_ids': fields.one2many('account.analytic.account', \ 'partner_id', 'Contracts'), + 'account_line_ids': fields.one2many('hr.analytic.timesheet', \ + 'partner_id', 'Anaylitic account lines '), } res_partner() diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_infotab/partner_infotab_view.xml index 7fbebdd84d8..8aabbb242e9 100644 --- a/addons/partner_crm/partner_crm_view.xml +++ b/addons/partner_infotab/partner_infotab_view.xml @@ -11,19 +11,19 @@ <field name="inherit_id" ref="base.view_partner_form"/> <field name="arch" type="xml"> <notebook position="inside"> - <page string="Other Info"> - <group col="2" colspan="4"> - <field name="opportunity_ids" colspan="4" nolabel="1" domain="[('type', '=', 'opportunity')]" /> - <field name="meeting_ids" colspan="4" nolabel="1" /> + <page string="CRM Info"> + <field name="opportunity_ids" colspan="4" nolabel="1" /> + <field name="meeting_ids" colspan="4" nolabel="1" /> <field name="phonecall_ids" colspan="4" nolabel="1" /> - </group> - <group col="2" colspan="4"> + </page> + + <page string="Other Info"> <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/> - </group> - <group col="2" colspan="4"> - <field name="contract_ids" colspan="4" nolabel="1" /> - </group> + <field name="contract_ids" colspan="4" nolabel="1"/> + <field name="account_line_ids" colspan="4" nolabel="1" context="{'group_by':'date'}"/> + </page> + </notebook> </field> </record> diff --git a/addons/partner_crm/security/ir.model.access.csv b/addons/partner_infotab/security/ir.model.access.csv index 1ebd2924293..1ebd2924293 100644 --- a/addons/partner_crm/security/ir.model.access.csv +++ b/addons/partner_infotab/security/ir.model.access.csv diff --git a/addons/product/product.py b/addons/product/product.py index b21ebe5ee3a..e8a226597e7 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -210,11 +210,11 @@ class product_category(osv.osv): 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."), 'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'), } - + _defaults = { 'type' : lambda *a : 'normal', } - + _order = "sequence" def _check_recursion(self, cr, uid, ids): level = 100 @@ -274,7 +274,7 @@ class product_template(osv.osv): 'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."), 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."), 'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'State', help="Tells the user if he can use the product or not."), - 'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."), + 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', required=True, help="Default Unit of Measure used for all stock operation."), 'uom_po_id': fields.many2one('product.uom', 'Purchase UoM', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."), 'uos_id' : fields.many2one('product.uom', 'Unit of Sale', help='Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM.'), @@ -551,7 +551,7 @@ class product_product(osv.osv): price_type_currency_id = pricetype_obj.browse(cr,uid,price_type_id).currency_id.id res[product.id] = self.pool.get('res.currency').compute(cr, uid, price_type_currency_id, context['currency_id'], res[product.id],context=context) - + return res def copy(self, cr, uid, id, default=None, context=None): diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index b9858e19eaf..24976a71533 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -607,6 +607,12 @@ <field name="view_id" ref="product_template_tree_view"/> </record> + <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc"> + <field name="name">Products</field> + <field name="resource">ir.ui.menu</field> + <field name="user_id" ref="base.user_root"/> + <field name="res_id" ref="product.menu_products"/> + </record> <!-- <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products" sequence="2" groups="product.group_product_variant" /> diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml index bf1ba9fdf24..f9b143e10f4 100644 --- a/addons/profile_accounting/profile_accounting.xml +++ b/addons/profile_accounting/profile_accounting.xml @@ -11,6 +11,9 @@ <form position="attributes"> <attribute name="string">Install Extra Modules</attribute> </form> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string" @@ -48,5 +51,16 @@ <field name="action_id" ref="action_config_install_module"/> <field name="sequence">3</field> </record> + <record id="accounting_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">accounting_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml index ae659245907..bbbc64af57a 100644 --- a/addons/profile_manufacturing/profile_manufacturing.xml +++ b/addons/profile_manufacturing/profile_manufacturing.xml @@ -11,15 +11,18 @@ <form position="attributes"> <attribute name="string">Manufacturing Profile: Install Extra Modules</attribute> </form> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='rowspan'>15</attribute> + <attribute name='string'></attribute> + </xpath> <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string">Here are a few modules which might be useful along with the rest of the Manufacturing profile. You can also install them the normal way later on, but if you think you'll need them to fit your requirements, you can select them now and they'll be installed immediately.</attribute> </xpath> <separator string="title" position="attributes"> - <attribute name="string">Manufacturing Modules</attribute> + <attribute name="string">Stock & Manufacturing</attribute> </separator> <group colspan="8"> - <separator string="Stock & Manufacturing" colspan="4"/> <field name="stock_location"/> <field name="mrp_jit"/> <field name="mrp_operation"/> @@ -52,5 +55,16 @@ <field name="action_id" ref="action_config_install_module"/> <field name="sequence">3</field> </record> + <record id="manufacturing_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">manufacturing_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml index 6f4a7aa9e9e..efef1dc3649 100644 --- a/addons/profile_tools/misc_tools_installer.xml +++ b/addons/profile_tools/misc_tools_installer.xml @@ -10,9 +10,12 @@ <form position="attributes"> <attribute name="string">Tools Modules Installation</attribute> </form> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <separator string="title" position="attributes"> - <attribute name="string">Select Tools To Install</attribute> + <attribute name="string">Tools</attribute> </separator> <xpath expr="//label[@string='description']" position="attributes"> @@ -20,7 +23,6 @@ >Here are a few useful applications which, while they don't directly contribute to your business, can improve on it or improve your OpenERP experience</attribute> </xpath> <group colspan="8"> - <separator string="Tools" colspan="4"/> <field name="lunch"/> <field name="subscription"/> <field name="survey"/> @@ -44,5 +46,16 @@ <field name="action_id" ref="action_misc_tools_installer"/> <field name="sequence">3</field> </record> + <record id="misc_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">misc_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_misc_tools_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/project/installer.py b/addons/project/installer.py index 1848d1e300e..dd18a2937a2 100644 --- a/addons/project/installer.py +++ b/addons/project/installer.py @@ -52,4 +52,7 @@ class project_installer(osv.osv_memory): help="Embeds the Getting Things Done concepts into OpenERP's " "project management."), } + _defaults={ + 'project_crm': True, + } project_installer() diff --git a/addons/project/project.py b/addons/project/project.py index 727f210a488..c7a1a8ae054 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -139,6 +139,7 @@ class project(osv.osv): 'active': lambda *a: True, 'priority': lambda *a: 1, 'sequence': lambda *a: 10, + 'warn_manager': lambda *a: True, } def _check_dates(self, cr, uid, ids): leave = self.read(cr, uid, ids[0],['date_start','date']) diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml index d7ca8c43989..a127333544f 100644 --- a/addons/project/project_installer.xml +++ b/addons/project/project_installer.xml @@ -13,21 +13,23 @@ <separator string="title" position="attributes"> <attribute name="string" - >Configure Your Project Management</attribute> + >Project Management</attribute> </separator> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute> </xpath> <group colspan="8"> - <separator string="Project Management" colspan="4"/> - <field name="project_long_term"/> + <field name="project_crm"/> + <field name="project_long_term" groups="base.group_extended"/> <field name="project_wiki"/> <field name="hr_timesheet_sheet"/> <field name="hr_timesheet_invoice"/> - <field name="account_budget"/> - <field name="project_messages"/> - <field name="project_crm"/> + <field name="account_budget" groups="base.group_extended"/> + <field name="project_messages" groups="base.group_extended"/> <separator string="Methodologies" colspan="4"/> <field name="scrum"/> <field name="project_gtd"/> @@ -50,5 +52,16 @@ <field name="action_id" ref="action_project_installer"/> <field name="sequence">3</field> </record> + <record id="project_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">project_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_project_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 6a74161b250..fa795c12d6a 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -110,7 +110,7 @@ <field name="arch" type="xml"> <search string="Search Project"> <group col='15' colspan='4'> - <filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/> + <filter icon="terp-project" string="Open" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" default="1"/> <filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/> <separator orientation="vertical"/> <filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/> @@ -136,7 +136,7 @@ <field name="type">tree</field> <field name="field_parent">child_ids</field> <field name="arch" type="xml"> - <tree string="Projects"> + <tree colors="red:date<current_date and state in ('open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects"> <field name="sequence" invisible="1"/> <field name="name" string="Project Name"/> <field name="user_id" string="Project Manager"/> @@ -238,7 +238,7 @@ <field name="project_id" required="1" select="1" domain="['|',('user_id','=',uid),('members','=',uid)]"/> <field name="total_hours" widget="float_time"/> <field name="date_deadline"/> - <field name="user_id" select="1"/> + <field name="user_id" select="1" widget="selection"/> <field name="progress" widget="progressbar"/> </group> <notebook colspan="4"> @@ -590,8 +590,8 @@ <field name="arch" type="xml"> <tree string="Messages"> <field name="subject" select="1"/> - <field name="user_id" select="1"/> <field name="project_id" select="1"/> + <field name="user_id" select="1"/> <field name="date" select="1"/> </tree> </field> @@ -640,5 +640,6 @@ <act_window domain="[('user_id', '=', active_id),('date', '>=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/> + <act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.message" src_model="project.project"/> </data> </openerp> diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index e4cd21f0b48..e099b4544aa 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -84,7 +84,7 @@ class report_project_task_user(osv.osv): t.project_id, t.state, t.priority, - t.name, + t.name as name, t.company_id, t.partner_id, t.type, diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 9ee400e6472..a4a072849b9 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -9,7 +9,7 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Tasks"> - <field name="name" invisible="1"/> + <field name="name" /> <field name="project_id" invisible="1"/> <field name="user_id" invisible="1"/> <field name="date_deadline" invisible="1"/> @@ -123,6 +123,7 @@ <filter string="User" name="User" icon="terp-project" context="{'group_by':'user_id'}" /> <filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/> <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" /> + <filter string="Task" icon="terp-project" context="{'group_by':'name'}" /> <separator orientation="vertical"/> <filter string="State" icon="terp-project" context="{'group_by':'state'}"/> <filter string="Company" icon="terp-project" context="{'group_by':'company_id'}" groups="base.group_multi_company"/> diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index fe6fa0a5e80..555d1fb085c 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -289,7 +289,8 @@ id="action_purchase_line_product_tree" name="Product purchases" res_model="purchase.order.line" - src_model="product.product"/> + src_model="product.product" + groups="base.group_extended"/> <!-- <record model="ir.values" id="action_merge_purchase_order"> <field name="object" eval="1" /> diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml index 77bbef10453..b105b6ba3aa 100644 --- a/addons/purchase/wizard/purchase_installer.xml +++ b/addons/purchase/wizard/purchase_installer.xml @@ -11,7 +11,9 @@ <form position="attributes"> <attribute name="string">Purchase Modules Installation</attribute> </form> - + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <separator string="title" position="attributes"> <attribute name="string" >Configure Your Purchase System</attribute> @@ -22,7 +24,6 @@ </xpath> <group colspan="8"> - <separator string="Purchase Application" colspan="4"/> <field name="purchase_requisition"/> </group> </data> @@ -42,7 +43,18 @@ <record id="purchase_installer_todo" model="ir.actions.todo"> <field name="action_id" ref="action_purchase_install_module"/> <field name="sequence">3</field> - + <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/> </record> + <record id="purchase_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">purchase_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_purchase_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml index bbef853ed79..bcd0250fb7e 100644 --- a/addons/report_designer/report_designer_installer.xml +++ b/addons/report_designer/report_designer_installer.xml @@ -10,10 +10,12 @@ <form position="attributes"> <attribute name="string">Report Modules Installation</attribute> </form> - + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <separator string="title" position="attributes"> <attribute name="string" - >Select Reporting Tools To Install</attribute> + >Reporting Tools</attribute> </separator> <xpath expr="//label[@string='description']" position="attributes"> @@ -21,7 +23,6 @@ >OpenERP's built-in reporting abilities can be improved even further with some of the following applications</attribute> </xpath> <group colspan="8"> - <separator string="Reporting" colspan="4"/> <field name="base_report_designer"/> <field name="base_report_creator"/> <field name="olap"/> @@ -44,5 +45,16 @@ <field name="action_id" ref="action_report_designer_installer"/> <field name="sequence">3</field> </record> + <record id="report_designer_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">report_designer_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_report_designer_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 7a12e9dbad0..894ff6b2e6c 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -486,7 +486,7 @@ <act_window context="{'partner_id': active_id}" domain="[('partner_id', '=', active_id)]" id="act_res_partner_2_sale_order" name="Sales" res_model="sale.order" src_model="res.partner"/> - <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/> + <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product" groups="base.group_extended"/> <menuitem id="menu_invoiced" name="Billing" parent="base.menu_base_partner" sequence="6"/> <menuitem action="action_order_line_tree2" id="menu_invoicing_sales_order_lines" parent="menu_invoiced" sequence="2"/> @@ -502,12 +502,18 @@ <form position="attributes"> <attribute name="string">Sales Configuration</attribute> </form> + <separator string="title" position="attributes"> + <attribute name="string" + >Configure Sale Order Logistic</attribute> + </separator> + <xpath expr="//label[@string='description']" position="attributes"> + <attribute name="string">Setup your sales workflow and default values.</attribute> + </xpath> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='rowspan'>15</attribute> + <attribute name='string'></attribute> + </xpath> <group string="res_config_contents" position="replace"> - <label colspan="4" align="0.0" - string="Setup your sales workflow and default values."/> - <separator colspan="4" - string="Configure Sale Order Logistic"/> - <newline/> <field name="picking_policy" groups="base.group_extended"/> <newline/> <field name="order_policy"/> @@ -532,6 +538,7 @@ <!-- register configuration wizard --> <record id="config_wizard_step_sale_picking_policy" model="ir.actions.todo"> <field name="action_id" ref="action_config_picking_policy"/> + <field name="groups_id" eval="[(6,0,[ref('base.group_extended')])]"/> </record> </data> diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml index 5dea1efd563..44f78fcdd55 100644 --- a/addons/sale_crm/process/sale_crm_process.xml +++ b/addons/sale_crm/process/sale_crm_process.xml @@ -4,7 +4,6 @@ <!-- Process Node - --> <record id="process_node_crmquotation0" model="process.node"> <field name="menu_id" ref="sale.menu_sale_order"/> @@ -17,17 +16,6 @@ <field eval="0" name="flow_start"/> </record> - <record id="process_node_crmopportunity0" model="process.node"> - <field name="model_id" ref="mail_gateway.model_mailgate_thread"/> - <field eval=""""subflow"""" name="kind"/> - <field eval=""""CRM Opportunity"""" name="name"/> - <field eval=""""The CRM Opportunity can lead to a quotation."""" name="note"/> - <field name="subflow_id" ref="crm.process_process_contractprocess0"/> - <field name="process_id" ref="sale.process_process_salesprocess0"/> - <field eval=""""object.state in ('draft', 'open', 'pending', 'done', 'cancel')"""" name="model_states"/> - <field eval="1" name="flow_start"/> - </record> - <record id="process_node_contractanalytic0" model="process.node"> <field name="menu_id" ref="account.account_analytic_def_account"/> <field name="model_id" ref="analytic.model_account_analytic_account"/> @@ -49,9 +37,6 @@ </record> - <!-- - Process Transition - --> <record id="process_transition_crmopportunityquotation" model="process.transition"> <field eval="[(6,0,[])]" name="role_ids"/> @@ -90,5 +75,7 @@ <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/> </record> + --> + </data> </openerp> diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py index bb4c2ba18ea..613d8af7b7a 100644 --- a/addons/sale_crm/sale_crm.py +++ b/addons/sale_crm/sale_crm.py @@ -25,7 +25,7 @@ class sale_order(osv.osv): _inherit = 'sale.order' _description = 'Sale orders' _columns = { - 'section_id': fields.many2one('crm.case.section', 'Section'), + 'section_id': fields.many2one('crm.case.section', 'Sales Team'), } def _get_section(self, cr, uid, context): diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index 4147101773b..7660dcc5cd2 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -34,11 +34,11 @@ <field name="inherit_id" ref="sale.view_sales_order_filter"/> <field name="arch" type="xml"> <field name="date_order" position="after"> - <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section"> + <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section" groups="base.group_extended"> <filter icon="terp-crm" domain="[('section_id','=',context.get('section_id',False))]" groups="base.group_extended" - help="My section"/> + help="My Sales Team"/> </field> </field> </field> diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py index 915332f7f7d..7595a8a5a28 100644 --- a/addons/scrum/scrum.py +++ b/addons/scrum/scrum.py @@ -97,7 +97,7 @@ class scrum_sprint(osv.osv): 'date_stop': fields.date('Ending Date', required=True), 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)]), 'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True), - 'scrum_master_id': fields.many2one('res.users', 'Scrum Master', required=True), + 'scrum_master_id': fields.many2one('res.users', 'Scrum Manager', required=True), 'meeting_ids': fields.one2many('scrum.meeting', 'sprint_id', 'Daily Scrum'), 'review': fields.text('Sprint Review'), 'retrospective': fields.text('Sprint Retrospective'), diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml index 41ddb3ff2cd..9ea4c8592a9 100644 --- a/addons/scrum/scrum_view.xml +++ b/addons/scrum/scrum_view.xml @@ -65,7 +65,7 @@ <field name="project_id" select="1"/> <field domain="[('project_id','=',project_id)]" name="sprint_id" select="1"/> <field name="user_id" select="1"/> - <field name="sequence"/> + <field name="sequence" groups="base.group_extended"/> <field name="date"/> <field name="active" select="1"/> <group colspan="6" col="8"> diff --git a/addons/service/service_installer.xml b/addons/service/service_installer.xml index 059d114a66b..98b1eab4bce 100644 --- a/addons/service/service_installer.xml +++ b/addons/service/service_installer.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> - + <record id="view_confirm_install_module_form" model="ir.ui.view"> <field name="name">Service Profile : Install extra modules</field> <field name="model">profile.service.config.install_modules_wizard</field> @@ -12,7 +12,9 @@ <form position="attributes"> <attribute name="string">Install Extra Service Profile Modules</attribute> </form> - + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + </xpath> <separator string="title" position="attributes"> <attribute name="string">Services Management</attribute> </separator> @@ -42,7 +44,7 @@ </data> </field> </record> - + <record id="action_config_install_module" model="ir.actions.act_window"> <field name="name">Service Profile : Install Extra Modules</field> <field name="type">ir.actions.act_window</field> @@ -58,5 +60,16 @@ <field name="action_id" ref="action_config_install_module"/> <field name="sequence">3</field> </record> + <record id="service_ir_actions_todo_tree" model="ir.ui.view"> + <field name="model">ir.actions.todo</field> + <field name="name">service_installer_action_replace</field> + <field name="type">tree</field> + <field name="inherit_id" ref="base.ir_actions_todo_tree"/> + <field name="arch" type="xml"> + <xpath expr="//button[@string='Launch']" position="replace"> + <button name="%(action_config_install_module)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/> + </xpath> + </field> + </record> </data> </openerp> diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml index 5d54634d72b..d4116313a7e 100644 --- a/addons/stock/report/report_stock_picking_view.xml +++ b/addons/stock/report/report_stock_picking_view.xml @@ -63,7 +63,7 @@ <field name="partner_id"/> <field name="reference" /> <field name="origin" /> - <field name="type" /> + <field name="type" groups="base.group_extended"/> </group> <newline/> <group expand="1" string="Group By..." colspan="4" col="5"> diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml index f2606e764b4..8ee15e1093d 100644 --- a/addons/stock/report/report_stock_view.xml +++ b/addons/stock/report/report_stock_view.xml @@ -105,21 +105,24 @@ id="act_stock_product_location_open" name="Stock by Location" res_model="stock.location" - src_model="product.product"/> + src_model="product.product" + groups="base.group_extended"/> <act_window domain="[('location_id', 'child_of', [active_id])]" id="act_stock_location_2_stock_report_prodlots" name="Stock by Lots" res_model="stock.report.prodlots" - src_model="stock.location"/> + src_model="stock.location" + /> <act_window domain="[('product_id','=',active_id)]" id="act_product_product_2_stock_report_prodlots" name="Stock by Lots" res_model="stock.report.prodlots" - src_model="product.product"/> + src_model="product.product" + groups="base.group_extended"/> <act_window domain="[('prodlot_id', '=', active_id)]" diff --git a/addons/stock/stock.py b/addons/stock/stock.py index dcb054c1cf7..a569a9dcbea 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -493,7 +493,7 @@ class stock_picking(osv.osv): 'date_done': fields.datetime('Date Done', help="Date of Completion"), 'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date", method=True, store=True, type='datetime', string='Max. Expected Date', select=2), - 'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}), + 'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}), 'delivery_line':fields.one2many('stock.delivery', 'picking_id', 'Delivery lines', readonly=True), 'auto_picking': fields.boolean('Auto-Picking'), 'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"), diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index 806722cd24f..10a24cb7a15 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -186,7 +186,7 @@ <!-- Multi Company --> - <record id="res_partner_tinyshop0" model="res.partner"> + <record id="res_partner_tinyshop0" model="res.partner"> <field eval="0" name="customer"/> <field eval="0" name="supplier"/> <field eval="1" name="active"/> diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml index 7b8d9eb13b3..60de8d1f74f 100644 --- a/addons/stock/stock_report.xml +++ b/addons/stock/stock_report.xml @@ -4,7 +4,7 @@ <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/> <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/> <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/> - <report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml"/> + <report auto="False" id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/> <report auto="False" id="report_lot_location" model="stock.location" name="lot.location" rml="stock/report/lot_location.rml" string="Lots by location"/> <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content (With children)" rml="stock/report/lot_overview_all.rml"/> </data> diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3c9f1d393ad..b7a865e3d8f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -3,10 +3,10 @@ <data> <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/> <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/> - <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/> + <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="4"/> <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/> <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="6"/> - <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="2"/> + <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="3"/> <record id="stock_inventory_line_tree" model="ir.ui.view"> <field name="name">stock.inventory.line.tree</field> @@ -54,6 +54,11 @@ <field name="date" select="1" /> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> </group> + <newline/> + <group expand="1" string="Group By..." colspan="4" col="4"> + <filter string="State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/> + <filter string="Date" icon="terp-sale" domain="[]" context="{'group_by':'date'}"/> + </group> </search> </field> @@ -175,7 +180,7 @@ <field name="view_type">form</field> <field name="view_id" ref="view_tracking_tree"/> </record> - <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="4"/> + <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/> <menuitem action="action_tracking_form" id="menu_action_tracking_form" groups="base.group_extended" parent="menu_traceability"/> @@ -403,7 +408,7 @@ <field name="account_id" select="1" groups="base.group_extended"/> <field name="location_id"/> <field name="address_id" context="{'contact_display':'partner'}"/> - <field name="icon"/> + <field name="icon" groups="base.group_extended"/> <field name="scrap_location"/> <newline/> <group col="2" colspan="2" groups="base.group_extended"> @@ -488,7 +493,7 @@ <field name="view_type">tree</field> <field name="view_id" ref="view_location_tree"/> </record> - <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" sequence="20"/> + <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_inventory_control" groups="base.group_extended" sequence="20"/> <record id="view_warehouse" model="ir.ui.view"> <field name="name">stock.warehouse</field> @@ -577,7 +582,7 @@ <field name="arch" type="xml"> <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date < current_date" string="Picking list"> <field name="name"/> - <field name="backorder_id"/> + <field name="backorder_id" groups="base.group_extended"/> <field name="origin"/> <field name="date"/> <field name="min_date"/> @@ -595,10 +600,10 @@ <form string="Picking list"> <group colspan="4" col="6"> <field name="name" select="1" readonly="1"/> - <field name="address_id" select="1" context="{'contact_display' : 'partner'}"/> +<!-- <field name="address_id" select="1" context="{'contact_display' : 'partner'}" groups="base.group_extended"/>--> <field name="origin"/> - <field name="backorder_id" readonly="1"/> - <field name="date" /> + <field name="backorder_id" groups="base.group_extended" readonly="1"/> + <field name="date"/> <field name="min_date" select="1"/> <field name="type"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> @@ -728,7 +733,7 @@ <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date < current_date" string="Picking list"> <field name="name"/> <field name="address_id" select="1"/> - <field name="backorder_id"/> + <field name="backorder_id" groups="base.group_extended"/> <field name="origin"/> <field name="date" select="1"/> <field name="min_date" select="1"/> @@ -748,7 +753,7 @@ <field name="name" select="1" readonly="1"/> <field name="address_id" select="1"/> <field name="origin"/> - <field name="backorder_id" readonly="1"/> + <field name="backorder_id" groups="base.group_extended" readonly="1"/> <field name="date" /> <field name="min_date" select="1"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> @@ -905,7 +910,7 @@ <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date < current_date" string="Picking list"> <field name="name"/> <field name="address_id"/> - <field name="backorder_id"/> + <field name="backorder_id" groups="base.group_extended"/> <field name="origin"/> <field name="date"/> <field name="min_date"/> @@ -1030,13 +1035,14 @@ <separator orientation="vertical"/> <field name="name" select="1"/> <field name="address_id" select="1"/> - <field name="company_id" select="1" widget="selection"/> +<!-- <field name="company_id" select="1" widget="selection"/>--> </group> <newline/> <group expand="1" string="Group By..." colspan="4" col="8"> <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/> <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/> - <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/> + <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/> + <filter string="Expected Date" icon="terp-stock" domain="[]" context="{'group_by':'min_date'}"/> </group> </search> </field> @@ -1079,11 +1085,11 @@ <tree colors="blue:state in ('draft');grey:state in ('cancel', 'done');red:state not in ('cancel', 'done') and date < current_date" string="Picking list"> <field name="name"/> <field name="address_id"/> - <field name="backorder_id"/> + <field name="backorder_id" groups="base.group_extended"/> <field name="origin"/> <field name="date"/> <field name="min_date"/> - <field name="invoice_state"/> + <field name="invoice_state" groups="base.group_extended"/> <field name="state"/> <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-ok" help="Receive products"/> <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" help="Cancel" confirm="This operation will cancel the shipment. Do you want to continue?" /> @@ -1098,10 +1104,11 @@ <form string="Input Picking List"> <group colspan="4" col="6"> <field name="name" readonly="1" select="1"/> - <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}"/> + <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" /> <field name="origin"/> - <field name="backorder_id" readonly="1"/> + <field name="backorder_id" readonly="1" groups="base.group_extended"/> <field name="date"/> + <field name="type"/> <field name="min_date" readonly="1"/> <field name="invoice_state" string="Invoice Control"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> @@ -1112,7 +1119,7 @@ <tree colors="grey:state in ('done','cancel');black:state not in ('cancel','done')" string="Stock Moves"> <field name="product_id"/> <field name="product_qty"/> - <field name="product_uom"/> + <field name="product_uom" string="Product Unit of Measure"/> <field name="location_dest_id"/> <field name="prodlot_id" groups="base.group_extended"/> <field name="state"/> @@ -1195,8 +1202,8 @@ <search string="Input Picking List"> <group col="8" colspan="4"> <filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" /> - <separator orientation="vertical"/> - <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" /> + <separator orientation="vertical" /> + <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" groups="base.group_extended"/> <separator orientation="vertical"/> <field name="name" select="1"/> <field name="address_id" select="1"/> @@ -1204,8 +1211,13 @@ </group> <newline/> <group expand="1" string="Group By..." colspan="4" col="8"> + <filter icon="terp-stock" name="state" string="State" domain="[]" context="{'group_by':'state'}"/> + <separator orientation="vertical" /> <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/> - <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/> + <separator orientation="vertical" /> + <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/> + <filter string="Expected Date" icon="terp-stock" domain="[]" context="{'group_by':'min_date'}"/> + <separator orientation="vertical" /> <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/> </group> </search> @@ -1258,8 +1270,10 @@ </group> <newline/> <group expand="1" string="Group By..." colspan="4" col="8"> + <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/> <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/> - <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/> + <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/> + <filter string="Expected Date" icon="terp-stock" domain="[]" context="{'group_by':'min_date'}"/> <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/> </group> </search> @@ -1276,7 +1290,7 @@ <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field> <field name="search_view_id" ref="view_picking_internal_search"/> </record> - <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/> + <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" groups="base.group_extended" sequence="2"/> <record id="view_move_tree" model="ir.ui.view"> <field name="name">stock.move.tree</field> @@ -1288,7 +1302,7 @@ <field name="name" string="Move Name"/> <field name="product_id"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> - <field name="product_uom" string="UOM"/> + <field name="product_uom" string="Unit Of Measure"/> <field name="picking_id" select="1"/> <field name="prodlot_id" groups="base.group_extended"/> <field name="location_id"/> @@ -1315,14 +1329,14 @@ <field name="name"/> <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/> <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/> - <field name="product_uom"/> - <field name="product_uos"/> + <field name="product_uom" string="Unit Of Measure" widget="selection"/> + <field name="product_uos" groups="base.group_extended" /> </group> <group colspan="2" col="2"> <separator string="Locations & Picking" colspan="2" /> - <field name="location_id" select="1"/> - <field name="location_dest_id" select="1"/> + <field name="location_id" select="1" widget="selection"/> + <field name="location_dest_id" select="1" widget="selection"/> <field name="picking_id"/> <field name="address_id" context="{'contact_display':'partner'}"/> <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/> @@ -1368,19 +1382,20 @@ <field name="arch" type="xml"> <search string="Stock Moves"> <group col="8" colspan="4"> - <filter icon="terp-stock" string="Available" domain="[('state','=','done')]" help="Done"/> - <filter icon="terp-stock" string="Available" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future"/> + <filter icon="terp-stock" string="Available" name="Available" domain="[('state','=','assigned')]" help="Available"/> <separator orientation="vertical"/> + <field name="product_id"/> <field name="location_id"/> <field name="location_dest_id"/> - <field name="product_id"/> </group> <newline/> <group expand="1" string="Group By..." colspan="4" col="8"> + <filter icon="terp-stock" string="Inventory" domain="[]" context="{'group_by':'name'}" /> + <filter icon="terp-stock" string="State" domain="[]" context="{'group_by':'state'}" /> <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/> + <filter string="Source Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/> + <filter string="Dest. Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/> <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/> - <filter string="Location" icon="terp-stock" domain="[]" context="{'group_by':'location_id'}"/> - <filter string="Destination Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/> </group> </search> </field> @@ -1393,6 +1408,7 @@ <field name="view_type">form</field> <field name="view_id" ref="view_move_tree"/> <field name="search_view_id" ref="view_move_search"/> + <field name="context">{'search_default_Available':1}</field> </record> <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/> @@ -1412,10 +1428,10 @@ <field name="partner_id" string="Supplier"/> <field name="product_id"/> <field name="product_qty" /> - <field name="product_uom" string="UOM"/> + <field name="product_uom" string="Uint Of Measure"/> <field name="prodlot_id" string="Lot" groups="base.group_extended"/> <field name="date_planned"/> - <field name="backorder_id"/> + <field name="backorder_id" groups="base.group_extended"/> <field name="state"/> <button name="%(action_partial_move)d" string="Partial" type="action" states="assigned" icon="gtk-justify-fill"/> <button name="action_cancel" states="assigned,confirmed" string="Cancel" type="object" icon="gtk-cancel"/> @@ -1591,7 +1607,8 @@ id="act_product_stock_move_futur_open" name="Future Stock Moves" res_model="stock.move" - src_model="product.product"/> + src_model="product.product" + groups="base.group_extended"/> <record id="ir_act_product_location_open" model="ir.values"> <field name="key2">tree_but_open</field> diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml index 59e0cc4f604..356282d2de5 100644 --- a/addons/thunderbird/thunderbird_installer.xml +++ b/addons/thunderbird/thunderbird_installer.xml @@ -12,13 +12,17 @@ <attribute name="string">Thunderbird Module Installation</attribute> </form> <separator string="title" position="attributes"> - <attribute name="string">Configure Thunderbird Module</attribute> + <attribute name="string">Thunderbird</attribute> </separator> <xpath expr="//label[@string='description']" position="attributes"> <attribute name="string">This module is required for the thuderbird plug-in to work properly.This allows you to select an object that you had like to add to your email and its attachments. You can select a partner, a task, a project, an analytical account, or any other object and attach selected mail as .eml file in attachment of selected record.</attribute> </xpath> - <group colspan="8"> - <separator string="Thunderbird" colspan="4"/> + <xpath expr='//separator[@string="vsep"]' position='attributes'> + <attribute name='string'></attribute> + <attribute name='rowspan'>15</attribute> + </xpath> + <group colspan="8" position="replace"> + <group colspan="8" height="400" width="700"> <field name="thunderbird"/> <field name="name" invisible="1"/> <field name="pdf_name" invisible="1"/> @@ -33,6 +37,7 @@ <separator string="Thunderbird plugin installation note." colspan="4"/> <label colspan="8" string="Save The thunderbird plugin Follow the following step to install thunderbird plugin ? 1. From Menu Bar, Open Tools > Add ons. 2. Now click on install button and a browser window will appear. 3. Just select the (.xpi) file from thunderbird/plugin directory and click ok, a new software installation window will appear and within a short time Install Now button will be enabled. 4. Click on Install Now and restart Thunderbird. 5. Now Thunderbird plugin is installed."/> </group> + </group> </data> </field> </record> |