[MERGE] lp:~xrg/openobject-addons/trunk-patch18

[odoo/odoo.git] / addons / account / company.py

diff --git a/addons/account/company.py b/addons/account/company.py
index 613c702..a3886cd 100644 (file)
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -24,14 +24,25 @@ from osv import fields, osv
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
-        'overdue_msg' : fields.text('Overdue Payments Message', translate=True),
+        'overdue_msg': fields.text('Overdue Payments Message', translate=True),
+        'property_reserve_and_surplus_account': fields.property(
+            'account.account',
+            type='many2one',
+            relation='account.account',
+            string="Reserve and Profit/Loss Account",
+            method=True,
+            view_load=True,
+            domain="[('type', '=', 'other')]",
+            help="This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be deducted.), Which is calculated from Profit & Loss Report"),
     }
 
     _defaults = {
-        'overdue_msg': 'Would your payment have been carried \
-out after this mail was sent, please consider the present one as \
-void. Do not hesitate to contact our accounting department'
+        'overdue_msg': 'Please note that the following payments are now due. If your payment \
+                        has been sent, kindly forward your payment details. If payment will be \
+                        delayed further, please contact us to discuss. \
+                        \nWould your payment have been carried out after this mail was sent, please consider the present one as void.'
     }
+
 res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file