[MERGE] lp881356

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

diff --git a/addons/account/company.py b/addons/account/company.py
index 613c702..4ad4d12 100644 (file)
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -24,14 +24,26 @@ from osv import fields, osv
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
-        'overdue_msg' : fields.text('Overdue Payments Message', translate=True),
+        'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
+        '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",
+            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.), as calculated in 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': '''Our records indicate that the following payments are still due. If the amount
+has already been paid, please disregard this notice. However, if you have any
+queries regarding your account, please contact us.
+Thank you in advance.
+'''
     }
+
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: