Merge lp:~oddbloke/openobject-addons/623334 into lp:openobject-addons/5.0

[Dan Watkins]

Fixes the Partner Ledger part of bug #623334, which involves Partner Account reports in the account module showing incorrect figures.

Essentially, we are joining with the moves that the move lines are part of, to ensure that they aren't in Draft status. I've then consolidated the shared SQL strings into _get_line_sql, _get_credit_sql and _get_debit_sql.

[Dan Watkins (oddbloke)]

So this doesn't fully fix bug #623334, that was a mis-type. It does, however, fix the Partner Ledger report problem.

[lp:~oddbloke/openobject-addons/623334]

2824. By Dan Watkins on 2010-08-24

Remove unused _sum_sdebit and _sum_scredit methods from partner_balance report.

2825. By Dan Watkins on 2010-08-24

Fix grand total display in the partner_balance report.

2826. By Dan Watkins on 2010-08-24

Fix individual lines in partner_balance report.

2827. By Dan Watkins on 2010-08-24

Fix aged_trial_balance report.

Unmerged revisions

2827. By Dan Watkins on 2010-08-24

Fix aged_trial_balance report.

2826. By Dan Watkins on 2010-08-24

Fix individual lines in partner_balance report.

2825. By Dan Watkins on 2010-08-24

Fix grand total display in the partner_balance report.

2824. By Dan Watkins on 2010-08-24

Remove unused _sum_sdebit and _sum_scredit methods from partner_balance report.

2823. By Dan Watkins on 2010-08-24

Fix third party ledger report.

=== 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	2010-08-24 13:10:20 +0000
@@ -256,12 +256,15 @@
 		if self.date_lst_string:
 			self.cr.execute(
 				"SELECT l.id,l.date,j.code, l.ref, l.name, l.debit, l.credit " \
-				"FROM account_move_line l " \
+				"FROM (account_move_line l " \
 				"LEFT JOIN account_journal j " \
-					"ON (l.journal_id = j.id) " \
+					"ON (l.journal_id = j.id)) " \
+					"LEFT JOIN account_move m " \
+						"ON (l.move_id = m.id) " \
 				"WHERE l.partner_id = %s " \
 					"AND l.account_id IN (" + self.account_ids + ") " \
 					"AND l.date IN (" + self.date_lst_string + ") " \
+					"AND m.state = 'posted' " \
 					" " + RECONCILE_TAG + " "\
 					"ORDER BY l.id",
 					(partner.id,))
@@ -274,6 +277,19 @@
 
 		return full_account
 
+	def _get_line_sql(self):
+		return "SELECT sum(line.%s) " \
+				"FROM account_move_line line " \
+				"LEFT JOIN account_move m ON (line.move_id = m.id) " \
+				"WHERE line.account_id IN (" + self.account_ids + ") " \
+				"AND m.state = 'posted' "
+
+	def _get_credit_sql(self):
+		return self._get_line_sql() % ("credit", )
+
+	def _get_debit_sql(self):
+		return self._get_line_sql() % ("debit", )
+
 	def _sum_debit_partner(self, partner,data):
 
 		account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
@@ -283,13 +299,10 @@
 		else:
 			RECONCILE_TAG = "AND reconcile_id IS NULL"
 		if self.date_lst and data['form']['soldeinit'] :
-			self.cr.execute(
-				"SELECT sum(debit) " \
-				"FROM account_move_line " \
-				"WHERE partner_id = %s " \
-					"AND account_id IN (" + self.account_ids + ") " \
-					"AND reconcile_id IS NULL " \
-					"AND date < %s " ,
+			self.cr.execute(self._get_debit_sql() +
+					"AND line.partner_id = %s " \
+					"AND line.reconcile_id IS NULL " \
+					"AND line.date < %s ",
 				(partner.id, self.date_lst[0],))
 			contemp = self.cr.fetchone()
 			if contemp != None:
@@ -298,13 +311,10 @@
 				result_tmp = result_tmp + 0.0
 
 		if self.date_lst_string:
-			self.cr.execute(
-					"SELECT sum(debit) " \
-					"FROM account_move_line " \
-					"WHERE partner_id = %s " \
-						"AND account_id IN (" + self.account_ids + ") " \
+			self.cr.execute(self._get_debit_sql() +
+						"AND line.partner_id = %s " \
 						" " + RECONCILE_TAG + " " \
-						"AND date IN (" + self.date_lst_string + ") " ,
+						"AND line.date IN (" + self.date_lst_string + ") ",
 					(partner.id,))
 
 			contemp = self.cr.fetchone()
@@ -322,13 +332,10 @@
 		else:
 			RECONCILE_TAG = "AND reconcile_id IS NULL"
 		if self.date_lst and data['form']['soldeinit'] :
-			self.cr.execute(
-					"SELECT sum(credit) " \
-					"FROM account_move_line " \
-					"WHERE partner_id=%s " \
-						"AND account_id IN (" + self.account_ids + ") " \
-						"AND reconcile_id IS NULL " \
-						"AND date < %s " ,
+			self.cr.execute(self._get_credit_sql() +
+						"AND line.partner_id=%s " \
+						"AND line.reconcile_id IS NULL " \
+						"AND line.date < %s ",
 					(partner.id,self.date_lst[0],))
 			contemp = self.cr.fetchone()
 			if contemp != None:
@@ -337,13 +344,10 @@
 				result_tmp = result_tmp + 0.0
 
 		if self.date_lst_string:
-			self.cr.execute(
-					"SELECT sum(credit) " \
-					"FROM account_move_line " \
-					"WHERE partner_id=%s " \
-						"AND account_id IN (" + self.account_ids + ") " \
+			self.cr.execute(self._get_credit_sql() +
+						"AND line.partner_id=%s " \
 						" " + RECONCILE_TAG + " " \
-						"AND date IN (" + self.date_lst_string + ") " ,
+						"AND line.date IN (" + self.date_lst_string + ") ",
 					(partner.id,))
 
 			contemp = self.cr.fetchone()
@@ -363,13 +367,10 @@
 		else:
 			RECONCILE_TAG = "AND reconcile_id IS NULL"
 		if self.date_lst and data['form']['soldeinit'] :
-			self.cr.execute(
-					"SELECT sum(debit) " \
-					"FROM account_move_line " \
-					"WHERE partner_id IN (" + self.partner_ids + ") " \
-						"AND account_id IN (" + self.account_ids + ") " \
-						"AND reconcile_id IS NULL " \
-						"AND date < %s " ,
+			self.cr.execute(self._get_debit_sql() +
+						"AND line.partner_id IN (" + self.partner_ids + ") " \
+						"AND line.reconcile_id IS NULL " \
+						"AND line.date < %s ",
 					(self.date_lst[0],))
 			contemp = self.cr.fetchone()
 			if contemp != None:
@@ -378,13 +379,10 @@
 				result_tmp = result_tmp + 0.0
 
 		if self.date_lst_string:
-			self.cr.execute(
-					"SELECT sum(debit) " \
-					"FROM account_move_line " \
-					"WHERE partner_id IN (" + self.partner_ids + ") " \
-						"AND account_id IN (" + self.account_ids + ") " \
+			self.cr.execute(self._get_debit_sql() +
+						"AND line.partner_id IN (" + self.partner_ids + ") " \
 						" " + RECONCILE_TAG + " " \
-						"AND date IN (" + self.date_lst_string + ") "
+						"AND line.date IN (" + self.date_lst_string + ") ",
 					)
 
 			contemp = self.cr.fetchone()
@@ -406,13 +404,10 @@
 		else:
 			RECONCILE_TAG = "AND reconcile_id IS NULL"
 		if self.date_lst and data['form']['soldeinit'] :
-			self.cr.execute(
-					"SELECT sum(credit) " \
-					"FROM account_move_line " \
-					"WHERE partner_id IN (" + self.partner_ids + ") " \
-						"AND account_id IN (" + self.account_ids + ") " \
-						"AND reconcile_id IS NULL " \
-						"AND date < %s " ,
+			self.cr.execute(self._get_credit_sql() +
+						"AND line.partner_id IN (" + self.partner_ids + ") " \
+						"AND line.reconcile_id IS NULL " \
+						"AND line.date < %s ",
 					(self.date_lst[0],))
 			contemp = self.cr.fetchone()
 			if contemp != None:
@@ -421,13 +416,10 @@
 				result_tmp = result_tmp + 0.0
 
 		if self.date_lst_string:
-			self.cr.execute(
-					"SELECT sum(credit) " \
-					"FROM account_move_line " \
-					"WHERE partner_id IN (" + self.partner_ids + ") " \
-						"AND account_id IN (" + self.account_ids + ") " \
+			self.cr.execute(self._get_credit_sql() +
+						"AND line.partner_id IN (" + self.partner_ids + ") " \
 						" " + RECONCILE_TAG + " " \
-						"AND date IN (" + self.date_lst_string + ") "
+						"AND line.date IN (" + self.date_lst_string + ") ",
 					)
 			contemp = self.cr.fetchone()
 			if contemp != None: