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

[MERGE]: Merge work of aag + Fixes 

bzr revid: rpa@tinyerp.com-20101119133426-u3lh55b5gqi55ty8
This commit is contained in:
rpa (Open ERP) 2010-11-19 19:04:26 +05:30
parent f39976fd44 6caca89f87
commit 9d1fd0df09
145 changed files with 272 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/auction/auction_demo.xml
View File

@ -2,6 +2,10 @@
<openerp>
<data noupdate="1">
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('group_auction_user'))]" name="groups_id"/>
</record>
<!-- demo data for Account -->
<record model="account.account.type" id="account.account_type_tax">
<field name="name">Tax</field>

2
addons/auction/security/auction_security.xml
View File

@ -8,6 +8,6 @@
<record id="group_auction_user" model="res.groups">
<field name="name">Auction / User</field>
</record>
</data>
</openerp>

4
addons/base_contact/base_contact_demo.xml
View File

@ -2,6 +2,10 @@
<openerp>
<data>
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
</record>
<!-- Create the contacts -->
<record id="res_partner_contact_mortier0" model="res.partner.contact">
<field eval="&quot;&quot;&quot;Benoit&quot;&quot;&quot;" name="first_name"/>

1
addons/base_contact/security/base_contact_security.xml
View File

@ -9,5 +9,6 @@
<record id="base.group_sale_manager" model="res.groups">
<field name="name">Sales / Manager</field>
</record>
</data>
</openerp>

2
addons/board/__openerp__.py
View File

@ -27,7 +27,7 @@
'author': 'OpenERP SA',
'depends': ['base'],
'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'],
'demo_xml': [],
'demo_xml': ['board_demo.xml'],
'installable': True,
'active': False,
'certificate': '0076912305725',

8
addons/board/board_demo.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
</record>
</data>
</openerp>

1
addons/crm/crm_demo.xml
View File

@ -5,6 +5,5 @@
<field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
</record>
</data>
</openerp>

2
addons/delivery/delivery_view.xml
View File

@ -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>

4
addons/document/document_demo.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('base.group_document_user'))]" name="groups_id"/>
</record>
</data>
</openerp>

2
addons/email_template/email_template_account.py
View File

@ -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):
"""

2
addons/email_template/email_template_account_view.xml
View File

@ -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"/>

3
addons/email_template/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
5 access_email_template_account_system email_template.account system model_email_template_account base.group_system 1 1 1 1
6 access_email_template_system email.template system model_email_template base.group_system 1 1 1 1
7 access_email_template_mailbox_system email_template.mailbox system model_email_template_mailbox base.group_system 1 0 0 0
8 access_email_template_account_manager email_template.account model_email_template_account marketing.group_marketing_manager 1 1 1 1
9 access_email_template_manager email.template model_email_template marketing.group_marketing_manager 1 1 1 1
10 access_email_template_mailbox_manager email_template.mailbox model_email_template_mailbox marketing.group_marketing_manager 1 1 1 1

2
addons/event/report/report_event_registration_view.xml
View File

@ -141,7 +141,7 @@
<field name="act_window_id" ref="action_report_event_registration"/>
</record>
<menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="base.group_marketing_manager"/>
<menuitem parent="base.menu_report_association" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="marketing.group_marketing_manager"/>
</data>
</openerp>

2
addons/event/security/event_security.xml
View File

@ -2,7 +2,7 @@
<openerp>
<data>
<record id="base.group_marketing_manager" model="res.groups">
<record id="marketing.group_marketing_manager" model="res.groups">
<field name="name">Marketing / Manager</field>
</record>

16
addons/event/security/ir.model.access.csv
View File

@ -1,16 +1,16 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_event_type","event.type","model_event_type","marketing.group_marketing_user",1,0,0,0
"access_event_type_manager","event.type manager","model_event_type","base.group_marketing_manager",1,1,1,1
"access_event_type_manager","event.type manager","model_event_type","marketing.group_marketing_manager",1,1,1,1
"access_event_event","event.event","model_event_event","marketing.group_marketing_user",1,1,1,0
"access_event_registration","event.registration","model_event_registration","marketing.group_marketing_user",1,1,1,0
"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_user",1,1,1,1
"access_event_event_manager","event.event manager","model_event_event","base.group_marketing_manager",1,0,0,0
"access_event_registration_manager","event.registration manager","model_event_registration","base.group_marketing_manager",1,0,0,0
"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","base.group_marketing_manager",1,1,1,1
"access_product_product","product.product.product manager","product.model_product_product","base.group_marketing_manager",1,1,1,1
"access_report_event_registration","report.event.registration","model_report_event_registration","base.group_marketing_manager",1,1,1,1
"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","base.group_marketing_manager",1,1,1,1
"access_event_event_manager","event.event manager","model_event_event","marketing.group_marketing_manager",1,0,0,0
"access_event_registration_manager","event.registration manager","model_event_registration","marketing.group_marketing_manager",1,0,0,0
"access_crm_case_section_manager","crm.case.section manager","crm.model_crm_case_section","marketing.group_marketing_manager",1,1,1,1
"access_product_product","product.product.product manager","product.model_product_product","marketing.group_marketing_manager",1,1,1,1
"access_report_event_registration","report.event.registration","model_report_event_registration","marketing.group_marketing_manager",1,1,1,1
"access_event_registration_badge_manager","event.registration.badge manager","model_event_registration_badge","marketing.group_marketing_manager",1,1,1,1
"access_event_event_sale_salesman","event.event.sale","model_event_event","base.group_sale_salesman",1,0,0,0
"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","base.group_marketing_manager",1,0,0,0
"access_account_account_invoice_manager","account.account.invoice","account.model_account_invoice","marketing.group_marketing_manager",1,0,0,0
"access_event_registration_badge","event.registration.badge","model_event_registration_badge","marketing.group_marketing_user",1,0,0,0
"access_event_registration_sale_user","event.registration.sale.user","model_event_registration","base.group_sale_salesman",1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_event_type event.type model_event_type marketing.group_marketing_user 1 0 0 0
3 access_event_type_manager event.type manager model_event_type base.group_marketing_manager marketing.group_marketing_manager 1 1 1 1
4 access_event_event event.event model_event_event marketing.group_marketing_user 1 1 1 0
5 access_event_registration event.registration model_event_registration marketing.group_marketing_user 1 1 1 0
6 access_report_event_registration report.event.registration model_report_event_registration marketing.group_marketing_user 1 1 1 1
7 access_event_event_manager event.event manager model_event_event base.group_marketing_manager marketing.group_marketing_manager 1 0 0 0
8 access_event_registration_manager event.registration manager model_event_registration base.group_marketing_manager marketing.group_marketing_manager 1 0 0 0
9 access_crm_case_section_manager crm.case.section manager crm.model_crm_case_section base.group_marketing_manager marketing.group_marketing_manager 1 1 1 1
10 access_product_product product.product.product manager product.model_product_product base.group_marketing_manager marketing.group_marketing_manager 1 1 1 1
11 access_report_event_registration report.event.registration model_report_event_registration base.group_marketing_manager marketing.group_marketing_manager 1 1 1 1
12 access_event_registration_badge_manager event.registration.badge manager model_event_registration_badge base.group_marketing_manager marketing.group_marketing_manager 1 1 1 1
13 access_event_event_sale_salesman event.event.sale model_event_event base.group_sale_salesman 1 0 0 0
14 access_account_account_invoice_manager account.account.invoice account.model_account_invoice base.group_marketing_manager marketing.group_marketing_manager 1 0 0 0
15 access_event_registration_badge event.registration.badge model_event_registration_badge marketing.group_marketing_user 1 0 0 0
16 access_event_registration_sale_user event.registration.sale.user model_event_registration base.group_sale_salesman 1 0 0 0

2
addons/marketing/__openerp__.py
View File

@ -34,7 +34,7 @@
'security/ir.model.access.csv',
'marketing_view.xml'
],
'demo_xml': [],
'demo_xml': ['marketing_demo.xml'],
'installable': True,
'active': False,
}

8
addons/marketing/marketing_demo.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('marketing.group_marketing_user'))]" name="groups_id"/>
</record>
</data>
</openerp>

2
addons/marketing/marketing_view.xml
View File

@ -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>

5
addons/marketing/security/marketing_security.xml
View File

@ -4,5 +4,10 @@
<record id="marketing.group_marketing_user" model="res.groups">
<field name="name">Marketing / User</field>
</record>
<record id="marketing.group_marketing_manager" model="res.groups">
<field name="name">Marketing / Manager</field>
</record>
</data>
</openerp>

1
addons/marketing_campaign/report/campaign_analysis_view.xml
View File

@ -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"/>

24
addons/marketing_campaign/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_marketing_campaign_admin marketing.campaign model_marketing_campaign marketing.group_marketing_user 1 1 1 0 1 0
3 access_marketing_campaign_segment_campaignadmin marketing.campaign.segment model_marketing_campaign_segment marketing.group_marketing_user 1 1 1 0 1 0
4 access_marketing_campaign_activity_campaignadmin marketing.campaign.activity model_marketing_campaign_activity marketing.group_marketing_user 1 1 1 0 1 0
5 access_marketing_campaign_workitem_campaignadmin marketing.campaign.workitem model_marketing_campaign_workitem marketing.group_marketing_user 1 1 1 0 1 0
6 access_marketing_campaign_transition_campaignadmin marketing.campaign.transition model_marketing_campaign_transition marketing.group_marketing_user 1 1 1 0 1 0
7 access_marketing_campaign_analysis_campaignadmin campaign.analysis model_campaign_analysis marketing.group_marketing_user 1 1 1 0 1 0
8 access_marketing_campaign_workitem_all marketing.campaign.workitem model_marketing_campaign_workitem base.group_user 1 0 0 0
9 access_email_template_user email.template model_email_template marketing.group_marketing_user 1 1 1 0 1 0
10 access_email_template_account_user email_template.account.user email_template.model_email_template_account marketing.group_marketing_user 1 1 1 0 1 0
11 access_marketing_campaign_system marketing.campaign system model_marketing_campaign base.group_system 1 0 0 0
12 access_marketing_campaign_segment_system marketing.campaign.segment system model_marketing_campaign_segment base.group_system 1 0 0 0
13 access_marketing_campaign_workitem_system marketing.campaign.workitem system model_marketing_campaign_workitem base.group_system 1 0 0 0
14 access_marketing_campaign_manager marketing.campaign model_marketing_campaign marketing.group_marketing_manager 1 1 1 1
15 access_marketing_campaign_segment_campaign_manager marketing.campaign.segment model_marketing_campaign_segment marketing.group_marketing_manager 1 1 1 1
16 access_marketing_campaign_activity_campaign_manager marketing.campaign.activity model_marketing_campaign_activity marketing.group_marketing_manager 1 1 1 1
17 access_marketing_campaign_workitem_campaign_manager marketing.campaign.workitem model_marketing_campaign_workitem marketing.group_marketing_manager 1 1 1 1
18 access_marketing_campaign_transition_campaign_manager marketing.campaign.transition model_marketing_campaign_transition marketing.group_marketing_manager 1 1 1 1
19 access_marketing_campaign_analysis_campaign_manager campaign.analysis model_campaign_analysis marketing.group_marketing_manager 1 1 1 1
20 access_email_template_manager email.template model_email_template marketing.group_marketing_manager 1 1 1 1
21 access_email_template_account_manager email_template.account.manager email_template.model_email_template_account marketing.group_marketing_manager 1 1 1 1

2
addons/mrp/i18n/ca.po
View File

@ -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 ""

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

@ -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 ""

2
addons/mrp/i18n/el.po
View File

@ -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 ""

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

@ -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 ""

2
addons/mrp/i18n/fi.po
View File

@ -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."

2
addons/mrp/i18n/it.po
View File

@ -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"

2
addons/mrp/i18n/ko.po
View File

@ -2246,7 +2246,7 @@ msgstr ""
#~ msgid "Product name"
#~ msgstr "제품 이름"
#~ msgid "MRP & Logistic Scheduler"
#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP 및 물류 스케줄러"
#~ msgid "Ask New Products"

2
addons/mrp/i18n/nl.po
View File

@ -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"

2
addons/mrp/i18n/pl.po
View File

@ -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"

2
addons/mrp/i18n/pt.po
View File

@ -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"

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

@ -2516,7 +2516,7 @@ msgstr ""
#~ msgid "Exceptions Procurements"
#~ msgstr "Исключения поставок"
#~ msgid "MRP & Logistic Scheduler"
#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "ПМР и Логистическое планирование"
#~ msgid "Stockable Stock"

2
addons/mrp/i18n/sk.po
View File

@ -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"

2
addons/mrp/i18n/tr.po
View File

@ -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"

2
addons/mrp/i18n/zh_CN.po
View File

@ -2544,7 +2544,7 @@ msgstr ""
#~ msgid "Product & Location"
#~ msgstr "产品&库位"
#~ msgid "MRP & Logistic Scheduler"
#~ msgid "MRP & Logistics Scheduler"
#~ msgstr "MRP&物流调度"
#~ msgid ""

2
addons/mrp/i18n/zh_HK.po
View File

@ -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"

2
addons/mrp/i18n/zh_TW.po
View File

@ -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"

5
addons/mrp/mrp_demo.xml
View File

@ -2,6 +2,11 @@
<openerp>
<data noupdate="1">
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('group_mrp_user'))]" name="groups_id"/>
</record>
<!--
Resource: mrp.workcenter
-->

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

@ -9,7 +9,6 @@
<field name="name">Manufacturing / User</field>
</record>
<!-- restrict access to menu -->
<record model='ir.ui.menu' id="mrp_Sched_all">
<field eval="[(6,0,[ref('group_mrp_manager')])]" name="groups_id"/>

2
addons/procurement/company_view.xml
View File

@ -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 &amp; Logistic Scheduler" colspan="4"/>
<separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
<field name="schedule_range"/>
</page>
</field>

4
addons/procurement/i18n/en_US.po
View File

@ -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

2
addons/procurement/i18n/fr.po
View File

@ -324,7 +324,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
msgid "MRP & Logistic Scheduler"
msgid "MRP & Logistics Scheduler"
msgstr ""
#. module: procurement

2
addons/procurement/i18n/it.po
View File

@ -325,7 +325,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
msgid "MRP & Logistic Scheduler"
msgid "MRP & Logistics Scheduler"
msgstr ""
#. module: procurement

2
addons/procurement/i18n/mn.po
View File

@ -342,7 +342,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
msgid "MRP & Logistic Scheduler"
msgid "MRP & Logistics Scheduler"
msgstr "Үйлдвэрлэл & Логистик"
#. module: procurement

2
addons/procurement/i18n/nl.po
View File

@ -325,7 +325,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
msgid "MRP & Logistic Scheduler"
msgid "MRP & Logistics Scheduler"
msgstr ""
#. module: procurement

2
addons/procurement/i18n/pl.po
View File

@ -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

2
addons/procurement/i18n/procurement.pot
View File

@ -332,7 +332,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
msgid "MRP & Logistic Scheduler"
msgid "MRP & Logistics Scheduler"
msgstr ""
#. module: procurement

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

@ -342,7 +342,7 @@ msgstr ""
#. module: procurement
#: view:res.company:0
msgid "MRP & Logistic Scheduler"
msgid "MRP & Logistics Scheduler"
msgstr "ПМР и Логистическое планирование"
#. module: procurement

2
addons/procurement/procurement_view.xml
View File

@ -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"/>

5
addons/product/product_demo.xml
View File

@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
</record>
<!--
Resource: product.category
-->

2
addons/project/project_demo.xml
View File

@ -4,7 +4,7 @@
<!-- Users -->
<record id="base.user_demo" model="res.users">
<field name="groups_id" eval="[(4,ref('group_project_user'))]"/>
<field eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]" name="groups_id"/>
</record>
<record id="res_users_analyst" model="res.users">

1
addons/purchase/board_purchase_view.xml
View File

@ -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" />

4
addons/purchase/purchase_demo.xml
View File

@ -2,6 +2,10 @@
<openerp>
<data noupdate="1">
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('group_purchase_user'))]" name="groups_id"/>
</record>
<!--Resource: purchase.order-->
<record id="order_purchase1" model="purchase.order">

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

@ -9,7 +9,6 @@
<field name="name">Purchase / User</field>
</record>
<record model="ir.rule" id="purchase_order_comp_rule">
<field name="name">Purchase Order multi-company</field>
<field name="model_id" ref="model_purchase_order"/>

4
addons/purchase_requisition/purchase_requisition_demo.xml
View File

@ -2,6 +2,10 @@
<openerp>
<data noupdate="1">
<record id="base.user_demo" model="res.users">
<field eval="[(4, ref('group_purchase_requisition_user'))]" name="groups_id"/>
</record>
<!--Resource: purchase.requisition-->
<record id="order_purchase_requisition1" model="purchase.requisition">

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

@ -5,6 +5,7 @@
<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>

2
addons/sale/i18n/ar.po
View File

@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

4
addons/sale/i18n/bg.po
View File

@ -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"

4
addons/sale/i18n/bs.po
View File

@ -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"

4
addons/sale/i18n/ca.po
View File

@ -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 !"

2
addons/sale/i18n/cs.po
View File

@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

3
addons/sale/i18n/de.po
View File

@ -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"

6
addons/sale/i18n/el.po
View File

@ -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 ""

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

@ -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 !"

4
addons/sale/i18n/es_AR.po
View File

@ -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"

4
addons/sale/i18n/et.po
View File

@ -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"

4
addons/sale/i18n/fi.po
View File

@ -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."

4
addons/sale/i18n/fr.po
View File

@ -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"

4
addons/sale/i18n/hr.po
View File

@ -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"

2
addons/sale/i18n/hu.po
View File

@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

2
addons/sale/i18n/id.po
View File

@ -1458,7 +1458,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

4
addons/sale/i18n/it.po
View File

@ -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"

4
addons/sale/i18n/ko.po
View File

@ -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)"

4
addons/sale/i18n/lt.po
View File

@ -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"

2
addons/sale/i18n/lv.po
View File

@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

4
addons/sale/i18n/nl.po
View File

@ -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"

2
addons/sale/i18n/nl_BE.po
View File

@ -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

4
addons/sale/i18n/pl.po
View File

@ -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."

4
addons/sale/i18n/pt.po
View File

@ -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"

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

@ -1559,7 +1559,7 @@ msgstr "Vendas por Representante"
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr "Logistica"
#. module: sale

2
addons/sale/i18n/ro.po
View File

@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

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

@ -1528,7 +1528,7 @@ msgstr "Продажи по менеджеру продаж"
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr "Логистика"
#. module: sale

2
addons/sale/i18n/sale.pot
View File

@ -1406,7 +1406,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

2
addons/sale/i18n/sk.po
View File

@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

2
addons/sale/i18n/sl.po
View File

@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

2
addons/sale/i18n/sq.po
View File

@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

2
addons/sale/i18n/sr.po
View File

@ -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"

4
addons/sale/i18n/sv.po
View File

@ -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"

2
addons/sale/i18n/tlh.po
View File

@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

4
addons/sale/i18n/tr.po
View File

@ -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"

2
addons/sale/i18n/uk.po
View File

@ -1454,7 +1454,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

2
addons/sale/i18n/vi.po
View File

@ -1464,7 +1464,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

4
addons/sale/i18n/zh_CN.po
View File

@ -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"

2
addons/sale/i18n/zh_TW.po
View File

@ -1453,7 +1453,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Logistic"
msgid "Logistics"
msgstr ""
#. module: sale

4
addons/sale/sale_view.xml
View File

@ -217,7 +217,7 @@
</group>
</page>
<page string="Other Information">
<group colspan="2" col="2" groups="base.group_extended" name="logistic">
<group colspan="2" col="2" groups="base.group_extended" name="logistics">
<separator string="Logistic" colspan="2"/>
<field name="incoterm" widget="selection"/>
<field name="picking_policy" required="True"/>
@ -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>

7
addons/sale/stock.py
View File

@ -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)

2
addons/sale_mrp/__openerp__.py
View File

@ -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': [],

3
addons/sale_mrp/security/ir.model.access.csv Normal file
View File

@ -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
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_mrp_bom_user mrp.bom mrp.model_mrp_bom base.group_sale_salesman 1 0 0 0
3 access_mrp_bom_manager mrp.bom mrp.model_mrp_bom base.group_sale_manager 1 0 0 0

14
addons/sale_mrp/security/sale_mrp_security.xml Normal file
View File

@ -0,0 +1,14 @@
<?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>
</data>
</openerp>

1
addons/share/__openerp__.py
View File

@ -41,6 +41,7 @@
""",
'website': 'http://www.openerp.com',
'demo_xml': ['share_demo.xml'],
'data': [
'security/share_security.xml',
'share_view.xml',

Some files were not shown because too many files have changed in this diff Show More