From 97a89675035a9e20bde3dea340ea0a3278f833f4 Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Mon, 28 Jul 2014 22:41:14 -0400 Subject: [PATCH 01/12] bill_of_lading_webkit: initialize module --- bill_of_lading_webkit/__init__.py | 23 +++ bill_of_lading_webkit/__openerp__.py | 58 ++++++++ .../i18n/bill_of_lading_webkit.pot | 103 ++++++++++++++ bill_of_lading_webkit/i18n/fr.po | 103 ++++++++++++++ bill_of_lading_webkit/report.xml | 26 ++++ bill_of_lading_webkit/report/__init__.py | 21 +++ bill_of_lading_webkit/report/bol_in.mako | 106 ++++++++++++++ bill_of_lading_webkit/report/bol_out.mako | 133 ++++++++++++++++++ bill_of_lading_webkit/report/stock_report.py | 93 ++++++++++++ bill_of_lading_webkit/static/src/img/icon.png | Bin 0 -> 8262 bytes bill_of_lading_webkit/stock.py | 70 +++++++++ bill_of_lading_webkit/stock_view.xml | 36 +++++ 12 files changed, 772 insertions(+) create mode 100644 bill_of_lading_webkit/__init__.py create mode 100644 bill_of_lading_webkit/__openerp__.py create mode 100644 bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot create mode 100644 bill_of_lading_webkit/i18n/fr.po create mode 100644 bill_of_lading_webkit/report.xml create mode 100644 bill_of_lading_webkit/report/__init__.py create mode 100644 bill_of_lading_webkit/report/bol_in.mako create mode 100644 bill_of_lading_webkit/report/bol_out.mako create mode 100644 bill_of_lading_webkit/report/stock_report.py create mode 100644 bill_of_lading_webkit/static/src/img/icon.png create mode 100644 bill_of_lading_webkit/stock.py create mode 100644 bill_of_lading_webkit/stock_view.xml diff --git a/bill_of_lading_webkit/__init__.py b/bill_of_lading_webkit/__init__.py new file mode 100644 index 0000000..491d2eb --- /dev/null +++ b/bill_of_lading_webkit/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2011-2013 Camptocamp SA (http://www.camptocamp.com) +# @author Nicolas Bessi +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +from . import stock +from . import report diff --git a/bill_of_lading_webkit/__openerp__.py b/bill_of_lading_webkit/__openerp__.py new file mode 100644 index 0000000..3eb7cb1 --- /dev/null +++ b/bill_of_lading_webkit/__openerp__.py @@ -0,0 +1,58 @@ +# -*- encoding: utf-8 -*- +############################################################################### +# +# OpenERP, Open Source Management Solution +# This module copyright (C) 2014 Savoir-faire Linux +# (). +# +# 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 . +# +############################################################################### + + +{ + 'name': 'Bill of Lading using Webkit Library', + 'version': '1.0', + 'category': 'Reports/Webkit', + 'description': """ + +A Bill of Lading is a document issued by a carrier to a shipper of goods. +It is a negotiable instrument, and it serves three purposes: + - it is a receipt for the goods shipped; + - it evidences the contract of carriage; + - it serves as a document of title (i.e. ownership). + +This document could be different from a Delivery Order as it has some legal issues. + +Two reports are provided in this module + - Bill of Lading for Delivey Orders; + - Bill of Lading for Incoming Shipment (the use-case is shipment from an international Warehouse +to the local Warehouse). + +This module also add a new field for a warehouse to pick form or deliver to; +this field will be used if the default warehouse_id is not set (normally from a PO). + +Contributors +------------ +* Marc Cassuto (marc.cassuto@savoirfairelinux.com) +* Mathieu Benoit (mathieu.benoit@savoirfairelinux.com) +* Camptocamp with its original module stock_picking_webkit + """, + 'author': 'Savoir-faire Linux', + 'website': 'http://www.savoirfairelinux.com', + 'depends': ['base', 'report_webkit', 'base_headers_webkit', 'stock', 'delivery'], + 'data': ['report.xml', 'stock_view.xml'], + 'installable': True, + 'auto_install': False, +} diff --git a/bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot b/bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot new file mode 100644 index 0000000..43e5140 --- /dev/null +++ b/bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot @@ -0,0 +1,103 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * bill_of_lading_webkit +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-09 15:06+0000\n" +"PO-Revision-Date: 2014-05-09 15:06+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:58 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:56 +msgid "Origin" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:59 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:57 +msgid "Scheduled Date" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:76 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:74 +msgid "Description" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:20 +msgid "Ship to:" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:61 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:59 +msgid "Delivery Method" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:53 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:51 +msgid "Delivery Order" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:75 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:73 +msgid "Item" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:77 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:75 +msgid "Serial Number" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:57 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:55 +msgid "Contact" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:78 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:76 +msgid "Weight (kg)" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:40 +msgid "Ship to :" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:79 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:77 +msgid "Quantity" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:21 +msgid "From :" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:60 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:58 +msgid "Total Weight" +msgstr "" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:38 +msgid "Customer name & address:" +msgstr "" + diff --git a/bill_of_lading_webkit/i18n/fr.po b/bill_of_lading_webkit/i18n/fr.po new file mode 100644 index 0000000..c1e4027 --- /dev/null +++ b/bill_of_lading_webkit/i18n/fr.po @@ -0,0 +1,103 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * bill_of_lading_webkit +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-09 15:06+0000\n" +"PO-Revision-Date: 2014-05-09 11:14-0500\n" +"Last-Translator: Marc Cassuto \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:58 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:56 +msgid "Origin" +msgstr "Origine" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:59 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:57 +msgid "Scheduled Date" +msgstr "Date prévue" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:76 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:74 +msgid "Description" +msgstr "Description" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:20 +msgid "Ship to:" +msgstr "Livré à:" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:61 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:59 +msgid "Delivery Method" +msgstr "Méthode de livraison" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:53 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:51 +msgid "Delivery Order" +msgstr "Ordre de livraison" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:75 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:73 +msgid "Item" +msgstr "Item" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:77 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:75 +msgid "Serial Number" +msgstr "N° lot / N° série" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:57 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:55 +msgid "Contact" +msgstr "Contact" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:78 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:76 +msgid "Weight (kg)" +msgstr "Poids (kg)" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:40 +msgid "Ship to :" +msgstr "Livré à:" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:79 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:77 +msgid "Quantity" +msgstr "Quantité" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:21 +msgid "From :" +msgstr "De :" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_in.mako:60 +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:58 +msgid "Total Weight" +msgstr "Poid total" + +#. module: bill_of_lading_webkit +#: report:addons/bill_of_lading_webkit/report/bol_out.mako:38 +msgid "Customer name & address:" +msgstr "Nom et adresse du client:" + diff --git a/bill_of_lading_webkit/report.xml b/bill_of_lading_webkit/report.xml new file mode 100644 index 0000000..a3fbe26 --- /dev/null +++ b/bill_of_lading_webkit/report.xml @@ -0,0 +1,26 @@ + + + + + + + + + + diff --git a/bill_of_lading_webkit/report/__init__.py b/bill_of_lading_webkit/report/__init__.py new file mode 100644 index 0000000..6f89be9 --- /dev/null +++ b/bill_of_lading_webkit/report/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2011-2013 Camptocamp SA (http://www.camptocamp.com) +# @author Nicolas Bessi +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## +from . import stock_report diff --git a/bill_of_lading_webkit/report/bol_in.mako b/bill_of_lading_webkit/report/bol_in.mako new file mode 100644 index 0000000..46d31ae --- /dev/null +++ b/bill_of_lading_webkit/report/bol_in.mako @@ -0,0 +1,106 @@ +## -*- coding: utf-8 -*- + + + + + + + <%page expression_filter="entity"/> + <% + def carriage_returns(text): + return text.replace('\n', '
') + %> + %for picking in objects: + <% setLang(picking.partner_id.lang) %> +
+ <% + warehouse_addr = warehouse_address(picking) + %> + + + + %if warehouse_addr.contact_address: + <% address_lines = warehouse_addr.contact_address.split("\n") %> + %for part in address_lines: + %if part: + + %endif + %endfor + %endif +
${_("Ship to :")}
${warehouse_addr.title and warehouse_addr.title.name or ''} ${warehouse_addr.name }
${part}
+ + %if picking.partner_id: + + %if picking.partner_id.parent_id: + + + <% address_lines = picking.partner_id.contact_address.split("\n")[1:] %> + %else: + + <% address_lines = picking.partner_id.contact_address.split("\n") %> + %endif + %for part in address_lines: + %if part: + + %endif + %endfor + %endif +
${_("From :")}
${picking.partner_id.parent_id.name or ''}
${picking.partner_id.title and picking.partner_id.title.name or ''} ${picking.partner_id.name }
${picking.partner_id.title and picking.partner_id.title.name or ''} ${picking.partner_id.name }
${part}
+
+ +

${_(u'Delivery Order') } ${picking.name}

+ + + + + + + + + + + + + + + + +
${_("Contact")}${_("Origin")}${_("Scheduled Date")}${_('Total Weight')}${_('Delivery Method')}
${user.name}${picking.origin or ''}${formatLang(picking.min_date, date=True)}${picking.weight}${picking.carrier_id and picking.carrier_id.name or ''}
+ + + + + + + + + + + + + %for line in picking.move_lines: + <% + weight = line.product_id.weight * line.product_qty + %> + + + + + + + + %endfor +
${_("Item")}${_("Description")}${_("Serial Number")}${_("Weight (kg)")}${_("Quantity")}
${ line.product_id.name }${ line.product_id.description or '' }${ line.prodlot_id and line.prodlot_id.name or ''}${ formatLang(weight) }${ formatLang(line.product_qty) } ${line.product_uom.name}
+ +
+ %if picking.note : +

${picking.note | carriage_returns}

+ %endif + +

+
+ %endfor + + diff --git a/bill_of_lading_webkit/report/bol_out.mako b/bill_of_lading_webkit/report/bol_out.mako new file mode 100644 index 0000000..07b9187 --- /dev/null +++ b/bill_of_lading_webkit/report/bol_out.mako @@ -0,0 +1,133 @@ +## -*- coding: utf-8 -*- + + + + + + + <%page expression_filter="entity"/> + <% + def carriage_returns(text): + return text.replace('\n', '
') + %> + %for picking in objects: + <% setLang(picking.partner_id.lang) %> +

+ <% + invoice_addr = invoice_address(picking) + %> + + + %if invoice_addr.phone: + + %endif + %if invoice_addr.mobile: + + %endif + %if invoice_addr.email: + + %endif +
${_("Contact info:")}
${_("Phone:")} ${invoice_addr.phone }
${_("Cell:")} ${invoice_addr.mobile }
${_("Email:")} ${invoice_addr.email }
+ + + + %if invoice_addr.contact_address: + <% address_lines = invoice_addr.contact_address.split("\n") %> + %for part in address_lines: + %if part: + + %endif + %endfor + %endif +
${_("Customer name & address:")}
${invoice_addr.title and invoice_addr.title.name or ''} ${invoice_addr.name }
${part}
+
+
+ <% + picking_addr = picking_address(picking) + %> + + + %if picking.partner_id.parent_id: + + + <% address_lines = picking.partner_id.contact_address.split("\n")[1:] %> + %else: + + <% address_lines = picking.partner_id.contact_address.split("\n") %> + %endif + %for part in address_lines: + %if part: + + %endif + %endfor +
${_("Ship to:")}
${picking.partner_id.parent_id.name or ''}
${picking.partner_id.title and picking.partner_id.title.name or ''} ${picking.partner_id.name }
${picking.partner_id.title and picking.partner_id.title.name or ''} ${picking.partner_id.name }
${part}
+ + + + %if picking_addr.contact_address: + <% address_lines = picking_addr.contact_address.split("\n") %> + %for part in address_lines: + %if part: + + %endif + %endfor + %endif +
${_("Pick from:")}
${picking_addr.title and picking_addr.title.name or ''} ${picking_addr.name }
${part}
+
+ +

${_(u'Delivery Order') } ${picking.name}

+ + + + + + + + + + + + + + + + +
${_("Customer Ref")}${_("Origin")}${_("Scheduled Date")}${_('Total Weight')}${_('Delivery Method')}
${picking.sale_id.client_order_ref if picking.sale_id else ''}${picking.origin or ''}${formatLang(picking.min_date, date=True)}${picking.weight}${picking.carrier_id and picking.carrier_id.name or ''}
+ + + + + + + + + + + + + %for line in picking.move_lines: + <% + weight = line.product_id.weight * line.product_qty + %> + + + + + + + + %endfor +
${_("Item")}${_("Description")}${_("Serial Number")}${_("Weight (kg)")}${_("Quantity")}
${ line.product_id.name }${ line.product_id.description or ''}${ line.prodlot_id and line.prodlot_id.name or ''}${ formatLang(weight) }${ formatLang(line.product_qty) } ${line.product_uom.name}
+ +
+ %if picking.note : +

${picking.note | carriage_returns}

+ %endif + +

+
+ %endfor + + diff --git a/bill_of_lading_webkit/report/stock_report.py b/bill_of_lading_webkit/report/stock_report.py new file mode 100644 index 0000000..ffade9c --- /dev/null +++ b/bill_of_lading_webkit/report/stock_report.py @@ -0,0 +1,93 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2011-2013 Camptocamp SA (http://www.camptocamp.com) +# @author Nicolas Bessi +# Copyright (c) 2013 Agile Business Group (http://www.agilebg.com) +# @author Lorenzo Battistini +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +from report import report_sxw +import pooler +import time + + +class BillOfLadingOut(report_sxw.rml_parse): + def _get_invoice_address(self, picking): + if picking.sale_id: + return picking.sale_id.partner_invoice_id + partner_obj = self.pool.get('res.partner') + invoice_address_id = picking.partner_id.address_get( + adr_pref=['invoice'] + )['invoice'] + return partner_obj.browse( + self.cr, self.uid, invoice_address_id) + + def _get_picking_address(self, picking): + # By default, print the warehouse selected manually + if picking.manual_warehouse_id: + return picking.manual_warehouse_id.partner_id + # if not set, print the shipping address of the default company's warehouse + partner_obj = self.pool.get('res.partner') + warehouse_address_id = picking.company_id.partner_id.address_get( + adr_pref=['shipping'] + )['shipping'] + return partner_obj.browse( + self.cr, self.uid, warehouse_address_id) + + def __init__(self, cr, uid, name, context): + super(BillOfLadingOut, self).__init__(cr, uid, name, context=context) + self.localcontext.update({ + 'time': time, + 'invoice_address': self._get_invoice_address, + 'picking_address': self._get_picking_address, + }) + +report_sxw.report_sxw('report.webkit.bill_of_lading_out', + 'stock.picking', + 'addons/bill_of_lading_webkit/report/bol_out.mako', + parser=BillOfLadingOut) + + +class BillOfLadingIn(report_sxw.rml_parse): + def _get_warehouse_address(self, picking): + # By default, print the warehouse selected from the related purchase order + if picking.purchase_id: + return picking.purchase_id.warehouse_id.partner_id + # else, print the warehouse selected manually + if picking.manual_warehouse_id: + return picking.manual_warehouse_id.partner_id + # if none of the above, print the shipping address of the default company's warehouse + partner_obj = self.pool.get('res.partner') + warehouse_address_id = picking.company_id.partner_id.address_get( + adr_pref=['shipping'] + )['shipping'] + return partner_obj.browse( + self.cr, self.uid, warehouse_address_id) + + def __init__(self, cr, uid, name, context): + super(BillOfLadingIn, self).__init__(cr, uid, name, context=context) + self.localcontext.update({ + 'time': time, + 'warehouse_address': self._get_warehouse_address, + }) + + +report_sxw.report_sxw('report.webkit.bill_of_lading_in', + 'stock.picking', + 'addons/bill_of_lading_webkit/report/bol_in.mako', + parser=BillOfLadingIn) diff --git a/bill_of_lading_webkit/static/src/img/icon.png b/bill_of_lading_webkit/static/src/img/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0dc49cddce5c465ea760900bb64418783bf1af22 GIT binary patch literal 8262 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. +# +# 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 . +# +############################################################################## +from openerp.osv import fields, orm + + +class stock_picking_out_warehouse(orm.Model): + _inherit = "stock.picking.out" + _columns = { + 'manual_warehouse_id': fields.many2one( + 'stock.warehouse', + 'Picking from', + readonly=True, + states={ + 'draft': [('readonly', False)], + 'confirmed': [('readonly', False)], + 'assigned': [('readonly', False)], + } + ), + } + + +class stock_picking_in_warehouse(orm.Model): + _inherit = "stock.picking.in" + _columns = { + 'manual_warehouse_id': fields.many2one( + 'stock.warehouse', + 'Deliver to', + readonly=True, + states={ + 'draft': [('readonly', False)], + 'confirmed': [('readonly', False)], + 'assigned': [('readonly', False)], + } + ), + } + + +class stock_picking_warehouse(orm.Model): + _inherit = "stock.picking" + _columns = { + 'manual_warehouse_id': fields.many2one( + 'stock.warehouse', + 'Warehouse', + readonly=True, + states={ + 'draft': [('readonly', False)], + 'confirmed': [('readonly', False)], + 'assigned': [('readonly', False)], + } + ), + } diff --git a/bill_of_lading_webkit/stock_view.xml b/bill_of_lading_webkit/stock_view.xml new file mode 100644 index 0000000..db79cef --- /dev/null +++ b/bill_of_lading_webkit/stock_view.xml @@ -0,0 +1,36 @@ + + + + + + stock.picking + + + + + + + + + + stock.picking.out + + + + + + + + + + stock.picking.in + + + + + + + + + + From 6d2d6f064dda6daa2da5583101559e84e5ac5ae1 Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Mon, 28 Jul 2014 23:00:44 -0400 Subject: [PATCH 02/12] bill_of_lading_webkit: fix PEP8 constraints --- bill_of_lading_webkit/__openerp__.py | 17 +++++++++++++---- bill_of_lading_webkit/report/stock_report.py | 9 ++++++--- bill_of_lading_webkit/stock.py | 6 +++--- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/bill_of_lading_webkit/__openerp__.py b/bill_of_lading_webkit/__openerp__.py index 3eb7cb1..e6e4bae 100644 --- a/bill_of_lading_webkit/__openerp__.py +++ b/bill_of_lading_webkit/__openerp__.py @@ -33,15 +33,18 @@ It is a negotiable instrument, and it serves three purposes: - it evidences the contract of carriage; - it serves as a document of title (i.e. ownership). -This document could be different from a Delivery Order as it has some legal issues. +This document could be different from a Delivery Order as it has some legal +issues. Two reports are provided in this module - Bill of Lading for Delivey Orders; - - Bill of Lading for Incoming Shipment (the use-case is shipment from an international Warehouse + - Bill of Lading for Incoming Shipment (the use-case is shipment from an + international Warehouse to the local Warehouse). This module also add a new field for a warehouse to pick form or deliver to; -this field will be used if the default warehouse_id is not set (normally from a PO). +this field will be used if the default warehouse_id is not set +(normally from a PO). Contributors ------------ @@ -51,7 +54,13 @@ Contributors """, 'author': 'Savoir-faire Linux', 'website': 'http://www.savoirfairelinux.com', - 'depends': ['base', 'report_webkit', 'base_headers_webkit', 'stock', 'delivery'], + 'depends': [ + 'base', + 'report_webkit', + 'base_headers_webkit', + 'stock', + 'delivery' + ], 'data': ['report.xml', 'stock_view.xml'], 'installable': True, 'auto_install': False, diff --git a/bill_of_lading_webkit/report/stock_report.py b/bill_of_lading_webkit/report/stock_report.py index ffade9c..30b85b0 100644 --- a/bill_of_lading_webkit/report/stock_report.py +++ b/bill_of_lading_webkit/report/stock_report.py @@ -41,7 +41,8 @@ class BillOfLadingOut(report_sxw.rml_parse): # By default, print the warehouse selected manually if picking.manual_warehouse_id: return picking.manual_warehouse_id.partner_id - # if not set, print the shipping address of the default company's warehouse + # if not set, print the shipping address of the default company's + # warehouse partner_obj = self.pool.get('res.partner') warehouse_address_id = picking.company_id.partner_id.address_get( adr_pref=['shipping'] @@ -65,13 +66,15 @@ report_sxw.report_sxw('report.webkit.bill_of_lading_out', class BillOfLadingIn(report_sxw.rml_parse): def _get_warehouse_address(self, picking): - # By default, print the warehouse selected from the related purchase order + # By default, print the warehouse selected from the related + # purchase order if picking.purchase_id: return picking.purchase_id.warehouse_id.partner_id # else, print the warehouse selected manually if picking.manual_warehouse_id: return picking.manual_warehouse_id.partner_id - # if none of the above, print the shipping address of the default company's warehouse + # if none of the above, print the shipping address of the default + # company's warehouse partner_obj = self.pool.get('res.partner') warehouse_address_id = picking.company_id.partner_id.address_get( adr_pref=['shipping'] diff --git a/bill_of_lading_webkit/stock.py b/bill_of_lading_webkit/stock.py index 3f122cb..183857e 100644 --- a/bill_of_lading_webkit/stock.py +++ b/bill_of_lading_webkit/stock.py @@ -22,7 +22,7 @@ from openerp.osv import fields, orm -class stock_picking_out_warehouse(orm.Model): +class StockPickingOutWarehouse(orm.Model): _inherit = "stock.picking.out" _columns = { 'manual_warehouse_id': fields.many2one( @@ -38,7 +38,7 @@ class stock_picking_out_warehouse(orm.Model): } -class stock_picking_in_warehouse(orm.Model): +class StockPickingInWarehouse(orm.Model): _inherit = "stock.picking.in" _columns = { 'manual_warehouse_id': fields.many2one( @@ -54,7 +54,7 @@ class stock_picking_in_warehouse(orm.Model): } -class stock_picking_warehouse(orm.Model): +class StockPickingWarehouse(orm.Model): _inherit = "stock.picking" _columns = { 'manual_warehouse_id': fields.many2one( From b961f413d250d1e7d84549238ef767b209e93193 Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Mon, 28 Jul 2014 23:04:50 -0400 Subject: [PATCH 03/12] bill_of_lading_webkit: remove SFL icon --- bill_of_lading_webkit/static/src/img/icon.png | Bin 8262 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bill_of_lading_webkit/static/src/img/icon.png diff --git a/bill_of_lading_webkit/static/src/img/icon.png b/bill_of_lading_webkit/static/src/img/icon.png deleted file mode 100644 index 0dc49cddce5c465ea760900bb64418783bf1af22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8262 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 Date: Mon, 28 Jul 2014 23:04:56 -0400 Subject: [PATCH 04/12] bill_of_lading_webkit: fix PEP8 constraints --- bill_of_lading_webkit/report.xml | 1 - bill_of_lading_webkit/report/stock_report.py | 4 ++-- bill_of_lading_webkit/stock.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bill_of_lading_webkit/report.xml b/bill_of_lading_webkit/report.xml index a3fbe26..b2468cd 100644 --- a/bill_of_lading_webkit/report.xml +++ b/bill_of_lading_webkit/report.xml @@ -2,7 +2,6 @@ - . # -############################################################################## +############################################################################### from report import report_sxw import pooler diff --git a/bill_of_lading_webkit/stock.py b/bill_of_lading_webkit/stock.py index 183857e..0db09c8 100644 --- a/bill_of_lading_webkit/stock.py +++ b/bill_of_lading_webkit/stock.py @@ -1,5 +1,5 @@ # -*- encoding: utf-8 -*- -############################################################################## +############################################################################### # # OpenERP, Open Source Management Solution # This module copyright (C) 2014 Savoir-faire Linux @@ -18,7 +18,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . # -############################################################################## +############################################################################### from openerp.osv import fields, orm From 0535ec4ff8174b87d0acd5ad1d2ad9fa378aa94b Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Tue, 29 Jul 2014 17:23:39 -0400 Subject: [PATCH 05/12] bill_of_lading_webkit : remove unused import of pooler --- bill_of_lading_webkit/report/__init__.py | 5 +++-- bill_of_lading_webkit/report/stock_report.py | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bill_of_lading_webkit/report/__init__.py b/bill_of_lading_webkit/report/__init__.py index 6f89be9..9a849d3 100644 --- a/bill_of_lading_webkit/report/__init__.py +++ b/bill_of_lading_webkit/report/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -############################################################################## +############################################################################### # # Copyright (c) 2011-2013 Camptocamp SA (http://www.camptocamp.com) # @author Nicolas Bessi @@ -17,5 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -############################################################################## +############################################################################### + from . import stock_report diff --git a/bill_of_lading_webkit/report/stock_report.py b/bill_of_lading_webkit/report/stock_report.py index 31b2479..e570595 100644 --- a/bill_of_lading_webkit/report/stock_report.py +++ b/bill_of_lading_webkit/report/stock_report.py @@ -22,7 +22,6 @@ ############################################################################### from report import report_sxw -import pooler import time From 22c459a4a680cbbd3760f3e50b30d58758880e9a Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Tue, 29 Jul 2014 17:31:32 -0400 Subject: [PATCH 06/12] stock_picking_webkit: fix all PEP8 violations --- stock_picking_webkit/__init__.py | 4 ++-- stock_picking_webkit/__openerp__.py | 10 ++++++--- stock_picking_webkit/report/__init__.py | 4 ++-- stock_picking_webkit/report/stock_report.py | 24 +++++++++++++++------ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/stock_picking_webkit/__init__.py b/stock_picking_webkit/__init__.py index cf0eee0..252a0e6 100644 --- a/stock_picking_webkit/__init__.py +++ b/stock_picking_webkit/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -############################################################################## +############################################################################### # # Copyright (c) 2011-2013 Camptocamp SA (http://www.camptocamp.com) # @author Nicolas Bessi @@ -17,6 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -############################################################################## +############################################################################### from . import report diff --git a/stock_picking_webkit/__openerp__.py b/stock_picking_webkit/__openerp__.py index 4c7561f..f47f3e1 100644 --- a/stock_picking_webkit/__openerp__.py +++ b/stock_picking_webkit/__openerp__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -############################################################################## +############################################################################### # # Copyright (c) 2011-2013 Camptocamp SA (http://www.camptocamp.com) # @author Nicolas Bessi @@ -19,7 +19,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -############################################################################## +############################################################################### { 'name': 'Picking reports using Webkit Library', @@ -34,7 +34,11 @@ Three reports are provided: """, 'author': 'Camptocamp', 'website': 'http://www.openerp.com', - 'depends': ['base', 'report_webkit', 'base_headers_webkit', 'stock', 'delivery'], + 'depends': ['base', + 'report_webkit', + 'base_headers_webkit', + 'stock', + 'delivery'], 'data': ['report.xml', 'stock_view.xml', ], diff --git a/stock_picking_webkit/report/__init__.py b/stock_picking_webkit/report/__init__.py index cda5838..3bbbe54 100644 --- a/stock_picking_webkit/report/__init__.py +++ b/stock_picking_webkit/report/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -############################################################################## +############################################################################### # # Copyright (c) 2011-2013 Camptocamp SA (http://www.camptocamp.com) # @author Nicolas Bessi @@ -17,5 +17,5 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -############################################################################## +############################################################################### import stock_report diff --git a/stock_picking_webkit/report/stock_report.py b/stock_picking_webkit/report/stock_report.py index 4561a71..d6fdea5 100644 --- a/stock_picking_webkit/report/stock_report.py +++ b/stock_picking_webkit/report/stock_report.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -############################################################################## +############################################################################### # # Copyright (c) 2011-2013 Camptocamp SA (http://www.camptocamp.com) # @author Nicolas Bessi @@ -19,12 +19,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # +############################################################################### import operator from report import report_sxw import pooler import time + class NullMove(object): """helper class to generate empty lines in the delivery report""" def __init__(self): @@ -32,8 +34,10 @@ class NullMove(object): self.picking_id = NullObj() self.product_qty = '' + class NullObj(object): - """the null obj has any attribute you want with an empty string as the value""" + """the null obj has any attribute you want with an empty string + as the value""" def __getattr__(self, attr): return '' @@ -52,11 +56,14 @@ class PickingAgregation(object): return hash((self.src_stock.id, self.dest_stock.id)) def __eq__(self, other): - return (self.src_stock.id, self.dest_stock.id) == (other.src_stock.id, other.dest_stock.id) + return (self.src_stock.id, + self.dest_stock.id) == (other.src_stock.id, + other.dest_stock.id) def moves_by_product(self): """iterate over moves sorted by product default_code""" - return sorted(self.stock_moves, key=operator.attrgetter('product_id.default_code')) + return sorted(self.stock_moves, + key=operator.attrgetter('product_id.default_code')) def moves_by_sale_order(self): """iterate over moves sorted by sale order name @@ -65,7 +72,8 @@ class PickingAgregation(object): the report displays an empty line """ origin = None - for move in sorted(self.stock_moves, key=operator.attrgetter('picking_id.origin')): + for move in sorted(self.stock_moves, + key=operator.attrgetter('picking_id.origin')): if origin is None: origin = move.picking_id.origin else: @@ -89,6 +97,7 @@ class PickingAgregation(object): for p_code in sorted(products): yield products[p_code], product_qty[p_code] + class PrintPick(report_sxw.rml_parse): def __init__(self, cursor, uid, name, context): @@ -115,7 +124,8 @@ class PrintPick(report_sxw.rml_parse): for agr in agreg: print agr objects.append(PickingAgregation(agr[0], agr[1], agreg[agr])) - return super(PrintPick, self).set_context(objects, data, ids, report_type=report_type) + return super(PrintPick, self).set_context(objects, data, ids, + report_type=report_type) class DeliverySlip(report_sxw.rml_parse): @@ -135,7 +145,7 @@ class DeliverySlip(report_sxw.rml_parse): self.localcontext.update({ 'time': time, 'invoice_address': self._get_invoice_address, - }) + }) report_sxw.report_sxw('report.webkit.aggregated_picking', 'stock.picking', From ad2f722919d4efe8347a5c092a53c4da10e4dd8b Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Wed, 30 Jul 2014 10:29:21 -0400 Subject: [PATCH 07/12] Update travis --- .travis.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 044f4a3..744db1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,24 @@ language: python + python: - "2.7" +env: + - VERSION="7.0" ODOO_REPO="odoo/odoo" + - VERSION="7.0" ODOO_REPO="OCA/OCB" + virtualenv: system_site_packages: true install: - - git clone https://github.com/OCA/maintainer-quality-tools.git $HOME/maintainer-quality-tools - - export PATH=$HOME/maintainer-quality-tools/travis:$PATH - - $HOME/maintainer-quality-tools/travis/travis_install_nightly 7.0 - - pip install coveralls flake8 - - git clone https://github.com/OCA/webkit-tools -b 7.0 $HOME/webkit-tools - -services: - - postgresql + - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools + - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} + - travis_install_nightly ${VERSION} + - git clone https://github.com/OCA/webkit-tools ${HOME}/webkit-tools -b ${VERSION} script: - - travis_run_flake8 - - travis_run_tests 7.0 openerp_test $HOME/webkit-tools + - travis_run_flake8 + - travis_run_tests ${VERSION} ${HOME}/webkit-tools after_success: coveralls From f832d969cf4c495bf6d42dd2e338595c92d8703f Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Thu, 31 Jul 2014 14:31:34 -0400 Subject: [PATCH 08/12] Fix the last Pep8 error (this one was not catched by PuCharm) --- stock_picking_webkit/report/stock_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock_picking_webkit/report/stock_report.py b/stock_picking_webkit/report/stock_report.py index d6fdea5..ad3d30c 100644 --- a/stock_picking_webkit/report/stock_report.py +++ b/stock_picking_webkit/report/stock_report.py @@ -113,7 +113,7 @@ class PrintPick(report_sxw.rml_parse): def set_context(self, objects, data, ids, report_type=None): """Return res.partner.category""" - #!! data form is manually set in wizard + # data form is manually set in wizard agreg = {} for pick in objects: for move in pick.move_lines: From f526062400f20ebfcaa9a53a39037755ce8429d7 Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Thu, 31 Jul 2014 14:39:54 -0400 Subject: [PATCH 09/12] stock_bill_of_lading_webkit: renaming module to respect naming convention --- .../__init__.py | 0 .../__openerp__.py | 0 .../i18n/bill_of_lading_webkit.pot | 0 {bill_of_lading_webkit => stock_bill_of_lading_webkit}/i18n/fr.po | 0 {bill_of_lading_webkit => stock_bill_of_lading_webkit}/report.xml | 0 .../report/__init__.py | 0 .../report/bol_in.mako | 0 .../report/bol_out.mako | 0 .../report/stock_report.py | 0 {bill_of_lading_webkit => stock_bill_of_lading_webkit}/stock.py | 0 .../stock_view.xml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/__init__.py (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/__openerp__.py (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/i18n/bill_of_lading_webkit.pot (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/i18n/fr.po (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/report.xml (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/report/__init__.py (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/report/bol_in.mako (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/report/bol_out.mako (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/report/stock_report.py (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/stock.py (100%) rename {bill_of_lading_webkit => stock_bill_of_lading_webkit}/stock_view.xml (100%) diff --git a/bill_of_lading_webkit/__init__.py b/stock_bill_of_lading_webkit/__init__.py similarity index 100% rename from bill_of_lading_webkit/__init__.py rename to stock_bill_of_lading_webkit/__init__.py diff --git a/bill_of_lading_webkit/__openerp__.py b/stock_bill_of_lading_webkit/__openerp__.py similarity index 100% rename from bill_of_lading_webkit/__openerp__.py rename to stock_bill_of_lading_webkit/__openerp__.py diff --git a/bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot b/stock_bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot similarity index 100% rename from bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot rename to stock_bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot diff --git a/bill_of_lading_webkit/i18n/fr.po b/stock_bill_of_lading_webkit/i18n/fr.po similarity index 100% rename from bill_of_lading_webkit/i18n/fr.po rename to stock_bill_of_lading_webkit/i18n/fr.po diff --git a/bill_of_lading_webkit/report.xml b/stock_bill_of_lading_webkit/report.xml similarity index 100% rename from bill_of_lading_webkit/report.xml rename to stock_bill_of_lading_webkit/report.xml diff --git a/bill_of_lading_webkit/report/__init__.py b/stock_bill_of_lading_webkit/report/__init__.py similarity index 100% rename from bill_of_lading_webkit/report/__init__.py rename to stock_bill_of_lading_webkit/report/__init__.py diff --git a/bill_of_lading_webkit/report/bol_in.mako b/stock_bill_of_lading_webkit/report/bol_in.mako similarity index 100% rename from bill_of_lading_webkit/report/bol_in.mako rename to stock_bill_of_lading_webkit/report/bol_in.mako diff --git a/bill_of_lading_webkit/report/bol_out.mako b/stock_bill_of_lading_webkit/report/bol_out.mako similarity index 100% rename from bill_of_lading_webkit/report/bol_out.mako rename to stock_bill_of_lading_webkit/report/bol_out.mako diff --git a/bill_of_lading_webkit/report/stock_report.py b/stock_bill_of_lading_webkit/report/stock_report.py similarity index 100% rename from bill_of_lading_webkit/report/stock_report.py rename to stock_bill_of_lading_webkit/report/stock_report.py diff --git a/bill_of_lading_webkit/stock.py b/stock_bill_of_lading_webkit/stock.py similarity index 100% rename from bill_of_lading_webkit/stock.py rename to stock_bill_of_lading_webkit/stock.py diff --git a/bill_of_lading_webkit/stock_view.xml b/stock_bill_of_lading_webkit/stock_view.xml similarity index 100% rename from bill_of_lading_webkit/stock_view.xml rename to stock_bill_of_lading_webkit/stock_view.xml From 9863f5a1ad871612543b4707ce3b3351a5ce2003 Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Fri, 1 Aug 2014 07:16:09 -0400 Subject: [PATCH 10/12] stock_bill_of_lading_webkit: renaming the module broke the report --- stock_bill_of_lading_webkit/report.xml | 4 ++-- stock_bill_of_lading_webkit/report/stock_report.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stock_bill_of_lading_webkit/report.xml b/stock_bill_of_lading_webkit/report.xml index b2468cd..bda6ce1 100644 --- a/stock_bill_of_lading_webkit/report.xml +++ b/stock_bill_of_lading_webkit/report.xml @@ -6,7 +6,7 @@ name="webkit.bill_of_lading_out" auto="False" model="stock.picking.out" - file="bill_of_lading_webkit/report/bol_out.mako" + file="stock_bill_of_lading_webkit/report/bol_out.mako" string="Bill of Lading" report_type="webkit" header="True" @@ -15,7 +15,7 @@ name="webkit.bill_of_lading_in" auto="False" model="stock.picking.in" - file="bill_of_lading_webkit/report/bol_in.mako" + file="stock_bill_of_lading_webkit/report/bol_in.mako" string="Bill of Lading (Return of Products)" report_type="webkit" header="True" diff --git a/stock_bill_of_lading_webkit/report/stock_report.py b/stock_bill_of_lading_webkit/report/stock_report.py index e570595..8a536dd 100644 --- a/stock_bill_of_lading_webkit/report/stock_report.py +++ b/stock_bill_of_lading_webkit/report/stock_report.py @@ -59,7 +59,7 @@ class BillOfLadingOut(report_sxw.rml_parse): report_sxw.report_sxw('report.webkit.bill_of_lading_out', 'stock.picking', - 'addons/bill_of_lading_webkit/report/bol_out.mako', + 'addons/stock_bill_of_lading_webkit/report/bol_out.mako', parser=BillOfLadingOut) @@ -91,5 +91,5 @@ class BillOfLadingIn(report_sxw.rml_parse): report_sxw.report_sxw('report.webkit.bill_of_lading_in', 'stock.picking', - 'addons/bill_of_lading_webkit/report/bol_in.mako', + 'addons/stock_bill_of_lading_webkit/report/bol_in.mako', parser=BillOfLadingIn) From 38eaadb544418643a3e27cd64edd5d3dfa64fac3 Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Mon, 4 Aug 2014 13:53:07 -0400 Subject: [PATCH 11/12] stock_bill_of_lading_webkit: translations files regenerated after module renaming --- .../i18n/bill_of_lading_webkit.pot | 103 ------------------ stock_bill_of_lading_webkit/i18n/fr.po | 84 +++++++------- 2 files changed, 42 insertions(+), 145 deletions(-) delete mode 100644 stock_bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot diff --git a/stock_bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot b/stock_bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot deleted file mode 100644 index 43e5140..0000000 --- a/stock_bill_of_lading_webkit/i18n/bill_of_lading_webkit.pot +++ /dev/null @@ -1,103 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * bill_of_lading_webkit -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-09 15:06+0000\n" -"PO-Revision-Date: 2014-05-09 15:06+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:58 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:56 -msgid "Origin" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:59 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:57 -msgid "Scheduled Date" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:76 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:74 -msgid "Description" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:20 -msgid "Ship to:" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:61 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:59 -msgid "Delivery Method" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:53 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:51 -msgid "Delivery Order" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:75 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:73 -msgid "Item" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:77 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:75 -msgid "Serial Number" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:57 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:55 -msgid "Contact" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:78 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:76 -msgid "Weight (kg)" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:40 -msgid "Ship to :" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:79 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:77 -msgid "Quantity" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:21 -msgid "From :" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:60 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:58 -msgid "Total Weight" -msgstr "" - -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:38 -msgid "Customer name & address:" -msgstr "" - diff --git a/stock_bill_of_lading_webkit/i18n/fr.po b/stock_bill_of_lading_webkit/i18n/fr.po index c1e4027..008da15 100644 --- a/stock_bill_of_lading_webkit/i18n/fr.po +++ b/stock_bill_of_lading_webkit/i18n/fr.po @@ -1,6 +1,6 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * bill_of_lading_webkit +# * stock_bill_of_lading_webkit # msgid "" msgstr "" @@ -15,89 +15,89 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:58 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:56 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:58 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:56 msgid "Origin" msgstr "Origine" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:59 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:57 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:59 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:57 msgid "Scheduled Date" msgstr "Date prévue" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:76 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:74 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:76 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:74 msgid "Description" msgstr "Description" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:20 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:20 msgid "Ship to:" msgstr "Livré à:" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:61 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:59 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:61 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:59 msgid "Delivery Method" msgstr "Méthode de livraison" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:53 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:51 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:53 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:51 msgid "Delivery Order" msgstr "Ordre de livraison" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:75 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:73 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:75 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:73 msgid "Item" msgstr "Item" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:77 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:75 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:77 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:75 msgid "Serial Number" msgstr "N° lot / N° série" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:57 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:55 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:57 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:55 msgid "Contact" msgstr "Contact" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:78 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:76 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:78 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:76 msgid "Weight (kg)" msgstr "Poids (kg)" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:40 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:40 msgid "Ship to :" msgstr "Livré à:" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:79 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:77 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:79 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:77 msgid "Quantity" msgstr "Quantité" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:21 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:21 msgid "From :" msgstr "De :" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_in.mako:60 -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:58 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:60 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:58 msgid "Total Weight" msgstr "Poid total" -#. module: bill_of_lading_webkit -#: report:addons/bill_of_lading_webkit/report/bol_out.mako:38 +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:38 msgid "Customer name & address:" msgstr "Nom et adresse du client:" From d62b2103b277b7870d25fcd1de4707f1db2dba9d Mon Sep 17 00:00:00 2001 From: Marc Cassuto Date: Mon, 4 Aug 2014 14:24:13 -0400 Subject: [PATCH 12/12] stock_bill_of_lading_webkit : forgot the renamed pot file --- .../i18n/stock_bill_of_lading_webkit.pot | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 stock_bill_of_lading_webkit/i18n/stock_bill_of_lading_webkit.pot diff --git a/stock_bill_of_lading_webkit/i18n/stock_bill_of_lading_webkit.pot b/stock_bill_of_lading_webkit/i18n/stock_bill_of_lading_webkit.pot new file mode 100644 index 0000000..f0adba9 --- /dev/null +++ b/stock_bill_of_lading_webkit/i18n/stock_bill_of_lading_webkit.pot @@ -0,0 +1,103 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * stock_bill_of_lading_webkit +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 7.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-09 15:06+0000\n" +"PO-Revision-Date: 2014-05-09 15:06+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:58 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:56 +msgid "Origin" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:59 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:57 +msgid "Scheduled Date" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:76 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:74 +msgid "Description" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:20 +msgid "Ship to:" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:61 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:59 +msgid "Delivery Method" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:53 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:51 +msgid "Delivery Order" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:75 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:73 +msgid "Item" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:77 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:75 +msgid "Serial Number" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:57 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:55 +msgid "Contact" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:78 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:76 +msgid "Weight (kg)" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:40 +msgid "Ship to :" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:79 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:77 +msgid "Quantity" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:21 +msgid "From :" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_in.mako:60 +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:58 +msgid "Total Weight" +msgstr "" + +#. module: stock_bill_of_lading_webkit +#: report:addons/stock_bill_of_lading_webkit/report/bol_out.mako:38 +msgid "Customer name & address:" +msgstr "" +