From cffb0ec16877a079b7df2a0c09c11982ccab4ae2 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 5 Nov 2008 14:47:14 +0100 Subject: [PATCH] improve bzr revid: fp@tinyerp.com-20081105134714-16t6g6r5m9jfvzie --- addons/delivery/i18n/fr_FR.po | 2 +- addons/document/ftpserver/abstracted_fs.py | 1 + addons/document/ftpserver/ftpserver.py | 2 ++ addons/product/i18n/fr_FR.po | 2 +- addons/product_margin/i18n/fr_FR.po | 4 ++-- addons/product_margin/product_margin.py | 4 +--- addons/product_margin/wizard/wizard_product_margin.py | 11 ++++++++--- addons/purchase/i18n/fr_FR.po | 2 +- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/addons/delivery/i18n/fr_FR.po b/addons/delivery/i18n/fr_FR.po index 75b4623f6b1..c8df3800918 100644 --- a/addons/delivery/i18n/fr_FR.po +++ b/addons/delivery/i18n/fr_FR.po @@ -318,7 +318,7 @@ msgstr "Complétez ce champ si vous planifiez de facturer la livraison sur base #. module: delivery #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add msgid "Delivery Costs" -msgstr "" +msgstr "Frais de livraison" #. module: delivery #: view:delivery.grid.line:0 diff --git a/addons/document/ftpserver/abstracted_fs.py b/addons/document/ftpserver/abstracted_fs.py index 9bdd38b72bd..fe624da7de4 100644 --- a/addons/document/ftpserver/abstracted_fs.py +++ b/addons/document/ftpserver/abstracted_fs.py @@ -344,6 +344,7 @@ class abstracted_fs: for db in self.db_list(): result.append(false_node(db)) return result + print path.children() return path.children() # Ok diff --git a/addons/document/ftpserver/ftpserver.py b/addons/document/ftpserver/ftpserver.py index 99b1c43abb3..814b6820d3c 100644 --- a/addons/document/ftpserver/ftpserver.py +++ b/addons/document/ftpserver/ftpserver.py @@ -1754,6 +1754,7 @@ class FTPHandler(asynchat.async_chat): - (file) file: the file[-like] object to send (if any). """ if self.data_channel: + print 'DATA', data self.respond("125 Data connection already open. Transfer starting.") if file: self.data_channel.file_obj = file @@ -2077,6 +2078,7 @@ class FTPHandler(asynchat.async_chat): print listing listing.sort() data = '\r\n'.join(listing) + '\r\n' + print data self.log('OK NLST "%s". Transfer starting.' %line) self.push_dtp_data(data) diff --git a/addons/product/i18n/fr_FR.po b/addons/product/i18n/fr_FR.po index 3523eac32ba..348c2870ca6 100644 --- a/addons/product/i18n/fr_FR.po +++ b/addons/product/i18n/fr_FR.po @@ -777,7 +777,7 @@ msgstr "Informations sur le fournisseur" #: view:product.product:0 #: view:product.packaging:0 msgid "Packaging" -msgstr "Unité logistique" +msgstr "Packaging" #. module: product #: field:product.pricelist,currency_id:0 diff --git a/addons/product_margin/i18n/fr_FR.po b/addons/product_margin/i18n/fr_FR.po index 828dc6d715c..a09bf4309b5 100644 --- a/addons/product_margin/i18n/fr_FR.po +++ b/addons/product_margin/i18n/fr_FR.po @@ -204,7 +204,7 @@ msgstr "Marge Totale * 100 / Chiffre d'Affaires" #. module: product_margin #: wizard_button:product.margins,init,open:0 msgid "Open Margins" -msgstr "Marges Ouvertes" +msgstr "Ouvrir les marges" #. module: product_margin #: wizard_view:product.margins,init:0 @@ -226,7 +226,7 @@ msgstr "Ventes" #: model:ir.ui.menu,name:product_margin.menu_action_product_margin #: view:product.product:0 msgid "Product Margins" -msgstr "Marges des Produits" +msgstr "Marges par produits" #. module: product_margin #: field:product.product,purchase_gap:0 diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py index e7376aae47b..638d10ee92f 100644 --- a/addons/product_margin/product_margin.py +++ b/addons/product_margin/product_margin.py @@ -115,9 +115,7 @@ class product_product(osv.osv): 'expected_margin' : fields.function(_product_margin, method=True, type='float', string='Expected Margin', multi='total',help="Excepted Sale - Normal Cost"), 'total_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Total Margin (%)', multi='margin',help="Total margin * 100 / Turnover"), 'expected_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Expected Margin (%)', multi='margin',help="Expected margin * 100 / Expected Sale"), - } - - + } product_product() diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py index bccc12a7813..fec60501960 100644 --- a/addons/product_margin/wizard/wizard_product_margin.py +++ b/addons/product_margin/wizard/wizard_product_margin.py @@ -25,16 +25,21 @@ import pooler import time def _action_open_window(self, cr, uid, data, context): + cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph')) + view_res3 = cr.fetchone()[0] + cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form')) + view_res2 = cr.fetchone()[0] cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree')) - view_res = cr.fetchone() + view_res = cr.fetchone()[0] return { 'name': 'Product Margins', - 'context':{'date_from':data['form']['from_date'],'date_to':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']}, + 'context':{'date_from':data['form']['from_date'],'date_to':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']}, 'view_type': 'form', "view_mode": 'tree,form,graph', 'res_model':'product.product', 'type': 'ir.actions.act_window', - 'view_id': view_res, + 'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')], + 'view_id': False } diff --git a/addons/purchase/i18n/fr_FR.po b/addons/purchase/i18n/fr_FR.po index aeac6c4e8ab..89974e5693d 100644 --- a/addons/purchase/i18n/fr_FR.po +++ b/addons/purchase/i18n/fr_FR.po @@ -767,7 +767,7 @@ msgstr "" #. module: purchase #: field:purchase.order,invoice_method:0 msgid "Invoicing Control" -msgstr "Méthode de facturation" +msgstr "Contrôle de facturation" #. module: purchase #: model:process.node,name:purchase.process_node_packinglist0