odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch 7.0 up to 43cf6d5

This commit is contained in:
Denis Ledoux 2014-12-17 14:05:44 +01:00
parent 77f8010c91 43cf6d51d2
commit 36bf774d20
5 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/account/account_view.xml
View File

@ -1002,7 +1002,9 @@
<group> <group>
<field name="name"/> <field name="name"/>
<field name="ref"/> <field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/> <field name="partner_id"
domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
</group> </group>
<group> <group>
<field name="journal_id"/> <field name="journal_id"/>
@ -1075,7 +1077,9 @@
<field name="journal_id" readonly="False"/> <field name="journal_id" readonly="False"/>
<field name="period_id" readonly="False"/> <field name="period_id" readonly="False"/>
<field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/> <field name="account_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation'),('company_id', '=', company_id)]"/>
<field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/> <field name="partner_id"
domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
<newline/> <newline/>
<field name="debit"/> <field name="debit"/>
<field name="credit"/> <field name="credit"/>
@ -1119,7 +1123,9 @@
<field name="name"/> <field name="name"/>
<field name="ref"/> <field name="ref"/>
<field name="statement_id" invisible="1"/> <field name="statement_id" invisible="1"/>
<field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/> <field name="partner_id"
domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
<field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id, partner_id, context)"/> <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id, partner_id, context)"/>
<field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/> <field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
@ -1302,7 +1308,9 @@
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="name"/> <field name="name"/>
<field name="ref"/> <field name="ref"/>
<field name="partner_id" on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, date, journal_id, context)"/> <field name="partner_id"
domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, date, journal_id, context)"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="period_id"/> <field name="period_id"/>
@ -1366,7 +1374,9 @@
<tree colors="blue:state == 'draft';black:state == 'posted'" editable="top" string="Journal Items"> <tree colors="blue:state == 'draft';black:state == 'posted'" editable="top" string="Journal Items">
<field name="invoice"/> <field name="invoice"/>
<field name="name"/> <field name="name"/>
<field name="partner_id" on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, parent.date, parent.journal_id, context)"/> <field name="partner_id"
domain="['|', ('parent_id', '=', False), ('is_company', '=', True)]"
on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, parent.date, parent.journal_id, context)"/>
<field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/> <field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
<field name="date_maturity"/> <field name="date_maturity"/>
<field name="debit" sum="Total Debit"/> <field name="debit" sum="Total Debit"/>

5
addons/account/report/account_aged_partner_balance.py
View File

@ -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'] partial = date and date[0][0] <= form[str(i)]['stop']
if partial: if partial:
# partial reconcilation # 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) self.cr.execute('''SELECT SUM(l.debit-l.credit)
FROM account_move_line AS l, account_move AS am 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() unreconciled_amount = self.cr.fetchall()
partners_amount[partner_info[0]] += unreconciled_amount[0][0] partners_amount[partner_info[0]] += unreconciled_amount[0][0]
else: else:

4
addons/base_geolocalize/models/res_partner.py
View File

@ -64,8 +64,8 @@ class res_partner(osv.osv):
_inherit = "res.partner" _inherit = "res.partner"
_columns = { _columns = {
'partner_latitude': fields.float('Geo Latitude'), 'partner_latitude': fields.float('Geo Latitude', digits=(16, 5)),
'partner_longitude': fields.float('Geo Longitude'), 'partner_longitude': fields.float('Geo Longitude', digits=(16, 5)),
'date_localization': fields.date('Geo Localization Date'), 'date_localization': fields.date('Geo Localization Date'),
} }

4
addons/crm_partner_assign/crm_partner_assign.py
View File

@ -87,8 +87,8 @@ class res_partner(osv.osv):
class crm_lead(osv.osv): class crm_lead(osv.osv):
_inherit = "crm.lead" _inherit = "crm.lead"
_columns = { _columns = {
'partner_latitude': fields.float('Geo Latitude'), 'partner_latitude': fields.float('Geo Latitude', digits=(16, 5)),
'partner_longitude': fields.float('Geo Longitude'), '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), '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"), 'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
} }

6
addons/stock/wizard/stock_return_picking.py
View File

@ -67,10 +67,10 @@ class stock_return_picking(osv.osv_memory):
pick = pick_obj.browse(cr, uid, record_id, context=context) pick = pick_obj.browse(cr, uid, record_id, context=context)
if pick: if pick:
if 'invoice_state' in fields: if 'invoice_state' in fields:
if pick.invoice_state=='invoiced': if pick.invoice_state in ['invoiced','2binvoiced']:
res.update({'invoice_state': '2binvoiced'}) res['invoice_state'] = '2binvoiced'
else: else:
res.update({'invoice_state': 'none'}) res['invoice_state'] = 'none'
return_history = self.get_return_history(cr, uid, record_id, context) return_history = self.get_return_history(cr, uid, record_id, context)
for line in pick.move_lines: for line in pick.move_lines:
qty = line.product_qty - return_history.get(line.id, 0) qty = line.product_qty - return_history.get(line.id, 0)