← Back to branch summary

~unifield-team/unifield-wm/us-826

« back to all changes in this revision

Viewing changes to msf_accrual/wizard/wizard_accrual_validation.py

  • Committer: Matthieu Dietrich
  • Date: 2012-05-08 09:13:25 UTC
  • mto: This revision was merged to the branch mainline in revision 837.
  • Revision ID: matthieu.dietrich@geneva.msf.org-20120508091325-lyw4ziqreanhc0et
UF-999: [FIX] points 1 to 3 of the ticket done (renaming, cancel button, new attribute to G/L account)

Show diffs side-by-side

added added

removed removed

Lines of Context:
msf_accrual/wizard/wizard_accrual_validation.py
74
74
                    move_id = move_obj.create(cr, uid, move_vals, context=context)
75
75
                    reversal_move_id = move_obj.create(cr, uid, reversal_move_vals, context=context)
76
76
                    
 
77
                    reversal_description = "REV - " + accrual_line.description
 
78
                    
77
79
                    # Create move lines
78
80
                    accrual_move_line_vals = {
 
81
                        'accrual': True,
79
82
                        'move_id': move_id,
80
83
                        'date': move_date,
81
84
                        'journal_id': accrual_line.journal_id.id,
89
92
                        'currency_id': accrual_line.currency_id.id,
90
93
                    }
91
94
                    expense_move_line_vals = {
 
95
                        'accrual': True,
92
96
                        'move_id': move_id,
93
97
                        'date': move_date,
94
98
                        'journal_id': accrual_line.journal_id.id,
105
109
                    
106
110
                    # and their reversal
107
111
                    reversal_accrual_move_line_vals = {
 
112
                        'accrual': True,
108
113
                        'move_id': reversal_move_id,
109
114
                        'date': reversal_move_date,
110
115
                        'journal_id': accrual_line.journal_id.id,
111
116
                        'period_id': reversal_period_id,
112
117
                        'reference': accrual_line.reference,
113
 
                        'name': accrual_line.description,
 
118
                        'name': reversal_description,
114
119
                        'account_id': accrual_line.accrual_account_id.id,
115
120
                        'partner_id': ((accrual_line.partner_id) and accrual_line.partner_id.id) or False,
116
121
                        'employee_id': ((accrual_line.employee_id) and accrual_line.employee_id.id) or False,
118
123
                        'currency_id': accrual_line.currency_id.id,
119
124
                    }
120
125
                    reversal_expense_move_line_vals = {
 
126
                        'accrual': True,
121
127
                        'move_id': reversal_move_id,
122
128
                        'date': reversal_move_date,
123
129
                        'journal_id': accrual_line.journal_id.id,
124
130
                        'period_id': reversal_period_id,
125
131
                        'reference': accrual_line.reference,
126
 
                        'name': accrual_line.description,
 
132
                        'name': reversal_description,
127
133
                        'account_id': accrual_line.expense_account_id.id,
128
134
                        'partner_id': ((accrual_line.partner_id) and accrual_line.partner_id.id) or False,
129
135
                        'employee_id': ((accrual_line.employee_id) and accrual_line.employee_id.id) or False,