diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 73b5f1a61c6..141fea4e53b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1002,7 +1002,9 @@
-
+
@@ -1075,7 +1077,9 @@
-
+
@@ -1119,7 +1123,9 @@
-
+
@@ -1302,7 +1308,9 @@
-
+
@@ -1366,7 +1374,9 @@
-
+
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index b2887bc0de2..57498f8a66d 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -188,9 +188,12 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header):
partial = date and date[0][0] <= form[str(i)]['stop']
if partial:
# partial reconcilation
+ limit_date = 'COALESCE(l.date_maturity,l.date) %s %%s' % '<=' if self.direction_selection == 'past' else '>='
self.cr.execute('''SELECT SUM(l.debit-l.credit)
FROM account_move_line AS l, account_move AS am
- WHERE l.move_id = am.id AND am.state in %s AND l.reconcile_partial_id = %s''', (tuple(move_state), partner_info[2],))
+ WHERE l.move_id = am.id AND am.state in %s
+ AND l.reconcile_partial_id = %s
+ AND ''' + limit_date, (tuple(move_state), partner_info[2], self.date_from))
unreconciled_amount = self.cr.fetchall()
partners_amount[partner_info[0]] += unreconciled_amount[0][0]
else:
diff --git a/addons/base_geolocalize/models/res_partner.py b/addons/base_geolocalize/models/res_partner.py
index af43b990526..6e89b312f4b 100644
--- a/addons/base_geolocalize/models/res_partner.py
+++ b/addons/base_geolocalize/models/res_partner.py
@@ -64,8 +64,8 @@ class res_partner(osv.osv):
_inherit = "res.partner"
_columns = {
- 'partner_latitude': fields.float('Geo Latitude'),
- 'partner_longitude': fields.float('Geo Longitude'),
+ 'partner_latitude': fields.float('Geo Latitude', digits=(16, 5)),
+ 'partner_longitude': fields.float('Geo Longitude', digits=(16, 5)),
'date_localization': fields.date('Geo Localization Date'),
}
diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index 31a042d8685..39467cac293 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -87,8 +87,8 @@ class res_partner(osv.osv):
class crm_lead(osv.osv):
_inherit = "crm.lead"
_columns = {
- 'partner_latitude': fields.float('Geo Latitude'),
- 'partner_longitude': fields.float('Geo Longitude'),
+ 'partner_latitude': fields.float('Geo Latitude', digits=(16, 5)),
+ 'partner_longitude': fields.float('Geo Longitude', digits=(16, 5)),
'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner',track_visibility='onchange' , help="Partner this case has been forwarded/assigned to.", select=True),
'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
}
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index f6a20c81586..1da567b166b 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -67,10 +67,10 @@ class stock_return_picking(osv.osv_memory):
pick = pick_obj.browse(cr, uid, record_id, context=context)
if pick:
if 'invoice_state' in fields:
- if pick.invoice_state=='invoiced':
- res.update({'invoice_state': '2binvoiced'})
+ if pick.invoice_state in ['invoiced','2binvoiced']:
+ res['invoice_state'] = '2binvoiced'
else:
- res.update({'invoice_state': 'none'})
+ res['invoice_state'] = 'none'
return_history = self.get_return_history(cr, uid, record_id, context)
for line in pick.move_lines:
qty = line.product_qty - return_history.get(line.id, 0)