[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20110105043904-qunibrk3vx3ddy18

addons/account/i18n/fr.po

@@ -489,7 +489,7 @@ msgstr "Date de création"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Remboursement d'achat"
+msgstr "Avoir fournisseur"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1632,7 +1632,7 @@ msgstr "Compte fournisseurs débiteurs"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Compte de taxe à payer"
+msgstr "Compte de taxe pour avoirs"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -9899,7 +9899,7 @@ msgstr "Rechercher une facture"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Rembourser"
+msgstr "Créer un avoir"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0

addons/email_template/email_template_mailbox.py

@@ -63,34 +63,19 @@ class email_template_mailbox(osv.osv):
         return True
     
     def send_this_mail(self, cr, uid, ids=None, context=None):
+        #previous method to send email (link with email account can be found at the revision 4172 and below
         result = True
         attachment_pool = self.pool.get('ir.attachment')
         for id in (ids or []):
             try:
                 account_obj = self.pool.get('email_template.account')
                 values = self.read(cr, uid, id, [], context) 
-                #payload = {}
                 attach_to_send = None
+                
                 if values['attachments_ids']:
-                    #for attid in values['attachments_ids']:
-                        #attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
-                        #payload[attachment.datas_fname] = attachment.datas
                     attach_to_send = self.pool.get('ir.attachment').read(cr, uid, values['attachments_ids'], ['datas_fname','datas', 'name'])
                     attach_to_send = map(lambda x: (x['datas_fname'] or x['name'], base64.decodestring(x['datas'])), attach_to_send)
-                #work around to uniformize send email while waiting for a merge of fetchmail, email_template, mailgate
-                #using tools.send_email instead
-                #No need to use email account
-                #result = account_obj.send_mail(cr, uid,
-                #              [values['account_id'][0]],
-                #              {'To':values.get('email_to') or u'',
-                #               'CC':values.get('email_cc') or u'',
-                #               'BCC':values.get('email_bcc') or u'',
-                #               'Reply-To':values.get('reply_to') or u''},
-                #              values['subject'] or u'',
-                #              {'text':values.get('body_text') or u'', 'html':values.get('body_html') or u''},
-                #              payload=payload,
-                #              message_id=values['message_id'], 
-                #              context=context)
+                
                 if values.get('body_html'):
                     body = values.get('body_html')
                     subtype = "html"

addons/mrp/i18n/fr.po

@@ -459,7 +459,7 @@ msgstr "Date planifiée"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Nomenclature des Matériaux"
+msgstr "Nomenclature"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -480,7 +480,7 @@ msgstr "Variation de la valeur de stock"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Structure de la nomenclature"
+msgstr "Structure des nomenclatures"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
@@ -577,7 +577,7 @@ msgstr "Valeur du stock"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Structure de la Nomenclature des Produits"
+msgstr "Structure des nomenclatures"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2228,7 +2228,7 @@ msgstr "Sélectionner quantité"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr "Nomenclature"
+msgstr "Nomenclatures"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0

addons/mrp/report/workcenter_load.py

@@ -30,6 +30,8 @@ from report.misc import choice_colors
 import random
 import StringIO
 
+from pychart import *
+
 
 theme.use_color = 1
 random.seed(0)

addons/stock/i18n/fr.po

@@ -2806,11 +2806,15 @@ msgstr "Nom de révision"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_root
 #: view:stock.warehouse:0
 msgid "Warehouse"
 msgstr "Entrepôt"
 
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_root
+msgid "Warehouse"
+msgstr "Stocks"
+
 #. module: stock
 #: view:stock.location.product:0
 msgid ""