[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag
bzr revid: rpa@tinyerp.com-20101119072430-0rgszlgidvyezsvd
This commit is contained in:
rpa (Open ERP)
commit
a81ecff2c4
|
|
@ -8,6 +8,9 @@
|
|||
<record id="group_auction_user" model="res.groups">
|
||||
<field name="name">Auction / User</field>
|
||||
</record>
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('group_auction_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -5,9 +5,14 @@
|
|||
<record id="base.group_sale_salesman" model="res.groups">
|
||||
<field name="name">Sales / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<record id="base.group_sale_manager" model="res.groups">
|
||||
<field name="name">Sales / Manager</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,10 @@
|
|||
<record id="base.group_sale_salesman" model="res.groups">
|
||||
<field name="name">Sales / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@
|
|||
<record id="base.group_sale_salesman" model="res.groups">
|
||||
<field name="name">Sales / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<record id="base.group_sale_salesman_all_leads" model="res.groups">
|
||||
<field name="name">Sales / User - See All Leads</field>
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@
|
|||
<field name="model">sale.order</field>
|
||||
<field name="inherit_id" ref="sale.view_order_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="logistic" position="inside">
|
||||
<group name="logistics" position="inside">
|
||||
<field name="id" invisible="True"/>
|
||||
<field name="carrier_id" context="{'order_id':active_id}"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,10 @@
|
|||
<record id="base.group_document_user" model="res.groups">
|
||||
<field name="name">Knowledge / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<!-- <record id="group_document_manager" model="res.groups">-->
|
||||
<!-- <field name="name">Document / Manager</field>-->
|
||||
|
|
|
|||
|
|
@ -372,7 +372,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
|
|||
return True
|
||||
else:
|
||||
logger.notifyChannel(_("Email Template"), netsvc.LOG_ERROR, _("Mail from Account %s failed. Probable Reason:Account not approved") % id)
|
||||
return {'error_msg':"Mail from Account %s failed. Probable Reason:Account not approved"% id}
|
||||
return {'nodestroy':True,'error_msg':"Mail from Account %s failed. Probable Reason:Account not approved"% id}
|
||||
|
||||
def extracttime(self, time_as_string):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<data>
|
||||
|
||||
<menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17"
|
||||
groups="marketing.group_marketing_user"/>
|
||||
groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
|
||||
<menuitem name="Emails" id="base.menu_emails" parent="base.marketing_menu" sequence="5"/>
|
||||
<menuitem name="Email Template" id="menu_email_template" parent="base.menu_emails"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,3 +5,6 @@
|
|||
"access_email_template_account_system","email_template.account system","model_email_template_account","base.group_system",1,1,1,1
|
||||
"access_email_template_system","email.template system","model_email_template","base.group_system",1,1,1,1
|
||||
"access_email_template_mailbox_system","email_template.mailbox system","model_email_template_mailbox","base.group_system",1,0,0,0
|
||||
"access_email_template_account_manager","email_template.account","model_email_template_account","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_email_template_mailbox_manager","email_template.mailbox","model_email_template_mailbox","marketing.group_marketing_manager",1,1,1,1
|
||||
|
|
|
|||
|
|
|
@ -8,6 +8,11 @@
|
|||
<record model="res.groups" id="base.group_tool_user">
|
||||
<field name="name">Tools / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_tool_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@
|
|||
<record id="base.group_document_user" model="res.groups">
|
||||
<field name="name">Knowledge / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<openerp>
|
||||
<data>
|
||||
|
||||
<menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="marketing.group_marketing_user"/>
|
||||
<menuitem name="Marketing" icon="terp-crm" id="base.marketing_menu" sequence="17" groups="marketing.group_marketing_user,marketing.group_marketing_manager"/>
|
||||
|
||||
<record id="view_marketing_installer" model="ir.ui.view">
|
||||
<field name="name">marketing.installer.view</field>
|
||||
|
|
|
|||
|
|
@ -4,5 +4,15 @@
|
|||
<record id="marketing.group_marketing_user" model="res.groups">
|
||||
<field name="name">Marketing / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('marketing.group_marketing_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="marketing.group_marketing_manager" model="res.groups">
|
||||
<field name="name">Marketing / Manager</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
<field name="month" invisible="1"/>
|
||||
<field name="day" invisible="1"/>
|
||||
<field name="date" invisible="1"/>
|
||||
<field name="state" invisible="1"/>
|
||||
<field name="campaign_id" invisible="1"/>
|
||||
<field name="activity_id" invisible="1"/>
|
||||
<field name="segment_id" invisible="1"/>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,21 @@
|
|||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,1,1
|
||||
"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,1,1
|
||||
"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,1,1
|
||||
"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,1,1
|
||||
"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,1,1
|
||||
"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,1,1
|
||||
"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
|
||||
"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,1,1
|
||||
"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,1,1
|
||||
"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,0,0
|
||||
"access_email_template_account_user","email_template.account.user","email_template.model_email_template_account","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
|
||||
"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
|
||||
"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
|
||||
"access_marketing_campaign_manager","marketing.campaign","model_marketing_campaign","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_segment_campaign_manager","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_activity_campaign_manager","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_workitem_campaign_manager","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_transition_campaign_manager","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_analysis_campaign_manager","campaign.analysis","model_campaign_analysis","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_email_template_account_manager","email_template.account.manager","email_template.model_email_template_account","marketing.group_marketing_manager",1,1,1,1
|
||||
|
|
|
|||
|
|
|
@ -2270,7 +2270,7 @@ msgstr ""
|
|||
#~ msgid "Product & Location"
|
||||
#~ msgstr "Producte & Ubicació"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "Planificador MRP & Logística"
|
||||
|
||||
#~ msgid ""
|
||||
|
|
|
|||
|
|
@ -2391,7 +2391,7 @@ msgstr "Jahr"
|
|||
#~ msgid "Product & Location"
|
||||
#~ msgstr "Produkt & Lagerort"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "Fertigungs- und Beschaffungsplanung"
|
||||
|
||||
#~ msgid ""
|
||||
|
|
|
|||
|
|
@ -2354,7 +2354,7 @@ msgstr ""
|
|||
#~ msgid "Best price (not yet active!)"
|
||||
#~ msgstr "Best price (not yet active!)"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "MRP & Προγραμματισμός Προμηθειών"
|
||||
|
||||
#~ msgid ""
|
||||
|
|
|
|||
|
|
@ -2501,7 +2501,7 @@ msgstr "Año"
|
|||
#~ msgid "Product & Location"
|
||||
#~ msgstr "Producto & Ubicación"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "Planificador MRP & Logística"
|
||||
|
||||
#~ msgid ""
|
||||
|
|
|
|||
|
|
@ -2385,7 +2385,7 @@ msgstr ""
|
|||
#~ "This is the days added to what you promise to customers for security purpose"
|
||||
#~ msgstr "Nämä päivät lisätään asiakkaalle luvattuun aikaan turvallisuussyistä"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "Tuotanto- ja logistiikka-aikataulut"
|
||||
|
||||
#~ msgid "A purchase order is created for a sub-contracting demand."
|
||||
|
|
|
|||
|
|
@ -2501,7 +2501,7 @@ msgstr ""
|
|||
#~ "Questi sono i giorni aggiunti, per sicurezza, alla data che hai promesso ai "
|
||||
#~ "clienti."
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "MRP e Schedulatore Logistico"
|
||||
|
||||
#~ msgid "Automatic Procurements"
|
||||
|
|
|
|||
|
|
@ -2246,7 +2246,7 @@ msgstr ""
|
|||
#~ msgid "Product name"
|
||||
#~ msgstr "제품 이름"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "MRP 및 물류 스케줄러"
|
||||
|
||||
#~ msgid "Ask New Products"
|
||||
|
|
|
|||
|
|
@ -2464,7 +2464,7 @@ msgstr ""
|
|||
#~ "Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
|
||||
#~ "beloofde levertijd."
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "MRP & logistieke planning"
|
||||
|
||||
#~ msgid "Product & Location"
|
||||
|
|
|
|||
|
|
@ -2283,7 +2283,7 @@ msgstr ""
|
|||
#~ msgid "Origin"
|
||||
#~ msgstr "Pochodzenie"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "MRP i planowanie logistyczne"
|
||||
|
||||
#~ msgid "Product & Location"
|
||||
|
|
|
|||
|
|
@ -2500,7 +2500,7 @@ msgstr ""
|
|||
#~ "Estes são os dias adicionados aos que prometeu aos clientes para fins de "
|
||||
#~ "segurança"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "Planificador Logístico e de Produção"
|
||||
|
||||
#~ msgid "Automatic Procurements"
|
||||
|
|
|
|||
|
|
@ -2516,7 +2516,7 @@ msgstr ""
|
|||
#~ msgid "Exceptions Procurements"
|
||||
#~ msgstr "Исключения поставок"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "ПМР и Логистическое планирование"
|
||||
|
||||
#~ msgid "Stockable Stock"
|
||||
|
|
|
|||
|
|
@ -2230,7 +2230,7 @@ msgstr ""
|
|||
#~ msgid "Ask New Products"
|
||||
#~ msgstr "Opýtať sa na nový produkt"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "MRP a plánovač logistiky"
|
||||
|
||||
#~ msgid "Product & Location"
|
||||
|
|
|
|||
|
|
@ -2241,7 +2241,7 @@ msgstr ""
|
|||
#~ msgid "Product & Location"
|
||||
#~ msgstr "Ürün & Lokasyon Bilgisi"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "MRP & Lojistik Planlaması"
|
||||
|
||||
#~ msgid "Ask New Products"
|
||||
|
|
|
|||
|
|
@ -2544,7 +2544,7 @@ msgstr ""
|
|||
#~ msgid "Product & Location"
|
||||
#~ msgstr "产品&库位"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "MRP&物流调度"
|
||||
|
||||
#~ msgid ""
|
||||
|
|
|
|||
|
|
@ -2255,7 +2255,7 @@ msgstr ""
|
|||
#~ "This is the days added to what you promise to customers for security purpose"
|
||||
#~ msgstr "這是你為了客人的保險而所承諾的天數"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "物料需求計劃 & 物流調度"
|
||||
|
||||
#~ msgid "Automatic Procurements"
|
||||
|
|
|
|||
|
|
@ -2251,7 +2251,7 @@ msgstr ""
|
|||
#~ "This is the days added to what you promise to customers for security purpose"
|
||||
#~ msgstr "這是你為了客人的保險而所承諾的天數"
|
||||
|
||||
#~ msgid "MRP & Logistic Scheduler"
|
||||
#~ msgid "MRP & Logistics Scheduler"
|
||||
#~ msgstr "物料需求計劃 & 物流調度"
|
||||
|
||||
#~ msgid "Product & Location"
|
||||
|
|
|
|||
|
|
@ -8,6 +8,15 @@
|
|||
<record id="group_mrp_user" model="res.groups">
|
||||
<field name="name">Manufacturing / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- restrict access to menu -->
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
<field name="inherit_id" ref="base.view_company_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<page string="Configuration" position="inside">
|
||||
<separator string="MRP & Logistic Scheduler" colspan="4"/>
|
||||
<separator string="MRP & Logistics Scheduler" colspan="4"/>
|
||||
<field name="schedule_range"/>
|
||||
</page>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -314,8 +314,8 @@ msgstr "If you encode manually a Procurement, you probably want to use a make to
|
|||
|
||||
#. module: procurement
|
||||
#: view:res.company:0
|
||||
msgid "MRP & Logistic Scheduler"
|
||||
msgstr "MRP & Logistic Scheduler"
|
||||
msgid "MRP & Logistics Scheduler"
|
||||
msgstr "MRP & Logistics Scheduler"
|
||||
|
||||
#. module: procurement
|
||||
#: view:procurement.order.compute.all:0
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ msgstr ""
|
|||
|
||||
#. module: procurement
|
||||
#: view:res.company:0
|
||||
msgid "MRP & Logistic Scheduler"
|
||||
msgid "MRP & Logistics Scheduler"
|
||||
msgstr ""
|
||||
|
||||
#. module: procurement
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ msgstr ""
|
|||
|
||||
#. module: procurement
|
||||
#: view:res.company:0
|
||||
msgid "MRP & Logistic Scheduler"
|
||||
msgid "MRP & Logistics Scheduler"
|
||||
msgstr ""
|
||||
|
||||
#. module: procurement
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ msgstr ""
|
|||
|
||||
#. module: procurement
|
||||
#: view:res.company:0
|
||||
msgid "MRP & Logistic Scheduler"
|
||||
msgid "MRP & Logistics Scheduler"
|
||||
msgstr "Үйлдвэрлэл & Логистик"
|
||||
|
||||
#. module: procurement
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ msgstr ""
|
|||
|
||||
#. module: procurement
|
||||
#: view:res.company:0
|
||||
msgid "MRP & Logistic Scheduler"
|
||||
msgid "MRP & Logistics Scheduler"
|
||||
msgstr ""
|
||||
|
||||
#. module: procurement
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@ msgstr ""
|
|||
|
||||
#. module: procurement
|
||||
#: view:res.company:0
|
||||
msgid "MRP & Logistic Scheduler"
|
||||
msgid "MRP & Logistics Scheduler"
|
||||
msgstr "MRP i planowanie logistyczne"
|
||||
|
||||
#. module: procurement
|
||||
|
|
|
|||
|
|
@ -332,7 +332,7 @@ msgstr ""
|
|||
|
||||
#. module: procurement
|
||||
#: view:res.company:0
|
||||
msgid "MRP & Logistic Scheduler"
|
||||
msgid "MRP & Logistics Scheduler"
|
||||
msgstr ""
|
||||
|
||||
#. module: procurement
|
||||
|
|
|
|||
|
|
@ -342,7 +342,7 @@ msgstr ""
|
|||
|
||||
#. module: procurement
|
||||
#: view:res.company:0
|
||||
msgid "MRP & Logistic Scheduler"
|
||||
msgid "MRP & Logistics Scheduler"
|
||||
msgstr "ПМР и Логистическое планирование"
|
||||
|
||||
#. module: procurement
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@
|
|||
src_model="procurement.order"/>
|
||||
|
||||
<!-- Procurements are located in Warehouse menu hierarchy, MRP users should come to Stock application to use it. -->
|
||||
<menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4" groups="base.group_extended"/>
|
||||
<menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4"/>
|
||||
<menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
|
||||
<menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
|
||||
<menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5" groups="base.group_extended"/>
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@
|
|||
<record id="base.group_sale_salesman" model="res.groups">
|
||||
<field name="name">Sales / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<record id="product_comp_rule" model="ir.rule">
|
||||
<field name="name" >Product multi-company</field>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@
|
|||
<record id="base.group_sale_salesman" model="res.groups">
|
||||
<field name="name">Sales / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.menu" id="menu_definitions">
|
||||
<field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
|
||||
|
|
|
|||
|
|
@ -131,7 +131,6 @@
|
|||
</child1>
|
||||
<child2>
|
||||
<action colspan="4" height="220" name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchase by Category" />
|
||||
<action colspan="4" height="220" name="%(action_negotiation_by_supplier)d" string="Negotiation by Supplier" />
|
||||
<!--
|
||||
<action colspan="4" height="220" name="%(purchase.action_purchase_by_supplier)d" string="Purchase by supplier" />
|
||||
<action colspan="4" height="220" name="%(purchase.action_total_price_by_product_by_state)d" string="Total price by product by state" />
|
||||
|
|
|
|||
|
|
@ -8,7 +8,14 @@
|
|||
<record id="group_purchase_user" model="res.groups">
|
||||
<field name="name">Purchase / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.rule" id="purchase_order_comp_rule">
|
||||
<field name="name">Purchase Order multi-company</field>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
#!/usr/bin/python
|
||||
# -*- encoding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||
# $Id$
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
import wizard
|
||||
import purchase_double_validation
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
#!/usr/bin/python
|
||||
# -*- encoding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||
# $Id$
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
{
|
||||
"name" : "purchase_double_validation",
|
||||
"version" : "1.1",
|
||||
"category": "Generic Modules/ Purchases Double Validation ",
|
||||
"depends" : ["base","purchase"],
|
||||
"author" : "Tiny",
|
||||
"description": """
|
||||
Subject,Date,Status
|
||||
""",
|
||||
'author': 'Tiny',
|
||||
'website': 'http://www.openerp.com',
|
||||
|
||||
'init_xml': [],
|
||||
'update_xml': [
|
||||
'purchase_double_validation_view.xml',
|
||||
'purchase_double_validation_workflow.xml',
|
||||
'wizard/purchase_double_validation_wizard_view.xml', ],
|
||||
'demo_xml': [],
|
||||
'installable': True,
|
||||
'active': False,
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
#!/usr/bin/python
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||
# $Id$
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
import time
|
||||
from osv import fields, osv
|
||||
|
||||
|
||||
class purchase_double_validation(osv.osv):
|
||||
_name = "purchase.double.validation"
|
||||
_description = "purchase double validation"
|
||||
|
||||
_columns = {
|
||||
'state': fields.selection([
|
||||
('draft', 'Request for Quotation'),
|
||||
('wait', 'Waiting'),
|
||||
('confirmed', 'Waiting Supplier Ack'),
|
||||
('approved', 'Approved'),
|
||||
('validate', 'Validate'),
|
||||
('except_picking', 'Shipping Exception'),
|
||||
('except_invoice', 'Invoice Exception'),
|
||||
('done', 'Done'),
|
||||
('cancel', 'Cancelled')
|
||||
], 'State', readonly=True, select=True),
|
||||
|
||||
}
|
||||
|
||||
_defaults = {
|
||||
'state': lambda *args: 'draft',
|
||||
}
|
||||
|
||||
def action_validate(self, cr, uid, ids, context={}):
|
||||
self.write(cr, uid, ids, {'state': 'validate'})
|
||||
return True
|
||||
|
||||
def action_limit(self, cr, uid, ids, context=None):
|
||||
amount_obj = self.pool.get('purchase.order').browse(cr, uid, uid, context)
|
||||
amount = amount_obj.amount_total
|
||||
|
||||
purchase_double_validation()
|
||||
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<record id="view_purchase_form_inherit" model="ir.ui.view">
|
||||
<field name="name">purchase.order.form.inherit</field>
|
||||
<field name="model">purchase.order</field>
|
||||
<field name="inherit_id" ref="purchase.purchase_order_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//button[@string='Convert to Purchase Order']" position="replace">
|
||||
|
||||
<button name="draft_router1" states="draft" string="To Validate" icon="gtk-go-forward"/>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//button[@string='Approve Purchase']" position="after">
|
||||
|
||||
<button name="validate_confirmed" states="validate" string="Convert to Purchase Order" icon="gtk-go-forward"/>
|
||||
</xpath>
|
||||
|
||||
|
||||
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record id="act_validate" model="workflow.activity">
|
||||
<field name="wkf_id" ref="purchase.purchase_order"/>
|
||||
<field name="name">Validate</field>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'state':'validate'})</field>
|
||||
</record>
|
||||
|
||||
<record id="act_router1" model="workflow.activity">
|
||||
<field name="wkf_id" ref="purchase.purchase_order"/>
|
||||
<field name="name">router1</field>
|
||||
<field name="split_mode">OR</field>
|
||||
<field name="kind">dummy</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="trans_draft_router1" model="workflow.transition">
|
||||
<field name="act_from" ref="purchase.act_draft"/>
|
||||
<field name="act_to" ref="act_router1"/>
|
||||
<field name="condition">True</field>
|
||||
<field name="signal">draft_router1</field>
|
||||
</record>
|
||||
|
||||
<record id="trans_router1_validate" model="workflow.transition">
|
||||
<field name="act_from" ref="act_router1"/>
|
||||
<field name="act_to" ref="act_validate"/>
|
||||
<field name="condition">True</field>
|
||||
<field name="signal">router1_validate</field>
|
||||
</record>
|
||||
|
||||
<record id="purchase.trans_draft_confirmed" model="workflow.transition">
|
||||
<field name="act_from" ref="act_router1"/>
|
||||
<field name="act_to" ref="purchase.act_confirmed"/>
|
||||
<field name="condition">True</field>
|
||||
<field name="signal">router1_confirmed</field>
|
||||
</record>
|
||||
|
||||
<record id="trans_validate_confirmed" model="workflow.transition">
|
||||
<field name="act_from" ref="act_validate"/>
|
||||
<field name="act_to" ref="purchase.act_confirmed"/>
|
||||
<field name="condition">True</field>
|
||||
<field name="signal">validate_confirmed</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
#!/usr/bin/python
|
||||
# -*- encoding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||
# $Id$
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
import purchase_double_validation_wizard
|
||||
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
|
||||
# $Id$
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
from osv import fields, osv
|
||||
from tools import config
|
||||
import time
|
||||
from tools.translate import _
|
||||
import netsvc
|
||||
|
||||
|
||||
|
||||
|
||||
class purchase_double_validation_wizard(osv.osv_memory):
|
||||
_name = 'purchase.double.validation.wizard'
|
||||
|
||||
|
||||
_columns = {
|
||||
'limit_amount': fields.float('Limit Amount', required=True),
|
||||
|
||||
}
|
||||
_defaults = {
|
||||
'limit_amount': 100,
|
||||
|
||||
}
|
||||
|
||||
|
||||
def set_limit(self, cr, uid, ids, context=None):
|
||||
pur_id = self.pool.get(purchase.order).search(cr, uid, [])
|
||||
amount_obj = self.pool.get('purchase.order').browse(cr, uid, pur_id, context)
|
||||
amount = amount_obj.amount_total
|
||||
return {}
|
||||
# limit = limit_obj.limit_amount
|
||||
#
|
||||
# return {
|
||||
# 'view_type': 'form',
|
||||
# "view_mode": 'form',
|
||||
# 'res_model': 'ir.actions.configuration.wizard',
|
||||
# 'type': 'ir.actions.act_window',
|
||||
# 'target': 'new',
|
||||
# }
|
||||
|
||||
def action_cancel(self,cr,uid,ids,conect=None):
|
||||
return {
|
||||
'view_type': 'form',
|
||||
"view_mode": 'form',
|
||||
'res_model': 'ir.actions.configuration.wizard',
|
||||
'type': 'ir.actions.act_window',
|
||||
'target':'new',
|
||||
}
|
||||
|
||||
purchase_double_validation_wizard()
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record id="view_purchase_double_validation_wizard" model="ir.ui.view">
|
||||
<field name="name">Configure Limit Amount</field>
|
||||
<field name="model">purchase.double.validation.wizard</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Limint Amount Configuration">
|
||||
<field name="limit_amount"/>
|
||||
<newline/>
|
||||
<group col="4" colspan="4">
|
||||
<button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
|
||||
<button icon="gtk-ok" name="set_limit" string="Set Limit Amount" type="object"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_purchase_double_validation_wizard" model="ir.actions.act_window">
|
||||
<field name="name">Configure Limit Amount</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">purchase.double.validation.wizard</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
<record id="config_purchase_double_validation_wizard" model="ir.actions.todo">
|
||||
<field name="name">Configure Limit Amount</field>
|
||||
<field name="note">This Configuration step use to setLimit Amount</field>
|
||||
<field name="action_id" ref="action_purchase_double_validation_wizard"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -5,9 +5,14 @@
|
|||
<record id="group_purchase_requisition_manager" model="res.groups">
|
||||
<field name="name">Purchase Requisition / Manager</field>
|
||||
</record>
|
||||
|
||||
<record id="group_purchase_requisition_user" model="res.groups">
|
||||
<field name="name">Purchase Requisition / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('group_purchase_requisition_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.rule" id="purchase_requisition_comp_rule">
|
||||
<field name="name">Purchase Requisition multi-company</field>
|
||||
|
|
|
|||
|
|
@ -1453,7 +1453,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1460,7 +1460,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2114,7 +2114,7 @@ msgstr "Фактура базирана на доставки"
|
|||
#~ msgid "My sales in shipping exception"
|
||||
#~ msgstr "Моите продажби с грешка при доставка"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Конфигуриране на реда на доставка при продажба"
|
||||
|
||||
#~ msgid "Sales Configuration"
|
||||
|
|
|
|||
|
|
@ -1457,7 +1457,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2215,7 +2215,7 @@ msgstr "Račun sa referencom na isporuku"
|
|||
#~ "Ovaj korak pri konfiguraciji se koristi da bi se definisalo podrazumjevanje "
|
||||
#~ "opcija izbora u toku kreiranja naloga za prodaju"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Konfigurisanje logistike prodajnog naloga"
|
||||
|
||||
#~ msgid "Sales Configuration"
|
||||
|
|
|
|||
|
|
@ -1465,7 +1465,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2038,7 +2038,7 @@ msgstr "Factura des d'albarans"
|
|||
#~ msgid "Manual in progress"
|
||||
#~ msgstr "Manual en procés"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Configureu la logística de les comandes de venda"
|
||||
|
||||
#~ msgid "You invoice has been successfully created !"
|
||||
|
|
|
|||
|
|
@ -1453,7 +1453,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1511,6 +1511,7 @@ msgstr "Verkäufe je Verkäufer"
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
|
||||
msgid "Logistic"
|
||||
msgstr "Logistik"
|
||||
|
||||
|
|
@ -2251,7 +2252,7 @@ msgstr "Rechnung bei Wareneingang"
|
|||
#~ msgid "Sale Procurement"
|
||||
#~ msgstr "Auftragsbezogene Beschaffung"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Konfiguriere Packliste für Auftrag"
|
||||
|
||||
#~ msgid "Status"
|
||||
|
|
|
|||
|
|
@ -1491,7 +1491,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2411,8 +2411,8 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
|
|||
#~ "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
|
||||
#~ "for the scheduler to be on the date 'Date Ordered'."
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgstr "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Configure Sale Order Logistics"
|
||||
|
||||
#, python-format
|
||||
#~ msgid ""
|
||||
|
|
|
|||
|
|
@ -2146,7 +2146,7 @@ msgstr "Facturar desde albaranes"
|
|||
#~ msgid "In progress"
|
||||
#~ msgstr "En progreso"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Configurar la logística de los pedidos de venta"
|
||||
|
||||
#~ msgid "You invoice has been successfully created !"
|
||||
|
|
|
|||
|
|
@ -1462,7 +1462,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2190,7 +2190,7 @@ msgstr "Facturar desde órdenes de entrega"
|
|||
#~ msgid "Status"
|
||||
#~ msgstr "Estado"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Configurar logística de orden de venta"
|
||||
|
||||
#~ msgid "Create Advance Invoice"
|
||||
|
|
|
|||
|
|
@ -1485,7 +1485,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2154,7 +2154,7 @@ msgstr "Arve kohaletoimetamiste põhjal"
|
|||
#~ msgstr ""
|
||||
#~ "Müügikorraldusel hankimine igale reale ja see muutub hankekorralduseks."
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Seadista müügikorralduse logistika"
|
||||
|
||||
#~ msgid "Packing Policy"
|
||||
|
|
|
|||
|
|
@ -1460,7 +1460,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2224,7 +2224,7 @@ msgstr "Lasku perustuen toimitettuihin"
|
|||
#~ msgid "Packing Policy"
|
||||
#~ msgstr "Pakkauskäytäntö"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Myyntitilauksien logistiikan asetukset"
|
||||
|
||||
#~ msgid "One procurement for each product."
|
||||
|
|
|
|||
|
|
@ -1489,7 +1489,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2094,7 +2094,7 @@ msgstr "Facture basé sur les livraisons"
|
|||
#~ msgid "Sale Procurement"
|
||||
#~ msgstr "Approvisionnement des ventes"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Configurer la logistique des commandes de ventes"
|
||||
|
||||
#~ msgid "Sale Order Procurement"
|
||||
|
|
|
|||
|
|
@ -1458,7 +1458,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2174,7 +2174,7 @@ msgstr "Račun na temelju dostava"
|
|||
#~ msgid "Sale Procurement"
|
||||
#~ msgstr "Pribavljanje za Prodaju"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Konfiguriraj logistiku Prodajne Narudžbe"
|
||||
|
||||
#~ msgid "Status"
|
||||
|
|
|
|||
|
|
@ -1453,7 +1453,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1458,7 +1458,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1494,7 +1494,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2213,7 +2213,7 @@ msgstr "Fattura basata su Consegne"
|
|||
#~ msgid "Sale Procurement"
|
||||
#~ msgstr "Vendita appalti"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Configura la logistica di ordine di vendita"
|
||||
|
||||
#~ msgid "Status"
|
||||
|
|
|
|||
|
|
@ -1454,7 +1454,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2206,7 +2206,7 @@ msgstr "베송에 기초한 인보이스"
|
|||
#~ "order"
|
||||
#~ msgstr "판매 주문 작성 시, 디폴트 피킹 정책을 설정하는 구성 과정"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "판매 주문 물류 구성"
|
||||
|
||||
#~ msgid "Quantity (UOS)"
|
||||
|
|
|
|||
|
|
@ -1461,7 +1461,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2235,7 +2235,7 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
|
|||
#~ msgid "Sale Procurement"
|
||||
#~ msgstr "Planiniai užsakymai"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Konfigūruoti pardavimo užsakymo logistiką"
|
||||
|
||||
#~ msgid "Packing Policy"
|
||||
|
|
|
|||
|
|
@ -1454,7 +1454,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1458,7 +1458,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2160,7 +2160,7 @@ msgstr "Facturatie gebaseer op leveringen"
|
|||
#~ msgid "Sale Procurement"
|
||||
#~ msgstr "Uitlevering verkoop"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Stel verkooplogistiek in"
|
||||
|
||||
#~ msgid "Status"
|
||||
|
|
|
|||
|
|
@ -699,7 +699,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.config.picking_policy:0
|
||||
msgid "Configure Sale Order Logistic"
|
||||
msgid "Configure Sale Order Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1496,7 +1496,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2134,7 +2134,7 @@ msgstr "Faktura wg dostaw"
|
|||
#~ msgid "Sales Process"
|
||||
#~ msgstr "Proces sprzedaży"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Konfiguruj ligistykę zamówienia sprzedaży"
|
||||
|
||||
#~ msgid "One procurement for each product."
|
||||
|
|
|
|||
|
|
@ -1457,7 +1457,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2208,7 +2208,7 @@ msgstr "Facturar com base na expedição"
|
|||
#~ msgid "Procurement for each line"
|
||||
#~ msgstr "Aprovisionamento para cada linha"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Configurar a logística da ordem de venda"
|
||||
|
||||
#~ msgid "Sales Configuration"
|
||||
|
|
|
|||
|
|
@ -1559,7 +1559,7 @@ msgstr "Vendas por Representante"
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr "Logistica"
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1453,7 +1453,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1528,7 +1528,7 @@ msgstr "Продажи по менеджеру продаж"
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr "Логистика"
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1406,7 +1406,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1454,7 +1454,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1454,7 +1454,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1454,7 +1454,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -2303,7 +2303,7 @@ msgstr "Račun na osnovu isporuke"
|
|||
#~ msgid "Sales Configuration"
|
||||
#~ msgstr "Konfiguracija prodaje"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Konfigurisanje logistike naloga za prodaju"
|
||||
|
||||
#~ msgid "Status"
|
||||
|
|
|
|||
|
|
@ -1456,7 +1456,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2184,7 +2184,7 @@ msgstr "Fakturera utgående ifrån leveranser"
|
|||
#~ msgid "Procurement for each line"
|
||||
#~ msgstr "Anskaffning för varje rad"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Konfigurera kundorder logistik"
|
||||
|
||||
#~ msgid "Sale Procurement"
|
||||
|
|
|
|||
|
|
@ -1453,7 +1453,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1455,7 +1455,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2119,7 +2119,7 @@ msgstr "Teslimatlara Bağlı Fatura"
|
|||
#~ msgid "Sale Procurement"
|
||||
#~ msgstr "Satış Satınalması"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "Satış Sipariş Lojistiğini Ayarla"
|
||||
|
||||
#~ msgid "Status"
|
||||
|
|
|
|||
|
|
@ -1454,7 +1454,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1464,7 +1464,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -1453,7 +1453,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
@ -2220,7 +2220,7 @@ msgstr "发票基于送货单"
|
|||
#~ msgid "Sale Procurement"
|
||||
#~ msgstr "销售产品需求"
|
||||
|
||||
#~ msgid "Configure Sale Order Logistic"
|
||||
#~ msgid "Configure Sale Order Logistics"
|
||||
#~ msgstr "设置销售订单逻辑"
|
||||
|
||||
#~ msgid "Packing Policy"
|
||||
|
|
|
|||
|
|
@ -1453,7 +1453,7 @@ msgstr ""
|
|||
|
||||
#. module: sale
|
||||
#: view:sale.order:0
|
||||
msgid "Logistic"
|
||||
msgid "Logistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: sale
|
||||
|
|
|
|||
|
|
@ -539,7 +539,7 @@
|
|||
<attribute name="string">Sales Application Configuration</attribute>
|
||||
</form>
|
||||
<separator string="title" position="attributes">
|
||||
<attribute name="string">Configure Sales Order Logistic</attribute>
|
||||
<attribute name="string">Configure Sales Order Logistics</attribute>
|
||||
</separator>
|
||||
<xpath expr="//label[@string='description']" position="attributes">
|
||||
<attribute name="string">Setup your sales workflow and default values.</attribute>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@
|
|||
<field name="name">Sales / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.menu" id="base.menu_base_partner">
|
||||
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -69,6 +69,13 @@ class stock_picking(osv.osv):
|
|||
|
||||
def _get_price_unit_invoice(self, cursor, user, move_line, type):
|
||||
if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
|
||||
from_uom_id = move_line.product_id.uom_id.id
|
||||
to_uom_id = move_line.product_id.uos_id.id
|
||||
price = move_line.sale_line_id.price_unit
|
||||
coeff = move_line.product_id.uos_coeff
|
||||
if from_uom_id != to_uom_id and coeff != 0:
|
||||
price_unit = price / coeff
|
||||
return price_unit
|
||||
return move_line.sale_line_id.price_unit
|
||||
return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@
|
|||
'depends': ['mrp', 'sale'],
|
||||
'init_xml': [],
|
||||
'update_xml': [
|
||||
'security/sale_mrp_security.xml',
|
||||
'security/ir.model.access.csv',
|
||||
'sale_mrp_view.xml',
|
||||
],
|
||||
'demo_xml': [],
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_mrp_bom_user","mrp.bom","mrp.model_mrp_bom","base.group_sale_salesman",1,0,0,0
|
||||
"access_mrp_bom_manager","mrp.bom","mrp.model_mrp_bom","base.group_sale_manager",1,0,0,0
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="0">
|
||||
|
||||
<record id="base.group_sale_manager" model="res.groups">
|
||||
<field name="name">Sales / Manager</field>
|
||||
</record>
|
||||
|
||||
<record id="base.group_sale_salesman" model="res.groups">
|
||||
<field name="name">Sales / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -4,5 +4,10 @@
|
|||
<record id="group_share_user" model="res.groups">
|
||||
<field name="name">Sharing / User</field>
|
||||
</record>
|
||||
|
||||
<record id="base.user_demo" model="res.users">
|
||||
<field eval="[(4, ref('group_share_user'))]" name="groups_id"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue