credativ team mailing list archive
-
credativ team
-
Mailing list archive
-
Message #04853
[Merge] lp:~therp-nl/openupgrade-addons/6.1-merge_openobject-addons into lp:openupgrade-addons
Holger Brunn (Therp) has proposed merging lp:~therp-nl/openupgrade-addons/6.1-merge_openobject-addons into lp:openupgrade-addons.
Requested reviews:
OpenUpgrade Committers (openupgrade-committers)
For more details, see:
https://code.launchpad.net/~therp-nl/openupgrade-addons/6.1-merge_openobject-addons/+merge/108928
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~therp-nl/openupgrade-addons/6.1-merge_openobject-addons/+merge/108928
Your team OpenUpgrade Committers is requested to review the proposed merge of lp:~therp-nl/openupgrade-addons/6.1-merge_openobject-addons into lp:openupgrade-addons.
=== modified file 'account/__openerp__.py'
--- account/__openerp__.py 2012-01-31 13:36:57 +0000
+++ account/__openerp__.py 2012-06-06 12:41:23 +0000
@@ -133,7 +133,7 @@
'project/analytic_account_demo.xml',
'demo/account_minimal.xml',
'demo/account_invoice_demo.xml',
-# 'account_unit_test.xml',
+ #'account_unit_test.xml',
],
'test': [
'test/account_customer_invoice.yml',
=== modified file 'account/account.py'
--- account/account.py 2012-02-15 09:38:17 +0000
+++ account/account.py 2012-06-06 12:41:23 +0000
@@ -1079,7 +1079,7 @@
def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
if period_from_id == period_to_id:
- return period_from_id
+ return [period_from_id]
period_from = self.browse(cr, uid, period_from_id)
period_date_start = period_from.date_start
company1_id = period_from.company_id.id
@@ -1652,7 +1652,7 @@
'create_date': fields.date('Creation date', readonly=True),
}
_defaults = {
- 'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
+ 'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/',
}
def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py 2012-02-14 12:25:20 +0000
+++ account/account_bank_statement.py 2012-06-06 12:41:23 +0000
@@ -341,11 +341,11 @@
if not st.name == '/':
st_number = st.name
else:
+ c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
if st.journal_id.sequence_id:
- c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c)
else:
- st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement')
+ st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement', context=c)
for line in st.move_line_ids:
if line.state <> 'valid':
=== modified file 'account/account_cash_statement.py'
--- account/account_cash_statement.py 2011-12-31 07:57:20 +0000
+++ account/account_cash_statement.py 2012-06-06 12:41:23 +0000
@@ -214,11 +214,12 @@
if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash':
open_close = self._get_cash_open_close_box_lines(cr, uid, context)
if vals.get('starting_details_ids', False):
- for start in vals.get('starting_details_ids'):
- dict_val = start[2]
+ starting_details_ids = vals.get('starting_details_ids')
+ for start in starting_details_ids:
+ dict_val = start[2] or {}
for end in open_close['end']:
- if end[2]['pieces'] == dict_val['pieces']:
- end[2]['number'] += dict_val['number']
+ if end[2]['pieces'] == dict_val.get('pieces', 0.0):
+ end[2]['number'] += dict_val.get('number', 0.0)
vals.update({
# 'ending_details_ids': open_close['start'],
'starting_details_ids': open_close['end']
@@ -292,11 +293,11 @@
raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
if statement.name and statement.name == '/':
+ c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
if statement.journal_id.sequence_id:
- c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
else:
- st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement')
+ st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement', context=c)
vals.update({
'name': st_number
})
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py 2012-02-16 19:11:07 +0000
+++ account/account_invoice.py 2012-06-06 12:41:23 +0000
@@ -80,8 +80,11 @@
def _reconciled(self, cr, uid, ids, name, args, context=None):
res = {}
- for id in ids:
- res[id] = self.test_paid(cr, uid, [id])
+ wf_service = netsvc.LocalService("workflow")
+ for inv in self.browse(cr, uid, ids, context=context):
+ res[inv.id] = self.test_paid(cr, uid, [inv.id])
+ if not res[inv.id] and inv.state == 'paid':
+ wf_service.trg_validate(uid, 'account.invoice', inv.id, 'open_test', cr)
return res
def _get_reference_type(self, cr, uid, context=None):
@@ -1092,7 +1095,7 @@
return map(lambda x: (0,0,x), lines)
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
- invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+ invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'address_contact_id', 'address_invoice_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'user_id', 'fiscal_position'])
obj_invoice_line = self.pool.get('account.invoice.line')
obj_invoice_tax = self.pool.get('account.invoice.tax')
obj_journal = self.pool.get('account.journal')
@@ -1141,7 +1144,8 @@
})
# take the id part of the tuple returned for many2one fields
for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
- 'account_id', 'currency_id', 'payment_term', 'journal_id'):
+ 'account_id', 'currency_id', 'payment_term', 'journal_id',
+ 'user_id', 'fiscal_position'):
invoice[field] = invoice[field] and invoice[field][0]
# create the new invoice
new_ids.append(self.create(cr, uid, invoice))
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2012-02-13 18:07:41 +0000
+++ account/account_move_line.py 2012-06-06 12:41:23 +0000
@@ -827,7 +827,12 @@
if r[0][1] != None:
raise osv.except_osv(_('Error'), _('Some entries are already reconciled !'))
- if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
+ if context.get('fy_closing'):
+ # We don't want to generate any write-off when being called from the
+ # wizard used to close a fiscal year (and it doesn't give us any
+ # writeoff_acc_id).
+ pass
+ elif (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
(account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
if not writeoff_acc_id:
raise osv.except_osv(_('Warning'), _('You have to provide an account for the write off/exchange difference entry !'))
=== modified file 'account/edi/invoice_action_data.xml'
--- account/edi/invoice_action_data.xml 2011-11-09 17:38:17 +0000
+++ account/edi/invoice_action_data.xml 2012-06-06 12:41:23 +0000
@@ -43,8 +43,9 @@
<field name="email_to">${object.address_invoice_id.email or ''}</field>
<field name="model_id" ref="account.model_account_invoice"/>
<field name="auto_delete" eval="True"/>
+ <field name="lang">${object.partner_id.lang}</field>
<field name="body_html"><