Merge lp:~bas-solutions/margin-analysis/6.1 into lp:~margin-analysis-core-editors/margin-analysis/6.1

[Erwin van der Ploeg (BAS Solutions)]

[lp:~bas-solutions/margin-analysis/6.1]

45. By Erwin van der Ploeg (BAS Solutions) on 2012-12-23

Added Dutch translations to all modules.

46. By Erwin van der Ploeg (BAS Solutions) on 2012-12-23

small fix in translation

47. By Erwin van der Ploeg (BAS Solutions) on 2012-12-23

Added extra string to po file

[Niels Huylebroeck (red15)]

Looks ok for me, good thing you caught that missing logging module

review: Approve

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Niels,

please set the correct author when you merge a branch, using bzr's --author option. If you set its value to the original author's email address, Launchpad recognizes its user account automatically. You can find out this address by looking at the latest log message from the merge branch (in this case, "bzr log lp:~endiansolutions/margin-analysis/6.1 -r -1").

Cheers,
Stefan.

[Niels Huylebroeck (red15)]

Should be fixed now (if you have the branch locally do a bzr pull --overwrite)

To be honest I understand the need of being credited but fail to see why the merge itself would need the author set, after all the underlying revisions still clearly point out who made the code changes.

In this case I would not make a fuss about it (because it was a no-conflict merge) but I can forsee times where the merge itself had to be modified extensively to fit a restructured module, would you not consider the person doing the commit/merge the author then?

[Stefan Rijnhart (Opener) (stefan-opener)]

thanks for the change. I know all the information can be extracted using the bzr log tool but the changelog on Launchpad has a high visibility and using the --author switch correctly is the only way to have it displayed properly there.

To make a merge proposal fit properly in an existing code base is what reviews are for, right?

[Stefan Rijnhart (Opener) (stefan-opener)]

BTW did you give as an exact argument to --author the email address or the whole bzr whoami identification string? Launchpad account recognition only seems to work in the first case (and it did not seem to work here for some reason).

[Niels Huylebroeck (red15)]

I pasted the whole string "Username" <email> because this is how it was
displayed on launchpad itself (the original commits were not linked on a
launchpad account either afaik)

2012/12/27 Stefan Rijnhart (Therp) <email address hidden>

> BTW did you give as an exact argument to --author the email address or the
> whole bzr whoami identification string? Launchpad account recognition only
> seems to work in the first case (and it did not seem to work here for some
> reason).
> --
>
> https://code.launchpad.net/~endiansolutions/margin-analysis/6.1/+merge/141164
> You are reviewing the proposed merge of
> lp:~endiansolutions/margin-analysis/6.1 into lp:margin-analysis.
>

--
Niels Huylebroeck
Lead Architect -- Agaplan
Tel. : [phone]
Web : http://www.agaplan.eu

=== added directory 'product_cost_incl_bom/i18n'
=== added file 'product_cost_incl_bom/i18n/nl.po'
--- product_cost_incl_bom/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ product_cost_incl_bom/i18n/nl.po	2012-12-23 13:24:22 +0000
@@ -0,0 +1,36 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* product_cost_incl_bom
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-23 10:17+0000\n"
+"PO-Revision-Date: 2012-12-23 14:20+0100\n"
+"Last-Translator: Erwin van der Ploeg | Endian Solutions "
+"<[e-mail]>\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"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: product_cost_incl_bom
+#: model:ir.model,name:product_cost_incl_bom.model_product_product
+msgid "Product"
+msgstr "Product"
+
+#. module: product_cost_incl_bom
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: ongeldige ean code"
+
+#. module: product_get_cost_field
+#: help:product.product,cost_price:0
+msgid ""
+"The cost price is the standard price or, if the product has a bom, the sum "
+"of all standard price of its components. it take also care of the bom "
+"costing like cost per cylce."
+msgstr "Dit is de kostprijs inclusief eventuele kosten."

=== added directory 'product_get_cost_field/i18n'
=== added file 'product_get_cost_field/i18n/nl.po'
--- product_get_cost_field/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ product_get_cost_field/i18n/nl.po	2012-12-23 13:24:22 +0000
@@ -0,0 +1,41 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* product_get_cost_field
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-23 10:21+0000\n"
+"PO-Revision-Date: 2012-12-23 11:28+0100\n"
+"Last-Translator: Erwin van der Ploeg | Endian Solutions "
+"<[e-mail]>\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"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: product_get_cost_field
+#: help:product.product,cost_price:0
+msgid ""
+"The cost price is the standard price or, if the product has a bom, the sum "
+"of all standard price of its components. it take also care of the bom "
+"costing like cost per cylce."
+msgstr "Dit is de kostprijs, inclusief eventuele kosten."
+
+#. module: product_get_cost_field
+#: model:ir.model,name:product_get_cost_field.model_product_product
+msgid "Product"
+msgstr "Product"
+
+#. module: product_get_cost_field
+#: field:product.product,cost_price:0
+msgid "Cost Price (incl. BoM)"
+msgstr "Kostprijs (incl. kosten)"
+
+#. module: product_get_cost_field
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: ongeldige ean code"

=== added file 'product_historical_margin/i18n/nl.po'
--- product_historical_margin/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ product_historical_margin/i18n/nl.po	2012-12-23 13:24:22 +0000
@@ -0,0 +1,341 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* product_historical_margin
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-23 10:29+0000\n"
+"PO-Revision-Date: 2012-12-23 13:01+0100\n"
+"Last-Translator: Erwin van der Ploeg | Endian Solutions "
+"<[e-mail]>\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"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "last month"
+msgstr "afgelopen maand"
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_type:0
+msgid "Customer Refund"
+msgstr "Klant credit"
+
+#. module: product_historical_margin
+#: help:account.invoice.line,margin_relative:0
+msgid ""
+"The Real Margin % [ (Real Margin / net sale) * 100 ] of the line.If no real "
+"margin set, will display 999.0 (if not invoiced yet for example)."
+msgstr ""
+"Werkelijke marge % [ (Werkelijke marge / Netto verkoop) * 100 ] van de "
+"regel. Indien geen werkelijke marge bekend is, dan wordt 999,0 weergegeven "
+"(bijvoorbeeld als nog niet is gefactureerd)."
+
+#. module: product_historical_margin
+#: field:historical.margin,from_date:0
+msgid "From"
+msgstr "Van"
+
+#. module: product_historical_margin
+#: field:account.invoice.line,subtotal_cost_price:0
+msgid "Cost in currency"
+msgstr "Kostprijs in valuta"
+
+#. module: product_historical_margin
+#: help:product.product,margin_relative:0
+msgid ""
+"The Real Margin [ Real Margin / sale price ] of the product in relative "
+"value based on historical values computed from open and paid invoices.If no "
+"real margin set, will display 999.0 (if not invoiced yet for example)."
+msgstr ""
+"De werkelijke marge [ Werkelijke marge / Verkoopprijs ] van het product als "
+"relatieve waarde, gebaseerd op historische waardes, berekend op basis van "
+"open en betaalde facturen. Indien geen werkelijke marge bekend is, dan wordt "
+"999,0 weergegeven (bijvoorbeeld als nog niet is gefactureerd)."
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_type:0
+msgid "Supplier Invoice"
+msgstr "Inkoopfactuur"
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_type:0
+msgid "Customer Invoice"
+msgstr "Factuur"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "year"
+msgstr "jaar"
+
+#. module: product_historical_margin
+#: view:historical.margin:0
+msgid "Historical Margin Properties"
+msgstr "Historische marge eigenschappen"
+
+#. module: product_historical_margin
+#: model:ir.actions.act_window,name:product_historical_margin.action_product_margin_view
+#: model:ir.ui.menu,name:product_historical_margin.menu_action_product_margin_tree
+msgid "Product Historical Margin"
+msgstr "Product historische marge"
+
+#. module: product_historical_margin
+#: view:historical.margin:0
+msgid "Compute margins"
+msgstr "Bereken marges"
+
+#. module: product_historical_margin
+#: help:account.invoice.line,margin_absolute:0
+msgid "The Real Margin [ net sale - cost ] of the line."
+msgstr "Werkelijke marge [ Netto verkoop - kostprijs ] van de regel."
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_state:0
+msgid "Draft"
+msgstr "Concept"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "Invoice Type"
+msgstr "Factuur soort"
+
+#. module: product_historical_margin
+#: help:historical.margin,from_date:0
+msgid ""
+"Date of the first invoice to take into account. The earliest existing "
+"invoice will be used if left empty"
+msgstr ""
+"Datum van de eerste factuur welke is meegerekend. De eerste factuur in het "
+"systeem wordt gebruikt indien leeg gelaten."
+
+#. module: product_historical_margin
+#: field:account.invoice.line,subtotal_cost_price_company:0
+msgid "Cost"
+msgstr "Kostprijs"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+#: model:ir.model,name:product_historical_margin.model_product_product
+msgid "Product"
+msgstr "Product"
+
+#. module: product_historical_margin
+#: help:account.invoice.line,subtotal_cost_price:0
+msgid ""
+"The cost subtotal of the line at the time of the creation of the invoice, "
+"express in the invoice currency."
+msgstr ""
+"Het kostprijs subtotaal van de regel op het moment van aanmaken van de "
+"factuur, weergegeven in de factuur valuta."
+
+#. module: product_historical_margin
+#: field:account.invoice.line,invoice_date:0
+msgid "Invoice Date"
+msgstr "Factuurdatum"
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_state:0
+msgid "Paid"
+msgstr "Betaald"
+
+#. module: product_historical_margin
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: ongeldige ean code"
+
+#. module: product_historical_margin
+#: help:account.invoice.line,invoice_state:0
+msgid "The parent invoice state"
+msgstr "De status van de bovenliggende factuur"
+
+#. module: product_historical_margin
+#: field:account.invoice.line,invoice_type:0
+msgid "Invoice type"
+msgstr "Factuur soort"
+
+#. module: product_historical_margin
+#: field:historical.margin,to_date:0
+msgid "To"
+msgstr "Aan"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "Account"
+msgstr "Rekening"
+
+#. module: product_historical_margin
+#: field:account.invoice.line,margin_relative:0
+#: field:product.product,margin_relative:0
+msgid "Real Margin (%)"
+msgstr "Werkelijke marge (%)"
+
+#. module: product_historical_margin
+#: model:ir.actions.act_window,name:product_historical_margin.act_product_act_open_invoice_lines
+msgid "Margin Details"
+msgstr "Marge details"
+
+#. module: product_historical_margin
+#: help:account.invoice.line,subtotal_cost_price_company:0
+msgid ""
+"The cost subtotal of the line at the time of the creation of the invoice, "
+"express in the company currency."
+msgstr ""
+"Het kostprijs subtotaal van de regel op het moment van aanmaken van de "
+"factuur, weergegeven in de bedrijfs valuta."
+
+#. module: product_historical_margin
+#: model:ir.model,name:product_historical_margin.model_historical_margin
+msgid "Product historical margin"
+msgstr "Product historische marge"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "Month-1"
+msgstr "Maand-1"
+
+#. module: product_historical_margin
+#: field:historical.margin,product_ids:0
+msgid "Products"
+msgstr "Producten"
+
+#. module: product_historical_margin
+#: field:account.invoice.line,margin_absolute:0
+#: field:product.product,margin_absolute:0
+msgid "Real Margin"
+msgstr "Werkelijke marge"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "Search Invoice Line"
+msgstr "Zoek factuurregel"
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_type:0
+msgid "Supplier Refund"
+msgstr "Leveranciers credit factuur"
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: product_historical_margin
+#: help:historical.margin,to_date:0
+msgid ""
+"Date of the last invoice to take into account. The latest existing invoice "
+"will be used if left empty"
+msgstr ""
+"Datum van de laatste factuur welke is meegerekend. De laatste factuur in het "
+"systeem wordt gebruikt indien leeg gelaten."
+
+#. module: product_historical_margin
+#: field:account.invoice.line,subtotal_company:0
+msgid "Net Sales"
+msgstr "Netto verkopen"
+
+#. module: product_historical_margin
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Factuurnummer moet uniek zijn per bedrijf!"
+
+#. module: product_historical_margin
+#: code:addons/product_historical_margin/wizard/historical_margin.py:101
+#: view:product.product:0
+#, python-format
+msgid "Historical Margins"
+msgstr "Historische marges"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "current month"
+msgstr "huidige maand"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0 field:account.invoice.line,invoice_user_id:0
+msgid "Salesman"
+msgstr "Verkoper"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "Group By..."
+msgstr "Groepeer op..."
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_state:0
+msgid "Pro-forma"
+msgstr "Pro-forma"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+#: model:ir.model,name:product_historical_margin.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Factuurregel"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: product_historical_margin
+#: field:account.invoice.line,invoice_state:0
+msgid "Invoice state"
+msgstr "Factuur status"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+#: model:ir.model,name:product_historical_margin.model_account_invoice
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "Year"
+msgstr "Jaar"
+
+#. module: product_historical_margin
+#: view:historical.margin:0
+msgid "Cancel"
+msgstr "Annuleer"
+
+#. module: product_historical_margin
+#: view:account.invoice.line:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: product_historical_margin
+#: help:account.invoice.line,subtotal_company:0
+msgid ""
+"The subtotal (VAT excluded) of the line at the time of the creation of the "
+"invoice, express in the company currency (computed with the rate at invoice "
+"creation time, as we don't have the cost price of the product at the date of "
+"the invoice)."
+msgstr ""
+"Het subtotaal (excl. BTW) van de regel op het moment van aanmaken van de "
+"factuur, weergegeven in de bedrijfsvaluta (berekend met de koers, welke "
+"bekend was op moment van aanmaken van de factuur)."
+
+#. module: product_historical_margin
+#: selection:account.invoice.line,invoice_state:0
+msgid "Open"
+msgstr "Open"
+
+#. module: product_historical_margin
+#: help:account.invoice.line,invoice_type:0
+msgid "The parent invoice type"
+msgstr "De bovenliggende factuur soort"
+
+#. module: product_historical_margin
+#: help:product.product,margin_absolute:0
+msgid ""
+"The Real Margin [ sale price - cost price ] of the product in absolute value "
+"based on historical values computed from open and paid invoices."
+msgstr ""
+"De werkelijke marge [ Verkoopprijs - Kostprijs ] van het product als "
+"absolute waarde, gebasseerd op historische waardes, berekend op basis van "
+"open en betaalde facturen."

=== modified file 'product_historical_margin/wizard/historical_margin.py'
--- product_historical_margin/wizard/historical_margin.py	2012-11-14 15:53:00 +0000
+++ product_historical_margin/wizard/historical_margin.py	2012-12-23 13:24:22 +0000
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 import time
+import logging
 
 from openerp.osv.orm import TransientModel
 from openerp.osv import fields

=== added file 'product_historical_margin_report/i18n/nl.po'
--- product_historical_margin_report/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ product_historical_margin_report/i18n/nl.po	2012-12-23 13:24:22 +0000
@@ -0,0 +1,40 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* product_historical_margin_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-23 12:02+0000\n"
+"PO-Revision-Date: 2012-12-23 13:03+0100\n"
+"Last-Translator: Erwin van der Ploeg | Endian Solutions "
+"<[e-mail]>\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"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: product_historical_margin_report
+#: view:account.invoice.report:0
+msgid "Total Without Tax"
+msgstr "Totaal exclusief belastingen"
+
+#. module: product_historical_margin_report
+#: model:ir.model,name:product_historical_margin_report.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr "Factuur analyses"
+
+#. module: product_historical_margin_report
+#: view:account.invoice.report:0
+#: field:account.invoice.report,margin_absolute:0
+msgid "Real Margin"
+msgstr "Werkelijke marge"
+
+#. module: product_historical_margin_report
+#: view:account.invoice.report:0
+#: field:account.invoice.report,subtotal_cost_price_company:0
+msgid "Total Cost"
+msgstr "Totale kosten"

=== added file 'product_standard_margin/i18n/nl.po'
--- product_standard_margin/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ product_standard_margin/i18n/nl.po	2012-12-23 13:24:22 +0000
@@ -0,0 +1,67 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* product_standard_margin
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-23 12:04+0000\n"
+"PO-Revision-Date: 2012-12-23 13:35+0100\n"
+"Last-Translator: Erwin van der Ploeg | Endian Solutions "
+"<[e-mail]>\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"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: product_standard_margin
+#: model:ir.model,name:product_standard_margin.model_product_product
+msgid "Product"
+msgstr "Product"
+
+#. module: product_standard_margin
+#: field:product.product,standard_margin_rate:0
+msgid "Theorical Margin (%)"
+msgstr "Theoretische marge (%)"
+
+#. module: product_standard_margin
+#: help:product.product,standard_margin_rate:0
+msgid ""
+"Markup rate is [ Theorical Margin / sale price (Wo Tax) ] of the product "
+"form (not based on historical values).Take care of tax include and exclude.. "
+"If no sale price set, will display 999.0"
+msgstr ""
+"Theoretische marge (%) is [ Theoretische marge / Verkoopprijs (excl. BTW) ] "
+"van het product (niet gebaseerd op historische waardes). Het veld houdt "
+"rekening met prijzen incl. en excl. BTW. Indien geen verkooprijs is "
+"ingevoerd, wordt 999,0 weergegeven."
+
+#. module: product_standard_margin
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: ongeldige ean code"
+
+#. module: product_standard_margin
+#: help:product.product,standard_margin:0
+msgid ""
+"Theorical Margin is [ sale price (Wo Tax) - cost price ] of the product form "
+"(not based on historical values).Take care of tax include and exclude. If no "
+"sale price, the margin will be negativ."
+msgstr ""
+"Theoretische marge is [ Verkoopprijs (excl. BTW) - Kostprijs) ] van het "
+"product (niet gebaseerd op historische waardes). Het veld houdt rekening met "
+"prijzen incl. en excl. BTW. Indien geen verkooprijs is ingevoerd, zal de "
+"marge negatief zijn."
+
+#. module: product_standard_margin
+#: view:product.product:0
+msgid "Margin"
+msgstr "Marge"
+
+#. module: product_standard_margin
+#: field:product.product,standard_margin:0
+msgid "Theorical Margin"
+msgstr "Theoretische marge"