merge

bzr revid: fp@tinyerp.com-20100223073925-8g8fpeciv8y6icfp

addons/account/account_move_line.py

@@ -283,7 +283,10 @@ class account_move_line(osv.osv):
                 result.append((line.id, line.name))
         return result
 
-    def _balance_search(self, cursor, user, obj, name, args):
+    def _balance_search(self, cursor, user, obj, name, args, domain=None, context=None):
+        if context is None:
+            context = {}
+
         if not len(args):
             return []
         where = ' and '.join(map(lambda x: '(abs(sum(debit-credit))'+x[1]+str(x[2])+')',args))

addons/account/i18n/ar.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-12-20 12:49+0000\n"
-"Last-Translator: Hend Awad <Unknown>\n"
+"PO-Revision-Date: 2010-02-22 08:34+0000\n"
+"Last-Translator: some one <Unknown>\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: 2009-12-21 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/pl.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-02-18 15:39+0000\n"
+"PO-Revision-Date: 2010-02-20 16:07+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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-02-20 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -45,7 +45,7 @@ msgstr "Podaj wiadomość dla raportu o przeterminowanych należnościach."
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr "Zatwierdź projekt zestawienia"
+msgstr "Zatwierdź projekt wyciągu"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -60,7 +60,7 @@ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "Waluta zastosowana do wprowadzenia zestawienia"
+msgstr "Waluta zastosowana do wprowadzenia wyciągu"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -334,7 +334,7 @@ msgstr "Odnośnik"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Oblicz subskrypcję"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -344,7 +344,7 @@ msgstr "Nr konta"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Przyrost Winien"
 
 #. module: account
 #: rml:account.invoice:0
@@ -466,7 +466,7 @@ msgstr "Specjalne Obliczenie"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr "Potwierdź projekt zestawienia z lub bez uzgodnienia"
+msgstr "Potwierdź projekt wyciągu z lub bez uzgodnienia"
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
@@ -910,7 +910,7 @@ msgstr "Dziennik odpisów"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Waluta kwoty"
+msgstr "Kwota w walucie"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -981,7 +981,7 @@ msgstr "Domyślne konto Winien"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr "Zapisy wg zestawień"
+msgstr "Zapisy wg wyciągów"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1471,7 +1471,7 @@ msgstr "Wyświetl konta "
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr "Pozycja uzgodnienia zestawienia"
+msgstr "Pozycja uzgodnienia wyciągu"
 
 #. module: account
 #: view:account.tax:0
@@ -1631,7 +1631,7 @@ msgstr "Konta należności i zobowiązań"
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Pozycje subskrypcji"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1750,13 +1750,13 @@ msgstr "Włącz do kwoty bazowej"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Przyrost Ma"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Skasuj uzgodnienie zapisów"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -1772,7 +1772,7 @@ msgstr "Rejestr kosztów dla okresu"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr "Nowe zestawienie"
+msgstr "Nowy wyciąg"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1936,7 +1936,7 @@ msgstr "Projekty faktur dla klienta"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Pozycja konta subskrypcji"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -2154,7 +2154,7 @@ msgstr "Uzgodnienie płatności"
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr "Uzgodnienie zestawienia"
+msgstr "Uzgodnienie wyciagów"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -2187,7 +2187,7 @@ msgstr "Schemat podatków"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Kwota"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -2270,7 +2270,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Utwórz zapisy subskrypcji"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
@@ -2321,7 +2321,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Konto podstawy do deklaracji podatkowej"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2352,7 +2352,7 @@ msgstr "Typ odnośnika"
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Skasuj uzgodnienie"
 
 #. module: account
 #: field:account.tax,type:0
@@ -2363,7 +2363,7 @@ msgstr "Typ podatku"
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr "Zapisy zestawienia"
+msgstr "Zapisy wyciągu"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
@@ -2627,7 +2627,7 @@ msgstr "Konto zobowiązań"
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr "Importuj faktury do zestawienia"
+msgstr "Importuj faktury do wyciągu"
 
 #. module: account
 #: view:account.invoice:0
@@ -2673,7 +2673,7 @@ msgstr "Kapitał własny"
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "Komunikat przeterminowanej płatności"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -2703,7 +2703,7 @@ msgstr "Zamykanie roku"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr ""
+msgstr "Ogólne raporty"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
@@ -2808,12 +2808,12 @@ msgstr "Nazwa"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Reconciliation transactions"
-msgstr ""
+msgstr "Transakcje uzgodnień"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
 msgid "Analysis Direction"
-msgstr ""
+msgstr "Kierunek analizy"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,init,go:0
@@ -2928,7 +2928,7 @@ msgstr "Konto Podatkowe"
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr "Z zestawienia, utwórz zapisy"
+msgstr "Z wyciągu, utwórz zapisy"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
@@ -2981,7 +2981,7 @@ msgstr "Mapowanie podatków"
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Transakcje kasowania uzgodnień"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
@@ -3029,7 +3029,7 @@ msgstr "Dziennik analityczny -"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Debit"
-msgstr ""
+msgstr "Winien - analityka"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -3268,7 +3268,7 @@ msgstr "Kurs średni"
 #: model:process.node,note:account.process_node_bankstatement0
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Statement encoding produces payment entries"
-msgstr ""
+msgstr "Wprowadzenie wyciągu generuje zapisy płatności"
 
 #. module: account
 #: field:account.account,code:0
@@ -3342,7 +3342,7 @@ msgstr "30 dni od końca miesiąca"
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr ""
+msgstr "Główny kod podatkowy"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -3543,7 +3543,7 @@ msgstr "Zapłać i uzgodnij"
 #: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "Dziennik główny"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -3709,7 +3709,7 @@ msgstr "Wprowadzanie zapisów"
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr ""
+msgstr "Nota kredytowa"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
@@ -3754,7 +3754,7 @@ msgstr "Miesiąc"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr ""
+msgstr "Konto subskrypcji"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -3766,7 +3766,7 @@ msgstr "Data zapłaty"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr ""
+msgstr "Zapis subskrypcji"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -3815,7 +3815,7 @@ msgstr "Data faktury"
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Unreconciled"
-msgstr ""
+msgstr "Skasowano uzgodnienie"
 
 #. module: account
 #: field:account.account,note:0
@@ -3880,7 +3880,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Komunikat raportu przeterminowanych płatności"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -3966,6 +3966,9 @@ msgid ""
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
 msgstr ""
+"Podaje typ dziennika analitycznego. Kiedy dokument (np. faktura) ma utworzyć "
+"zapisy analityczne, to OpenERP będzie szukał odpowiedniego dziennika tego "
+"samego typu."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -3975,7 +3978,7 @@ msgstr "Grupy"
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr ""
+msgstr "Kod/Data"
 
 #. module: account
 #: field:account.account,active:0
@@ -4084,7 +4087,7 @@ msgstr "Zmiana stanu konta"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Pozycje zestawienia"
+msgstr "Pozycje wyciągu"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
@@ -4160,7 +4163,7 @@ msgstr "Ogólne"
 #. module: account
 #: rml:account.general.journal:0
 msgid "Credit Trans."
-msgstr ""
+msgstr "Trans. Ma"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -4228,7 +4231,7 @@ msgstr "Szukaj zapisów"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr ""
+msgstr "Koszt analityczny do refakturowania zakupów, kart pracy, ..."
 
 #. module: account
 #: field:account.account,tax_ids:0
@@ -4276,7 +4279,7 @@ msgstr ""
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Lewy nadrzędny"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -4397,7 +4400,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr ""
+msgstr "Działające subskrypcje"
 
 #. module: account
 #: selection:account.move,type:0
@@ -4413,7 +4416,7 @@ msgstr "Zaksięgowano"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Nota kredytowa"
 
 #. module: account
 #: field:account.config.wizard,date2:0
@@ -4587,7 +4590,7 @@ msgstr "Ważna zapisy"
 #: model:ir.actions.wizard,name:account.wizard_line_account_use_model
 #: model:ir.ui.menu,name:account.menu_account_use_model
 msgid "Create Entries From Models"
-msgstr "Utwórz zapisu z modeli"
+msgstr "Utwórz zapisy z modeli"
 
 #. module: account
 #: field:account.account.template,reconcile:0
@@ -4642,7 +4645,7 @@ msgstr ""
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr "Zestawienie"
+msgstr "Wyciąg"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
@@ -4719,7 +4722,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Projekt zestawienia"
+msgstr "Projekt wyciągu"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -4729,7 +4732,7 @@ msgstr "Nazwa dziennika"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr "Importuj fakturę z zestawienia"
+msgstr "Importuj fakturę z wyciągu"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -4825,7 +4828,7 @@ msgstr "Anulowano"
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "Projekty zestawień"
+msgstr "Projekty wyciągów"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
@@ -4852,7 +4855,7 @@ msgstr "Konta należności"
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
 msgid "Open for unreconciliation"
-msgstr ""
+msgstr "Otwórz do kasowania uzgodnień"
 
 #. module: account
 #: field:account.bank.statement.reconcile,statement_line:0
@@ -5098,7 +5101,7 @@ msgstr "Dziennik kont"
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "pozycje subskrypcji"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5204,7 +5207,7 @@ msgstr "Szablon kodu konta podatkowego"
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr ""
+msgstr "Okresy subskrypcji"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -5265,7 +5268,7 @@ msgstr "Podatek zamienny"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "Encode manually statement comes into the draft statement"
-msgstr "Ręcznie wprowadzone zestawienie jest projektem"
+msgstr "Ręcznie wprowadzony wyciąg jest projektem wyciągu"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
@@ -5292,7 +5295,7 @@ msgstr "Płatności"
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Accounting entries at statement's confirmation"
-msgstr "Zapisy księgowe przy potwierdzeniu zestawienia"
+msgstr "Zapisy księgowe przy potwierdzeniu wyciągu"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -5474,7 +5477,7 @@ msgstr "Zastosowanie podatku"
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr ""
+msgstr "Zapisy subskrypcji"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
@@ -5995,12 +5998,12 @@ msgstr "Obszary podatkowe"
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr ""
+msgstr "Proces wyciągu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr ""
+msgstr "Uzgodnienia wyciągu"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0

addons/account/i18n/pt_BR.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-01-14 10:44+0000\n"
-"Last-Translator: Carlos Paiva <Unknown>\n"
+"PO-Revision-Date: 2010-02-22 21:38+0000\n"
+"Last-Translator: sbrianti <Unknown>\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-01-15 04:34+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -313,7 +313,7 @@ msgstr "Pagamentos atrasados"
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 #: wizard_view:account.vat.declaration,init:0
 msgid "Select period"
-msgstr "Periodo selecionado"
+msgstr "Selecione o período"
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -1011,7 +1011,7 @@ msgstr "Período"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr "Grande total"
+msgstr "Total geral"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -1340,7 +1340,7 @@ msgstr "Modelo"
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr "Fechar ano fiscal"
+msgstr "Fechar um ano fiscal"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -1355,7 +1355,7 @@ msgstr "Mensagem:"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr "Selecionar faturaa s pagar e administrar vantagens"
+msgstr "Selecionar as faturas que você quer pagar e adiantamentos a fazer"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1389,7 +1389,7 @@ msgstr "O método de calculo para o valor do imposto."
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr "Lançamentos de conta validado"
+msgstr "Lançamentos contábeis validados"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1398,8 +1398,9 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
-"Se você não concilia transações, você também deve verificar todas as ações "
-"que estão ligadas a essas operações, porque não será desativaadas"
+"Se você desfazer a reconciliação de transações, você deve também verificar "
+"todas as ações que estão ligadas a essas operações, porque elas não serão "
+"desfeitas pelo sistema"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0

addons/account_analytic_default/i18n/pl.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-11-17 09:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-20 15:28+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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: 2009-12-16 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,12 +21,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
 msgid "Analytic Defaults"
-msgstr ""
+msgstr "Domyślne ustawienia analityczne"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
 msgid "Account Analytic Default"
-msgstr ""
+msgstr "Domyślne ustawienia konta analitycznego"
 
 #. module: account_analytic_default
 #: constraint:ir.ui.view:0
@@ -84,7 +84,7 @@ msgstr "Użytkownik"
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
@@ -111,4 +111,4 @@ msgstr "Warunki"
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr ""
+msgstr "Reguły analityczne"

addons/account_balance/i18n/bs.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-16 14:07+0000\n"
+"PO-Revision-Date: 2010-02-22 12:42+0000\n"
 "Last-Translator: adnan <adnankraljic@yahoo.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-02-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
@@ -73,27 +73,27 @@ msgstr "Odaberite razdoblja"
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procenat"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "Usporedi odabrane godine pod uvjetima"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "Izaberi odgovarajuća konta (za poređenje u %)"
 
 #. module: account_balance
 #: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Saldo konta - poredi godine"
 
 #. module: account_balance
 #: model:ir.module.module,description:account_balance.module_meta_information
@@ -120,108 +120,108 @@ msgstr ""
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je."
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Prikaži izvješće u položenoj formi"
 
 #. module: account_balance
 #: help:account.balance.account.balance.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Ako je prazno, sva razdoblja"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "Sa saldom različit od 0"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno :"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Saldo računa -"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "Prikaži usporedbu u %"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period"
-msgstr ""
+msgstr "Odaberite razdoblje"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Postavke izvješća"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "With movements"
-msgstr ""
+msgstr "Sa kretanjima"
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,backtoinit,end:0
 #: wizard_button:account.balance.account.balance.report,zero_years,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Uredu"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Cash"
-msgstr ""
+msgstr "Gotovina"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "Ne uspoređuj"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "Prikaži račune"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Credit"
-msgstr ""
+msgstr "Potražuje"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
 
 #. module: account_balance
 #: model:ir.module.module,shortdesc:account_balance.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Godina:"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno."
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -229,27 +229,30 @@ msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
 msgstr ""
+"Izabrali ste \"Postotak\" opciju sa više od dvije godine, ali niste odabrali "
+"\"Položeni\" format."
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "You might have done following mistakes. Please correct them and try again."
 msgstr ""
+"Možda ste napravili sljedeće pogreške. Ispravite ih i pokušajte ponovno."
 
 #. module: account_balance
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Ostavite prazno za usporedbu sa roditeljem"
 
 #. module: account_balance
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Fiskalna godina"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -257,11 +260,12 @@ msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
 msgstr ""
+"2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine."
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Razdoblja"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -270,18 +274,21 @@ msgid ""
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
 msgstr ""
+"Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa "
+"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
+"papira. Molimo pokušajte ponovno."
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Prilagodite izvješće"

addons/account_chart/i18n/nb.po

@@ -0,0 +1,23 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-02-21 07:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_chart
+#: model:ir.module.module,description:account_chart.module_meta_information
+msgid "Remove minimal account chart"
+msgstr "Fjern minimal konto diagram"

addons/account_chart/i18n/sv.po

@@ -7,16 +7,16 @@ 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-09-18 15:24+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-21 07:34+0000\n"
+"Last-Translator: Kristian <kimocoder> Bremvaag <Unknown>\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: 2009-12-16 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr ""
+msgstr "Ta bort minimal konto diagram"

addons/crm/crm_phonecall_menu.xml

@@ -56,7 +56,7 @@
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
         <field name="sequence" eval="1"/>
         <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_phone_incomming_tree_view"/>
+        <field name="view_id" ref="crm_case_phone_tree_view"/>
         <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">

addons/crm/wizard/crm_opportunity_wizard.py

@@ -135,21 +135,7 @@ class opportunity2meeting(wizard.interface):
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        opportunity_case_obj = pool.get('crm.opportunity')
-        meeting_case_obj = pool.get('crm.meeting')        
-        for opportunity in opportunity_case_obj.browse(cr, uid, data['ids']):
-            new_meeting_id = meeting_case_obj.create(cr, uid, {
-                'name': opportunity.name,
-                'date': time.strftime('%Y-%m-%d'),
-                'section_id' : opportunity.section_id and opportunity.section_id.id or False,
-                'date_deadline': opportunity.date_deadline,
-                'description':opportunity.description,
-                'opportunity_id':opportunity.id
-                })
-            new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
-            vals = {}
-            opportunity_case_obj.write(cr, uid, [opportunity.id], vals)            
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])        
+        opportunity_case_obj = pool.get('crm.opportunity')                
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])

addons/crm/wizard/crm_phonecall_wizard.py

@@ -202,21 +202,7 @@ class phonecall2meeting(wizard.interface):
 
     def _makeMeeting(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        phonecall_case_obj = pool.get('crm.phonecall')
-        meeting_case_obj = pool.get('crm.meeting')        
-        for phonecall in phonecall_case_obj.browse(cr, uid, data['ids']):
-            new_meeting_id = meeting_case_obj.create(cr, uid, {
-                'name': phonecall.name,
-                'section_id' : phonecall.section_id and phonecall.section_id.id or False,
-                'duration': phonecall.duration,
-                'description':phonecall.description,
-                'phonecall_id':phonecall.id
-                })
-            new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
-            vals = {}
-            phonecall_case_obj.write(cr, uid, [phonecall.id], vals)
-            phonecall_case_obj.case_cancel(cr, uid, [phonecall.id])
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])             
+        phonecall_case_obj = pool.get('crm.phonecall')                   
         data_obj = pool.get('ir.model.data')
         result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
         id = data_obj.read(cr, uid, result, ['res_id'])

addons/hr_expense/i18n/el.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-02-15 01:57+0000\n"
-"Last-Translator: thunk <thunk77@gmail.com>\n"
+"PO-Revision-Date: 2010-02-21 16:01+0000\n"
+"Last-Translator: Μάριος Ζηντίλης <m.zindilis@dmajor.org>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -312,7 +312,7 @@ msgstr "Χρήστης"
 #: field:hr.expense.expense,date:0
 #: field:hr.expense.line,date_value:0
 msgid "Date"
-msgstr "Ηεμρ/νία"
+msgstr "Ημερ/νία"
 
 #. module: hr_expense
 #: rml:hr.expense:0

addons/mrp/mrp.py

@@ -19,14 +19,13 @@
 #
 ##############################################################################
 
+from mx import DateTime
 from osv import fields
 from osv import osv
+from tools.translate import _
 import ir
-
 import netsvc
 import time
-from mx import DateTime
-from tools.translate import _
 
 #----------------------------------------------------------
 # Work Centers
@@ -334,6 +333,45 @@ def rounding(f, r):
         return f
     return round(f / r) * r
 
+class many2many_domain(fields.many2many):
+    def set(self, cr, obj, id, name, values, user=None, context=None):
+        if not values:
+            return
+        return super(many2many_domain, self).set(cr, obj, id, name, values, user=user,
+                context=context)
+
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        res = {}
+        move_obj = obj.pool.get('stock.move')
+        for prod in obj.browse(cr, user, ids, context=context):
+            cr.execute("SELECT move_id from mrp_production_move_ids where\
+                production_id=%s" % (prod.id))
+            m_ids = map(lambda x: x[0], cr.fetchall())
+            final = move_obj.search(cr, user, self._domain + [('id', 'in', tuple(m_ids))])
+            res[prod.id] = final
+        return res
+
+class one2many_domain(fields.one2many):
+    def set(self, cr, obj, id, field, values, user=None, context=None):
+        if not values:
+            return
+        return super(one2many_domain, self).set(cr, obj, id, field, values, 
+                                            user=user, context=context)
+
+    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
+        if not context:
+            context = {}
+        res = {}
+        move_obj = obj.pool.get('stock.move')
+        for prod in obj.browse(cr, user, ids, context=context):
+            cr.execute("SELECT id from stock_move where production_id=%s" % (prod.id))
+            m_ids = map(lambda x: x[0], cr.fetchall())
+            final = move_obj.search(cr, user, self._domain + [('id', 'in', tuple(m_ids))])
+            res[prod.id] = final
+        return res
+
 class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Production'
@@ -420,9 +458,10 @@ class mrp_production(osv.osv):
         'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
             help="This is the internal picking list that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
-        'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products Consummed'),
-
-        'move_created_ids': fields.one2many('stock.move', 'production_id', 'Moves Created'),
+        'move_lines': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consumme', domain=[('state','not in', ('done', 'cancel'))]),
+        'move_lines2': many2many_domain('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consummed Products', domain=[('state','in', ('done', 'cancel'))]),
+        'move_created_ids': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','not in', ('done', 'cancel'))]),
+        'move_created_ids2': one2many_domain('stock.move', 'production_id', 'Moves Created', domain=[('state','in', ('done', 'cancel'))]),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation'),
         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
@@ -544,7 +583,7 @@ class mrp_production(osv.osv):
 
     #TODO Review materials in function in_prod and prod_end.
     def action_production_end(self, cr, uid, ids):
-#        move_ids = []
+        move_ids = []
         for production in self.browse(cr, uid, ids):
             for res in production.move_lines:
                 for move in production.move_created_ids:
@@ -552,7 +591,7 @@ class mrp_production(osv.osv):
                     cr.execute('INSERT INTO stock_move_history_ids \
                             (parent_id, child_id) VALUES (%s,%s)',
                             (res.id, move.id))
-#                move_ids.append(res.id)
+                move_ids.append(res.id)
             vals= {'state':'confirmed'}
             new_moves = [x.id for x in production.move_created_ids]
             self.pool.get('stock.move').write(cr, uid, new_moves, vals)
@@ -562,7 +601,7 @@ class mrp_production(osv.osv):
             self.pool.get('stock.move').check_assign(cr, uid, new_moves)
             self.pool.get('stock.move').action_done(cr, uid, new_moves)
             self._costs_generate(cr, uid, production)
-#        self.pool.get('stock.move').action_done(cr, uid, move_ids)
+        self.pool.get('stock.move').action_done(cr, uid, move_ids)
         self.write(cr,  uid, ids, {'state': 'done'})
         return True
 
@@ -599,14 +638,7 @@ class mrp_production(osv.osv):
         return amount
 
     def action_in_production(self, cr, uid, ids):
-        move_ids = []
-        for production in self.browse(cr, uid, ids):
-            for res in production.move_lines:
-                move_ids.append(res.id)
-            if not production.date_start:
-                self.write(cr, uid, [production.id],
-                        {'date_start': time.strftime('%Y-%m-%d %H:%M:%S')})
-        self.pool.get('stock.move').action_done(cr, uid, move_ids)
+        move_ids = []        
         self.write(cr, uid, ids, {'state': 'in_production'})
         return True
 
@@ -1299,6 +1331,41 @@ class StockMove(osv.osv):
                     wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'mrp.procurement', m, 'button_wait_done', cr)
         return True
+    
+    
+    def consume_moves(self, cr, uid, ids, product_qty, location_id, context=None):
+        res = []
+        production_obj = self.pool.get('mrp.production')
+        for move in self.browse(cr, uid, ids):
+            new_moves = super(StockMove, self).consume_moves(cr, uid, ids, product_qty, location_id, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+                res.append(new_move)
+        return res
+
+    def split_lines(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, context=None):
+        res = []
+        production_obj = self.pool.get('mrp.production')
+        for move in self.browse(cr, uid, ids):
+            new_moves = super(StockMove, self).split_lines(cr, uid, [move.id], quantity, split_by_qty, prefix, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+                res.append(new_move)
+        return res
+    
+    def scrap_moves(self, cr, uid, ids, quantity, location_dest_id, context=None):
+        res = []
+        production_obj = self.pool.get('mrp.production')
+        for move in self.browse(cr, uid, ids):
+            new_moves = super(StockMove, self).scrap_moves(cr, uid, [move.id], quantity, location_dest_id, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
+                res.append(new_move)
+        return res
+
 StockMove()
 
 
@@ -1326,5 +1393,20 @@ class StockPicking(osv.osv):
 
 StockPicking()
 
+
+class spilt_in_production_lot(osv.osv_memory):
+    _inherit = "stock.move.spilt"
+    def split(self, cr, uid, ids, move_ids, context=None):
+        production_obj = self.pool.get('mrp.production')
+        move_obj = self.pool.get('stock.move')  
+        res = []      
+        for move in move_obj.browse(cr, uid, move_ids, context=context):
+            new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context)
+            production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
+            for new_move in new_moves:
+                production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})                
+        return res
+spilt_in_production_lot()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/mrp/mrp_view.xml

@@ -438,6 +438,7 @@
                 </graph>
             </field>
         </record>
+
         <wizard
             string="Change Product Qty."
             model="mrp.production"
@@ -445,55 +446,97 @@
             id="mrp.wizard_change_production_qty"
             keyword="client_action_multi"
             multi="True"/>
-
+	
         <record id="mrp_production_form_view" model="ir.ui.view">
             <field name="name">mrp.production.form</field>
             <field name="model">mrp.production</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders">
-                    <group colspan="4" col="7">
-                        <field name="name" select="1"/>
+                    <group colspan="4" col="6">
+                        <field name="name" select="1" string="Reference"/>
                         <field name="date_planned" select="1"/>
                         <field name="origin" select="1"/>
-                        <newline/>
-                        <field name="product_id" on_change="product_id_change(product_id)" select="1"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" select="1"/>                        
                         <field name="product_qty"/>
-                        <field name="product_uom"/>
-                        <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production" icon="gtk-ok"/>
-                        <field name="product_uos_qty" groups="product.group_uos"/>
-                        <field name="product_uos" groups="product.group_uos"/>
-                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <group colspan="2" col="3">
+                            <field name="product_uom"/>
+                            <!-- TODO Fix change qty accroding to move_lines and move_lines2 -->
+<!--                            <button type="action" name="%(mrp.wizard_change_production_qty)d" string="Change Qty" states="ready,confirmed,in_production" icon="gtk-ok"/>-->
+                        </group>
+                        <label string="" colspan="2"/>                          
+                        <field name="product_uos_qty" groups="product.group_uos"/>                        
+                        <group colspan="2" col="3" groups="product.group_uos">
+                            <field name="product_uos"/>
+                            <label string=""/> 
+                        </group>                        
                     </group>
 
                     <notebook colspan="4">
                         <page string="Consumed Products">
-                            <field name="location_src_id" select="2" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
                             <field name="routing_id" groups="base.group_extended" select="1"/>
-                            <newline/>
-                            <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list">
-                                <tree string="Moves">
-                                    <field name="product_id" select="1"/>
-                                    <field name="product_qty" select="1"/>
-                                    <field name="product_uom" select="1" string="UOM"/>
-                                    <field name="prodlot_id" select="1"/>
-                                    <field name="product_packaging" domain="[('product_id','=',product_id)]"/>
-                                    <field name="picking_id"/>
-                                    <field name="location_id" select="1"/>
-                                    <field name="location_dest_id" select="1"/>
-                                    <field name="date" select="1"/>
-                                    <field name="date_planned" select="1" string="Date"/>
+                            <field name="location_src_id" select="2" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
+                            <separator string="" colspan="4"/>
 
-                                </tree>
+                            <field colspan="2" name="move_lines" nolabel="1" widget="one2many_list"
+                            	mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                            	<tree string="Products to Consume">
+                            		<field name="product_id" />
+                            		<field name="product_qty" />
+                            		<field name="product_uom" />
+                            		<field name="state" invisible="1" />
+                            		<button
+                            			name="%(stock.move_consume)d"
+                            			string=">" type="action"
+                            			icon="gtk-go-forward" context="{'consume': True}"
+                            			states="draft,waiting,confirmed,assigned"/>
+                            		<button name="%(stock.move_scrap)d"
+                            			string="D" type="action"
+                            			icon="gtk-justify-fill" context="{'scrap': True}"
+                            			states="draft,waiting,confirmed,assigned" />
+                            	</tree>
+                            	<form string="Products to Consume">
+                            		<field name="product_id" />
+                            		<field name="product_qty" />
+                            		<field name="product_uom" />
+                            	</form>
                             </field>
+
+                            <field colspan="2" name="move_lines2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
+                           			widget="one2many_list" mode="tree,form" height="275">
+                           		<tree string="Consumed Products" editable="bottom">
+                           			<field name="product_id" readonly="1"/>
+                           			<field name="product_qty" readonly="1"/>
+                           			<field name="product_uom" readonly="1" />
+                           			<field name="state" invisible="1" />
+                           			<field name="location_id" readonly="1"/>
+                           			<field name="prodlot_id" />                           			
+                           			<button
+                           				name="%(stock.track_line)d"
+                           				string="Split in production lots"
+                           				type="action" icon="gtk-justify-fill"
+                           				states="done,cancel" />
+                           			<button
+                           				name="%(stock.move_scrap)d"
+                           				string="D" type="action"
+                           				icon="gtk-convert"
+                           				states="done,cancel" />
+                           		</tree>
+                           		<form string="Consumed Products">
+                           			<field name="product_id" />
+                           			<field name="product_qty" />
+                           			<field name="product_uom" />
+                           		</form>
+                           	</field>						
+
                             <group col="9" colspan="4">
                                 <field name="state" select="2"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="gtk-execute"/>
                                 <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                                <button name="button_produce" states="ready" string="Start Production" icon="gtk-media-play"/>
-                                <button name="button_produce_done" states="in_production" string="Production done" icon="gtk-ok"/>
+                                <button name="button_produce" states="ready" string="Mark as Start" icon="gtk-execute"/>
+                                <button name="button_produce_done" states="in_production" string="Production" icon="gtk-ok"/>
                                 <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
                                 <button name="button_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-cancel"/>
                                 <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="gtk-convert"/>
@@ -503,7 +546,51 @@
                             <field colspan="4" name="product_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Finished Products">
-                            <field colspan="4" name="move_created_ids" nolabel="1"/>
+                            <field colspan="2" name="move_created_ids" nolabel="1" widget="one2many_list"
+                            	mode="tree,form" height="275" domain="[('state','&lt;&gt;', ('done', 'cancel'))]">
+                            	<tree string="Products to Finish">
+                            		<field name="product_id" />
+                            		<field name="product_qty" />
+                            		<field name="product_uom" />
+                            		<field name="state" invisible="1" />
+                            		<button
+                            			name="%(stock.move_consume)d"
+                            			string=">" type="action"
+                            			icon="gtk-go-forward"
+                            			states="draft,waiting,confirmed,assigned"/>
+                            		<button name="%(stock.move_scrap)d"
+                            			string="D" type="action"
+                            			icon="gtk-justify-fill" context="{'scrap': True}"
+                            			states="draft,waiting,confirmed,assigned" />
+                            	</tree>
+                            	<form string="Products to Finish">
+                            		<field name="product_id" />
+                            		<field name="product_qty" />
+                            		<field name="product_uom" />
+                            	</form>
+                            </field>
+
+                            <field colspan="2" name="move_created_ids2" nolabel="1"  domain="[('state','in', ('done', 'cancel'))]"
+                           			widget="one2many_list" mode="tree,form" height="275">
+                           		<tree string="Finished Products" editable="bottom">
+                           			<field name="product_id" readonly="1"/>
+                           			<field name="product_qty" readonly="1"/>
+                           			<field name="product_uom" readonly="1" />
+                           			<field name="state" invisible="1" />
+                           			<field name="location_id" readonly="1"/>
+                           			<field name="prodlot_id" />                           			
+                           			<button name="%(stock.track_line)d" 
+                                            string="Split in production lots" type="action" icon="gtk-justify-fill" states="done,cancel"/>
+                           			<button name="%(stock.move_scrap)d"
+                           				string="D" type="action" icon="gtk-go-forward" 
+                           				states="done,cancel" />
+                           		</tree>
+                           		<form string="Finished Products">
+                           			<field name="product_id" />
+                           			<field name="product_qty" />
+                           			<field name="product_uom" />
+                           		</form>
+                           	</field>
                         </page>
                         <page string="Work Orders">
                             <field colspan="4" name="workcenter_lines" nolabel="1">
@@ -525,6 +612,7 @@
 
                         </page>
                         <page string="Extra Information">
+                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <field name="priority" groups="base.group_extended"/>
                             <newline/>
                             <field name="date_start" select="2"/>

addons/mrp/mrp_wizard.xml

@@ -31,12 +31,5 @@
             keyword="client_action_multi"
             id="product_procurement_wizard"/>
 
-        <wizard
-            id="stock.track_line"
-            model="stock.move"
-            multi="True"
-            name="mrp.stock.move.track"
-            string="Track line"/>
-
     </data>
 </openerp>

addons/mrp/wizard/__init__.py

@@ -27,7 +27,6 @@ import wizard_workcenter_load
 import wizard_track_prod
 import wizard_change_production_qty
 import make_procurement
-import wizard_track_line
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/mrp/wizard/wizard_track_line.py

@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution    
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.translate import _
-
-track_form = '''<?xml version="1.0"?>
-<form string="Tracking a move">
- <field name="tracking_prefix"/>
- <newline/>
- <field name="quantity"/>
-</form>
-'''
-fields = {
-        'tracking_prefix': {
-            'string': 'Tracking prefix',
-            'type': 'char',
-            'size': 64,
-        },
-        'quantity': {
-            'string': 'Quantity per lot',
-            'type': 'float',
-            'default': 1,
-        }
-}
-
-def _check_picking(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    move_obj = pool.get('stock.move').browse(cr, uid, data['id'])
-    if not move_obj.picking_id:
-        raise wizard.except_wizard(_('Caution!'), _('Before splitting the production lots,make sure this move has a Picking attached !\nYou must save the move before performing this operation.'))
-    return data['form']
-
-def _track_lines(self, cr, uid, data, context):
-    move_id = data['id']
-
-    pool = pooler.get_pool(cr.dbname)
-    prodlot_obj = pool.get('stock.production.lot')
-    move_obj = pool.get('stock.move')
-    production_obj = pool.get('mrp.production')
-    ir_sequence_obj = pool.get('ir.sequence')
-
-    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-    if not sequence:
-        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
-    if data['form']['tracking_prefix']:
-        sequence=data['form']['tracking_prefix']+'/'+(sequence or '')
-
-    move = move_obj.browse(cr, uid, [move_id])[0]
-    quantity=data['form']['quantity']
-    if quantity <= 0 or move.product_qty == 0:
-        return {}
-    uos_qty=quantity/move.product_qty*move.product_uos_qty
-
-    quantity_rest = move.product_qty%quantity
-    uos_qty_rest = quantity_rest/move.product_qty*move.product_uos_qty
-
-    update_val = {
-        'product_qty': quantity,
-        'product_uos_qty': uos_qty,
-    }
-    new_move = []
-    production_ids = []
-    for idx in range(int(move.product_qty//quantity)):
-        if idx:
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-            new_move.append(current_move)
-        else:
-            current_move = move.id
-        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-        update_val['prodlot_id'] = new_prodlot
-        move_obj.write(cr, uid, [current_move], update_val)
-        production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-    
-    if quantity_rest > 0:
-        idx = int(move.product_qty//quantity)
-        update_val['product_qty']=quantity_rest
-        update_val['product_uos_qty']=uos_qty_rest
-        if idx:
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
-            new_move.append(current_move)
-        else:
-            current_move = move.id
-        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-        update_val['prodlot_id'] = new_prodlot
-        move_obj.write(cr, uid, [current_move], update_val)
-
-    products = production_obj.read(cr, uid, production_ids, ['move_lines'])
-    for p in products:
-        for new in new_move:
-            if new not in p['move_lines']:
-                p['move_lines'].append(new)
-        production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]})
-
-    return {}
-
-class wizard_track_move(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_check_picking],
-            'result': {'type': 'form', 'arch': track_form, 'fields': fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('track', 'Ok', 'gtk-ok')]},
-            },
-        'track': {
-            'actions': [_track_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_track_move('mrp.stock.move.track')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

addons/mrp_operations/i18n/ko.po

@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:10+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-02-22 13:22+0000\n"
+"Last-Translator: barge <Unknown>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
 msgid "Start Operation"
-msgstr "오퍼레이션 시작"
+msgstr "작업 시작"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
@@ -32,7 +32,7 @@ msgstr "진행 중"
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Pause"
-msgstr "중지"
+msgstr "일시정지"
 
 #. module: mrp_operations
 #: constraint:ir.model:0

addons/process/i18n/pt_BR.po

@@ -7,20 +7,20 @@ 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-11-17 06:55+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-22 18:07+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\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: 2009-12-16 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr ""
+msgstr "Nó do processo"
 
 #. module: process
 #: constraint:ir.model:0
@@ -33,7 +33,7 @@ msgstr ""
 #. module: process
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação."
 
 #. module: process
 #: view:process.node:0
@@ -78,7 +78,7 @@ msgstr "URL de ajuda"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr ""
+msgstr "Nós do processo"
 
 #. module: process
 #: view:process.process:0
@@ -111,7 +111,7 @@ msgstr "Descrição"
 #. module: process
 #: model:ir.model,name:process.model_process_transition_action
 msgid "Process Transitions Actions"
-msgstr ""
+msgstr "Processar ações de transições"
 
 #. module: process
 #: field:process.condition,model_id:0
@@ -128,7 +128,7 @@ msgstr "Nó de origem"
 #. module: process
 #: field:process.transition,transition_ids:0
 msgid "Workflow Transitions"
-msgstr ""
+msgstr "Transições de Workflow"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -138,7 +138,7 @@ msgstr "Ação ID"
 #. module: process
 #: view:process.transition:0
 msgid "Process Transition"
-msgstr ""
+msgstr "Transição de processo"
 
 #. module: process
 #: model:ir.model,name:process.model_process_condition
@@ -251,7 +251,7 @@ msgstr "Processo"
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
 msgid "Enterprise Process"
-msgstr ""
+msgstr "Processos de negócios"
 
 #. module: process
 #: view:process.node:0
@@ -263,14 +263,14 @@ msgstr "Ações"
 #. module: process
 #: field:process.node,model_states:0
 msgid "States Expression"
-msgstr ""
+msgstr "Expressão de estado"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_transition_form
 #: model:ir.model,name:process.model_process_transition
 #: model:ir.ui.menu,name:process.menu_process_transition_form
 msgid "Process Transitions"
-msgstr ""
+msgstr "Transições de Processos"
 
 #. module: process
 #: field:process.transition,target_node_id:0
@@ -286,7 +286,7 @@ msgstr "Tipo de nó"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Transições de saida"
 
 #. module: process
 #: model:ir.ui.menu,name:process.menu_process

addons/product/product_view.xml

@@ -37,6 +37,7 @@
                     <field name="virtual_available"/>
                     <field name="lst_price"/>
                     <field name="standard_price"/>
+                    <field name="price" invisible="not context.get('pricelist',False)"/>
                     <field name="state"/>
                 </tree>
             </field>

addons/project/i18n/sv.po

@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 08:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-22 17:33+0000\n"
+"Last-Translator: Anders Eriksson <ae@mobilasystem.se>\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: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr ""
+msgstr "Tilldelade aktiviteter"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Aktivitetsprocess"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
@@ -34,22 +34,22 @@ msgstr ""
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr ""
+msgstr "Ändra återstående timmar"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
 msgid "Close Task"
-msgstr ""
+msgstr "Avsluta aktivitet"
 
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Projektaktiviteter"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Öppna avslutade aktiviteter"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr ""
+msgstr "Upparbetning"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -115,7 +115,7 @@ msgstr ""
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Update"
-msgstr ""
+msgstr "Uppdatera"
 
 #. module: project
 #: help:project.task.delegate,init,user_id:0
@@ -125,7 +125,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
 msgid "All Attachments"
-msgstr ""
+msgstr "Alla bilagor"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -141,17 +141,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types
 msgid "Task Types"
-msgstr ""
+msgstr "Aktivtetstyoer"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Nytt projekt baserat på en mall"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Projektets aktiviteter"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -161,7 +161,7 @@ msgstr ""
 #. module: project
 #: wizard_button:project.task.delegate,init,valid:0
 msgid "Validate"
-msgstr ""
+msgstr "Validera"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -175,17 +175,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr ""
+msgstr "Mina pågående aktiviteter"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Definiera som mall"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Preliminär aktivitet"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -211,7 +211,7 @@ msgstr "Anteckningar"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Days"
-msgstr ""
+msgstr "Dagar"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
@@ -229,13 +229,13 @@ msgstr "Projekt"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Starta aktivitet"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
 msgid "My Draft Tasks"
-msgstr ""
+msgstr "Mina preliminära aktiviteter"
 
 #. module: project
 #: view:project.project:0
@@ -247,7 +247,7 @@ msgstr ""
 #: selection:project.project,state:0
 #: selection:project.task,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: project
 #: view:project.project:0
@@ -258,12 +258,12 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Avslutade aktiviteter"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Aktiviteten är avslutad"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -295,7 +295,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Utfört av"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -307,24 +307,24 @@ msgstr "Alla uppgifter"
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planering"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Tilläggsinformation"
 
 #. module: project
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: project
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planerade timmar"
 
 #. module: project
 #: view:project.project:0
@@ -350,13 +350,13 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr ""
+msgstr "Mina projekt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 msgid "All projects"
-msgstr ""
+msgstr "Alla projekt"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -376,17 +376,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Ny aktivitetsbeskrivning"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Intern beskrivning av projektet"
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Överliggande projekt"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -402,19 +402,19 @@ msgstr "Typ"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Veckor"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr ""
+msgstr "Mina pågående aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr ""
+msgstr "Nytt projekt"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -426,17 +426,17 @@ msgstr ""
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Återstående timmar"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 msgid "Project task type"
-msgstr ""
+msgstr "Projekt aktivitetstyp"
 
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Planerade timmar"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -448,7 +448,7 @@ msgstr ""
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Timmar"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
@@ -461,7 +461,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr ""
+msgstr "Pågående aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
@@ -478,7 +478,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Mina projekt"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
@@ -488,7 +488,7 @@ msgstr ""
 #. module: project
 #: selection:project.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Mall"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -500,23 +500,23 @@ msgstr "Konfiguration"
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
 #: view:project.project:0
 msgid "Projects"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "Aktivitetsdetaljer"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
@@ -559,13 +559,13 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_main
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projekt"
 
 #. module: project
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Nedlagd tid"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
@@ -576,13 +576,13 @@ msgstr "Uppgifter"
 #. module: project
 #: view:project.task.type:0
 msgid "Task type"
-msgstr ""
+msgstr "Aktivitetstyp"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr ""
+msgstr "Ny aktivitet"
 
 #. module: project
 #: help:project.project,timesheet_id:0
@@ -608,7 +608,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. module: project
 #: view:project.project:0
@@ -618,7 +618,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planerad"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -633,17 +633,17 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Information"
 
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Granska"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Administration"
 
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
@@ -660,7 +660,7 @@ msgstr ""
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Preliminär"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -670,7 +670,7 @@ msgstr "Låg"
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Projektledare"
 
 #. module: project
 #: view:project.project:0
@@ -679,12 +679,12 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Väntande"
 
 #. module: project
 #: field:project.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: help:project.task.delegate,init,state:0
@@ -702,17 +702,17 @@ msgstr ""
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Projektnamn"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
 msgid "Send Message"
-msgstr ""
+msgstr "Skicka meddelande"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Total tid"
 
 #. module: project
 #: field:project.task,active:0
@@ -722,12 +722,12 @@ msgstr "Aktiv"
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Fel"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
 msgid "Quotation"
-msgstr ""
+msgstr "Offert"
 
 #. module: project
 #: view:project.task:0
@@ -744,17 +744,17 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Öppna aktivitet"
 
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Arbetstid"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Månader"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -764,7 +764,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -852,7 +852,7 @@ msgstr ""
 #. module: project
 #: field:project.project,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: field:project.task,name:0
@@ -879,7 +879,7 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
-msgstr ""
+msgstr "Klar"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -890,17 +890,17 @@ msgstr ""
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr ""
+msgstr "Skapa en aktivitet"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr ""
+msgstr "Öppna"
 
 #. module: project
 #: view:project.project:0
@@ -910,7 +910,7 @@ msgstr ""
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: project
 #: constraint:ir.model:0
@@ -942,7 +942,7 @@ msgstr "Mycket låg"
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr ""
+msgstr "Skicka epost till kunden"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -979,13 +979,13 @@ msgstr ""
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Aktivtetsfaktura"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_open
 msgid "Projects Structure"
-msgstr ""
+msgstr "Projektstruktur"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
@@ -995,7 +995,7 @@ msgstr ""
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Avslutat arbete"
 
 #. module: project
 #: selection:project.project,state:0
@@ -1029,7 +1029,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr ""
+msgstr "Ny funktion"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1039,17 +1039,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Din aktivitets titel"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Projektaktivitet"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Nedlagda timmar"
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1066,7 +1066,7 @@ msgstr ""
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvens"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1103,7 +1103,7 @@ msgstr "Slutdatum"
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Tilldela till"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1135,4 +1135,4 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr ""
+msgstr "Pågående projekt"

addons/purchase/i18n/bg.po

@@ -7,19 +7,19 @@ 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-09-08 16:29+0000\n"
+"PO-Revision-Date: 2010-02-22 21:23+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2009-12-16 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr ""
+msgstr "Фактуриран и платен"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
@@ -29,7 +29,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,location_id:0
 msgid "Destination"
-msgstr ""
+msgstr "Назначение"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
@@ -39,52 +39,52 @@ msgstr ""
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Validated By"
-msgstr ""
+msgstr "Проверрено от"
 
 #. module: purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаване на действие"
 
 #. module: purchase
 #: field:purchase.order,partner_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "Доставчик"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Delivery"
-msgstr ""
+msgstr "Доставка"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Количество"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Order"
-msgstr ""
+msgstr "От поръчка"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_confirmpurchaseorder0
 msgid "Confirmed Purchase"
-msgstr ""
+msgstr "Потвърдена поръчка"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Грешка при фактуриране"
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr ""
+msgstr "Ценова листа при покупка (по подрабиране)"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
 msgid "Create invoice"
-msgstr ""
+msgstr "Създаване на фактура"
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -92,11 +92,13 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
+"За поръчки от текущия партньор ще се използва тази ценова листа вместо тази "
+"по подразбиране"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Факс :"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
@@ -113,33 +115,33 @@ msgstr ""
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
 msgid "Purchase Process"
-msgstr ""
+msgstr "Обработка на покупка"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
 msgid "Invoice from Packing list"
-msgstr ""
+msgstr "Фактура от списък за пакетиране"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Purchase"
-msgstr ""
+msgstr "Одобряване на покупказ"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Одобрен"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_form_action4
 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action4
 msgid "Purchase Orders in Progress"
-msgstr ""
+msgstr "Активни заявки за покупка"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Необложена сума"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -147,14 +149,14 @@ msgstr ""
 #: view:purchase.order.line:0
 #: field:purchase.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Бележки"
 
 #. module: purchase
 #: rml:purchase.order:0
 #: field:purchase.order,amount_tax:0
 #: field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Данъци"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -163,22 +165,22 @@ msgstr ""
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Поръчка за покупка"
 
 #. module: purchase
 #: rml:purchase.quotation:0
 msgid "Regards,"
-msgstr ""
+msgstr "Благодарности,"
 
 #. module: purchase
 #: rml:purchase.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Общо нето :"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отказан"
 
 #. module: purchase
 #: help:purchase.order,state:0

addons/sale/i18n/pl.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-20 15:42+0000\n"
+"Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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: 2009-12-16 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -860,6 +860,16 @@ msgid ""
 "  - The 'Invoice from the packing' choice is used to create an invoice "
 "during the packing process."
 msgstr ""
+"Zasady wysyłki są stosowane do synchronizowania operacji fakturowych i "
+"wysyłkowych.\n"
+"  - 'Płać przed wysyłką' najpierw wygeneruje fakturę a potem, po otrzymaniu "
+"wpłaty, wygeneruje zamówienie wysyłki.\n"
+"  - 'Wysyłka i faktura ręczna' utworzy zamówienie wysyłki od razu i poczeka, "
+"aż użytkownik naciśnie przycisk 'Faktura', aby wygenerować projekt faktury.\n"
+"  - 'Faktura wg zamówienia po postawie' utworzy projekt faktury po wysyłce "
+"na podstawie zamówienia.\n"
+"  - 'Faktura wg wysyłki' jest stosowana do tworzenia faktury w trakcie "
+"procesu wysyłki."
 
 #. module: sale
 #: rml:sale.order:0
@@ -947,6 +957,11 @@ msgid ""
 "'Waiting Schedule' state is set when the invoice is confirmed but waiting "
 "for the scheduler to run on the date 'Date Ordered'."
 msgstr ""
+"Podaje stan oferty lub zamówienia sprzedaży. Stan wyjątku jest ustawiany "
+"automatycznie gdy wystąpi operacja anulowania w trakcie zatwierdzania "
+"faktury (Wyjątek faktury) lub w procesie listy przesunięć (Wyjątek wysyłki). "
+"Stan 'Oczekiwanie na planistę' jest ustawiany, gdy faktura jest zatwierdzona "
+"ale oczekuje na planistę, aby uruchomił akcję dla daty zamówienia."
 
 #. module: sale
 #: view:sale.order:0

addons/sale_journal/i18n/bg.po

@@ -7,130 +7,130 @@ 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-09-08 16:34+0000\n"
+"PO-Revision-Date: 2010-02-21 20:40+0000\n"
 "Last-Translator: lem0na <nickyk@gmx.net>\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: 2009-12-16 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
 msgid "Monthly sales"
-msgstr ""
+msgstr "Месечни продажби"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_assigned
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_assigned
 msgid "Assigned packing"
-msgstr ""
+msgstr "Назначени пакетирания"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "assigned"
-msgstr ""
+msgstr "назначен"
 
 #. module: sale_journal
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Невалидно име на модел при задаване на действие"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Очакващ график"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "to be invoiced"
-msgstr ""
+msgstr "за фактуриране"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_journal
 #: view:sale_journal.sale.journal:0
 #: field:stock.picking,sale_journal_id:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Дневник продажби"
 
 #. module: sale_journal
 #: field:sale_journal.sale.journal,sale_stats_ids:0
 msgid "Sale Stats"
-msgstr ""
+msgstr "Състояние на продажба"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "waiting"
-msgstr ""
+msgstr "чакащ"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Пращане в проект"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date:0
 #: field:sale_journal.sale.journal,date:0
 msgid "Journal date"
-msgstr ""
+msgstr "Дата от дневник"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_invoice_method
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_all
 #: model:ir.ui.menu,name:sale_journal.menu_invoice_type_picking_stats_open_menu
 msgid "Packing by Invoice Method"
-msgstr ""
+msgstr "Пакетиране според метода на фактуриране"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking
 msgid "Packing Journals"
-msgstr ""
+msgstr "Дневници на пакетиране"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 #: view:sale_journal.sale.journal:0
 msgid "Notes"
-msgstr ""
+msgstr "Бележки"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_my
 msgid "My open journals"
-msgstr ""
+msgstr "Моите отворени дневници"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,count:0
 #: field:sale_journal.picking.stats,count:0
 #: field:sale_journal.sale.stats,count:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# от редове"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_picking_byjournal_all
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_sales_all_open
 msgid "All Open Journals"
-msgstr ""
+msgstr "Всички отворени дневници"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
 msgid "Managing sales and deliveries by journal"
-msgstr ""
+msgstr "Управление на продажби и доставки по дневник"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "done"
-msgstr ""
+msgstr "готов"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,price_average:0
 #: field:sale_journal.picking.stats,price_average:0
 #: field:sale_journal.sale.stats,price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Средна цена"
 
 #. module: sale_journal
 #: constraint:ir.ui.view:0
@@ -140,14 +140,14 @@ msgstr "Невалиден XML за преглед на архитектурат
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
 msgid "Grouped"
-msgstr ""
+msgstr "Групиран"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,state:0
 #: field:sale_journal.picking.stats,state:0
 #: field:sale_journal.sale.journal,state:0
 msgid "State"
-msgstr ""
+msgstr "Състояние"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_reporting_all
@@ -160,12 +160,12 @@ msgstr "Всички месеци"
 #: field:sale_journal.picking.stats,price_total:0
 #: field:sale_journal.sale.stats,price_total:0
 msgid "Total Price"
-msgstr ""
+msgstr "Обща цена"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal
 msgid "Packing journals"
-msgstr ""
+msgstr "Дневник на опаковане"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_report_sales
@@ -175,42 +175,42 @@ msgstr "Справки"
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree_my
 msgid "My open packing journals"
-msgstr ""
+msgstr "Моите отворени дневници на опаковане"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_journal_sale_stats
 msgid "Sales Orders by Journal"
-msgstr ""
+msgstr "Поръчки за продажби по дневник"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_tree_all
 msgid "Open journals"
-msgstr ""
+msgstr "Отваряне на дневници"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Packing"
-msgstr ""
+msgstr "Опаковане"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and packing."
-msgstr ""
+msgstr "Вида дневник използван при продажби и пакетиране"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,invoice_state:0
 msgid "None"
-msgstr ""
+msgstr "Няма"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_sale_sale_stats_open_menu_month
 msgid "Sales by journal (this month)"
-msgstr ""
+msgstr "Продажби по дневник (този месец)"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Manual in progress"
-msgstr ""
+msgstr "Ръчно в изпълнение"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_picking_journal_tree
@@ -218,141 +218,141 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_picking_picking_stats_open_menu_month
 msgid "Packing by journal"
-msgstr ""
+msgstr "Пакетиране по дневник"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0
 msgid "Cancel Packing"
-msgstr ""
+msgstr "Прекратяване на пакетиране"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_picking_journal_2_stock_picking_confirmed
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_stock_picking_confirmed
 msgid "Confirmed packing"
-msgstr ""
+msgstr "Потвърдени опакования"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "In progress"
-msgstr ""
+msgstr "В развитие"
 
 #. module: sale_journal
 #: view:sale_journal.picking.stats:0
 msgid "Packing by journals"
-msgstr ""
+msgstr "Опаковане по дневник"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,name:0
 #: field:sale_journal.picking.stats,name:0
 #: field:sale_journal.sale.stats,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месец"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type.stats,invoice_state:0
 msgid "Invoice state"
-msgstr ""
+msgstr "Състояние на фактура"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_all
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_picking_stats_open_menu_month
 #: view:sale_journal.invoice.type.stats:0
 msgid "Packing by invoice method"
-msgstr ""
+msgstr "Опаковане според метод на фактуриране"
 
 #. module: sale_journal
 #: field:sale_journal.sale.stats,state:0
 msgid "Order State"
-msgstr ""
+msgstr "Състояние на поръчка"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Грешка при доставка"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 #: field:sale_journal.picking.journal,note:0
 #: field:sale_journal.sale.journal,note:0
 msgid "Note"
-msgstr ""
+msgstr "Бележка"
 
 #. module: sale_journal
 #: selection:sale_journal.picking.journal,state:0
 #: selection:sale_journal.sale.journal,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Проект"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "cancel"
-msgstr ""
+msgstr "отказан"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Грешла при фактура"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_validation:0
 #: field:sale_journal.sale.journal,date_validation:0
 msgid "Validation date"
-msgstr ""
+msgstr "Дата на проверка"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type.stats,state:0
 #: selection:sale_journal.picking.stats,state:0
 msgid "draft"
-msgstr ""
+msgstr "проект"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активен"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_draft
 msgid "Draft sales"
-msgstr ""
+msgstr "Продажби в проект"
 
 #. module: sale_journal
 #: selection:sale_journal.sale.stats,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "Запитване"
 
 #. module: sale_journal
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal
 msgid "Sales Journals"
-msgstr ""
+msgstr "Дневници за продажби"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_invoice_type_tree
 msgid "sale_journal.invoice.type.tree"
-msgstr ""
+msgstr "sale_journal.invoice.type.tree"
 
 #. module: sale_journal
 #: view:sale_journal.sale.journal:0
 msgid "Confirm Sales"
-msgstr ""
+msgstr "Потвърждаване на продажби"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,date_created:0
 #: field:sale_journal.picking.journal,state:0
 #: field:sale_journal.sale.journal,date_created:0
 msgid "Creation date"
-msgstr ""
+msgstr "Дата на създаване"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Method"
-msgstr ""
+msgstr "Метод на фактуриране"
 
 #. module: sale_journal
 #: field:sale_journal.picking.journal,code:0
 #: field:sale_journal.sale.journal,code:0
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #. module: sale_journal
 #: view:sale_journal.picking.journal:0

addons/stock/__init__.py

@@ -27,6 +27,8 @@ import report
 import wizard
 import report_stock
 
+import stock_wizard
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/stock/__terp__.py

@@ -45,6 +45,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "stock_data.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",
+        "stock_wizard_view.xml", 
         "stock_view.xml",
         "stock_report.xml",
         "stock_sequence.xml",

addons/stock/i18n/es.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-01-04 12:56+0000\n"
-"Last-Translator: Hilario J. Montoliu (hjmf) <Unknown>\n"
+"PO-Revision-Date: 2010-02-22 23:58+0000\n"
+"Last-Translator: Rodrigo Testa <rod-95@live.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-01-05 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -658,6 +658,11 @@ msgstr "Fecha realizado"
 msgid "Expected Shipping Date"
 msgstr "Fecha de envío prevista"
 
+#. module: stock
+#: rml:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr "Dirección de envío:"
+
 #. module: stock
 #: view:stock.tracking:0
 msgid "Tracking/Serial"

addons/stock/i18n/pl.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-02-18 15:41+0000\n"
+"PO-Revision-Date: 2010-02-20 15:47+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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-02-20 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -44,13 +44,13 @@ msgstr ""
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 #: model:ir.ui.menu,name:stock.menu_stock_root
 msgid "Inventory Management"
-msgstr ""
+msgstr "Inwentaryzacja"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -571,7 +571,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Lewy nadrzędny"
 
 #. module: stock
 #: field:report.stock.lines.date,create_date:0
@@ -1375,7 +1375,7 @@ msgstr "Stan faktury"
 #. module: stock
 #: rml:lot.location:0
 msgid "Units"
-msgstr ""
+msgstr "Jednostki"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1630,7 +1630,7 @@ msgstr "Incoterms"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr ""
+msgstr "Suma:"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1685,7 +1685,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_workshop
 msgid "Workshop"
-msgstr ""
+msgstr "Sklep"
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -2271,6 +2271,8 @@ msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
 msgstr ""
+"Planowana data przesunięcia produktów lub rzeczywista data, jeśli "
+"przesunięcie już nastąpiło."
 
 #. module: stock
 #: view:stock.picking:0

addons/stock/stock.py

@@ -20,11 +20,12 @@
 ##############################################################################
 
 from mx import DateTime
-import time
-import netsvc
 from osv import fields, osv
 from tools import config
 from tools.translate import _
+import math
+import netsvc
+import time
 import tools
 
 
@@ -856,12 +857,15 @@ class stock_production_lot(osv.osv):
     def name_get(self, cr, uid, ids, context={}):
         if not ids:
             return []
-        reads = self.read(cr, uid, ids, ['name', 'ref'], context)
+        reads = self.read(cr, uid, ids, ['name', 'prefix', 'ref'], context)
         res = []
         for record in reads:
             name = record['name']
+            prefix = record['prefix']
+            if prefix:
+                name = prefix + '/' + name
             if record['ref']:
-                name = name + '/' + record['ref']
+                name = '%s [%s]' % (name, record['ref'])
             res.append((record['id'], name))
         return res
 
@@ -905,7 +909,8 @@ class stock_production_lot(osv.osv):
 
     _columns = {
         'name': fields.char('Serial', size=64, required=True),
-        'ref': fields.char('Internal Reference', size=64),
+        'ref': fields.char('Internal Reference', size=256),
+        'prefix': fields.char('Prefix', size=64),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'date': fields.datetime('Created Date', required=True),
         'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Available", select="2"),
@@ -923,72 +928,6 @@ class stock_production_lot(osv.osv):
 
 stock_production_lot()
 
-class stock_split_production_lots(osv.osv_memory):
-    _name = "stock.split.production.lots"
-    _description = "Split Production Lots"
-
-    def _quantity_default_get(self, cr, uid, object=False, field=False, context=None):
-        cr.execute("select %s from %s where id=%s" %(field,object,context.get('active_id')))
-        res = cr.fetchone()[0]
-        return res
-
-    _columns = {
-        'name': fields.char('Lot Number/Prefix', size=64, required=True),
-        'qty': fields.float('Total Quantity'),
-        'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
-    }
-    _defaults = {
-                 'qty': lambda self,cr,uid,c: self.pool.get('stock.split.production.lots')._quantity_default_get(cr, uid, 'stock_move', 'product_qty',context=c) or 1,
-    }
-
-    def split_lines(self, cr, uid, ids, context={}):
-        data = self.read(cr, uid, ids[0])
-        prodlot_obj = self.pool.get('stock.production.lot')
-        move_obj = self.pool.get('stock.move')
-        move_browse = move_obj.browse(cr, uid, context['active_id'])
-
-        quantity = data['qty']
-        if quantity <= 0 or move_browse.product_qty == 0:
-            return {}
-        uos_qty = quantity/move_browse.product_qty*move_browse.product_uos_qty
-
-        quantity_rest = move_browse.product_qty%quantity
-        uos_qty_rest = quantity_rest/move_browse.product_qty*move_browse.product_uos_qty
-
-        update_val = {
-            'product_qty': quantity,
-            'product_uos_qty': uos_qty,
-        }
-
-        new_move = []
-        for idx in range(int(move_browse.product_qty//quantity)):
-            if idx:
-                current_move = move_obj.copy(cr, uid, move_browse.id, {'state': move_browse.state})
-                new_move.append(current_move)
-            else:
-                current_move = move_browse.id
-            new_prodlot = prodlot_obj.create(cr, uid, {'name': data['name'], 'ref': '%d'%idx}, {'product_id': move_browse.product_id.id})
-            update_val['prodlot_id'] = new_prodlot
-            move_obj.write(cr, uid, [current_move], update_val)
-
-        if quantity_rest > 0:
-            idx = int(move_browse.product_qty//quantity)
-            update_val['product_qty'] = quantity_rest
-            update_val['product_uos_qty'] = uos_qty_rest
-            if idx:
-                current_move = move_obj.copy(cr, uid, move_browse.id, {'state': move_browse.state})
-                new_move.append(current_move)
-            else:
-                current_move = move_browse.id
-            new_prodlot = prodlot_obj.create(cr, uid, {'name': data['name'], 'ref': '%d'%idx}, {'product_id': move_browse.product_id.id})
-            update_val['prodlot_id'] = new_prodlot
-            move_obj.write(cr, uid, [current_move], update_val)
-
-        return {}
-
-stock_split_production_lots()
-
-
 class stock_production_lot_revision(osv.osv):
     _name = 'stock.production.lot.revision'
     _description = 'Production lot revisions'
@@ -1491,7 +1430,133 @@ class stock_move(osv.osv):
                 raise osv.except_osv(_('UserError'),
                         _('You can only delete draft moves.'))
         return super(stock_move, self).unlink(
-            cr, uid, ids, context=context)
+            cr, uid, ids, context=context)    
+
+    def split_lines(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, context=None):
+        prodlot_obj = self.pool.get('stock.production.lot')
+        ir_sequence_obj = self.pool.get('ir.sequence')
+
+        sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+        if not sequence:
+            raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
+        new_move = []      
+
+        def _create_lot(move_id, product_id):
+            prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix': prefix}, {'product_id': product_id})
+            prodlot = prodlot_obj.browse(cr, uid, prodlot_id) 
+            ref = '%d' % (move_id)
+            if prodlot.ref:
+                ref = '%s, %s' % (prodlot.ref, ref) 
+            prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
+            return prodlot_id
+
+        for move in self.browse(cr, uid, ids):            
+            if split_by_qty <= 0 or quantity == 0:
+                return res
+
+            uos_qty = split_by_qty / move.product_qty * move.product_uos_qty
+
+            quantity_rest = quantity % split_by_qty
+            uos_qty_rest = split_by_qty / move.product_qty * move.product_uos_qty
+
+            update_val = {
+                'product_qty': split_by_qty,
+                'product_uos_qty': uos_qty,
+            }                
+            for idx in range(int(quantity//split_by_qty)):
+                if idx:        
+                    current_move = self.copy(cr, uid, move.id, {'state': move.state})
+                    new_move.append(current_move)
+                else:
+                    current_move = move.id
+                
+
+                update_val['prodlot_id'] = _create_lot(current_move, move.product_id.id)
+                self.write(cr, uid, [current_move], update_val)
+        
+            
+            if quantity_rest > 0:
+                idx = int(quantity//split_by_qty)
+                update_val['product_qty'] = quantity_rest
+                update_val['product_uos_qty'] = uos_qty_rest
+                if idx:        
+                    current_move = self.copy(cr, uid, move.id, {'state': move.state})
+                    new_move.append(current_move)
+                else:
+                    current_move = move.id                
+                update_val['prodlot_id'] = _create_lot(current_move, move.product_id.id)
+                self.write(cr, uid, [current_move], update_val)
+        return new_move
+
+    def consume_moves(self, cr, uid, ids, quantity, location_id, context=None):
+        new_move = []
+        if not context:
+            context = {}        
+        if quantity <= 0:
+            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
+       
+        for move in self.browse(cr, uid, ids, context=context):
+            move_qty = move.product_qty
+            quantity_rest = move.product_qty
+
+            quantity_rest -= quantity
+            uos_qty = quantity / move_qty * move.product_uos_qty
+            uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
+            if quantity_rest <= 0:
+                quantity_rest = quantity
+                break
+
+            default_val = {
+                'product_qty': quantity, 
+                'product_uos_qty': uos_qty,
+                'location_id' : location_id,                
+            }
+            if move.product_id.track_production:
+                new_move = self.split_lines(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
+            else:
+                current_move = self.copy(cr, uid, move.id, default_val)
+                new_move.append(current_move)
+
+            update_val = {}
+            if quantity_rest > 0:                        
+                update_val['product_qty'] = quantity_rest
+                update_val['product_uos_qty'] = uos_qty_rest                          
+                self.write(cr, uid, [move.id], update_val)
+            
+            self.action_done(cr, uid, new_move)
+        return new_move
+
+    def scrap_moves(self, cr, uid, ids, quantity, location_dest_id, context=None):
+        new_move = []     
+        if quantity <= 0:
+            raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
+        
+        for move in self.browse(cr, uid, ids, context=context):
+            location = move.location_dest_id.id
+            move_qty = move.product_qty
+            quantity_rest = move.product_qty
+
+            quantity_rest -= quantity
+            uos_qty = quantity / move_qty * move.product_uos_qty
+            uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
+            if quantity_rest <= 0:
+                quantity_rest = quantity
+                break
+        
+            default_val = {
+                'product_qty': quantity, 
+                'product_uos_qty': uos_qty,
+                'location_dest_id' : location_dest_id,
+                'state': move.state
+            }
+            current_move = self.copy(cr, uid, move.id, default_val)
+            new_move.append(current_move)
+            update_val = {}
+            if quantity_rest > 0:                        
+                update_val['product_qty'] = quantity_rest
+                update_val['product_uos_qty'] = uos_qty_rest                          
+                self.write(cr, uid, [move.id], update_val)
+        return new_move
 
 stock_move()
 

addons/stock/stock_view.xml

@@ -217,6 +217,7 @@
 	                	<page string="Production Lot">
 		                    <field name="name" select="1"/>
 		                    <field name="ref" select="2"/>
+                            <field name="prefix" select="1"/>
 		                    <field name="product_id" select="1"/>
 		                    <field name="stock_available"/>
 		                    <field name="date" select="2"/>
@@ -496,34 +497,7 @@
             <field name="auto_refresh" eval="1"/>
             <field name="target">new</field>
             <field name="context">{'action_id': active_id}</field>
-        </record>
-
-
-    	<record id="view_stock_split_production_lots" model="ir.ui.view">
-            <field name="name">Split Production Lots</field>
-            <field name="model">stock.split.production.lots</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Split Production Lots">
-                	<group col="4" colspan="4">
-	                   <field name="name"/>
-	                   <field name="qty" attrs="{'readonly':[('action','!=','split')]}"/>
-	                   <field name="action" colspan="4"/>
-                    </group>
-                    <newline/>
-                    <button name="split_lines" string="Ok" type="object" icon="gtk-go-forward"/>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_view_stock_split_production_lots" model="ir.actions.act_window">
-            <field name="name">Split Production Lots</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.split.production.lots</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
+        </record>    	
 
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
@@ -574,6 +548,28 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
+                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                    <field name="name" string="Move Name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="UOM"/>
+                                    <field name="picking_id" select="1"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="date_planned"/>
+                                    <field name="state"/> 
+                                    <button
+                           				name="%(stock.track_line)d"
+                           				string="Split in production lots"
+                           				type="action" icon="gtk-justify-fill"
+                           				states="done,cancel" />
+                           			<button
+                           				name="%(stock.move_scrap)d"
+                           				string="D" type="action"
+                           				icon="gtk-convert"
+                           				states="done,cancel" />
+                                </tree>
                                 <form string="Stock Moves">
                                 	<notebook colspan="4">
                                 		<page string="General Information">
@@ -598,6 +594,7 @@
 		                                    <newline/>
 		                                    <label/>
 		                                    <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
 		                                    <separator colspan="4" string="Move State"/>
 		                                    <field name="state" select="1"/>
 		                                    <group>
@@ -707,6 +704,28 @@
                         <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
+                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                    <field name="name" string="Move Name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="UOM"/>
+                                    <field name="picking_id" select="1"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="date_planned"/>
+                                    <field name="state"/> 
+                                    <button
+                           				name="%(stock.track_line)d"
+                           				string="Split in production lots"
+                           				type="action" icon="gtk-justify-fill"
+                           				states="done,cancel" />
+                           			<button
+                           				name="%(stock.move_scrap)d"
+                           				string="D" type="action"
+                           				icon="gtk-convert"
+                           				states="done,cancel" />
+                                </tree>
                                 <form string="Stock Moves">
                                 	<notebook colspan="4">
                                 		<page string="General Information">
@@ -865,6 +884,28 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
+                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
+                                    <field name="name" string="Move Name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="UOM"/>
+                                    <field name="picking_id" select="1"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="date_planned"/>
+                                    <field name="state"/> 
+                                    <button
+                           				name="%(stock.track_line)d"
+                           				string="Split in production lots"
+                           				type="action" icon="gtk-justify-fill"
+                           				states="done,cancel" />
+                           			<button
+                           				name="%(stock.move_scrap)d"
+                           				string="D" type="action"
+                           				icon="gtk-convert"
+                           				states="done,cancel" />
+                                </tree>
                                 <form string="Stock Moves">
                                 	<notebook colspan="4">
  										<page string="General Information">
@@ -1025,14 +1066,24 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_in_id': address_id}">
-                                <tree string="Stock Moves">
+                                <tree colors="grey:state in ('cancel');black:state not in ('cancel')" string="Stock Moves">
                                     <field name="product_id"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="location_dest_id"/>
                                     <field name="prodlot_id"/>
                                     <field name="state"/>
-                                </tree>
+                                    <button
+                           				name="%(stock.track_line)d"
+                           				string="Split in production lots"
+                           				type="action" icon="gtk-justify-fill"
+                           				states="done,cancel" />
+                           			<button
+                           				name="%(stock.move_scrap)d"
+                           				string="D" type="action"
+                           				icon="gtk-convert"
+                           				states="done,cancel" />
+                                </tree>                                
                                 <form string="Stock Moves">
                                 	<notebook colspan="4">
                                 		<page string="General Information">
@@ -1199,7 +1250,7 @@
                     <field name="location_id"/>
                     <field name="location_dest_id"/>
                     <field name="date_planned"/>
-                    <field name="state"/>
+                    <field name="state"/>                    
                 </tree>
             </field>
         </record>

addons/stock/stock_wizard.py

@@ -0,0 +1,206 @@
+# -*- 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
+from tools.translate import _
+
+class stock_move_track(osv.osv_memory):
+    _name = "stock.move.track"
+    _description = "Track moves"
+    
+    _columns = {
+        'tracking_prefix': fields.char('Tracking prefix', size=64), 
+        'quantity': fields.float("Quantity per lot")
+              }
+
+    _defaults = {
+        'quantity': lambda *x: 1
+                 }
+    
+    def track_lines(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids)[0]
+        move_obj = self.pool.get('stock.move')
+        move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
+        return {}
+
+stock_move_track()
+
+class stock_move_consume(osv.osv_memory):
+    _name = "stock.move.consume"
+    _description = "Consume Products"
+    
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True), 
+        'product_qty': fields.float('Quantity', required=True), 
+        'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 
+        'location_id': fields.many2one('stock.location', 'Location', required=True)
+              }
+
+    def _get_product_id(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_id.id
+    
+    def _get_product_qty(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_qty
+    
+    def _get_product_uom(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_uom.id
+    
+    def _get_location_id(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.location_id.id
+    
+    _defaults = {
+                 'product_id': _get_product_id, 
+                 'product_qty': _get_product_qty, 
+                 'product_uom': _get_product_uom, 
+                 'location_id': _get_location_id
+                 }
+
+    def do_move_consume(self, cr, uid, ids, context={}):
+        move_obj = self.pool.get('stock.move')
+        move_ids = context['active_ids']
+        for data in self.read(cr, uid, ids):            
+            move_obj.consume_moves(cr, uid, move_ids, 
+                             data['product_qty'], data['location_id'], 
+                             context=context)
+        return {}
+
+stock_move_consume()
+
+
+class stock_move_scrap(osv.osv_memory):
+    _name = "stock.move.scrap"
+    _description = "Scrap Products"
+    _inherit = "stock.move.consume"
+    
+    _defaults = {
+                 'location_id': lambda *x: False
+    }
+
+    def move_scrap(self, cr, uid, ids, context={}):
+        move_obj = self.pool.get('stock.move')        
+        move_ids = context['active_ids']
+        for data in self.read(cr, uid, ids):
+            move_obj.scrap_moves(cr, uid, move_ids, 
+                             data['product_qty'], data['location_id'], 
+                             context=context)
+        return {}
+
+stock_move_scrap()
+
+
+class spilt_in_production_lot(osv.osv_memory):
+    _name = "stock.move.spilt"
+    _description = "Split in Production lots"
+    
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
+        'line_ids': fields.one2many('stock.move.spilt.lines', 'lot_id', 'Lots Number')
+     }
+    
+    def _get_product_id(self, cr, uid, context):
+        move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
+        return move.product_id.id
+    
+    _defaults = {
+                 'product_id': _get_product_id, 
+                 }
+
+    def split_lot(self, cr, uid, ids, context=None):
+        self.split(cr, uid, ids, context.get('active_ids'), context=context)
+        return {}
+
+    def split(self, cr, uid, ids, move_ids, context=None):
+        prodlot_obj = self.pool.get('stock.production.lot')
+        ir_sequence_obj = self.pool.get('ir.sequence')
+        move_obj = self.pool.get('stock.move')
+        new_move = []        
+        for data in self.browse(cr, uid, ids):
+            for move in move_obj.browse(cr, uid, move_ids):
+                move_qty = move.product_qty
+                quantity_rest = move.product_qty
+                uos_qty_rest = move.product_uos_qty
+                new_move = []                            
+                for line in data.line_ids:
+                    quantity = line.quantity
+                    
+
+                    if quantity <= 0 or move_qty == 0:
+                        continue
+                    quantity_rest -= quantity
+                    uos_qty = quantity / move_qty * move.product_uos_qty
+                    uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
+                    if quantity_rest <= 0:
+                        quantity_rest = quantity
+                        break
+                    default_val = {
+                        'product_qty': quantity, 
+                        'product_uos_qty': uos_qty, 
+                        'state': move.state
+                    }
+                    current_move = move_obj.copy(cr, uid, move.id, default_val)
+                    new_move.append(current_move)
+                    prodlot_id = False
+                    if line.use_exist and line.name:
+                        prodlot_id = prodlot_obj.search(cr, uid, [('prefix','=',line.name),('product_id','=',data.product_id.id)])
+                        if prodlot_id:
+                            prodlot_id = prodlot_id[0]                    
+                    if not prodlot_id:
+                        sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
+                        prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence, 'prefix' : line.name}, 
+                                                 {'product_id': move.product_id.id})                    
+                    move_obj.write(cr, uid, [current_move], {'prodlot_id': prodlot_id})
+                    prodlot = prodlot_obj.browse(cr, uid, prodlot_id) 
+                    ref = '%d' % (current_move)
+                    if prodlot.ref:
+                        ref = '%s, %s' % (prodlot.ref, ref) 
+                    prodlot_obj.write(cr, uid, [prodlot_id], {'ref': ref})
+                    
+                    update_val = {}
+                    if quantity_rest > 0:                        
+                        update_val['product_qty'] = quantity_rest
+                        update_val['product_uos_qty'] = uos_qty_rest                          
+                        move_obj.write(cr, uid, [move.id], update_val)
+
+                    
+        return new_move
+spilt_in_production_lot()
+
+class stock_move_spilt_lines(osv.osv_memory):
+    _name = "stock.move.spilt.lines"
+    _description = "Split lines"
+    
+    _columns = {
+        'name': fields.char('Tracking serial', size=64), 
+        'quantity': fields.integer('Quantity'), 
+        'use_exist' : fields.boolean('Use Exist'),
+        'lot_id': fields.many2one('stock.move.spilt', 'Lot'),
+        'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
+    }
+    _defaults = {
+        'quantity': lambda *x: 1,
+        'action' : lambda *x: 'split', 
+    }
+
+stock_move_spilt_lines()

addons/stock/stock_wizard.xml

@@ -28,13 +28,6 @@
             name="stock.partial_move"
             string="Partial Move"/>
 
-    <wizard
-        id="track_line"
-        model="stock.move"
-        multi="True"
-        name="stock.move.track"
-        string="Track line"/>
-        
     <wizard
         id="split_inventory_lots"
         model="stock.inventory.line"
@@ -85,5 +78,6 @@
         model="stock.location"
         name="stock.location.products"
         string="Products by Location"/>
-    </data>
+            
+   </data>        
 </openerp>

addons/stock/stock_wizard_view.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+	    <record id="view_stock_move_track_wizard" model="ir.ui.view">
+	            <field name="name">Tracking a move</field>
+	            <field name="model">stock.move.track</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Tracking a move">
+	                	<field name="tracking_prefix" colspan="4"/>
+	                	<field name="quantity" colspan="4"/>
+	                	<newline/>
+	                	<separator string="" colspan="4" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="track_lines" string="Ok"
+	                		type="object" icon="gtk-ok" />
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="track_line_old" model="ir.actions.act_window">
+	            <field name="name">Tracking a move</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">stock.move.track</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>
+	        
+        
+        <!--  Consume, scrap move -->
+        
+		<record id="view_stock_move_consume_wizard" model="ir.ui.view">
+            <field name="name">Consume Move</field>
+            <field name="model">stock.move.consume</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Consume Move">
+                	<separator string="Consume Products" colspan="4"/>
+				    <field name="product_id" colspan="4" readonly="1"/>
+				    <field name="location_id" colspan="4"/>
+				    <field name="product_qty" colspan="2"/>
+				    <field name="product_uom" nolabel="1" readonly="1"/>
+                	<newline/>
+                	<separator string="" colspan="4" />
+                	<label string="" colspan="2" />
+                	<group col="2" colspan="1">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="do_move_consume" string="Ok"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="move_consume" model="ir.actions.act_window">
+            <field name="name">Consume Move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.move.consume</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+       <record id="view_stock_move_scrap_wizard" model="ir.ui.view">
+            <field name="name">Scrap Move</field>
+            <field name="model">stock.move.scrap</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Scrap Move">
+                	<separator string="Scrap Products" colspan="4"/>
+				    <field name="product_id" colspan="4" readonly="1"/>
+				    <field name="location_id" colspan="4" string="Dest. Location" domain="[('usage','&lt;&gt;','view')]"/>
+				    <field name="product_qty" colspan="2"/>
+				    <field name="product_uom" nolabel="1" readonly="1"/>
+                	<newline/>
+                	<separator string="" colspan="4" />
+                	<label string="" colspan="2" />
+                	<group col="2" colspan="1">
+                		<button icon='gtk-cancel' special="cancel"
+                			string="Cancel" />
+                		<button name="move_scrap" string="Ok"
+                			colspan="1" type="object" icon="gtk-ok" />
+                	</group>
+                </form>
+            </field>
+        </record>
+
+        <record id="move_scrap" model="ir.actions.act_window">
+            <field name="name">Scrap Move</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.move.scrap</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        <record id="view_split_in_lots" model="ir.ui.view">
+	            <field name="name">Split in lots</field>
+	            <field name="model">stock.move.spilt</field>
+	            <field name="type">form</field>
+	            <field name="arch" type="xml">
+	                <form string="Split in lots">
+	                	<field name="product_id" colspan="4" readonly="1"/>
+	                	<newline/>
+	                	<field name="line_ids" colspan="4" nolabel="1">
+	                		<tree string="Lots Number" editable="top">
+	                			<field name="name" string="Lots"/>
+	                			<field name="quantity" />
+                                <field name="use_exist" />
+	                		</tree>
+	                		<form string="Lots Number">
+	                			<field name="name" string="Lots"/>
+	                			<field name="quantity" />
+                                <field name="use_exist" />
+	                		</form>
+	                	</field>
+	                	<separator string="" colspan="4" />
+	                	<label string="" colspan="2" />
+	                	<button icon='gtk-cancel' special="cancel"
+	                		string="Cancel" />
+	                	<button name="split_lot" string="Ok"
+	                		type="object" icon="gtk-ok" />
+	                </form>
+	            </field>
+	        </record>
+	
+	        <record id="track_line" model="ir.actions.act_window">
+	            <field name="name">Split in lots</field>
+	            <field name="type">ir.actions.act_window</field>
+	            <field name="res_model">stock.move.spilt</field>
+	            <field name="view_type">form</field>
+	            <field name="view_mode">form</field>
+	            <field name="target">new</field>
+	        </record>          
+
+	</data>
+</openerp>	

addons/stock/wizard/__init__.py

@@ -26,7 +26,6 @@ import wizard_picking_make
 import wizard_replacement
 import wizard_return
 import wizard_split_lot_line
-import wizard_track_line
 import wizard_ups
 import wizard_invoice_onshipping
 import wizard_location_product
@@ -34,5 +33,6 @@ import wizard_inventory
 import wizard_split_inventory_lots
 import inventory_merge_zero
 import inventory_merge
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/stock/wizard/wizard_track_line.py

@@ -1,138 +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/>.     
-#
-##############################################################################
-
-import wizard
-import netsvc
-import pooler
-
-import time
-from osv import osv
-from tools.translate import _
-
-track_form = '''<?xml version="1.0"?>
-<form string="Tracking a move">
- <field name="tracking_prefix"/>
- <newline/>
- <field name="quantity"/>
-</form>
-'''
-fields = {
-        'tracking_prefix': {
-            'string': 'Tracking prefix',
-            'type': 'char',
-            'size': 64,
-        },
-        'quantity': {
-            'string': 'Quantity per lot',
-            'type': 'float',
-            'default': 1,
-        }
-}
-
-def _check_picking(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    move_obj = pool.get('stock.move').browse(cr, uid, data['id'])
-    if not move_obj.picking_id:
-        raise wizard.except_wizard(_('Caution!'), _('Before splitting the production lots,make sure this move has a Picking attached !\nYou must save the move before performing this operation.'))
-    return data['form']    
-
-def _track_lines(self, cr, uid, data, context):
-    move_id = data['id']
-
-    pool = pooler.get_pool(cr.dbname)
-    prodlot_obj = pool.get('stock.production.lot')
-    move_obj = pool.get('stock.move')
-#    production_obj = pool.get('mrp.production')
-    ir_sequence_obj = pool.get('ir.sequence')
-
-    sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
-    if not sequence:
-        raise wizard.except_wizard(_('Error!'), _('No production sequence defined'))
-    if data['form']['tracking_prefix']:
-        sequence=data['form']['tracking_prefix']+'/'+(sequence or '')
-
-    move = move_obj.browse(cr, uid, [move_id])[0]
-    quantity=data['form']['quantity']
-    if quantity <= 0 or move.product_qty == 0:
-        return {}
-    uos_qty=quantity/move.product_qty*move.product_uos_qty
-
-    quantity_rest = move.product_qty%quantity
-    uos_qty_rest = quantity_rest/move.product_qty*move.product_uos_qty
-
-    update_val = {
-        'product_qty': quantity,
-        'product_uos_qty': uos_qty,
-    }
-    new_move = []
-#    production_ids = []
-    for idx in range(int(move.product_qty//quantity)):
-        if idx:
-#            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
-            new_move.append(current_move)
-        else:
-            current_move = move.id
-        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-        update_val['prodlot_id'] = new_prodlot
-        move_obj.write(cr, uid, [current_move], update_val)
-#        production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-    
-    if quantity_rest > 0:
-        idx = int(move.product_qty//quantity)
-        update_val['product_qty']=quantity_rest
-        update_val['product_uos_qty']=uos_qty_rest
-        if idx:
-#            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state, 'production_id': move.production_id.id})
-            current_move = move_obj.copy(cr, uid, move.id, {'state': move.state})
-            new_move.append(current_move)
-        else:
-            current_move = move.id
-        new_prodlot = prodlot_obj.create(cr, uid, {'name': sequence, 'ref': '%d'%idx}, {'product_id': move.product_id.id})
-        update_val['prodlot_id'] = new_prodlot
-        move_obj.write(cr, uid, [current_move], update_val)
-
-#    products = production_obj.read(cr, uid, production_ids, ['move_lines'])
-#    for p in products:
-#        for new in new_move:
-#            if new not in p['move_lines']:
-#                p['move_lines'].append(new)
-#        production_obj.write(cr, uid, [p['id']], {'move_lines': [(6, 0, p['move_lines'])]})
-
-    return {}
-
-class wizard_track_move(wizard.interface):
-    states = {
-        'init': {
-            'actions': [_check_picking],
-            'result': {'type': 'form', 'arch': track_form, 'fields': fields, 'state': [('end', 'Cancel', 'gtk-cancel'), ('track', 'Ok', 'gtk-ok')]},
-            },
-        'track': {
-            'actions': [_track_lines],
-            'result': {'type':'state', 'state':'end'}
-        }
-    }
-
-wizard_track_move('stock.move.track')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

addons/subscription/i18n/pl.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-15 15:42+0000\n"
+"PO-Revision-Date: 2010-02-20 15:53+0000\n"
 "Last-Translator: Grzegorz Grzelak (Cirrus) <Unknown>\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: 2009-12-16 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-02-21 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -78,7 +78,7 @@ msgstr "Stan"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document_fields
 msgid "Subscription document fields"
-msgstr ""
+msgstr "Pola dokumentu subskrypcji"
 
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
@@ -99,7 +99,7 @@ msgstr "Ustaw na projekt"
 #: model:ir.module.module,description:subscription.module_meta_information
 msgid ""
 "Module allows to create new documents and add subscription on that document."
-msgstr ""
+msgstr "Moduł pozwala tworzyć dokumenty i dodawać subskrypcję do nich."
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
@@ -175,7 +175,7 @@ msgstr "Dni"
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr ""
+msgstr "Subskrypcje i operacje powtarzalne"
 
 #. module: subscription
 #: field:subscription.subscription,active:0
@@ -185,7 +185,7 @@ msgstr "Aktywny"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
 msgid "Subscription document"
-msgstr ""
+msgstr "Dokument subskrypcji"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -212,7 +212,7 @@ msgstr "Dane subskrypcji"
 #: view:subscription.document:0
 #: field:subscription.document.fields,document_id:0
 msgid "Subscription Document"
-msgstr ""
+msgstr "Dokument subskrypcji"
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
@@ -245,7 +245,7 @@ msgstr "Typy dokumentów"
 #. module: subscription
 #: view:subscription.document.fields:0
 msgid "Subscription Document Fields"
-msgstr ""
+msgstr "Pola dokumentu subskrypcji"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0

addons/wiki/i18n/ko.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:52+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"PO-Revision-Date: 2010-02-23 04:46+0000\n"
+"Last-Translator: CSro <choongsan@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -89,7 +89,7 @@ msgstr "위키 구성"
 #. module: wiki
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "액션 정의에서 유효하지 않은 모델 이름"
 
 #. module: wiki
 #: field:wiki.groups,name:0