Merge lp:~unifield-team/unifield-server/us-1060 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/supplier_catalogue/__init__.py'
--- bin/addons/supplier_catalogue/__init__.py	2012-02-21 15:09:35 +0000
+++ bin/addons/supplier_catalogue/__init__.py	2016-08-09 16:14:47 +0000
@@ -24,5 +24,6 @@
 import partner
 import purchase
 import wizard
+import report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/supplier_catalogue/__openerp__.py'
--- bin/addons/supplier_catalogue/__openerp__.py	2012-02-22 13:04:06 +0000
+++ bin/addons/supplier_catalogue/__openerp__.py	2016-08-09 16:14:47 +0000
@@ -41,6 +41,7 @@
         "supplier_catalogue_data.xml",
         "wizard/catalogue_import_lines_view.xml",
         "wizard/catalogue_export_lines_view.xml",
+        "supplier_catalogue_report.xml",
         "security/ir.model.access.csv",
     ],
     'test': [
@@ -51,4 +52,4 @@
     'active': False,
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'bin/addons/supplier_catalogue/report'
=== added file 'bin/addons/supplier_catalogue/report/__init__.py'
--- bin/addons/supplier_catalogue/report/__init__.py	1970-01-01 00:00:00 +0000
+++ bin/addons/supplier_catalogue/report/__init__.py	2016-08-09 16:14:47 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 MSF, TeMPO Consulting
+#
+#    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/>.
+#
+##############################################################################
+
+import supplier_catalogue_lines_xls
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako'
--- bin/addons/supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako	2016-08-09 16:14:47 +0000
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>MSFUser</Author>
+  <LastAuthor>MSFUser</LastAuthor>
+  <Created>2012-06-18T15:46:09Z</Created>
+  <Company>Medecins Sans Frontieres</Company>
+  <Version>11.9999</Version>
+ </DocumentProperties>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>13170</WindowHeight>
+  <WindowWidth>19020</WindowWidth>
+  <WindowTopX>120</WindowTopX>
+  <WindowTopY>60</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+<Styles>
+    <Style ss:ID="header">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+        <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+        <Borders>
+          <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+        </Borders>
+    </Style>
+    <Style ss:ID="line">
+        <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+        <Borders>
+          <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+          <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+        </Borders>
+    </Style>
+  <Style ss:ID="short_date">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <NumberFormat ss:Format="Short Date"/>
+  </Style>
+</Styles>
+## ==================================== we loop over the supplier_catalogue "objects" == supplier.catalogue  ====================================================
+% for o in getOrders(objects):
+<ss:Worksheet ss:Name="${"%s"%(o.name.split('/')[-1] or 'Sheet1')|x}">
+## definition of the columns' size
+<% nb_of_columns = 8 %>
+<Table x:FullColumns="1" x:FullRows="1">
+<Column ss:AutoFitWidth="1" ss:Width="120" />
+<Column ss:AutoFitWidth="1" ss:Width="300" />
+% for x in range(2,nb_of_columns - 1):
+<Column ss:AutoFitWidth="1" ss:Width="60" />
+% endfor
+<Column ss:AutoFitWidth="1" ss:Width="250" />
+
+## we loop over the purchase_order_line "%s"%po_name.split('/')[-1])
+    
+    <Row>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Code')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Description')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('UoM')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Min. Qty')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Unit Price')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('SoQ Rounding')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Min. Order Qty.')}</Data></Cell>
+        <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Comment')}</Data></Cell>
+    </Row>
+    % for line in getLines(o):
+    <Row>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id.default_code or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.product_id.name or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.line_uom_id.name or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.min_qty or 0.00)|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.unit_price or 0.00)|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.rounding or 0.00)|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="Number">${(line.min_order_qty or 0.00)|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(line.comment or '')|x}</Data></Cell>
+    </Row>
+    % endfor
+</Table>
+<x:WorksheetOptions/>
+</ss:Worksheet>
+% endfor
+</Workbook>

=== added file 'bin/addons/supplier_catalogue/report/supplier_catalogue_lines_xls.py'
--- bin/addons/supplier_catalogue/report/supplier_catalogue_lines_xls.py	1970-01-01 00:00:00 +0000
+++ bin/addons/supplier_catalogue/report/supplier_catalogue_lines_xls.py	2016-08-09 16:14:47 +0000
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 MSF, TeMPO Consulting
+#
+#    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
+from report import report_sxw
+from msf_supply_doc_export.msf_supply_doc_export import WebKitParser
+from msf_supply_doc_export.msf_supply_doc_export import getIds
+
+
+class supplier_catalogue_lines_report_parser(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context=None):
+        super(supplier_catalogue_lines_report_parser, self).__init__(cr, uid, name, context=context)
+
+        self.localcontext.update({
+            'getLines': self._get_lines,
+            'getOrders': self._get_orders,
+        })
+        self._nb_lines = 0
+        self._lines_iterator = 0
+
+        if context.get('background_id'):
+            self.back_browse = self.pool.get('memory.background.report').browse(self.cr, self.uid, context['background_id'])
+        else:
+            self.back_browse = None
+
+    def _get_orders(self, objs):
+        for o in objs:
+            self._nb_lines += len(o.line_ids)
+
+        return objs
+
+    def _get_lines(self, cat_brw):
+        for cat_line in cat_brw.line_ids:
+            self._lines_iterator += 1
+            if self.back_browse and self._nb_lines:
+                percent = float(self._lines_iterator) / float(self._nb_lines)
+                self.pool.get('memory.background.report').update_percent(self.cr, self.uid, [self.back_browse.id], percent)
+
+            yield cat_line
+
+        raise StopIteration
+
+
+class supplier_catalogue_lines_report_xls(WebKitParser):
+
+    def __init__(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
+        WebKitParser.__init__(self, name, table, rml=rml, parser=parser, header=header, store=store)
+
+    def create_single_pdf(self, cr, uid, ids, data, report_xml, context=None):
+        report_xml.webkit_debug = 1
+        report_xml.header = " "
+        report_xml.webkit_header.html = "${_debug or ''|n}"
+        return super(supplier_catalogue_lines_report_xls, self).create_single_pdf(cr, uid, ids, data, report_xml, context)
+
+    def create(self, cr, uid, ids, data, context=None):
+        ids = getIds(self, cr, uid, ids, context)
+        a = super(supplier_catalogue_lines_report_xls, self).create(cr, uid, ids, data, context)
+        return (a[0], 'xls')
+
+supplier_catalogue_lines_report_xls(
+    'report.supplier.catalogue.lines.xls',
+    'supplier.catalogue',
+    'addons/supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako',
+    parser=supplier_catalogue_lines_report_parser,
+)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/supplier_catalogue/supplier_catalogue_report.xml'
--- bin/addons/supplier_catalogue/supplier_catalogue_report.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/supplier_catalogue/supplier_catalogue_report.xml	2016-08-09 16:14:47 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+
+        <report
+            id="supplier_catalogue_lines_xls"
+            string="Supplier catalogue lines (xls)"
+            model="supplier.catalogue"
+            name="supplier.catalogue.lines.xls"
+            file="supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako"
+            report_type="webkit"
+            auto="False"
+            menu="False" />
+
+    </data>
+</openerp>

=== modified file 'bin/addons/supplier_catalogue/wizard/catalogue_export_lines.py'
--- bin/addons/supplier_catalogue/wizard/catalogue_export_lines.py	2012-03-28 14:30:33 +0000
+++ bin/addons/supplier_catalogue/wizard/catalogue_export_lines.py	2016-08-09 16:14:47 +0000
@@ -26,23 +26,42 @@
 class catalogue_export_lines(osv.osv_memory):
     _name = 'catalogue.export.lines'
     _description = 'Supplier catalogue export lines'
-    
+
     _columns = {
         'catalogue_id': fields.many2one('supplier.catalogue', string='Catalogue', required=True),
         'file_to_export': fields.binary(string='File to export'),
     }
-    
+
     def export_file(self, cr, uid, ids, context=None):
         '''
         Export lines to file
         '''
         if not context:
             context = {}
-        
-        for wiz in self.browse(cr, uid, ids, context=context):
-            pass
-            # TODO: Export file            
-        
-        return {'type': 'ir.actions.act_window_close'}
+
+        catalogue_ids = context.get('active_ids', [])
+
+        report_name = 'supplier.catalogue.lines.xls'
+        background_id = self.pool.get('memory.background.report').create(cr, uid, {
+            'file_name': report_name,
+            'report_name': report_name,
+        }, context=context)
+
+        context.update({
+            'background_id': background_id,
+            'background_time': 15,
+        })
+
+        datas = {'ids': catalogue_ids, 'context': context}
+
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': report_name,
+            'datas': datas,
+            'nodestroy': True,
+            'context': context,
+        }
+
+catalogue_export_lines()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml'
--- bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml	2012-02-22 07:38:27 +0000
+++ bin/addons/supplier_catalogue/wizard/catalogue_export_lines_view.xml	2016-08-09 16:14:47 +0000
@@ -16,7 +16,22 @@
 					<button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2" />
 				</form>
 			</field>
-		</record>
+        </record>
+
+        <record id="action_server_export_catalogue_lines" model="ir.actions.server">
+            <field name="name">Export lines (csv)</field>
+            <field name="model_id" ref="model_catalogue_export_lines" />
+            <field name="state">code</field>
+            <field name="code">action = obj.export_file(context=context)</field>
+        </record>
+
+        <record id="ir_export_catalogue_lines" model="ir.values">
+            <field name="key2">client_print_multi</field>
+            <field name="model">supplier.catalogue</field>
+            <field name="name">Export lines (Excel)</field>
+            <field eval="'ir.actions.server,%d'%action_server_export_catalogue_lines" name="value" />
+            <field eval="True" name="object" />
+        </record>
 		
 	</data>
 </openerp>