diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1f86fb07b90..2421c4c044d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -193,7 +193,7 @@
-
+
@@ -202,12 +202,12 @@
-
+
-
-
+
+
-
+
@@ -256,7 +256,7 @@
-
+
@@ -286,7 +286,7 @@
-
+
@@ -295,11 +295,11 @@
-
-
+
+
-
+
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1b9e166ac81..ab28fa3925c 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -407,9 +407,9 @@
-
-
-
+
+
+
@@ -465,7 +465,7 @@
-
+
@@ -956,8 +956,8 @@
-
-
+
+
@@ -1094,9 +1094,9 @@
-
-
-
+
+
+
@@ -1372,7 +1372,7 @@
-
+
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 4a6d2d3a2b8..6cb23888049 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-04 16:42+0000\n"
+"PO-Revision-Date: 2010-06-15 07:00+0000\n"
"Last-Translator: eLBati - albatos.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: 2010-06-11 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -1176,7 +1176,7 @@ msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
msgid "Terms"
-msgstr "Periodi"
+msgstr "Condizioni"
#. module: account
#: rml:account.vat.declaration:0
diff --git a/addons/account/project/wizard/project_account_analytic_line_view.xml b/addons/account/project/wizard/project_account_analytic_line_view.xml
index 96d9186cfa8..d564ffb5c81 100644
--- a/addons/account/project/wizard/project_account_analytic_line_view.xml
+++ b/addons/account/project/wizard/project_account_analytic_line_view.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py
index 482b9b62280..ad965e04b57 100644
--- a/addons/account/report/__init__.py
+++ b/addons/account/report/__init__.py
@@ -30,7 +30,7 @@ import invoice
import overdue
import aged_trial_balance
import tax_report
-import account_tax_code
+#import account_tax_code
import account_balance_landscape
import compare_account_balance
import account_invoice_report
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 1564859540a..3b9e3ec193e 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -66,7 +66,7 @@
-
+
diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml
index 290e6950569..070b3a8c10a 100644
--- a/addons/account/report/account_analytic_report_view.xml
+++ b/addons/account/report/account_analytic_report_view.xml
@@ -82,7 +82,7 @@
-
+
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 0c3a77db2a7..5645c34d20c 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -93,7 +93,7 @@
-
+
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 542b695e7dd..448f2abaf6d 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -111,7 +111,7 @@
-
+
diff --git a/addons/account/wizard/account_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 9711fc9b941..02fbb5a7376 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -21,7 +21,7 @@
-
+
@@ -56,7 +56,7 @@
-
+
diff --git a/addons/account/wizard/account_central_journal_view.xml b/addons/account/wizard/account_central_journal_view.xml
index dfe704c7051..b833af4a9dd 100644
--- a/addons/account/wizard/account_central_journal_view.xml
+++ b/addons/account/wizard/account_central_journal_view.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 5dca78673c5..3eae57dfe61 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/addons/account/wizard/account_chart_view.xml b/addons/account/wizard/account_chart_view.xml
index 66da81d24f6..24a1effb689 100644
--- a/addons/account/wizard/account_chart_view.xml
+++ b/addons/account/wizard/account_chart_view.xml
@@ -17,7 +17,7 @@
-
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index e0c22a0007f..8bdfb4ba8e2 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -10,7 +10,7 @@
-
+
@@ -43,8 +43,8 @@
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 71a0d591768..d2cfc95a77f 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index 89342803aaf..f17c2396255 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 7a25932bb98..c423a79e77c 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -16,8 +16,8 @@
-
-
+
+
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index dbd25408fe1..08a44a33639 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -13,8 +13,8 @@
-
-
+
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index d0b6a2f709a..bf3831baea0 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index 7d10c02f010..86681106845 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -13,8 +13,8 @@
-
-
+
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index c5269939e0c..b8c914cd737 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index 55fb71553d7..35a2556982d 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -31,7 +31,7 @@
-
+
diff --git a/addons/account/wizard/account_period_close_view.xml b/addons/account/wizard/account_period_close_view.xml
index 0866e64bdb6..82e7f8b3f3a 100644
--- a/addons/account/wizard/account_period_close_view.xml
+++ b/addons/account/wizard/account_period_close_view.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml
index 0f92376e045..1bed69d45fe 100644
--- a/addons/account/wizard/account_reconcile_view.xml
+++ b/addons/account/wizard/account_reconcile_view.xml
@@ -54,7 +54,7 @@
-
+
@@ -99,7 +99,7 @@
-
+
diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml
index 6f17279888c..05b77a1d570 100644
--- a/addons/account/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account/wizard/account_statement_from_invoice_view.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index fec632c2e59..ccd8b594296 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -52,7 +52,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 27ca48662bc..d0fd808dd3a 100644
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index b83ce33596d..821f7180e2e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,8 +1,8 @@
-
-
+
+
All Uninvoiced Entries
@@ -23,7 +23,7 @@
[]
-
+
Overpassed Accounts
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 56e45c9ccf9..21b16443e0a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -138,7 +138,7 @@
+ parent="base.menu_config_address_book" sequence="15" />
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index b4e7fa3e2ed..352e8cf62d3 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -122,6 +122,18 @@
+
+
+
+
+
+
@@ -400,13 +412,5 @@
src_model="res.partner.address"
/>
-
-
-
-
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 9a4838ace97..c804964322a 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-09 18:42+0000\n"
-"Last-Translator: Nicola Pedron \n"
+"PO-Revision-Date: 2010-06-15 12:50+0000\n"
+"Last-Translator: Rinux \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
@@ -33,7 +33,7 @@ msgstr ""
#. module: base_module_quality
#: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
msgid "Base module quality"
-msgstr ""
+msgstr "Modulo base di qualità"
#. module: base_module_quality
#: field:module.quality.check,name:0
@@ -63,7 +63,7 @@ msgstr ""
#. module: base_module_quality
#: field:module.quality.detail,ponderation:0
msgid "Ponderation"
-msgstr ""
+msgstr "Ponderazione"
#. module: base_module_quality
#: help:module.quality.detail,ponderation:0
@@ -110,7 +110,7 @@ msgstr ""
#. module: base_module_quality
#: wizard_field:quality_detail_save,init,module_file:0
msgid "Save report"
-msgstr ""
+msgstr "Salva report"
#. module: base_module_quality
#: wizard_field:quality_detail_save,init,name:0
@@ -120,12 +120,12 @@ msgstr ""
#. module: base_module_quality
#: field:module.quality.detail,score:0
msgid "Score (%)"
-msgstr ""
+msgstr "Punteggio (%)"
#. module: base_module_quality
#: help:quality_detail_save,init,name:0
msgid "Save report as .html format"
-msgstr ""
+msgstr "Salva report come formato .html"
#. module: base_module_quality
#: view:module.quality.detail:0
@@ -146,12 +146,12 @@ msgstr ""
#. module: base_module_quality
#: view:module.quality.detail:0
msgid "Save Report"
-msgstr ""
+msgstr "Salva report"
#. module: base_module_quality
#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
msgid "Quality Check"
-msgstr ""
+msgstr "Controllo di qualità"
#. module: base_module_quality
#: model:ir.model,name:base_module_quality.model_module_quality_detail
@@ -182,4 +182,4 @@ msgstr ""
#. module: base_module_quality
#: field:module.quality.detail,quality_check_id:0
msgid "Quality"
-msgstr ""
+msgstr "Qualità"
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index a16b538056f..e2c3c12f7ee 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:45+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-06-15 14:17+0000\n"
+"Last-Translator: Niels Huylebroeck \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
@@ -26,50 +26,50 @@ msgstr ""
#. module: board
#: model:ir.model,name:board.model_board_board
msgid "board.board"
-msgstr ""
+msgstr "board.board"
#. module: board
#: field:board.note,user_id:0
msgid "Author"
-msgstr ""
+msgstr "Auteur"
#. module: board
#: model:ir.module.module,shortdesc:board.module_meta_information
msgid "Dashboard main module"
-msgstr ""
+msgstr "Algemene dashboard module"
#. module: board
#: view:board.note:0
#: field:board.note,note:0
msgid "Note"
-msgstr ""
+msgstr "Notitie"
#. module: board
#: field:board.board.line,width:0
msgid "Width"
-msgstr ""
+msgstr "Breedte"
#. module: board
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de actie-definitie."
#. module: board
#: field:board.board.line,name:0
msgid "Title"
-msgstr ""
+msgstr "Titel"
#. module: board
#: model:ir.actions.act_window,name:board.action_view_board_list_form
#: model:ir.ui.menu,name:board.menu_view_board_form
msgid "Dashboard Definition"
-msgstr ""
+msgstr "Dashboard definitie"
#. module: board
#: model:ir.actions.act_window,name:board.action_view_board_note_form
#: model:ir.ui.menu,name:board.menu_view_board_note_form
msgid "Publish a note"
-msgstr ""
+msgstr "Publiceer een opmerking"
#. module: board
#: wizard_view:board.board.menu.create,init:0
diff --git a/addons/claim_from_delivery/__init__.py b/addons/claim_from_delivery/__init__.py
index 6f95fbf0fbc..b10828031a8 100644
--- a/addons/claim_from_delivery/__init__.py
+++ b/addons/claim_from_delivery/__init__.py
@@ -17,6 +17,6 @@
# along with this program. If not, see .
#
##############################################################################
-
+import claim_delivery
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/claim_from_delivery/claim_delivery.py b/addons/claim_from_delivery/claim_delivery.py
new file mode 100644
index 00000000000..4e81a0a3067
--- /dev/null
+++ b/addons/claim_from_delivery/claim_delivery.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import fields, osv
+
+class stock_picking(osv.osv):
+ _inherit = "stock.picking"
+ _columns = {
+ 'partner_id': fields.related('address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
+ }
+stock_picking()
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index a1c8be870e2..7fb68cc6348 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -1,12 +1,32 @@
-
+
+
+ stock.picking.delivery.form20
+ stock.picking
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+ {'default_partner_address_id': address_id, 'default_partner_id': partner_id}
+
+
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 08530fcae27..550d82f86ac 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -15,7 +15,7 @@
+ parent="menu_crm_config_opportunity" sequence="1"/>
@@ -30,7 +30,7 @@
+ parent="menu_crm_config_opportunity" sequence="2"/>
@@ -45,7 +45,7 @@
+ parent="menu_crm_config_opportunity" sequence="3"/>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index a5caf10b673..74bba86be04 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -48,7 +48,7 @@
+ parent="base.menu_base_partner" sequence="4" />
Inbound
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 19e3f731606..b196d9cb4ca 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -17,7 +17,7 @@
parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
+ parent="base.menu_base_partner" sequence="11" />
@@ -169,7 +169,7 @@
+ parent="menu_crm_config_opportunity" />
@@ -354,7 +354,7 @@
+ parent="menu_crm_config_opportunity" />
view.users.form.crm.modif.inherited1
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0601cd47c71..b9119325c52 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -126,7 +126,7 @@
domain="[]"
context="{'group_by':'company_id'}" />
-
@@ -232,10 +232,10 @@
+ parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/>
+ parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index f1f5eb4a490..ccc6cd677f4 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -136,7 +136,7 @@
domain="[]"
context="{'group_by':'company_id'}" />
-
@@ -189,7 +189,7 @@
+ id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="5"/>
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index d45b9aa6482..a5dfc5a30e5 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -75,7 +75,8 @@ class crm_claim(osv.osv, crm.crm_case):
'company_id': fields.many2one('res.company', 'Company'),
'partner_id': fields.many2one('res.partner', 'Partner'),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
- domain="[('partner_id','=',partner_id)]"),
+ # domain="[('partner_id','=',partner_id)]"
+ ),
'email_cc': fields.text('Watchers Emails', size=252, help="These people will receive a copy of the future communication between partner and users by email"),
'email_from': fields.char('Email', size=128, help="These people will receive email."),
'partner_name': fields.char("Employee's Name", size=64),
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 7fb1c08f84b..40f077d49f0 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -4,7 +4,7 @@
+ parent="base.menu_base_partner" sequence="7" />
@@ -47,7 +47,7 @@
+ parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index c59e0aabdc8..487a116ca1d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -4,7 +4,7 @@
+ parent="base.menu_base_config" sequence="6" />
@@ -92,11 +92,18 @@
form
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index 640f842cade..a49640e7293 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-15 03:32+0000\n"
+"X-Launchpad-Export-Date: 2010-06-18 03:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: google_map
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f6a03030a6f..4adb8c3488b 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,7 +9,7 @@
+
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index e3db974ebb5..68c4ad60926 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -57,7 +57,7 @@
-
+
@@ -77,9 +77,9 @@
+ parent="hr.menu_hr_root" sequence="3"/>
+ parent="menu_hr_time_tracking" groups="hr.group_hr_manager" sequence="3"/>
hr.action.reason.form
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 443983dffe7..a7a39312aff 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -46,7 +46,7 @@
+ parent="menu_hr_time_tracking" sequence="4"/>
hr.sign.in.out.ask.form
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0b92bcc986a..e1135a9f058 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -48,7 +48,7 @@
[]
-
+
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index cbb4c796c90..5784bb4d868 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,7 +64,7 @@
+ name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
-
+
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cafe42fcffa..9c5ebf49953 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -171,7 +171,7 @@
-
-
+
@@ -134,7 +134,7 @@
-
+
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1a310a55100..98c8d558f3a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -245,7 +245,7 @@
name="Holidays Management"
parent="hr.menu_hr_root"
id="menu_open_ask_holidays"
- sequence="9"/>
+ sequence="5"/>
Leave Requests
@@ -362,7 +362,7 @@
tree,form
-
+
-
+
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 24ea6745270..7f42982eaad 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -90,7 +90,7 @@
-
+
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ef5fcd3387f..cb8e4e196d7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -1,12 +1,16 @@
-
-
+
+
# ------------------------------------------------------
# Job Categories
@@ -319,12 +323,6 @@
-
-
-
+
@@ -129,7 +129,7 @@
-
+
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index f161c8c07f9..1354788f77b 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -10,7 +10,7 @@
id="menu_hr_reporting_timesheet"
name="Timesheet"
parent="hr.menu_hr_reporting"
- sequence="4" />
+ sequence="5" />
@@ -50,7 +50,7 @@
-
+
@@ -68,7 +68,7 @@
+ groups="hr.group_hr_user" sequence="4" icon="STOCK_PRINT"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index de834621c23..fa1f4a80c9a 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -16,7 +16,7 @@
-
+
@@ -34,7 +34,7 @@
+ groups="hr.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 6f6ce56b091..099eb0d4642 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -54,7 +54,7 @@
id="menu_hr_timesheet_sign_in"
groups="base.group_extended"
parent="hr_attendance.menu_hr_time_tracking"
- />
+ sequence="5" />
hr.sign.out.project.form
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index a801e21082b..b1a6cc0dc51 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -6,11 +6,11 @@
name="Reporting"
parent="hr.menu_hr_root"
sequence="10" />
-
+
+
+
+
+
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index b3f81e5fbb1..602204fd4e8 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -76,7 +76,7 @@
-
+
@@ -512,6 +512,6 @@
id="menu_hr_action_random_timesheet_lines_board"
name="Working Hours"
parent="hr_attendance.menu_hr_time_tracking"
- groups="hr.group_hr_manager"/>
+ groups="hr.group_hr_manager" sequence="2"/>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index b68112a5a38..651edf9b2b1 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -17,7 +17,7 @@
-
+
@@ -34,7 +34,7 @@
+ parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/>
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
index ea14e52ed52..bab9e1ff8e5 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_analytic_cost_ledger_view.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 51edeea837b..6bd5d20567d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -105,12 +105,12 @@
-
+
-
-
-
+
+
+
@@ -121,8 +121,8 @@
-
-
+
+
@@ -176,10 +176,10 @@
-
-
-
-
+
+
+
+
@@ -227,12 +227,12 @@
+ parent="base.menu_main_pm" sequence="5"/>
+ groups="hr.group_hr_manager" sequence="1"/>
-
- marketing.campaign.segment.form.inherit
- marketing.campaign.segment
+
+ marketing.campaign.activity.form.inherit
+ marketing.campaign.activity
form
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ marketing.campaign.form.inherit
+ marketing.campaign
+ form
+
+
+
+
+
+
+
@@ -35,9 +50,9 @@
-
- marketing.campaign.mailchimp.account.tree
- marketing.campaign.mailchimp.account
+
+ mailchimp.account.tree
+ mailchimp.account
tree
@@ -49,9 +64,9 @@
-
- marketing.campaign.mailchimp.account.form
- marketing.campaign.mailchimp.account
+
+ mailchimp.account.form
+ mailchimp.account
form
-
+
All Mailchimp Accounts
ir.actions.act_window
- marketing.campaign.mailchimp.account
+ mailchimp.account
form
tree,form
-
+
-
+
diff --git a/addons/marketing_campaign_mailchimp/wizard/__init__.py b/addons/marketing_campaign_mailchimp/wizard/__init__.py
new file mode 100755
index 00000000000..713b0c1e773
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+import create_list
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/wizard/create_list.py b/addons/marketing_campaign_mailchimp/wizard/create_list.py
new file mode 100755
index 00000000000..0a490787de5
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/wizard/create_list.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import netsvc
+
+class create_list(osv.osv_memory):
+ _name = "create.list"
+ _description = "Create List of mailchimp"
+# crm.lead remain
+ _columns = {
+ 'mailchimp_account_id': fields.many2one('mailchimp.account',
+ 'Mailchimp Account', required=True),
+ 'mailchimp_list_id': fields.many2one('mailchimp.list', 'List'),
+ 'list_name': fields.char('Name',size = 64),
+ 'partner_ids': fields.many2many('res.partner',
+ 'create_list_partner_rel',
+ 'cust_list_id', 'partner_id',
+ 'Partner'),
+
+ }
+
+ def onchange_mailchimp_account_id(self, cr, uid, ids, mailchimp_account_id,
+ action):
+ print mailchimp_account_id,action,
+ return {'value':{}}
+
+ def create_list(self, cr, uid, ids, context=None):
+ create_list_obj = self.browse(cr, uid, ids[0])
+ print create_list_obj.id
+ mailchimp_account_obj = self.pool.get('mailchimp.account')
+ account_id = create_list_obj.mailchimp_account_id
+ lists = mailchimp_account_obj.get_response(cr, uid, account_id.id, 'lists')
+ lists = dict([(l['name'],l['id']) for l in lists])
+ print lists
+ if create_list_obj.list_name not in lists.keys():
+ raise osv.except_osv(_('UserError'),
+ _('There is no list define in account %s') % (account_id.name))
+ list_id = lists[create_list_obj.list_name]
+ mailchimp_account_obj.add_partner_list(cr, uid, account_id.id, list_id,
+ create_list_obj.partner_ids)
+ return {}
+create_list()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml b/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml
new file mode 100755
index 00000000000..f15826aeaea
--- /dev/null
+++ b/addons/marketing_campaign_mailchimp/wizard/create_list_view.xml
@@ -0,0 +1,35 @@
+
+
+
+ create.list.form
+ create.list
+ form
+
+
+
+
+
+ Update List
+ ir.actions.act_window
+ create.list
+ form
+
+ new
+
+
+
+
+
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 3837588035e..ef0b9a1adc7 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,7 +4,7 @@
-
+
@@ -78,7 +78,7 @@
form
tree,form
-
@@ -349,11 +352,43 @@
+
+ account.bank.statment.select
+ account.bank.statement
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
All Cashboxes
ir.actions.act_window
account.bank.statement
form
+
+ {'search_default_Today':1}
+
+
@@ -367,7 +402,7 @@
-
@@ -414,8 +449,8 @@
-
+
+
-
-
+
+
project.gtd.timebox.tree
@@ -68,7 +69,7 @@
-
+
project.task.tree.timebox
project.task
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index c9bb771a2ac..ea902ea599f 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -46,6 +46,7 @@
view_type="form"/>
-
+
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 673f4239971..973e0a1a20c 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
-
+
Issue Categories
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index b4d0af02185..c422d987db5 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -93,7 +93,7 @@
-
@@ -118,7 +118,7 @@
context="{'group_by':'company_id'}" />
-
-
+
# ------------------------------------------------------
# Project Resource Allocation
@@ -292,18 +292,18 @@
+ id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/>
+ name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
+ name="Resources" parent="project.menu_definitions" sequence="3"/>
-
-
+
+
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index d7d2880714c..fff11703de5 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -164,10 +164,10 @@
-
-
-
-
+
+
+
+
@@ -217,12 +217,12 @@
{"search_default_user_id":uid}
-
-
+
+
+ id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3"/>
+
+ Addresses
+ ir.actions.act_window
+ res.partner.address
+ form
+ {"search_default_supplier":1}
+
+
+
+
+ tree
+
+
+
+
+
+ form
+
+
+
-
-
-
-
+
+ parent="menu_procurement_management_invoice" sequence="13"/>
-
-
+
@@ -346,7 +367,8 @@
-
+
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3c49922086a..b17aad16a62 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,9 +1,10 @@
+
-
+
@@ -506,7 +507,7 @@
-
+
diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml
index 33ba22667ec..2475c7bdceb 100644
--- a/addons/sale/test/sale_procurement.yml
+++ b/addons/sale/test/sale_procurement.yml
@@ -2,9 +2,7 @@
In order to test the sale order working with procurements I will create some
products with different supply method and procurement method.
-
- I create two products.
--
- I create one product Table.
+ I create one product Table as MTO.
-
!record {model: product.product, id: product_product_table0}:
categ_id: product.cat1
@@ -15,7 +13,7 @@
uom_id: product.product_uom_unit
uom_po_id: product.product_uom_unit
-
- I create another product Wood.
+ I create another product Wood as MTS.
-
!record {model: product.product, id: product_product_wood0}:
categ_id: product.cat1
@@ -26,7 +24,7 @@
uom_id: product.product_uom_kgm
uom_po_id: product.product_uom_kgm
-
- I define Minimum stock rule for my stockable product wood
+ I define Minimum stock rule for my stockable product Wood (qty between 10 and 15)
-
!record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
company_id: base.main_company
@@ -77,19 +75,16 @@
proc_ids = self.search(cr, uid, [('state','=','confirmed')])
assert proc_ids, _('No Procurements!')
-
- The scheduler runs.
+ I run the scheduler.
-
!function {model: procurement.order, name: run_scheduler}:
- model: procurement.order
search: "[('state','=','confirmed')]"
-
I check that the procurement for the product table is in exception state.
- As my product's supply method is produce and mrp module is yet not installed.
+ As my product's supply method is produce and the BoM is not defined.
-
!python {model: procurement.order}: |
from tools.translate import _
- proc_ids = self.search(cr, uid, [('state','=','exception')])
- assert proc_ids, _('No Procurements are in exception state!')
-
-
-
\ No newline at end of file
+ proc_ids = self.search(cr, uid, [('state','=','exception'),('product_id','=',ref('sale.product_product_table0'))])
+ assert proc_ids, _('No Procurements are in exception state for the table!')
diff --git a/addons/sale/test/shipping_manual_sale_order.yml b/addons/sale/test/shipping_manual_sale_order.yml
index c030a80c64a..1f5bc5fe10a 100644
--- a/addons/sale/test/shipping_manual_sale_order.yml
+++ b/addons/sale/test/shipping_manual_sale_order.yml
@@ -1,5 +1,5 @@
-
- In order to test the sale module in the Open-ERP, I need to configure details regarding product & customer.
+ In order to test the sale module, I need to configure details regarding product & customer.
-
I am going to sell my Mobile products to the customer with name Cleartrail
-
diff --git a/addons/sale_journal/report/sale_journal_report_view.xml b/addons/sale_journal/report/sale_journal_report_view.xml
index aa0a9cf06fe..ae454f7674b 100644
--- a/addons/sale_journal/report/sale_journal_report_view.xml
+++ b/addons/sale_journal/report/sale_journal_report_view.xml
@@ -81,7 +81,8 @@
{'search_default_journal': 1,'group_by_no_leaf':1,'group_by':[]}
-
+
@@ -181,7 +182,8 @@
{'search_default_month':1, 'group_by_no_leaf':1,'group_by':[]}
-
+
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 5b3d2de5652..70b12997c54 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -134,7 +134,7 @@
-
+
@@ -439,7 +439,7 @@
-
+
Picking by invoice_method
diff --git a/addons/sale_order_dates/__init__.py b/addons/sale_order_dates/__init__.py
new file mode 100644
index 00000000000..ed4a8b0a952
--- /dev/null
+++ b/addons/sale_order_dates/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+import sale
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
new file mode 100644
index 00000000000..0f7a56fba20
--- /dev/null
+++ b/addons/sale_order_dates/__openerp__.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+
+{
+ 'name': 'Sale Order Dates',
+ 'version': '1.0',
+ 'category': 'Generic Modules/CRM & SRM',
+ 'description': """
+Add commitment, requested and effective dates on the sale order.
+""",
+ 'author': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ["sale"],
+ 'init_xml': [
+ ],
+
+ 'update_xml': [
+ 'sale_view.xml',
+ ],
+ 'demo_xml': [
+ ],
+ 'test': [],
+ 'installable': True,
+ 'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_order_dates/sale.py b/addons/sale_order_dates/sale.py
new file mode 100644
index 00000000000..877199b32ad
--- /dev/null
+++ b/addons/sale_order_dates/sale.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import fields, osv
+import time
+from mx import DateTime
+class sale_order_dates(osv.osv):
+ _inherit = 'sale.order'
+ _name = 'sale.order'
+
+ def _get_effective_date(self, cr, uid, ids, name, arg, context={}):
+ res = {}
+ dates_list = []
+ for order in self.browse(cr, uid, ids):
+ dates_list = []
+ for pick in order.picking_ids:
+ dates_list.append(pick.date)
+ if dates_list:
+ res[order.id] = min(dates_list)
+ else:
+ res[order.id] =False
+ return res
+
+ def _get_commitment_date(self, cr, uid, ids, name, arg, context={}):
+ res = {}
+ dates_list = []
+ for order in self.browse(cr, uid, ids):
+ dates_list = []
+ for line in order.order_line:
+ dt=DateTime.strptime(order.date_order, '%Y-%m-%d') + DateTime.RelativeDateTime(days=line.delay or 0.0)
+ dt_s = dt.strftime('%Y-%m-%d')
+ dates_list.append(dt_s)
+ if dates_list:
+ res[order.id] = min(dates_list)
+ return res
+
+ _columns = {
+ 'commitment_date': fields.function(_get_commitment_date, method=True,store=True, type='date', string='Commitment Date'),
+ 'requested_date': fields.date('Requested Date'),
+ 'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date'),
+ }
+sale_order_dates()
+"""
+ - date_commitment: min(fields.function using delay on SO lines +
+ date_order)
+ - date_requested: fields.date
+ - Effective date: fields.function the first picking done.
+"""
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_order_dates/sale_view.xml b/addons/sale_order_dates/sale_view.xml
new file mode 100644
index 00000000000..54248fa0176
--- /dev/null
+++ b/addons/sale_order_dates/sale_view.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ sale.order.form.inherit5
+ sale.order
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 70c3e82ee56..46ce72c2f0a 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -4,7 +4,7 @@
+ parent="base.menu_main_pm" sequence="3"/>
@@ -172,7 +172,7 @@
@@ -219,7 +219,7 @@
{'contact_display': 'partner', 'search_default_real':1, 'search_default_location_type_internal':1,'search_default_group_product':1,'search_default_group_location':1,'group_by':[], 'group_by_no_leaf':1}
-
+
diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml
index a14298ff771..b8e5d4ff868 100644
--- a/addons/stock/report/report_stock_picking_view.xml
+++ b/addons/stock/report/report_stock_picking_view.xml
@@ -83,7 +83,7 @@
-
+
@@ -129,7 +129,8 @@
-
+
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 9265ac0b2c9..7ecb0b833e9 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -5,6 +5,8 @@
"access_stock_warehouse_user","stock.warehouse.user","model_stock_warehouse","base.group_user",1,0,0,0
"access_stock_location_manager","stock.location.manager","model_stock_location","stock.group_stock_manager",1,1,1,1
"access_stock_location_user","stock.location.user","model_stock_location","base.group_user",1,0,0,0
+"access_stock_journal_user","stock.journal.user","model_stock_journal","base.group_user",1,0,0,0
+"access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1
"access_stock_picking_move_wizard","stock.picking.move.wizard","model_stock_picking_move_wizard","stock.group_stock_user",1,1,1,1
"access_stock_tracking","stock.tracking","model_stock_tracking","stock.group_stock_user",1,1,1,0
"access_stock_picking","stock.picking","model_stock_picking","stock.group_stock_user",1,1,1,1
@@ -40,3 +42,14 @@
"access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
"access_action_traceability","action.traceability","model_action_traceability","stock.group_stock_user",1,0,0,0
+"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,0,0,0
+"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
+"access_report_stock_move","report.stock.move","model_report_stock_move","stock.group_stock_user",1,1,1,1
+"access_report_stock_inventory","report.stock.inventory","model_report_stock_inventory","stock.group_stock_user",1,1,1,1
+"access_stock_replacement","stock.replacement","model_stock_replacement","stock.group_stock_user",1,1,1,1
+"access_stock_replacement_result","stock.replacement.result","model_stock_replacement_result","stock.group_stock_user",1,1,1,1
+"access_stock_ups","stock.ups","model_stock_ups","stock.group_stock_user",1,1,1,1
+"access_stock_ups_final","stock.ups.final","model_stock_ups_final","stock.group_stock_user",1,1,1,1
+"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
+"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,1,1,0
+"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ddfe4808dba..924bf69c520 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -49,6 +49,17 @@ class stock_incoterms(osv.osv):
stock_incoterms()
+class stock_journal(osv.osv):
+ _name = "stock.journal"
+ _description = "Stock Journal"
+ _columns = {
+ 'name': fields.char('Stock Journal', size=32, required=True),
+ 'user_id': fields.many2one('res.users','Responsible'),
+ }
+ _defaults = {
+ 'user_id': lambda s,c,u,ctx: u
+ }
+stock_journal()
#----------------------------------------------------------
# Stock Location
@@ -159,7 +170,6 @@ class stock_location(osv.osv):
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the stock location without removing it."),
'usage': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True),
'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
-
'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Location Name"),
'stock_real': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', multi="stock"),
@@ -169,6 +179,7 @@ class stock_location(osv.osv):
'location_id': fields.many2one('stock.location', 'Parent Location', select=True, ondelete='cascade'),
'child_ids': fields.one2many('stock.location', 'location_id', 'Contains'),
+ 'chained_journal_id': fields.many2one('stock.journal', 'Chained Journal'),
'chained_location_id': fields.many2one('stock.location', 'Chained Location If Fixed'),
'chained_location_type': fields.selection([('none', 'None'), ('customer', 'Customer'), ('fixed', 'Fixed Location')],
'Chained Location Type', required=True),
@@ -181,6 +192,8 @@ class stock_location(osv.osv):
"validated automatically. With 'Manual Operation', the stock move has to be validated "\
"by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
),
+ 'chained_picking_type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', help="Shipping type specify of the chained move, goods coming in or going out."),
+ 'chained_company_id': fields.many2one('res.company', 'Chained Company', help='Set here the belonging company of the chained move'),
'chained_delay': fields.integer('Chained lead time (days)'),
'address_id': fields.many2one('res.partner.address', 'Location Address'),
'icon': fields.selection(tools.icons, 'Icon', size=64),
@@ -225,7 +238,7 @@ class stock_location(osv.osv):
elif location.chained_location_type == 'fixed':
result = location.chained_location_id
if result:
- return result, location.chained_auto_packing, location.chained_delay
+ return result, location.chained_auto_packing, location.chained_delay, location.chained_journal_id and location.chained_journal_id.id or False, location.chained_company_id and location.chained_company_id.id or False, location.chained_picking_type
return result
def picking_type_get(self, cr, uid, from_location, to_location, context={}):
@@ -557,7 +570,7 @@ class stock_picking(osv.osv):
'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal'), ('delivery', 'Delivery')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the picking without removing it."),
'note': fields.text('Notes'),
-
+ 'stock_journal_id': fields.many2one('stock.journal','Stock Journal'),
'location_id': fields.many2one('stock.location', 'Location', help="Keep empty if you produce at the location where the finished products are needed." \
"Set a location if you produce at a fixed location. This can be a partner location " \
"if you subcontract the manufacturing operations."),
@@ -589,7 +602,7 @@ class stock_picking(osv.osv):
("2binvoiced", "To Be Invoiced"),
("none", "Not from Picking")], "Invoice Status",
select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
- 'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+ 'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
}
_defaults = {
'name': lambda self, cr, uid, context: '/',
@@ -599,7 +612,7 @@ class stock_picking(osv.osv):
'type': lambda *a: 'in',
'invoice_state': lambda *a: 'none',
'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
- 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock_picking', context=c)
+ 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.picking', context=c)
}
def copy(self, cr, uid, id, default=None, context={}):
@@ -1289,6 +1302,7 @@ stock_production_lot_revision()
# location_dest_id is only used for predicting futur stocks
#
class stock_move(osv.osv):
+
def _getSSCC(self, cr, uid, context={}):
cr.execute('select id from stock_tracking where create_uid=%s order by id desc limit 1', (uid,))
res = cr.fetchone()
@@ -1366,7 +1380,7 @@ class stock_move(osv.osv):
\nThe state is \'Waiting\' if the move is waiting for another one.'),
'price_unit': fields.float('Unit Price',
digits_compute= dp.get_precision('Account')),
- 'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+ 'company_id': fields.many2one('res.company', 'Company', required=True, select=1),
'partner_id': fields.related('picking_id','address_id','partner_id',type='many2one', relation="res.partner", string="Partner"),
'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order"),
'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
@@ -1392,7 +1406,8 @@ class stock_move(osv.osv):
move_list = self.pool.get('stock.move').read(cr, uid, context['move_line'][0], ['location_dest_id'])
return move_list and move_list['location_dest_id'][0] or False
if context.get('address_out_id', False):
- return self.pool.get('res.partner.address').browse(cr, uid, context['address_out_id'], context).partner_id.property_stock_customer.id
+ property_out = self.pool.get('res.partner.address').browse(cr, uid, context['address_out_id'], context).partner_id.property_stock_customer
+ return property_out and property_out.id or False
return False
def _default_location_source(self, cr, uid, context={}):
@@ -1558,8 +1573,9 @@ class stock_move(osv.osv):
def create_chained_picking(self, cr, uid, moves, context):
new_moves = []
+ res_obj = self.pool.get('res.company')
for picking, todo in self._chain_compute(cr, uid, moves, context).items():
- ptype = self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
+ ptype = todo[0][1][5] and todo[0][1][5] or self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
pick_name = ''
if ptype == 'delivery':
pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.delivery')
@@ -1570,17 +1586,20 @@ class stock_move(osv.osv):
'note': picking.note,
'move_type': picking.move_type,
'auto_picking': todo[0][1][1] == 'auto',
+ 'stock_journal_id': todo[0][1][3],
+ 'company_id': todo[0][1][4] or res_obj._company_default_get(cr, uid, 'stock.company', context),
'address_id': picking.address_id.id,
+
'invoice_state': 'none'
})
- for move, (loc, auto, delay) in todo:
- # Is it smart to copy ? May be it's better to recreate ?
+ for move, (loc, auto, delay, journal, company_id, ptype) in todo:
new_id = self.pool.get('stock.move').copy(cr, uid, move.id, {
'location_id': move.location_dest_id.id,
'location_dest_id': loc.id,
'date_moved': time.strftime('%Y-%m-%d'),
'picking_id': pickid,
'state': 'waiting',
+ 'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context) ,
'move_history_ids': [],
'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
'move_history_ids2': []}
@@ -1666,6 +1685,33 @@ class stock_move(osv.osv):
wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
return count
+ def setlast_tracking(self, cr, uid, ids, context=None):
+ new_move = []
+ update_val = {}
+ ir_sequence_obj = self.pool.get('ir.sequence')
+ tracking_obj = self.pool.get('stock.tracking')
+ tracking = False
+ tracking = context.get('tracking', False)
+ # import pdb; pdb.set_trace()
+ if tracking:
+ tracking_id = tracking_obj.search(cr, uid, ['name','=', tracking])
+ if prodlot_id:
+ update_val['prodlot_id'] = prodlot_id
+ else:
+ tracking_id = tracking_obj.create(cr, uid, {'name': tracking}, {'product_id': self.browse(cr, uid, ids)[0].product_id.id})
+ update_val['tracking_id'] = tracking_id
+ else:
+ last_track = [line.tracking_id for line in self.browse(cr, uid, ids)[0].picking_id.move_lines if line.tracking_id]
+ if not last_track:
+ track_ids= tracking_obj.search(cr, uid, [])
+ last_track = [track for track in tracking_obj.browse(cr, uid, track_ids)]
+ last_track.sort(key=lambda p: p.date, reverse=True)
+ last_track_id = last_track and last_track[0].id
+ update_val['tracking_id'] = last_track_id
+ self.write(cr, uid, ids, update_val)
+ return True
+
+
#
# Cancel move => cancel others move and pickings
#
@@ -1813,10 +1859,12 @@ class stock_move(osv.osv):
for pick in picking_obj.browse(cr, uid, picking_ids):
if all(move.state == 'done' for move in pick.move_lines):
picking_obj.action_done(cr, uid, [pick.id])
-
wf_service = netsvc.LocalService("workflow")
for id in ids:
wf_service.trg_trigger(uid, 'stock.move', id, cr)
+ for pick in picking_obj.browse(cr, uid, picking_ids):
+ if len([move.state == 'done' for move in pick.move_lines]) == len(pick.move_lines):
+ wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
return True
def create_account_move(self, cr, uid, move,account_id,account_variation,amount, context=None):
@@ -2203,7 +2251,7 @@ class stock_inventory(osv.osv):
'prodlot_id': lot_id,
'date': inv.date,
'date_planned': inv.date,
- 'state': 'assigned'
+ 'state': 'done'
}
if change > 0:
value.update( {
@@ -2223,9 +2271,6 @@ class stock_inventory(osv.osv):
'product_qty': line.product_qty
})
move_ids.append(self._inventory_line_hook(cr, uid, line, value))
- if len(move_ids):
- self.pool.get('stock.move').action_done(cr, uid, move_ids,
- context=context)
self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 'move_ids': [(6, 0, move_ids)]})
return True
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index 3084e8527a7..547ed785cd1 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -3,6 +3,7 @@
+
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0e26df8bdf9..e2c79a6499a 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,11 +3,12 @@
-
-
+
+
-
+
+
stock.inventory.line.tree
@@ -181,7 +182,7 @@
form
-
+
@@ -313,6 +314,7 @@
+
@@ -321,6 +323,7 @@
+
@@ -336,6 +339,7 @@
+
@@ -420,6 +424,9 @@
+
+
+
@@ -475,7 +482,7 @@
{'full':1, 'search_default_in_location':1}
-
+
stock.location.tree
@@ -535,7 +542,7 @@
form
-
+
stock.picking.move.wizard.form
@@ -603,37 +610,46 @@
-
+
#
# Sending Products
@@ -939,12 +986,13 @@
+
-
-
+
+
@@ -953,23 +1001,23 @@
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
-
+
+
+
-
-
@@ -989,13 +1037,23 @@
+
-
+
+
+
+
@@ -1048,6 +1106,7 @@
+
@@ -1088,7 +1147,7 @@
calendar
-
+
stock.picking.in.tree
@@ -1125,24 +1184,35 @@
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
@@ -1156,23 +1226,23 @@
-
-
+
+
-
-
-
+
+
-
+
+
+
@@ -1220,6 +1290,7 @@
+
@@ -1263,7 +1334,7 @@
calendar
-
+
stock.picking.internal.search
@@ -1277,6 +1348,7 @@
+
@@ -1301,7 +1373,7 @@
{'contact_display': 'partner',"search_default_confirmed":1}
-
+
stock.move.tree
@@ -1309,7 +1381,7 @@
tree
-
+
@@ -1319,15 +1391,25 @@
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
-
+
+
+
+
@@ -1377,7 +1459,19 @@
context="{'location_id':location_id, 'product_id':product_id}"
domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-
+
+
+
+
+
+
+
@@ -1460,17 +1554,26 @@
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
-
+
+
+
-
-
-
+
@@ -1499,19 +1602,24 @@
-
-
+
-
-
-
-
+
+
+
+
@@ -1556,6 +1664,10 @@
+
+
+
+
@@ -1620,7 +1732,7 @@
form
tree,form
-
+
+
+
+
+ stock.journal.filter
+ stock.journal
+ search
+
+
+
+
+
+
+
+
+ Stock Journals
+ stock.journal
+ tree
+
+
+
+
+
+
+
+
+ Stock Journals
+ stock.journal
+ form
+
+
+
+
+
+ Stock Journals
+ stock.journal
+ ir.actions.act_window
+ form
+
+
+
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index 82825000eaa..a211de96780 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -21,6 +21,7 @@
import stock_traceability
import stock_move
+import stock_splitinto
import stock_partial_picking
import stock_partial_move
import stock_replacement
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 8616f939bb8..d66972fd36b 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -179,13 +179,18 @@ class split_in_production_lot(osv.osv_memory):
move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
if 'product_id' in fields:
res.update({'product_id': move.product_id.id})
+ if 'product_uom' in fields:
+ res.update({'product_uom': move.product_uom.id})
if 'qty' in fields:
res.update({'qty': move.product_qty})
+ if 'use_exist' in fields:
+ res.update({'use_exist': (move.picking_id and move.picking_id.type=='out' and True) or False})
return res
_columns = {
'qty': fields.integer('Quantity'),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+ 'product_uom': fields.many2one('product.uom', 'Product UOM'),
'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Lots Number'),
'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Lots Existing Numbers'),
'use_exist' : fields.boolean('Use Exist'),
@@ -244,7 +249,6 @@ class split_in_production_lot(osv.osv_memory):
}
if quantity_rest > 0:
current_move = move_obj.copy(cr, uid, move.id, default_val)
- move_obj.action_confirm(cr, uid, [current_move])
new_move.append(current_move)
if quantity_rest == 0:
current_move = move.id
@@ -258,7 +262,7 @@ class split_in_production_lot(osv.osv_memory):
prodlot_id = prodlot_obj.create(cr, uid, {'name': line.name},
# 'prefix' : line.name},
{'product_id': move.product_id.id})
- move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id})
+ move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id, 'state':move.state})
prodlot = prodlot_obj.browse(cr, uid, prodlot_id)
# ref = '%d' % (move.id)
# if prodlot.ref:
@@ -269,6 +273,7 @@ class split_in_production_lot(osv.osv_memory):
if quantity_rest > 0:
update_val['product_qty'] = quantity_rest
update_val['product_uos_qty'] = uos_qty_rest
+ update_val['state'] = move.state
move_obj.write(cr, uid, [move.id], update_val)
return new_move
split_in_production_lot()
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index bba27bfe9c7..71626e7d161 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -103,14 +103,24 @@
stock.move.split
form
-