diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index 2dcf62a1dbb..d67b9c0e8c8 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-20 12:49+0000\n" -"Last-Translator: Hend Awad \n" +"PO-Revision-Date: 2010-02-22 08:34+0000\n" +"Last-Translator: some one \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2009-12-21 04:43+0000\n" +"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 0b03cdeb1cc..ecb7e15efc4 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-21 23:52+0000\n" -"Last-Translator: Holverat Bortolossi \n" +"PO-Revision-Date: 2010-02-22 21:38+0000\n" +"Last-Translator: sbrianti \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-22 04:41+0000\n" +"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1340,7 +1340,7 @@ msgstr "Modelo" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "Fechar ano fiscal" +msgstr "Fechar um ano fiscal" #. module: account #: field:account.journal,centralisation:0 @@ -1355,7 +1355,7 @@ msgstr "Mensagem:" #. module: account #: model:process.node,note:account.process_node_supplierpaymentorder0 msgid "Select invoices you want to pay and manages advances" -msgstr "Selecionar faturaa s pagar e administrar vantagens" +msgstr "Selecionar as faturas que você quer pagar e adiantamentos a fazer" #. module: account #: selection:account.account,type:0 @@ -1389,7 +1389,7 @@ msgstr "O método de calculo para o valor do imposto." #: model:process.node,note:account.process_node_accountingentries0 #: model:process.node,note:account.process_node_supplieraccountingentries0 msgid "Validated accounting entries." -msgstr "Lançamentos de conta validado" +msgstr "Lançamentos contábeis validados" #. module: account #: wizard_view:account.move.line.unreconcile,init:0 @@ -1398,8 +1398,9 @@ msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disable" msgstr "" -"Se você não concilia transações, você também deve verificar todas as ações " -"que estão ligadas a essas operações, porque não será desativaadas" +"Se você desfazer a reconciliação de transações, você deve também verificar " +"todas as ações que estão ligadas a essas operações, porque elas não serão " +"desfeitas pelo sistema" #. module: account #: model:process.node,name:account.process_node_electronicfile0 diff --git a/addons/account_balance/i18n/bs.po b/addons/account_balance/i18n/bs.po index 4092eee07c8..b13ebd52784 100644 --- a/addons/account_balance/i18n/bs.po +++ b/addons/account_balance/i18n/bs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-02-16 14:07+0000\n" +"PO-Revision-Date: 2010-02-22 12:42+0000\n" "Last-Translator: adnan \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-02-17 04:56+0000\n" +"X-Launchpad-Export-Date: 2010-02-23 05:05+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_balance @@ -73,27 +73,27 @@ msgstr "Odaberite razdoblja" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Percentage" -msgstr "" +msgstr "Procenat" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0 msgid "Compare Selected Years In Terms Of" -msgstr "" +msgstr "Usporedi odabrane godine pod uvjetima" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Fiscal Year(s)(Maximum Three Years)" -msgstr "" +msgstr "Odaberite fiskalne godine (Maksimalno 3 godine)" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,select_account:0 msgid "Select Reference Account(for % comparision)" -msgstr "" +msgstr "Izaberi odgovarajuća konta (za poređenje u %)" #. module: account_balance #: model:ir.actions.wizard,name:account_balance.wizard_account_balance_report msgid "Account balance-Compare Years" -msgstr "" +msgstr "Saldo konta - poredi godine" #. module: account_balance #: model:ir.module.module,description:account_balance.module_meta_information @@ -120,108 +120,108 @@ msgstr "" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "You have to select 'Landscape' option. Please Check it." -msgstr "" +msgstr "Morate odabrati opciju 'Položeno'. Molimo označite je." #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,landscape:0 msgid "Show Report in Landscape Form" -msgstr "" +msgstr "Prikaži izvješće u položenoj formi" #. module: account_balance #: help:account.balance.account.balance.report,init,periods:0 msgid "All periods if empty" -msgstr "" +msgstr "Ako je prazno, sva razdoblja" #. module: account_balance #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "With balance is not equal to 0" -msgstr "" +msgstr "Sa saldom različit od 0" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Total :" -msgstr "" +msgstr "Ukupno :" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Account Balance -" -msgstr "" +msgstr "Saldo računa -" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,format_perc:0 msgid "Show Comparision in %" -msgstr "" +msgstr "Prikaži usporedbu u %" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period" -msgstr "" +msgstr "Odaberite razdoblje" #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Report Options" -msgstr "" +msgstr "Postavke izvješća" #. module: account_balance #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "With movements" -msgstr "" +msgstr "Sa kretanjima" #. module: account_balance #: wizard_button:account.balance.account.balance.report,backtoinit,end:0 #: wizard_button:account.balance.account.balance.report,zero_years,end:0 msgid "Ok" -msgstr "" +msgstr "Uredu" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Cash" -msgstr "" +msgstr "Gotovina" #. module: account_balance #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Don't Compare" -msgstr "" +msgstr "Ne uspoređuj" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,account_choice:0 msgid "Show Accounts" -msgstr "" +msgstr "Prikaži račune" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Credit" -msgstr "" +msgstr "Potražuje" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "1. You have selected more than 3 years in any case." -msgstr "" +msgstr "1. Odabrali ste više od 3 godine u svakom slučaju." #. module: account_balance #: model:ir.module.module,shortdesc:account_balance.module_meta_information msgid "Accounting and financial management-Compare Accounts" -msgstr "" +msgstr "Upravljanje računovodstvom i finansijama - Usporedi konta" #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Year :" -msgstr "" +msgstr "Godina:" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "You can select maximum 3 years. Please check again." -msgstr "" +msgstr "Možete odabrati maksimalno 3 godine. Molimo pokušajte ponovno." #. module: account_balance #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Balance" -msgstr "" +msgstr "Saldo" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -229,27 +229,30 @@ msgid "" "3. You have selected 'Percentage' option with more than 2 years, but you " "have not selected landscape format." msgstr "" +"Izabrali ste \"Postotak\" opciju sa više od dvije godine, ali niste odabrali " +"\"Položeni\" format." #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "" "You might have done following mistakes. Please correct them and try again." msgstr "" +"Možda ste napravili sljedeće pogreške. Ispravite ih i pokušajte ponovno." #. module: account_balance #: help:account.balance.account.balance.report,init,select_account:0 msgid "Keep empty for comparision to its parent" -msgstr "" +msgstr "Ostavite prazno za usporedbu sa roditeljem" #. module: account_balance #: selection:account.balance.account.balance.report,init,period_manner:0 msgid "Creation Date" -msgstr "" +msgstr "Datum kreiranja" #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,fiscalyear:0 msgid "Fiscal year" -msgstr "" +msgstr "Fiskalna godina" #. module: account_balance #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -257,11 +260,12 @@ msgid "" "2. You have not selected 'Percentage' option, but you have selected more " "than 2 years." msgstr "" +"2. Niste odabrali opciju 'Postotak', ali ste odabrali više od 2 godine." #. module: account_balance #: wizard_field:account.balance.account.balance.report,init,periods:0 msgid "Periods" -msgstr "" +msgstr "Razdoblja" #. module: account_balance #: wizard_view:account.balance.account.balance.report,zero_years:0 @@ -270,18 +274,21 @@ msgid "" "credit/debit columns and % option.This can lead contents to be printed out " "of the paper.Please try again." msgstr "" +"Postoji mogućnost da ste odabrali postavke usporedbe sa više od 1 godine sa " +"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van " +"papira. Molimo pokušajte ponovno." #. module: account_balance #: wizard_button:account.balance.account.balance.report,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Odustani" #. module: account_balance #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "You have to select at least 1 Fiscal Year. Try again." -msgstr "" +msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno." #. module: account_balance #: wizard_view:account.balance.account.balance.report,init:0 msgid "Customize Report" -msgstr "" +msgstr "Prilagodite izvješće" diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 1f941b8195c..5d4801f4f41 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -587,7 +587,7 @@ class mrp_production(osv.osv): #TODO Review materials in function in_prod and prod_end. def action_production_end(self, cr, uid, ids): -# move_ids = [] + move_ids = [] for production in self.browse(cr, uid, ids): for res in production.move_lines: for move in production.move_created_ids: @@ -595,7 +595,7 @@ class mrp_production(osv.osv): cr.execute('INSERT INTO stock_move_history_ids \ (parent_id, child_id) VALUES (%s,%s)', (res.id, move.id)) -# move_ids.append(res.id) + move_ids.append(res.id) vals= {'state':'confirmed'} new_moves = [x.id for x in production.move_created_ids] self.pool.get('stock.move').write(cr, uid, new_moves, vals) @@ -657,14 +657,7 @@ class mrp_production(osv.osv): # self.write(cr, uid, ids, {'state': 'in_production'}) return True def action_in_production(self, cr, uid, ids): - move_ids = [] - for production in self.browse(cr, uid, ids): - for res in production.move_lines: - move_ids.append(res.id) - if not production.date_start: - self.write(cr, uid, [production.id], - {'date_start': time.strftime('%Y-%m-%d %H:%M:%S')}) -# self.pool.get('stock.move').action_done(cr, uid, move_ids) + move_ids = [] self.write(cr, uid, ids, {'state': 'in_production'}) return True @@ -1372,24 +1365,36 @@ class StockMove(osv.osv): return {} def consume_moves(self, cr, uid, ids, product_qty, location_id, context=None): - new_move = super(StockMove, self).consume_moves(cr, uid, ids, product_qty, location_id, context=context) - if new_move: - production_obj = self.pool.get('mrp.production') - move_obj = self.pool.get('stock.move') - move = move_obj.browse(cr, uid, ids) + res = [] + production_obj = self.pool.get('mrp.production') + for move in self.browse(cr, uid, ids): + new_moves = super(StockMove, self).consume_moves(cr, uid, ids, product_qty, location_id, context=context) production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) - production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) - return {} - - def scrap_moves(self, cr, uid, ids, product_qty, location_id, context=None): - new_move = super(StockMove, self).scrap_moves(cr, uid, ids, product_qty, location_id, context=context) - if new_move: - production_obj = self.pool.get('mrp.production') - move_obj = self.pool.get('stock.move') - move = move_obj.browse(cr, uid, ids) + for new_move in new_moves: + production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) + res.append(new_move) + return res + + def split_lines(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, context=None): + res = [] + production_obj = self.pool.get('mrp.production') + for move in self.browse(cr, uid, ids): + new_moves = super(StockMove, self).split_lines(cr, uid, [move.id], quantity, split_by_qty, prefix, context=context) production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) - production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) - return {} + for new_move in new_moves: + production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) + res.append(new_move) + return res + def scrap_moves(self, cr, uid, ids, quantity, location_dest_id, context=None): + res = [] + production_obj = self.pool.get('mrp.production') + for move in self.browse(cr, uid, ids): + new_moves = super(StockMove, self).scrap_moves(cr, uid, [move.id], quantity, location_dest_id, context=context) + production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) + for new_move in new_moves: + production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) + res.append(new_move) + return res StockMove() @@ -1418,5 +1423,20 @@ class StockPicking(osv.osv): StockPicking() + +class spilt_in_production_lot(osv.osv_memory): + _inherit = "stock.move.spilt" + def split(self, cr, uid, ids, move_ids, context=None): + production_obj = self.pool.get('mrp.production') + move_obj = self.pool.get('stock.move') + res = [] + for move in move_obj.browse(cr, uid, move_ids, context=context): + new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context) + production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])]) + for new_move in new_moves: + production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]}) + return res +spilt_in_production_lot() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index d3d334601fb..83f40350b74 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -531,10 +531,8 @@