[MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100415132520-7tm83tyu5nub94k8
This commit is contained in:
mra (Open ERP)
commit
1f9f099294
|
|
@ -11,8 +11,8 @@
|
|||
<page string="Accounting">
|
||||
<separator string="Sales Properties" colspan="2"/>
|
||||
<separator string="Purchase Properties" colspan="2"/>
|
||||
<field name="property_account_income" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />
|
||||
<field name="property_account_expense" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
|
||||
<field name="property_account_income" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" groups="base.group_extended"/>
|
||||
<field name="property_account_expense" domain="[('type','<>','view'),('type','<>','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="base.group_extended"/>
|
||||
|
||||
<separator string="Sale Taxes" colspan="2"/>
|
||||
<separator string="Purchase Taxes" colspan="2"/>
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 14:29+0000\n"
|
||||
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
|
||||
"PO-Revision-Date: 2010-04-15 00:46+0000\n"
|
||||
"Last-Translator: Bundo <bundo@bundo.biz>\n"
|
||||
"Language-Team: Korean <ko@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-03-30 04:07+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
|
|
@ -106,7 +106,7 @@ msgstr "배분 코드"
|
|||
#. module: account_analytic_plans
|
||||
#: constraint:ir.actions.act_window:0
|
||||
msgid "Invalid model name in the action definition."
|
||||
msgstr ""
|
||||
msgstr "액션 정의에서 유효하지 않은 모델 이름"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: field:account.analytic.plan.line,name:0
|
||||
|
|
@ -116,7 +116,7 @@ msgstr "플랜 이름"
|
|||
#. module: account_analytic_plans
|
||||
#: rml:account.analytic.account.crossovered.analytic:0
|
||||
msgid "Printing date"
|
||||
msgstr ""
|
||||
msgstr "인쇄 날짜"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: rml:account.analytic.account.crossovered.analytic:0
|
||||
|
|
@ -147,7 +147,7 @@ msgstr "분석 저널"
|
|||
#. module: account_analytic_plans
|
||||
#: rml:account.analytic.account.crossovered.analytic:0
|
||||
msgid "100.00%"
|
||||
msgstr ""
|
||||
msgstr "100.00%"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: wizard_field:wizard.crossovered.analytic,init,ref:0
|
||||
|
|
@ -157,7 +157,7 @@ msgstr "분석 계정 참조"
|
|||
#. module: account_analytic_plans
|
||||
#: rml:account.analytic.account.crossovered.analytic:0
|
||||
msgid "Analytic Account :"
|
||||
msgstr ""
|
||||
msgstr "분석 계정:"
|
||||
|
||||
#. module: account_analytic_plans
|
||||
#: view:account.analytic.plan.line:0
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 16:01+0000\n"
|
||||
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
|
||||
"PO-Revision-Date: 2010-04-15 01:01+0000\n"
|
||||
"Last-Translator: Bundo <bundo@bundo.biz>\n"
|
||||
"Language-Team: Korean <ko@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-03-30 04:14+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: analytic_user_function
|
||||
|
|
@ -35,7 +35,7 @@ msgstr "상품"
|
|||
#. module: analytic_user_function
|
||||
#: field:analytic_user_funct_grid,account_id:0
|
||||
msgid "Analytic Account"
|
||||
msgstr ""
|
||||
msgstr "분석 계정"
|
||||
|
||||
#. module: analytic_user_function
|
||||
#: view:account.analytic.account:0
|
||||
|
|
@ -57,7 +57,7 @@ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포
|
|||
#. module: analytic_user_function
|
||||
#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
|
||||
msgid "Analytic User Function"
|
||||
msgstr ""
|
||||
msgstr "사용자 함수 분석"
|
||||
|
||||
#. module: analytic_user_function
|
||||
#: view:analytic_user_funct_grid:0
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<child1>
|
||||
<action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
|
||||
<action colspan="4" name="%(stock.action_picking_all)d" string="Deliveries (Out picking)" domain="[('state','=','assigned'),('type','=','out')]"/>
|
||||
<action colspan="4" name="%(mrp.mrp_procurement_action4)d" string=" Requisition in Exception"/>
|
||||
<action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="Procurements in Exception"/>
|
||||
</child1>
|
||||
|
||||
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
<field name="view_id" ref="board_mrp_manager_form"/>
|
||||
</record>
|
||||
|
||||
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
|
||||
<menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
|
||||
<menuitem
|
||||
id="next_id_87"
|
||||
name="Production"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,calendar,form,graph</field>
|
||||
<field name="view_id" ref="crm_case_claims_tree_view"/>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_Current":1,"search_default_My Claims":1}</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_current":1,"search_default_my_claims":1}</field>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_claims_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Claims">
|
||||
<filter icon="gtk-new" string="Current"
|
||||
<filter icon="gtk-new" string="Current" name="current"
|
||||
domain="[('state','in',('draft', 'open'))]"
|
||||
separator="1" help="Current Claims"
|
||||
/>
|
||||
|
|
@ -263,7 +263,7 @@
|
|||
<field name="name" select='1'/>
|
||||
<field name="partner_id" select="1"/>
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter icon="terp-partner" string="My Claims"
|
||||
<filter icon="terp-partner" name="my_claims"
|
||||
domain="[('user_id','=',uid)]" help="My Claims"/>
|
||||
<filter icon="terp-partner"
|
||||
domain="[('user_id','=', False)]"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<field name="res_model">crm.fundraising</field>
|
||||
<field name="view_mode">tree,form,graph</field>
|
||||
<field name="view_id" ref="crm.crm_case_tree_view_fund"/>
|
||||
<field name="context">{"search_default_My Funds":1,"search_default_section_id":section_id}</field>
|
||||
<field name="context">{"search_default_my_funds":1,"search_default_section_id":section_id}</field>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_fund_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@
|
|||
<search string="Search Funds">
|
||||
<group col='6' colspan='4'>
|
||||
<filter icon="terp-partner" string="My Funds"
|
||||
domain="[('user_id','=',uid)]"
|
||||
name="my_funds" domain="[('user_id','=',uid)]"
|
||||
separator="1"
|
||||
help="Funds Related to Current User"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<field name="res_model">crm.helpdesk</field>
|
||||
<field name="view_mode">tree,calendar,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_helpdesk"/>
|
||||
<field name="context">{"search_default_My Request":1,"search_default_section_id":section_id}</field>
|
||||
<field name="context">{"search_default_my_hd_request":1,"search_default_section_id":section_id}</field>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_helpdesk_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@
|
|||
<separator colspan="4" string="Action Information"/>
|
||||
<field colspan="4" name="name"/>
|
||||
<field name="date" select="2"/>
|
||||
<field name="user_id" select="2"/>
|
||||
<field name="user_id" select="2"/>
|
||||
</form>
|
||||
</field>
|
||||
</page>
|
||||
|
|
@ -223,7 +223,7 @@
|
|||
<field name="name" select='1' string="Query"/>
|
||||
<field name="partner_id" />
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter icon="terp-partner" string="My Request"
|
||||
<filter icon="terp-partner" name="my_hd_request"
|
||||
domain="[('user_id','=',uid)]" help="My Helpdesk Requests"/>
|
||||
</field>
|
||||
<field name="section_id" select="1" widget="selection" string="Section">
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
<field name="res_model">crm.lead</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_leads"/>
|
||||
<field name="context">{"search_default_Current":1,"search_default_My Lead":1,"search_default_section_id":section_id}</field>
|
||||
<field name="context">{"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}</field>
|
||||
<field name="context">{"search_default_current":1,"search_default_my_lead":1,"search_default_section_id":section_id}</field>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@
|
|||
name="convert_opportunity"
|
||||
string="Convert"
|
||||
help="Convert into Opportunity"
|
||||
icon="gtk-index"
|
||||
type="object"
|
||||
icon="gtk-index"
|
||||
type="object"
|
||||
attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
|
||||
<newline />
|
||||
<field name="section_id" colspan="1"
|
||||
|
|
@ -262,7 +262,7 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Leads">
|
||||
<filter icon="terp-project"
|
||||
<filter icon="terp-project" name="current"
|
||||
string="Current"
|
||||
domain="[('state','in',('draft','open'))]"/>
|
||||
<filter icon="terp-project"
|
||||
|
|
@ -288,7 +288,7 @@
|
|||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-partner"
|
||||
domain="[('user_id','=',uid)]"
|
||||
help="My Leads" string="My Lead"
|
||||
help="My Leads" name="my_lead"
|
||||
/>
|
||||
<filter icon="terp-partner"
|
||||
domain="[('user_id','=', False)]"
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@
|
|||
<field name="res_model">crm.meeting</field>
|
||||
<field name="view_mode">calendar,tree,form,gantt</field>
|
||||
<field name="view_id" ref="crm_case_calendar_view_meet"/>
|
||||
<field name="context">{"search_default_Current":1,"search_default_section_id":section_id}</field>
|
||||
<field name="context">{"search_default_current":1,"search_default_section_id":section_id}</field>
|
||||
<field name="search_view_id" ref="view_crm_case_meetings_filter"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet">
|
||||
|
|
|
|||
|
|
@ -259,9 +259,9 @@
|
|||
<filter icon="terp-crm" string="My Meetings"
|
||||
domain="[('user_id','=',uid)]"
|
||||
help="My Meetings" />
|
||||
<filter icon="terp-crm" string="Current"
|
||||
domain="[('state','in',('draft', 'open'))]"
|
||||
help="Current Meetings"/>
|
||||
<filter icon="terp-crm" name="current" string="Current"
|
||||
domain="[('state','in',('draft', 'open'))]"
|
||||
help="Current Meetings"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" select="1" string="Subject"/>
|
||||
<field name="partner_id" select="1" />
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<field name="res_model">crm.opportunity</field>
|
||||
<field name="view_mode">tree,form,graph</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_oppor"/>
|
||||
<field name="context">{"search_default_My Oprtnit":1,"search_default_Current":1,"search_default_section_id":section_id}</field>
|
||||
<field name="context">{"search_default_my_oprtnit":1,"search_default_new_oprtnit":1,"search_default_section_id":section_id}</field>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_oppor11">
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@
|
|||
<field name="name" string="Opportunity"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-partner" string="My Oprtnit"
|
||||
<filter icon="terp-partner" name="my_oprtnit"
|
||||
domain="[('user_id','=',uid)]"
|
||||
help="My Opportunities" />
|
||||
<filter icon="terp-partner"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,calendar</field>
|
||||
<field name="view_id" ref="crm_case_phone_tree_view"/>
|
||||
<field name="context">{"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_section_id":section_id}</field>
|
||||
<field name="context">{"set_editable":True,"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}</field>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
<field name="view_mode">tree,calendar</field>
|
||||
<field name="view_id" ref="crm_case_phone_tree_view"/>
|
||||
<field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
|
||||
<field name="context">{"default_state":'open',"search_default_My Calls":1,"search_default_section_id":section_id}</field>
|
||||
<field name="context">{"default_state":'open',"search_default_my_calls":1,"search_default_state":1,"search_default_section_id":section_id}</field>
|
||||
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -161,7 +161,6 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Phonecalls">
|
||||
<group>
|
||||
<filter icon="gtk-home" string="Today"
|
||||
domain="[('date','<', time.strftime('%%Y-%%m-%%d 23:59:59')),\
|
||||
('date','>=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
|
||||
|
|
@ -177,9 +176,9 @@
|
|||
<field name="name" string="Call Summary"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-partner" string="My Calls"
|
||||
domain="[('user_id','=',uid)]"
|
||||
help="My Phonecalls"/>
|
||||
<filter icon="terp-partner" name="my_calls"
|
||||
domain="[('user_id','=',uid)]"
|
||||
help="My Phonecalls"/>
|
||||
<filter icon="terp-partner"
|
||||
domain="[('user_id','=',False)]"
|
||||
help="Unassigned Phonecalls" />
|
||||
|
|
@ -190,7 +189,6 @@
|
|||
domain="[('section_id','=',context.get('section_id',False))]"
|
||||
help="My section" />
|
||||
</field>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="1" string="Group By..." colspan="4">
|
||||
<filter string="Partner" icon="terp-crm" domain="[]"
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 5.0.7\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
|
||||
"PO-Revision-Date: 2010-02-09 23:36+0000\n"
|
||||
"Last-Translator: Sebastien LANGE - http://www.Syleam.fr <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-04-14 15:48+0000\n"
|
||||
"Last-Translator: Olivier Dony (OpenERP) <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-03-30 03:58+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: crm
|
||||
|
|
@ -1753,7 +1753,7 @@ msgstr "Planifier un appel téléphonique"
|
|||
#. module: crm
|
||||
#: field:crm.case,ref:0
|
||||
msgid "Reference"
|
||||
msgstr ""
|
||||
msgstr "Référence"
|
||||
|
||||
#. module: crm
|
||||
#: field:crm.meeting,exrule:0
|
||||
|
|
@ -2408,6 +2408,8 @@ msgstr "Historique"
|
|||
msgid ""
|
||||
"This may help associations in their fund raising process and tracking."
|
||||
msgstr ""
|
||||
"Ceci peut aider les associations dans leur procédure de collecte de fonds et "
|
||||
"de suivi."
|
||||
|
||||
#. module: crm
|
||||
#: view:crm.meeting:0
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 5.0.0\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
|
||||
"PO-Revision-Date: 2010-04-14 03:47+0000\n"
|
||||
"PO-Revision-Date: 2010-04-14 03:53+0000\n"
|
||||
"Last-Translator: grisha <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-14 03:50+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: crm
|
||||
|
|
@ -172,7 +172,7 @@ msgstr ""
|
|||
#: wizard_field:crm.job.meeting_set,init,duration:0
|
||||
#: wizard_field:crm.phonecall.meeting_set,init,duration:0
|
||||
msgid "Duration (Hours)"
|
||||
msgstr ""
|
||||
msgstr "Длительность(в часах)"
|
||||
|
||||
#. module: crm
|
||||
#: selection:crm.meeting,transparent:0
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="view_id" ref="view_report_crm_claim_tree"/>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_report_crm_claim_filter"/>
|
||||
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="view_id" ref="view_report_crm_fundraising_tree"/>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_report_crm_fundraising_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
<field name="res_model">crm.lead.report</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_report_crm_lead_filter"/>
|
||||
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
<field name="res_model">crm.opportunity.report</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_report_crm_opportunity_filter"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_report_crm_opportunity_tree">
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="view_id" ref="view_report_crm_phonecall_tree"/>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1,"search_default_User":1}</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_report_crm_phonecall_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -64,10 +64,12 @@
|
|||
<search string="Search">
|
||||
<group col="16" colspan="8">
|
||||
<filter string="This Year" icon="terp-hr"
|
||||
domain="[('name','=',time.localtime()[0])]" />
|
||||
domain="[('name','=',time.localtime()[0])]"
|
||||
name="this_year" />
|
||||
|
||||
<filter string="This Month" icon="terp-hr"
|
||||
domain="[('month','=',time.strftime('%%m'))]" />
|
||||
domain="[('month','=',time.strftime('%%m'))]"
|
||||
name="this_month" />
|
||||
|
||||
<separator orientation="vertical" />
|
||||
<filter string="Current" icon="terp-hr"
|
||||
|
|
@ -104,7 +106,8 @@
|
|||
<newline/>
|
||||
<group expand="1" string="Group By..." colspan="4" col="8">
|
||||
<filter string="User" icon="terp-sale"
|
||||
domain="[]" context="{'group_by':'user_id'}" />
|
||||
domain="[]" context="{'group_by':'user_id'}"
|
||||
name="by_user" />
|
||||
|
||||
<filter string="Company" icon="terp-sale"
|
||||
domain="[]"
|
||||
|
|
@ -142,7 +145,7 @@
|
|||
<field name="res_model">crm.case.report</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_This Year":1,"search_default_This Month":1}</field>
|
||||
<field name="context">{"search_default_section_id":section_id,"search_default_this_year":1,"search_default_this_month":1}</field>
|
||||
<field name="search_view_id" ref="view_crm_case_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -67,9 +67,9 @@ def html2plaintext(html, body_id=None, encoding='utf-8'):
|
|||
|
||||
soup = BeautifulSoup(html, parseOnlyThese=strainer, fromEncoding=encoding)
|
||||
for link in soup.findAll('a'):
|
||||
title = link.renderContents()
|
||||
title = unicode(link)
|
||||
for url in [x[1] for x in link.attrs if x[0]=='href']:
|
||||
urls.append(dict(url=url, tag=str(link), title=title))
|
||||
urls.append(dict(url=url, tag=unicode(link), title=title))
|
||||
|
||||
html = unicode(soup)
|
||||
|
||||
|
|
@ -162,12 +162,9 @@ class email_parser(object):
|
|||
if charset:
|
||||
try:
|
||||
return s.decode(charset)
|
||||
except UnicodeError:
|
||||
pass
|
||||
try:
|
||||
return s.decode('ascii')
|
||||
except UnicodeError:
|
||||
return s
|
||||
except UnicodeError:
|
||||
pass
|
||||
return s.decode('latin1')
|
||||
|
||||
def _decode_header(self, s):
|
||||
from email.Header import decode_header
|
||||
|
|
|
|||
|
|
@ -8,20 +8,20 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 16:32+0000\n"
|
||||
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
|
||||
"PO-Revision-Date: 2010-04-15 00:44+0000\n"
|
||||
"Last-Translator: Bundo <bundo@bundo.biz>\n"
|
||||
"Language-Team: Korean <ko@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-03-30 04:13+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: crm_profiling
|
||||
#: constraint:ir.model:0
|
||||
msgid ""
|
||||
"The Object name must start with x_ and not contain any special character !"
|
||||
msgstr ""
|
||||
msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
|
||||
|
||||
#. module: crm_profiling
|
||||
#: field:crm_profiling.answer,question_id:0
|
||||
|
|
@ -43,12 +43,12 @@ msgstr "자식 프로파일"
|
|||
#. module: crm_profiling
|
||||
#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
|
||||
msgid "crm_profiling management"
|
||||
msgstr ""
|
||||
msgstr "crm 프로파일링 관리자(_P)"
|
||||
|
||||
#. module: crm_profiling
|
||||
#: constraint:ir.actions.act_window:0
|
||||
msgid "Invalid model name in the action definition."
|
||||
msgstr ""
|
||||
msgstr "액션 정의에서 유효하지 않은 모델 이름"
|
||||
|
||||
#. module: crm_profiling
|
||||
#: field:crm_profiling.answer,name:0
|
||||
|
|
@ -91,7 +91,7 @@ msgstr "질의서 이용"
|
|||
#. module: crm_profiling
|
||||
#: constraint:ir.ui.view:0
|
||||
msgid "Invalid XML for View Architecture!"
|
||||
msgstr ""
|
||||
msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
|
||||
|
||||
#. module: crm_profiling
|
||||
#: view:crm_profiling.questionnaire:0
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 13:55+0000\n"
|
||||
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
|
||||
"PO-Revision-Date: 2010-04-15 00:59+0000\n"
|
||||
"Last-Translator: Bundo <bundo@bundo.biz>\n"
|
||||
"Language-Team: Korean <ko@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-03-30 04:12+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: hr
|
||||
|
|
@ -58,7 +58,7 @@ msgstr "페어런트"
|
|||
#. module: hr
|
||||
#: constraint:ir.actions.act_window:0
|
||||
msgid "Invalid model name in the action definition."
|
||||
msgstr ""
|
||||
msgstr "액션 정의에 잘못된 모델 이름이 있습니다."
|
||||
|
||||
#. module: hr
|
||||
#: view:hr.department:0
|
||||
|
|
|
|||
|
|
@ -311,9 +311,9 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Evaluation">
|
||||
<group col='10' colspan='4'>
|
||||
<filter icon="terp-crm" string="To Do" domain="[('state','=','waiting_answer')]"/>
|
||||
<filter icon="terp-crm" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="My" icon="terp-partner" domain="[('user_id','=',uid)]"/>
|
||||
<filter string="My" icon="terp-partner" name="my" domain="[('user_id','=',uid)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-stock" string="Late" domain="[('date_deadline','<',current_date)]"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -329,7 +329,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('is_evaluation' ,'=', True)]</field>
|
||||
<field name="context">{"search_default_To Do":1,"search_default_My":1}</field>
|
||||
<field name="context">{"search_default_todo":1,"search_default_my":1}</field>
|
||||
<field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@
|
|||
<field name="date" select='1'/>
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter
|
||||
icon="gtk-execute" string="My Expns"
|
||||
icon="gtk-execute" name="my_expns"
|
||||
help="My Expenses"
|
||||
domain="[('user_id','=',uid)]"/>
|
||||
<filter icon="terp-hr"
|
||||
|
|
@ -172,7 +172,7 @@
|
|||
<field name="name">Expenses</field>
|
||||
<field name="res_model">hr.expense.expense</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="context">{"search_default_My Expns":1}</field>
|
||||
<field name="context">{"search_default_my_expns":1}</field>
|
||||
<field name="search_view_id" ref="view_hr_expense_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,8 @@
|
|||
<filter icon="terp-hr"
|
||||
string="Draft"
|
||||
domain="[('state','=','draft')]"/>
|
||||
<filter icon="terp-hr" string="Expenses"
|
||||
<filter icon="terp-hr" name="expenses"
|
||||
string="Expenses"
|
||||
domain="[('state','<>','draft'),('state','<>','cancelled')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="product_id"/>
|
||||
|
|
@ -70,7 +71,7 @@
|
|||
<newline/>
|
||||
<group expand="1" string="Group By...">
|
||||
<filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}"/>
|
||||
<filter string="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
|
||||
<filter string="User" name="by_user" icon="terp-hr" context="{'group_by':'user_id'}"/>
|
||||
<filter string="Employee" icon="terp-hr" context="{'group_by':'employee_id'}"/>
|
||||
<filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -89,7 +90,7 @@
|
|||
<field name="res_model">hr.expense.report</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{"search_default_Expenses":1,"search_default_User":1}</field>
|
||||
<field name="context">{"search_default_expenses":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_hr_expense_report_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<field name="res_model">hr.applicant</field>
|
||||
<field name="view_mode">tree,form,graph</field>
|
||||
<field name="view_id" ref="crm_case_tree_view_job"/>
|
||||
<field name="context">{"search_default_Current":1,"search_default_My Recrui":1}</field>
|
||||
<field name="context">{"search_default_current":1,"search_default_my_recrui":1}</field>
|
||||
<field name="search_view_id" ref="view_crm_case_jobs_filter"/>
|
||||
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Jobs">
|
||||
<group>
|
||||
<filter icon="gtk-new" string="Current"
|
||||
<filter icon="gtk-new" string="Current" name="current"
|
||||
domain="[('state','in',('draft','open'))]"
|
||||
help="All new and in progress jobs"
|
||||
/>
|
||||
|
|
@ -224,7 +224,7 @@
|
|||
<field name="job_id" widget="selection"/>
|
||||
<newline/>
|
||||
<field name="user_id" widget="selection">
|
||||
<filter domain="[('user_id','=',uid)]" string="My Recrui" help="My Recruitements" icon="gtk-execute"/>
|
||||
<filter domain="[('user_id','=',uid)]" name="my_recrui" help="My Recruitements" icon="gtk-execute"/>
|
||||
<filter domain="[('user_id','=',False)]" help="Unassigned Recruitements" icon="gtk-execute" separator="1"/>
|
||||
</field>
|
||||
<field name="department_id" widget="selection" string="Department" context="{'invisible_department': False}">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
<field name="type">search</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Recruitments">
|
||||
<group>
|
||||
<filter icon="terp-hr"
|
||||
string="This Year"
|
||||
domain="[('year','=',time.strftime('%%Y'))]"
|
||||
|
|
@ -59,9 +58,8 @@
|
|||
string="My Recruitments"
|
||||
domain="[('user_id','=',uid)]"/>
|
||||
</field>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="1" string="Extended options...">
|
||||
<group expand="1" string="Extended options..." colspan="10" col="12">
|
||||
<filter icon="terp-hr"
|
||||
string="Not Good"
|
||||
domain="[('priority','=','5')]"/>
|
||||
|
|
@ -78,9 +76,10 @@
|
|||
string="Excellent"
|
||||
domain="[('priority','=','1')]"/>
|
||||
</group>
|
||||
|
||||
<newline/>
|
||||
<group expand="1" string="Group By...">
|
||||
<filter string="User" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" />
|
||||
<group expand="1" string="Group By..." colspan="10" col="12">
|
||||
<filter string="User" name="by_user" icon="terp-hr" domain="[]" context="{'group_by':'user_id'}" />
|
||||
<filter string="Company" icon="terp-hr" domain="[]" context="{'group_by':'company_id'}"/>
|
||||
<filter string="Stage" icon="terp-hr" domain="[]" context="{'group_by':'stage_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -101,7 +100,7 @@
|
|||
<field name="res_model">hr.recruitment.report</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{"search_default_User":1}</field>
|
||||
<field name="context">{"search_default_user_id":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
|
||||
</record>
|
||||
<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class company(osv.osv):
|
|||
_columns = {
|
||||
'schedule_range': fields.float('Scheduler Range', required=True,
|
||||
help="This is the time frame analysed by the scheduler when "\
|
||||
"computing Requisitions. All Requisition that are not between "\
|
||||
"computing procurements. All procurements that are not between "\
|
||||
"today and today+range are skipped for futur computation."),
|
||||
'po_lead': fields.float('Purchase Lead Time', required=True,
|
||||
help="This is the leads/security time for each purchase order."),
|
||||
|
|
|
|||
|
|
@ -992,15 +992,15 @@ mrp_production_product_line()
|
|||
#
|
||||
class mrp_procurement(osv.osv):
|
||||
"""
|
||||
Procument Orders / Requisitions
|
||||
Procument Orders
|
||||
"""
|
||||
_name = "mrp.procurement"
|
||||
_description = "Procurement"
|
||||
_order = 'priority,date_planned'
|
||||
_columns = {
|
||||
'name': fields.char('Reason', size=64, required=True, help='Requisition name.'),
|
||||
'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
|
||||
'origin': fields.char('Source Document', size=64,
|
||||
help="Reference of the document that created this Requisition.\n"
|
||||
help="Reference of the document that created this Procurement.\n"
|
||||
"This is automatically completed by Open ERP."),
|
||||
'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
|
||||
'date_planned': fields.datetime('Scheduled date', required=True),
|
||||
|
|
@ -1056,7 +1056,7 @@ class mrp_procurement(osv.osv):
|
|||
if s['state'] in ['draft','cancel']:
|
||||
unlink_ids.append(s['id'])
|
||||
else:
|
||||
raise osv.except_osv(_('Invalid action !'), _('Cannot delete Requisition Order(s) which are in %s State!' % s['state']))
|
||||
raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
|
||||
return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
|
||||
|
||||
def onchange_product_id(self, cr, uid, ids, product_id, context={}):
|
||||
|
|
@ -1250,7 +1250,7 @@ class mrp_procurement(osv.osv):
|
|||
move_obj = self.pool.get('stock.move')
|
||||
for procurement in self.browse(cr, uid, ids):
|
||||
if procurement.product_qty <= 0.00:
|
||||
raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Requisition Order(s), it should not be less than 1!'))
|
||||
raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
|
||||
if procurement.product_id.type in ('product', 'consu'):
|
||||
if not procurement.move_id:
|
||||
source = procurement.location_id.id
|
||||
|
|
|
|||
|
|
@ -441,7 +441,7 @@
|
|||
<field name="cycle_total" operator="+"/>
|
||||
</graph>
|
||||
</field>
|
||||
</record>
|
||||
</record>
|
||||
|
||||
<record id="mrp_production_form_view" model="ir.ui.view">
|
||||
<field name="name">mrp.production.form</field>
|
||||
|
|
@ -493,7 +493,7 @@
|
|||
<button name="%(stock.move_scrap)d"
|
||||
string="Scrap Products" type="action"
|
||||
icon="gtk-convert" context="{'scrap': True}"
|
||||
states="draft,waiting,confirmed,assigned" />
|
||||
states="draft,waiting,confirmed,assigned" />
|
||||
</tree>
|
||||
</field>
|
||||
|
||||
|
|
@ -502,7 +502,7 @@
|
|||
<tree string="Consumed Products" editable="bottom" colors="red:scraped==True">
|
||||
<field name="product_id" readonly="1"/>
|
||||
<field name="product_qty" readonly="1" string="Qty"/>
|
||||
<field name="product_uom" readonly="1" string="UOM"/>
|
||||
<field name="product_uom" readonly="1" string="UOM"/>
|
||||
<field name="location_dest_id" readonly="1" string="Destination Loc."/>
|
||||
<field name="prodlot_id" />
|
||||
<field name="state" invisible="1"/>
|
||||
|
|
@ -516,8 +516,8 @@
|
|||
name="%(stock.move_scrap)d"
|
||||
string="Scrap Products" type="action"
|
||||
icon="gtk-convert"
|
||||
states="done,cancel" />
|
||||
|
||||
states="done,cancel" />
|
||||
|
||||
</tree>
|
||||
</field>
|
||||
|
||||
|
|
@ -525,13 +525,13 @@
|
|||
<field name="state" select="2"/>
|
||||
<button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
|
||||
<button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
|
||||
<button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>
|
||||
<button name="button_produce" states="ready" string="Mark as Started" icon="gtk-execute"/>
|
||||
<button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
|
||||
<button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
|
||||
<button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
|
||||
<button name="button_recreate" states="picking_except" string="Recreate Picking" icon="gtk-convert"/>
|
||||
</group>
|
||||
</page>
|
||||
</page>
|
||||
<page string="Finished Products">
|
||||
<field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
|
||||
mode="tree,form" height="275" domain="[('state','<>', ('done', 'cancel'))]">
|
||||
|
|
@ -548,7 +548,7 @@
|
|||
<button name="%(stock.move_scrap)d"
|
||||
string="Scrap Products" type="action"
|
||||
icon="gtk-convert" context="{'scrap': True}"
|
||||
states="draft,waiting,confirmed,assigned" />
|
||||
states="draft,waiting,confirmed,assigned" />
|
||||
</tree>
|
||||
</field>
|
||||
|
||||
|
|
@ -618,7 +618,7 @@
|
|||
<filter icon="terp-mrp" string="Draft"
|
||||
domain="[('state','=','draft')]"
|
||||
help="Non confirmed manufacturing orders"/>
|
||||
<filter icon="terp-mrp" string="Current"
|
||||
<filter icon="terp-mrp" string="Current" name="current"
|
||||
domain="[('state','in',('confirmed','ready'))]"
|
||||
help="Manufacturing Orders which are waiting for raw materials"/>
|
||||
<filter icon="terp-mrp" string="Ready"
|
||||
|
|
@ -656,7 +656,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar,graph,gantt</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
<field name="context">{"search_default_Current":1}</field>
|
||||
<field name="context">{"search_default_current":1}</field>
|
||||
<field name="search_view_id" ref="view_mrp_production_filter"/>
|
||||
</record>
|
||||
<menuitem action="mrp_production_action" id="menu_mrp_production_action" parent="menu_mrp_manufacturing" sequence="1"/>
|
||||
|
|
@ -852,7 +852,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Procurement">
|
||||
<group col='10' colspan='4'>
|
||||
<filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" help="Procurement Orders in draft or open state."/>
|
||||
<filter icon="terp-mrp" string="Current" domain="[('state','in',('draft','confirmed'))]" name="current" help="Procurement Orders in draft or open state."/>
|
||||
<filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement Orders with exceptions"/>
|
||||
<filter icon="terp-mrp" string="Late"
|
||||
domain="['&', ('date_planned::date','<', current_date), ('state', 'in', ('draft', 'confirmed'))]"
|
||||
|
|
@ -878,14 +878,14 @@
|
|||
<field name="res_model">mrp.procurement</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
<field name="context">{"search_default_Current":1}</field>
|
||||
<field name="context">{"search_default_current":1}</field>
|
||||
<field name="search_view_id" ref="view_mrp_procurement_filter"/>
|
||||
</record>
|
||||
<menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_manufacturing"
|
||||
sequence="2" />
|
||||
|
||||
<record id="mrp_procurement_action3" model="ir.actions.act_window">
|
||||
<field name="name">Requisitions</field>
|
||||
<field name="name">Procurements</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">mrp.procurement</field>
|
||||
<field name="view_type">form</field>
|
||||
|
|
@ -895,9 +895,6 @@
|
|||
<field name="context">{}</field>
|
||||
</record>
|
||||
|
||||
<menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
|
||||
sequence="5" />
|
||||
|
||||
<record id="mrp_procurement_action5" model="ir.actions.act_window">
|
||||
<field name="name">Procurement Exceptions</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
|
|
|
|||
|
|
@ -1,102 +1,102 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
<data>
|
||||
|
||||
<!--
|
||||
Process
|
||||
-->
|
||||
<!--
|
||||
Process
|
||||
-->
|
||||
|
||||
<record id="process_process_procurementprocess0" model="process.process">
|
||||
<field eval=""""Requisition"""" name="name"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval="1" name="active"/>
|
||||
</record>
|
||||
<record id="process_process_procurementprocess0" model="process.process">
|
||||
<field eval=""""Procurement"""" name="name"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval="1" name="active"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
<!--
|
||||
Process Node
|
||||
-->
|
||||
|
||||
<record id="process_node_stockproduct1" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""For stockable products and consumables"""" name="note"/>
|
||||
<field eval=""""Stockable Product"""" name="name"/>
|
||||
<field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
|
||||
<field name="subflow_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
<record id="process_node_stockproduct1" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""For stockable products and consumables"""" name="note"/>
|
||||
<field eval=""""Stockable Product"""" name="name"/>
|
||||
<field name="process_id" ref="mrp.process_process_stockableproductprocess0"/>
|
||||
<field name="subflow_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_serviceproduct1" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""For Services."""" name="note"/>
|
||||
<field eval=""""Service"""" name="name"/>
|
||||
<field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
|
||||
<field name="subflow_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
<record id="process_node_serviceproduct1" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""For Services."""" name="note"/>
|
||||
<field eval=""""Service"""" name="name"/>
|
||||
<field name="process_id" ref="mrp.process_process_serviceproductprocess0"/>
|
||||
<field name="subflow_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_productionorder0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_production"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Drives the requisition orders for raw material."""" name="note"/>
|
||||
<field eval=""""Production Order"""" name="name"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
<record id="process_node_productionorder0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_production"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Drives the procurement orders for raw material."""" name="note"/>
|
||||
<field eval=""""Production Order"""" name="name"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')"""" name="model_states"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_minimumstockrule0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
|
||||
<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Linked to the 'Minimum stock rule' supplying method."""" name="note"/>
|
||||
<field eval=""""Minimum Stock"""" name="name"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
<record id="process_node_minimumstockrule0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
|
||||
<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""Linked to the 'Minimum stock rule' supplying method."""" name="note"/>
|
||||
<field eval=""""Minimum Stock"""" name="name"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval="1" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_procureproducts0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""The way to requisition depends on the product type."""" name="note"/>
|
||||
<field eval=""""Procure Products"""" name="name"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
<record id="process_node_procureproducts0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""state"""" name="kind"/>
|
||||
<field eval=""""The way to procurement depends on the product type."""" name="note"/>
|
||||
<field eval=""""Procure Products"""" name="name"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_stockproduct0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Product type is Stockable or Consumable."""" name="note"/>
|
||||
<field eval=""""Stockable Product"""" name="name"/>
|
||||
<field name="subflow_id" ref="process_process_stockableproductprocess0"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
<record id="process_node_stockproduct0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Product type is Stockable or Consumable."""" name="note"/>
|
||||
<field eval=""""Stockable Product"""" name="name"/>
|
||||
<field name="subflow_id" ref="process_process_stockableproductprocess0"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_serviceproduct0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Product type is service"""" name="note"/>
|
||||
<field eval=""""Service"""" name="name"/>
|
||||
<field name="subflow_id" ref="process_process_serviceproductprocess0"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
<record id="process_node_serviceproduct0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Product type is service"""" name="note"/>
|
||||
<field eval=""""Service"""" name="name"/>
|
||||
<field name="subflow_id" ref="process_process_serviceproductprocess0"/>
|
||||
<field name="process_id" ref="process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')"""" name="model_states"/>
|
||||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<record id="process_node_purchaseprocure0" model="process.node">
|
||||
<record id="process_node_purchaseprocure0" model="process.node">
|
||||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
|
|
@ -137,83 +137,83 @@
|
|||
<field eval="0" name="flow_start"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
<!--
|
||||
Process Transition
|
||||
-->
|
||||
|
||||
<record id="process_transition_servicemto0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Order"""" name="name"/>
|
||||
<field eval=""""If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
|
||||
</record>
|
||||
<record id="process_transition_servicemto0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Order"""" name="name"/>
|
||||
<field eval=""""If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_servicemts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Stock"""" name="name"/>
|
||||
<field eval=""""This is used in case of a service without any impact in the system, a training session for instance."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
|
||||
</record>
|
||||
<record id="process_transition_servicemts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Stock"""" name="name"/>
|
||||
<field eval=""""This is used in case of a service without any impact in the system, a training session for instance."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_stockmts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Stock"""" name="name"/>
|
||||
<field eval=""""The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
|
||||
</record>
|
||||
<record id="process_transition_stockmts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Stock"""" name="name"/>
|
||||
<field eval=""""The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_stockproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Order"""" name="name"/>
|
||||
<field eval=""""The system creates an order (production or purchased) depending on the sold quantity and the products parameters."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
|
||||
</record>
|
||||
<record id="process_transition_stockproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Make to Order"""" name="name"/>
|
||||
<field eval=""""The system creates an order (production or purchased) depending on the sold quantity and the products parameters."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_productionprocureproducts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Requisition of raw material"""" name="name"/>
|
||||
<field eval=""""In order to supply raw material (to be purchased or produced), the production order creates as much requisition orders as components listed in the BOM, through a run of the schedulers (MRP)."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
|
||||
</record>
|
||||
<record id="process_transition_productionprocureproducts0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement of raw material"""" name="name"/>
|
||||
<field eval=""""In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP)."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_minimumstockprocure0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""'Minimum stock rule' material"""" name="name"/>
|
||||
<field eval=""""The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/>
|
||||
</record>
|
||||
<record id="process_transition_minimumstockprocure0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""'Minimum stock rule' material"""" name="name"/>
|
||||
<field eval=""""The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_procurestockableproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement of stockable Products"""" name="name"/>
|
||||
<field eval=""""Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... """" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
|
||||
</record>
|
||||
<record id="process_transition_procurestockableproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement of stockable Products"""" name="name"/>
|
||||
<field eval=""""Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... """" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_procureserviceproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Requisition of services"""" name="name"/>
|
||||
<field eval=""""Depending on the chosen method to 'supply' the service, the requisition order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products)."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
|
||||
</record>
|
||||
<record id="process_transition_procureserviceproduct0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Procurement of services"""" name="name"/>
|
||||
<field eval=""""Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products)."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_purchaseprocure0" model="process.transition">
|
||||
<record id="process_transition_purchaseprocure0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Automatic RFQ"""" name="name"/>
|
||||
|
|
@ -240,7 +240,7 @@
|
|||
<field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/>
|
||||
</record>
|
||||
|
||||
<record id="process_transition_bom0" model="process.transition">
|
||||
<record id="process_transition_bom0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Manufacturing decomposition"""" name="name"/>
|
||||
|
|
@ -249,5 +249,5 @@
|
|||
<field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search">
|
||||
<group col="16" colspan="6">
|
||||
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
|
||||
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
|
||||
<filter string="This Year" name="this_year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]"/>
|
||||
<filter string="This Month" name="this_month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
|
||||
<filter string="Scheduled Date" icon="terp-hr" domain="[('scheduled_date',=,time.strftime('%%m/%%d/%%Y'))]"/>
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
<field name="res_model">mrp.production.order</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{"search_default_This Year":1,"search_default_This Month":1}</field>
|
||||
<field name="context">{"search_default_this_year":1,"search_default_this_month":1}</field>
|
||||
<field name="view_id" ref="view_report_mrp_production_order_tree"/>
|
||||
<field name="search_view_id" ref="view_report_mrp_production_order_filter"/>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ class mrp_procurement(osv.osv):
|
|||
'''% (start_date, end_date, report_total, report_except, report_later)
|
||||
summary += '\n'.join(report)
|
||||
request.create(cr, uid,
|
||||
{'name': "Requisition calculation report.",
|
||||
{'name': "Procurement calculation report.",
|
||||
'act_from': uid,
|
||||
'act_to': uid,
|
||||
'body': summary,
|
||||
|
|
|
|||
|
|
@ -44,13 +44,13 @@ class stock_warehouse_orderpoint(osv.osv):
|
|||
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
|
||||
'product_min_qty': fields.float('Min Quantity', required=True,
|
||||
help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
|
||||
"a requisition to bring the virtual stock to the Max Quantity."),
|
||||
"a procurement to bring the virtual stock to the Max Quantity."),
|
||||
'product_max_qty': fields.float('Max Quantity', required=True,
|
||||
help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
|
||||
"a requisition to bring the virtual stock to the Max Quantity."),
|
||||
"a procurement to bring the virtual stock to the Max Quantity."),
|
||||
'qty_multiple': fields.integer('Qty Multiple', required=True,
|
||||
help="The requisition quantity will by rounded up to this multiple."),
|
||||
'procurement_id': fields.many2one('mrp.procurement', 'Latest Requisition'),
|
||||
help="The procurement quantity will by rounded up to this multiple."),
|
||||
'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
|
||||
'company_id': fields.many2one('res.company','Company',required=True),
|
||||
}
|
||||
_defaults = {
|
||||
|
|
@ -94,7 +94,7 @@ class StockMove(osv.osv):
|
|||
_inherit = 'stock.move'
|
||||
_columns = {
|
||||
'production_id': fields.many2one('mrp.production', 'Production', select=True),
|
||||
'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
|
||||
'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
|
||||
}
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
default = default or {}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,39 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
<!-- Make Procurement -->
|
||||
|
||||
<record id="view_make_procurment_wizard" model="ir.ui.view">
|
||||
<field name="name">Requisition Request</field>
|
||||
|
||||
<record id="view_make_procurment_wizard" model="ir.ui.view">
|
||||
<field name="name">Procurement Request</field>
|
||||
<field name="model">make.procurement</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Requisition Request">
|
||||
<label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
|
||||
<field name="product_id" on_change="onchange_product_id(product_id)"/>
|
||||
<field name="qty"/>
|
||||
<field name="uom_id"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="warehouse_id" colspan="4"/>
|
||||
<newline/>
|
||||
<group col="2" colspan="4">
|
||||
<button icon='gtk-cancel' special="cancel"
|
||||
string="Cancel" />
|
||||
<button name="make_procurement" string="Ask New Products"
|
||||
colspan="1" type="object" icon="gtk-ok" />
|
||||
</group>
|
||||
<form string="Procurement Request">
|
||||
<label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/>
|
||||
<field name="product_id" on_change="onchange_product_id(product_id)"/>
|
||||
<field name="qty"/>
|
||||
<field name="uom_id"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="warehouse_id" colspan="4"/>
|
||||
<newline/>
|
||||
<group col="2" colspan="4">
|
||||
<button icon='gtk-cancel' special="cancel"
|
||||
string="Cancel" />
|
||||
<button name="make_procurement" string="Ask New Products"
|
||||
colspan="1" type="object" icon="gtk-ok" />
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<act_window name="Requisition Request"
|
||||
res_model="make.procurement"
|
||||
src_model="product.product"
|
||||
view_mode="form"
|
||||
target="new"
|
||||
key2="client_action_multi"
|
||||
id="act_make_procurement"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
<act_window name="Procurement Request"
|
||||
res_model="make.procurement"
|
||||
src_model="product.product"
|
||||
view_mode="form"
|
||||
target="new"
|
||||
key2="client_action_multi"
|
||||
id="act_make_procurement"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -1,34 +1,34 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
|
||||
<!-- Compute Procurement -->
|
||||
|
||||
<record id="view_compute_procurment_wizard" model="ir.ui.view">
|
||||
|
||||
<record id="view_compute_procurment_wizard" model="ir.ui.view">
|
||||
<field name="name">Compute Procurements</field>
|
||||
<field name="model">mrp.procurement.compute</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Parameters">
|
||||
<label string="This wizard will schedule procurements." colspan="4" align="0.0"/>
|
||||
<newline/>
|
||||
<group col="2" colspan="4">
|
||||
<button icon='gtk-cancel' special="cancel"
|
||||
string="Cancel" />
|
||||
<button name="procure_calculation" string="Compute Requisitions"
|
||||
colspan="1" type="object" icon="gtk-ok" />
|
||||
</group>
|
||||
<label string="This wizard will schedule procurements." colspan="4" align="0.0"/>
|
||||
<newline/>
|
||||
<group col="2" colspan="4">
|
||||
<button icon='gtk-cancel' special="cancel"
|
||||
string="Cancel" />
|
||||
<button name="procure_calculation" string="Compute Procurements"
|
||||
colspan="1" type="object" icon="gtk-ok" />
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- <act_window name="Compute Procurements" -->
|
||||
<!-- res_model="mrp.procurement.compute"-->
|
||||
<!-- src_model="mrp.procurement"-->
|
||||
<!-- view_mode="form"-->
|
||||
<!-- target="new" -->
|
||||
<!-- <act_window name="Compute Procurements" -->
|
||||
<!-- res_model="mrp.procurement.compute"-->
|
||||
<!-- src_model="mrp.procurement"-->
|
||||
<!-- view_mode="form"-->
|
||||
<!-- target="new" -->
|
||||
<!-- key2="client_action_multi" -->
|
||||
<!-- id="act_compute_procurement"/> -->
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
<!-- id="act_compute_procurement"/> -->
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<data>
|
||||
|
||||
# -----------------------------------------------------------
|
||||
# Requisition - Automatic schedule
|
||||
# Procurements - Automatic schedule
|
||||
# -----------------------------------------------------------
|
||||
|
||||
<record model="workflow.transition" id="mrp.trans_confirm_confirm_wait">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
# Polish 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-04-14 10:45+0000\n"
|
||||
"Last-Translator: Krystian Twardowski <Unknown>\n"
|
||||
"Language-Team: Polish <pl@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-04-15 03:59+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: olap_crm
|
||||
#: model:ir.module.module,description:olap_crm.module_meta_information
|
||||
msgid ""
|
||||
"\n"
|
||||
" Sale module will load the data in olap tables\n"
|
||||
" "
|
||||
msgstr ""
|
||||
|
||||
#. module: olap_crm
|
||||
#: model:ir.module.module,shortdesc:olap_crm.module_meta_information
|
||||
msgid "olap_crm"
|
||||
msgstr "olap_crm"
|
||||
|
|
@ -256,11 +256,11 @@ class product_template(osv.osv):
|
|||
'description': fields.text('Description',translate=True),
|
||||
'description_purchase': fields.text('Purchase Description',translate=True),
|
||||
'description_sale': fields.text('Sale Description',translate=True),
|
||||
'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way requisitions are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
|
||||
'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no inventory management in the system."),
|
||||
'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."),
|
||||
'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
|
||||
'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
|
||||
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the requisition request."),
|
||||
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
|
||||
'rental': fields.boolean('Can be Rent'),
|
||||
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]"),
|
||||
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@
|
|||
<notebook colspan="4">
|
||||
<page string="Information">
|
||||
<group colspan="2" col="2">
|
||||
<separator string=" Requisition" colspan="2"/>
|
||||
<separator string="Procurement" colspan="2"/>
|
||||
<field name="type" select="2"/>
|
||||
<field name="procure_method"/>
|
||||
<field name="supply_method"/>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
</group>
|
||||
|
||||
</page>
|
||||
<page string="Requisition & Locations">
|
||||
<page string="Procurement & Locations">
|
||||
<group colspan="2" col="2" name="delay">
|
||||
<separator string="Delays" colspan="2"/>
|
||||
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
|
||||
|
|
@ -144,8 +144,8 @@
|
|||
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
|
||||
<field name="list_price"/>
|
||||
<newline/>
|
||||
<field name="price_margin" select="1"/>
|
||||
<field name="price_extra" select="1"/>
|
||||
<field name="price_margin" groups="base.group_extended"/>
|
||||
<field name="price_extra" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field groups="base.group_extended" name="cost_method"/>
|
||||
<newline/>
|
||||
|
|
@ -428,8 +428,8 @@
|
|||
<form string="Supplier Information">
|
||||
<field name="name"/>
|
||||
<field name="sequence"/>
|
||||
<field name="product_name"/>
|
||||
<field name="product_code"/>
|
||||
<field name="product_name" groups="base.group_extended"/>
|
||||
<field name="product_code" groups="base.group_extended"/>
|
||||
<field name="delay"/>
|
||||
<field name="qty"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
|
|
@ -456,7 +456,6 @@
|
|||
<field name="name"/>
|
||||
<field name="delay"/>
|
||||
<field name="qty"/>
|
||||
<field name="product_code"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
</tree>
|
||||
</field>
|
||||
|
|
@ -528,7 +527,7 @@
|
|||
<notebook colspan="4">
|
||||
<page string="Information">
|
||||
<group colspan="2" col="2">
|
||||
<separator string="Requisition" colspan="2"/>
|
||||
<separator string="Procurement" colspan="2"/>
|
||||
<field name="type" select="2"/>
|
||||
<field name="procure_method"/>
|
||||
<field name="supply_method"/>
|
||||
|
|
@ -562,7 +561,7 @@
|
|||
</group>
|
||||
|
||||
</page>
|
||||
<page string="Requisition & Locations">
|
||||
<page string="Procurement & Locations" groups="base.group_extended">
|
||||
<group colspan="2" col="2" name="delay">
|
||||
<separator string="Delays" colspan="2"/>
|
||||
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
|
||||
|
|
@ -575,7 +574,6 @@
|
|||
<field name="loc_row"/>
|
||||
<field name="loc_case"/>
|
||||
</group>
|
||||
|
||||
<group colspan="2" col="2" name="misc">
|
||||
<separator string="Miscelleanous" colspan="2"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@
|
|||
</td>
|
||||
</tr><tr>
|
||||
<td>
|
||||
<barCode><xsl:value-of select="code"/></barCode>
|
||||
</td><td>
|
||||
<para style="nospace"><xsl:value-of select="product"/></para><xsl:text>, </xsl:text>
|
||||
<para style="nospace"><xsl:value-of select="variant"/></para>
|
||||
|
|
|
|||
|
|
@ -110,11 +110,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Project">
|
||||
<group col='15' colspan='4'>
|
||||
<filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects"/>
|
||||
<filter icon="terp-project" string="Current" domain="[('state', 'in',('open','draft'))]" help="Open and Draft Projects" name="open"/>
|
||||
<filter icon="terp-project" string="Pending" domain="[('state', '=', 'pending')]" help="Pending Projects"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-project" string="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/>
|
||||
<filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member."/>
|
||||
<filter icon="terp-project" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." name="member"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-project" string="Templates" domain="[('state','=','template')]" help="Template Projects"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="domain">[]</field>
|
||||
<field name="view_id" ref="view_project"/>
|
||||
<field name="context">{"search_default_Current":1,"search_default_Member":1}</field>
|
||||
<field name="context">{"search_default_open":1,"search_default_member":1}</field>
|
||||
<field name="search_view_id" ref="view_project_project_filter"/>
|
||||
</record>
|
||||
<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
|
||||
|
|
@ -403,7 +403,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Task Edition">
|
||||
<group col="20" colspan="4">
|
||||
<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project"/>
|
||||
<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Tasks" icon="terp-project" name="current"/>
|
||||
<filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
|
||||
<filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-project"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -414,7 +414,7 @@
|
|||
<filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
|
||||
</field>
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" string="My Task"/>
|
||||
<filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" name="my_task"/>
|
||||
<filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
|
||||
</field>
|
||||
</group>
|
||||
|
|
@ -440,7 +440,7 @@
|
|||
<field name="view_mode">tree,form,calendar,gantt,graph</field>
|
||||
<field eval="False" name="filter"/>
|
||||
<field name="view_id" ref="view_task_tree2"/>
|
||||
<field name="context">{"search_default_Current":1,"search_default_My Task":1}</field>
|
||||
<field name="context">{"search_default_current":1,"search_default_my_task":1}</field>
|
||||
<field name="search_view_id" ref="view_task_search_form"/>
|
||||
</record>
|
||||
<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
|
||||
|
|
@ -607,7 +607,7 @@
|
|||
<field name="subject"/>
|
||||
<field name="project_id" select="1" widget="selection"/>
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" string="My Msg"/>
|
||||
<filter domain="[('user_id','=',uid)]" help="My Message" icon="gtk-execute" name="my_msg"/>
|
||||
</field>
|
||||
</group>
|
||||
<newline/>
|
||||
|
|
@ -626,7 +626,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="view_project_message_tree"/>
|
||||
<field name="context">{"search_default_My Msg":1}</field>
|
||||
<field name="context">{"search_default_my_msg":1}</field>
|
||||
<field name="search_view_id" ref="view_project_message_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@
|
|||
<separator orientation="vertical"/>
|
||||
<field name="project_id"/>
|
||||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]"/>
|
||||
<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" name="my_task"/>
|
||||
</field>
|
||||
</group>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="1" string="Group By...">
|
||||
<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
<field name="res_model">report.project.task.user</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="context">{"search_default_My Task":1}</field>
|
||||
<field name="context">{"search_default_my_task":1}</field>
|
||||
<field name="search_view_id" ref="view_task_project_user_search"/>
|
||||
</record>
|
||||
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<field name="view_mode">tree,calendar</field>
|
||||
<field name="view_id" ref="project_issue_tree_view"/>
|
||||
<field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
|
||||
<field name="context">{"search_default_My Bugs":1,"search_default_Current Bugs":1,"search_default_project_id":project_id}</field>
|
||||
<field name="context">{"search_default_my_bugs":1,"search_default_current_bugs":1,"search_default_project_id":project_id}</field>
|
||||
<field name="search_view_id" ref="view_project_issue_filter"/>
|
||||
</record>
|
||||
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
|
||||
|
|
|
|||
|
|
@ -207,10 +207,10 @@
|
|||
<group>
|
||||
<field name="name" select='1' string="Subject"/>
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" string="My Bugs"/>
|
||||
<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Bugs" name="my_bugs"/>
|
||||
</field>
|
||||
<field name="state" select="1">
|
||||
<filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" string="Current Bugs"/>
|
||||
<filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Bugs" name="current_bugs"/>
|
||||
<filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Bugs"/>
|
||||
</field>
|
||||
<field name="project_id" select="1" widget="selection" string="Project">
|
||||
|
|
@ -308,10 +308,10 @@
|
|||
<group>
|
||||
<field name="name" select='1' string="Feature description"/>
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" string="My Feature"/>
|
||||
<filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My Features" name="my_feature"/>
|
||||
</field>
|
||||
<field name="state" select="1">
|
||||
<filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" string="Current Feature"/>
|
||||
<filter icon="gtk-new" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
|
||||
<filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Features"/>
|
||||
</field>
|
||||
<field name="project_id" select="1" widget="selection" string="Project">
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Project Phases">
|
||||
<group colspan="4" col="20">
|
||||
<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" />
|
||||
<filter string="Current" domain="[('state','in',('open','draft'))]" help="Draft, Open and Pending Phases" icon="terp-project" name="current"/>
|
||||
<filter string="In Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-project"/>
|
||||
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-project"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -205,7 +205,7 @@
|
|||
<filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
|
||||
</field>
|
||||
<field name="responsible_id" widget="selection">
|
||||
<filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" string="My Phase"/>
|
||||
<filter domain="[('responsible_id','=',uid)]" help="My Phase" icon="gtk-execute" name="my_phase"/>
|
||||
</field>
|
||||
<field name="date_start"/>
|
||||
</group>
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
<field name="res_model">project.phase</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar,gantt</field>
|
||||
<field name="context">{"search_default_Current":1,"search_default_My Phase":1}</field>
|
||||
<field name="context">{"search_default_current":1,"search_default_my_phase":1}</field>
|
||||
<field name="search_view_id" ref="view_project_phase_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
Process Node
|
||||
-->
|
||||
|
||||
<record id="process_node_procuretasktask0" model="process.node">
|
||||
<record id="process_node_procuretasktask0" model="process.node">
|
||||
<field name="menu_id" ref="project.menu_action_view_task"/>
|
||||
<field name="model_id" ref="project.model_project_task"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
|
|
@ -46,9 +46,9 @@
|
|||
Process Transition
|
||||
-->
|
||||
|
||||
<record id="process_transition_procuretask0" model="process.transition">
|
||||
<record id="process_transition_procuretask0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval="""" Requisition Task"""" name="name"/>
|
||||
<field eval=""""Procurement Task"""" name="name"/>
|
||||
<field eval=""""if product type is 'service' then it creates the task."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
|
||||
<field model="process.node" name="source_node_id" ref="sale.process_node_saleprocurement0"/>
|
||||
|
|
@ -65,35 +65,10 @@
|
|||
<record id="process_transition_ordertask0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Order Task"""" name="name"/>
|
||||
<field eval=""""If Requisition method is Make to order and supply method is produce"""" name="note"/>
|
||||
<field eval=""""If procurement method is Make to order and supply method is produce"""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_mrptask0"/>
|
||||
<field model="process.node" name="source_node_id" ref="mrp.process_node_serviceonorder0"/>
|
||||
</record>
|
||||
|
||||
<!--
|
||||
Process Action
|
||||
-->
|
||||
|
||||
<!-- <record id="process_transition_action_orderconfirmtask0" model="process.transition.action">-->
|
||||
<!-- <field eval=""""action_confirm"""" name="action"/>-->
|
||||
<!-- <field eval=""""object"""" name="state"/>-->
|
||||
<!-- <field eval=""""Confirm"""" name="name"/>-->
|
||||
<!-- <field name="transition_id" ref="process_transition_ordertask0"/>-->
|
||||
<!-- </record>-->
|
||||
<!-- -->
|
||||
<!-- <record id="process_transition_action_ordercanceltask0" model="process.transition.action">-->
|
||||
<!-- <field eval=""""action_cancel"""" name="action"/>-->
|
||||
<!-- <field eval=""""object"""" name="state"/>-->
|
||||
<!-- <field eval=""""Cancel"""" name="name"/>-->
|
||||
<!-- <field name="transition_id" ref="process_transition_ordertask0"/>-->
|
||||
<!-- </record>-->
|
||||
<!-- -->
|
||||
<!-- <record id="process_transition_action_taskrunprocurement0" model="process.transition.action">-->
|
||||
<!-- <field eval=""""write({'state':'exception'})"""" name="action"/>-->
|
||||
<!-- <field eval=""""object"""" name="state"/>-->
|
||||
<!-- <field eval=""""Run Requisition"""" name="name"/>-->
|
||||
<!-- <field name="transition_id" ref="process_transition_ordertask0"/>-->
|
||||
<!-- </record>-->
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class project_task(osv.osv):
|
|||
_name = "project.task"
|
||||
_inherit = "project.task"
|
||||
_columns = {
|
||||
'procurement_id': fields.many2one('mrp.procurement', 'Requisition', ondelete='set null')
|
||||
'procurement_id': fields.many2one('mrp.procurement', 'Procurement', ondelete='set null')
|
||||
}
|
||||
|
||||
def do_close(self, cr, uid, ids, *args):
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@
|
|||
</group>
|
||||
<newline/>
|
||||
<group expand="1" string="Group By..." colspan="4" col="3">
|
||||
<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
|
||||
<filter string="User" name="by_user" icon="terp-project" context="{'group_by':'user_id'}" />
|
||||
<filter string="Year" icon="terp-project" context="{'group_by':'year'}" />
|
||||
<filter string="Month" icon="terp-project" context="{'group_by':'month'}" />
|
||||
</group>
|
||||
|
|
@ -175,7 +175,7 @@
|
|||
<field name="res_model">report.timesheet.task.user</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree</field>
|
||||
<field name="context">{"search_default_User":1}</field>
|
||||
<field name="context">{"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_report_timesheet_task_user_search"/>
|
||||
</record>
|
||||
<menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@
|
|||
<search string="Purchase Orders">
|
||||
<group>
|
||||
<filter icon="terp-purchase"
|
||||
string="This Year"
|
||||
string="This Year" name="this_year"
|
||||
domain="[('name','=',time.strftime('%%Y'))]"
|
||||
help="Purchase orders of the year"/>
|
||||
<filter icon="terp-purchase"
|
||||
string="This Month"
|
||||
string="This Month" name="this_month"
|
||||
domain="[('month','=',time.strftime('%%m'))]"
|
||||
help="Purchase orders of this month"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
string="Quotations"
|
||||
domain="[('state','=','draft')]"/>
|
||||
<filter icon="terp-purchase"
|
||||
string="Purchase"
|
||||
string="Purchase" name="purchase"
|
||||
domain="[('state','<>','draft'),('state','<>','cancel')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="product_id"/>
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<group expand="1" string="Group By...">
|
||||
<filter string="Company" icon="terp-purchase" context="{'group_by':'company_id'}"/>
|
||||
<filter string="Warehouse" icon="terp-purchase" context="{'group_by':'warehouse_id'}"/>
|
||||
<filter string="Responsible" icon="terp-purchase" context="{'group_by':'user_id'}"/>
|
||||
<filter string="Responsible" name="by_user" icon="terp-purchase" context="{'group_by':'user_id'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Product" icon="terp-purchase" context="{'group_by':'product_id'}"/>
|
||||
<filter string="Product Category" icon="terp-purchase" context="{'group_by':'category_id'}"/>
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
<field name="res_model">report.purchase.order</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{"search_default_This Year":1,"search_default_This Month":1,"search_default_Purchase":1,"search_default_Responsible":1}</field>
|
||||
<field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_purchase":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_purchase_order_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,6 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
import purchase_tender
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
import purchase_requisition
|
||||
|
||||
|
|
@ -18,20 +18,20 @@
|
|||
#
|
||||
##############################################################################
|
||||
{
|
||||
"name" : "Purchase - Purchase Tender",
|
||||
"name" : "Purchase - Purchase Requisition",
|
||||
"version" : "0.1",
|
||||
"author" : "Tiny",
|
||||
"category" : "Generic Modules/Sales & Purchases",
|
||||
"website" : "http://www.openerp.com",
|
||||
"description": """
|
||||
This module allows you to manage your Purchase Tenders.
|
||||
When a purchase order is created, you now have the opportunity to save the related tender.
|
||||
This module allows you to manage your Purchase Requisition.
|
||||
When a purchase order is created, you now have the opportunity to save the related requisition.
|
||||
This new object will regroup and will allow you to easily keep track and order all your purchase orders.
|
||||
""",
|
||||
"depends" : ["purchase","mrp"],
|
||||
"init_xml" : [],
|
||||
"demo_xml" : [],
|
||||
"update_xml" : ["purchase_tender_view.xml","security/ir.model.access.csv","purchase_tender_sequence.xml"],
|
||||
"update_xml" : ["purchase_requisition_view.xml","security/ir.model.access.csv","purchase_requisition_sequence.xml"],
|
||||
"active": False,
|
||||
"installable": True
|
||||
}
|
||||
|
|
@ -0,0 +1,134 @@
|
|||
# Translation of OpenERP Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * purchase_requisition
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.6\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2009-11-25 14:07:40+0000\n"
|
||||
"PO-Revision-Date: 2009-11-25 14:07:40+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: constraint:ir.ui.view:0
|
||||
msgid "Invalid XML for View Architecture!"
|
||||
msgstr "XML incorrect pour l'Architecture des Vues!"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: field:purchase.requisition,date_end:0
|
||||
msgid "Date End"
|
||||
msgstr "Date de fin"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: constraint:ir.model:0
|
||||
msgid "The Object name must start with x_ and not contain any special character !"
|
||||
msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: view:purchase.requisition:0
|
||||
#: field:purchase.requisition,description:0
|
||||
msgid "Description"
|
||||
msgstr "Description"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:ir.model,name:purchase_requisition.model_purchase_requisition
|
||||
#: field:purchase.order,requisition_id:0
|
||||
#: view:purchase.requisition:0
|
||||
msgid "Purchase requisition"
|
||||
msgstr "Appel d'Offre"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
|
||||
#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1
|
||||
#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition
|
||||
msgid "Purchase requisitions"
|
||||
msgstr "Appels d'offre"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: selection:purchase.requisition,state:0
|
||||
msgid "Open"
|
||||
msgstr "Ouvert"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: field:purchase.requisition,user_id:0
|
||||
msgid "Responsible"
|
||||
msgstr "Responsable"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_draft
|
||||
#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_draft
|
||||
msgid "Draft Purchase requisitions"
|
||||
msgstr "Appels d'Offre brouillons"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: field:purchase.requisition,state:0
|
||||
msgid "State"
|
||||
msgstr "Etat"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: selection:purchase.requisition,state:0
|
||||
msgid "Draft"
|
||||
msgstr "Brouillon"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_open
|
||||
#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_open
|
||||
msgid "Open Purchase requisitions"
|
||||
msgstr "Appels d'offre ouverts"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: constraint:ir.actions.act_window:0
|
||||
msgid "Invalid model name in the action definition."
|
||||
msgstr "Nom de modèle incorrect pour la définition de l'action"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
|
||||
msgid "Purchase - Purchase requisition"
|
||||
msgstr "Achat - Appel d'offre"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: field:purchase.requisition,name:0
|
||||
msgid "requisition Reference"
|
||||
msgstr "Référence"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: selection:purchase.requisition,state:0
|
||||
msgid "Close"
|
||||
msgstr "Clôturé"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: field:purchase.requisition,date_start:0
|
||||
msgid "Date Start"
|
||||
msgstr "Date de début"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: view:purchase.requisition:0
|
||||
msgid "Quotations"
|
||||
msgstr ""
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:ir.module.module,description:purchase_requisition.module_meta_information
|
||||
msgid " This module allows you to manage your Purchase requisitions. When a purchase order is created, you now have the opportunity to save the related requisition. \n"
|
||||
" This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
|
||||
""
|
||||
msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
|
||||
" Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
|
||||
""
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_new
|
||||
#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_new
|
||||
msgid "New Purchase requisitions"
|
||||
msgstr "Nouveaux Appels d'Offre"
|
||||
|
||||
#. module: purchase_requisition
|
||||
#: field:purchase.requisition,purchase_ids:0
|
||||
msgid "Purchase Orders"
|
||||
msgstr "Bons d'achat"
|
||||
|
||||
|
|
@ -25,54 +25,56 @@ from osv import orm
|
|||
import netsvc
|
||||
import time
|
||||
|
||||
class purchase_tender(osv.osv):
|
||||
_name = "purchase.tender"
|
||||
_description="Purchase Tender"
|
||||
class purchase_requisition(osv.osv):
|
||||
_name = "purchase.requisition"
|
||||
_description="Purchase requisition"
|
||||
_columns = {
|
||||
'name': fields.char('Tender Reference', size=32,required=True),
|
||||
'date_start': fields.datetime('Date Start'),
|
||||
'date_end': fields.datetime('Date End'),
|
||||
'name': fields.char('Requisition Reference', size=32,required=True),
|
||||
'origin': fields.char('Origin', size=32),
|
||||
'date_start': fields.datetime('Requisition Date'),
|
||||
'date_end': fields.datetime('Requisition Deadline'),
|
||||
'user_id': fields.many2one('res.users', 'Responsible'),
|
||||
'exclusive': fields.boolean('Exclusive', help="If the tender is exclusive, it will cancel all purchase orders when you confirm one of them"),
|
||||
'exclusive': fields.selection([('exclusive','Purchase Tender (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', help="If the requisition is exclusive, it will cancel all purchase orders when you confirm one of them", required=True),
|
||||
'description': fields.text('Description'),
|
||||
'purchase_ids' : fields.one2many('purchase.order','tender_id','Purchase Orders'),
|
||||
'line_ids' : fields.one2many('purchase.tender.line','tender_id','Products to Purchase'),
|
||||
'state': fields.selection([('draft','Draft'),('open','Open'),('close','Close')], 'State', required=True)
|
||||
'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders'),
|
||||
'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase'),
|
||||
'state': fields.selection([('draft','Draft'),('open','Open'),('cancel','Cancelled'),('close','Close')], 'State', required=True)
|
||||
}
|
||||
_defaults = {
|
||||
'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'),
|
||||
'state': lambda *args: 'open',
|
||||
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.tender'),
|
||||
'exclusive': lambda *args: 'multiple',
|
||||
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
|
||||
}
|
||||
purchase_tender()
|
||||
purchase_requisition()
|
||||
|
||||
class purchase_tender_line(osv.osv):
|
||||
_name = "purchase.tender.line"
|
||||
_description="Purchase Tender Line"
|
||||
class purchase_requisition_line(osv.osv):
|
||||
_name = "purchase.requisition.line"
|
||||
_description="Purchase Requisition Line"
|
||||
_rec_name = 'product_id'
|
||||
_columns = {
|
||||
'product_id': fields.many2one('product.product', 'Product'),
|
||||
'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
|
||||
'product_qty': fields.float('Date End', digits=(16,2)),
|
||||
'tender_id' : fields.many2one('purchase.tender','Purchase Tender', ondelete='cascade')
|
||||
'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade')
|
||||
}
|
||||
purchase_tender_line()
|
||||
purchase_requisition_line()
|
||||
|
||||
class purchase_order(osv.osv):
|
||||
_inherit = "purchase.order"
|
||||
_description = "purchase order"
|
||||
_columns = {
|
||||
'tender_id' : fields.many2one('purchase.tender','Purchase Tender')
|
||||
'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
|
||||
}
|
||||
def wkf_confirm_order(self, cr, uid, ids, context={}):
|
||||
res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
|
||||
for po in self.browse(cr, uid, ids, context):
|
||||
if po.tender_id and po.tender_id.exclusive:
|
||||
for order in po.tender_id.purchase_ids:
|
||||
if po.requisition_id and (po.requisition_id.exclusive=='exclusive'):
|
||||
for order in po.requisition_id.purchase_ids:
|
||||
if order.id<>po.id:
|
||||
wf_service = netsvc.LocalService("workflow")
|
||||
wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
|
||||
self.pool.get('purchase.tender').write(cr, uid, [po.tender_id.id], {'state':'close'})
|
||||
self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'close'})
|
||||
return res
|
||||
purchase_order()
|
||||
|
||||
|
|
@ -80,10 +82,10 @@ purchase_order()
|
|||
class product_product(osv.osv):
|
||||
_inherit = 'product.product'
|
||||
_columns = {
|
||||
'purchase_tender': fields.boolean('Purchase Tender', help="Check this box so that requisitions generates purchase tenders instead of directly requests for quotations.")
|
||||
'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box so that requisitions generates purchase requisitions instead of directly requests for quotations.")
|
||||
}
|
||||
_defaults = {
|
||||
'purchase_tender': lambda *args: False
|
||||
'purchase_requisition': lambda *args: False
|
||||
}
|
||||
product_product()
|
||||
|
||||
|
|
@ -94,9 +96,11 @@ class mrp_procurement(osv.osv):
|
|||
res = super(mrp_procurement, self).make_po(cr, uid, ids, context)
|
||||
for proc_id,po_id in res.items():
|
||||
procurement = self.browse(cr, uid, proc_id)
|
||||
if procurement.product_id.purchase_tender:
|
||||
self.pool.get('purchase.tender').create(cr, uid, {
|
||||
if procurement.product_id.purchase_requisition:
|
||||
self.pool.get('purchase.requisition').create(cr, uid, {
|
||||
'name': procurement.name,
|
||||
'origin': procurement.name,
|
||||
'date_end': procurement.date_planned,
|
||||
'lines_ids': [(0,0,{
|
||||
'product_id': procurement.product_id.id,
|
||||
'product_uom_id': procurement.product_uom.id,
|
||||
|
|
@ -105,4 +109,5 @@ class mrp_procurement(osv.osv):
|
|||
})],
|
||||
'purchase_ids': [(6,0,[po_id])]
|
||||
})
|
||||
return res
|
||||
mrp_procurement()
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
<!-- Sequences for purchase.order -->
|
||||
<record id="seq_type_purchase_requisition" model="ir.sequence.type">
|
||||
<field name="name">Purchase Requisition Order</field>
|
||||
<field name="code">purchase.order.requisition</field>
|
||||
</record>
|
||||
<record id="seq_purchase_requisition" model="ir.sequence">
|
||||
<field name="name">Purchase Requisition Order</field>
|
||||
<field name="code">purchase.order.requisition</field>
|
||||
<field name="prefix">TE</field>
|
||||
<field name="padding">5</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<field name="inherit_id" ref="purchase.purchase_order_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="name" position="after">
|
||||
<field name="tender_id"/>
|
||||
<field name="requisition_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -21,21 +21,25 @@
|
|||
<field name="inherit_id" ref="purchase.purchase_order_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_ref" position="after">
|
||||
<field name="tender_id"/>
|
||||
<field name="requisition_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_purchase_tender_form">
|
||||
<field name="name">purchase.tender.form</field>
|
||||
<record model="ir.ui.view" id="view_purchase_requisition_form">
|
||||
<field name="name">purchase.requisition.form</field>
|
||||
<field name="type">form</field>
|
||||
<field name="model">purchase.tender</field>
|
||||
<field name="model">purchase.requisition</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Purchase Tender">
|
||||
<field name="name" select="1"/>
|
||||
<field name="user_id" select="1"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<form string="Purchase Requisition">
|
||||
<group colspan="4" col="6">
|
||||
<field name="name" select="1"/>
|
||||
<field name="user_id" select="1"/>
|
||||
<field name="exclusive" select="1"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<field name="origin"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Products">
|
||||
<field name="line_ids" colspan="4" nolabel="1">
|
||||
|
|
@ -62,28 +66,33 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_purchase_tender_tree">
|
||||
<field name="name">purchase.tender.tree</field>
|
||||
<record model="ir.ui.view" id="view_purchase_requisition_tree">
|
||||
<field name="name">purchase.requisition.tree</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="model">purchase.tender</field>
|
||||
<field name="model">purchase.requisition</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Purchase Tender">
|
||||
<tree string="Purchase Requisition">
|
||||
<field name="name"/>
|
||||
<field name="user_id"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<field name="origin"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.actions.act_window" id="action_purchase_tender">
|
||||
<field name="name">Purchase Tenders</field>
|
||||
<record model="ir.actions.act_window" id="action_purchase_requisition">
|
||||
<field name="name">Purchase Requisitions</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">purchase.tender</field>
|
||||
<field name="res_model">purchase.requisition</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
|
||||
<menuitem
|
||||
id="menu_purchase_requisition_pro_mgt"
|
||||
sequence="0"
|
||||
parent="purchase.menu_procurement_management"
|
||||
action="action_purchase_requisition"/>
|
||||
|
||||
<record model="ir.ui.view" id="product_normal_form_view_inherit">
|
||||
<field name="name">product.form.inherit</field>
|
||||
|
|
@ -93,7 +102,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<field name="supply_method" position="after">
|
||||
<group colspan="2" col="2" attrs="{'invisible': [('supply_method','<>','buy')]}">
|
||||
<field name="purchase_tender"/>
|
||||
<field name="purchase_requisition"/>
|
||||
</group>
|
||||
</field>
|
||||
</field>
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_purchase_requisition","purchase.requisition","model_purchase_requisition",purchase.group_purchase_user,1,1,1,1
|
||||
"access_purchase_requisition_line","purchase.requisition.line","model_purchase_requisition_line",purchase.group_purchase_user,1,1,1,1
|
||||
|
|
|
@ -1,134 +0,0 @@
|
|||
# Translation of OpenERP Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * purchase_tender
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.6\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2009-11-25 14:07:40+0000\n"
|
||||
"PO-Revision-Date: 2009-11-25 14:07:40+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: constraint:ir.ui.view:0
|
||||
msgid "Invalid XML for View Architecture!"
|
||||
msgstr "XML incorrect pour l'Architecture des Vues!"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: field:purchase.tender,date_end:0
|
||||
msgid "Date End"
|
||||
msgstr "Date de fin"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: constraint:ir.model:0
|
||||
msgid "The Object name must start with x_ and not contain any special character !"
|
||||
msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: view:purchase.tender:0
|
||||
#: field:purchase.tender,description:0
|
||||
msgid "Description"
|
||||
msgstr "Description"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: model:ir.model,name:purchase_tender.model_purchase_tender
|
||||
#: field:purchase.order,tender_id:0
|
||||
#: view:purchase.tender:0
|
||||
msgid "Purchase Tender"
|
||||
msgstr "Appel d'Offre"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender
|
||||
#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1
|
||||
#: model:ir.ui.menu,name:purchase_tender.menu_purchase_tender
|
||||
msgid "Purchase Tenders"
|
||||
msgstr "Appels d'offre"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: selection:purchase.tender,state:0
|
||||
msgid "Open"
|
||||
msgstr "Ouvert"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: field:purchase.tender,user_id:0
|
||||
msgid "Responsible"
|
||||
msgstr "Responsable"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_draft
|
||||
#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_draft
|
||||
msgid "Draft Purchase Tenders"
|
||||
msgstr "Appels d'Offre brouillons"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: field:purchase.tender,state:0
|
||||
msgid "State"
|
||||
msgstr "Etat"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: selection:purchase.tender,state:0
|
||||
msgid "Draft"
|
||||
msgstr "Brouillon"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_open
|
||||
#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_open
|
||||
msgid "Open Purchase Tenders"
|
||||
msgstr "Appels d'offre ouverts"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: constraint:ir.actions.act_window:0
|
||||
msgid "Invalid model name in the action definition."
|
||||
msgstr "Nom de modèle incorrect pour la définition de l'action"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: model:ir.module.module,shortdesc:purchase_tender.module_meta_information
|
||||
msgid "Purchase - Purchase Tender"
|
||||
msgstr "Achat - Appel d'offre"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: field:purchase.tender,name:0
|
||||
msgid "Tender Reference"
|
||||
msgstr "Référence"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: selection:purchase.tender,state:0
|
||||
msgid "Close"
|
||||
msgstr "Clôturé"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: field:purchase.tender,date_start:0
|
||||
msgid "Date Start"
|
||||
msgstr "Date de début"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: view:purchase.tender:0
|
||||
msgid "Quotations"
|
||||
msgstr ""
|
||||
|
||||
#. module: purchase_tender
|
||||
#: model:ir.module.module,description:purchase_tender.module_meta_information
|
||||
msgid " This module allows you to manage your Purchase Tenders. When a purchase order is created, you now have the opportunity to save the related tender. \n"
|
||||
" This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
|
||||
""
|
||||
msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
|
||||
" Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
|
||||
""
|
||||
|
||||
#. module: purchase_tender
|
||||
#: model:ir.actions.act_window,name:purchase_tender.action_purchase_tender_new
|
||||
#: model:ir.ui.menu,name:purchase_tender.menu_purchase_Tender1_new
|
||||
msgid "New Purchase Tenders"
|
||||
msgstr "Nouveaux Appels d'Offre"
|
||||
|
||||
#. module: purchase_tender
|
||||
#: field:purchase.tender,purchase_ids:0
|
||||
msgid "Purchase Orders"
|
||||
msgstr "Bons d'achat"
|
||||
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
<!-- Sequences for purchase.order -->
|
||||
<record id="seq_type_purchase_tender_order" model="ir.sequence.type">
|
||||
<field name="name">Purchase Tender Order</field>
|
||||
<field name="code">purchase.order.tender</field>
|
||||
</record>
|
||||
<record id="seq_purchase_tender_order" model="ir.sequence">
|
||||
<field name="name">Purchase Tender Order</field>
|
||||
<field name="code">purchase.order.tender</field>
|
||||
<field name="prefix">TE</field>
|
||||
<field name="padding">5</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_purchase_tender","purchase.tender","model_purchase_tender",,1,1,1,1
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<group>
|
||||
<field name="name"/>
|
||||
<field name="user_id" string="User" widget="selection">
|
||||
<filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" string="My Resources"/>
|
||||
<filter domain="[('user_id','=',uid)]" help="My Resouces" icon="gtk-execute" name="my_resources"/>
|
||||
</field>
|
||||
<field name="resource_type"/>
|
||||
<field name="company_id" widget="selection"/>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
<field name="context">{"search_default_My Resources":1}</field>
|
||||
<field name="context">{"search_default_my_resources":1}</field>
|
||||
<field name="search_view_id" ref="view_resource_calendar_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
<field name="model_id" ref="sale.model_sale_order"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Sale Order Requisition"""" name="name"/>
|
||||
<field eval=""""Drives requisition orders for every sale order line."""" name="note"/>
|
||||
<field eval=""""Drives procurement orders for every sale order line."""" name="note"/>
|
||||
<field name="subflow_id" ref="process_process_salesprocess0"/>
|
||||
<field name="process_id" ref="mrp.process_process_procurementprocess0"/>
|
||||
<field eval=""""object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')"""" name="model_states"/>
|
||||
|
|
@ -66,8 +66,8 @@
|
|||
<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
|
||||
<field name="model_id" ref="mrp.model_mrp_procurement"/>
|
||||
<field eval=""""subflow"""" name="kind"/>
|
||||
<field eval=""""Requisition Order"""" name="name"/>
|
||||
<field eval=""""One requisition order for each sale order line and for each of the components."""" name="note"/>
|
||||
<field eval=""""Procurement Order"""" name="name"/>
|
||||
<field eval=""""One Procurement order for each sale order line and for each of the components."""" name="note"/>
|
||||
<field name="subflow_id" ref="mrp.process_process_procurementprocess0"/>
|
||||
<field name="process_id" ref="process_process_salesprocess0"/>
|
||||
<field eval=""""object.state=='confirmed'"""" name="model_states"/>
|
||||
|
|
@ -158,8 +158,8 @@
|
|||
|
||||
<record id="process_transition_saleprocurement0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Create Requisition Order"""" name="name"/>
|
||||
<field eval=""""A requisition order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. """" name="note"/>
|
||||
<field eval=""""Create Procurement Order"""" name="name"/>
|
||||
<field eval=""""A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. """" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
|
||||
</record>
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
<record id="process_transition_packing0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Create Pick List"""" name="name"/>
|
||||
<field eval=""""The Pick List form is created as soon as the sale order is confirmed, in the same time as the requisition order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts."""" name="note"/>
|
||||
<field eval=""""The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
|
||||
</record>
|
||||
|
|
@ -200,8 +200,8 @@
|
|||
<record id="process_transition_saleorderprocurement0" model="process.transition">
|
||||
<field eval="[(6,0,[])]" name="role_ids"/>
|
||||
<field eval="[(6,0,[])]" name="transition_ids"/>
|
||||
<field eval=""""Requisition of sold material"""" name="name"/>
|
||||
<field eval=""""For every sale order line, a requisition order is created to supply the sold product."""" name="note"/>
|
||||
<field eval=""""Procurement of sold material"""" name="name"/>
|
||||
<field eval=""""For every sale order line, a procurement order is created to supply the sold product."""" name="note"/>
|
||||
<field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
|
||||
<field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@
|
|||
<search string="Sale Orders">
|
||||
<group>
|
||||
<filter icon="terp-sale"
|
||||
string="This Year"
|
||||
string="This Year" name="this_year"
|
||||
domain="[('year','=',time.strftime('%%Y'))]"
|
||||
help="Sales orders of the year"/>
|
||||
<filter icon="terp-sale"
|
||||
string="This Month"
|
||||
string="This Month" name="this_month"
|
||||
domain="[('month','=',time.strftime('%%m'))]"
|
||||
help="Sales orders of this month"/>
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
string="Quotations"
|
||||
domain="[('state','=','draft')]"/>
|
||||
<filter icon="terp-sale"
|
||||
string="Sales"
|
||||
string="Sales" name="sales"
|
||||
domain="[('state','<>','draft'),('state','<>','cancel')]"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="user_id" widget="selection">
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
<group expand="1" string="Group By..." >
|
||||
<filter string="Company" icon="terp-sale" context="{'group_by':'company_id'}"/>
|
||||
<filter string="Shop" icon="terp-sale" context="{'group_by':'shop_id'}"/>
|
||||
<filter string="Salesman" icon="terp-sale" context="{'group_by':'user_id'}" />
|
||||
<filter string="Salesman" name="by_user" icon="terp-sale" context="{'group_by':'user_id'}" />
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Product" icon="terp-sale" context="{'group_by':'product_id'}"/>
|
||||
<filter string="Partner" icon="terp-sale" context="{'group_by':'partner_id'}"/>
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
<field name="res_model">sale.report</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{"search_default_This Year":1,"search_default_This Month":1,"search_default_Sales":1,"search_default_Salesman":1}</field>
|
||||
<field name="context">{"search_default_this_year":1,"search_default_this_month":1,"search_default_sales":1,"search_default_by_user":1}</field>
|
||||
<field name="search_view_id" ref="view_order_product_search"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -776,12 +776,12 @@ class sale_order_line(osv.osv):
|
|||
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
|
||||
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
|
||||
'invoiced': fields.boolean('Invoiced', readonly=True),
|
||||
'procurement_id': fields.many2one('mrp.procurement', 'Requisition'),
|
||||
'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
|
||||
'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits_compute= dp.get_precision('Sale Price')),
|
||||
'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
|
||||
'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Requisition Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft':[('readonly',False)]}),
|
||||
'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
|
||||
'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}),
|
||||
|
|
|
|||
|
|
@ -98,11 +98,11 @@
|
|||
<form string="Sales order">
|
||||
<group col="6" colspan="4">
|
||||
<field name="name" select="1"/>
|
||||
<field name="client_order_ref" select="2"/>
|
||||
<field name="shipped" select="2"/>
|
||||
<field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2" widget="selection"/>
|
||||
<field name="client_order_ref"/>
|
||||
<field name="shipped"/>
|
||||
<field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
|
||||
<field name="date_order" select="1" string="Order date" />
|
||||
<field name="invoiced" select="2"/>
|
||||
<field name="invoiced"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Sale Order">
|
||||
|
|
@ -111,8 +111,9 @@
|
|||
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
|
||||
<field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
|
||||
<field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
|
||||
<field name="project_id" select="2"
|
||||
context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
|
||||
<field name="project_id"
|
||||
context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
|
||||
groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
|
||||
<form string="Sale Order Lines">
|
||||
|
|
@ -140,17 +141,17 @@
|
|||
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<separator colspan="4" string="Manual Description"/>
|
||||
<field colspan="4" name="name" select="2"/>
|
||||
<field name="price_unit" select="2"/>
|
||||
<field colspan="4" name="name"/>
|
||||
<field name="price_unit"/>
|
||||
<field name="discount"/>
|
||||
<field name="type"/>
|
||||
<field name="delay" select="2"/>
|
||||
<field name="type" groups="base.group_extended"/>
|
||||
<field name="delay" groups="base.group_extended"/>
|
||||
<newline/>
|
||||
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/>
|
||||
<separator colspan="4" string="States"/>
|
||||
<field name="state" select="2"/>
|
||||
<field name="state"/>
|
||||
<group col="3" colspan="2">
|
||||
<field name="invoiced" select="2"/>
|
||||
<field name="invoiced"/>
|
||||
<button colspan="1"
|
||||
name="%(action_view_sale_order_line_make_invoice)d"
|
||||
states="confirmed"
|
||||
|
|
@ -163,7 +164,7 @@
|
|||
<field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
|
||||
<field groups="product.group_uos" name="product_uos"/>
|
||||
<field name="th_weight"/>
|
||||
<field name="address_allotment_id" select="2"/>
|
||||
<field name="address_allotment_id"/>
|
||||
<separator colspan="4" string="Properties"/>
|
||||
<field colspan="4" name="property_ids" nolabel="1"/>
|
||||
</page>
|
||||
|
|
@ -196,12 +197,12 @@
|
|||
<button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
|
||||
</group>
|
||||
<group col="13" colspan="4">
|
||||
<field name="state" select="2"/>
|
||||
<field name="state"/>
|
||||
<button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
|
||||
<button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-print"/>
|
||||
<button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
|
||||
<button name="ship_recreate" states="shipping_except" string="Recreate Requisition" icon="gtk-ok"/>
|
||||
<button name="ship_corrected" states="shipping_except" string="Requisition Corrected" icon="gtk-apply"/>
|
||||
<button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
|
||||
<button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
|
||||
<button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-print"/>
|
||||
<button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
|
||||
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
|
||||
|
|
@ -211,25 +212,25 @@
|
|||
</group>
|
||||
</page>
|
||||
<page string="Other data">
|
||||
<group colspan="2" col="2">
|
||||
<group colspan="2" col="2" groups="base.group_extended">
|
||||
<separator string="Logistic" colspan="2"/>
|
||||
<field groups="base.group_extended" name="incoterm"/>
|
||||
<field groups="base.group_extended" name="picking_policy" required="True"/>
|
||||
<field name="incoterm"/>
|
||||
<field name="picking_policy" required="True"/>
|
||||
<field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
|
||||
<field groups="base.group_extended" name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
|
||||
<field name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<separator string="References" colspan="2"/>
|
||||
<field name="user_id"/>
|
||||
<field groups="base.group_extended" name="origin"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<group colspan="2" col="2" groups="base.group_extended">
|
||||
<separator string="Conditions" colspan="2"/>
|
||||
<field name="payment_term" widget="selection"/>
|
||||
<field name="fiscal_position" groups="base.group_extended" widget="selection"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="fiscal_position" widget="selection"/>
|
||||
<field name="company_id" widget="selection"/>
|
||||
</group>
|
||||
<group colspan="2" col="2">
|
||||
<group colspan="2" col="2" groups="base.group_extended">
|
||||
<separator string="Dates" colspan="2"/>
|
||||
<field name="create_date" widget="datetime"/>
|
||||
<field name="date_confirm"/>
|
||||
|
|
@ -237,7 +238,7 @@
|
|||
<separator colspan="4" string="Notes"/>
|
||||
<field colspan="4" name="note" nolabel="1"/>
|
||||
</page>
|
||||
<page string="History">
|
||||
<page string="History" groups="base.group_extended">
|
||||
<separator colspan="4" string="Related invoices"/>
|
||||
<field colspan="4" name="invoice_ids" nolabel="1"/>
|
||||
<field colspan="4" name="picking_ids" nolabel="1"/>
|
||||
|
|
@ -260,7 +261,7 @@
|
|||
<field name="name" select="1"/>
|
||||
<field name="partner_id" select="1"/>
|
||||
<field name="user_id" select="1" widget="selection">
|
||||
<filter icon="terp-partner" string="My Sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
|
||||
<filter icon="terp-partner" name="my_sale" domain="[('user_id','=',uid)]" help="My Sale Orders" />
|
||||
</field>
|
||||
<field name="date_order" select="1" string="Order date" />
|
||||
<newline/>
|
||||
|
|
@ -280,7 +281,7 @@
|
|||
<field name="res_model">sale.order</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar,graph</field>
|
||||
<field name="context">{"search_default_My Sale":1}</field>
|
||||
<field name="context">{"search_default_my_sale":1}</field>
|
||||
<field name="search_view_id" ref="view_sales_order_filter"/>
|
||||
</record>
|
||||
<menuitem action="action_order_form" id="menu_sale_order" parent="base.menu_sales" sequence="3"/>
|
||||
|
|
@ -368,43 +369,43 @@
|
|||
<form string="Sales Order Lines">
|
||||
<notebook>
|
||||
<page string="Order Lines">
|
||||
<separator colspan="4" string="Automatic Declaration"/>
|
||||
<separator colspan="4" string="General Information"/>
|
||||
<field name="order_id" select="1"/>
|
||||
<field name="order_partner_id" readonly="1" select="1" invisible="1"/>
|
||||
<field name="product_uom_qty" readonly="1" select="2"/>
|
||||
<field name="product_uom_qty" readonly="1"/>
|
||||
<field name="product_uom"/>
|
||||
<field name="product_id" readonly="1" select="1"/>
|
||||
<field name="invoiced" select="2"/>
|
||||
<field name="invoiced"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<separator colspan="4" string="Manual Designation"/>
|
||||
<field colspan="4" name="name" select="2"/>
|
||||
<field name="price_unit" select="2"/>
|
||||
<field colspan="4" name="name"/>
|
||||
<field name="price_unit"/>
|
||||
<field name="discount"/>
|
||||
<field name="type"/>
|
||||
<field name="delay" select="2"/>
|
||||
<field name="type" groups="base.group_extended"/>
|
||||
<field name="delay" groups="base.group_extended"/>
|
||||
<field name="price_subtotal"/>
|
||||
<field name="th_weight"/>
|
||||
<field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/>
|
||||
<separator colspan="4" string="States"/>
|
||||
<field name="state" select="2"/>
|
||||
<field name="state"/>
|
||||
<group col="2" colspan="2">
|
||||
<button name="button_done"
|
||||
states="confirmed,exception"
|
||||
string="Done" type="object"
|
||||
icon="gtk-jump-to" />
|
||||
states="confirmed,exception"
|
||||
string="Done" type="object"
|
||||
icon="gtk-jump-to" />
|
||||
<button name="button_cancel"
|
||||
states="confirmed,exception"
|
||||
string="Cancel" type="object"
|
||||
icon="gtk-cancel" />
|
||||
states="confirmed,exception"
|
||||
string="Cancel" type="object"
|
||||
icon="gtk-cancel" />
|
||||
</group>
|
||||
</page>
|
||||
<page string="Properties">
|
||||
<page string="Properties" groups="base.group_extended">
|
||||
<field name="property_ids" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<field colspan="4" name="notes" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Invoice Lines">
|
||||
<page string="Invoice Lines" groups="base.group_extended">
|
||||
<field colspan="4" name="invoice_lines" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
|
|
@ -447,7 +448,7 @@
|
|||
<filter icon="terp-purchase" string="Shipped"
|
||||
domain="[('state','=','done')]"
|
||||
separator="1" />
|
||||
<filter icon="terp-purchase" string="Uninvoiced"
|
||||
<filter icon="terp-purchase" string="Uninvoiced" name="uninvoiced"
|
||||
domain="[('invoiced','<>', 1),('state','<>','draft'),('state','<>','cancel')]"
|
||||
separator="1" />
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -472,7 +473,7 @@
|
|||
<field name="res_model">sale.order.line</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,graph</field>
|
||||
<field name="context">{"search_default_Uninvoiced":1}</field>
|
||||
<field name="context">{"search_default_uninvoiced":1}</field>
|
||||
<field name="search_view_id" ref="view_sales_order_uninvoiced_line_filter" />
|
||||
<field name="filter" eval="True"/>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 16:15+0000\n"
|
||||
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
|
||||
"PO-Revision-Date: 2010-04-15 01:00+0000\n"
|
||||
"Last-Translator: Bundo <bundo@bundo.biz>\n"
|
||||
"Language-Team: Korean <ko@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-03-30 03:59+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: sale_crm
|
||||
|
|
@ -45,7 +45,7 @@ msgstr "한꺼번"
|
|||
#. module: sale_crm
|
||||
#: constraint:ir.ui.view:0
|
||||
msgid "Invalid XML for View Architecture!"
|
||||
msgstr ""
|
||||
msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
|
||||
|
||||
#. module: sale_crm
|
||||
#: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
|
||||
|
|
|
|||
|
|
@ -100,7 +100,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Product Backlogs">
|
||||
<group col="10" colspan="4">
|
||||
<filter icon="terp-project"
|
||||
<filter name="current"
|
||||
icon="terp-project"
|
||||
string="Current"
|
||||
domain="['|','&',('sprint_id.date_start','<=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','>=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open'])]"
|
||||
help="Current Backlogs"/>
|
||||
|
|
@ -114,7 +115,8 @@
|
|||
/>
|
||||
<field name="sprint_id"/>
|
||||
<field name="user_id" widget="selection">
|
||||
<filter icon="terp-project"
|
||||
<filter name="my_features"
|
||||
icon="terp-project"
|
||||
string="My Features"
|
||||
domain="[('user_id','=',uid)]"
|
||||
help="My Backlogs"/>
|
||||
|
|
@ -136,7 +138,7 @@
|
|||
<field name="name">Product Backlogs</field>
|
||||
<field name="res_model">scrum.product.backlog</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="context">{"search_default_Current":1,"search_default_My Features":1,"search_default_project_id":project_id}</field>
|
||||
<field name="context">{"search_default_current":1,"search_default_my_features":1,"search_default_project_id":project_id}</field>
|
||||
<field name="search_view_id" ref="view_scrum_product_backlog_search"/>
|
||||
</record>
|
||||
<menuitem
|
||||
|
|
@ -228,14 +230,14 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Sprints">
|
||||
<group col="10" colspan="4">
|
||||
<filter icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
|
||||
<filter name="current" icon="terp-project" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
|
||||
<filter icon="terp-project" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
|
||||
<filter icon="terp-project" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="project_id" widget="selection"/>
|
||||
<field name="scrum_master_id" widget="selection">
|
||||
<filter icon="gtk-execute" string="My Sprints" domain="[('scrum_master_id','=',uid)]"
|
||||
<filter icon="gtk-execute" name="my_sprints" domain="[('scrum_master_id','=',uid)]"
|
||||
help="My Sprints"/>
|
||||
</field>
|
||||
<field name="date_start"/>
|
||||
|
|
@ -259,7 +261,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="view_scrum_sprint_tree"/>
|
||||
<field name="context">{"search_default_Current":1,"search_default_My Sprints":1}</field>
|
||||
<field name="context">{"search_default_current":1,"search_default_my_sprints":1}</field>
|
||||
<field name="search_view_id" ref="view_scrum_sprint_search"/>
|
||||
</record>
|
||||
<menuitem
|
||||
|
|
@ -322,7 +324,7 @@
|
|||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="sprint_id">
|
||||
<filter icon="terp-project" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
|
||||
<filter icon="terp-project" name="current" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
|
||||
</field>
|
||||
<field name="date"/>
|
||||
</group>
|
||||
|
|
@ -340,7 +342,7 @@
|
|||
<field name="res_model">scrum.meeting</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context">{"search_default_Current":1}</field>
|
||||
<field name="context">{"search_default_current":1}</field>
|
||||
<field name="search_view_id" ref="view_scrum_meeting_search"/>
|
||||
</record>
|
||||
<menuitem sequence="30"
|
||||
|
|
|
|||
|
|
@ -335,7 +335,7 @@ class product_template(osv.osv):
|
|||
'stock.location',
|
||||
type='many2one',
|
||||
relation='stock.location',
|
||||
string="Requisition Location",
|
||||
string="Procurement Location",
|
||||
method=True,
|
||||
view_load=True,
|
||||
domain=[('usage','like','procurement')],
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="product_search_form_view_stock" model="ir.ui.view">
|
||||
<record id="product_search_form_view_stock" model="ir.ui.view">
|
||||
<field name="name">product.search.stock.form</field>
|
||||
<field name="model">product.product</field>
|
||||
<field name="type">search</field>
|
||||
<field name="inherit_id" ref="product.product_search_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="pricelist_id" select="1" widget="selection" position="before">
|
||||
<field name="location_id" select="1" widget="selection" context="{'location': self}" />
|
||||
<separator orientation="vertical"/>
|
||||
</field>
|
||||
<field name="pricelist_id" select="1" widget="selection" position="before">
|
||||
<field name="location_id" select="1" widget="selection" context="{'location': self}" />
|
||||
<separator orientation="vertical"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="view_category_property_form" model="ir.ui.view">
|
||||
<field name="name">product.category.stock.property.form.inherit</field>
|
||||
<field name="model">product.category</field>
|
||||
|
|
@ -54,20 +54,21 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_product_standard_price_form" model="ir.ui.view">
|
||||
<record id="view_product_standard_price_form" model="ir.ui.view">
|
||||
<field name="name">product.product.standard.price.form.inherit</field>
|
||||
<field name="model">product.product</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="product.product_normal_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="standard_price" position="replace">
|
||||
<group col="4" colspan="2">
|
||||
<field name="standard_price" readonly="True"/>
|
||||
<button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
|
||||
</group>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
<field name="standard_price" position="replace">
|
||||
<label string="Cost Price" align="1.0"/>
|
||||
<group col="2" colspan="1">
|
||||
<field name="standard_price" readonly="True" nolabel="1"/>
|
||||
<button name="%(action_view_change_standard_price)d" string="Change Price" type="action" icon="gtk-execute"/>
|
||||
</group>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_normal_property_acc_form" model="ir.ui.view">
|
||||
<field name="name">product.normal.stock.acc.property.form.inherit</field>
|
||||
|
|
@ -77,8 +78,8 @@
|
|||
<field name="priority">26</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="property_account_expense" position="after">
|
||||
<field name="property_stock_account_output" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_account_input" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_account_output" domain="[('type','<>','view'),('type','<>','consolidation')]" groups="base.group_extended"/>
|
||||
<field name="property_stock_account_input" domain="[('type','<>','view'),('type','<>','consolidation')]" groups="base.group_extended"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -112,7 +113,7 @@
|
|||
<field name="inherit_id" ref="product.product_normal_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="store" position="after">
|
||||
<group col="2" colspan="2" name="store">
|
||||
<group col="2" colspan="2" name="store" groups="base.group_extended">
|
||||
<separator string="Counter-Part Locations Properties" colspan="2"/>
|
||||
<field name="property_stock_procurement" widget="selection" domain="[('usage','=','procurement')]"/>
|
||||
<field name="property_stock_production" widget="selection"/>
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search">
|
||||
<group>
|
||||
<filter string="This Year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" />
|
||||
<filter string="This Month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" />
|
||||
<filter string="This Year" name="this_year" icon="terp-hr" domain="[('name','=',time.localtime()[0])]" />
|
||||
<filter string="This Month" name="this_month" icon="terp-hr" domain="[('month','=',time.strftime('%%m'))]" />
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="Current" icon="terp-hr" domain="[('state','in',('open','draft'))]"/>
|
||||
<filter string="Order Date" icon="terp-stock" domain="[('order_date',=,time.strftime('%%Y-%%m-%%d'))]" />
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="view_id" ref="view_report_report_stock_picking_tree"/>
|
||||
<field name="context">{"search_default_This Year":1,"search_default_This Month":1}</field>
|
||||
<field name="context">{"search_default_this_year":1,"search_default_this_month":1}</field>
|
||||
<field name="search_view_id" ref="view_report_report_stock_picking_filter"/>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Location">
|
||||
<group col="10" colspan="4">
|
||||
<filter icon="terp-stock" string="Internal Locations" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
|
||||
<filter icon="terp-stock" string="Customer Locations" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
|
||||
<filter icon="terp-stock" string="Supplier Locations" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
|
||||
<filter icon="terp-stock" name="in_location" string="Internal" domain="[('location_id.usage', '=', 'internal')]" help="Internal Locations" />
|
||||
<filter icon="terp-stock" string="Customer" domain="[('location_id.usage', '=', 'customer')]" help="Customer Locations" />
|
||||
<filter icon="terp-stock" string="Supplier" domain="[('location_id.usage', '=', 'supplier')]" help="Supplier Locations" />
|
||||
|
||||
<separator orientation="vertical"/>
|
||||
<field name="location_id" select="1" />
|
||||
<field name="product_id" select="1" />
|
||||
<field name="location_id" select="1"/>
|
||||
<field name="product_id" select="1" default="1"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="1" string="Group By..." colspan="4" col="10">
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
<form string="Stock by Lots">
|
||||
<field name="location_id"/>
|
||||
<field name="product_id"/>
|
||||
<field name="prodlot_id"/>
|
||||
<field name="prodlot_id" groups="base.group_extended"/>
|
||||
<field name="name"/>
|
||||
</form>
|
||||
</field>
|
||||
|
|
@ -49,19 +49,32 @@
|
|||
<tree string="Stock by Lots">
|
||||
<field name="location_id"/>
|
||||
<field name="product_id"/>
|
||||
<field name="prodlot_id"/>
|
||||
<field name="prodlot_id" groups="base.group_extended"/>
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="stock_report_prodlots_graph" model="ir.ui.view">
|
||||
<field name="name">stock.report.prodlots.view</field>
|
||||
<field name="model">stock.report.prodlots</field>
|
||||
<field name="type">graph</field>
|
||||
<field name="arch" type="xml">
|
||||
<graph string="Stock by Lots" type="bar">
|
||||
<field name="product_id"/>
|
||||
<field name="name"/>
|
||||
</graph>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="action_stock_report_prodlots_form" model="ir.actions.act_window">
|
||||
<field name="name">Inventory by Location</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">stock.report.prodlots</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context">{'full':'1',"search_default_Internal Locations":1}</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="context">{'full':'1',"search_default_in_location":1}</field>
|
||||
<field name="search_view_id" ref="view_stock_report_prodlots_filter" />
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</page><page string="Posted Inventory">
|
||||
</page><page string="Posted Inventory" groups="base.group_extended">
|
||||
<field colspan="4" name="move_ids" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
|
|
@ -264,7 +264,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Product Lots Filter">
|
||||
<group col="10" colspan="4">
|
||||
<filter icon="terp-stock" string="Available" domain="[('stock_available', '>', 0)]" help="Available Product Lots" />
|
||||
<filter icon="terp-stock" name="available" string="Available" domain="[('stock_available', '>', 0)]" help="Available Product Lots" />
|
||||
<separator orientation="vertical"/>
|
||||
<field name="prefix" select="1"/>
|
||||
<field name="name" select="1"/>
|
||||
|
|
@ -287,7 +287,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_production_lot_tree"/>
|
||||
<field name="search_view_id" ref="search_product_lot_filter" />
|
||||
<field name="context">{'full':'1',"search_default_Available":1}</field>
|
||||
<field name="context">{'full':'1',"search_default_available":1}</field>
|
||||
</record>
|
||||
<menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
|
||||
|
||||
|
|
@ -304,7 +304,7 @@
|
|||
<field name="product_id" select="1"/>
|
||||
<field name="product_qty" select="1"/>
|
||||
<field name="product_uom" select="1" string="UOM"/>
|
||||
<field name="prodlot_id" select="1"/>
|
||||
<field name="prodlot_id" select="1" groups="base.group_extended"/>
|
||||
<field name="product_packaging" domain="[('product_id','=',product_id)]"/>
|
||||
<field name="picking_id"/>
|
||||
<field name="location_id" select="1"/>
|
||||
|
|
@ -326,7 +326,7 @@
|
|||
<field name="product_id" select="1"/>
|
||||
<field name="product_qty" select="1"/>
|
||||
<field name="product_uom" select="1" string="UOM"/>
|
||||
<field name="prodlot_id" select="1"/>
|
||||
<field name="prodlot_id" select="1" groups="base.group_extended"/>
|
||||
<field name="product_packaging" domain="[('product_id','=',product_id)]"/>
|
||||
<field name="picking_id"/>
|
||||
<field name="location_id" select="1"/>
|
||||
|
|
@ -607,7 +607,7 @@
|
|||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
<field name="product_uom" string="UOM"/>
|
||||
<field name="picking_id" select="1"/>
|
||||
<field name="prodlot_id"/>
|
||||
<field name="prodlot_id" groups="base.group_extended"/>
|
||||
<field name="location_id"/>
|
||||
<field name="location_dest_id"/>
|
||||
<field name="date_planned"/>
|
||||
|
|
@ -639,7 +639,7 @@
|
|||
<field name="date_planned"/>
|
||||
<field name="address_id" select="1" context="{'contact_display':'partner'}"/>
|
||||
<field groups="base.group_extended" name="product_packaging"/>
|
||||
<field name="prodlot_id" select="2"
|
||||
<field name="prodlot_id" select="2" groups="base.group_extended"
|
||||
context="{'location_id':location_id, 'product_id':product_id}"
|
||||
domain="[('product_id','=?',product_id)]"
|
||||
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
|
||||
|
|
@ -656,7 +656,7 @@
|
|||
<button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Return Picking History">
|
||||
<page string="Return Picking History" groups="base.group_extended">
|
||||
<field name="move_stock_return_history" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
|
|
@ -695,7 +695,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Stock Picking">
|
||||
<group col="10" colspan="4">
|
||||
<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
|
||||
<filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Available Pickings"/>
|
||||
<filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Pickings"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
|
||||
|
|
@ -769,7 +769,7 @@
|
|||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
<field name="product_uom" string="UOM"/>
|
||||
<field name="picking_id" select="1"/>
|
||||
<field name="prodlot_id"/>
|
||||
<field name="prodlot_id" groups="base.group_extended"/>
|
||||
<field name="location_id"/>
|
||||
<field name="location_dest_id"/>
|
||||
<field name="date_planned"/>
|
||||
|
|
@ -778,6 +778,7 @@
|
|||
name="%(stock.track_line)d"
|
||||
string="Split in production lots"
|
||||
type="action" icon="gtk-justify-fill"
|
||||
groups="base.group_extended"
|
||||
states="draft,waiting,confirmed,assigned" />
|
||||
<button name="%(stock.move_scrap)d"
|
||||
string="Scrap Products" type="action"
|
||||
|
|
@ -799,7 +800,7 @@
|
|||
<field invisible="1" name="date"/>
|
||||
<field name="date_planned"/>
|
||||
<field groups="base.group_extended" name="product_packaging"/>
|
||||
<field name="prodlot_id" select="2"
|
||||
<field name="prodlot_id" select="2" groups="base.group_extended"
|
||||
context="{'location_id':location_id, 'product_id':product_id}"
|
||||
domain="[('product_id','=?',product_id)]"
|
||||
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
|
||||
|
|
@ -851,7 +852,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Search Stock Delivery">
|
||||
<group col="10" colspan="4">
|
||||
<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
|
||||
<filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Orders" />
|
||||
<filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Orders"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
|
||||
|
|
@ -877,7 +878,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar</field>
|
||||
<field name="domain">[('type','=','delivery')]</field>
|
||||
<field name="context">{'contact_display': 'partner',"search_default_Available":1}</field>
|
||||
<field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
|
||||
<field name="search_view_id" ref="view_stock_delivery_filter"/>
|
||||
</record>
|
||||
<record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
|
||||
|
|
@ -958,7 +959,7 @@
|
|||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
<field name="product_uom" string="UOM"/>
|
||||
<field name="picking_id" select="1"/>
|
||||
<field name="prodlot_id"/>
|
||||
<field name="prodlot_id" groups="base.group_extended"/>
|
||||
<field name="location_id"/>
|
||||
<field name="location_dest_id"/>
|
||||
<field name="date_planned"/>
|
||||
|
|
@ -989,7 +990,7 @@
|
|||
<field invisible="1" name="date"/>
|
||||
<field name="date_planned"/>
|
||||
<field groups="base.group_extended" name="product_packaging"/>
|
||||
<field name="prodlot_id" select="1"
|
||||
<field name="prodlot_id" select="1" groups="base.group_extended"
|
||||
context="{'location_id':location_id, 'product_id':product_id}"
|
||||
domain="[('product_id','=?',product_id)]"
|
||||
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
|
||||
|
|
@ -1144,7 +1145,7 @@
|
|||
<field name="product_qty"/>
|
||||
<field name="product_uom"/>
|
||||
<field name="location_dest_id"/>
|
||||
<field name="prodlot_id"/>
|
||||
<field name="prodlot_id" groups="base.group_extended"/>
|
||||
<field name="state"/>
|
||||
<button
|
||||
name="%(stock.track_line)d"
|
||||
|
|
@ -1173,7 +1174,7 @@
|
|||
<newline/>
|
||||
<field groups="base.group_extended" name="product_packaging"/>
|
||||
<newline/>
|
||||
<field name="prodlot_id" select="1"
|
||||
<field name="prodlot_id" select="1" groups="base.group_extended"
|
||||
context="{'location_id':location_id, 'product_id':product_id}"
|
||||
domain="[('product_id','=?',product_id)]"
|
||||
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
|
||||
|
|
@ -1224,7 +1225,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Input Picking List">
|
||||
<group col="8" colspan="4">
|
||||
<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
|
||||
<filter icon="terp-stock" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Incoming Orders" />
|
||||
<separator orientation="vertical"/>
|
||||
<filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" />
|
||||
<separator orientation="vertical"/>
|
||||
|
|
@ -1250,7 +1251,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar</field>
|
||||
<field name="domain">[('type','=','in')]</field>
|
||||
<field name="context">{'contact_display': 'partner',"search_default_Available":1}</field>
|
||||
<field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
|
||||
<field name="search_view_id" ref="view_picking_in_search"/>
|
||||
</record>
|
||||
<record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
|
||||
|
|
@ -1280,7 +1281,7 @@
|
|||
<search string="Internal Picking List">
|
||||
<group col="8" colspan="4">
|
||||
<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
|
||||
<filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
|
||||
<filter icon="terp-stock" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves" />
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="origin" select="1"/>
|
||||
|
|
@ -1303,7 +1304,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form,calendar</field>
|
||||
<field name="domain">[('type','=','internal')]</field>
|
||||
<field name="context">{'contact_display': 'partner',"search_default_Confirmed":1}</field>
|
||||
<field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
|
||||
<field name="search_view_id" ref="view_picking_internal_search"/>
|
||||
</record>
|
||||
<menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
|
||||
|
|
@ -1320,7 +1321,7 @@
|
|||
<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
<field name="product_uom" string="UOM"/>
|
||||
<field name="picking_id" select="1"/>
|
||||
<field name="prodlot_id"/>
|
||||
<field name="prodlot_id" groups="base.group_extended"/>
|
||||
<field name="location_id"/>
|
||||
<field name="location_dest_id"/>
|
||||
<field name="date_planned"/>
|
||||
|
|
@ -1368,7 +1369,7 @@
|
|||
<group colspan="2" col="4">
|
||||
<separator string="Traceability" colspan="4" />
|
||||
<field name="tracking_id" select="1" colspan="4" />
|
||||
<field name="prodlot_id" select="2"
|
||||
<field name="prodlot_id" select="2" groups="base.group_extended"
|
||||
context="{'location_id':location_id, 'product_id':product_id}"
|
||||
domain="[('product_id','=?',product_id)]"
|
||||
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
|
||||
|
|
@ -1398,13 +1399,12 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Stock Moves">
|
||||
<group col="8" colspan="4">
|
||||
<filter icon="terp-stock" string="Available" domain="[('state','=','assigned')]" help="Available Moves"/>
|
||||
<filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Moves"/>
|
||||
<filter icon="terp-stock" string="Waiting" domain="[('state','=','waiting')]" help="Waiting"/>
|
||||
<filter icon="terp-stock" string="Available" domain="[('state','=','done')]" help="Done"/>
|
||||
<filter icon="terp-stock" string="Available" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Future"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="location_id" select="1"/>
|
||||
<field name="location_dest_id" select="1"/>
|
||||
<field name="product_id" select="1"/>
|
||||
<field name="location_id"/>
|
||||
<field name="location_dest_id"/>
|
||||
<field name="product_id"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<group expand="1" string="Group By..." colspan="4" col="8">
|
||||
|
|
@ -1439,12 +1439,12 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree colors="grey:state in ('cancel','done');black:state not in ('cancel','done')" string="Moves">
|
||||
<field name="picking_id" string="Reference"/>
|
||||
<field name="origin" string="Latest Requisition"/>
|
||||
<field name="origin" string="Latest Procurement"/>
|
||||
<field name="partner_id" string="Supplier"/>
|
||||
<field name="product_id"/>
|
||||
<field name="product_qty" />
|
||||
<field name="product_uom" string="UOM"/>
|
||||
<field name="prodlot_id" string="Lot"/>
|
||||
<field name="prodlot_id" string="Lot" groups="base.group_extended"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="backorder_id"/>
|
||||
<field name="state"/>
|
||||
|
|
@ -1464,22 +1464,22 @@
|
|||
<notebook colspan="4">
|
||||
<page string="General Information">
|
||||
<separator colspan="4" string="Move Information"/>
|
||||
<field name="location_id" select="1"/>
|
||||
<field name="location_dest_id" select="1"/>
|
||||
<field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
|
||||
<field name="location_id"/>
|
||||
<field name="location_dest_id"/>
|
||||
<field colspan="4" name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
|
||||
<field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
|
||||
<field name="product_uom" select="2"/>
|
||||
<field name="product_uos" select="2"/>
|
||||
<field colspan="4" name="name" select="2"/>
|
||||
<field name="date"/>
|
||||
<field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
|
||||
<field name="date_planned"/>
|
||||
<field name="priority"/>
|
||||
<field name="address_id" select="2" context="{'contact_display':'partner'}"/>
|
||||
<newline/>
|
||||
<field name="picking_id" select="2"/>
|
||||
<newline/>
|
||||
<field name="prodlot_id" select="2"
|
||||
<field name="prodlot_id" select="2" groups="base.group_extended"
|
||||
context="{'location_id':location_id, 'product_id':product_id}"
|
||||
domain="[('product_id','=?',product_id)]"
|
||||
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
|
||||
|
|
@ -1488,7 +1488,7 @@
|
|||
<label/>
|
||||
<button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
|
||||
<separator colspan="4" string="Move State"/>
|
||||
<field name="state" select="1"/>
|
||||
<field name="state"/>
|
||||
<group col="5" colspan="2">
|
||||
<button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
|
||||
<button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
|
||||
|
|
@ -1513,12 +1513,12 @@
|
|||
<field name="arch" type="xml">
|
||||
<search string="Stock Moves">
|
||||
<group col="8" colspan="4">
|
||||
<filter icon="terp-stock" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
|
||||
<filter icon="terp-stock" name="receive" string="To Receive" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
|
||||
<filter icon="terp-stock" string="Back Orders" domain="[('backorder_id','!=',False)]" help="Back Orders"/>
|
||||
<filter icon="terp-stock" string="Planned Today" domain="[('date_planned::date','=',time.strftime('%%Y-%%m-%%d'))]" help="Orders planned for today"/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="origin" string="Latest Requisition" select="1"/>
|
||||
<field name="partner_id" string="Supplier" select="1"/>
|
||||
<field name="origin" string="Latest Procurement"/>
|
||||
<field name="partner_id" string="Supplier"/>
|
||||
<field name="product_id"/>
|
||||
</group>
|
||||
<newline/>
|
||||
|
|
@ -1539,7 +1539,7 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('picking_id','!=',False),('picking_id.type','=','in')]</field>
|
||||
<field name="view_id" ref="view_move_tree_reception_picking"/>
|
||||
<field name="context">{"search_default_To Receive":1}</field>
|
||||
<field name="context">{"search_default_receive":1}</field>
|
||||
<field name="search_view_id" ref="view_move_search_reception_picking"/>
|
||||
</record>
|
||||
|
||||
|
|
@ -1568,7 +1568,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree string="Incoterms">
|
||||
<field name="code"/>
|
||||
<field colspan="4" name="name" select="1"/>
|
||||
<field colspan="4" name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="product.product_normal_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<page string="Requisition & Locations">
|
||||
<page string="Procurement & Locations">
|
||||
<field name="path_ids" editable="bottom" colspan="4" nolabel="1">
|
||||
<tree string="Location Paths" editable="bottom">
|
||||
<field name="location_from_id"/>
|
||||
|
|
|
|||
|
|
@ -8,19 +8,19 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 16:34+0000\n"
|
||||
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
|
||||
"PO-Revision-Date: 2010-04-15 00:45+0000\n"
|
||||
"Last-Translator: Bundo <bundo@bundo.biz>\n"
|
||||
"Language-Team: Korean <ko@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-03-30 04:13+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: stock_no_autopicking
|
||||
#: constraint:ir.ui.view:0
|
||||
msgid "Invalid XML for View Architecture!"
|
||||
msgstr ""
|
||||
msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
|
||||
|
||||
#. module: stock_no_autopicking
|
||||
#: field:product.product,auto_pick:0
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
|
||||
"PO-Revision-Date: 2009-09-08 15:16+0000\n"
|
||||
"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
|
||||
"PO-Revision-Date: 2010-04-15 01:06+0000\n"
|
||||
"Last-Translator: Bundo <bundo@bundo.biz>\n"
|
||||
"Language-Team: Korean <ko@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-03-30 03:53+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: subscription
|
||||
|
|
@ -62,7 +62,7 @@ msgstr "현재 날짜"
|
|||
#. module: subscription
|
||||
#: constraint:ir.actions.act_window:0
|
||||
msgid "Invalid model name in the action definition."
|
||||
msgstr ""
|
||||
msgstr "액션 정의에 잘못된 모델 이름이 있습니다."
|
||||
|
||||
#. module: subscription
|
||||
#: selection:subscription.subscription,interval_type:0
|
||||
|
|
|
|||
Loading…
Reference in New Issue