Merge lp:~r-dawn/openobject-addons/trunk_negative_brackets into lp:openobject-addons

[Dawn Richardson]

Adds an extra option in languages to format negative numbers into brackets on accounting reports. This is farily standard accounting functionality. See http://help.openerp.com/question/20849/how-to-display-negative-numbers-in-brackets-on-reports/. The additions leave the option unchecked by default, to avoid changing any existing functionality.

Unmerged revisions

8765. By Dawn Richardson on 2013-06-14

[IMP] Adds in option in languages to display all negative amounts on accounting reports in brackets. Unticked by default to avoid changing existing functionality.

=== modified file 'account/res_config.py'
--- account/res_config.py	2013-05-30 10:18:33 +0000
+++ account/res_config.py	2013-06-14 02:29:31 +0000
@@ -344,4 +344,25 @@
                 'module_account_accountant': True,
                 }}
         return {}
+
+class lang(osv.osv):
+    """
+    Adding an option for displaying negative numbers in brackets
+    """
+    _name = "res.lang"
+    _inherit = "res.lang"
+    _columns = {
+        'negative_brackets': fields.boolean('Display Negatives in Brackets'),
+    }
+
+    def format(self, cr, uid, ids, percent, value, grouping=False, monetary=False, context=None):
+        """ Format() will return the language-specific output for float values"""
+        formatted = super(lang,self).format(cr, uid, ids, percent, value, grouping, monetary, context)
+        this = self.browse(cr, uid, ids)[0]
+        if this.negative_brackets and (len(formatted) > 0 and formatted[0]=="-"): 
+            # replace negative sign with brackets
+            formatted = '(' + formatted[1:] + ")"
+        return formatted
+
+lang()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml	2013-04-11 10:46:43 +0000
+++ account/res_config_view.xml	2013-06-14 02:29:31 +0000
@@ -271,5 +271,17 @@
         <menuitem id="menu_account_config" name="Invoicing" parent="base.menu_config"
             sequence="14" action="action_account_config"/>
 
+        <!-- Extra language settings -->
+        <record id="res_lang_form" model="ir.ui.view">
+            <field name="name">res.lang.form</field>
+            <field name="model">res.lang</field>
+            <field name="inherit_id" ref="base.res_lang_form"/>
+            <field name="arch" type="xml">
+                <field name="translatable" position="after">
+                    <field name="negative_brackets" />
+                </field>
+            </field>
+        </record>
+
     </data>
 </openerp>