Amit Dodiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/5.0-opw-16036-ado into
lp:openobject-addons/5.0.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
Jay Vora (OpenERP) (jvo-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/5.0-opw-16036-ado/+merge/67324
Hello Sir,
I have done change in the sql query while fetching data into report because the
sql query was giving Null value in report column.
Thanks.
Amit
--
https://code.launchpad.net/~openerp-dev/openobject-addons/5.0-opw-16036-ado/+merge/67324
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/5.0-opw-16036-ado.
=== modified file 'account/report/partner_balance.py'
--- account/report/partner_balance.py 2010-08-17 07:00:51 +0000
+++ account/report/partner_balance.py 2011-07-08 12:48:44 +0000
@@ -121,7 +121,7 @@
sql = "SELECT min(date) as start_date from account_move_line"
self.cr.execute(sql)
start_date = self.cr.fetchone()[0]
-
+
sql = "SELECT max(date) as start_date from account_move_line"
self.cr.execute(sql)
stop_date = self.cr.fetchone()[0]
@@ -196,7 +196,7 @@
result_tmp = 0.0
if self.date_lst:
self.cr.execute(
- "SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, sum(debit) as debit, sum(credit) as credit, " \
+ "SELECT p.ref,l.account_id,ac.name as account_name,ac.code as code ,p.name, COALESCE(sum(debit),0.00) as debit, COALESCE(sum(credit),0.00) as credit, " \
"CASE WHEN sum(debit) > sum(credit) " \
"THEN sum(debit) - sum(credit) " \
"ELSE 0 " \
=== modified file 'account/report/third_party_ledger.py'
--- account/report/third_party_ledger.py 2010-05-27 10:59:00 +0000
+++ account/report/third_party_ledger.py 2011-07-08 12:48:44 +0000
@@ -255,7 +255,7 @@
# full_account.append(r)
if self.date_lst_string:
self.cr.execute(
- "SELECT l.id,l.date,j.code, l.ref, l.name, l.debit, l.credit " \
+ "SELECT l.id,l.date,j.code, l.ref, l.name, COALESCE(l.debit,0.00) as debit, COALESCE(l.credit,0.00) as credit " \
"FROM account_move_line l " \
"LEFT JOIN account_journal j " \
"ON (l.journal_id = j.id) " \
=== modified file 'account_payment/account_move_line.py'
--- account_payment/account_move_line.py 2010-02-19 14:07:57 +0000
+++ account_payment/account_move_line.py 2011-07-08 12:48:44 +0000
@@ -51,7 +51,7 @@
if not len(args):
return []
line_obj = self.pool.get('account.move.line')
- query = line_obj._query_get(cr, uid, context={})
+ query = line_obj._query_get(cr, uid, context=context)
where = ' and '.join(map(lambda x: '''(SELECT
CASE WHEN l.amount_currency < 0
THEN - l.amount_currency
=== modified file 'account_payment/wizard/wizard_payment_order.py'
--- account_payment/wizard/wizard_payment_order.py 2010-04-27 13:53:33 +0000
+++ account_payment/wizard/wizard_payment_order.py 2011-07-08 12:48:44 +0000
@@ -44,6 +44,9 @@
search_due_date=data['form']['duedate']
pool = pooler.get_pool(cr.dbname)
+ fiscal_year_obj = pool.get('account.fiscalyear')
+ fiscal_year_ids = fiscal_year_obj.search(cr, uid, [])
+ context ['fiscalyear'] = ','.join(str(n) for n in fiscal_year_ids)
order_obj = pool.get('payment.order')
line_obj = pool.get('account.move.line')
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
