pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: Merge with latest trunk

Browse Source 
bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl
This commit is contained in:
Rucha (Open ERP)
2011-11-02 10:58:27 +05:30
parent 9fe0f6fa83 3d22bb8b55
commit 2fdecf4717
5284 changed files with 57507 additions and 19304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/__openerp__.py
-1
View File
@@ -75,7 +75,6 @@ Dashboard provided by this module:
'wizard/change_production_qty_view.xml',
'wizard/mrp_price_view.xml',
'wizard/mrp_workcenter_load_view.xml',
# 'wizard/mrp_change_standard_price_view.xml',
'mrp_view.xml',
'mrp_report.xml',
'company_view.xml',
addons/mrp/i18n/ar.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/bg.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/bs.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/ca.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/cs.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
"X-Poedit-Language: Czech\n"
#. module: mrp
addons/mrp/i18n/da.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-23 04:38+0000\n"
"X-Generator: Launchpad (build 14012)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/de.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/el.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
addons/mrp/i18n/es.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/es_AR.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/es_CL.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/es_EC.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/et.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/fi.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/fr.po
+3 -3
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-27 04:47+0000\n"
"X-Generator: Launchpad (build 14028)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.bom,product_uos:0
@@ -806,7 +806,7 @@ msgid ""
"Add more functionalities to the core Manufacturing Application with the "
"following addons."
msgstr ""
"Ajouter plus de fonctionnalités au module de production de bases grâce à ces "
"Ajouter plus de fonctionnalités au module de production de base grâce à ces "
"différents modules"
#. module: mrp
addons/mrp/i18n/gl.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/hi.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/hr.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/hu.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/id.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/it.po
+3 -3
View File
@@ -8,13 +8,13 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
"PO-Revision-Date: 2011-01-17 09:33+0000\n"
"Last-Translator: Davide Corio - agilebg.com <davide.corio@domsense.com>\n"
"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/ko.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/lt.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
"Language: lt\n"
#. module: mrp
addons/mrp/i18n/nb.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/nl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/nl_BE.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/pl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/pt.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/pt_BR.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/ro.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/ru.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/sk.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/sl.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/sq.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:58+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:51+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/sr@latin.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/sv.po
+8 -8
View File
@@ -13,14 +13,14 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
#: field:mrp.production,move_created_ids2:0
msgid "Moves Created"
msgstr "Moves Created"
msgstr "Flytt skapad"
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -55,7 +55,7 @@ msgstr "Manufacturing Resource Planning"
#. module: mrp
#: report:mrp.production.order:0
msgid "No. Of Cycles"
msgstr "No. Of Cycles"
msgstr "Antal cykler"
#. module: mrp
#: field:mrp.routing.workcenter,cycle_nbr:0
@@ -90,7 +90,7 @@ msgstr "Kostnad per enhet"
#. module: mrp
#: view:mrp.production:0
msgid "Scrap Products"
msgstr ""
msgstr "Kassera produkt"
#. module: mrp
#: view:mrp.production.order:0
@@ -170,7 +170,7 @@ msgstr ""
#. module: mrp
#: view:mrp.production:0
msgid "Products to Finish"
msgstr ""
msgstr "Produkter att slutföra"
#. module: mrp
#: selection:mrp.bom,method:0
@@ -188,7 +188,7 @@ msgstr ""
#: view:mrp.production.order:0
#: field:mrp.production.order,state:0
msgid "State"
msgstr ""
msgstr "Status"
#. module: mrp
#: field:mrp.workcenter,costs_hour:0
@@ -1891,7 +1891,7 @@ msgstr "Product Rounding"
#: model:ir.model,name:mrp.model_mrp_production_workcenter_line
#: field:mrp.production.workcenter.line,name:0
msgid "Work Order"
msgstr "Work Order"
msgstr "Arbetsorder"
#. module: mrp
#: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
addons/mrp/i18n/tlh.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 04:59+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/tr.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/uk.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/vi.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:52+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/zh_CN.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/zh_HK.po
+2 -2
View File
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/i18n/zh_TW.po
+2 -2
View File
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-09-05 05:00+0000\n"
"X-Generator: Launchpad (build 13830)\n"
"X-Launchpad-Export-Date: 2011-10-19 04:53+0000\n"
"X-Generator: Launchpad (build 14157)\n"
#. module: mrp
#: field:mrp.production,move_created_ids:0
addons/mrp/mrp.py
+1 -3
View File
@@ -274,9 +274,7 @@ class mrp_bom(osv.osv):
if product_id:
prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
v = {'product_uom': prod.uom_id.id}
if not name:
v['name'] = prod.name
v = {'name': prod.name, 'product_uom': prod.uom_id.id}
return {'value': v}
return {}
addons/mrp/report/custom_default.xsl
+2 -2
View File
@@ -39,7 +39,7 @@
<xsl:template name="first_page_frames">
<xsl:if test="$page_format='a4_normal'">
<frame id="main" x1="1cm" y1="2.5cm" width="21.0cm" height="29.0cm"/>
<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="25.0cm"/>
</xsl:if>
<xsl:if test="$page_format='a4_letter'">
@@ -49,7 +49,7 @@
</xsl:template>
<xsl:template name="other_pages_frames">
<frame id="main" x1="1cm" y1="2.5cm" width="21.0cm" height="29cm"/>
<frame id="main" x1="1cm" y1="2.5cm" width="19.0cm" height="25.0cm"/>
</xsl:template>
</xsl:stylesheet>
addons/mrp/report/price.xsl
+3 -1
View File
@@ -3,6 +3,8 @@
<xsl:import href="custom_default.xsl"/>
<xsl:import href="custom_rml.xsl"/>
<xsl:variable name="page_format">a4_normal</xsl:variable>
<xsl:template match="/">
<xsl:call-template name="rml"/>
@@ -11,7 +13,7 @@
<!-- stylesheet -->
<xsl:template name="stylesheet">
<paraStyle name="title" fontName="Helvetica-Bold" fontSize="15.0" leftIndent="-8.0cm" alignment="center"/>
<paraStyle name="title" fontName="Helvetica-Bold" fontSize="15.0" alignment="center"/>
<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
addons/mrp/wizard/mrp_change_standard_price.py
-53
View File
@@ -1,53 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero 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 Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from osv import fields, osv
class change_standard_price(osv.osv_memory):
_inherit = "stock.change.standard.price"
_description = "Change Standard Price"
_columns = {
'change_parent_price': fields.boolean('Change Parent Price', help="This will change the price of parent products also "
"according to the BoM structure specified for the product."),
}
def change_price(self, cr, uid, ids, context=None):
""" Changes the Standard Price of Parent Product according to BoM
only when the field 'change_parent_price' is True.
And creates an account move accordingly.
@param self: The object pointer.
@param cr: A database cursor
@param uid: ID of the user currently logged in
@param ids: List of IDs selected
@param context: A standard dictionary
@return:
"""
if context is None:
context = {}
res = self.browse(cr, uid, ids, context=context)
context.update({'change_parent_price': res[0].change_parent_price})
return super(change_standard_price, self).change_price(cr, uid, ids, context=context)
change_standard_price()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/mrp/wizard/mrp_change_standard_price_view.xml
-17
View File
@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_change_standard_price_inherit" model="ir.ui.view">
<field name="name">Change Standard Price (Inherit)</field>
<field name="model">stock.change.standard.price</field>
<field name="inherit_id" ref="stock.view_change_standard_price"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="new_price" position="after">
<field name="change_parent_price"/>
</field>
</field>
</record>
</data>
</openerp>