diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 9b1497b563f..81b6e3157a1 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -630,7 +630,7 @@ class account_bank_statement_line(osv.osv): 'statement_id': fields.many2one('account.bank.statement', 'Statement', select=True, required=True, ondelete='cascade'), 'reconcile_id': fields.many2one('account.bank.statement.reconcile', - 'Reconcile', states={'confirm':[('readonly',True)]}), + 'Reconcile'), 'move_ids': fields.many2many('account.move', 'account_bank_statement_line_move_rel', 'move_id','statement_id', 'Moves'), diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po index 320fdc82290..7389cdda788 100644 --- a/addons/account/i18n/th.po +++ b/addons/account/i18n/th.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-15 03:12+0000\n" +"PO-Revision-Date: 2010-05-20 07:09+0000\n" "Last-Translator: Songpon Phusing \n" "Language-Team: Thai \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n" +"X-Launchpad-Export-Date: 2010-05-21 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -51,7 +51,7 @@ msgstr "" #. module: account #: model:account.account.type,name:account.account_type_asset msgid "Asset" -msgstr "" +msgstr "สินทรัพย์" #. module: account #: constraint:ir.actions.act_window:0 @@ -106,7 +106,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_vat_declaration #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration msgid "Print Taxes Report" -msgstr "" +msgstr "พิมพ์รายงานภาษี" #. module: account #: field:account.account,parent_id:0 @@ -2133,7 +2133,8 @@ msgid "Analytic Entry" msgstr "" #. module: account -#: view:res.company:0 field:res.company,overdue_msg:0 +#: view:res.company:0 +#: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" msgstr "" diff --git a/addons/account_chart/i18n/th.po b/addons/account_chart/i18n/th.po index 9b4d7b21560..e53bfc9b6c2 100644 --- a/addons/account_chart/i18n/th.po +++ b/addons/account_chart/i18n/th.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-05-20 05:23+0000\n" +"X-Launchpad-Export-Date: 2010-05-21 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po index e4c04634f12..0d613b0573b 100644 --- a/addons/base_setup/i18n/th.po +++ b/addons/base_setup/i18n/th.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-05-20 05:23+0000\n" +"X-Launchpad-Export-Date: 2010-05-21 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index fe0eb82c52a..fe43982ad66 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -103,7 +103,7 @@ class crm_lead(osv.osv, crm_case): 'email_cc': fields.text('Watchers Emails', size=252 , help="These \ people will receive a copy of the future communication between partner \ and users by email"), - 'description': fields.text('Description'), + 'description': fields.text('Notes'), 'write_date': fields.datetime('Update Date' , readonly=True), # Lead fields @@ -137,7 +137,7 @@ and users by email"), \nIf the case is in progress the state is set to \'Open\'.\ \nWhen the case is over, the state is set to \'Done\'.\ \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), - } + } _defaults = { 'active': lambda *a: 1, diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 1c7dce6e30b..02841b64b03 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -166,7 +166,7 @@ - + diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml index 6f7ef00b3d2..a9c83b23b7e 100644 --- a/addons/mrp/mrp_workflow.xml +++ b/addons/mrp/mrp_workflow.xml @@ -113,8 +113,9 @@ button_cancel - + + produce diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml index 5ab36dd4cb8..599d11cfe01 100644 --- a/addons/mrp_procurement/mrp_procurement_workflow.xml +++ b/addons/mrp_procurement/mrp_procurement_workflow.xml @@ -2,8 +2,6 @@ - - mrp.procurement.basic mrp.procurement diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po index 2e6f71b23d4..0f63c32dd30 100644 --- a/addons/multi_company/i18n/fr.po +++ b/addons/multi_company/i18n/fr.po @@ -8,41 +8,45 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-08 11:46+0000\n" -"PO-Revision-Date: 2010-01-26 11:01+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2010-05-20 14:21+0000\n" +"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:21+0000\n" +"X-Launchpad-Export-Date: 2010-05-21 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: multi_company #: help:multi_company.default,object_id:0 msgid "Object affect by this rules" -msgstr "" +msgstr "Objet affecté par cette règle" #. module: multi_company #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de " +"caractères spéciaux !" #. module: multi_company #: constraint:product.template:0 msgid "" "Error: The default UOM and the purchase UOM must be in the same category." msgstr "" +"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent " +"faire partie de la même catégorie" #. module: multi_company #: constraint:res.partner:0 msgid "The VAT doesn't seem to be correct." -msgstr "" +msgstr "La TVA ne semble pas correcte" #. module: multi_company #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nom de l'objet invalide dans l'action défini" #. module: multi_company #: model:res.company,overdue_msg:multi_company.res_company_odoo @@ -59,18 +63,18 @@ msgstr "" #. module: multi_company #: field:multi_company.default,company_dest_id:0 msgid "Default Company" -msgstr "" +msgstr "Société par défaut" #. module: multi_company #: field:multi_company.default,object_id:0 msgid "Object" -msgstr "" +msgstr "Objet" #. module: multi_company #: model:ir.module.module,shortdesc:multi_company.module_meta_information #: view:multi_company.default:0 msgid "Multi Company" -msgstr "" +msgstr "Multi société" #. module: multi_company #: model:ir.module.module,description:multi_company.module_meta_information diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index ef7919356fa..8b65468c158 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -423,10 +423,10 @@ - - - - + + + + diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index 77234889391..85c35b277c5 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -93,22 +93,17 @@ class purchase_requisition_line(osv.osv): @param product_id: Changed product_id @return: Dictionary of changed values """ - value = {} - + value = {'product_uom_id': ''} if product_id: prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0] value = {'product_uom_id': prod.uom_id.id} - if product_uom_id != prod.uom_id.id: - value = {'product_uom_id': prod.uom_id.id} return {'value': value} _defaults = { 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, } - purchase_requisition_line() - class purchase_order(osv.osv): _inherit = "purchase.order" _columns = { diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po index 9d0c7b40248..6b82ef00f96 100644 --- a/addons/stock/i18n/fr.po +++ b/addons/stock/i18n/fr.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-03-25 14:13+0000\n" -"Last-Translator: Numérigraphe \n" +"PO-Revision-Date: 2010-05-20 06:22+0000\n" +"Last-Translator: Olivier (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-05-21 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: stock @@ -677,7 +677,7 @@ msgstr "Date d'envoi prévue" #. module: stock #: rml:stock.picking.list:0 msgid "Shipping Address :" -msgstr "" +msgstr "Adresse de livraison" #. module: stock #: view:stock.tracking:0 @@ -1703,7 +1703,7 @@ msgstr "Magasin" #: selection:stock.move,state:0 #: selection:stock.picking,state:0 msgid "Done" -msgstr "Terminer" +msgstr "Terminé" #. module: stock #: model:stock.location,name:stock.stock_location_locations_virtual diff --git a/addons/stock/stock.py b/addons/stock/stock.py index f4fad43086c..27930c8a3e7 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -351,20 +351,18 @@ class stock_tracking(osv.osv): _name = "stock.tracking" _description = "Stock Tracking Lots" - def get_create_tracking_lot(self, cr, uid, ids, context): - tracking_id = context.get('tracking_id', False) - tracking_id_list = self.search(cr, uid, [('name', '=', tracking_id)], + def get_create_tracking_lot(self, cr, uid, ids, tracking_lot): + tracking_lot_list = self.search(cr, uid, [('name', '=', tracking_lot)], limit=1) - if tracking_id_list: - tracking_id = tracking_id_list[0] - tracking_obj = self.browse(cr, uid, tracking_id) + if tracking_lot_list: + tracking_lot = tracking_lot_list[0] + tracking_obj = self.browse(cr, uid, tracking_lot) if not tracking_obj: tracking_lot_vals = { - 'name': tracking_id + 'name': tracking_lot } - tracking_id = self.create(cr, uid, tracking_lot_vals, - context=context) - return tracking_id + tracking_lot = self.create(cr, uid, tracking_lot_vals) + return tracking_lot def checksum(sscc): salt = '31' * 8 + '3' sum = 0 @@ -1650,15 +1648,15 @@ class stock_move(osv.osv): 'line_id': lines, 'ref': ref, }) - tracking_id = False + tracking_lot = False if context: - tracking_id = context.get('tracking_id', False) - if tracking_id: + tracking_lot = context.get('tracking_lot', False) + if tracking_lot: rec_id = context and context.get('active_id', False) tracking = self.pool.get('stock.tracking') - tracking_id = tracking.get_create_tracking_lot(cr, uid,[rec_id], context=context ) + tracking_lot = tracking.get_create_tracking_lot(cr, uid,[rec_id], tracking_lot) - self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_id or False}) + self.write(cr, uid, ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S'), 'tracking_id': tracking_lot or False}) picking_obj = self.pool.get('stock.picking') for pick in picking_obj.browse(cr, uid, picking_ids): if all(move.state == 'done' for move in pick.move_lines): @@ -1878,7 +1876,7 @@ class stock_move(osv.osv): partner_id = partial_datas.get('partner_id', False) address_id = partial_datas.get('address_id', False) delivery_date = partial_datas.get('delivery_date', False) - tracking_id = context.get('tracking_id', False) + tracking_lot = context.get('tracking_lot', False) new_moves = [] @@ -1897,7 +1895,7 @@ class stock_move(osv.osv): if move.product_qty == product_qty: self.write(cr, uid, move.id, { - 'tracking_id': tracking_id + 'tracking_id': tracking_lot }) complete.append(move) elif move.product_qty > product_qty: @@ -1943,7 +1941,7 @@ class stock_move(osv.osv): 'state': 'assigned', 'move_dest_id': False, 'price_unit': move.price_unit, - 'tracking_id': tracking_id, + 'tracking_id': tracking_lot, }) complete.append(self.browse(cr, uid, new_move)) self.write(cr, uid, move.id, @@ -1958,7 +1956,7 @@ class stock_move(osv.osv): { 'product_qty': move.product_qty, 'product_uos_qty': move.product_qty, - 'tracking_id': tracking_id + 'tracking_id': tracking_lot }) complete.append(move) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 13ee27bd6c0..5cb543b748e 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -192,9 +192,9 @@ child_ids - - - + + + @@ -308,17 +308,17 @@ move_history_ids - - - - + + + + - - - - - + + + + + @@ -331,17 +331,17 @@ move_history_ids2 - - - - + + + + - - - - - + + + + + @@ -625,7 +625,7 @@ - +