odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons1 

bzr revid: mtr@mtr-20100505120029-o6pbrf6c3z8h6ex5
bzr revid: mtr@mtr-20100506045515-wztoc3xfhl6xl2vm
bzr revid: mtr@mtr-20100506122958-vu4r1mwuru1prodh
This commit is contained in:
mtr 2010-05-06 17:59:58 +05:30
parent c9a1e40246 b1ba2545e8
commit 7a3371828b
48 changed files with 2185 additions and 621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/i18n/pl.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-05-02 10:11+0000\n"
"PO-Revision-Date: 2010-05-05 14:54+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-05-03 04:03+0000\n"
"X-Launchpad-Export-Date: 2010-05-06 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -1596,7 +1596,7 @@ msgstr ""
#: selection:account.tax,tax_group:0
#: selection:account.tax.template,tax_group:0
msgid "VAT"
msgstr "NIP"
msgstr "VAT"
#. module: account
#: rml:account.analytic.account.journal:0

8
addons/account/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-29 00:34+0000\n"
"PO-Revision-Date: 2010-05-06 01:44+0000\n"
"Last-Translator: digitalsatori <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n"
"X-Launchpad-Export-Date: 2010-05-06 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@ -40,7 +40,7 @@ msgstr "凭证录入"
#. module: account
#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
msgid "Specify The Message for the Overdue Payment Report."
msgstr "设定这逾期应付款表单的消息"
msgstr "设置过期支付的催款信息"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@ -115,7 +115,7 @@ msgstr "上级科目"
#. module: account
#: selection:account.move,type:0
msgid "Journal Voucher"
msgstr "原始凭证分类帐"
msgstr "日记账凭证"
#. module: account
#: field:account.invoice,residual:0

153
addons/account/security/account_security.xml
View File

@ -36,161 +36,88 @@
<field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
</record>
<record id="account_move_comp_rule_group" model="ir.rule.group">
<record id="account_move_comp_rule" model="ir.rule">
<field name="name">Account Entry</field>
<field ref="model_account_move" name="model_id"/>
<field eval="True" name="global"/>
</record>
<record id="account_move_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.move'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="account_move_comp_rule_group"/>
</record>
<record id="account_move_line_comp_rule_group" model="ir.rule.group">
<field name="name">Entry lines</field>
<field model="ir.model" name="model_id" ref="model_account_move_line"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="account_move_line_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.move.line'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="account_move_line_comp_rule_group"/>
</record>
<record id="journal_period_comp_rule_group" model="ir.rule.group">
<field name="name">Journal Period</field>
<field model="ir.model" name="model_id" ref="model_account_journal_period"/>
<field name="name">Entry lines</field>
<field model="ir.model" name="model_id" ref="model_account_move_line"/>
<field eval="True" name="global"/>
</record>
<record id="journal_period_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.journal.period'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="journal_period_comp_rule_group"/>
</record>
<record id="journal_comp_rule_group" model="ir.rule.group">
<field name="name">Journal multi-company</field>
<record id="journal_period_comp_rule" model="ir.rule">
<field name="name">Journal Period</field>
<field model="ir.model" name="model_id" ref="model_account_journal_period"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="journal_comp_rule" model="ir.rule">
<field name="name">Journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_journal"/>
<field eval="True" name="global"/>
</record>
<record id="journal_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.journal'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="journal_comp_rule_group"/>
</record>
<record id="analytic_journal_comp_rule_group" model="ir.rule.group">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
</record>
<record id="analytic_journal_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="analytic_journal_comp_rule_group"/>
</record>
<record id="analytic_journal_comp_rule_group1" model="ir.rule.group">
<field name="name">Analytic journal multi-company</field>
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
</record>
<record id="analytic_journal_comp_rule_false" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.analytic.journal'),('name','=','company_id')]"/>
<field name="operator">=</field>
<field name="operand">False</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="analytic_journal_comp_rule_group1"/>
</record>
<record id="period_comp_rule_group" model="ir.rule.group">
<field name="name">Period multi-company</field>
<record id="analytic_journal_comp_rule_false" model="ir.rule">
<field name="name">Analytic journal multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="period_comp_rule" model="ir.rule">
<field name="name">Period multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_period"/>
<field eval="True" name="global"/>
</record>
<record id="period_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.period'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="period_comp_rule_group"/>
</record>
<record id="fiscal_year_comp_rule_group" model="ir.rule.group">
<field name="name">Fiscal year multi-company</field>
<record id="fiscal_year_comp_rule" model="ir.rule">
<field name="name">Fiscal year multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
<field eval="True" name="global"/>
</record>
<record id="fiscal_year_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.fiscalyear'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="fiscal_year_comp_rule_group"/>
</record>
<record id="account_comp_rule_group" model="ir.rule.group">
<field name="name">Account multi-company</field>
<record id="account_comp_rule" model="ir.rule">
<field name="name">Account multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_account"/>
<field eval="True" name="global"/>
</record>
<record id="account_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.account'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="account_comp_rule_group"/>
</record>
<record id="tax_comp_rule_group" model="ir.rule.group">
<field name="name">Tax multi-company</field>
<record id="tax_comp_rule" model="ir.rule">
<field name="name">Tax multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_tax"/>
<field eval="True" name="global"/>
</record>
<record id="tax_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.tax'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="tax_comp_rule_group"/>
</record>
<record id="tax_code_comp_rule_group" model="ir.rule.group">
<field name="name">Tax code multi-company</field>
<record id="tax_code_comp_rule" model="ir.rule">
<field name="name">Tax code multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_tax_code"/>
<field eval="True" name="global"/>
</record>
<record id="tax_code_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.tax.code'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="tax_code_comp_rule_group"/>
</record>
<record id="invoice_comp_rule_group" model="ir.rule.group">
<field name="name">Invoice multi-company</field>
<record id="invoice_comp_rule" model="ir.rule">
<field name="name">Invoice multi-company</field>
<field model="ir.model" name="model_id" ref="model_account_invoice"/>
<field eval="True" name="global"/>
</record>
<record id="invoice_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.invoice'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="invoice_comp_rule_group"/>
</record>
</data></openerp>

21
addons/account/wizard/account_invoice_state.py
View File

@ -21,6 +21,7 @@
from osv import fields, osv
from tools.translate import _
import netsvc
import pooler
class account_invoice_confirm(osv.osv_memory):
"""
@ -34,7 +35,12 @@ class account_invoice_confirm(osv.osv_memory):
wf_service = netsvc.LocalService('workflow')
if context is None:
context = {}
for id in context['active_ids']:
pool_obj = pooler.get_pool(cr.dbname)
data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
for record in data_inv:
if record['state'] not in ('draft','proforma','proforma2'):
raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
return {}
@ -47,14 +53,19 @@ class account_invoice_cancel(osv.osv_memory):
"""
_name = "account.invoice.cancel"
_description = "Cancel the selected invoices"
_description = "Cancel the Selected Invoices"
def invoice_cancel(self, cr, uid, ids, context=None):
wf_service = netsvc.LocalService('workflow')
if context is None:
context = {}
for id in context['active_ids']:
wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
wf_service = netsvc.LocalService('workflow')
pool_obj = pooler.get_pool(cr.dbname)
data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
for record in data_inv:
if record['state'] in ('cancel','paid'):
raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))
wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
return {}
account_invoice_cancel()

22
addons/account/wizard/account_invoice_state_view.xml
View File

@ -6,10 +6,10 @@
<field name="model">account.invoice.confirm</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Confirm draft invoices">
<separator string="Confirm draft invoices" colspan="4"/>
<form string="Confirm Draft Invoices">
<separator string="Confirm Draft Invoices" colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-cancel" special="cancel" string="Close"/>
<button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
</group>
</form>
@ -17,7 +17,7 @@
</record>
<record id="action_account_invoice_confirm" model="ir.actions.act_window">
<field name="name">Confirm draft invoices</field>
<field name="name">Confirm Draft Invoices</field>
<field name="res_model">account.invoice.confirm</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
@ -28,7 +28,7 @@
<record model="ir.values" id="action_account_invoice_confirm_values">
<field name="model_id" ref="account.model_account_invoice" />
<field name="object" eval="1" />
<field name="name">Confirm draft invoices</field>
<field name="name">Confirm Draft Invoices</field>
<field name="key2">client_action_multi</field>
<field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />
<field name="key">action</field>
@ -40,18 +40,18 @@
<field name="model">account.invoice.cancel</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Cancel selected invoices">
<separator string="Cancel selected invoices" colspan="4"/>
<form string="Cancel Selected Invoices">
<separator string="Cancel Selected Invoices" colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Cancel selected invoices" name="invoice_cancel" type="object" default_focus="1"/>
<button icon="gtk-cancel" special="cancel" string="Close"/>
<button icon="gtk-execute" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
</group>
</form>
</field>
</record>
<record id="action_account_invoice_cancel" model="ir.actions.act_window">
<field name="name">Cancel selected invoices</field>
<field name="name">Cancel Selected Invoices</field>
<field name="res_model">account.invoice.cancel</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
@ -62,7 +62,7 @@
<record model="ir.values" id="action_account_invoice_cancel_values">
<field name="model_id" ref="account.model_account_invoice" />
<field name="object" eval="1" />
<field name="name">Cancel selected invoices</field>
<field name="name">Cancel Selected Invoices</field>
<field name="key2">client_action_multi</field>
<field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />
<field name="key">action</field>

52
addons/account_analytic_plans/i18n/it.po
View File

@ -7,27 +7,27 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-04-29 11:06+0000\n"
"Last-Translator: Lorenzo Lucio Ancora <Unknown>\n"
"PO-Revision-Date: 2010-05-03 16:30+0000\n"
"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
msgid "Account4 Id"
msgstr "Identificativo di Account4"
msgstr ""
#. module: account_analytic_plans
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Il nome dell'oggetto deve iniziare con x_ e non può contenere caratteri "
"speciali !"
"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
"speciali!"
#. module: account_analytic_plans
#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
@ -43,7 +43,7 @@ msgstr "Identificativo di Account5"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,date2:0
msgid "End Date"
msgstr ""
msgstr "Data fine"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,rate:0
@ -57,7 +57,7 @@ msgstr "Tasso (%)"
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
msgid "Analytic Plan"
msgstr "Pianificazione analitica"
msgstr "Piano analitico"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@ -67,7 +67,7 @@ msgstr ""
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Lines"
msgstr ""
msgstr "Righe della distribuzione analitica"
#. module: account_analytic_plans
#: wizard_button:wizard.crossovered.analytic,init,print:0
@ -82,12 +82,12 @@ msgstr "Alla data"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,plan_id:0
msgid "Plan Id"
msgstr ""
msgstr "Identificativo del piano"
#. module: account_analytic_plans
#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
msgid "Analytic Distribution's Models"
msgstr ""
msgstr "Modelli di distribuzione analitica"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
@ -97,7 +97,7 @@ msgstr "Nome conto"
#. module: account_analytic_plans
#: view:account.analytic.plan.instance.line:0
msgid "Analytic Distribution Line"
msgstr ""
msgstr "Riga distribuzione analitica"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,code:0
@ -143,32 +143,32 @@ msgstr "Identificativo di Account3"
#: field:account.analytic.plan.instance,journal_id:0
#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
msgid "Analytic Journal"
msgstr "Registro Analitico"
msgstr "Libro Giornale analitico"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "100.00%"
msgstr "Cento per cento"
msgstr "100%"
#. module: account_analytic_plans
#: wizard_field:wizard.crossovered.analytic,init,ref:0
msgid "Analytic Account Ref."
msgstr ""
msgstr "Riferimento conto analitico"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account :"
msgstr "Account analitico:"
msgstr "Conto analitico :"
#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
msgid "Analytic Plan Line"
msgstr "Linea del piano analitico"
msgstr "Riga piano analitico"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account Reference:"
msgstr ""
msgstr "Riferimento conto analitico"
#. module: account_analytic_plans
#: model:ir.actions.wizard,name:account_analytic_plans.create_model
@ -186,7 +186,7 @@ msgstr "Valori di default"
#: field:account.journal,plan_id:0
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
msgid "Analytic Plans"
msgstr ""
msgstr "Piani analitici"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,min_required:0
@ -261,13 +261,13 @@ msgstr ""
#. module: account_analytic_plans
#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
msgid "Multiple-plans management in Analytic Accounting"
msgstr ""
msgstr "Gestione multi-piano in contabilità analitica"
#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
msgid "Analytic Plan Lines"
msgstr "Linee del piano analitico"
msgstr "Righe del piano analitico"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
@ -277,7 +277,7 @@ msgstr ""
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,plan_id:0
msgid "Model's Plan"
msgstr "Piano dei modelli"
msgstr "Piano del modello"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account2_ids:0
@ -292,7 +292,7 @@ msgstr "Quantità"
#. module: account_analytic_plans
#: help:account.analytic.plan.line,root_analytic_id:0
msgid "Root account of this plan."
msgstr "Account radice per questo piano"
msgstr "Conto base di questo piano"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account6_ids:0
@ -307,7 +307,7 @@ msgstr "Quantità"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account_ids:0
msgid "Account Id"
msgstr "Identificativo dell'Account"
msgstr "Identificativo del conto"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
@ -322,7 +322,7 @@ msgstr "OK"
#. module: account_analytic_plans
#: field:account.analytic.plan.line,root_analytic_id:0
msgid "Root Account"
msgstr "Account radice"
msgstr "Conto base"
#. module: account_analytic_plans
#: wizard_view:create.model,info:0
@ -340,7 +340,7 @@ msgstr "Sequenza"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,analytic_account_id:0
msgid "Analytic Account"
msgstr "Account analitico"
msgstr "Conto Analitico"
#. module: account_analytic_plans
#: field:account.analytic.default,analytics_id:0

19
addons/account_budget/security/account_budget_security.xml
View File

@ -1,19 +1,10 @@
<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
<record id="budget_post_comp_rule_group" model="ir.rule.group">
<field name="name">Budget post multi-company</field>
<record id="budget_post_comp_rule" model="ir.rule">
<field name="name">Budget post multi-company</field>
<field name="model_id" ref="model_account_budget_post"/>
<field eval="True" name="global"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="budget_post_comp_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="budget_post_comp_rule_group"/>
</record>
<record id="budget_post_comp_rule_false" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','account.budget.post'),('name','=','company_id')]"/>
<field name="operator">=</field>
<field name="operand">False</field>
<field name="rule_group" ref="budget_post_comp_rule_group"/>
</record>
</data></openerp>

1
addons/account_payment/payment_view.xml
View File

@ -2,6 +2,7 @@
<openerp>
<data>
<wizard id="wizard_populate_statement" menu="False" model="account.bank.statement" name="populate_statement" string="Populate Statement with Payment lines"/>
<!-- View used in the wizard -->
<record id="view_move_line_form" model="ir.ui.view">
<field name="name">account.move.line.form.inherit</field>

2
addons/account_tax_include/i18n/oc.po
View File

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include

2
addons/analytic_user_function/i18n/oc.po
View File

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function

2
addons/crm/i18n/es.po
View File

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm

2
addons/crm_profiling/i18n/ru.po
View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling

10
addons/delivery/i18n/pl.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-11-21 16:05+0000\n"
"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
"PO-Revision-Date: 2010-05-03 08:04+0000\n"
"Last-Translator: Piotr Lipski <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 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
@ -27,7 +27,7 @@ msgstr ""
#. module: delivery
#: selection:delivery.grid.line,operator:0
msgid ">="
msgstr ""
msgstr ">="
#. module: delivery
#: view:res.partner:0
@ -62,7 +62,7 @@ msgstr "Stany"
#. module: delivery
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: delivery
#: help:res.partner,property_delivery_carrier:0

31
addons/document_webdav/i18n/et.po Normal file
View File

@ -0,0 +1,31 @@
# Estonian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-05-30 15:14+0000\n"
"PO-Revision-Date: 2010-05-05 21:44+0000\n"
"Last-Translator: lyyser <logard.1961@gmail.com>\n"
"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-06 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_webdav_old
#: model:ir.module.module,description:document_webdav_old.module_meta_information
msgid ""
"This is a complete document management system:\n"
"\t* WebDav Interface\n"
"\t* User Authentification\n"
"\t* Document Indexation\n"
msgstr ""
"See on terviklik juhtimissüsteemi dokument:\n"
"\t* WebDav liides\n"
"\t* Kasutaja audentimise\n"
"\t* Dokumendi indekseerimine\n"

15
addons/fetchmail/fetchmail_data.xml
View File

@ -12,19 +12,14 @@
<field eval="'()'" name="args"/>
</record>
</data>
<data>
<record id="fetchmail_user_server" model="ir.rule.group">
<field name="name">User wise Server</field>
<field ref="model_email_server" name="model_id" model="ir.model"/>
<field eval="True" name="global"/>
</record>
<record id="fetchmail_user_server_rule" model="ir.rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','email.server'),('name','=','user_id')]"/>
<field name="operator">=</field>
<field name="operand">user.id</field>
<field name="rule_group" ref="fetchmail_user_server"/>
<field name="name">User wise Server</field>
<field ref="model_email_server" name="model_id" model="ir.model"/>
<field eval="True" name="global"/>
<field name="domain_force">[('user_id', '=', user.id)]</field>
</record>
</data>

9
addons/google_map/i18n/et.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2009-01-28 20:11+0000\n"
"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
"PO-Revision-Date: 2010-05-05 21:41+0000\n"
"Last-Translator: lyyser <logard.1961@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-05-06 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: google_map
@ -39,6 +39,9 @@ msgid ""
"so that we can directly open google map from the\n"
"url widget."
msgstr ""
"See moodul lisab google kaardi välja partneri\n"
"aadressile nii, et me saame otse avada google\n"
"kaardi url vidinast."
#. module: google_map
#: view:res.partner:0

278
addons/hr_evaluation/i18n/et.po Normal file
View File

@ -0,0 +1,278 @@
# Estonian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-25 12:18+0000\n"
"PO-Revision-Date: 2010-05-05 21:37+0000\n"
"Last-Translator: lyyser <logard.1961@gmail.com>\n"
"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-06 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
#: field:hr_evaluation.type,info:0
msgid "Information"
msgstr ""
#. module: hr_evaluation
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Schedule next evaluation"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_bad:0
msgid "Bad Points"
msgstr ""
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
msgid "My Next Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.type,value_ids:0
msgid "Values"
msgstr "Väärtused"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_good:0
msgid "Good Points"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,state:0
msgid "State"
msgstr "Olek"
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,score:0
#: field:hr_evaluation.quote,score:0
#: field:hr_evaluation.type,score:0
#: field:hr_evaluation.type.value,score:0
msgid "Score"
msgstr ""
#. module: hr_evaluation
#: selection:hr_evaluation.evaluation,state:0
msgid "Draft"
msgstr "Mustand"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Informal Data"
msgstr "Mitteametlikud andmed"
#. module: hr_evaluation
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr "Vigane mudeli nimi toimingu definitsioonis."
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,employee_id:0
msgid "Employee"
msgstr "Töötaja"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_improve:0
msgid "To Improve"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,evaluation_id:0
msgid "Evaluation"
msgstr "Hinnang"
#. module: hr_evaluation
#: field:hr_evaluation.type.value,type_id:0
msgid "Evaluation Type"
msgstr "Hinnangu tüüp"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Status"
msgstr "Olek"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Apply to categories"
msgstr "Rakenda ktegooriatele"
#. module: hr_evaluation
#: model:ir.module.module,description:hr_evaluation.module_meta_information
msgid "Ability to create employees evaluation."
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,name:0
msgid "Quote"
msgstr "Tsitaat"
#. module: hr_evaluation
#: field:hr_evaluation.type,category_ids:0
msgid "Appliable Role"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,user_id:0
msgid "Evaluation User"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Choices Results"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,date:0
msgid "Date"
msgstr "Kuupäev"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
msgid "Evaluations"
msgstr "Hinnangud"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
msgid "Configuration"
msgstr "Seadistamine"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
msgid "Next Evaluations"
msgstr "Järgmine hindamine"
#. module: hr_evaluation
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "Vigane XML vaate arhitektuurile!"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
msgid "Evaluation Criterions"
msgstr "Hindamise kriteeriumid"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
msgid "My Preceeding Evaluations"
msgstr ""
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
msgid "HR Responsible"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,value_id:0
#: field:hr_evaluation.type.value,name:0
msgid "Value"
msgstr "Väärtus"
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,name:0
msgid "Summary"
msgstr "Summaarne"
#. module: hr_evaluation
#: field:hr_evaluation.type,active:0
msgid "Active"
msgstr "Aktiivne"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
msgid "Notes"
msgstr "Märkused"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
msgid "Employee Evaluation"
msgstr ""
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
msgid "Employee Evaluation Type"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Quotations"
msgstr "Tsitaadid"
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
msgid "Next Employee Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.quote,type_id:0
msgid "Type"
msgstr "Tüüp"
#. module: hr_evaluation
#: view:hr_evaluation.type:0
#: field:hr_evaluation.type,name:0
msgid "Evaluation Criterion"
msgstr "Hindamiskriteerium"
#. module: hr_evaluation
#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
msgid "My Next Evaluations"
msgstr "Minu järgmine hindamine"
#. module: hr_evaluation
#: view:hr_evaluation.quote:0
msgid "Evalution Quote"
msgstr ""
#. module: hr_evaluation
#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
msgid "Human Resources Evaluation"
msgstr ""
#. module: hr_evaluation
#: field:hr_evaluation.evaluation,quote_ids:0
msgid "Quotes"
msgstr "Tsitaadid"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: selection:hr_evaluation.evaluation,state:0
msgid "Done"
msgstr "Valmis"
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
msgid "Employee Evaluation Quote"
msgstr ""
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,info_employee:0
msgid "Employee Response"
msgstr ""
#. module: hr_evaluation
#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
msgid "Evaluation Type Value"
msgstr ""

2
addons/hr_holidays/i18n/es.po
View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-01 03:55+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays

9
addons/hr_timesheet_sheet/security/hr_timesheet_data.xml
View File

@ -2,16 +2,11 @@
<openerp>
<data>
<record model="ir.rule.group" id="timesheet_comp_rule_group">
<record model="ir.rule" id="timesheet_comp_rule">
<field name="name">Timesheet multi-company</field>
<field name="model_id" search="[('model','=','hr_timesheet_sheet.sheet')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="timesheet_comp_rule">
<field name="field_id" search="[('model','=','hr_timesheet_sheet.sheet'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="timesheet_comp_rule_group"/>
<field name="domain_force">[('company_id','child_of',[user.company_id.id])]</field>
</record>
</data>

50
addons/mrp/security/mrp_security.xml
View File

@ -16,69 +16,39 @@
</record>
<!-- Multi -->
<record model="ir.rule.group" id="mrp_procurement_rule_group">
<field name="name">mrp_procurement multi-company</field>
<record model="ir.rule" id="mrp_procurement_rule">
<field name="name">mrp_procurement multi-company</field>
<field name="model_id" search="[('model','=','mrp.procurement')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="mrp_procurement_rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.procurement'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
<field name="rule_group" ref="mrp_procurement_rule_group"/>
</record>
<record model="ir.rule.group" id="stock_warehouse_orderpoint_rule_group">
<field name="name">stock_warehouse.orderpoint multi-company</field>
<record model="ir.rule" id="stock_warehouse_orderpoint_rule">
<field name="name">stock_warehouse.orderpoint multi-company</field>
<field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="stock_warehouse_orderpoint_rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','stock.warehouse.orderpoint'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
<field name="rule_group" ref="stock_warehouse_orderpoint_rule_group"/>
</record>
<record model="ir.rule.group" id="mrp_production_rule_group">
<field name="name">mrp_production multi-company</field>
<record model="ir.rule" id="mrp_production_rule">
<field name="name">mrp_production multi-company</field>
<field name="model_id" search="[('model','=','mrp.production')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="mrp_production_rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.production'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
<field name="rule_group" ref="mrp_production_rule_group"/>
</record>
<record model="ir.rule.group" id="mrp_workcenter_rule_group">
<field name="name">mrp_workcenter multi-company</field>
<record model="ir.rule" id="mrp_workcenter_rule">
<field name="name">mrp_workcenter multi-company</field>
<field name="model_id" search="[('model','=','mrp.workcenter')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="mrp_workcenter_rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.workcenter'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
<field name="rule_group" ref="mrp_workcenter_rule_group"/>
</record>
<record model="ir.rule.group" id="mrp_bom_rule_group">
<field name="name">mrp_bom multi-company</field>
<record model="ir.rule" id="mrp_bom_rule">
<field name="name">mrp_bom multi-company</field>
<field name="model_id" search="[('model','=','mrp.bom')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="mrp_bom_rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','mrp.bom'),('name','=','company_id')]"/>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
<field name="rule_group" ref="mrp_bom_rule_group"/>
</record>
</data>

1399
addons/olap/i18n/et.po Normal file
View File

File diff suppressed because it is too large Load Diff

2
addons/olap_crm/i18n/de.po
View File

@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_crm

56
addons/olap_extract/i18n/et.po Normal file
View File

@ -0,0 +1,56 @@
# Estonian translation for openobject-addons
# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-11-26 05:29+0000\n"
"PO-Revision-Date: 2010-05-05 21:38+0000\n"
"Last-Translator: lyyser <logard.1961@gmail.com>\n"
"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-06 04:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: olap_extract
#: model:ir.module.module,shortdesc:olap_extract.module_meta_information
msgid "olap_extract"
msgstr ""
#. module: olap_extract
#: wizard_button:olap.extract.schema,init,ok:0
msgid "OK"
msgstr "OK"
#. module: olap_extract
#: model:ir.actions.wizard,name:olap_extract.bi_olap_extract_schema
msgid "Olap Extract"
msgstr ""
#. module: olap_extract
#: model:ir.module.module,description:olap_extract.module_meta_information
msgid ""
"\n"
" Extracts the schema structure.\n"
" "
msgstr ""
#. module: olap_extract
#: wizard_field:olap.extract.schema,init,module_name:0
msgid "Module Name"
msgstr "Mooduli nimi"
#. module: olap_extract
#: wizard_button:olap.extract.schema,init,end:0
msgid "Cancel"
msgstr "Katkesta"
#. module: olap_extract
#: wizard_view:olap.extract.schema,init:0
msgid "New Module Name"
msgstr "Uus mooduli nimi"

2
addons/point_of_sale/__init__.py
View File

@ -27,7 +27,5 @@ import stock
import wizard
import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

16
addons/point_of_sale/pos.py
View File

@ -287,7 +287,7 @@ class pos_order(osv.osv):
'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
'date_validity': fields.date('Validity Date', required=True),
'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
'user_saleman': fields.many2one('res.users', 'Salesman', required=True),
'user_salesman_id': fields.many2one('res.users', 'Salesman', required=True),
'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
'amount_tax': fields.function(_amount_all, method=True, string='Taxes',digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
'amount_total': fields.function(_amount_total, method=True, string='Total'),
@ -496,12 +496,12 @@ class pos_order(osv.osv):
if line.product_id and line.product_id.type=='service':
continue
prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value
val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value_reference
cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
res=cr.fetchone()
location_id=res and res[0] or None
# location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
stock_dest_id = int(val.split(',')[1])
stock_dest_id = val.id
if line.qty < 0:
location_id, stock_dest_id = stock_dest_id, location_id
@ -610,7 +610,7 @@ class pos_order(osv.osv):
if 'payment_name' in data.keys():
args['name'] = data['payment_name'] + ' ' +order.name
account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
if data.get('is_acc',False):
args['is_acc']=data['is_acc']
args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id
@ -703,7 +703,7 @@ class pos_order(osv.osv):
inv_ids = []
for order in self.browse(cr, uid, ids, context):
curr_c = order.user_saleman.company_id
curr_c = order.user_salesman_id.company_id
if order.invoice_id:
inv_ids.append(order.invoice_id.id)
continue
@ -980,8 +980,8 @@ class pos_order(osv.osv):
create_contract_nb = True
break
if create_contract_nb:
seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_saleman.login)
vals['contract_number'] ='%s-%s' % (pos.user_saleman.login, seq)
seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login)
vals['contract_number'] ='%s-%s' % (pos.user_salesman_id.login, seq)
self.write(cr, uid, ids, vals)
def action_paid(self, cr, uid, ids, context=None):
@ -1328,4 +1328,4 @@ class product_product(osv.osv):
'disc_controle': lambda *a: True,
}
product_product()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

6
addons/point_of_sale/pos_demo.xml
View File

@ -57,7 +57,7 @@
<field name="shop_id" ref="sale.shop"/>
<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
<field name="partner_id" ref="base.res_partner_5"/>
<field name="user_saleman" ref="base.user_root"/>
<field name="user_salesman_id" ref="base.user_root"/>
<field name="sale_manager" ref="base.user_root"/>
<field eval="&quot;&quot;&quot;POS/001&quot;&quot;&quot;" name="name"/>
<field name="company_id" ref="res_company_tinyshop0"/>
@ -93,7 +93,7 @@
<field name="shop_id" ref="sale.shop"/>
<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
<field name="partner_id" ref="base.res_partner_3"/>
<field name="user_saleman" ref="res_users_sofia0"/>
<field name="user_salesman_id" ref="res_users_sofia0"/>
<field name="sale_manager" ref="base.user_root"/>
<field eval="&quot;&quot;&quot;POS/002&quot;&quot;&quot;" name="name"/>
<field name="company_id" ref="res_company_shop0"/>
@ -135,7 +135,7 @@
<field eval="&quot;&quot;&quot;2009-11-29&quot;&quot;&quot;" name="date_validity"/>
<field eval="&quot;&quot;&quot;2009-05-29&quot;&quot;&quot;" name="date_order"/>
<field name="partner_id" ref="base.res_partner_3"/>
<field name="user_saleman" ref="res_users_sofia0"/>
<field name="user_salesman_id" ref="res_users_sofia0"/>
<field name="sale_manager" ref="base.user_root"/>
<field eval="&quot;&quot;&quot;POS/0012&quot;&quot;&quot;" name="name"/>
<field name="company_id" ref="res_company_shop0"/>

8
addons/point_of_sale/pos_view.xml
View File

@ -11,7 +11,7 @@
<notebook >
<page string="Order lines">
<group colspan="4" col="6">
<field name="user_saleman" />
<field name="user_salesman_id" />
<field name="partner_id" on_change="onchange_partner_pricelist(partner_id)"/>
<field name="contract_number" select="1" groups="base.group_extended"/>
</group>
@ -65,7 +65,7 @@
<button name="%(action_report_pos_receipt)d" string="_Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
<button name="set_to_draft" string="Set to draft" states="paid" icon="gtk-execute" type="object" />
<button name="%(action_view_pos_return)d" string="Return Picking" type="action" icon="gtk-ok" states="paid"
attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}" context="{'record_id':'active_id'}" />
attrs="{'invisible':[('state','!=','paid'),('state','!=','invoiced')]}"/>
</group>
</page>
@ -175,7 +175,9 @@
<menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
<menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
<menuitem name="Sales Order" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
<menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="2" />
<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale_product" sequence="2" name="Products"/>
<!-- POS Order view (date_payment) -->
<record model="ir.actions.act_window" id="action_pos_pos_form_user">

56
addons/point_of_sale/posrule_data.xml
View File

@ -25,23 +25,18 @@
<field eval="&quot;&quot;&quot;shop2&quot;&quot;&quot;" name="login"/>
<field model="ir.actions.actions" name="action_id" search="[('name','=','Menu')]"/>
</record>
<record id="ir_rule_group_posline0" model="ir.rule.group">
<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
<field eval="&quot;&quot;&quot;POS line&quot;&quot;&quot;" name="name"/>
<field eval="1" name="global"/>
</record>
<record id="ir_rule_0" model="ir.rule">
<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
<field name="rule_group" ref="ir_rule_group_posline0"/>
<field name="name">POS line</field>
<field name="model_id" ref="model_pos_order_line"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
</data>
<data>
<record id="res_groups_posuserposline0" model="res.groups">
<field eval="[(6,0,[ref('point_of_sale.menu_action_pos_order_line'),ref('point_of_sale.menu_action_pos_order_line_day')])]" name="menu_access"/>
<field eval="[(6,0,[ref('ir_rule_group_posline0')])]" name="rule_groups"/>
<field eval="[(6,0,[ref('ir_rule_0')])]" name="rule_groups"/>
<field eval="[(6,0,[ref('res_users_shopuser0'),ref('res_users_shopuser1')])]" name="users"/>
<field eval="&quot;&quot;&quot;POS_user_pos_line&quot;&quot;&quot;" name="name"/>
</record>
@ -66,42 +61,21 @@
</data>
<data>
<record id="ir_rule_group_point0" model="ir.rule.group">
<field name="model_id" ref="point_of_sale.model_pos_order"/>
<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
<field eval="1" name="global"/>
</record>
<record id="ir_rule_0" model="ir.rule">
<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
<field name="field_id" ref="point_of_sale.field_pos_order_company_id"/>
<field name="rule_group" ref="ir_rule_group_point0"/>
</record>
<record id="ir_rule_group_poslinecompany0" model="ir.rule.group">
<field name="model_id" ref="point_of_sale.model_pos_order_line"/>
<field eval="&quot;&quot;&quot;POS line company&quot;&quot;&quot;" name="name"/>
<field eval="1" name="global"/>
</record>
<record id="ir_rule_4" model="ir.rule">
<field eval="&quot;&quot;&quot;child_of&quot;&quot;&quot;" name="operator"/>
<field eval="&quot;&quot;&quot;user.company_id.id&quot;&quot;&quot;" name="operand"/>
<field name="field_id" ref="point_of_sale.field_pos_order_line_company_id"/>
<field name="rule_group" ref="ir_rule_group_poslinecompany0"/>
</record>
<record id="ir_rule_group_posreporting0" model="ir.rule.group">
<record id="ir_rule_0" model="ir.rule">
<field eval="&quot;&quot;&quot;point&quot;&quot;&quot;" name="name"/>
<field name="model_id" ref="model_pos_order"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record id="ir_rule_group_posreporting0" model="ir.rule">
<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
<field eval="&quot;&quot;&quot;POS Reporting&quot;&quot;&quot;" name="name"/>
<field eval="1" name="global"/>
<field name="global" eval="True"/>
</record>
<record id="ir_rule_5" model="ir.rule">
<field eval="&quot;&quot;&quot;=&quot;&quot;&quot;" name="operator"/>
<field eval="&quot;&quot;&quot;user.id&quot;&quot;&quot;" name="operand"/>
<field name="field_id" ref="point_of_sale.field_report_transaction_pos_user_id"/>
<field name="rule_group" ref="ir_rule_group_posreporting0"/>
<field name="model_id" ref="point_of_sale.model_report_transaction_pos"/>
<field name="domain_force">['|',('user_id','=',False),('user_id','=',[user.id])]</field>
</record>
</data>

2
addons/point_of_sale/report/pos_receipt.rml
View File

@ -103,7 +103,7 @@
<para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
<para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
<para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
<para style="terp_default_Centre_9">Vendeur : [[ o.user_saleman.name ]]</para>
<para style="terp_default_Centre_9">Vendeur : [[ o.user_salesman_id.name ]]</para>
<para style="terp_default_Centre_9">Date : [[ formatLang(o.date_order,date = True) ]]</para>
<para style="P4">
<font color="white"> </font>

4
addons/point_of_sale/statement_data.xml
View File

@ -21,13 +21,13 @@
<field eval="1" name="perm_create"/>
<field name="group_id" ref="point_of_sale.res_groups_posuser0"/>
</record>
<record id="ir_rule_group_bankstatementcompany0" model="ir.rule.group">
<record id="ir_rule_group_bankstatementcompany0" model="ir.rule">
<field name="model_id" ref="account.model_account_bank_statement"/>
<field eval="&quot;&quot;&quot;Bank Statement company&quot;&quot;&quot;" name="name"/>
<field eval="1" name="global"/>
</record>
<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule.group">
<record id="ir_rule_group_bankstatementlinecompany0" model="ir.rule">
<field name="model_id" ref="account.model_account_bank_statement_line"/>
<field eval="&quot;&quot;&quot;Bank Statement line Company&quot;&quot;&quot;" name="name"/>
<field eval="1" name="global"/>

2
addons/point_of_sale/wizard/pos_add_product.py
View File

@ -63,7 +63,7 @@ class add_product(osv.osv_memory):
}
def close_action(self, cr, uid, ids, context):
record_id = context and context.get('record_id', False)
record_id = context and context.get('active_id', False)
order_obj= self.pool.get('pos.order')
order_line_obj= self.pool.get('pos.order.line')
obj=order_obj.browse(cr,uid, record_id)

55
addons/point_of_sale/wizard/pos_payment.py
View File

@ -43,7 +43,7 @@ class pos_make_payment(osv.osv_memory):
@return: A dictionary which of fields with values.
"""
res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
record_id = context and context.get('record_id',False)
active_id = context and context.get('active_id',False)
j_obj = self.pool.get('account.journal')
company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
@ -55,14 +55,14 @@ class pos_make_payment(osv.osv_memory):
wf_service = netsvc.LocalService("workflow")
order_obj=self.pool.get('pos.order')
order = order_obj.browse(cr, uid, record_id, context)
order = order_obj.browse(cr, uid, active_id, context)
#get amount to pay
amount = order.amount_total - order.amount_paid
if amount <= 0.0:
context.update({'flag': True})
order_obj.action_paid(cr, uid, [record_id], context)
order_obj.action_paid(cr, uid, [active_id], context)
elif order.amount_paid > 0.0:
order_obj.write(cr, uid, [record_id], {'state': 'advance'})
order_obj.write(cr, uid, [active_id], {'state': 'advance'})
invoice_wanted_checked = False
current_date = time.strftime('%Y-%m-%d')
@ -81,8 +81,8 @@ class pos_make_payment(osv.osv_memory):
def view_init(self, cr, uid, fields_list, context=None):
res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
record_id = context and context.get('record_id', False) or False
order = self.pool.get('pos.order').browse(cr, uid, record_id)
active_id = context and context.get('active_id', False) or False
order = self.pool.get('pos.order').browse(cr, uid, active_id)
if not order.lines:
raise osv.except_osv('Error!','No order lines defined for this sale ')
True
@ -99,10 +99,15 @@ class pos_make_payment(osv.osv_memory):
@return: New arch of view.
"""
record_id = context and context.get('record_id', False) or False
res = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
if record_id:
order = self.pool.get('pos.order').browse(cr, uid, record_id)
result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
active_model = context.get('active_model')
if not active_model and active_model != 'pos.order':
return result
active_id = context.get('active_id', False)
if active_id:
order = self.pool.get('pos.order').browse(cr, uid, active_id)
if order.amount_total == order.amount_paid:
res['arch'] = """ <form string="Make Payment" colspan="4">
<group col="2" colspan="2">
@ -121,10 +126,10 @@ class pos_make_payment(osv.osv_memory):
if the order is not paid: continue payment,
if the order is paid print invoice (if wanted) or ticket.
"""
record_id = context and context.get('record_id',False)
active_id = context and context.get('active_id',False)
order_obj = self.pool.get('pos.order')
jrnl_obj = self.pool.get('account.journal')
order = order_obj.browse(cr, uid, record_id, context)
order = order_obj.browse(cr, uid, active_id, context)
amount = order.amount_total - order.amount_paid
data = self.read(cr, uid, ids)[0]
@ -134,35 +139,35 @@ class pos_make_payment(osv.osv_memory):
jrnl_used=False
if data.get('journal',False):
jrnl_used=jrnl_obj.browse(cr,uid,data['journal'])
order_obj.write(cr, uid, [record_id], {'invoice_wanted': invoice_wanted})
order_obj.add_payment(cr, uid, record_id, data, context=context)
order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted})
order_obj.add_payment(cr, uid, active_id, data, context=context)
# Todo need to check
# if amount<=0.0:
# context.update({'flag':True})
# order_obj.action_paid(cr,uid,[record_id],context)
if order_obj.test_paid(cr, uid, [record_id]):
# order_obj.action_paid(cr,uid,[active_id],context)
if order_obj.test_paid(cr, uid, [active_id]):
if order.partner_id and order.invoice_wanted:
return self.create_invoice(cr,uid,ids,context)
else:
context.update({'flag': True})
order_obj.action_paid(cr,uid,[record_id],context)
order_obj.write(cr, uid, [record_id],{'state':'paid'})
order_obj.action_paid(cr,uid,[active_id],context)
order_obj.write(cr, uid, [active_id],{'state':'paid'})
return self.print_report(cr, uid, ids, context)
if order.amount_paid > 0.0:
context.update({'flag': True})
# Todo need to check
order_obj.action_paid(cr, uid, [record_id], context)
self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
order_obj.action_paid(cr, uid, [active_id], context)
self.pool.get('pos.order').write(cr, uid, [active_id],{'state':'advance'})
return self.print_report(cr, uid, ids, context)
return {}
def create_invoice(self, cr, uid, ids, context):
wf_service = netsvc.LocalService("workflow")
record_ids = [context and context.get('record_id',False)]
for i in record_ids:
active_ids = [context and context.get('active_id',False)]
for i in active_ids:
wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
datas = {'ids' : context.get('record_id', [])}
datas = {'ids' : context.get('active_id', [])}
return {
'type' : 'ir.actions.report.xml',
'report_name':'pos.invoice',
@ -180,8 +185,8 @@ class pos_make_payment(osv.osv_memory):
@param context: A standard dictionary
@return : retrun report
"""
record_id=context.get('record_id',[])
datas = {'ids' : [record_id]}
active_id=context.get('active_id',[])
datas = {'ids' : [active_id]}
res = {}
datas['form'] = res

76
addons/point_of_sale/wizard/pos_return.py
View File

@ -52,11 +52,11 @@ class pos_return(osv.osv_memory):
"""
res = super(pos_return, self).default_get(cr, uid, fields, context=context)
order_obj=self.pool.get('pos.order')
record_id=context.get('record_id')
order_obj = self.pool.get('pos.order')
active_ids = context.get('active_ids')
if not context:
context={}
for order in order_obj.browse(cr, uid,[record_id]):
for order in order_obj.browse(cr, uid, active_ids):
for line in order.lines:
if 'return%s'%(line.id) in fields:
res['return%s'%(line.id)] = line.qty
@ -66,9 +66,10 @@ class pos_return(osv.osv_memory):
res = super(pos_return, self).view_init(cr, uid, fields_list, context=context)
order_obj=self.pool.get('pos.order')
if not context:
context={}
record_id=context.get('record_id')
for order in order_obj.browse(cr, uid,[record_id]):
context={}
active_ids=context.get('active_ids')
for order in order_obj.browse(cr, uid, active_ids):
for line in order.lines:
if 'return%s'%(line.id) not in self._columns:
self._columns['return%s'%(line.id)] = fields.float("Quantity")
@ -79,14 +80,17 @@ class pos_return(osv.osv_memory):
result = super(pos_return, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
if not context:
context={}
order_obj=self.pool.get('pos.order')
record_id = context.get('record_id', False)
if record_id:
active_model = context.get('active_model')
if not active_model and active_model != 'pos.order':
return result
order_obj = self.pool.get('pos.order')
active_id = context.get('active_id', False)
if active_id:
_moves_arch_lst="""<?xml version="1.0"?>
<form string="Return lines">
<label string="Quantities you enter, match to products that will return to the stock." colspan="4"/>"""
_line_fields = result['fields']
order=order_obj.browse(cr, uid, record_id)
order=order_obj.browse(cr, uid, active_id)
for line in order.lines:
quantity=line.qty
_line_fields.update({
@ -130,7 +134,7 @@ class pos_return(osv.osv_memory):
'type': 'ir.actions.act_window',
}
def create_returns2(self, cr, uid, ids, context):
record_id = context.get('record_id', False)
active_id = context.get('active_id', False)
order_obj =self.pool.get('pos.order')
line_obj = self.pool.get('pos.order.line')
picking_obj = self.pool.get('stock.picking')
@ -139,19 +143,19 @@ class pos_return(osv.osv_memory):
uom_obj =self. pool.get('product.uom')
wf_service = netsvc.LocalService("workflow")
#Todo :Need to clean the code
if record_id:
picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[record_id]), ('state', '=', 'done')])
if active_id:
picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[active_id]), ('state', '=', 'done')])
data=self.read(cr,uid,ids)[0]
clone_list = []
date_cur=time.strftime('%Y-%m-%d')
for order_id in order_obj.browse(cr, uid, [record_id], context=context):
for order_id in order_obj.browse(cr, uid, [active_id], context=context):
prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
val = property_obj.browse(cr, uid,prop_ids[0]).value
val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
res=cr.fetchone()
location_id=res and res[0] or None
stock_dest_id = int(val.split(',')[1])
stock_dest_id = val.id
new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
'move_lines':[], 'state':'draft', 'type':'in',
@ -205,13 +209,10 @@ class add_product(osv.osv_memory):
@param context: A standard dictionary
@return : Retrun the add product form again for adding more product
"""
if not context.get('record_id', False):
super(add_product).select_product(cr,uid,ids)
else:
record_id=context.get('record_id', False)
data = self.read(cr, uid, ids)[0]
active_id=context.get('active_id', False)
data = self.read(cr, uid, ids)[0]
if active_id:
order_obj = self.pool.get('pos.order')
lines_obj = self.pool.get('pos.order.line')
picking_obj = self.pool.get('stock.picking')
@ -219,24 +220,24 @@ class add_product(osv.osv_memory):
move_obj = self.pool.get('stock.move')
property_obj= self.pool.get("ir.property")
invoice_obj= self.pool.get('account.invoice')
picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[record_id]), ('state', '=', 'done')])
picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in',[active_id]), ('state', '=', 'done')])
clone_list = []
date_cur=time.strftime('%Y-%m-%d')
uom_obj = self.pool.get('product.uom')
prod_obj=self.pool.get('product.product')
wf_service = netsvc.LocalService("workflow")
return_boj=self.pool.get('pos.return')
order_obj.add_product(cr, uid, record_id,data['product_id'],data['quantity'], context=context)
order_obj.add_product(cr, uid, active_id,data['product_id'],data['quantity'], context=context)
for order_id in order_obj.browse(cr, uid, [record_id], context=context):
for order_id in order_obj.browse(cr, uid, [active_id], context=context):
prod=data['product_id']
qty=data['quantity']
prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
val = property_obj.browse(cr, uid,prop_ids[0]).value
val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
res=cr.fetchone()
location_id=res and res[0] or None
stock_dest_id = int(val.split(',')[1])
stock_dest_id = val.id
prod_id=prod_obj.browse(cr,uid,prod)
new_picking=picking_obj.create(cr,uid,{
@ -259,7 +260,7 @@ class add_product(osv.osv_memory):
wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
picking_obj.force_assign(cr, uid, [new_picking], context)
order_obj.write(cr,uid,record_id,{'last_out_picking':new_picking})
order_obj.write(cr,uid,active_id,{'last_out_picking':new_picking})
return {
@ -273,10 +274,9 @@ class add_product(osv.osv_memory):
'views': False,
'type': 'ir.actions.act_window',
}
def close_action(self, cr, uid, ids, context):
record_id=context.get('record_id', False)
active_id=context.get('active_id', False)
order_obj = self.pool.get('pos.order')
lines_obj = self.pool.get('pos.order.line')
picking_obj = self.pool.get('stock.picking')
@ -284,7 +284,7 @@ class add_product(osv.osv_memory):
move_obj = self.pool.get('stock.move')
property_obj= self.pool.get("ir.property")
invoice_obj=self.pool.get('account.invoice')
picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', [record_id]), ('state', '=', 'done')])
picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', [active_id]), ('state', '=', 'done')])
clone_list = []
date_cur=time.strftime('%Y-%m-%d')
uom_obj = self.pool.get('product.uom')
@ -293,13 +293,13 @@ class add_product(osv.osv_memory):
data=return_boj.read(cr,uid,return_id,[])[0]
wf_service = netsvc.LocalService("workflow")
for order_id in order_obj.browse(cr, uid, [record_id], context=context):
for order_id in order_obj.browse(cr, uid, [active_id], context=context):
prop_ids =property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
val = property_obj.browse(cr, uid,prop_ids[0]).value
val = property_obj.browse(cr, uid,prop_ids[0]).value_reference
cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
res=cr.fetchone()
location_id=res and res[0] or None
stock_dest_id = int(val.split(',')[1])
stock_dest_id = val.id
order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
if order_id.invoice_id:
@ -328,11 +328,11 @@ class add_product(osv.osv_memory):
})
wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
picking_obj.force_assign(cr, uid, [new_picking], context)
obj=order_obj.browse(cr,uid, record_id)
obj=order_obj.browse(cr,uid, active_id)
if obj.amount_total != obj.amount_paid:
return {
'name': _('Make Payment'),
'context ':context and context.get('record_id', False),
'context ':context and context.get('active_id', False),
'view_type': 'form',
'view_mode': 'form',
'res_model': 'pos.make.payment',

7
addons/product/security/product_security.xml
View File

@ -10,13 +10,10 @@
</record>
<record model="ir.rule.group" id="product_comp_rule_group">
<field name="name" >Product multi-company</field>
<record id="product_comp_rule" model="ir.rule">
<field name="name" >Product multi-company</field>
<field name="model_id" ref="model_product_template"/>
<field name="global" eval="True"/>
</record>
<record id="product_comp_rule" model="ir.rule">
<field name="rule_group" ref="product_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>

2
addons/profile_manufacturing/i18n/pt_BR.po
View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_manufacturing

25
addons/project/security/project_security.xml
View File

@ -16,34 +16,25 @@
<field name="groups_id" eval="[(6,0,[ref('group_project_manager'), ref('group_project_finance')])]"/>
</record>
<record model="ir.rule.group" id="project_comp_rule_group">
<field name="name">Project multi-company</field>
<record model="ir.rule" id="project_comp_rule">
<field name="name">Project multi-company</field>
<field name="model_id" ref="model_project_project"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="project_comp_rule">
<field name="rule_group" ref="project_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule.group" id="task_comp_rule_group">
<field name="name" >Task multi-company</field>
<field name="model_id" ref="model_project_task"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="task_comp_rule">
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="rule_group" ref="task_comp_rule_group"/>
</record>
<record model="ir.rule.group" id="task_visibility_rule_group">
<field name="name" >Tasks According to User and Project</field>
<field name="name" >Task multi-company</field>
<field name="model_id" ref="model_project_task"/>
<field name="global" eval="True"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule" id="task_visibility_rule">
<field name="name" >Tasks According to User and Project</field>
<field name="model_id" ref="model_project_task"/>
<field name="global" eval="True"/>
<field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','=',user.id),('project_id.user_id','=',user.id)]</field>
<field name="rule_group" ref="task_visibility_rule_group"/>
</record>
</data>

11
addons/project_issue/security/project_issue_security.xml
View File

@ -2,17 +2,12 @@
<openerp>
<data noupdate="1">
<record model="ir.rule.group" id="project_issue_rule_group">
<field name="name">project.issue.rule.group</field>
<record id="project_issue_rule" model="ir.rule">
<field name="name">project.issue.rule.group</field>
<field name="model_id" search="[('model','=','project.issue')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="project_issue_rule" model="ir.rule">
<field name="domain_force">['|',('project_id','=',False),('project_id','=',user.context_project_id)]</field>
<field name="rule_group" ref="project_issue_rule_group"/>
</record>
</record>
</data>
</openerp>

16
addons/purchase/security/purchase_security.xml
View File

@ -10,25 +10,17 @@
</record>
<record model="ir.rule.group" id="purchase_order_comp_rule_group">
<field name="name">Purchase Order multi-company</field>
<record model="ir.rule" id="purchase_order_comp_rule">
<field name="name">Purchase Order multi-company</field>
<field name="model_id" ref="model_purchase_order"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="purchase_order_comp_rule">
<field name="field_id" search="[('model','=','purchase.order'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="purchase_order_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule.group" id="purchase_order_line_comp_rule_group">
<field name="name">Purchase Order Line multi-company</field>
<record model="ir.rule" id="purchase_order_line_comp_rule">
<field name="name">Purchase Order Line multi-company</field>
<field name="model_id" ref="model_purchase_order_line"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="purchase_order_line_comp_rule">
<field name="field_id" search="[('model','=','purchase.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="purchase_order_line_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>

17
addons/purchase_requisition/security/purchase_tender.xml
View File

@ -9,26 +9,17 @@
<field name="name">Purchase Requisition / User</field>
</record>
<record model="ir.rule.group" id="purchase_requisition_comp_rule_group">
<field name="name">Purchase Requisition multi-company</field>
<record model="ir.rule" id="purchase_requisition_comp_rule">
<field name="name">Purchase Requisition multi-company</field>
<field name="model_id" ref="model_purchase_requisition"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="purchase_requisition_comp_rule">
<field name="field_id" search="[('model','=','purchase.requisition'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="purchase_requisition_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule.group" id="purchase_requisition_line_comp_rule_group">
<field name="name">Purchase requisition Line multi-company</field>
<record model="ir.rule" id="purchase_requisition_line_comp_rule">
field name="name">Purchase requisition Line multi-company</field>
<field name="model_id" ref="model_purchase_requisition_line"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="purchase_requisition_line_comp_rule">
<field name="field_id" search="[('model','=','purchase.requisition.line'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="purchase_requisition_line_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>

10
addons/report_purchase/i18n/pl.po
View File

@ -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-11-17 10:25+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-05-05 06:46+0000\n"
"Last-Translator: Wojtek Kubiak <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 03:54+0000\n"
"X-Launchpad-Export-Date: 2010-05-06 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_purchase
#: field:report.purchase.order.category,price_average:0
#: field:report.purchase.order.product,price_average:0
msgid "Average Price"
msgstr "Cena przeciętna"
msgstr "Średnia cena"
#. module: report_purchase
#: field:report.purchase.order.category,state:0
@ -49,7 +49,7 @@ msgstr "Zakupy wg produktów"
#. module: report_purchase
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
msgstr ""
msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
#. module: report_purchase
#: model:ir.ui.menu,name:report_purchase.next_id_75

16
addons/sale/security/sale_security.xml
View File

@ -13,25 +13,17 @@
<field name="groups_id" eval="[(6,0,[ref('group_sale_manager')])]"/>
</record>
<record model="ir.rule.group" id="sale_order_comp_rule_group">
<field name="name">Sale Order multi-company</field>
<record model="ir.rule" id="sale_order_comp_rule">
<field name="name">Sale Order multi-company</field>
<field name="model_id" ref="model_sale_order"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="sale_order_comp_rule">
<field name="field_id" search="[('model','=','sale.order'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="sale_order_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule.group" id="sale_order_line_comp_rule_group">
<field name="name">Sale Order Line multi-company</field>
<record model="ir.rule" id="sale_order_line_comp_rule">
<field name="name">Sale Order Line multi-company</field>
<field name="model_id" ref="model_sale_order_line"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="sale_order_line_comp_rule">
<field name="field_id" search="[('model','=','sale.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="sale_order_line_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>

2
addons/stock/i18n/es.po
View File

@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n"
"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock

258
addons/stock/i18n/zh_CN.po
View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.6\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
"PO-Revision-Date: 2010-03-29 01:06+0000\n"
"PO-Revision-Date: 2010-05-06 03:59+0000\n"
"Last-Translator: digitalsatori <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n"
"X-Launchpad-Export-Date: 2010-05-06 04:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@ -141,7 +141,7 @@ msgstr "业务伙伴"
#. module: stock
#: help:product.product,track_incoming:0
msgid "Force to use a Production Lot during receptions"
msgstr "接收强制的生产批次"
msgstr "在接收时强制使用生产批号"
#. module: stock
#: field:stock.move,move_history_ids:0
@ -184,7 +184,7 @@ msgstr "状态"
#. module: stock
#: field:stock.location,stock_real_value:0
msgid "Real Stock Value"
msgstr "实时库存值"
msgstr "实际库存额"
#. module: stock
#: view:stock.move:0
@ -201,7 +201,7 @@ msgstr "可用"
#. module: stock
#: view:stock.move:0
msgid "Make Parcel"
msgstr "打小包"
msgstr "装箱"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
@ -211,27 +211,27 @@ msgstr "包装结果"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_QUIT"
msgstr "退出"
msgstr "STOCK_QUIT"
#. module: stock
#: field:stock.warehouse,lot_output_id:0
msgid "Location Output"
msgstr "库位出"
msgstr "输出库存位"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GOTO_TOP"
msgstr "顶"
msgstr "STOCK_GOTO_TOP"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ABOUT"
msgstr "关于"
msgstr "STOCK_ABOUT"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-hr"
msgstr "人力资源"
msgstr "terp-hr"
#. module: stock
#: field:stock.location,usage:0
@ -241,7 +241,7 @@ msgstr "库位类型"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-purchase"
msgstr "采购"
msgstr "terp-purchase"
#. module: stock
#: selection:stock.location,icon:0
@ -256,12 +256,12 @@ msgstr "["
#. module: stock
#: view:stock.picking:0
msgid "Products Sent"
msgstr "产品发出"
msgstr "已发出产品"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GOTO_FIRST"
msgstr "开始"
msgstr "STOCK_GOTO_FIRST"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree6
@ -272,7 +272,7 @@ msgstr "内部调拨"
#. module: stock
#: field:stock.move,product_packaging:0
msgid "Packaging"
msgstr "包装"
msgstr "装箱"
#. module: stock
#: rml:stock.picking.list:0
@ -300,12 +300,12 @@ msgstr "客户退货"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_FLOPPY"
msgstr "软驱"
msgstr "STOCK_FLOPPY"
#. module: stock
#: view:stock.production.lot.revision:0
msgid "Production Lot Revisions"
msgstr "生产批次修改"
msgstr ""
#. module: stock
#: view:stock.location:0
@ -321,7 +321,7 @@ msgstr "库位名称"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNINDENT"
msgstr "不缩进"
msgstr "STOCK_UNINDENT"
#. module: stock
#: view:stock.move:0
@ -349,12 +349,12 @@ msgstr "客户"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNDERLINE"
msgstr "下划线"
msgstr "STOCK_UNDERLINE"
#. module: stock
#: view:stock.picking.move.wizard:0
msgid "Move Lines"
msgstr "调拨线路"
msgstr "凭证明细"
#. module: stock
#: wizard_field:stock.fill_inventory,init,recursive:0
@ -385,22 +385,22 @@ msgstr "跟踪明细"
#. module: stock
#: field:stock.location,child_ids:0
msgid "Contains"
msgstr "含"
msgstr "包含"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_BOLD"
msgstr "粗体"
msgstr "STOCK_BOLD"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-graph"
msgstr "图像"
msgstr "terp-graph"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PREFERENCES"
msgstr "偏爱"
msgstr "STOCK_PREFERENCES"
#. module: stock
#: rml:lot.location:0
@ -434,12 +434,12 @@ msgstr "库存层1"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_REWIND"
msgstr "倒回"
msgstr "STOCK_MEDIA_REWIND"
#. module: stock
#: field:stock.warehouse,lot_input_id:0
msgid "Location Input"
msgstr "库位进"
msgstr "输入库位"
#. module: stock
#: view:res.partner:0
@ -475,7 +475,7 @@ msgstr "产品ID"
#. module: stock
#: view:res.partner:0
msgid "Sales & Purchases"
msgstr "销售&采购"
msgstr "销售与采购"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
@ -490,12 +490,12 @@ msgstr "盘存库位"
#. module: stock
#: help:product.product,track_production:0
msgid "Force to use a Production Lot during production order"
msgstr "生产单强制的生产批次"
msgstr "在录入生产单时强制使用生产批号"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CUT"
msgstr "剪贴"
msgstr "STOCK_CUT"
#. module: stock
#: help:product.template,property_stock_inventory:0
@ -513,7 +513,7 @@ msgstr "用于记录出库价值科目"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ZOOM_FIT"
msgstr "放大到适合"
msgstr "STOCK_ZOOM_FIT"
#. module: stock
#: help:product.category,property_stock_journal:0
@ -540,7 +540,7 @@ msgstr "库存库位"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SAVE_AS"
msgstr "另存到"
msgstr "STOCK_SAVE_AS"
#. module: stock
#: model:ir.model,name:stock.model_stock_report_prodlots
@ -550,7 +550,7 @@ msgstr "库存生产批次报表"
#. module: stock
#: field:stock.location,stock_virtual:0
msgid "Virtual Stock"
msgstr "虚拟库存"
msgstr "账面库存"
#. module: stock
#: selection:stock.location,usage:0
@ -560,7 +560,7 @@ msgstr "视图"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_ERROR"
msgstr "错误"
msgstr "STOCK_DIALOG_ERROR"
#. module: stock
#: field:stock.location,parent_left:0
@ -575,12 +575,12 @@ msgstr "最近盘存日期"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_INDEX"
msgstr "索引"
msgstr "STOCK_INDEX"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GOTO_BOTTOM"
msgstr "底"
msgstr "STOCK_GOTO_BOTTOM"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_form
@ -614,27 +614,27 @@ msgstr "跟踪批次"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GO_FORWARD"
msgstr "向前"
msgstr "STOCK_GO_FORWARD"
#. module: stock
#: field:stock.production.lot.revision,author_id:0
msgid "Author"
msgstr "建立者"
msgstr "作者"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNDELETE"
msgstr "恢复"
msgstr "STOCK_UNDELETE"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_EXECUTE"
msgstr "执行"
msgstr "STOCK_EXECUTE"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_QUESTION"
msgstr "疑问"
msgstr "STOCK_DIALOG_QUESTION"
#. module: stock
#: selection:stock.location,chained_auto_packing:0
@ -664,12 +664,12 @@ msgstr "跟踪号/序号"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SELECT_FONT"
msgstr "选择字体"
msgstr "STOCK_SELECT_FONT"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PASTE"
msgstr "粘贴"
msgstr "STOCK_PASTE"
#. module: stock
#: model:stock.location,name:stock.stock_location_locations_partner
@ -680,7 +680,7 @@ msgstr "业务伙伴库位"
#: help:stock.move,tracking_id:0
msgid ""
"Tracking lot is the code that will be put on the logistical unit/pallet"
msgstr "跟踪批次是代码将放入逻辑单位/托板"
msgstr "跟踪批次号是帖在货运包装或托板上的代码"
#. module: stock
#: view:stock.tracking:0
@ -695,7 +695,7 @@ msgstr "欧洲客户"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-stock"
msgstr "库存"
msgstr "terp-stock"
#. module: stock
#: rml:stock.picking.list:0
@ -705,12 +705,12 @@ msgstr "包装单:"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_RECORD"
msgstr "记录"
msgstr "STOCK_MEDIA_RECORD"
#. module: stock
#: view:stock.picking:0
msgid "Calendar View"
msgstr "日程表视图"
msgstr "日历视图"
#. module: stock
#: wizard_field:stock.location.products,init,from_date:0
@ -725,7 +725,7 @@ msgstr "重量"
#. module: stock
#: rml:stock.picking.list:0
msgid "Non Assigned Products:"
msgstr "没指定产品"
msgstr "未分派的产品"
#. module: stock
#: view:stock.picking:0
@ -735,12 +735,12 @@ msgstr "发票控制"
#. module: stock
#: model:ir.model,name:stock.model_stock_production_lot_revision
msgid "Production lot revisions"
msgstr "生产批次次修订"
msgstr "生产批次修订"
#. module: stock
#: view:stock.picking:0
msgid "Packing Done"
msgstr "打包装完成"
msgstr "装箱完成"
#. module: stock
#: selection:stock.move,state:0
@ -754,7 +754,7 @@ msgstr "等待中"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
#: model:ir.ui.menu,name:stock.menu_picking_waiting
msgid "Available Packing"
msgstr "可包装"
msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_warehouse
@ -765,7 +765,7 @@ msgstr "仓库"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-report"
msgstr "报表"
msgstr "terp-report"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,type:0
@ -780,12 +780,12 @@ msgstr "一般IT供应商"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_location_overview_all
msgid "Location Content (With children)"
msgstr "货物内容(子库位)"
msgstr "库存地点（包括子项）"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_FILE"
msgstr "文件"
msgstr "STOCK_FILE"
#. module: stock
#: field:report.stock.lines.date,id:0
@ -795,35 +795,35 @@ msgstr "盘存明细ID"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_EDIT"
msgstr "编辑"
msgstr "STOCK_EDIT"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CONNECT"
msgstr "连接"
msgstr "STOCK_CONNECT"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_all
#: model:ir.ui.menu,name:stock.menu_action_picking_all
#: wizard_field:stock.picking.make,init,pickings:0
msgid "Packing"
msgstr "包装"
msgstr "装箱"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GO_DOWN"
msgstr "向下"
msgstr "STOCK_GO_DOWN"
#. module: stock
#: field:res.partner,property_stock_customer:0
#: selection:stock.location,usage:0
msgid "Customer Location"
msgstr "客户库位"
msgstr "客户存货地点"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_OK"
msgstr "好"
msgstr "STOCK_OK"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree9
@ -876,7 +876,7 @@ msgstr "所有库存调拨"
#. module: stock
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
msgstr "无效XML视图结构!"
msgstr "描述视图结构的XML文件无效"
#. module: stock
#: field:res.partner,property_stock_supplier:0
@ -887,7 +887,7 @@ msgstr "供货商库位"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_HELP"
msgstr "帮助"
msgstr "STOCK_HELP"
#. module: stock
#: selection:stock.move,priority:0
@ -897,12 +897,12 @@ msgstr "紧急"
#. module: stock
#: help:product.category,property_stock_account_input_categ:0
msgid "This account will be used to value the input stock"
msgstr "用于记录入库的价值科目"
msgstr "此科目用于记录入库库存金额"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_INFO"
msgstr "信息"
msgstr "STOCK_DIALOG_INFO"
#. module: stock
#: field:stock.move,date:0
@ -928,7 +928,7 @@ msgstr "已创建存货调拨"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GO_BACK"
msgstr "后退"
msgstr "STOCK_GO_BACK"
#. module: stock
#: selection:stock.picking,invoice_state:0
@ -944,7 +944,7 @@ msgstr "对应库位属性"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUSTIFY_FILL"
msgstr "两端对齐"
msgstr "STOCK_JUSTIFY_FILL"
#. module: stock
#: view:stock.move:0
@ -965,7 +965,7 @@ msgstr "分配方法"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-administration"
msgstr "管理员"
msgstr "terp-administration"
#. module: stock
#: field:stock.warehouse,lot_stock_id:0
@ -975,12 +975,12 @@ msgstr "库位库存"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_APPLY"
msgstr "应用"
msgstr "STOCK_APPLY"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "The packing has been successfully made !"
msgstr "这包装创建成功!"
msgstr "装箱已完成！"
#. module: stock
#: field:stock.move,address_id:0
@ -997,23 +997,23 @@ msgstr "定期盘存"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-crm"
msgstr "客户关系管理"
msgstr "terp-crm"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_STRIKETHROUGH"
msgstr "加删除线"
msgstr "STOCK_STRIKETHROUGH"
#. module: stock
#: rml:lot.stock.overview_all:0
#: field:stock.incoterms,code:0
msgid "Code"
msgstr "代码"
msgstr "编码"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-partner"
msgstr "业务伙伴"
msgstr "terp-partner"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
@ -1060,12 +1060,12 @@ msgstr "信息"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MISSING_IMAGE"
msgstr "图像"
msgstr "STOCK_MISSING_IMAGE"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SPELL_CHECK"
msgstr "检查"
msgstr "STOCK_SPELL_CHECK"
#. module: stock
#: model:ir.model,name:stock.model_stock_tracking
@ -1082,7 +1082,7 @@ msgstr "单价"
#. module: stock
#: view:stock.picking:0
msgid "Process Later"
msgstr "最后处理"
msgstr "稍候处理"
#. module: stock
#: help:res.partner,property_stock_supplier:0
@ -1115,7 +1115,7 @@ msgstr "可调拨"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_HARDDISK"
msgstr "硬盘"
msgstr "STOCK_HARDDISK"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_relate_picking
@ -1128,7 +1128,7 @@ msgstr "相关领料/提货"
#: field:stock.picking.move.wizard,name:0
#: field:stock.warehouse,name:0
msgid "Name"
msgstr "3"
msgstr "名称"
#. module: stock
#: view:stock.inventory.line:0
@ -1159,7 +1159,7 @@ msgstr "包装单"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_COPY"
msgstr "复制"
msgstr "STOCK_COPY"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
@ -1180,7 +1180,7 @@ msgstr "出库科目"
#. module: stock
#: selection:stock.location,chained_auto_packing:0
msgid "Automatic No Step Added"
msgstr "自动没步骤增加"
msgstr "自动，不加入步骤"
#. module: stock
#: wizard_view:stock.location.products,init:0
@ -1190,7 +1190,7 @@ msgstr "库存库位分析"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CDROM"
msgstr "光驱"
msgstr "STOCK_CDROM"
#. module: stock
#: selection:stock.picking,invoice_state:0
@ -1215,12 +1215,12 @@ msgstr "内部参考"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_REFRESH"
msgstr "恢复"
msgstr "STOCK_REFRESH"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_STOP"
msgstr "停止"
msgstr "STOCK_STOP"
#. module: stock
#: wizard_view:stock.move.track,init:0
@ -1230,27 +1230,27 @@ msgstr "跟踪调拨"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_FIND_AND_REPLACE"
msgstr "替换"
msgstr "STOCK_FIND_AND_REPLACE"
#. module: stock
#: view:stock.picking:0
msgid "Validate"
msgstr "确认"
msgstr "审核"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_WARNING"
msgstr "警告"
msgstr "STOCK_DIALOG_WARNING"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ZOOM_IN"
msgstr "缩小"
msgstr "STOCK_ZOOM_IN"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CONVERT"
msgstr "修改"
msgstr "STOCK_CONVERT"
#. module: stock
#: field:stock.move,note:0
@ -1284,27 +1284,27 @@ msgstr "产品"
#. module: stock
#: field:stock.picking,move_type:0
msgid "Delivery Method"
msgstr "交货方式"
msgstr "运输方式"
#. module: stock
#: model:ir.actions.wizard,name:stock.partial_picking
msgid "Partial packing"
msgstr "部分包装"
msgstr "部分装箱"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-calendar"
msgstr "日程表"
msgstr "terp-calendar"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ITALIC"
msgstr "斜体"
msgstr "STOCK_ITALIC"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_YES"
msgstr "是"
msgstr "STOCK_YES"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
@ -1325,7 +1325,7 @@ msgstr "新的定期盘存"
#. module: stock
#: field:stock.production.lot,revisions:0
msgid "Revisions"
msgstr "修改"
msgstr "修订记录"
#. module: stock
#: selection:stock.location,allocation_method:0
@ -1370,7 +1370,7 @@ msgstr "单位"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUSTIFY_LEFT"
msgstr "左对齐"
msgstr "STOCK_JUSTIFY_LEFT"
#. module: stock
#: view:stock.inventory:0
@ -1420,7 +1420,7 @@ msgstr "固定库位"
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
#. module: stock
#: field:stock.picking,min_date:0
@ -1436,7 +1436,7 @@ msgstr "发出的产品"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_COLOR_PICKER"
msgstr "颜色包"
msgstr "STOCK_COLOR_PICKER"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_lot_location
@ -1446,7 +1446,7 @@ msgstr "库位批次"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DELETE"
msgstr "删除"
msgstr "STOCK_DELETE"
#. module: stock
#: model:account.journal,name:stock.stock_journal
@ -1456,7 +1456,7 @@ msgstr "库存分类帐"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CLEAR"
msgstr "清空"
msgstr "STOCK_CLEAR"
#. module: stock
#: field:stock.production.lot,date:0
@ -1486,7 +1486,7 @@ msgstr "产品库存视图"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-mrp"
msgstr "生产资源计划"
msgstr "terp-mrp"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
@ -1497,12 +1497,12 @@ msgstr "未来的送货单"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_GO_UP"
msgstr "向上"
msgstr "STOCK_GO_UP"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SORT_DESCENDING"
msgstr "降序"
msgstr "STOCK_SORT_DESCENDING"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_tracking_form
@ -1523,17 +1523,17 @@ msgstr "库存清单"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_HOME"
msgstr "首页"
msgstr "STOCK_HOME"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PROPERTIES"
msgstr "属性"
msgstr "STOCK_PROPERTIES"
#. module: stock
#: field:stock.location,stock_real:0
msgid "Real Stock"
msgstr "实时库存"
msgstr "实际库存"
#. module: stock
#: model:ir.actions.wizard,name:stock.wizard_fill_inventory
@ -1576,7 +1576,7 @@ msgstr "包装处理"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_STOP"
msgstr "停止"
msgstr "STOCK_MEDIA_STOP"
#. module: stock
#: view:stock.move:0
@ -1587,7 +1587,7 @@ msgstr "设为可用"
#: model:ir.actions.wizard,name:stock.make_picking
#: wizard_view:stock.picking.make,init:0
msgid "Make packing"
msgstr "进行创建分拣单"
msgstr "装箱"
#. module: stock
#: field:stock.picking,backorder_id:0
@ -1597,12 +1597,12 @@ msgstr "拖欠订单"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DND_MULTIPLE"
msgstr "倍数"
msgstr "STOCK_DND_MULTIPLE"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_REMOVE"
msgstr "移除"
msgstr "STOCK_REMOVE"
#. module: stock
#: field:stock.incoterms,active:0
@ -1610,7 +1610,7 @@ msgstr "移除"
#: field:stock.picking,active:0
#: field:stock.tracking,active:0
msgid "Active"
msgstr "生效"
msgstr "有效"
#. module: stock
#: view:product.template:0
@ -1634,12 +1634,12 @@ msgstr "合计:"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_DIALOG_AUTHENTICATION"
msgstr "确定"
msgstr "STOCK_DIALOG_AUTHENTICATION"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ZOOM_OUT"
msgstr "放大"
msgstr "STOCK_ZOOM_OUT"
#. module: stock
#: wizard_field:stock.move.track,init,tracking_prefix:0
@ -1654,22 +1654,22 @@ msgstr "最近"
#. module: stock
#: wizard_field:stock.location.products,init,to_date:0
msgid "To"
msgstr "到"
msgstr "至"
#. module: stock
#: field:stock.production.lot.revision,name:0
msgid "Revision Name"
msgstr "修改名称"
msgstr "修订版名称"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_SELECT_COLOR"
msgstr "选择颜色"
msgstr "STOCK_SELECT_COLOR"
#. module: stock
#: view:stock.inventory:0
msgid "Confirm Inventory"
msgstr "库存确定"
msgstr "盘点确认"
#. module: stock
#: view:product.category:0
@ -1679,7 +1679,7 @@ msgstr "会计库存属性"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_NO"
msgstr "否"
msgstr "STOCK_NO"
#. module: stock
#: model:stock.location,name:stock.stock_location_workshop
@ -1701,7 +1701,7 @@ msgstr "虚拟库位"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_REDO"
msgstr "重做"
msgstr "STOCK_REDO"
#. module: stock
#: model:stock.location,name:stock.stock_location_company
@ -1721,7 +1721,7 @@ msgstr "不紧急"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_CLOSE"
msgstr "关闭"
msgstr "STOCK_CLOSE"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_warehouse_form
@ -1732,7 +1732,7 @@ msgstr "仓库"
#. module: stock
#: help:product.product,track_outgoing:0
msgid "Force to use a Production Lot during deliveries"
msgstr "送货强制的生产批次"
msgstr "在运输时强制使用生产批次"
#. module: stock
#: view:stock.picking:0
@ -1796,7 +1796,7 @@ msgstr "系列型号"
#. module: stock
#: field:stock.location,posx:0
msgid "Corridor (X)"
msgstr "走廊（X）"
msgstr "通道(X)"
#. module: stock
#: model:stock.location,name:stock.stock_location_suppliers
@ -1806,12 +1806,12 @@ msgstr "供应商"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_JUMP_TO"
msgstr "跳到"
msgstr "STOCK_JUMP_TO"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-tools"
msgstr "工具"
msgstr "terp-tools"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_location_overview
@ -1826,7 +1826,7 @@ msgstr "产品库位"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_UNDO"
msgstr "取消"
msgstr "STOCK_UNDO"
#. module: stock
#: model:ir.actions.wizard,name:stock.move_split
@ -1836,7 +1836,7 @@ msgstr "分割调拨明细"
#. module: stock
#: selection:stock.location,icon:0
msgid "terp-sale"
msgstr "销售"
msgstr "terp-sale"
#. module: stock
#: field:stock.production.lot,name:0
@ -1846,7 +1846,7 @@ msgstr "序号"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_ADD"
msgstr "增加"
msgstr "STOCK_ADD"
#. module: stock
#: field:stock.location,chained_delay:0
@ -1856,17 +1856,17 @@ msgstr "连锁延迟(天)"
#. module: stock
#: field:stock.move,location_id:0
msgid "Source Location"
msgstr "源货位"
msgstr "源库位"
#. module: stock
#: view:product.template:0
msgid "Accounting Entries"
msgstr "凭证"
msgstr "会计分录"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_MEDIA_PAUSE"
msgstr "暂停"
msgstr "STOCK_MEDIA_PAUSE"
#. module: stock
#: view:product.product:0
@ -1894,12 +1894,12 @@ msgstr "盘存日期"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_PRINT_PREVIEW"
msgstr "打印预览"
msgstr "STOCK_PRINT_PREVIEW"
#. module: stock
#: selection:stock.location,icon:0
msgid "STOCK_FIND"
msgstr "查找"
msgstr "STOCK_FIND"
#. module: stock
#: view:stock.inventory:0

1
addons/stock/report/__init__.py
View File

@ -29,7 +29,6 @@ import lot_overview_all
import report_stock
import report_stock_move
import report_stock_picking
import report_stock_move
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

55
addons/stock/security/stock_security.xml
View File

@ -19,75 +19,46 @@
<!-- multi -->
<record model="ir.rule.group" id="stock_picking_rule_group">
<field name="name">stock_picking multi-company</field>
<record model="ir.rule" id="stock_picking_rule">
<field name="name">stock_picking multi-company</field>
<field name="model_id" search="[('model','=','stock.picking')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="stock_picking_rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','stock.picking'),('name','=','company_id')]"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','=',False)]</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="stock_picking_rule_group"/>
</record>
<record model="ir.rule.group" id="stock_warehouse_comp_rule_group">
<field name="name">Warehouse multi-company</field>
<record model="ir.rule" id="stock_warehouse_comp_rule">
<field name="name">Warehouse multi-company</field>
<field name="model_id" ref="model_stock_warehouse"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="stock_warehouse_comp_rule">
<field name="field_id" search="[('model','=','stock.warehouse'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="stock_warehouse_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule.group" id="stock_location_comp_rule_group">
<field name="name">Location multi-company</field>
<record model="ir.rule" id="stock_location_comp_rule">
<field name="name">Location multi-company</field>
<field name="model_id" ref="model_stock_location"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="stock_location_comp_rule">
<field name="field_id" search="[('model','=','stock.location'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="stock_location_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule.group" id="stock_move_rule_group">
<field name="name">stock_move multi-company</field>
<record model="ir.rule" id="stock_move_rule">
<field name="name">stock_move multi-company</field>
<field name="model_id" search="[('model','=','stock.move')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="stock_move_rule">
<field model="ir.model.fields" name="field_id" search="[('model','=','stock.move'),('name','=','company_id')]"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="operator">child_of</field>
<field name="operand">user.company_id.id</field>
<field name="rule_group" ref="stock_move_rule_group"/>
</record>
<record model="ir.rule.group" id="stock_inventory_line_comp_rule_group">
<field name="name">Inventory Line multi-company</field>
<record model="ir.rule" id="stock_inventory_line_comp_rule">
<field name="name">Inventory Line multi-company</field>
<field name="model_id" ref="model_stock_inventory_line"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="stock_inventory_line_comp_rule">
<field name="field_id" search="[('model','=','stock.inventory.line'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="stock_inventory_line_comp_rule_group"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
<record model="ir.rule.group" id="stock_inventory_comp_rule_group">
<field name="name">Inventory multi-company</field>
<record model="ir.rule" id="stock_inventory_comp_rule">
<field name="name">Inventory multi-company</field>
<field name="model_id" ref="model_stock_inventory"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="stock_inventory_comp_rule">
<field name="field_id" search="[('model','=','stock.inventory'),('name','=','company_id')]" model="ir.model.fields"/>
<field name="rule_group" ref="stock_inventory_comp_rule_group"/>
<field name="domain_force">[('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
</record>
</data>

4
addons/stock/stock.py
View File

@ -182,7 +182,7 @@ class stock_location(osv.osv):
'stock_real_value': fields.function(_product_value, method=True, type='float', string='Real Stock Value', multi="stock"),
'stock_virtual_value': fields.function(_product_value, method=True, type='float', string='Virtual Stock Value', multi="stock"),
'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
'scraped': fields.boolean('Scraped'),
'scrap_location': fields.boolean('Scrap Location', help='Check this box if the current location is a place for destroyed items'),
}
_defaults = {
'active': lambda *a: 1,
@ -195,7 +195,7 @@ class stock_location(osv.osv):
'posy': lambda *a: 0,
'posz': lambda *a: 0,
'icon': lambda *a: False,
'scraped': lambda *a: False,
'scrap_location': lambda *a: False,
}
def chained_location_get(self, cr, uid, location, partner=None, product=None, context={}):

2
addons/stock/stock_view.xml
View File

@ -404,7 +404,7 @@
<field name="location_id"/>
<field name="address_id" context="{'contact_display':'partner'}"/>
<field name="icon"/>
<field name="scraped"/>
<field name="scrap_location"/>
<newline/>
<group col="2" colspan="2" groups="base.group_extended">
<separator string="Chained Locations" colspan="2"/>

2
addons/stock/wizard/stock_move_view.xml
View File

@ -73,7 +73,7 @@
<form string="Scrap Move">
<separator string="Scrap Products" colspan="4"/>
<field name="product_id" colspan="4" readonly="1"/>
<field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scraped','=',True)]"/>
<field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]"/>
<field name="product_qty" colspan="2"/>
<field name="product_uom" nolabel="1" readonly="1"/>
<newline/>