Merge lp:~numerigraphe/openobject-addons/trunk-stock-not-yet-invoiced into lp:openobject-addons

[Numérigraphe]

Makes the wording clearer for stock moves not yet invoiced.
I have changed the translation templates and the translations into French, and willingly left the other translations unchanged so that translators have a chance to catch up.

[Olivier Dony (Odoo) (odo-openerp)]

Hi Lionel,

After reading the bug report I understand your concern, and I agree that "not yet invoiced" conveys almost the same meaning as "to be invoiced". However, I'm concerned by the fact that this is one of the possible values for the "Invoice Control" field, which are:
  - Not Applicable
  - To Be Invoiced
  - Invoiced
Here "To Be Invoiced" really means: invoicing control is enabled for this picking, and the picking will need to be invoiced. In this context "Not yet invoiced" is weaker and does not stress the fact that it is a required step: it could even be confused with the "Not Applicable" case... Is it "not yet invoiced" because it will never be, because it is optional, or because someone will do it later?

In addition to this, it requires a `hard` change of translations in order to carry its full effect (as you noted), forcing every language to re-translate several terms.

To sum up, I think this is one case (like many others) where the users need to be trained to used the software properly, and trying to adapt it too much to one kind of user will impact others negatively.

Unless we see a very strong demand for this I'd prefer to keep it as it is.

If you really want to customize it for your users there are still many options: you can always provide you own fr.po translation file (or use your own fr_XX.po sub-language) and change the label of the state or that of the column, or even hide the column completely when it is confusing them.

I hope you'll understand this point of view..

Thanks for the merge proposal nevertheless, it's always a pleasure to review your contributions!

review: Disapprove

[Numérigraphe (numerigraphe)]

Dear Olivier,
Thanks for your review.
It's OK, we'll maintain that branch on our own.
Lionel.

=== modified file 'stock/i18n/fr.po'
--- stock/i18n/fr.po	2011-11-12 04:53:03 +0000
+++ stock/i18n/fr.po	2011-11-17 13:34:34 +0000
@@ -2953,8 +2953,8 @@
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
-msgid "To Be Invoiced"
-msgstr "À facturer"
+msgid "Not yet invoiced"
+msgstr "Pas encore facturé"
 
 #. module: stock
 #: field:stock.inventory,date_done:0

=== modified file 'stock/i18n/stock.pot'
--- stock/i18n/stock.pot	2011-11-11 13:48:19 +0000
+++ stock/i18n/stock.pot	2011-11-17 13:34:34 +0000
@@ -2539,7 +2539,7 @@
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
-msgid "To Be Invoiced"
+msgid "Not yet invoiced"
 msgstr ""
 
 #. module: stock

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-11-15 09:50:27 +0000
+++ stock/stock.py	2011-11-17 13:34:34 +0000
@@ -647,7 +647,7 @@
         'partner_id': fields.related('address_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
+            ("2binvoiced", "Not yet invoiced"),
             ("none", "Not Applicable")], "Invoice Control",
             select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),

=== modified file 'stock_invoice_directly/wizard/stock_invoice.py'
--- stock_invoice_directly/wizard/stock_invoice.py	2011-10-16 01:28:00 +0000
+++ stock_invoice_directly/wizard/stock_invoice.py	2011-11-17 13:34:34 +0000
@@ -25,7 +25,7 @@
     _inherit = 'stock.partial.picking'
 
     def do_partial(self, cr, uid, ids, context=None):
-        """Launch Create invoice wizard if invoice state is To be Invoiced,
+        """Launch Create invoice wizard if invoice state is "Not yet invoiced",
            after processing the partial picking.
         """
         if context is None: context = {}

=== modified file 'stock_location/i18n/fr.po'
--- stock_location/i18n/fr.po	2011-11-09 18:12:56 +0000
+++ stock_location/i18n/fr.po	2011-11-17 13:34:34 +0000
@@ -216,8 +216,8 @@
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
-msgid "To Be Invoiced"
-msgstr "À facturer"
+msgid "Not yet invoiced"
+msgstr "Pas encore facturé"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0

=== modified file 'stock_location/i18n/stock_location.pot'
--- stock_location/i18n/stock_location.pot	2011-01-14 00:11:01 +0000
+++ stock_location/i18n/stock_location.pot	2011-11-17 13:34:34 +0000
@@ -196,7 +196,7 @@
 #. module: stock_location
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
-msgid "To Be Invoiced"
+msgid "Not yet invoiced"
 msgstr ""
 
 #. module: stock_location

=== modified file 'stock_location/stock_location.py'
--- stock_location/stock_location.py	2011-05-19 12:13:36 +0000
+++ stock_location/stock_location.py	2011-11-17 13:34:34 +0000
@@ -34,7 +34,7 @@
         'delay': fields.integer('Delay (days)', help="Number of days to do this transition"),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
+            ("2binvoiced", "Not yet invoiced"),
             ("none", "Not Applicable")], "Invoice Status",
             required=True,),
         'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"),
@@ -73,7 +73,7 @@
         'product_id':fields.many2one('product.product','Product'),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
-            ("2binvoiced", "To Be Invoiced"),
+            ("2binvoiced", "Not invoiced yet"),
             ("none", "Not Applicable")], "Invoice Status",
             required=True,),
     }