From 05bee134f8588699f7f30da28406c38f83770e87 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 28 Oct 2010 12:45:48 +0530 Subject: [PATCH 01/11] Security Added in sale_mrp bzr revid: aag@tinyerp.co.in-20101028071548-so4ysxes4esg3m7j --- addons/sale_mrp/__openerp__.py | 2 ++ addons/sale_mrp/security/ir.model.access.csv | 3 +++ addons/sale_mrp/security/sale_mrp_security.xml | 15 +++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 addons/sale_mrp/security/ir.model.access.csv create mode 100644 addons/sale_mrp/security/sale_mrp_security.xml diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py index a8380dcb370..e9eb4cbba92 100644 --- a/addons/sale_mrp/__openerp__.py +++ b/addons/sale_mrp/__openerp__.py @@ -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': [], diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv new file mode 100644 index 00000000000..90ff5ac06e2 --- /dev/null +++ b/addons/sale_mrp/security/ir.model.access.csv @@ -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 diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml new file mode 100644 index 00000000000..71c817c0b76 --- /dev/null +++ b/addons/sale_mrp/security/sale_mrp_security.xml @@ -0,0 +1,15 @@ + + + + + + Sales / Manager + + + + Sales / User + + + + + From 300389eb939995cdae2fadfc295bcc0f70340f27 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 1 Nov 2010 12:43:41 +0530 Subject: [PATCH 02/11] [IMP] solve state button AssertionError bzr revid: aag@tinyerp.co.in-20101101071341-fza82dcbbgsi5ynk --- addons/marketing_campaign/report/campaign_analysis_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml index fd5a8c0908f..09ba411562a 100644 --- a/addons/marketing_campaign/report/campaign_analysis_view.xml +++ b/addons/marketing_campaign/report/campaign_analysis_view.xml @@ -11,6 +11,7 @@ + From 971b590f6dcc16a1add540c7c5263fcf756d9456 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 1 Nov 2010 17:49:45 +0530 Subject: [PATCH 03/11] [ADD]: Add Marketing/Manager user and change access of Marketing/User bzr revid: aag@tinyerp.co.in-20101101121945-afl2rs63vfop9d0h --- .../email_template_account_view.xml | 2 +- .../security/ir.model.access.csv | 3 +++ addons/marketing/marketing_view.xml | 2 +- .../marketing/security/marketing_security.xml | 5 ++++ .../security/ir.model.access.csv | 24 ++++++++++++------- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/addons/email_template/email_template_account_view.xml b/addons/email_template/email_template_account_view.xml index 97108cb9e33..a372e5fb443 100644 --- a/addons/email_template/email_template_account_view.xml +++ b/addons/email_template/email_template_account_view.xml @@ -3,7 +3,7 @@ + groups="marketing.group_marketing_user,marketing.group_marketing_manager"/> diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv index 79135b0de4d..17859d6bb9d 100644 --- a/addons/email_template/security/ir.model.access.csv +++ b/addons/email_template/security/ir.model.access.csv @@ -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 diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 69ee91d52dc..8b804487e77 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -2,7 +2,7 @@ - + marketing.installer.view diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml index 740b9b3a2c5..06cf40772f4 100644 --- a/addons/marketing/security/marketing_security.xml +++ b/addons/marketing/security/marketing_security.xml @@ -4,5 +4,10 @@ Marketing / User + + + Marketing / Manager + + diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv index 082cafd7054..c2b7b4f4c86 100644 --- a/addons/marketing_campaign/security/ir.model.access.csv +++ b/addons/marketing_campaign/security/ir.model.access.csv @@ -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 From 3284fe1f4a73646c769b7dac8fb7fbbdeb1b02a6 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 2 Nov 2010 12:50:19 +0530 Subject: [PATCH 04/11] [IMP]client close when account is not Approved is improved bzr revid: aag@tinyerp.co.in-20101102072019-k7o1mhgss3oda9jg --- addons/email_template/email_template_account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py index 24b7958276d..ec8d6446603 100644 --- a/addons/email_template/email_template_account.py +++ b/addons/email_template/email_template_account.py @@ -372,7 +372,7 @@ unless it is already specified in the From Email, e.g: John Doe ", 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): """ From 1c2082d46fad7dcc7e1fc51c639b27f7e26ecf57 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Wed, 3 Nov 2010 15:58:20 +0530 Subject: [PATCH 05/11] [FIX] In All: Logistic converted to Logistics lp bug: https://launchpad.net/bugs/665052 fixed bzr revid: aag@tinyerp.co.in-20101103102820-gpysva2mqgwve3kl --- addons/delivery/delivery_view.xml | 2 +- addons/mrp/i18n/ca.po | 2 +- addons/mrp/i18n/de.po | 2 +- addons/mrp/i18n/el.po | 2 +- addons/mrp/i18n/es.po | 2 +- addons/mrp/i18n/fi.po | 2 +- addons/mrp/i18n/it.po | 2 +- addons/mrp/i18n/ko.po | 2 +- addons/mrp/i18n/nl.po | 2 +- addons/mrp/i18n/pl.po | 2 +- addons/mrp/i18n/pt.po | 2 +- addons/mrp/i18n/ru.po | 2 +- addons/mrp/i18n/sk.po | 2 +- addons/mrp/i18n/tr.po | 2 +- addons/mrp/i18n/zh_CN.po | 2 +- addons/mrp/i18n/zh_HK.po | 2 +- addons/mrp/i18n/zh_TW.po | 2 +- addons/procurement/company_view.xml | 2 +- addons/procurement/i18n/de.po | 2 +- addons/procurement/i18n/en_US.po | 4 ++-- addons/procurement/i18n/fr.po | 2 +- addons/procurement/i18n/it.po | 2 +- addons/procurement/i18n/mn.po | 2 +- addons/procurement/i18n/nl.po | 2 +- addons/procurement/i18n/pl.po | 2 +- addons/procurement/i18n/procurement.pot | 2 +- addons/procurement/i18n/ru.po | 2 +- addons/sale/i18n/ar.po | 2 +- addons/sale/i18n/bg.po | 4 ++-- addons/sale/i18n/bs.po | 4 ++-- addons/sale/i18n/ca.po | 4 ++-- addons/sale/i18n/cs.po | 2 +- addons/sale/i18n/de.po | 4 ++-- addons/sale/i18n/el.po | 6 +++--- addons/sale/i18n/es.po | 4 ++-- addons/sale/i18n/es_AR.po | 4 ++-- addons/sale/i18n/es_EC.po | 2 +- addons/sale/i18n/et.po | 4 ++-- addons/sale/i18n/fi.po | 4 ++-- addons/sale/i18n/fr.po | 4 ++-- addons/sale/i18n/hr.po | 4 ++-- addons/sale/i18n/hu.po | 2 +- addons/sale/i18n/id.po | 2 +- addons/sale/i18n/it.po | 4 ++-- addons/sale/i18n/ko.po | 4 ++-- addons/sale/i18n/lt.po | 4 ++-- addons/sale/i18n/lv.po | 2 +- addons/sale/i18n/mn.po | 4 ++-- addons/sale/i18n/nl.po | 4 ++-- addons/sale/i18n/nl_BE.po | 2 +- addons/sale/i18n/pl.po | 4 ++-- addons/sale/i18n/pt.po | 4 ++-- addons/sale/i18n/pt_BR.po | 2 +- addons/sale/i18n/ro.po | 2 +- addons/sale/i18n/ru.po | 2 +- addons/sale/i18n/sale.pot | 2 +- addons/sale/i18n/sk.po | 2 +- addons/sale/i18n/sl.po | 2 +- addons/sale/i18n/sq.po | 2 +- addons/sale/i18n/sr.po | 4 ++-- addons/sale/i18n/sv.po | 4 ++-- addons/sale/i18n/tlh.po | 2 +- addons/sale/i18n/tr.po | 4 ++-- addons/sale/i18n/uk.po | 2 +- addons/sale/i18n/vi.po | 2 +- addons/sale/i18n/zh_CN.po | 4 ++-- addons/sale/i18n/zh_TW.po | 2 +- addons/sale/sale_view.xml | 6 +++--- addons/stock_location/i18n/ar.po | 2 +- addons/stock_location/i18n/bg.po | 2 +- addons/stock_location/i18n/bs.po | 2 +- addons/stock_location/i18n/ca.po | 2 +- addons/stock_location/i18n/cs.po | 2 +- addons/stock_location/i18n/de.po | 2 +- addons/stock_location/i18n/el.po | 2 +- addons/stock_location/i18n/es.po | 2 +- addons/stock_location/i18n/es_AR.po | 2 +- addons/stock_location/i18n/et.po | 2 +- addons/stock_location/i18n/fr.po | 2 +- addons/stock_location/i18n/hr.po | 2 +- addons/stock_location/i18n/hu.po | 2 +- addons/stock_location/i18n/id.po | 2 +- addons/stock_location/i18n/it.po | 2 +- addons/stock_location/i18n/ko.po | 2 +- addons/stock_location/i18n/lt.po | 2 +- addons/stock_location/i18n/mn.po | 2 +- addons/stock_location/i18n/nl.po | 2 +- addons/stock_location/i18n/nl_BE.po | 2 +- addons/stock_location/i18n/pl.po | 2 +- addons/stock_location/i18n/pt.po | 2 +- addons/stock_location/i18n/pt_BR.po | 2 +- addons/stock_location/i18n/ro.po | 2 +- addons/stock_location/i18n/ru.po | 2 +- addons/stock_location/i18n/sl.po | 2 +- addons/stock_location/i18n/sq.po | 2 +- addons/stock_location/i18n/stock_location.pot | 2 +- addons/stock_location/i18n/sv.po | 2 +- addons/stock_location/i18n/tlh.po | 2 +- addons/stock_location/i18n/tr.po | 2 +- addons/stock_location/i18n/uk.po | 2 +- addons/stock_location/i18n/vi.po | 2 +- addons/stock_location/i18n/zh_CN.po | 2 +- addons/stock_location/i18n/zh_TW.po | 2 +- addons/stock_location/stock_location_view.xml | 2 +- 104 files changed, 130 insertions(+), 130 deletions(-) diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index b7ec0fed61e..d557f2c0750 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -128,7 +128,7 @@ sale.order - + diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po index d0f2e64988c..ca586185708 100644 --- a/addons/mrp/i18n/ca.po +++ b/addons/mrp/i18n/ca.po @@ -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 "" diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po index 13a95a3f4b2..02aa1967ec1 100644 --- a/addons/mrp/i18n/de.po +++ b/addons/mrp/i18n/de.po @@ -2288,7 +2288,7 @@ msgstr "" #~ msgid "Product & Location" #~ msgstr "Produkt & Lagerort" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "Fertigungs- und Beschaffungsplanung" #~ msgid "" diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po index 5c7ca68f453..0308547af2a 100644 --- a/addons/mrp/i18n/el.po +++ b/addons/mrp/i18n/el.po @@ -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 "" diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po index 3d464703033..04f0d069596 100644 --- a/addons/mrp/i18n/es.po +++ b/addons/mrp/i18n/es.po @@ -2279,7 +2279,7 @@ msgstr "" #~ msgid "Product & Location" #~ msgstr "Producto & Ubicación" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "Planificador MRP & Logística" #~ msgid "" diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po index 0cb3e26f332..a41a1571a61 100644 --- a/addons/mrp/i18n/fi.po +++ b/addons/mrp/i18n/fi.po @@ -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." diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po index 56545de28d3..a9c38d15a38 100644 --- a/addons/mrp/i18n/it.po +++ b/addons/mrp/i18n/it.po @@ -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" diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po index ed5a3b7c0af..22f851c1de6 100644 --- a/addons/mrp/i18n/ko.po +++ b/addons/mrp/i18n/ko.po @@ -2246,7 +2246,7 @@ msgstr "" #~ msgid "Product name" #~ msgstr "제품 이름" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP 및 물류 스케줄러" #~ msgid "Ask New Products" diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po index 202d9117369..aeb0547ec47 100644 --- a/addons/mrp/i18n/nl.po +++ b/addons/mrp/i18n/nl.po @@ -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" diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po index 1bdef26de4b..1d61c038bad 100644 --- a/addons/mrp/i18n/pl.po +++ b/addons/mrp/i18n/pl.po @@ -2260,7 +2260,7 @@ msgstr "" #~ msgid "Origin" #~ msgstr "Pochodzenie" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP i planowanie logistyczne" #~ msgid "Product & Location" diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po index 38ab051f51b..dcb5807136a 100644 --- a/addons/mrp/i18n/pt.po +++ b/addons/mrp/i18n/pt.po @@ -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" diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po index 173247f5102..b2f867c6fac 100644 --- a/addons/mrp/i18n/ru.po +++ b/addons/mrp/i18n/ru.po @@ -2400,7 +2400,7 @@ msgstr "" #~ msgid "Exceptions Procurements" #~ msgstr "Исключения поставок" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "ПМР и Логистическое планирование" #~ msgid "Stockable Stock" diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po index d72ee6b54d0..2715a919654 100644 --- a/addons/mrp/i18n/sk.po +++ b/addons/mrp/i18n/sk.po @@ -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" diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po index 6c34a3b860d..54a7b5e374d 100644 --- a/addons/mrp/i18n/tr.po +++ b/addons/mrp/i18n/tr.po @@ -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" diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po index ce6a25897a9..f44485efd32 100644 --- a/addons/mrp/i18n/zh_CN.po +++ b/addons/mrp/i18n/zh_CN.po @@ -2544,7 +2544,7 @@ msgstr "" #~ msgid "Product & Location" #~ msgstr "产品&库位" -#~ msgid "MRP & Logistic Scheduler" +#~ msgid "MRP & Logistics Scheduler" #~ msgstr "MRP&物流调度" #~ msgid "" diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po index a96126ab8db..5160246f0b4 100644 --- a/addons/mrp/i18n/zh_HK.po +++ b/addons/mrp/i18n/zh_HK.po @@ -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" diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po index 15c4a447108..a1e6e66c1de 100644 --- a/addons/mrp/i18n/zh_TW.po +++ b/addons/mrp/i18n/zh_TW.po @@ -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" diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml index e046fd4faee..4d14f69edde 100644 --- a/addons/procurement/company_view.xml +++ b/addons/procurement/company_view.xml @@ -10,7 +10,7 @@ - + diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po index 2978842b796..b71cf4d2cee 100644 --- a/addons/procurement/i18n/de.po +++ b/addons/procurement/i18n/de.po @@ -325,7 +325,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/en_US.po b/addons/procurement/i18n/en_US.po index 61b250516dd..249709f42cf 100644 --- a/addons/procurement/i18n/en_US.po +++ b/addons/procurement/i18n/en_US.po @@ -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 diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po index 1cd6975c4f5..441527c6ce6 100644 --- a/addons/procurement/i18n/fr.po +++ b/addons/procurement/i18n/fr.po @@ -324,7 +324,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po index a9e09d5abde..83922e0b663 100644 --- a/addons/procurement/i18n/it.po +++ b/addons/procurement/i18n/it.po @@ -325,7 +325,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po index 0fd557774c7..72aa146cd7e 100644 --- a/addons/procurement/i18n/mn.po +++ b/addons/procurement/i18n/mn.po @@ -342,7 +342,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "Үйлдвэрлэл & Логистик" #. module: procurement diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po index 978d027fb94..b426a7aa414 100644 --- a/addons/procurement/i18n/nl.po +++ b/addons/procurement/i18n/nl.po @@ -325,7 +325,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po index edf783bd6c4..737298169f3 100644 --- a/addons/procurement/i18n/pl.po +++ b/addons/procurement/i18n/pl.po @@ -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 diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot index 27c61cc23c2..b0508cc87a2 100644 --- a/addons/procurement/i18n/procurement.pot +++ b/addons/procurement/i18n/procurement.pot @@ -312,7 +312,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "" #. module: procurement diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po index 3dab25cb2f6..ba77a1e4b57 100644 --- a/addons/procurement/i18n/ru.po +++ b/addons/procurement/i18n/ru.po @@ -342,7 +342,7 @@ msgstr "" #. module: procurement #: view:res.company:0 -msgid "MRP & Logistic Scheduler" +msgid "MRP & Logistics Scheduler" msgstr "ПМР и Логистическое планирование" #. module: procurement diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po index de033e1a379..c61b42d7501 100644 --- a/addons/sale/i18n/ar.po +++ b/addons/sale/i18n/ar.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po index 469e72f6b8e..cf82dd2f508 100644 --- a/addons/sale/i18n/bg.po +++ b/addons/sale/i18n/bg.po @@ -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" diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po index c65a9e3e0cd..c121e6dfc39 100644 --- a/addons/sale/i18n/bs.po +++ b/addons/sale/i18n/bs.po @@ -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" diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po index 497996e82ba..1303d15c48e 100644 --- a/addons/sale/i18n/ca.po +++ b/addons/sale/i18n/ca.po @@ -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 !" diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po index 47f616f52da..c84a67d748b 100644 --- a/addons/sale/i18n/cs.po +++ b/addons/sale/i18n/cs.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po index a19fc0bfbc3..977857dbb0a 100644 --- a/addons/sale/i18n/de.po +++ b/addons/sale/i18n/de.po @@ -1460,7 +1460,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2177,7 +2177,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" diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po index de4f7327659..c3b4fca57b7 100644 --- a/addons/sale/i18n/el.po +++ b/addons/sale/i18n/el.po @@ -1464,7 +1464,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2344,8 +2344,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 "" diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po index 88ae200a5da..b5c574a802e 100644 --- a/addons/sale/i18n/es.po +++ b/addons/sale/i18n/es.po @@ -1464,7 +1464,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2036,7 +2036,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 !" diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po index 0c847f65824..9bb7c8b758c 100644 --- a/addons/sale/i18n/es_AR.po +++ b/addons/sale/i18n/es_AR.po @@ -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" diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po index b0067b49a6d..745eaa3cb15 100644 --- a/addons/sale/i18n/es_EC.po +++ b/addons/sale/i18n/es_EC.po @@ -1460,7 +1460,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po index 771d2773c54..fe91c762189 100644 --- a/addons/sale/i18n/et.po +++ b/addons/sale/i18n/et.po @@ -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" diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po index d5867287896..d2c463e1d6c 100644 --- a/addons/sale/i18n/fi.po +++ b/addons/sale/i18n/fi.po @@ -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." diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po index 4b92ec317e9..a98f4329401 100644 --- a/addons/sale/i18n/fr.po +++ b/addons/sale/i18n/fr.po @@ -1471,7 +1471,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2076,7 +2076,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" diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po index 6a521c55975..a0e3c69fba7 100644 --- a/addons/sale/i18n/hr.po +++ b/addons/sale/i18n/hr.po @@ -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" diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po index 2c3b328219c..7f2bca798d8 100644 --- a/addons/sale/i18n/hu.po +++ b/addons/sale/i18n/hu.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po index eb66cb0bf91..db2832bdd81 100644 --- a/addons/sale/i18n/id.po +++ b/addons/sale/i18n/id.po @@ -1458,7 +1458,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po index 40e9450ca72..e945ee8f195 100644 --- a/addons/sale/i18n/it.po +++ b/addons/sale/i18n/it.po @@ -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" diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po index daa426d1cf4..37bd9b4d242 100644 --- a/addons/sale/i18n/ko.po +++ b/addons/sale/i18n/ko.po @@ -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)" diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po index 35180aaeb1d..a044f016e62 100644 --- a/addons/sale/i18n/lt.po +++ b/addons/sale/i18n/lt.po @@ -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" diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po index b72e429313d..e92aa05e425 100644 --- a/addons/sale/i18n/lv.po +++ b/addons/sale/i18n/lv.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po index 07bb9e7a3ba..64b4a4fa49c 100644 --- a/addons/sale/i18n/mn.po +++ b/addons/sale/i18n/mn.po @@ -1473,7 +1473,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2316,7 +2316,7 @@ msgstr "" #~ msgid "One procurement for each product." #~ msgstr "Бүтээгдэхүүн бүр дээр нэг татан авалт" -#~ msgid "Configure Sale Order Logistic" +#~ msgid "Configure Sale Order Logistics" #~ msgstr "Борлуулалтын захиалгын Ложистик тохиргоо" #~ msgid "Sales order lines" diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po index da7086887fc..32539b346d8 100644 --- a/addons/sale/i18n/nl.po +++ b/addons/sale/i18n/nl.po @@ -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" diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po index d609b1b857e..6ed2db9718e 100644 --- a/addons/sale/i18n/nl_BE.po +++ b/addons/sale/i18n/nl_BE.po @@ -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 diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po index 949545153ec..8e6d0960657 100644 --- a/addons/sale/i18n/pl.po +++ b/addons/sale/i18n/pl.po @@ -1460,7 +1460,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2098,7 +2098,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." diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po index 8f1f7b132f8..2d6e3d27de6 100644 --- a/addons/sale/i18n/pt.po +++ b/addons/sale/i18n/pt.po @@ -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" diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po index 844f8081f02..82ea85b0488 100644 --- a/addons/sale/i18n/pt_BR.po +++ b/addons/sale/i18n/pt_BR.po @@ -1466,7 +1466,7 @@ msgstr "Vendas por Representante" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "Logistica" #. module: sale diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po index 755529d8146..dd68a487a4e 100644 --- a/addons/sale/i18n/ro.po +++ b/addons/sale/i18n/ro.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po index 46b68f13499..1873236086a 100644 --- a/addons/sale/i18n/ru.po +++ b/addons/sale/i18n/ru.po @@ -1528,7 +1528,7 @@ msgstr "Продажи по менеджеру продаж" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "Логистика" #. module: sale diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot index 492265144f0..61a0bb301be 100644 --- a/addons/sale/i18n/sale.pot +++ b/addons/sale/i18n/sale.pot @@ -1387,7 +1387,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po index 759f08e932a..6d460268901 100644 --- a/addons/sale/i18n/sk.po +++ b/addons/sale/i18n/sk.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po index 15f81f76eee..e93421dc470 100644 --- a/addons/sale/i18n/sl.po +++ b/addons/sale/i18n/sl.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po index a677946c53e..1e67a58edfe 100644 --- a/addons/sale/i18n/sq.po +++ b/addons/sale/i18n/sq.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po index 790a25c9606..c51fb8f82a2 100644 --- a/addons/sale/i18n/sr.po +++ b/addons/sale/i18n/sr.po @@ -1462,7 +1462,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale @@ -2214,7 +2214,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" diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po index c4651c9030c..19c99c2e46c 100644 --- a/addons/sale/i18n/sv.po +++ b/addons/sale/i18n/sv.po @@ -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" diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po index 91409bfe880..0917dc6147f 100644 --- a/addons/sale/i18n/tlh.po +++ b/addons/sale/i18n/tlh.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po index 0f19f853131..a4aad4e217b 100644 --- a/addons/sale/i18n/tr.po +++ b/addons/sale/i18n/tr.po @@ -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" diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po index 4c3f124421e..1ae4fb3fd2a 100644 --- a/addons/sale/i18n/uk.po +++ b/addons/sale/i18n/uk.po @@ -1454,7 +1454,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po index 23136063d35..c272c028a19 100644 --- a/addons/sale/i18n/vi.po +++ b/addons/sale/i18n/vi.po @@ -1456,7 +1456,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po index 08519599ba4..514c8c3ece9 100644 --- a/addons/sale/i18n/zh_CN.po +++ b/addons/sale/i18n/zh_CN.po @@ -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" diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po index 46046d713af..4c600190c3d 100644 --- a/addons/sale/i18n/zh_TW.po +++ b/addons/sale/i18n/zh_TW.po @@ -1453,7 +1453,7 @@ msgstr "" #. module: sale #: view:sale.order:0 -msgid "Logistic" +msgid "Logistics" msgstr "" #. module: sale diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 5c3690504c2..e9aa1de470a 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -219,8 +219,8 @@ - - + + @@ -541,7 +541,7 @@ Sales Application Configuration - Configure Sales Order Logistic + Configure Sales Order Logistics Setup your sales workflow and default values. diff --git a/addons/stock_location/i18n/ar.po b/addons/stock_location/i18n/ar.po index 14ac0cec775..15698f0a426 100644 --- a/addons/stock_location/i18n/ar.po +++ b/addons/stock_location/i18n/ar.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/bg.po b/addons/stock_location/i18n/bg.po index 15c8281003d..6ec712b3543 100644 --- a/addons/stock_location/i18n/bg.po +++ b/addons/stock_location/i18n/bg.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/bs.po b/addons/stock_location/i18n/bs.po index d0af6268488..367c11ed5a8 100644 --- a/addons/stock_location/i18n/bs.po +++ b/addons/stock_location/i18n/bs.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po index d94921bda61..52ca8cb951f 100644 --- a/addons/stock_location/i18n/ca.po +++ b/addons/stock_location/i18n/ca.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po index 73b5d31b105..81ee1068653 100644 --- a/addons/stock_location/i18n/cs.po +++ b/addons/stock_location/i18n/cs.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po index 313b5d6097c..bb7af0149f1 100644 --- a/addons/stock_location/i18n/de.po +++ b/addons/stock_location/i18n/de.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po index 114381592f7..b1d01d5094c 100644 --- a/addons/stock_location/i18n/el.po +++ b/addons/stock_location/i18n/el.po @@ -32,7 +32,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po index 23ec5602b6d..453995fae56 100644 --- a/addons/stock_location/i18n/es.po +++ b/addons/stock_location/i18n/es.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po index c5d219a9823..860b97ff6ae 100644 --- a/addons/stock_location/i18n/es_AR.po +++ b/addons/stock_location/i18n/es_AR.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po index 5e68ccc2368..3828b0588ba 100644 --- a/addons/stock_location/i18n/et.po +++ b/addons/stock_location/i18n/et.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po index acb531a5549..dbe0d998994 100644 --- a/addons/stock_location/i18n/fr.po +++ b/addons/stock_location/i18n/fr.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/hr.po b/addons/stock_location/i18n/hr.po index 9e6e18715b2..9a67e1fe2fb 100644 --- a/addons/stock_location/i18n/hr.po +++ b/addons/stock_location/i18n/hr.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po index 83b3624675d..c48382d3f8a 100644 --- a/addons/stock_location/i18n/hu.po +++ b/addons/stock_location/i18n/hu.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/id.po b/addons/stock_location/i18n/id.po index 3888e97469a..30ea2eaf696 100644 --- a/addons/stock_location/i18n/id.po +++ b/addons/stock_location/i18n/id.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po index 3c138fc8622..ead3d8468ee 100644 --- a/addons/stock_location/i18n/it.po +++ b/addons/stock_location/i18n/it.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po index 64a5936c3a6..c98327842df 100644 --- a/addons/stock_location/i18n/ko.po +++ b/addons/stock_location/i18n/ko.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po index e1eaa398c2c..7761ac5fb80 100644 --- a/addons/stock_location/i18n/lt.po +++ b/addons/stock_location/i18n/lt.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/mn.po b/addons/stock_location/i18n/mn.po index aa677c23cd8..a6b2c29c243 100644 --- a/addons/stock_location/i18n/mn.po +++ b/addons/stock_location/i18n/mn.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/nl.po b/addons/stock_location/i18n/nl.po index 6ddc0f1b92d..d5da8405080 100644 --- a/addons/stock_location/i18n/nl.po +++ b/addons/stock_location/i18n/nl.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po index 401207e5cae..3c0dcd42c34 100644 --- a/addons/stock_location/i18n/nl_BE.po +++ b/addons/stock_location/i18n/nl_BE.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po index 0ee1d85550c..dd1d98a7e07 100644 --- a/addons/stock_location/i18n/pl.po +++ b/addons/stock_location/i18n/pl.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po index cdc303372d4..2eee9cb5b4a 100644 --- a/addons/stock_location/i18n/pt.po +++ b/addons/stock_location/i18n/pt.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po index 1f6ae3bd5b4..ffa9708416d 100644 --- a/addons/stock_location/i18n/pt_BR.po +++ b/addons/stock_location/i18n/pt_BR.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po index e45ec906169..402edbad361 100644 --- a/addons/stock_location/i18n/ro.po +++ b/addons/stock_location/i18n/ro.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po index 38709513ee1..2c2aa9d2a4f 100644 --- a/addons/stock_location/i18n/ru.po +++ b/addons/stock_location/i18n/ru.po @@ -29,7 +29,7 @@ msgstr "Входящие пути" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "Товарно-транспортный поток" #. module: stock_location diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po index a0de701f1b4..3c480360a69 100644 --- a/addons/stock_location/i18n/sl.po +++ b/addons/stock_location/i18n/sl.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/sq.po b/addons/stock_location/i18n/sq.po index 511a0d9333f..bb3d33c55e9 100644 --- a/addons/stock_location/i18n/sq.po +++ b/addons/stock_location/i18n/sq.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot index 503dadc84b8..634e2098084 100644 --- a/addons/stock_location/i18n/stock_location.pot +++ b/addons/stock_location/i18n/stock_location.pot @@ -28,7 +28,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/sv.po b/addons/stock_location/i18n/sv.po index 62f737a30d5..5bd2f34576d 100644 --- a/addons/stock_location/i18n/sv.po +++ b/addons/stock_location/i18n/sv.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/tlh.po b/addons/stock_location/i18n/tlh.po index bc570c3c26f..aeddaabb045 100644 --- a/addons/stock_location/i18n/tlh.po +++ b/addons/stock_location/i18n/tlh.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po index 508a5b7cbb0..24073d880f5 100644 --- a/addons/stock_location/i18n/tr.po +++ b/addons/stock_location/i18n/tr.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po index 20ecf89146e..72391f54656 100644 --- a/addons/stock_location/i18n/uk.po +++ b/addons/stock_location/i18n/uk.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/vi.po b/addons/stock_location/i18n/vi.po index 69a82695333..f43399b2b34 100644 --- a/addons/stock_location/i18n/vi.po +++ b/addons/stock_location/i18n/vi.po @@ -30,7 +30,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po index 8b14a486d95..c721db268a7 100644 --- a/addons/stock_location/i18n/zh_CN.po +++ b/addons/stock_location/i18n/zh_CN.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po index 9369bea9bfb..f04da49edd0 100644 --- a/addons/stock_location/i18n/zh_TW.po +++ b/addons/stock_location/i18n/zh_TW.po @@ -29,7 +29,7 @@ msgstr "" #. module: stock_location #: view:product.product:0 -msgid "Logistic Flow" +msgid "Logistics Flow" msgstr "" #. module: stock_location diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml index 3d08d48034e..24816e9fa1c 100644 --- a/addons/stock_location/stock_location_view.xml +++ b/addons/stock_location/stock_location_view.xml @@ -40,7 +40,7 @@ - + From c513041a32c6d98539358ee3f840a0570df3b285 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 4 Nov 2010 15:40:19 +0530 Subject: [PATCH 06/11] [FIX] SALE: invoice from packing wrong price/unit if product has uos lp bug: https://launchpad.net/bugs/668378 fixed bzr revid: aag@tinyerp.co.in-20101104101019-c219duu0021gjs4h --- addons/sale/stock.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/sale/stock.py b/addons/sale/stock.py index f9e0c38494b..c020389ba19 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -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) From eeaa68471d8d36ae37335d78fc0ccc128aec4dcd Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Thu, 11 Nov 2010 18:48:55 +0530 Subject: [PATCH 07/11] [IMP] IN ALL: the demo user should be in all applications name user groups, Task id: 1771 bzr revid: aag@tinyerp.co.in-20101111131855-v07piwfyp33wlmng --- addons/auction/security/auction_security.xml | 3 +++ addons/base_contact/security/base_contact_security.xml | 5 +++++ addons/board/security/board_security.xml | 4 ++++ addons/crm/security/crm_security.xml | 4 ++++ addons/document/security/document_security.xml | 4 ++++ addons/event/security/event_security.xml | 6 +++++- addons/hr/security/hr_security.xml | 4 ++++ addons/idea/security/idea_security.xml | 5 +++++ addons/knowledge/security/knowledge_security.xml | 4 ++++ addons/lunch/security/lunch_security.xml | 4 ++++ addons/marketing/security/marketing_security.xml | 5 +++++ addons/mrp/security/mrp_security.xml | 9 +++++++++ addons/point_of_sale/security/point_of_sale_security.xml | 4 ++++ addons/product/security/product_security.xml | 4 ++++ addons/project/security/project_security.xml | 4 ++++ addons/purchase/security/purchase_security.xml | 7 +++++++ addons/purchase_requisition/security/purchase_tender.xml | 5 +++++ addons/sale/security/sale_security.xml | 4 ++++ addons/sale_mrp/security/sale_mrp_security.xml | 3 +++ addons/share/security/share_security.xml | 5 +++++ addons/stock/security/stock_security.xml | 4 ++++ addons/subscription/security/subcription_security.xml | 4 ++++ addons/survey/security/survey_security.xml | 4 ++++ addons/wiki/security/wiki_security.xml | 4 ++++ 24 files changed, 108 insertions(+), 1 deletion(-) diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml index 32fdf0d64f3..7bf5901f5f0 100644 --- a/addons/auction/security/auction_security.xml +++ b/addons/auction/security/auction_security.xml @@ -8,6 +8,9 @@ Auction / User + + + \ No newline at end of file diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml index 72b692ca372..fba04ea8a13 100644 --- a/addons/base_contact/security/base_contact_security.xml +++ b/addons/base_contact/security/base_contact_security.xml @@ -5,9 +5,14 @@ Sales / User + + + + Sales / Manager + diff --git a/addons/board/security/board_security.xml b/addons/board/security/board_security.xml index ee544e098cc..a4c5b86bbd3 100644 --- a/addons/board/security/board_security.xml +++ b/addons/board/security/board_security.xml @@ -5,6 +5,10 @@ Sales / User + + + + diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml index 1e25ecb5bdd..7368423d509 100644 --- a/addons/crm/security/crm_security.xml +++ b/addons/crm/security/crm_security.xml @@ -9,6 +9,10 @@ Sales / User + + + + Sales / User - See All Leads diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml index 2bf1a2adb57..be6e94f21df 100644 --- a/addons/document/security/document_security.xml +++ b/addons/document/security/document_security.xml @@ -5,6 +5,10 @@ Knowledge / User + + + + diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml index 4415b11a8e4..1463138fa25 100644 --- a/addons/event/security/event_security.xml +++ b/addons/event/security/event_security.xml @@ -17,7 +17,11 @@ Sales / User - + + + + + diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index 4f7691f03e9..53ac31cba93 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -9,6 +9,10 @@ Human Resources / User + + + + diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml index 4b060c51e6c..758997060e1 100644 --- a/addons/idea/security/idea_security.xml +++ b/addons/idea/security/idea_security.xml @@ -8,6 +8,11 @@ Tools / User + + + + + diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml index b4c7bb99c1b..94ef433f7e0 100644 --- a/addons/knowledge/security/knowledge_security.xml +++ b/addons/knowledge/security/knowledge_security.xml @@ -8,6 +8,10 @@ Knowledge / User + + + + diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml index 0014f38182b..94e1cd7a358 100644 --- a/addons/lunch/security/lunch_security.xml +++ b/addons/lunch/security/lunch_security.xml @@ -8,6 +8,10 @@ Tools / User + + + + diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml index 06cf40772f4..5f85adc603a 100644 --- a/addons/marketing/security/marketing_security.xml +++ b/addons/marketing/security/marketing_security.xml @@ -5,6 +5,11 @@ Marketing / User + + + + + Marketing / Manager diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml index b105e1cbb8a..a06aebf2ef4 100644 --- a/addons/mrp/security/mrp_security.xml +++ b/addons/mrp/security/mrp_security.xml @@ -8,6 +8,15 @@ Manufacturing / User + + + + + + + + + diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml index d70fd1caa85..64de2e4ec17 100644 --- a/addons/point_of_sale/security/point_of_sale_security.xml +++ b/addons/point_of_sale/security/point_of_sale_security.xml @@ -8,6 +8,10 @@ Point of Sale / User + + + + diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml index 32399358f68..532498ad966 100644 --- a/addons/product/security/product_security.xml +++ b/addons/product/security/product_security.xml @@ -15,6 +15,10 @@ Sales / User + + + + Product multi-company diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index bf3b8c07998..2b94024b073 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -13,6 +13,10 @@ Sales / User + + + + diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml index 1848e9a7c61..13adc9bacd0 100644 --- a/addons/purchase/security/purchase_security.xml +++ b/addons/purchase/security/purchase_security.xml @@ -8,7 +8,14 @@ Purchase / User + + + + + + + Purchase Order multi-company diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml index 9ccab8fdbb9..22c91d191cc 100644 --- a/addons/purchase_requisition/security/purchase_tender.xml +++ b/addons/purchase_requisition/security/purchase_tender.xml @@ -5,9 +5,14 @@ Purchase Requisition / Manager + Purchase Requisition / User + + + + Purchase Requisition multi-company diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 27852979773..4086985e099 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -9,6 +9,10 @@ Sales / User + + + + diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml index 71c817c0b76..c8548e6a4e1 100644 --- a/addons/sale_mrp/security/sale_mrp_security.xml +++ b/addons/sale_mrp/security/sale_mrp_security.xml @@ -10,6 +10,9 @@ Sales / User + + + diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml index 0b2e8c4c1fd..1e98c40ab3b 100644 --- a/addons/share/security/share_security.xml +++ b/addons/share/security/share_security.xml @@ -4,5 +4,10 @@ Sharing / User + + + + + diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index 717486413c6..285c82532b8 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -9,6 +9,10 @@ Warehouse / User + + + + diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml index 0014f38182b..ec38d1e10ec 100644 --- a/addons/subscription/security/subcription_security.xml +++ b/addons/subscription/security/subcription_security.xml @@ -8,6 +8,10 @@ Tools / User + + + + diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml index 1506fdaec1b..cf465368546 100644 --- a/addons/survey/security/survey_security.xml +++ b/addons/survey/security/survey_security.xml @@ -14,6 +14,10 @@ Survey / User + + + + diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml index 934d7a607ee..b9c7af52ccd 100644 --- a/addons/wiki/security/wiki_security.xml +++ b/addons/wiki/security/wiki_security.xml @@ -12,5 +12,9 @@ Knowledge / User + + + + From b8863993e1e0b71ed061db6689eebf499dc171fc Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 15 Nov 2010 12:38:04 +0530 Subject: [PATCH 08/11] [IMP] procrument,purchase,stock4 : purhcase improvments : Task id:1774 bzr revid: aag@tinyerp.co.in-20101115070804-hmmd0zvuvmwpjs38 --- .../board_mrp_procurement_view.xml | 2 +- addons/purchase/board_purchase_view.xml | 42 ------------------- addons/stock/stock.py | 2 +- 3 files changed, 2 insertions(+), 44 deletions(-) diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml index 3b18a876f4f..20cc83193a8 100644 --- a/addons/procurement/board_mrp_procurement_view.xml +++ b/addons/procurement/board_mrp_procurement_view.xml @@ -17,7 +17,7 @@ form - + diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml index 475873a138e..060382053e2 100644 --- a/addons/purchase/board_purchase_view.xml +++ b/addons/purchase/board_purchase_view.xml @@ -70,47 +70,6 @@ - - negotiation.by.supplier.tree - purchase.report - tree - - - - - - - - - negotiation.by.supplier.graph - purchase.report - graph - - - - - - - - - Negotiation by Supplier - purchase.report - form - graph,tree - - - - - tree - - - - - - graph - - - board.purchase.form @@ -129,7 +88,6 @@ - - + From 225d6bb85a620acff121920c6abea53da2f269e4 Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Mon, 15 Nov 2010 18:11:14 +0530 Subject: [PATCH 10/11] [IMP] stock : purhcase improvments :Warehouse dashboard: Task id:1774 bzr revid: aag@tinyerp.co.in-20101115124114-4zqe18w4g3tcbpea --- addons/stock/board_warehouse_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index b073be73575..a4b0054a124 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -13,7 +13,7 @@ form tree,form [('state','in',('confirmed','assigned')),'|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')] - + @@ -23,7 +23,7 @@ form tree,form [('state','in',('confirmed','assigned')),'|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')] - + From 027cb4ceb6c28cf8f3b0f9add12a2d0cf76d49cb Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Fri, 19 Nov 2010 11:27:05 +0530 Subject: [PATCH 11/11] [ADD]: purchase_double_validation: Added new module for adding one step to validate purchase workflow bzr revid: aag@tinyerp.co.in-20101119055705-y5xq00flbs8crgtm --- addons/purchase_double_validation/__init__.py | 26 +++++++ addons/purchase_double_validation/__terp__.py | 45 +++++++++++ .../purchase_double_validation.py | 62 ++++++++++++++++ .../purchase_double_validation_view.xml | 29 ++++++++ .../purchase_double_validation_workflow.xml | 51 +++++++++++++ .../wizard/__init__.py | 24 ++++++ .../purchase_double_validation_wizard.py | 74 +++++++++++++++++++ ...purchase_double_validation_wizard_view.xml | 37 ++++++++++ 8 files changed, 348 insertions(+) create mode 100644 addons/purchase_double_validation/__init__.py create mode 100644 addons/purchase_double_validation/__terp__.py create mode 100644 addons/purchase_double_validation/purchase_double_validation.py create mode 100644 addons/purchase_double_validation/purchase_double_validation_view.xml create mode 100644 addons/purchase_double_validation/purchase_double_validation_workflow.xml create mode 100644 addons/purchase_double_validation/wizard/__init__.py create mode 100644 addons/purchase_double_validation/wizard/purchase_double_validation_wizard.py create mode 100644 addons/purchase_double_validation/wizard/purchase_double_validation_wizard_view.xml diff --git a/addons/purchase_double_validation/__init__.py b/addons/purchase_double_validation/__init__.py new file mode 100644 index 00000000000..04c185f0e7a --- /dev/null +++ b/addons/purchase_double_validation/__init__.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). 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 . +# +############################################################################## +import wizard +import purchase_double_validation + + diff --git a/addons/purchase_double_validation/__terp__.py b/addons/purchase_double_validation/__terp__.py new file mode 100644 index 00000000000..442142980cb --- /dev/null +++ b/addons/purchase_double_validation/__terp__.py @@ -0,0 +1,45 @@ +#!/usr/bin/python +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). 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 . +# +############################################################################## + +{ + "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, + +} diff --git a/addons/purchase_double_validation/purchase_double_validation.py b/addons/purchase_double_validation/purchase_double_validation.py new file mode 100644 index 00000000000..919721ad415 --- /dev/null +++ b/addons/purchase_double_validation/purchase_double_validation.py @@ -0,0 +1,62 @@ +#!/usr/bin/python +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). 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 . +# +############################################################################## +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: + diff --git a/addons/purchase_double_validation/purchase_double_validation_view.xml b/addons/purchase_double_validation/purchase_double_validation_view.xml new file mode 100644 index 00000000000..fa37b8f3719 --- /dev/null +++ b/addons/purchase_double_validation/purchase_double_validation_view.xml @@ -0,0 +1,29 @@ + + + + + + purchase.order.form.inherit + purchase.order + + form + + + +