[MERGE]

bzr revid: nel@tinyerp.com-20100409065814-ttpq414i45xm3yi9

addons/account/i18n/cs.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-04-01 22:39+0000\n"
+"PO-Revision-Date: 2010-04-08 18:06+0000\n"
 "Last-Translator: mitev.dmitry <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-04-03 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-04-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -115,7 +115,7 @@ msgstr "Rodič"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Rada"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -134,7 +134,7 @@ msgstr "Základní kódová značka"
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Nepotvrzené záznamy"
 
 #. module: account
 #: constraint:account.period:0
@@ -159,7 +159,7 @@ msgstr "Debetní Centralizace"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Potvrdit návrh faktury"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -182,7 +182,7 @@ msgstr "Grafy účtu"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
 msgid "Move line select"
-msgstr ""
+msgstr "Přesun řádku vyberte"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -310,7 +310,7 @@ msgstr "Původ"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Název Pohybu"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -325,7 +325,7 @@ msgstr "Vypočítat předpaltné(Subscription Compute)"
 #. module: account
 #: rml:account.central.journal:0
 msgid "Account Num."
-msgstr ""
+msgstr "Číslo účtu"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -337,12 +337,12 @@ msgstr ""
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Daň"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Debetní transakce"
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -356,24 +356,24 @@ msgstr "Analytický účet"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Daň z dětí"
 
 #. module: account
 #: rml:account.central.journal:0
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Název časopisu"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on invoices"
-msgstr ""
+msgstr "Popis na fakturách"
 
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Chyba! Nemůžete vytvářet rekurzivní analytické účty."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -389,13 +389,13 @@ msgstr "Zdroj účtu"
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Povolit Zrušení Příspěvky"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Platba usmíření"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
@@ -425,7 +425,7 @@ msgstr "(Účet / Partner) Název"
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Kontraindikace"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -447,7 +447,7 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Speciální výpočetní"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
@@ -506,7 +506,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Supplier invoice"
-msgstr ""
+msgstr "Dodavatele uvedený na faktuře"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -533,7 +533,7 @@ msgstr ""
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Metoda zpoždění"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -560,7 +560,7 @@ msgstr ""
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Pravda"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -577,7 +577,7 @@ msgstr ""
 #. module: account
 #: rml:account.central.journal:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Datum vydání"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -593,7 +593,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Vstupní kontrolou"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -616,13 +616,13 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Partner splatnosti"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -637,13 +637,13 @@ msgstr "Otevřeno pro bankovní vyrovnání(Open for bank reconciliation)"
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Sleva (%)"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Odpis části"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
@@ -653,7 +653,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analytické účetnictví"
 
 #. module: account
 #: rml:account.overdue:0
@@ -666,22 +666,22 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analytická Příspěvky"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "měsíc"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Přidruženého partnera"
 
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Další informace"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -719,18 +719,18 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr ""
+msgstr "Analytická faktury"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Název pole"
 
 #. module: account
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Přihlaste se na mateřské"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -741,7 +741,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Nákup Nemovitosti"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -751,12 +751,12 @@ msgstr ""
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Částečná platba"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Move Lines Created."
-msgstr ""
+msgstr "Přesun vytvořených linek."
 
 #. module: account
 #: field:account.fiscalyear,state:0
@@ -766,18 +766,18 @@ msgstr ""
 #: field:account.period,state:0
 #: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stav"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Období do"
 
 #. module: account
 #: field:account.account.type,partner_account:0
 msgid "Partner account"
-msgstr ""
+msgstr "Partner účet"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
@@ -803,7 +803,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Přesun Linky"
 
 #. module: account
 #: model:ir.model,name:account.model_account_config_wizard
@@ -831,26 +831,26 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Bankovní usmíření"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "Šablony pro účty"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Analytické účty"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr ""
+msgstr "Tisk věstníku"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -861,39 +861,39 @@ msgstr ""
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Datum vytvoření"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Zrušit účet"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Požadované"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Cestovní účet"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Odpis věstníku"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Částka měny"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Kategorie výdajů účtu"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
@@ -910,7 +910,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Fiskální rok otevřena"
 
 #. module: account
 #: view:account.config.wizard:0
@@ -928,7 +928,7 @@ msgstr ""
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Množství"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -936,7 +936,7 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Datum ukončení"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -957,12 +957,12 @@ msgstr ""
 #: 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 ""
+msgstr "Příspěvky výroky"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "analytické faktury"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -981,22 +981,22 @@ msgstr ""
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
-msgstr ""
+msgstr "Perioda"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Úhrn"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Finanční účetnictví"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Čistá celkem:"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1010,7 +1010,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Fiskální pozice"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1027,7 +1027,7 @@ msgstr ""
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Děti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -1038,35 +1038,35 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
 msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Nového dodavatele faktury"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Zaplacené částky"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Zákazník faktury"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Vyberte si fiskální rok"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Hlavní posloupnosti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Tisk Analytické Časopisy"
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -1083,7 +1083,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr ""
+msgstr "Celkem odpis"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1095,14 +1095,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Daňové kódy"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Graf šablony"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -1113,24 +1113,24 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr ""
+msgstr "Nový analitickiý účet"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr ""
+msgstr "Fiskální pozice Šablony"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Cena za kus"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Období od:"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1140,7 +1140,7 @@ msgstr ""
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Prodej věstníku"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -1151,23 +1151,23 @@ msgstr ""
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Fiskální pozice šablony"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Podmínky"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr ""
+msgstr "Daňové Report"
 
 #. module: account
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Zobrazit Grafy"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
@@ -1177,7 +1177,7 @@ msgstr ""
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Bankovní Příjem"
 
 #. module: account
 #: view:res.partner:0
@@ -1187,17 +1187,17 @@ msgstr "Bankovní účet"
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Daňové seznamu šablon"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Faktura import"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr ""
+msgstr "Standardní vstupní"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1212,7 +1212,7 @@ msgstr ""
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Společnost měny"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1222,7 +1222,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Parent Analytická účtu"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1242,22 +1242,22 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Konečný zůstatek"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Nákup Daně"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Název řádku"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Pevná částka"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -1285,24 +1285,24 @@ msgstr ""
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Pokračovat"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Hodnota"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Odpis účet"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Vzor"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
@@ -1313,12 +1313,12 @@ msgstr ""
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizované protějšek"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Zpráva"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -1332,7 +1332,7 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Pohled"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1340,13 +1340,13 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Vše"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr ""
+msgstr "Analytická linky"
 
 #. module: account
 #: help:account.tax,type:0
@@ -1370,28 +1370,28 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronický soubor"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Odběratelský úvěr"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Daňové Linky"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Posloupnosti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Typy účtů"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1413,18 +1413,18 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Časopis"
 
 #. module: account
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Dětská konta"
 
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr ""
+msgstr "Zobrazení historie"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
@@ -1454,7 +1454,7 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr ""
+msgstr "Odpis"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1466,12 +1466,12 @@ msgstr ""
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Celkem za poplatek"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
 msgid "Close states"
-msgstr ""
+msgstr "Zavřít státy"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
@@ -1486,22 +1486,22 @@ msgstr ""
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Refundace věstníku"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Příjem"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dodavatel"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Telefonní číslo:"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0

addons/account/test/test_parent_structure.py

@@ -1,54 +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/>.     
-#
-##############################################################################
-
-#
-# TODO: move this in a YAML test with !python tag
-#
-
-import xmlrpclib
-
-DB = 'training3'
-USERID = 1
-USERPASS = 'admin'
-
-
-sock = xmlrpclib.ServerProxy('http://%s:%s/xmlrpc/object' % ('localhost',8069))
-
-ids = sock.execute(DB, USERID, USERPASS, 'account.account', 'search', [], {})
-account_lists = sock.execute(DB, USERID, USERPASS, 'account.account', 'read', ids, ['parent_id','parent_left','parent_right'])
-
-accounts = dict(map(lambda x: (x['id'],x), account_lists))
-for a in account_lists:
-    if a['parent_id']:
-        assert a['parent_left'] > accounts[a['parent_id'][0]]['parent_left']
-        assert a['parent_right'] < accounts[a['parent_id'][0]]['parent_right']
-    assert a['parent_left'] < a['parent_right']
-    for a2 in account_lists:
-        assert not ((a2['parent_right']>a['parent_left']) and 
-            (a2['parent_left']<a['parent_left']) and 
-            (a2['parent_right']<a['parent_right']))
-        if a2['parent_id']==a['id']:
-            assert (a2['parent_left']>a['parent_left']) and (a2['parent_right']<a['parent_right'])
-
-print 'Tests Ok'
-
-
-

addons/account/test/test_parent_structure.yml

@@ -1,5 +1,12 @@
--
-  We retrieve all accounts and test they are in a tree data structure.
+- |
+  In order to test the Preorder Traversal Tree algorythm to organize tree
+  structure, we retrieve all accounts and test their parent_left and
+  parent_right values with the following assertions
+    . parent_left < parent_right
+    . parent_left < parent_left of all childs
+    . parent_right > parent_right of all childs
+    . if an account is a child it is included in parent_left-parent_right
+    . if an account is not a child it is not included in parent_left-parent_right
 - 
   !python {model: account.account}: |
     ids = self.search(cr, uid, [])

addons/base_setup/i18n/fa.po

@@ -0,0 +1,283 @@
+# Persian 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-04-08 14:27+0000\n"
+"Last-Translator: Sadegh Ismael Nattaj <nat@sethack.com>\n"
+"Language-Team: Persian <fa@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-04-09 03:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,city:0
+#: wizard_field:base_setup.base_setup,init,city:0
+#: wizard_field:base_setup.base_setup,update,city:0
+msgid "City"
+msgstr "شهر"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid ""
+"You can start configuring the system or connect directly to the database "
+"using the default setup."
+msgstr ""
+"شما می‌توانید با بکارگیری از سوارسازی پیش‌فرض آغاز به پیکربندی سامانه کنید و "
+"یا یک‌راست به دادگان متصل شوید."
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,zip:0
+#: wizard_field:base_setup.base_setup,init,zip:0
+#: wizard_field:base_setup.base_setup,update,zip:0
+msgid "Zip code"
+msgstr "کد پستی"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid "Select a Profile"
+msgstr "یک پروفایل را برگزینید"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report header"
+msgstr "سرنویس گزارش"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,config:0
+msgid "Start Configuration"
+msgstr "آغاز پیکربندی"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"You'll be able to install more modules later through the Administration menu."
+msgstr ""
+"شما می‌توانید از طریق منوی راهبری پیمانه‌های بیشتری را در آینده برپاسازی "
+"نمایید."
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,init:0
+msgid ""
+"A profile sets a pre-selection of modules for specific needs. These profiles "
+"have been setup to help you discover the different aspects of OpenERP. This "
+"is just an overview, we have 300+ available modules."
+msgstr ""
+"یک پروفایل دارای پیمانه‌های از پیش گزینش شده برای نیازهای خاص است. این "
+"پروفایل‌ها برای این سوار می‌شوند تا به شما برای شناخت بیشتر جنبه‌های متفاوت "
+"اپن ای‌آر‌پی کمک نماید. این تنها یک پیش‌نمایش است، ما بیش از ۳۰۰ پیمانه "
+"آماده داریم."
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,update:0
+#: wizard_button:base_setup.base_setup,init,company:0
+msgid "Next"
+msgstr "پس"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,email:0
+#: wizard_field:base_setup.base_setup,init,email:0
+#: wizard_field:base_setup.base_setup,update,email:0
+msgid "E-mail"
+msgstr "ایمیل"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,state_id:0
+#: wizard_field:base_setup.base_setup,init,state_id:0
+#: wizard_field:base_setup.base_setup,update,state_id:0
+msgid "State"
+msgstr "استان"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Your new database is now fully installed."
+msgstr "دادگان نو شما بطور کامل برپاسازی گردید."
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,profile:0
+#: wizard_field:base_setup.base_setup,init,profile:0
+#: wizard_field:base_setup.base_setup,update,profile:0
+msgid "Profile"
+msgstr "پروفایل"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer1:0
+#: wizard_field:base_setup.base_setup,init,rml_footer1:0
+#: wizard_field:base_setup.base_setup,update,rml_footer1:0
+msgid "Report Footer 1"
+msgstr "پانویس گزارش ۱"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_footer2:0
+#: wizard_field:base_setup.base_setup,init,rml_footer2:0
+#: wizard_field:base_setup.base_setup,update,rml_footer2:0
+msgid "Report Footer 2"
+msgstr "پانویس گزارش ۲"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "General Information"
+msgstr "آگهگان عمومی"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street2:0
+#: wizard_field:base_setup.base_setup,init,street2:0
+#: wizard_field:base_setup.base_setup,update,street2:0
+msgid "Street2"
+msgstr "خیابان۲"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Report Information"
+msgstr "آگهگان گزارش"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,phone:0
+#: wizard_field:base_setup.base_setup,init,phone:0
+#: wizard_field:base_setup.base_setup,update,phone:0
+msgid "Phone"
+msgstr "تلفن"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Define Main Company"
+msgstr "تعریف شرکت اصلی"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,name:0
+#: wizard_field:base_setup.base_setup,init,name:0
+#: wizard_field:base_setup.base_setup,update,name:0
+msgid "Company Name"
+msgstr "نام شرکت"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer2:0
+#: help:base_setup.base_setup,init,rml_footer2:0
+#: help:base_setup.base_setup,update,rml_footer2:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to put bank information here:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+msgstr ""
+"این جمله در پایین گزارش‌های شما ظاهر خواهد شد.\n"
+"پیشنهاد می‌کنیم آگهگان بانکی را اینجا وارد نمایید:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,country_id:0
+#: wizard_field:base_setup.base_setup,init,country_id:0
+#: wizard_field:base_setup.base_setup,update,country_id:0
+msgid "Country"
+msgstr "کشور"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+#: wizard_view:base_setup.base_setup,finish:0
+#: wizard_view:base_setup.base_setup,init:0
+#: wizard_view:base_setup.base_setup,update:0
+#: model:ir.actions.wizard,name:base_setup.action_wizard_setup
+#: model:ir.actions.wizard,name:base_setup.wizard_base_setup
+msgid "Setup"
+msgstr "سوارکردن"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_footer1:0
+#: help:base_setup.base_setup,init,rml_footer1:0
+#: help:base_setup.base_setup,update,rml_footer1:0
+msgid ""
+"This sentence will appear at the bottom of your reports.\n"
+"We suggest you to write legal sentences here:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+msgstr ""
+"این جمله در پایین گزارش‌های شما ظاهر خواهد شد.\n"
+"پیشنهاد می‌کنیم تا از عبارات قانونی در اینجا بکار ببرید:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,update:0
+msgid "Summary"
+msgstr "چکیده"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,update,finish:0
+msgid "Install"
+msgstr "برپایی"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,finish:0
+msgid "Installation Done"
+msgstr "برپایی انجام شد"
+
+#. module: base_setup
+#: help:base_setup.base_setup,company,rml_header1:0
+#: help:base_setup.base_setup,init,rml_header1:0
+#: help:base_setup.base_setup,update,rml_header1:0
+msgid ""
+"This sentence will appear at the top right corner of your reports.\n"
+"We suggest you to put a slogan here:\n"
+"\"Open Source Business Solutions\"."
+msgstr ""
+"این جمله در گوشه بالا سمت راست گزارش‌های شما ظاهر خواهد شد.\n"
+"پیشنهاد می‌کنیم شعار خود را اینجا قرار دهید:\n"
+"\"راهکارهای بازمتن برای تجارت\"."
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,rml_header1:0
+#: wizard_field:base_setup.base_setup,init,rml_header1:0
+#: wizard_field:base_setup.base_setup,update,rml_header1:0
+msgid "Report Header"
+msgstr "سرنویس گزارش"
+
+#. module: base_setup
+#: wizard_view:base_setup.base_setup,company:0
+msgid "Your Logo - Use a size of about 450x150 pixels."
+msgstr "نشان شما - اندازه تصویری ۱۵۰×۴۵۰ پیکسل را بکار برید."
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,currency:0
+#: wizard_field:base_setup.base_setup,init,currency:0
+#: wizard_field:base_setup.base_setup,update,currency:0
+msgid "Currency"
+msgstr "ارز"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,street:0
+#: wizard_field:base_setup.base_setup,init,street:0
+#: wizard_field:base_setup.base_setup,update,street:0
+msgid "Street"
+msgstr "خیابان"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,finish,menu:0
+msgid "Use Directly"
+msgstr "بکارگیری آنی"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,init,menu:0
+msgid "Cancel"
+msgstr "لغو"
+
+#. module: base_setup
+#: wizard_field:base_setup.base_setup,company,logo:0
+#: wizard_field:base_setup.base_setup,init,logo:0
+#: wizard_field:base_setup.base_setup,update,logo:0
+msgid "Logo"
+msgstr "نشان"
+
+#. module: base_setup
+#: model:ir.module.module,shortdesc:base_setup.module_meta_information
+msgid "Base Setup"
+msgstr "سوارکردن پایه"
+
+#. module: base_setup
+#: wizard_button:base_setup.base_setup,company,init:0
+#: wizard_button:base_setup.base_setup,update,company:0
+msgid "Previous"
+msgstr "پیش"

addons/crm/crm_claims_view.xml

@@ -183,7 +183,7 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                       string="Reply to Last Email"
+                                       string="Reply to Email"
                                        name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.claim'}"
                                        icon="gtk-undo" type="action" />

addons/crm/crm_fund_view.xml

@@ -191,7 +191,7 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                       string="Reply to Last Email"
+                                       string="Reply to Email"
                                        name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.fundraising'}"
                                        icon="gtk-undo" type="action" />

addons/crm/crm_helpdesk_view.xml

@@ -126,7 +126,7 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                       string="Reply to Last Email"
+                                       string="Reply to Email"
                                        name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.helpdesk'}"
                                        icon="gtk-undo" type="action" />

addons/crm/crm_lead_view.xml

@@ -166,7 +166,7 @@
                             <newline/>
                             <field name="description" colspan="4" nolabel="1"/>
                             <button colspan="4"
-                                string="Reply to Last Email"
+                                string="Reply to Email"
                                 name="%(action_crm_send_mail)d"
                                 context="{'mail':'reply', 'model': 'crm.lead'}"
                                 icon="gtk-undo" type="action" />

addons/crm/crm_meeting_menu.xml

@@ -36,14 +36,14 @@
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
+    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_partner">
         <field name="sequence" eval="3"/>
         <field name="view_mode">gantt</field>
         <field name="view_id" ref="crm_case_gantt_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_create_partner"/>
     </record>
 
-	<act_window
+    <act_window
         id="crm_case_categ_meet_case"
         name="Schedule a Meeting"
         res_model="crm.meeting"
@@ -74,7 +74,7 @@
         <field name="view_id" ref="crm_case_form_view_meet"/>
         <field name="act_window_id" ref="crm_case_categ_meet_case"/>
     </record>
-	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_case">
+    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_meet_case">
         <field name="sequence" eval="3"/>
         <field name="view_mode">gantt</field>
         <field name="view_id" ref="crm_case_gantt_view_meet"/>
@@ -116,26 +116,27 @@
 <!-- ALL MEETINGS -->
 
     <menuitem name="Meetings" id="menu_meeting_sale"
-    	parent="base.menu_base_partner" sequence="3" />
+        parent="base.menu_base_partner" sequence="3" />
 
     <menuitem name="Meetings" id="menu_crm_case_categ_meet"
-    	action="crm_case_categ_meet" parent="menu_meeting_sale"
-    	sequence="1" />
+        action="crm_case_categ_meet" parent="menu_meeting_sale"
+        sequence="1" />
 
     <record id="action_view_attendee_form" model="ir.actions.act_window">
-	 	<field name="name">Meeting Invitations</field>
-	 	<field name="type">ir.actions.act_window</field>
-	 	<field name="res_model">calendar.attendee</field>
-	 	<field name="view_type">form</field>
-	 	<field name="view_mode">tree,form</field>
-	 	<field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
+         <field name="name">Meeting Invitations</field>
+         <field name="type">ir.actions.act_window</field>
+         <field name="res_model">calendar.attendee</field>
+         <field name="view_type">form</field>
+         <field name="view_mode">tree,form</field>
+         <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
         <field name="domain">[('ref','like','crm.meeting,')]</field>
-	 	<field name="context">{'default_sent_by_uid': uid}</field>
-	 </record>
+         <field name="context">{'default_sent_by_uid': uid}</field>
+     </record>
 
     <menuitem id="menu_attendee_invitations"
-			name="Meeting Invitations" parent="crm.menu_meeting_sale"
-			sequence="10" action="action_view_attendee_form" />
+            name="Meeting Invitations" parent="crm.menu_meeting_sale"
+            groups="base.group_extended"
+            sequence="10" action="action_view_attendee_form" />
 
 
     <record model="ir.actions.act_window" id="crm_case_category_act_meetall3">
@@ -145,7 +146,7 @@
         <field name="view_mode">tree,calendar,form,gantt</field>
         <field name="view_id" ref="crm_case_calendar_view_meet"/>
         <field name="domain"
-        	eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]" />
+            eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]" />
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_view_meetall3">
@@ -169,7 +170,7 @@
         <field name="act_window_id" ref="crm_case_category_act_meetall3"/>
     </record>
 
-	<record model="ir.actions.act_window.view" id="action_crm_tag_gantt_view_meetall3">
+    <record model="ir.actions.act_window.view" id="action_crm_tag_gantt_view_meetall3">
         <field name="sequence" eval="2"/>
         <field name="view_mode">gantt</field>
         <field name="view_id" ref="crm_case_gantt_view_meet"/>

addons/crm/crm_opportunity.py

@@ -88,7 +88,7 @@ class crm_opportunity(osv.osv):
                     resource_id = False
                     if opportunity.user_id:
                         resource_ids = res_obj.search(cr, uid, [('user_id','=',opportunity.user_id.id)])
-                        resource_id = len(resource_ids) or resource_ids[0]
+                        resource_id = len(resource_ids) and resource_ids[0] or False
 
                     duration = float(ans.days)
                     if opportunity.section_id.resource_calendar_id:

addons/crm/crm_opportunity_view.xml

@@ -82,21 +82,19 @@
                 </group>
                 <notebook colspan="4">
                 <page string="Opportunity">
-                    <group col="3" colspan="2">
+                    <group col="4" colspan="2">
                         <separator colspan="4" string="Contacts"/>
                         <field name="partner_id" select="1"
-                            on_change="onchange_partner_id(partner_id, email_from)"
-                            colspan="2" />
+                            on_change="onchange_partner_id(partner_id, email_from)" />
                         <field name="partner_address_id"
                             string="Contact"
-                            on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                            colspan="1" />
+                            on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
                         <field name="email_from" string="Email" />
                         <field name="phone"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator colspan="2" string="Categorization"/>
-                        <field name="type_id" select="1" string="Campaign"/>
+                        <field name="type_id" select="1" string="Campaign" groups="base.group_extended"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="priority" string="Priority"/>
                         <field name="categ_id" select="1"
@@ -104,7 +102,7 @@
                             domain="[('object_id.model', '=', 'crm.opportunity')]" />
                     </group>
 
-                    <separator colspan="4" string="Details"/>
+                    <separator colspan="4" string="Notes"/>
                     <field name="description" nolabel="1" colspan="4"/>
 
                     <separator colspan="4"/>
@@ -215,9 +213,9 @@
                 <button name="stage_next" string="Next"
                     states="open,pending" type="object"
                     icon="gtk-go-forward" />
-                <field name="planned_revenue" sum="Total of Planned Revenue"/>
+                <field name="planned_revenue" sum="Expected Revenue"/>
                 <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                <field name="date_deadline" string="Excepted Closing"/>
+                <field name="date_deadline" string="Expected Closing"/>
                 <field name="section_id"/>
                 <field name="user_id"/>
                 <field name="priority"/>

addons/crm/crm_view.xml

@@ -364,7 +364,7 @@
                                     <separator colspan="4" string="Action Information"/>
                                     <field colspan="4" name="name"/>
                                     <field name="date" select="2"/>
-                                    <field name="user_id" select="2"/>                                    
+                                    <field name="user_id" select="2"/>
                                 </form>
                             </field>
                         </page>
@@ -377,7 +377,7 @@
                                    <group col="7" colspan="4">
                                        <field name="date"/>
                                        <field name="email_to"/>
-                                       <field name="email_from"/>                                       
+                                       <field name="email_from"/>
                                        <button
                                      string="Add a CC"
                                                name="%(crm.action_view_crm_email_add_cc_wizard)d"
@@ -386,7 +386,7 @@
                                    <newline/>
                                    <field name="description" colspan="4" nolabel="1"/>
                                    <button colspan="4"
-                                       string="Reply to Last Email"
+                                       string="Reply to Email"
                                        name="%(action_crm_send_mail)d"
                                        context="{'mail':'reply', 'model': 'crm.case'}"
                                        icon="gtk-undo" type="action" />

addons/crm/wizard/crm_send_email.py

@@ -146,7 +146,7 @@ class crm_send_new_email(osv.osv_memory):
             if 'email_cc' in fields:
                 res.update({'email_cc': case.email_cc or ''})
             if 'text' in fields:
-                res.update({'text': '\n\n'+(case.user_id.signature or '') + '\n\n' +  (case.description or '')})
+                res.update({'text': '\n\n'+(case.user_id.signature or '')})
             if 'state' in fields:
                 res.update({'state': 'pending'})
         return res

addons/crm/wizard/crm_send_email_view.xml

@@ -15,6 +15,7 @@
                     <field name="subject" colspan="4"/>
                     <group colspan="4" string="Extended Options" expand="1">
                         <field name="email_from" />
+                        <newline/>
                         <field name="doc1" filename="doc1_fname"/>
                         <field name="doc1_fname"/>
                         <field name="doc2" filename="doc2_fname" />

addons/hr_evaluation/hr_evaluation.py

@@ -300,6 +300,51 @@ class hr_evaluation_interview(osv.osv):
         self.write(cr, uid, ids, { 'state' : 'cancel'}, context=context)
         return True
 
+    def action_print_survey(self, cr, uid, ids, context=None):
+        """
+        If response is available then print this response otherwise print survey form(print template of the survey).
+
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Survey IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for print survey form.
+        """
+        if not context:
+            context = {}
+        record = self.browse(cr, uid, ids, context)
+        record = record and record[0]
+        datas = {}
+        page_setting = {'orientation': 'vertical', 'without_pagebreak': 0, 'paper_size': 'letter', 'page_number': 1, 'survey_title': 1}
+        report = {}
+        if record:
+            datas['ids'] = [record.survey_id.id]
+            response_id = record.response.id
+            if response_id:
+                context.update({'survey_id': datas['ids'], 'response_id' : [response_id], 'response_no':0})
+                datas['form'] = page_setting
+                datas['model'] = 'survey.print.answer'
+                report = {
+                    'type': 'ir.actions.report.xml',
+                    'report_name': 'survey.browse.response',
+                    'datas': datas,
+                    'nodestroy': True,
+                    'context' : context
+                }
+            else:
+                datas['form'] = page_setting
+                datas['model'] = 'survey.print'
+                report = {
+                    'type': 'ir.actions.report.xml',
+                    'report_name': 'survey.form',
+                    'datas': datas,
+                    'nodestroy':True,
+                    'context' : context
+                }
+        return report
+
+
 hr_evaluation_interview()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1

addons/hr_evaluation/hr_evaluation_view.xml

@@ -261,8 +261,8 @@
                         <group  colspan="1">
                             <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
                                 icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done"
-                                icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                            <button name="action_print_survey" string="Print Interview" type="object" states="waiting_answer,done,cancel"
+                                icon="gtk-print"  attrs="{'readonly':[('survey_id','=',False)]}" />
                         </group>
                     </group>
                     <group col="4" colspan="4">
@@ -297,8 +297,8 @@
                     <field name="response" readonly="1" invisible="True"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel"
                         icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done"
-                        icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
+                    <button name="action_print_survey" string="Print Interview" type="object" states="waiting_answer,done,cancel"
+                        icon="gtk-print" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <field name="state"/>
                 </tree>
             </field>

addons/hr_recruitment/hr_recruitment.py

@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields,osv,orm
+from tools.translate import _
 
 AVAILABLE_STATES = [
     ('draft','New'),
@@ -54,13 +55,145 @@ class hr_applicant(osv.osv):
         'partner_name': fields.char("Applicant's Name", size=64),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
-        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('section_id','=',section_id),('object_id.model', '=', 'hr.applicant')]"),
+        'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'hr.applicant')]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Degree', domain="[('object_id.model', '=', 'hr.applicant')]"),
         'department_id':fields.many2one('hr.department','Department'),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'survey' : fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'response' : fields.integer("Response"),
     }
+
+    def stage_previous(self, cr, uid, ids, context=None):
+        """This function computes previous stage for case from its current stage
+             using available stage for that case type 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+        for case in self.browse(cr, uid, ids, context):
+            section = (case.section_id.id or False)
+            st = case.stage_id.id  or False
+            stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [])
+            if st and stage_ids.index(st):
+                self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)-1]})
+        return True
+
+    def stage_next(self, cr, uid, ids, context=None):
+        """This function computes next stage for case from its current stage
+             using available stage for that case type 
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of case IDs
+        @param context: A standard dictionary for contextual values"""
+        if not context:
+            context = {}
+        for case in self.browse(cr, uid, ids, context):
+            section = (case.section_id.id or False)
+            st = case.stage_id.id  or False
+            stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [])
+            if st and len(stage_ids) != stage_ids.index(st)+1:
+                self.write(cr, uid, [case.id], {'stage_id': stage_ids[stage_ids.index(st)+1]})
+        return True
+
+    def action_makeMeeting(self, cr, uid, ids, context=None):
+        """
+        This opens Meeting's calendar view to schedule meeting on current Opportunity
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Opportunity to Meeting IDs
+        @param context: A standard dictionary for contextual values
+
+        @return : Dictionary value for created Meeting view
+        """
+        value = {}
+        for opp in self.browse(cr, uid, ids):
+            data_obj = self.pool.get('ir.model.data')
+
+            # Get meeting views
+            result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_meetings_filter')
+            res = data_obj.read(cr, uid, result, ['res_id'])
+            id1 = data_obj._get_id(cr, uid, 'crm', 'crm_case_calendar_view_meet')
+            id2 = data_obj._get_id(cr, uid, 'crm', 'crm_case_form_view_meet')
+            id3 = data_obj._get_id(cr, uid, 'crm', 'crm_case_tree_view_meet')
+            if id1:
+                id1 = data_obj.browse(cr, uid, id1, context=context).res_id
+            if id2:
+                id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+            if id3:
+                id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+
+            context = {
+                'default_opportunity_id': opp.id,
+                'default_partner_id': opp.partner_id and opp.partner_id.id or False,
+                'default_section_id': opp.section_id and opp.section_id.id or False,
+                'default_email_from': opp.email_from,
+                'default_state': 'open',
+                'default_name': opp.name
+            }
+            value = {
+                'name': _('Meetings'),
+                'domain': "[('user_id','=',%s)]" % (uid),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'calendar,form,tree',
+                'res_model': 'crm.meeting',
+                'view_id': False,
+                'views': [(id1, 'calendar'), (id2, 'form'), (id3, 'tree')],
+                'type': 'ir.actions.act_window',
+                'search_view_id': res['res_id'],
+                'nodestroy': True
+            }
+        return value
+
+    def action_print_survey(self, cr, uid, ids, context=None):
+        """
+        If response is available then print this response otherwise print survey form(print template of the survey).
+
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Survey IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for print survey form.
+        """
+        if not context:
+            context = {}
+        datas = {}
+        record = self.browse(cr, uid, ids, context)
+        record = record and record[0]
+        page_setting = {'orientation': 'vertical', 'without_pagebreak': 0, 'paper_size': 'letter', 'page_number': 1, 'survey_title': 1}
+        report = {}
+        if record:
+            datas['ids'] = [record.survey.id]
+            response_id = record.response
+            if response_id:
+                context.update({'survey_id': datas['ids'], 'response_id' : [response_id], 'response_no':0,})
+                datas['form'] = page_setting
+                datas['model'] = 'survey.print.answer'
+                report = {
+                    'type': 'ir.actions.report.xml',
+                    'report_name': 'survey.browse.response',
+                    'datas': datas,
+                    'nodestroy': True,
+                    'context' : context
+                }
+            else:
+                datas['form'] = page_setting
+                datas['model'] = 'survey.print'
+                report = {
+                    'type': 'ir.actions.report.xml',
+                    'report_name': 'survey.form',
+                    'datas': datas,
+                    'nodestroy':True,
+                    'context' : context
+                }
+        return report
+    
 hr_applicant()
 
 class hr_job(osv.osv):

addons/hr_recruitment/hr_recruitment_view.xml

@@ -43,8 +43,8 @@
                 <field name="partner_phone"/>
                 <field name="job_id"/>
                 <field name="stage_id"/>
-                <button name="stage_previous" string="Previous" states="open,pending" type="object" icon="gtk-go-back"/>
-                <button name="stage_next" string="Next" states="open,pending" type="object" icon="gtk-go-forward"/>
+                <button name="stage_previous" string="Previous" states="draft,open,cancel,done,pending" type="object" icon="gtk-go-back"/>
+                <button name="stage_next" string="Next" states="draft,open,cancel,done,pending" type="object" icon="gtk-go-forward"/>
                 <field name="survey" invisible="1"/>
                 <field name="response" invisible="1"/>
                 <field name="priority"/>
@@ -71,8 +71,9 @@
                 <group colspan="4" col="8">
                     <field name="name" string="Subject"/>
                     <label string="Stage: " align="1.0"/>
-                    <group colspan="1" col="2">
+                    <group colspan="1" col="3">
                         <field name="stage_id" nolabel="1"/>
+                		<button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
                     <field name="user_id"/>
@@ -84,10 +85,11 @@
                     <field name="partner_name"/>
                     <field name="job_id"/>
                     <field name="department_id" widget="selection"/>
-                    <button name="%(wizard_hr_job_meeting_set)d" string="Schedule Meeting" icon="terp-hr" type="action"/>
-                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action"
-                        icon="gtk-print" context="{'survey_id': survey, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
-                </group>
+                    <button name="action_makeMeeting" type="object"
+                        string="Schedule Meeting" icon="terp-hr" />
+					<button name="action_print_survey" string="Print Interview" type="object"
+						icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
+				</group>
                 <notebook colspan="4">
                     <page string="Job Info">
                         <group col="2" colspan="2">

addons/hr_recruitment/hr_recruitment_wizard.xml

@@ -9,14 +9,6 @@
             multi="True"
             string="Schedule Phone Call" />
 
-        <wizard
-            id="wizard_hr_job_meeting_set"
-            keyword="client_action_multi"
-            model="hr.applicant"
-            name="hr.applicant.meeting_set"
-            multi="True"
-            string="Schedule Meeting"/>
-
         <wizard
             id="wizard_hr_job_partner_create"
             keyword="client_action_multi"

addons/hr_recruitment/wizard/hr_recruitment_wizard.py

@@ -132,61 +132,6 @@ class job2phonecall(wizard.interface):
 
 job2phonecall('hr.applicant.reschedule_phone_call')
 
-class job2meeting(wizard.interface):
-
-    def _makeMeeting(self, cr, uid, data, context):
-        pool = pooler.get_pool(cr.dbname)
-        job_case_obj = pool.get('hr.applicant')
-        meeting_case_obj = pool.get('hr.meeting')
-        for job in job_case_obj.browse(cr, uid, data['ids']):
-            new_meeting_id = meeting_case_obj.create(cr, uid, {
-                'name': job.name,
-                'date': job.date,
-                'duration': job.duration,
-                })
-            new_meeting = meeting_case_obj.browse(cr, uid, new_meeting_id)
-            vals = {}
-            job_case_obj.write(cr, uid, [job.id], vals)
-            job_case_obj.case_cancel(cr, uid, [job.id])
-            meeting_case_obj.case_open(cr, uid, [new_meeting_id])
-
-        data_obj = pool.get('ir.model.data')
-        result = data_obj._get_id(cr, uid, 'hr', 'view_hr_case_meetings_filter')
-        id = data_obj.read(cr, uid, result, ['res_id'])
-        id1 = data_obj._get_id(cr, uid, 'hr', 'hr_case_calendar_view_meet')
-        id2 = data_obj._get_id(cr, uid, 'hr', 'hr_case_form_view_meet')
-        id3 = data_obj._get_id(cr, uid, 'hr', 'hr_case_tree_view_meet')
-        if id1:
-            id1 = data_obj.browse(cr, uid, id1, context=context).res_id
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
-        return {
-            'name': _('Meetings'),
-            'view_type': 'form',
-            'view_mode': 'calendar,form,tree',
-            'res_model': 'hr.meeting',
-            'view_id': False,
-            'views': [(id1,'calendar'),(id2,'form'),(id3,'tree'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']
-            }
-
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _makeMeeting, 'state': 'order'}
-        },
-        'order': {
-            'actions': [],
-            'result': {'type': 'state', 'state': 'end'}
-        }
-    }
-
-job2meeting('hr.applicant.meeting_set')
-
-
 class partner_create(wizard.interface):
 
     case_form = """<?xml version="1.0"?>

addons/mrp/mrp_view.xml

@@ -808,7 +808,7 @@
                     <page string="Procurement Details">
                         <separator colspan="4" string="Product &amp; Location"/>
                         <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
-                        <field name="location_id" select="2"/>
+                        <field name="location_id" select="2" domain="[('usage','=','internal')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
 
@@ -896,7 +896,7 @@
         </record>
 
       <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
-                  name="Requisitions" sequence="5" />
+                  sequence="5" />
 
         <record id="mrp_procurement_action5" model="ir.actions.act_window">
             <field name="name">Procurement Exceptions</field>

addons/mrp/mrp_workflow.xml

@@ -163,8 +163,7 @@
         <record id="act_produce" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">produce</field>
-            <field name="kind">subflow</field>
-            <field name="subflow_id" search="[('osv','=','mrp.production')]"/>
+            <field name="kind">function</field>
             <field name="action">action_produce_assign_product()</field>
         </record>
         <record id="act_produce_check" model="workflow.activity">
@@ -180,8 +179,7 @@
         <record id="act_buy" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">buy</field>
-            <field name="kind">subflow</field>
-            <field name="subflow_id" search="[('osv','=','purchase.order')]"/>
+            <field name="kind">function</field>
             <field name="action">action_po_assign()</field>
         </record>
         <record id="act_make_done" model="workflow.activity">
@@ -308,26 +306,16 @@
             <field name="trigger_model" eval="False"/>
             <field name="trigger_expr_id" eval="False"/>
         </record>
-        <record id="trans_produce_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_produce"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
         <record id="trans_produce_service_cancel" model="workflow.transition">
             <field name="act_from" ref="act_produce_service"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        <record id="trans_buy_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_buy"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">subflow.cancel</field>
-        </record>
 
         <record id="trans_produce_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
             <field name="act_to" ref="act_make_done"/>
-            <field name="signal">subflow.done</field>
+            <field name="signal" eval="False"/>
         </record>
 
         <record id="trans_produce_service_make_done" model="workflow.transition">
@@ -337,12 +325,14 @@
         <record id="trans_buy_make_done" model="workflow.transition">
             <field name="act_from" ref="act_buy"/>
             <field name="act_to" ref="act_make_done"/>
-            <field name="signal">subflow.delivery_done</field>
+            <field name="signal" eval="False"/>
         </record>
         <record id="trans_make_done_done" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
-            <field name="condition">action_check_finnished()</field>
+            <field name="condition">action_check_finnished() or (not move_id)</field>
+            <field name="trigger_model">stock.move</field>
+            <field name="trigger_expr_id">[move_id.id]</field>
         </record>
         <record id="trans_make_done_confirm" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>

addons/olap_extract/i18n/zh_CN.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: olap_extract

addons/product/partner_view.xml

@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <newline/>
-                    <group col="2" colspan="2" name="sale_list">
+                    <group col="2" colspan="2" name="sale_list" groups="base.group_extended">
                         <separator string="Sales Properties" colspan="2"/>
                         <field name="property_product_pricelist"/>
                     </group>

addons/product/pricelist_view.xml

@@ -2,7 +2,10 @@
 <openerp>
     <data>
 
-        <menuitem groups="base.group_extended" id="menu_product_pricelist_main" name="Pricelists" parent="prod_config_main" sequence="50"/>
+        <menuitem id="menu_product_pricelist_main"
+            name="Pricelists" parent="prod_config_main" 
+            groups="base.group_extended"
+            sequence="50"/>
 
         <record id="product_pricelist_version_form_view" model="ir.ui.view">
             <field name="name">product.pricelist.version.form</field>

addons/purchase/partner_view.xml

@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="priority">36</field>
             <field name="arch" type="xml">
-                <group name="sale_list" position="after">
+                <group name="sale_list" position="after" groups="base.group_extended">
                     <group colspan="2" col="2">
                         <separator string="Purchases Properties" colspan="2"/>
                         <field name="property_product_pricelist_purchase"/>

addons/purchase_tender/__terp__.py

@@ -28,7 +28,7 @@
     When a purchase order is created, you now have the opportunity to save the related tender.
     This new object will regroup and will allow you to easily keep track and order all your purchase orders.
 """,
-    "depends" : ["purchase"],
+    "depends" : ["purchase","mrp"],
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : ["purchase_tender_view.xml","security/ir.model.access.csv","purchase_tender_sequence.xml"],

addons/purchase_tender/purchase_tender.py

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -33,8 +33,10 @@ class purchase_tender(osv.osv):
         'date_start': fields.datetime('Date Start'),
         'date_end': fields.datetime('Date End'),
         'user_id': fields.many2one('res.users', 'Responsible'),
+        'exclusive': fields.boolean('Exclusive', help="If the tender is exclusive, it will cancel all purchase orders when you confirm one of them"),
         'description': fields.text('Description'),
         'purchase_ids' : fields.one2many('purchase.order','tender_id','Purchase Orders'),
+        'line_ids' : fields.one2many('purchase.tender.line','tender_id','Products to Purchase'),
         'state': fields.selection([('draft','Draft'),('open','Open'),('close','Close')], 'State', required=True)
     }
     _defaults = {
@@ -44,6 +46,18 @@ class purchase_tender(osv.osv):
     }
 purchase_tender()
 
+class purchase_tender_line(osv.osv):
+    _name = "purchase.tender.line"
+    _description="Purchase Tender Line"
+    _rec_name = 'product_id'
+    _columns = {
+        'product_id': fields.many2one('product.product', 'Product'),
+        'product_uom_id': fields.many2one('product.uom', 'Product UoM'),
+        'product_qty': fields.float('Date End', digits=(16,2)),
+        'tender_id' : fields.many2one('purchase.tender','Purchase Tender', ondelete='cascade')
+    }
+purchase_tender_line()
+
 class purchase_order(osv.osv):
     _inherit = "purchase.order"
     _description = "purchase order"
@@ -53,7 +67,7 @@ class purchase_order(osv.osv):
     def wkf_confirm_order(self, cr, uid, ids, context={}):
         res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
         for po in self.browse(cr, uid, ids, context):
-            if po.tender_id:
+            if po.tender_id and po.tender_id.exclusive:
                 for order in po.tender_id.purchase_ids:
                     if order.id<>po.id:
                         wf_service = netsvc.LocalService("workflow")
@@ -61,3 +75,34 @@ class purchase_order(osv.osv):
                     self.pool.get('purchase.tender').write(cr, uid, [po.tender_id.id], {'state':'close'})
         return res
 purchase_order()
+
+
+class product_product(osv.osv):
+    _inherit = 'product.product'
+    _columns = {
+        'purchase_tender': fields.boolean('Purchase Tender', help="Check this box so that requisitions generates purchase tenders instead of directly requests for quotations.")
+    }
+    _defaults = {
+        'purchase_tender': lambda *args: False
+    }
+product_product()
+
+
+class mrp_procurement(osv.osv):
+    _inherit = 'mrp.procurement'
+    def make_po(self, cr, uid, ids, context={}):
+        res = super(mrp_procurement, self).make_po(cr, uid, ids, context)
+        for proc_id,po_id in res.items():
+            procurement = self.browse(cr, uid, proc_id)
+            if procurement.product_id.purchase_tender:
+                self.pool.get('purchase.tender').create(cr, uid, {
+                    'name': procurement.name,
+                    'lines_ids': [(0,0,{
+                        'product_id': procurement.product_id.id,
+                        'product_uom_id': procurement.product_uom.id,
+                        'product_qty': procurement.product_qty
+
+                    })],
+                    'purchase_ids': [(6,0,[po_id])]
+                })
+mrp_procurement()

addons/purchase_tender/purchase_tender_view.xml

@@ -21,82 +21,84 @@
         <field name="inherit_id" ref="purchase.purchase_order_form"/>
         <field name="arch" type="xml">
             <field name="partner_ref" position="after">
-                <field name="tender_id" select="2"/>
+                <field name="tender_id"/>
             </field>
         </field>
     </record>
 
-        <record model="ir.ui.view" id="view_purchase_tender_form">
-            <field name="name">purchase.tender.form</field>
-            <field name="type">form</field>
-            <field name="model">purchase.tender</field>
-            <field name="arch" type="xml">
-                <form string="Purchase Tender">
-                    <field name="name" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="date_start" select="2"/>
-                    <field name="date_end" select="2"/>
-                    <notebook colspan="4">
-                        <page string="Description">
-                            <field name="description" colspan="4" nolabel="1" select="2"/>
-                        </page>
-                        <page string="Quotations">
-                            <field name="purchase_ids" nolabel="1" colspan="4"/>
-                        </page>
-                    </notebook>
-                    <field name="state" select="1"/>
-                </form>
-            </field>
-        </record>
-        <record model="ir.ui.view" id="view_purchase_tender_tree">
-            <field name="name">purchase.tender.tree</field>
-            <field name="type">tree</field>
-            <field name="model">purchase.tender</field>
-            <field name="arch" type="xml">
-                <tree string="Purchase Tender">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="date_start"/>
-                    <field name="date_end"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="action_purchase_tender">
-            <field name="name">Purchase Tenders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.tender</field>
-            <field name="view_type">form</field>
-        </record>
-<!--        <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="base.menu_purchase_root"/>-->
-<!--        <menuitem id="menu_purchase_Tender1" parent="menu_purchase_tender" action="action_purchase_tender"/>-->
-		<menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
-        <record model="ir.actions.act_window" id="action_purchase_tender_draft">
-            <field name="name">Draft Purchase Tenders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.tender</field>
-            <field name="domain">[('state','=','draft')]</field>
-            <field name="view_type">form</field>
-        </record>
-<!--        <menuitem id="menu_purchase_Tender1_draft" parent="menu_purchase_Tender1" action="action_purchase_tender_draft"/>-->
+    <record model="ir.ui.view" id="view_purchase_tender_form">
+        <field name="name">purchase.tender.form</field>
+        <field name="type">form</field>
+        <field name="model">purchase.tender</field>
+        <field name="arch" type="xml">
+            <form string="Purchase Tender">
+                <field name="name" select="1"/>
+                <field name="user_id" select="1"/>
+                <field name="date_start"/>
+                <field name="date_end"/>
+                <notebook colspan="4">
+                    <page string="Products">
+                        <field name="line_ids" colspan="4" nolabel="1">
+                            <tree string="Products" editable="bottom">
+                                <field name="product_id"/>
+                                <field name="product_uom_id"/>
+                                <field name="product_qty"/>
+                            </tree>
+                            <form string="Products" editable="bottom">
+                                <field name="product_id"/>
+                                <field name="product_uom_id"/>
+                                <field name="product_qty"/>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Notes">
+                        <field name="description" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Quotations">
+                        <field name="purchase_ids" nolabel="1" colspan="4"/>
+                    </page>
+                </notebook>
+                <field name="state" select="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_purchase_tender_tree">
+        <field name="name">purchase.tender.tree</field>
+        <field name="type">tree</field>
+        <field name="model">purchase.tender</field>
+        <field name="arch" type="xml">
+            <tree string="Purchase Tender">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="date_start"/>
+                <field name="date_end"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="action_purchase_tender">
+        <field name="name">Purchase Tenders</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">purchase.tender</field>
+        <field name="view_type">form</field>
+    </record>
 
-        <record model="ir.actions.act_window" id="action_purchase_tender_open">
-            <field name="name">Open Purchase Tenders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.tender</field>
-            <field name="domain">[('state','=','open')]</field>
-            <field name="view_type">form</field>
-        </record>
-<!--        <menuitem id="menu_purchase_Tender1_open" parent="menu_purchase_Tender1" action="action_purchase_tender_open"/>-->
+    <menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
+
+    <record model="ir.ui.view" id="product_normal_form_view_inherit">
+        <field name="name">product.form.inherit</field>
+        <field name="type">form</field>
+        <field name="model">product.product</field>
+        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="arch" type="xml">
+            <field name="supply_method" position="after">
+                <group colspan="2" col="2" attrs="{'invisible': [('supply_method','&lt;&gt;','buy')]}">
+                <field name="purchase_tender"/>
+                </group>
+            </field>
+        </field>
+    </record>
 
-        <record model="ir.actions.act_window" id="action_purchase_tender_new">
-            <field name="name">New Purchase Tenders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">purchase.tender</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-        </record>
-<!--        <menuitem id="menu_purchase_Tender1_new" parent="menu_purchase_tender" action="action_purchase_tender_new"/>-->
 
     </data>
 </openerp>

addons/sale/sale_view.xml

@@ -18,7 +18,7 @@
                     <field name="warehouse_id" required="1" select="1" widget="selection"/>
                     <separator colspan="4" string="Accounting"/>
                     <field name="payment_default_id"/>
-                    <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
+                    <field domain="[('type','=','sale')]" name="pricelist_id" select="1" groups="base.group_extended"/>
                     <field name="project_id" select="1"/>
                 </form>
             </field>
@@ -31,7 +31,7 @@
                 <tree string="Sale Shop">
                     <field name="name"/>
                     <field name="warehouse_id"/>
-                    <field name="pricelist_id"/>
+                    <field name="pricelist_id" groups="base.group_extended"/>
                     <field name="project_id"/>
                 </tree>
             </field>
@@ -110,8 +110,9 @@
                             <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"/>
                             <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id"/>
-                            <field name="project_id" select="2" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
+                            <field name="project_id" select="2" 
+                                context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"/>
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">

addons/stock/__terp__.py

@@ -56,7 +56,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "wizard/stock_traceability_view.xml",
         "wizard/stock_picking_make_view.xml",
         "wizard/stock_return_picking_view.xml",
-        "wizard/stock_split_move_view.xml",
         "stock_workflow.xml",
         "stock_incoterms.xml",
         "stock_wizard.xml",        

addons/stock/security/ir.model.access.csv

@@ -36,8 +36,6 @@
 "access_stock_invoice_onshipping","stock.invoice.onshipping","model_stock_invoice_onshipping","stock.group_stock_user",1,0,0,0
 "access_stock_location_product","stock.location.product","model_stock_location_product","stock.group_stock_user",1,0,0,0
 "access_report_stock_picking","report.stock.picking","model_report_stock_picking","stock.group_stock_user",1,0,0,0
-"access_stock_delivery","stock.delivery","model_stock_delivery","stock.group_stock_user",1,0,0,0
-
 "access_stock_traceability_upstream","stock.traceability.upstream","model_stock_traceability_upstream","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_downstream","stock.traceability.downstream","model_stock_traceability_downstream","stock.group_stock_user",1,0,0,0
 "access_stock_traceability_lot_upstream","stock.traceability.lot.upstream","model_stock_traceability_lot_upstream","stock.group_stock_user",1,0,0,0
@@ -46,4 +44,4 @@
 "access_stock_partial_move","stock.partial.move","model_stock_partial_move","stock.group_stock_user",1,0,0,0
 "access_stock_picking_make","stock.picking.make","model_stock_picking_make","stock.group_stock_user",1,0,0,0
 "access_stock_inventory_merge","stock.inventory.merge","model_stock_inventory_merge","stock.group_stock_user",1,0,0,0
-"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0
+"access_stock_change_standard_price","stock.change.standard.price","model_stock_change_standard_price","stock.group_stock_user",1,0,0,0

addons/stock/stock.py

@@ -492,7 +492,6 @@ class stock_picking(osv.osv):
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Max. Expected Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
-        'delivery_line':fields.one2many('stock.delivery', 'picking_id', 'Delivery lines', readonly=True),
         'auto_picking': fields.boolean('Auto-Picking'),
         'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
         'invoice_state': fields.selection([
@@ -877,7 +876,6 @@ class stock_picking(osv.osv):
         """
         res = {}
         move_obj = self.pool.get('stock.move')
-        delivery_obj = self.pool.get('stock.delivery')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
         users_obj = self.pool.get('res.users')
@@ -1003,14 +1001,6 @@ class stock_picking(osv.osv):
                 delivered_pack_id = pick.id
 
             delivered_pack = self.browse(cr, uid, delivered_pack_id, context=context)
-            delivery_id = delivery_obj.create(cr, uid, {
-                'name':  delivered_pack.name,
-                'partner_id': partner_id,
-                'address_id': address_id,
-                'date': delivery_date,
-                'picking_id' :  pick.id,
-                'move_delivered' : [(6,0, map(lambda x:x.id, delivered_pack.move_lines))]
-            }, context=context)
             res[pick.id] = {'delivered_picking': delivered_pack.id or False}
         return res
 
@@ -1112,26 +1102,6 @@ class stock_production_lot_revision(osv.osv):
 
 stock_production_lot_revision()
 
-class stock_delivery(osv.osv):
-
-    """ Tracability of partialdeliveries """
-
-    _name = "stock.delivery"
-    _description = "Delivery"
-    _columns = {
-        'name': fields.char('Name', size=60, required=True),
-        'date': fields.datetime('Date', required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner', required=True),
-        'address_id': fields.many2one('res.partner.address', 'Address', required=True),
-        'move_delivered':fields.one2many('stock.move', 'delivered_id', 'Move Delivered'),
-        'picking_id': fields.many2one('stock.picking', 'Picking list'),
-
-    }
-stock_delivery()
-# ----------------------------------------------------
-# Move
-# ----------------------------------------------------
-
 #
 # Fields:
 #   location_dest_id is only used for predicting futur stocks
@@ -1211,7 +1181,6 @@ class stock_move(osv.osv):
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Orders"),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Origin"),
         'move_stock_return_history': fields.many2many('stock.move', 'stock_move_return_history', 'move_id', 'return_move_id', 'Move Return History',readonly=True),
-        'delivered_id': fields.many2one('stock.delivery', 'Product delivered'),
         'scraped': fields.boolean('Scraped'),
     }
     _constraints = [
@@ -1803,7 +1772,6 @@ class stock_move(osv.osv):
         """
         res = {}
         picking_obj = self.pool.get('stock.picking')
-        delivery_obj = self.pool.get('stock.delivery')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
         users_obj = self.pool.get('res.users')
@@ -1909,18 +1877,6 @@ class stock_move(osv.osv):
         done_move_ids = []
         for move in complete:
             done_move_ids.append(move.id)
-            if move.picking_id.id not in ref:
-                delivery_id = delivery_obj.create(cr, uid, {
-                    'partner_id': partner_id,
-                    'address_id': address_id,
-                    'date': delivery_date,
-                    'name' : move.picking_id.name,
-                    'picking_id':  move.picking_id.id
-                }, context=context)
-                ref[move.picking_id.id] = delivery_id
-            delivery_obj.write(cr, uid, ref[move.picking_id.id], {
-                'move_delivered' : [(4,move.id)]
-            })
         return done_move_ids
 
 stock_move()

addons/stock/stock_view.xml

@@ -20,7 +20,7 @@
                     <field name="prod_lot_id"/>
                     <button name="%(stock.action_view_stock_inventory_line_split)d"
                             string="Split inventory lines"
-                            type="action" icon="gtk-justify-fill"/>                    
+                            type="action" icon="gtk-justify-fill"/>
                     <field name="location_id"/>
                 </tree>
             </field>
@@ -35,7 +35,7 @@
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="prod_lot_id"/>
-                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>                  
+                    <field colspan="4" domain="[('usage','=','internal')]" name="location_id" select="1"/>
                         <button name="%(stock.action_view_stock_inventory_line_split)d"
                             string="Split inventory lines"
                             type="action" icon="gtk-justify-fill"/>
@@ -426,7 +426,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_location_tree2" model="ir.ui.view">
             <field name="name">stock.location.tree</field>
             <field name="model">stock.location</field>
@@ -585,17 +585,17 @@
                         <field name="min_date" select="1"/>
                         <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(act_stock_make_picking_wizard)d" 
-                            states="confirmed,assigned" 
-                            string="Make Picking" 
-                            type="action" 
+                        <button name="%(act_stock_make_picking_wizard)d"
+                            states="confirmed,assigned"
+                            string="Make Picking"
+                            type="action"
                             icon="gtk-go-forward"
                             help="Make Picking" colspan="2"/>
-                        <button name="%(act_stock_return_picking)d" 
-                            states="done" 
-                            string="Return Picking" 
+                        <button name="%(act_stock_return_picking)d"
+                            states="done"
+                            string="Return Picking"
                             type="action"
-                            icon="gtk-go-back" 
+                            icon="gtk-go-back"
                             help="Return Picking" colspan="2"/>
                     </group>
                     <notebook colspan="4">
@@ -619,9 +619,9 @@
                                            states="draft,waiting,confirmed,assigned" />
 
                                     <button name="%(stock.move_scrap)d"
-				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-convert" context="{'scrap': True}"
-				                    	states="draft,waiting,confirmed,assigned" />                                       
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -662,10 +662,6 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <group col="7" colspan="4">
-                                <label colspan="6"/>
-                                <button name="%(act_split_moves)d" string="Split Entry Lines in two" type="action" icon="gtk-justify-fill"/>
-                            </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
                                 <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object" icon="gtk-apply"/>
@@ -687,7 +683,7 @@
                             <newline/>
                             <field name="move_type"/>
                         </page>
-                    </notebook>                    
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -708,8 +704,8 @@
                         <field name="location_dest_id" select="1"/>
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
-                    </group>  
-                    <newline/>                   
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -750,19 +746,18 @@
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="date" />
                         <field name="min_date" select="1"/>
-                        <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(act_stock_make_picking_wizard)d" 
-                                states="assigned" 
-                                string="Make Picking" 
-                                type="action" 
-                                icon="gtk-go-forward" 
+                        <button name="%(act_stock_make_picking_wizard)d"
+                                states="assigned"
+                                string="Make Picking"
+                                type="action"
+                                icon="gtk-go-forward"
                                 help="Make Picking" colspan="2"/>
-                        <button name="%(act_stock_return_picking)d" 
-                                states="done" 
-                                string="Return Picking" 
-                                type="action" 
-                                icon="gtk-go-back" 
+                        <button name="%(act_stock_return_picking)d"
+                                states="done"
+                                string="Return Picking"
+                                type="action"
+                                icon="gtk-go-back"
                                 help="Return Picking" colspan="2"/>
                     </group>
                         <notebook colspan="4">
@@ -785,9 +780,9 @@
                                            type="action" icon="gtk-justify-fill"
                                            states="draft,waiting,confirmed,assigned" />
                                        <button name="%(stock.move_scrap)d"
-				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-convert" context="{'scrap': True}"
-				                    	states="draft,waiting,confirmed,assigned" />
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -823,10 +818,6 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <group col="7" colspan="4">
-                                <label colspan="6"/>
-                                <button name="%(act_split_moves)d" string="Split in Two" type="action" states="assigned,confirmed,draft,auto" icon="gtk-justify-fill"/>
-                            </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
@@ -848,7 +839,7 @@
                             <field name="date_done" select="2"/>
                             <field name="move_type"/>
                         </page>
-                    </notebook>                    
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -868,8 +859,8 @@
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
                         <field name="origin" select="1"/>
-                    </group> 
-                    <newline/>                    
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -886,7 +877,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>            
+            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
@@ -939,24 +930,23 @@
                 <form string="Picking list">
                     <group col="6" colspan="4">
                         <field name="address_id" select="2"/>
-                        <field name="type"/>
                         <field name="min_date" select="2"/>
                         <field name="name" select="1" readonly="1"/>
                         <field name="invoice_state"/>
                         <field name="backorder_id" select="2" readonly="1"/>
                         <field name="origin" select="2" readonly="1"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(act_stock_make_picking_wizard)d" 
-                                states="assigned" 
-                                string="Make Picking" 
-                                type="action" 
-                                icon="gtk-go-forward" 
+                        <button name="%(act_stock_make_picking_wizard)d"
+                                states="assigned"
+                                string="Make Picking"
+                                type="action"
+                                icon="gtk-go-forward"
                                 help="Make Picking" colspan="2"/>
-                        <button name="%(act_stock_return_picking)d" 
-                                states="done" 
-                                string="Return Picking" 
-                                type="action" 
-                                icon="gtk-go-back" 
+                        <button name="%(act_stock_return_picking)d"
+                                states="done"
+                                string="Return Picking"
+                                type="action"
+                                icon="gtk-go-back"
                                 help="Return Picking" colspan="2"/>
                     </group>
                     <notebook colspan="4">
@@ -1020,10 +1010,6 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <group col="7" colspan="4">
-                                <label colspan="6"/>
-                                <button name="%(act_split_moves)d" string="Split in Two" type="action" icon="gtk-justify-fill"/>
-                            </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
@@ -1034,9 +1020,6 @@
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
-                        <page string="Delivery Info">
-                            <field colspan="4" name="delivery_line" nolabel="1"/>
-                        </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
@@ -1066,8 +1049,8 @@
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
                         <field name="company_id" select="1" widget="selection"/>
-                   </group>   
-                    <newline/>                 
+                   </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -1139,19 +1122,18 @@
                         <field name="date"/>
                         <field name="min_date" select="2" readonly="1"/>
                         <field name="invoice_state" select="2" string="Invoice Control"/>
-                        <field name="type"/>
                         <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                        <button name="%(act_stock_make_picking_wizard)d" 
-                                states="confirmed,assigned" 
-                                string="Make Picking" 
-                                type="action" 
-                                icon="gtk-go-forward" 
+                        <button name="%(act_stock_make_picking_wizard)d"
+                                states="confirmed,assigned"
+                                string="Make Picking"
+                                type="action"
+                                icon="gtk-go-forward"
                                 help="Make Picking" colspan="2"/>
-                        <button name="%(act_stock_return_picking)d" 
-                                states="done" 
-                                string="Return Picking" 
-                                type="action" 
-                                icon="gtk-go-back" 
+                        <button name="%(act_stock_return_picking)d"
+                                states="done"
+                                string="Return Picking"
+                                type="action"
+                                icon="gtk-go-back"
                                 help="Return Picking" colspan="2"/>
                     </group>
                     <notebook colspan="4">
@@ -1170,9 +1152,9 @@
                                            type="action" icon="gtk-justify-fill"
                                            states="draft,waiting,confirmed,assigned" />
                                        <button name="%(stock.move_scrap)d"
-				                    	string="Scrap Products" type="action"
-				                    	icon="gtk-convert" context="{'scrap': True}"
-				                    	states="draft,waiting,confirmed,assigned" />
+                                        string="Scrap Products" type="action"
+                                        icon="gtk-convert" context="{'scrap': True}"
+                                        states="draft,waiting,confirmed,assigned" />
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -1227,9 +1209,6 @@
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
-                        <page string="Delivery Info">
-                            <field colspan="4" name="delivery_line" nolabel="1"/>
-                        </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
@@ -1252,8 +1231,8 @@
                         <field name="name" select="1"/>
                         <field name="address_id" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company" />
-                    </group>  
-                    <newline/>                   
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
@@ -1265,7 +1244,7 @@
 
 
         <record id="action_picking_tree4" model="ir.actions.act_window">
-            <field name="name">Incoming shipments</field>
+            <field name="name">Incoming Shipments</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1306,8 +1285,8 @@
                         <field name="name" select="1"/>
                         <field name="origin" select="1"/>
                         <field name="company_id" select="1" widget="selection"/>
-                    </group>  
-                    <newline/>                   
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
@@ -1364,7 +1343,6 @@
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Move Information"/>
                                 <field name="name" select="2"/>
-								<field name="delivered_id"/>                                
                                 <field name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
                                 <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom" select="2"/>
@@ -1427,8 +1405,8 @@
                         <field name="location_id" select="1"/>
                         <field name="location_dest_id" select="1"/>
                         <field name="product_id" select="1"/>
-                    </group> 
-                    <newline/>                    
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]"  context="{'group_by':'product_id'}"/>
                         <filter string="Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
@@ -1449,24 +1427,6 @@
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
 
-        <record id="action_picking_all" model="ir.actions.act_window">
-            <field name="name">Picking lists</field>
-            <field name="res_model">stock.picking</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar</field>
-            <field name="search_view_id" ref="view_stock_picking_filter"/>
-            <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
-        </record>
-        <record id="action_picking_out_tree_view" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_picking_out_tree"/>
-            <field name="act_window_id" ref="action_picking_all"/>
-        </record>
-        <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_stock_warehouse_mgmt" sequence="3"/>
-
         ====================================
         Reception Picking (By Stock Move)
         ====================================
@@ -1504,7 +1464,6 @@
                     <notebook colspan="4">
                         <page string="General Information">
                             <separator colspan="4" string="Move Information"/>
-                            <field name="delivered_id"/>
                             <field name="location_id" select="1"/>
                             <field name="location_dest_id" select="1"/>
                             <field colspan="4" name="product_id" select="1" on_change="onchange_product_id(product_id,location_id,location_dest_id)"/>
@@ -1561,8 +1520,8 @@
                         <field name="origin" string="Latest Requisition" select="1"/>
                         <field name="partner_id" string="Supplier" select="1"/>
                         <field name="product_id"/>
-                    </group>   
-                    <newline/>                 
+                    </group>
+                    <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
@@ -1754,56 +1713,6 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_move_delivery_products_planned_graph"/>
         </record>
-          <!-- Product Delivered  -->
-        <record id="view_stock_delivery_form" model="ir.ui.view">
-            <field name="name">stock.delivery.from</field>
-            <field name="model">stock.delivery</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Product">
-                		<field name="name"/>
-	                    <field name="date"/>
-	                    <field name="partner_id"/>
-	                    <field name="address_id"/>
-	                    <field name="picking_id"/>
-	                    <separator string="Product Delivered Information" colspan="4" />
-	                    <field name="move_delivered" colspan="4" nolabel="1" widget="one2many" mode="tree,form">
-	                       <tree string="Stock Moves" editable="top">
-			                    <field name="picking_id" string="Reference"/>
-			                    <field name="origin" string="Latest Requisition"/>
-			                    <field name="partner_id" string="Supplier"/>
-			                    <field name="product_id"/>
-			                    <field name="product_qty" />
-			                    <field name="product_uom" string="UOM"/>
-			                    <field name="prodlot_id" string="Lot"/>
-		            		</tree>
-	           			</field> 
-                </form>
-            </field>
-        </record>
-        <record id="view_stock_delivery_tree" model="ir.ui.view">
-            <field name="name">stock.delivery.tree</field>
-            <field name="model">stock.delivery</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Delivered Product">	
-                	<field name="name"/>
-                    <field name="date"/>
-                    <field name="partner_id"/>
-                    <field name="address_id"/>
-                </tree>
-            </field>
-        </record>
-	    
-    	<record id="action_stock_delivery" model="ir.actions.act_window">
-            <field name="name">Delivered Products</field>
-            <field name="res_model">stock.delivery</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>            
-            <field name="view_mode">form,tree</field>
-            <field name="view_id" ref="view_stock_delivery_tree"/>
-        </record>        
-		
-		<menuitem action="action_stock_delivery" id="menu_action_picking_all" parent="menu_traceability" sequence="4"/>
+
     </data>
 </openerp>

addons/stock/wizard/__init__.py

@@ -26,7 +26,6 @@ import stock_partial_move
 import stock_picking_make
 import wizard_replacement
 import stock_return_picking
-import stock_split_move
 import wizard_ups
 import stock_inventory_merge
 import stock_inventory_set_stock_zero

addons/stock/wizard/stock_partial_move.py

@@ -27,22 +27,19 @@ import pooler
 import time
 
 class stock_partial_move(osv.osv_memory):
-    _name = "stock.partial.move"    
-    _description = "Partial Move"    
+    _name = "stock.partial.move"
+    _description = "Partial Move"
     _columns = {
-                'date': fields.datetime('Date', required=True),
-                'partner_id': fields.many2one('res.partner',string="Partner", required=True),
-                'address_id': fields.many2one('res.partner.address', 'Delivery Address', help="Address where goods are to be delivered", required=True),
-                               
-     }
+        'date': fields.datetime('Date', required=True),
+    }
 
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
-        move_obj = self.pool.get('stock.move')        
+        move_obj = self.pool.get('stock.move')
         if not context:
             context={}
         moveids = []
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if m.state in ('done', 'cancel'):
                 continue
             if 'move%s_product_id'%(m.id) not in self._columns:
@@ -57,55 +54,53 @@ class stock_partial_move(osv.osv_memory):
                     self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
                 if 'move%s_product_currency'%(m.id) not in self._columns:
                     self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
-        return res   
+        return res
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
-        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)        
+        result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
         move_obj = self.pool.get('stock.move')
-        move_ids = context.get('active_ids', False)                
+        move_ids = context.get('active_ids', False)
         move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
         _moves_arch_lst = """<form string="Deliver Products">
-                        <separator colspan="4" string="Delivery Information"/>
+                        <separator colspan="4" string="Information"/>
                     	<field name="date" colspan="4" />
-                    	<field name="partner_id"/>
-                    	<field name="address_id"/>
                     	<newline/>
                         <separator colspan="4" string="Move Detail"/>
                     	"""
         _moves_fields = result['fields']
-        if move_ids and view_type in ['form']:            
-            for m in move_obj.browse(cr, uid, move_ids, context):                
+        if move_ids and view_type in ['form']:
+            for m in move_obj.browse(cr, uid, move_ids, context):
                 if m.state in ('done', 'cancel'):
                     continue
                 _moves_fields.update({
                     'move%s_product_id'%(m.id)  : {
                                 'string': _('Product'),
-                                'type' : 'many2one', 
-                                'relation': 'product.product', 
-                                'required' : True, 
-                                'readonly' : True,                                    
+                                'type' : 'many2one',
+                                'relation': 'product.product',
+                                'required' : True,
+                                'readonly' : True,
                                 },
                     'move%s_product_qty'%(m.id) : {
                                 'string': _('Quantity'),
                                 'type' : 'float',
-                                'required': True,                                    
+                                'required': True,
                                 },
                     'move%s_product_uom'%(m.id) : {
                                 'string': _('Product UOM'),
-                                'type' : 'many2one', 
-                                'relation': 'product.uom', 
-                                'required' : True, 
-                                'readonly' : True,                                    
+                                'type' : 'many2one',
+                                'relation': 'product.uom',
+                                'required' : True,
+                                'readonly' : True,
                                 }
-                })                
-                
+                })
+
                 _moves_arch_lst += """
                     <group colspan="4" col="10">
                     <field name="move%s_product_id" nolabel="1"/>
                     <field name="move%s_product_qty" string="Qty" />
                     <field name="move%s_product_uom" nolabel="1" />
                 """%(m.id, m.id, m.id)
-                if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):                        
+                if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
                         'move%s_product_price'%(m.id) : {
                                 'string': _('Price'),
@@ -113,9 +108,9 @@ class stock_partial_move(osv.osv_memory):
                                 },
                         'move%s_product_currency'%(m.id): {
                                 'string': _('Currency'),
-                                'type' : 'float',      
-                                'type' : 'many2one', 
-                                'relation': 'res.currency',                                    
+                                'type' : 'float',
+                                'type' : 'many2one',
+                                'relation': 'res.currency',
                                 }
                     })
                     _moves_arch_lst += """
@@ -136,31 +131,31 @@ class stock_partial_move(osv.osv_memory):
         	</group>                	
         </form>"""
         result['arch'] = _moves_arch_lst
-        result['fields'] = _moves_fields           
+        result['fields'] = _moves_fields
         return result
 
     def default_get(self, cr, uid, fields, context=None):
-        """ 
+        """
              To get default values for the object.
-            
+
              @param self: The object pointer.
              @param cr: A database cursor
              @param uid: ID of the user currently logged in
-             @param fields: List of fields for which we want default values 
-             @param context: A standard dictionary 
-             
-             @return: A dictionary which of fields with values. 
-        
-        """ 
+             @param fields: List of fields for which we want default values
+             @param context: A standard dictionary
+
+             @return: A dictionary which of fields with values.
+
+        """
 
         res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
-        move_obj = self.pool.get('stock.move')        
+        move_obj = self.pool.get('stock.move')
         if not context:
             context={}
         moveids = []
         if 'date' in fields:
             res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):            
+        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
             if m.state in ('done', 'cancel'):
                 continue
             if 'move%s_product_id'%(m.id) in fields:
@@ -178,23 +173,21 @@ class stock_partial_move(osv.osv_memory):
                 currency = False
                 if hasattr(m.picking_id, 'purchase_id') and m.picking_id.purchase_id:
                     currency = m.picking_id.purchase_id.pricelist_id.currency_id.id
-    
+
                 if 'move%s_product_price'%(m.id) in fields:
                     res['move%s_product_price'%(m.id)] = price
                 if 'move%s_product_currency'%(m.id) in fields:
                     res['move%s_product_currency'%(m.id)] = currency
-        return res   
+        return res
 
-    def do_partial(self, cr, uid, ids, context):    
-        move_obj = self.pool.get('stock.move')    
+    def do_partial(self, cr, uid, ids, context):
+        move_obj = self.pool.get('stock.move')
         move_ids = context.get('active_ids', False)
         partial = self.browse(cr, uid, ids[0], context)
         partial_datas = {
-            'partner_id' : partial.partner_id and partial.partner_id.id or False,
-            'address_id' : partial.address_id and partial.address_id.id or False,
-            'delivery_date' : partial.date         
+            'delivery_date' : partial.date
         }
-        for m in move_obj.browse(cr, uid, move_ids):            
+        for m in move_obj.browse(cr, uid, move_ids):
             if m.state in ('done', 'cancel'):
                 continue
             partial_datas['move%s'%(m.id)] = {
@@ -203,15 +196,14 @@ class stock_partial_move(osv.osv_memory):
                 'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id
             }
 
-            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):   
-                partial_datas['move%s'%(m.id)].update({             
+            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                partial_datas['move%s'%(m.id)].update({
                     'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
                     'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
-                })  
-        
+                })
+
         res = move_obj.do_partial(cr, uid, move_ids, partial_datas, context=context)
         return {}
- 
-stock_partial_move()    
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+stock_partial_move()
 

addons/stock/wizard/stock_split_move.py

@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-from osv import osv, fields
-
-class stock_split_move_line(osv.osv_memory):
-    _name = 'stock.move.line.split'
-    _description = "Split Moves"
-    
-    def default_get(self, cr, uid, fields, context):
-        """ 
-         To get default values for the object.
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param fields: List of fields for which we want default values 
-         @param context: A standard dictionary 
-         @return: A dictionary which of fields with values. 
-        """ 
-        res = super(stock_split_move_line, self).default_get(cr, uid, fields, context=context)
-        record_id = context and context.get('active_id', False) or False
-        pick_obj = self.pool.get('stock.picking')
-        pick = pick_obj.browse(cr, uid, record_id)
-        for m in [line for line in pick.move_lines]:
-            res['move%s'%(m.id)] = m.product_qty
-        return res
-    
-    def view_init(self, cr, uid, fields_list, context=None):
-        """ 
-         Creates view dynamically and adding fields at runtime.
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param context: A standard dictionary 
-         @return: New arch of view with new columns.
-        """
-        res = super(stock_split_move_line, self).view_init(cr, uid, fields_list, context=context)
-        record_id = context and context.get('active_id', False) or False
-        if record_id:
-            pick_obj = self.pool.get('stock.picking')
-            try:
-                pick = pick_obj.browse(cr, uid, record_id)
-                for m in [line for line in pick.move_lines]:
-                    if 'move%s' % m.id not in self._columns:
-                        self._columns['move%s' % m.id] = fields.float(string=m.product_id.name)
-            except:
-                return res
-        return res
-    
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', 
-                        context=None, toolbar=False, submenu=False):
-        """ 
-         Changes the view dynamically
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param context: A standard dictionary 
-         @return: New arch of view.
-        """
-        res = super(stock_split_move_line, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-        record_id = context and context.get('active_id', False) or False
-        assert record_id,'Active ID not found'
-        pick_obj = self.pool.get('stock.picking')
-        pick = pick_obj.browse(cr, uid, record_id)
-        arch_lst = ['<?xml version="1.0"?>', '<form string="Split lines">', '<label string="Indicate here the quantity of the new line. A quantity of zero will not split the line." colspan="4"/>']
-        for m in [line for line in pick.move_lines]:
-            quantity = m.product_qty
-            arch_lst.append('<field name="move%s" />\n<newline />' % (m.id,))
-            res['fields']['move%s' % m.id] = {'string' : m.product_id.name, 'type' : 'float', 'required' : True}
-        arch_lst.append('<group col="2" colspan="4">')
-        arch_lst.append('<button icon="gtk-cancel" special="cancel" string="Cancel" />')
-        arch_lst.append('<button name="split_lines" string="Split" colspan="1" type="object" icon="gtk-apply" />')
-        arch_lst.append('</group>')
-        arch_lst.append('</form>')
-        res['arch'] = '\n'.join(arch_lst)
-        return res
-    
-    def split_lines(self, cr, uid, ids, context):
-        """ 
-         Splits moves in quantity given in the wizard.
-         @param self: The object pointer.
-         @param cr: A database cursor
-         @param uid: ID of the user currently logged in
-         @param ids: List of ids selected 
-         @param context: A standard dictionary 
-         @return: A dictionary which of fields with values. 
-        """ 
-        move_obj = self.pool.get('stock.move')
-        record_id = context and context.get('active_id', False) or False
-        pick_obj = self.pool.get('stock.picking')
-        pick = pick_obj.browse(cr, uid, record_id)
-        data = self.read(cr, uid, ids[0])
-        move_ids = [m.id for m in [line for line in pick.move_lines]]
-        for move in move_obj.browse(cr, uid, move_ids):
-            quantity = data['move%s' % move.id]
-            if 0 < quantity < move.product_qty:
-                new_qty = move.product_qty - quantity
-                new_uos_qty = new_qty / move.product_qty * move.product_uos_qty
-                new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : new_qty, 'product_uos_qty': new_uos_qty, 'state':move.state})
-                uos_qty = quantity / move.product_qty * move.product_uos_qty
-                move_obj.write(cr, uid, [move.id], {'product_qty' : quantity, 'product_uos_qty': uos_qty})
-        return {}
-    
-stock_split_move_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

addons/stock/wizard/stock_split_move_view.xml

@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-        <!--  Split Moves -->
-        
-        <record id="act_split_moves" model="ir.actions.act_window">
-            <field name="name">Split Moves</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">stock.move.line.split</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>  
-		
-	</data>
-</openerp>	
+
+    </data>
+</openerp>

addons/survey/i18n/zh_CN.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
+"X-Launchpad-Export-Date: 2010-04-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey

addons/survey/survey.py

@@ -95,6 +95,46 @@ class survey(osv.osv):
     def copy(self, cr, uid, id, default=None,context={}):
         raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
 
+    def action_print_survey(self, cr, uid, ids, context=None):
+        """
+        If response is available then print this response otherwise print survey form(print template of the survey).
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Survey IDs
+        @param context: A standard dictionary for contextual values
+        @return : Dictionary value for print survey form.
+        """
+        if not context:
+            context = {}
+        datas = {}
+        response_id = self.pool.get('survey.response').search(cr, uid, [('survey_id','=', ids)], context=context)
+        page_setting = {'orientation': 'vertical', 'without_pagebreak': 0, 'paper_size': 'letter', 'page_number': 1, 'survey_title': 1}
+        report = {}
+        datas['ids'] = ids
+        if response_id:
+            context.update({'survey_id': datas['ids']})
+            datas['form'] = page_setting
+            datas['model'] = 'survey.print.answer'
+            report = {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'survey.browse.response',
+                'datas': datas,
+                'nodestroy': True,
+                'context' : context
+            }
+        else:
+            datas['form'] = page_setting
+            datas['model'] = 'survey.print'
+            report = {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'survey.form',
+                'datas': datas,
+                'nodestroy':True,
+                'context' : context
+            }
+        return report
+
 survey()
 
 class survey_history(osv.osv):

addons/survey/survey_view.xml

@@ -243,8 +243,8 @@
                         string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
 					<button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                         string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
-					<button name="%(survey_browse_response)d" states="open,draft,close,cancel"
-                                	string="Print Answer" type="action" icon="gtk-print"/>
+					<button name="action_print_survey" states="open,draft,close,cancel"
+                                	string="Print Answer" type="object" icon="gtk-print"/>
                 </tree>
             </field>
         </record>