Merge lp:~openerp-commiter/openobject-addons/trunk-addons-aag into lp:~openerp-dev/openobject-addons/trunk-dev-addons2
- trunk-addons-aag
- Merge into trunk-dev-addons2
Proposed by
Atik Agewan(OpenERP)
Status: | Merged |
---|---|
Merge reported by: | Rucha (Open ERP) |
Merged at revision: | not available |
Proposed branch: | lp:~openerp-commiter/openobject-addons/trunk-addons-aag |
Merge into: | lp:~openerp-dev/openobject-addons/trunk-dev-addons2 |
Diff against target: |
775 lines (+91/-131) 37 files modified
account/i18n/pt_BR.po (+2/-3) account/report/account_balance.py (+2/-0) account/wizard/account_move_journal.py (+1/-1) account/wizard/account_open_closed_fiscalyear.py (+2/-0) account/wizard/account_report_balance_sheet.py (+2/-1) account/wizard/account_report_common.py (+4/-1) account/wizard/account_report_general_ledger.py (+1/-1) account/wizard/account_report_partner_balance.py (+1/-1) account/wizard/account_report_partner_ledger.py (+1/-1) account/wizard/account_report_profit_loss.py (+1/-1) account/wizard/account_validate_account_move.py (+3/-0) account/wizard/account_vat.py (+3/-0) account_invoice_layout/i18n/hu.po (+3/-3) auction/wizard/auction_pay_sel.py (+5/-5) board/wizard/board_menu_create.py (+3/-3) email_template/wizard/email_template_send_wizard.py (+10/-10) hr_timesheet/i18n/pt_BR.po (+1/-1) hr_timesheet/wizard/hr_timesheet_print_employee.py (+3/-1) hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py (+3/-0) mrp/i18n/es_AR.po (+2/-3) mrp/wizard/mrp_product_produce.py (+2/-2) pad/__openerp__.py (+1/-1) point_of_sale/i18n/pt_BR.po (+1/-1) project_scrum/wizard/project_scrum_backlog_create_task.py (+4/-2) project_scrum/wizard/project_scrum_backlog_sprint.py (+3/-0) purchase/purchase.py (+7/-4) purchase_requisition/wizard/purchase_requisition_partner.py (+4/-5) stock/i18n/stock.pot (+0/-5) stock/wizard/stock_move.py (+0/-29) stock/wizard/stock_move_view.xml (+0/-28) stock/wizard/stock_split_move.py (+1/-1) survey/wizard/survey_browse_answer.py (+7/-8) survey/wizard/survey_print.py (+2/-3) survey/wizard/survey_print_answer.py (+1/-1) survey/wizard/survey_print_statistics.py (+1/-1) survey/wizard/survey_selection.py (+3/-3) survey/wizard/survey_send_invitation.py (+1/-1) |
To merge this branch: | bzr merge lp:~openerp-commiter/openobject-addons/trunk-addons-aag |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Atik Agewan(OpenERP) (community) | Needs Resubmitting | ||
OpenERP Core Team | Pending | ||
Review via email: mp+49797@code.launchpad.net |
Commit message
Description of the change
Purchase:[PS] Purchase order line_ Unit of measure
To post a comment you must log in.
Revision history for this message
Atik Agewan(OpenERP) (aag-openerp) : | # |
review:
Needs Resubmitting
Revision history for this message
Atik Agewan(OpenERP) (aag-openerp) wrote : | # |
review:
Needs Resubmitting
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'account/i18n/pt_BR.po' | |||
2 | --- account/i18n/pt_BR.po 2011-02-14 11:45:07 +0000 | |||
3 | +++ account/i18n/pt_BR.po 2011-02-15 12:38:08 +0000 | |||
4 | @@ -7,14 +7,13 @@ | |||
5 | 7 | "Project-Id-Version: OpenERP Server 6.0dev\n" | 7 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
6 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
7 | 9 | "POT-Creation-Date: 2011-01-11 11:14+0000\n" | 9 | "POT-Creation-Date: 2011-01-11 11:14+0000\n" |
9 | 10 | "PO-Revision-Date: 2011-02-11 22:50+0000\n" | 10 | "PO-Revision-Date: 2011-02-10 00:58+0000\n" |
10 | 11 | "Last-Translator: Emerson <Unknown>\n" | 11 | "Last-Translator: Emerson <Unknown>\n" |
11 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
12 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
13 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 14 | "Content-Type: text/plain; charset=UTF-8\n" |
14 | 15 | "Content-Transfer-Encoding: 8bit\n" | 15 | "Content-Transfer-Encoding: 8bit\n" |
17 | 16 | "X-Launchpad-Export-Date: 2011-02-12 05:00+0000\n" | 16 | "X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n" |
16 | 17 | "X-Generator: Launchpad (build 12351)\n" | ||
18 | 18 | 17 | ||
19 | 19 | #. module: account | 18 | #. module: account |
20 | 20 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 | 19 | #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 |
21 | 21 | 20 | ||
22 | === modified file 'account/report/account_balance.py' | |||
23 | --- account/report/account_balance.py 2011-02-15 12:13:39 +0000 | |||
24 | +++ account/report/account_balance.py 2011-02-15 12:38:08 +0000 | |||
25 | @@ -71,6 +71,8 @@ | |||
26 | 71 | def lines(self, form, ids=[], done=None):#, level=1): | 71 | def lines(self, form, ids=[], done=None):#, level=1): |
27 | 72 | def _process_child(accounts, disp_acc, parent): | 72 | def _process_child(accounts, disp_acc, parent): |
28 | 73 | account_rec = [acct for acct in accounts if acct['id']==parent][0] | 73 | account_rec = [acct for acct in accounts if acct['id']==parent][0] |
29 | 74 | if isinstance(account_rec['parent_id'], tuple): | ||
30 | 75 | account_rec['parent_id'] = account_rec['parent_id'][0] | ||
31 | 74 | currency_obj = self.pool.get('res.currency') | 76 | currency_obj = self.pool.get('res.currency') |
32 | 75 | acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id']) | 77 | acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id']) |
33 | 76 | currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id | 78 | currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id |
34 | 77 | 79 | ||
35 | === modified file 'account/wizard/account_move_journal.py' | |||
36 | --- account/wizard/account_move_journal.py 2011-02-15 12:13:39 +0000 | |||
37 | +++ account/wizard/account_move_journal.py 2011-02-15 12:38:08 +0000 | |||
38 | @@ -148,7 +148,7 @@ | |||
39 | 148 | 148 | ||
40 | 149 | journal_id = self._get_journal(cr, uid, context) | 149 | journal_id = self._get_journal(cr, uid, context) |
41 | 150 | period_id = self._get_period(cr, uid, context) | 150 | period_id = self._get_period(cr, uid, context) |
43 | 151 | target_move = self.read(cr, uid, ids, [])[0]['target_move'] | 151 | target_move = self.read(cr, uid, ids, [], context=context)[0]['target_move'] |
44 | 152 | 152 | ||
45 | 153 | name = _("Journal Items") | 153 | name = _("Journal Items") |
46 | 154 | if journal_id: | 154 | if journal_id: |
47 | 155 | 155 | ||
48 | === modified file 'account/wizard/account_open_closed_fiscalyear.py' | |||
49 | --- account/wizard/account_open_closed_fiscalyear.py 2011-02-15 12:13:39 +0000 | |||
50 | +++ account/wizard/account_open_closed_fiscalyear.py 2011-02-15 12:38:08 +0000 | |||
51 | @@ -35,6 +35,8 @@ | |||
52 | 35 | move_obj = self.pool.get('account.move') | 35 | move_obj = self.pool.get('account.move') |
53 | 36 | 36 | ||
54 | 37 | data = self.read(cr, uid, ids, [], context=context)[0] | 37 | data = self.read(cr, uid, ids, [], context=context)[0] |
55 | 38 | if isinstance(data['fyear_id'], tuple): | ||
56 | 39 | data['fyear_id'] = data['fyear_id'][0] | ||
57 | 38 | data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context) | 40 | data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context) |
58 | 39 | if not data_fyear.end_journal_period_id: | 41 | if not data_fyear.end_journal_period_id: |
59 | 40 | raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year')) | 42 | raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year')) |
60 | 41 | 43 | ||
61 | === modified file 'account/wizard/account_report_balance_sheet.py' | |||
62 | --- account/wizard/account_report_balance_sheet.py 2011-02-15 12:13:39 +0000 | |||
63 | +++ account/wizard/account_report_balance_sheet.py 2011-02-15 12:38:08 +0000 | |||
64 | @@ -65,7 +65,8 @@ | |||
65 | 65 | def _print_report(self, cr, uid, ids, data, context=None): | 65 | def _print_report(self, cr, uid, ids, data, context=None): |
66 | 66 | if context is None: | 66 | if context is None: |
67 | 67 | context = {} | 67 | context = {} |
69 | 68 | data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0]) | 68 | record = self.browse(cr, uid, ids, context=context)[0] |
70 | 69 | data['form'].update({'display_type':record.display_type, 'reserve_account_id':record.reserve_account_id.id}) | ||
71 | 69 | if not data['form']['reserve_account_id']: | 70 | if not data['form']['reserve_account_id']: |
72 | 70 | raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !')) | 71 | raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !')) |
73 | 71 | data = self.pre_print_report(cr, uid, ids, data, context=context) | 72 | data = self.pre_print_report(cr, uid, ids, data, context=context) |
74 | 72 | 73 | ||
75 | === modified file 'account/wizard/account_report_common.py' | |||
76 | --- account/wizard/account_report_common.py 2011-02-15 12:13:39 +0000 | |||
77 | +++ account/wizard/account_report_common.py 2011-02-15 12:38:08 +0000 | |||
78 | @@ -131,7 +131,10 @@ | |||
79 | 131 | data = {} | 131 | data = {} |
80 | 132 | data['ids'] = context.get('active_ids', []) | 132 | data['ids'] = context.get('active_ids', []) |
81 | 133 | data['model'] = context.get('active_model', 'ir.ui.menu') | 133 | data['model'] = context.get('active_model', 'ir.ui.menu') |
83 | 134 | data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'])[0] | 134 | data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'], context=context)[0] |
84 | 135 | for field in data['form'].keys(): | ||
85 | 136 | if isinstance(data['form'][field], tuple): | ||
86 | 137 | data['form'][field] = data['form'][field][0] | ||
87 | 135 | used_context = self._build_contexts(cr, uid, ids, data, context=context) | 138 | used_context = self._build_contexts(cr, uid, ids, data, context=context) |
88 | 136 | data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or [] | 139 | data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or [] |
89 | 137 | data['form']['used_context'] = used_context | 140 | data['form']['used_context'] = used_context |
90 | 138 | 141 | ||
91 | === modified file 'account/wizard/account_report_general_ledger.py' | |||
92 | --- account/wizard/account_report_general_ledger.py 2011-02-15 12:13:39 +0000 | |||
93 | +++ account/wizard/account_report_general_ledger.py 2011-02-15 12:38:08 +0000 | |||
94 | @@ -50,7 +50,7 @@ | |||
95 | 50 | if context is None: | 50 | if context is None: |
96 | 51 | context = {} | 51 | context = {} |
97 | 52 | data = self.pre_print_report(cr, uid, ids, data, context=context) | 52 | data = self.pre_print_report(cr, uid, ids, data, context=context) |
99 | 53 | data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby'])[0]) | 53 | data['form'].update(self.read(cr, uid, ids, ['landscape', 'initial_balance', 'amount_currency', 'sortby'], context=context)[0]) |
100 | 54 | if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record | 54 | if not data['form']['fiscalyear_id']:# GTK client problem onchange does not consider in save record |
101 | 55 | data['form'].update({'initial_balance': False}) | 55 | data['form'].update({'initial_balance': False}) |
102 | 56 | if data['form']['landscape']: | 56 | if data['form']['landscape']: |
103 | 57 | 57 | ||
104 | === modified file 'account/wizard/account_report_partner_balance.py' | |||
105 | --- account/wizard/account_report_partner_balance.py 2011-02-15 12:13:39 +0000 | |||
106 | +++ account/wizard/account_report_partner_balance.py 2011-02-15 12:38:08 +0000 | |||
107 | @@ -42,7 +42,7 @@ | |||
108 | 42 | if context is None: | 42 | if context is None: |
109 | 43 | context = {} | 43 | context = {} |
110 | 44 | data = self.pre_print_report(cr, uid, ids, data, context=context) | 44 | data = self.pre_print_report(cr, uid, ids, data, context=context) |
112 | 45 | data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0]) | 45 | data['form'].update(self.read(cr, uid, ids, ['display_partner'], context=context)[0]) |
113 | 46 | return { | 46 | return { |
114 | 47 | 'type': 'ir.actions.report.xml', | 47 | 'type': 'ir.actions.report.xml', |
115 | 48 | 'report_name': 'account.partner.balance', | 48 | 'report_name': 'account.partner.balance', |
116 | 49 | 49 | ||
117 | === modified file 'account/wizard/account_report_partner_ledger.py' | |||
118 | --- account/wizard/account_report_partner_ledger.py 2011-02-15 12:13:39 +0000 | |||
119 | +++ account/wizard/account_report_partner_ledger.py 2011-02-15 12:38:08 +0000 | |||
120 | @@ -47,7 +47,7 @@ | |||
121 | 47 | if context is None: | 47 | if context is None: |
122 | 48 | context = {} | 48 | context = {} |
123 | 49 | data = self.pre_print_report(cr, uid, ids, data, context=context) | 49 | data = self.pre_print_report(cr, uid, ids, data, context=context) |
125 | 50 | data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'])[0]) | 50 | data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'reconcil', 'page_split', 'amount_currency'], context=context)[0]) |
126 | 51 | if data['form']['page_split']: | 51 | if data['form']['page_split']: |
127 | 52 | return { | 52 | return { |
128 | 53 | 'type': 'ir.actions.report.xml', | 53 | 'type': 'ir.actions.report.xml', |
129 | 54 | 54 | ||
130 | === modified file 'account/wizard/account_report_profit_loss.py' | |||
131 | --- account/wizard/account_report_profit_loss.py 2011-02-15 12:13:39 +0000 | |||
132 | +++ account/wizard/account_report_profit_loss.py 2011-02-15 12:38:08 +0000 | |||
133 | @@ -42,7 +42,7 @@ | |||
134 | 42 | if context is None: | 42 | if context is None: |
135 | 43 | context = {} | 43 | context = {} |
136 | 44 | data = self.pre_print_report(cr, uid, ids, data, context=context) | 44 | data = self.pre_print_report(cr, uid, ids, data, context=context) |
138 | 45 | data['form'].update(self.read(cr, uid, ids, ['display_type'])[0]) | 45 | data['form'].update(self.read(cr, uid, ids, ['display_type'], context=context)[0]) |
139 | 46 | if data['form']['display_type']: | 46 | if data['form']['display_type']: |
140 | 47 | return { | 47 | return { |
141 | 48 | 'type': 'ir.actions.report.xml', | 48 | 'type': 'ir.actions.report.xml', |
142 | 49 | 49 | ||
143 | === modified file 'account/wizard/account_validate_account_move.py' | |||
144 | --- account/wizard/account_validate_account_move.py 2011-02-15 12:13:39 +0000 | |||
145 | +++ account/wizard/account_validate_account_move.py 2011-02-15 12:38:08 +0000 | |||
146 | @@ -34,6 +34,9 @@ | |||
147 | 34 | if context is None: | 34 | if context is None: |
148 | 35 | context = {} | 35 | context = {} |
149 | 36 | data = self.read(cr, uid, ids, context=context)[0] | 36 | data = self.read(cr, uid, ids, context=context)[0] |
150 | 37 | for field in data.keys(): | ||
151 | 38 | if isinstance(data[field], tuple): | ||
152 | 39 | data[field] = data[field][0] | ||
153 | 37 | ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])]) | 40 | ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])]) |
154 | 38 | if not ids_move: | 41 | if not ids_move: |
155 | 39 | raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period')) | 42 | raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period')) |
156 | 40 | 43 | ||
157 | === modified file 'account/wizard/account_vat.py' | |||
158 | --- account/wizard/account_vat.py 2011-02-15 12:13:39 +0000 | |||
159 | +++ account/wizard/account_vat.py 2011-02-15 12:38:08 +0000 | |||
160 | @@ -47,6 +47,9 @@ | |||
161 | 47 | datas = {'ids': context.get('active_ids', [])} | 47 | datas = {'ids': context.get('active_ids', [])} |
162 | 48 | datas['model'] = 'account.tax.code' | 48 | datas['model'] = 'account.tax.code' |
163 | 49 | datas['form'] = self.read(cr, uid, ids)[0] | 49 | datas['form'] = self.read(cr, uid, ids)[0] |
164 | 50 | for field in datas['form'].keys(): | ||
165 | 51 | if isinstance(datas['form'][field], tuple): | ||
166 | 52 | datas['form'][field] = datas['form'][field][0] | ||
167 | 50 | datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id | 53 | datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id |
168 | 51 | return { | 54 | return { |
169 | 52 | 'type': 'ir.actions.report.xml', | 55 | 'type': 'ir.actions.report.xml', |
170 | 53 | 56 | ||
171 | === modified file 'account_invoice_layout/i18n/hu.po' | |||
172 | --- account_invoice_layout/i18n/hu.po 2011-02-11 04:59:58 +0000 | |||
173 | +++ account_invoice_layout/i18n/hu.po 2011-02-15 12:38:08 +0000 | |||
174 | @@ -7,13 +7,13 @@ | |||
175 | 7 | "Project-Id-Version: OpenERP Server 6.0dev\n" | 7 | "Project-Id-Version: OpenERP Server 6.0dev\n" |
176 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
177 | 9 | "POT-Creation-Date: 2011-01-11 11:14+0000\n" | 9 | "POT-Creation-Date: 2011-01-11 11:14+0000\n" |
179 | 10 | "PO-Revision-Date: 2011-02-10 13:27+0000\n" | 10 | "PO-Revision-Date: 2011-02-09 12:16+0000\n" |
180 | 11 | "Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n" | 11 | "Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n" |
181 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
182 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
183 | 14 | "Content-Type: text/plain; charset=utf-8\n" | 14 | "Content-Type: text/plain; charset=utf-8\n" |
184 | 15 | "Content-Transfer-Encoding: 8bit\n" | 15 | "Content-Transfer-Encoding: 8bit\n" |
186 | 16 | "X-Launchpad-Export-Date: 2011-02-11 04:59+0000\n" | 16 | "X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n" |
187 | 17 | "X-Generator: Launchpad (build 12177)\n" | 17 | "X-Generator: Launchpad (build 12177)\n" |
188 | 18 | 18 | ||
189 | 19 | #. module: account_invoice_layout | 19 | #. module: account_invoice_layout |
190 | @@ -160,7 +160,7 @@ | |||
191 | 160 | #: report:account.invoice.layout:0 | 160 | #: report:account.invoice.layout:0 |
192 | 161 | #: report:notify_account.invoice:0 | 161 | #: report:notify_account.invoice:0 |
193 | 162 | msgid "Price" | 162 | msgid "Price" |
195 | 163 | msgstr "Nettó érték" | 163 | msgstr "Érték" |
196 | 164 | 164 | ||
197 | 165 | #. module: account_invoice_layout | 165 | #. module: account_invoice_layout |
198 | 166 | #: report:account.invoice.layout:0 | 166 | #: report:account.invoice.layout:0 |
199 | 167 | 167 | ||
200 | === modified file 'auction/wizard/auction_pay_sel.py' | |||
201 | --- auction/wizard/auction_pay_sel.py 2011-01-14 00:11:01 +0000 | |||
202 | +++ auction/wizard/auction_pay_sel.py 2011-02-15 12:38:08 +0000 | |||
203 | @@ -42,14 +42,14 @@ | |||
204 | 42 | @param context: A standard dictionary | 42 | @param context: A standard dictionary |
205 | 43 | @return: | 43 | @return: |
206 | 44 | """ | 44 | """ |
208 | 45 | if context is None: | 45 | if context is None: |
209 | 46 | context = {} | 46 | context = {} |
210 | 47 | lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context=context) | 47 | lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context=context) |
211 | 48 | invoice_obj = self.pool.get('account.invoice') | 48 | invoice_obj = self.pool.get('account.invoice') |
216 | 49 | for datas in self.read(cr, uid, ids, context=context): | 49 | for datas in self.browse(cr, uid, ids, context=context): |
217 | 50 | account_id = datas.get('writeoff_acc_id', False) | 50 | account_id = datas.dest_account_id and datas.dest_account_id.id or False |
218 | 51 | period_id = datas.get('period_id', False) | 51 | period_id = datas.period_id and datas.period_id.id or False |
219 | 52 | journal_id = datas.get('journal_id', False) | 52 | journal_id = datas.journal_id and datas.journal_id.id or False |
220 | 53 | if lot.sel_inv_id: | 53 | if lot.sel_inv_id: |
221 | 54 | p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context) | 54 | p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context) |
222 | 55 | return {'type': 'ir.actions.act_window_close'} | 55 | return {'type': 'ir.actions.act_window_close'} |
223 | 56 | 56 | ||
224 | === modified file 'board/wizard/board_menu_create.py' | |||
225 | --- board/wizard/board_menu_create.py 2011-02-09 07:18:57 +0000 | |||
226 | +++ board/wizard/board_menu_create.py 2011-02-15 12:38:08 +0000 | |||
227 | @@ -70,10 +70,10 @@ | |||
228 | 70 | }) | 70 | }) |
229 | 71 | obj_menu = self.pool.get('ir.ui.menu') | 71 | obj_menu = self.pool.get('ir.ui.menu') |
230 | 72 | #start Loop | 72 | #start Loop |
232 | 73 | for data in self.read(cr, uid, ids): | 73 | for data in self.browse(cr, uid, ids, context=context): |
233 | 74 | obj_menu.create(cr, uid, { | 74 | obj_menu.create(cr, uid, { |
236 | 75 | 'name': data.get('menu_name'), | 75 | 'name': data.menu_name, |
237 | 76 | 'parent_id': data.get('menu_parent_id'), | 76 | 'parent_id': data.menu_parent_id.id, |
238 | 77 | 'icon': 'STOCK_SELECT_COLOR', | 77 | 'icon': 'STOCK_SELECT_COLOR', |
239 | 78 | 'action': 'ir.actions.act_window,' + str(action_id) | 78 | 'action': 'ir.actions.act_window,' + str(action_id) |
240 | 79 | }, context=context) | 79 | }, context=context) |
241 | 80 | 80 | ||
242 | === modified file 'email_template/wizard/email_template_send_wizard.py' | |||
243 | --- email_template/wizard/email_template_send_wizard.py 2011-01-14 00:11:01 +0000 | |||
244 | +++ email_template/wizard/email_template_send_wizard.py 2011-02-15 12:38:08 +0000 | |||
245 | @@ -66,7 +66,7 @@ | |||
246 | 66 | if not id: | 66 | if not id: |
247 | 67 | id = context['src_rec_ids'][0] | 67 | id = context['src_rec_ids'][0] |
248 | 68 | return get_value(cursor, user, id, message, template, context) | 68 | return get_value(cursor, user, id, message, template, context) |
250 | 69 | 69 | ||
251 | 70 | def _get_template(self, cr, uid, context=None): | 70 | def _get_template(self, cr, uid, context=None): |
252 | 71 | if context is None: | 71 | if context is None: |
253 | 72 | context = {} | 72 | context = {} |
254 | @@ -116,13 +116,13 @@ | |||
255 | 116 | 'to':fields.char('To',size=250,required=True), | 116 | 'to':fields.char('To',size=250,required=True), |
256 | 117 | 'cc':fields.char('CC',size=250,), | 117 | 'cc':fields.char('CC',size=250,), |
257 | 118 | 'bcc':fields.char('BCC',size=250,), | 118 | 'bcc':fields.char('BCC',size=250,), |
260 | 119 | 'reply_to':fields.char('Reply-To', | 119 | 'reply_to':fields.char('Reply-To', |
261 | 120 | size=250, | 120 | size=250, |
262 | 121 | help="The address recipients should reply to," | 121 | help="The address recipients should reply to," |
263 | 122 | " if different from the From address." | 122 | " if different from the From address." |
264 | 123 | " Placeholders can be used here."), | 123 | " Placeholders can be used here."), |
267 | 124 | 'message_id':fields.char('Message-ID', | 124 | 'message_id':fields.char('Message-ID', |
268 | 125 | size=250, | 125 | size=250, |
269 | 126 | help="The Message-ID header value, if you need to" | 126 | help="The Message-ID header value, if you need to" |
270 | 127 | "specify it, for example to automatically recognize the replies later." | 127 | "specify it, for example to automatically recognize the replies later." |
271 | 128 | " Placeholders can be used here."), | 128 | " Placeholders can be used here."), |
272 | @@ -133,12 +133,12 @@ | |||
273 | 133 | 'signature':fields.boolean('Attach my signature to mail'), | 133 | 'signature':fields.boolean('Attach my signature to mail'), |
274 | 134 | #'filename':fields.text('File Name'), | 134 | #'filename':fields.text('File Name'), |
275 | 135 | 'requested':fields.integer('No of requested Mails',readonly=True), | 135 | 'requested':fields.integer('No of requested Mails',readonly=True), |
277 | 136 | 'generated':fields.integer('No of generated Mails',readonly=True), | 136 | 'generated':fields.integer('No of generated Mails',readonly=True), |
278 | 137 | 'full_success':fields.boolean('Complete Success',readonly=True), | 137 | 'full_success':fields.boolean('Complete Success',readonly=True), |
279 | 138 | 'attachment_ids': fields.many2many('ir.attachment','send_wizard_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'), | 138 | 'attachment_ids': fields.many2many('ir.attachment','send_wizard_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'), |
280 | 139 | } | 139 | } |
281 | 140 | 140 | ||
283 | 141 | #FIXME: probably better by overriding default_get directly | 141 | #FIXME: probably better by overriding default_get directly |
284 | 142 | _defaults = { | 142 | _defaults = { |
285 | 143 | 'state': lambda self,cr,uid,ctx: len(ctx['src_rec_ids']) > 1 and 'multi' or 'single', | 143 | 'state': lambda self,cr,uid,ctx: len(ctx['src_rec_ids']) > 1 and 'multi' or 'single', |
286 | 144 | 'rel_model': lambda self,cr,uid,ctx: self.pool.get('ir.model').search(cr,uid,[('model','=',ctx['src_model'])],context=ctx)[0], | 144 | 'rel_model': lambda self,cr,uid,ctx: self.pool.get('ir.model').search(cr,uid,[('model','=',ctx['src_model'])],context=ctx)[0], |
287 | @@ -156,7 +156,7 @@ | |||
288 | 156 | 'reply_to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'reply_to', ctx), | 156 | 'reply_to': lambda self,cr,uid,ctx: self._get_template_value(cr, uid, 'reply_to', ctx), |
289 | 157 | 'requested':lambda self,cr,uid,ctx: len(ctx['src_rec_ids']), | 157 | 'requested':lambda self,cr,uid,ctx: len(ctx['src_rec_ids']), |
290 | 158 | 'full_success': False, | 158 | 'full_success': False, |
292 | 159 | 'attachment_ids': [], | 159 | 'attachment_ids': [], |
293 | 160 | } | 160 | } |
294 | 161 | 161 | ||
295 | 162 | def fields_get(self, cr, uid, fields=None, context=None, write_access=True): | 162 | def fields_get(self, cr, uid, fields=None, context=None, write_access=True): |
296 | @@ -200,7 +200,7 @@ | |||
297 | 200 | else: | 200 | else: |
298 | 201 | raise osv.except_osv(_("Email Template"),_("Email sending failed for one or more objects.")) | 201 | raise osv.except_osv(_("Email Template"),_("Email sending failed for one or more objects.")) |
299 | 202 | return True | 202 | return True |
301 | 203 | 203 | ||
302 | 204 | def save_to_mailbox(self, cr, uid, ids, context=None): | 204 | def save_to_mailbox(self, cr, uid, ids, context=None): |
303 | 205 | def get_end_value(id, value): | 205 | def get_end_value(id, value): |
304 | 206 | if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets value from the template | 206 | if len(context['src_rec_ids']) > 1: # Multiple Mail: Gets value from the template |
305 | @@ -213,7 +213,7 @@ | |||
306 | 213 | mail_ids = [] | 213 | mail_ids = [] |
307 | 214 | template = self._get_template(cr, uid, context) | 214 | template = self._get_template(cr, uid, context) |
308 | 215 | for id in context['src_rec_ids']: | 215 | for id in context['src_rec_ids']: |
310 | 216 | screen_vals = self.read(cr, uid, ids[0], [],context) | 216 | screen_vals = self.read(cr, uid, ids[0], [],context=context) |
311 | 217 | account = self.pool.get('email_template.account').read(cr, uid, screen_vals['from'], context=context) | 217 | account = self.pool.get('email_template.account').read(cr, uid, screen_vals['from'], context=context) |
312 | 218 | vals = { | 218 | vals = { |
313 | 219 | 'email_from': tools.ustr(account['name']) + "<" + tools.ustr(account['email_id']) + ">", | 219 | 'email_from': tools.ustr(account['name']) + "<" + tools.ustr(account['email_id']) + ">", |
314 | 220 | 220 | ||
315 | === modified file 'hr_timesheet/i18n/pt_BR.po' | |||
316 | --- hr_timesheet/i18n/pt_BR.po 2011-02-11 04:59:58 +0000 | |||
317 | +++ hr_timesheet/i18n/pt_BR.po 2011-02-15 12:38:08 +0000 | |||
318 | @@ -14,7 +14,7 @@ | |||
319 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
320 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
321 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
323 | 17 | "X-Launchpad-Export-Date: 2011-02-11 04:59+0000\n" | 17 | "X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n" |
324 | 18 | "X-Generator: Launchpad (build 12177)\n" | 18 | "X-Generator: Launchpad (build 12177)\n" |
325 | 19 | 19 | ||
326 | 20 | #. module: hr_timesheet | 20 | #. module: hr_timesheet |
327 | 21 | 21 | ||
328 | === modified file 'hr_timesheet/wizard/hr_timesheet_print_employee.py' | |||
329 | --- hr_timesheet/wizard/hr_timesheet_print_employee.py 2011-01-14 00:11:01 +0000 | |||
330 | +++ hr_timesheet/wizard/hr_timesheet_print_employee.py 2011-02-15 12:38:08 +0000 | |||
331 | @@ -31,7 +31,7 @@ | |||
332 | 31 | 'Month', required=True), | 31 | 'Month', required=True), |
333 | 32 | 'year': fields.integer('Year', required=True), | 32 | 'year': fields.integer('Year', required=True), |
334 | 33 | 'employee_id': fields.many2one('hr.employee', 'Employee', required=True) | 33 | 'employee_id': fields.many2one('hr.employee', 'Employee', required=True) |
336 | 34 | 34 | ||
337 | 35 | } | 35 | } |
338 | 36 | 36 | ||
339 | 37 | def _get_user(self, cr, uid, context=None): | 37 | def _get_user(self, cr, uid, context=None): |
340 | @@ -50,6 +50,8 @@ | |||
341 | 50 | 50 | ||
342 | 51 | def print_report(self, cr, uid, ids, context=None): | 51 | def print_report(self, cr, uid, ids, context=None): |
343 | 52 | data = self.read(cr, uid, ids, context=context)[0] | 52 | data = self.read(cr, uid, ids, context=context)[0] |
344 | 53 | if isinstance(data['employee_id'], tuple): | ||
345 | 54 | data['employee_id'] = data['employee_id'][0] | ||
346 | 53 | datas = { | 55 | datas = { |
347 | 54 | 'ids': [], | 56 | 'ids': [], |
348 | 55 | 'model': 'hr.employee', | 57 | 'model': 'hr.employee', |
349 | 56 | 58 | ||
350 | === modified file 'hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py' | |||
351 | --- hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py 2011-01-14 00:11:01 +0000 | |||
352 | +++ hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py 2011-02-15 12:38:08 +0000 | |||
353 | @@ -59,6 +59,9 @@ | |||
354 | 59 | res = mod_obj.read(cr, uid, result, ['res_id'], context=context) | 59 | res = mod_obj.read(cr, uid, result, ['res_id'], context=context) |
355 | 60 | 60 | ||
356 | 61 | data = self.read(cr, uid, ids, [], context=context)[0] | 61 | data = self.read(cr, uid, ids, [], context=context)[0] |
357 | 62 | if isinstance(data['balance_product'], tuple): | ||
358 | 63 | data['balance_product'] = data['balance_product'][0] | ||
359 | 64 | |||
360 | 62 | account_ids = 'active_ids' in context and context['active_ids'] or [] | 65 | account_ids = 'active_ids' in context and context['active_ids'] or [] |
361 | 63 | 66 | ||
362 | 64 | for account in analytic_account_obj.browse(cr, uid, account_ids, context=context): | 67 | for account in analytic_account_obj.browse(cr, uid, account_ids, context=context): |
363 | 65 | 68 | ||
364 | === modified file 'mrp/i18n/es_AR.po' | |||
365 | --- mrp/i18n/es_AR.po 2011-02-12 05:00:59 +0000 | |||
366 | +++ mrp/i18n/es_AR.po 2011-02-15 12:38:08 +0000 | |||
367 | @@ -7,14 +7,13 @@ | |||
368 | 7 | "Project-Id-Version: OpenERP Server 5.0.0\n" | 7 | "Project-Id-Version: OpenERP Server 5.0.0\n" |
369 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" |
370 | 9 | "POT-Creation-Date: 2011-01-11 11:15+0000\n" | 9 | "POT-Creation-Date: 2011-01-11 11:15+0000\n" |
372 | 10 | "PO-Revision-Date: 2011-02-11 22:02+0000\n" | 10 | "PO-Revision-Date: 2011-02-06 16:11+0000\n" |
373 | 11 | "Last-Translator: jpdborgna <Unknown>\n" | 11 | "Last-Translator: jpdborgna <Unknown>\n" |
374 | 12 | "Language-Team: \n" | 12 | "Language-Team: \n" |
375 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
376 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 14 | "Content-Type: text/plain; charset=UTF-8\n" |
377 | 15 | "Content-Transfer-Encoding: 8bit\n" | 15 | "Content-Transfer-Encoding: 8bit\n" |
380 | 16 | "X-Launchpad-Export-Date: 2011-02-12 05:00+0000\n" | 16 | "X-Launchpad-Export-Date: 2011-02-07 05:19+0000\n" |
379 | 17 | "X-Generator: Launchpad (build 12351)\n" | ||
381 | 18 | 17 | ||
382 | 19 | #. module: mrp | 18 | #. module: mrp |
383 | 20 | #: field:mrp.production,move_created_ids:0 | 19 | #: field:mrp.production,move_created_ids:0 |
384 | 21 | 20 | ||
385 | === modified file 'mrp/wizard/mrp_product_produce.py' | |||
386 | --- mrp/wizard/mrp_product_produce.py 2011-01-14 00:11:01 +0000 | |||
387 | +++ mrp/wizard/mrp_product_produce.py 2011-02-15 12:38:08 +0000 | |||
388 | @@ -70,10 +70,10 @@ | |||
389 | 70 | context = {} | 70 | context = {} |
390 | 71 | prod_obj = self.pool.get('mrp.production') | 71 | prod_obj = self.pool.get('mrp.production') |
391 | 72 | move_ids = context.get('active_ids', []) | 72 | move_ids = context.get('active_ids', []) |
393 | 73 | for data in self.read(cr, uid, ids, context=context): | 73 | for data in self.browse(cr, uid, ids, context=context): |
394 | 74 | for move_id in move_ids: | 74 | for move_id in move_ids: |
395 | 75 | prod_obj.action_produce(cr, uid, move_id, | 75 | prod_obj.action_produce(cr, uid, move_id, |
397 | 76 | data['product_qty'], data['mode'], context=context) | 76 | data.product_qty, data.mode, context=context) |
398 | 77 | return {} | 77 | return {} |
399 | 78 | 78 | ||
400 | 79 | mrp_product_produce() | 79 | mrp_product_produce() |
401 | 80 | 80 | ||
402 | === modified file 'pad/__openerp__.py' | |||
403 | --- pad/__openerp__.py 2011-02-10 16:10:42 +0000 | |||
404 | +++ pad/__openerp__.py 2011-02-15 12:38:08 +0000 | |||
405 | @@ -1,7 +1,7 @@ | |||
406 | 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
407 | 2 | { | 2 | { |
408 | 3 | 'name': 'Enhanced support for (Ether)Pad attachments', | 3 | 'name': 'Enhanced support for (Ether)Pad attachments', |
410 | 4 | 'version': '1.0.3', | 4 | 'version': '1.0.2', |
411 | 5 | 'category': 'Generic Modules/Others', | 5 | 'category': 'Generic Modules/Others', |
412 | 6 | 'description': """ | 6 | 'description': """ |
413 | 7 | Adds enhanced support for (Ether)Pad attachments in the web client, lets the | 7 | Adds enhanced support for (Ether)Pad attachments in the web client, lets the |
414 | 8 | 8 | ||
415 | === modified file 'point_of_sale/i18n/pt_BR.po' | |||
416 | --- point_of_sale/i18n/pt_BR.po 2011-02-11 04:59:58 +0000 | |||
417 | +++ point_of_sale/i18n/pt_BR.po 2011-02-15 12:38:08 +0000 | |||
418 | @@ -13,7 +13,7 @@ | |||
419 | 13 | "MIME-Version: 1.0\n" | 13 | "MIME-Version: 1.0\n" |
420 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | 14 | "Content-Type: text/plain; charset=UTF-8\n" |
421 | 15 | "Content-Transfer-Encoding: 8bit\n" | 15 | "Content-Transfer-Encoding: 8bit\n" |
423 | 16 | "X-Launchpad-Export-Date: 2011-02-11 04:59+0000\n" | 16 | "X-Launchpad-Export-Date: 2011-02-10 04:35+0000\n" |
424 | 17 | "X-Generator: Launchpad (build 12177)\n" | 17 | "X-Generator: Launchpad (build 12177)\n" |
425 | 18 | 18 | ||
426 | 19 | #. module: point_of_sale | 19 | #. module: point_of_sale |
427 | 20 | 20 | ||
428 | === modified file 'project_scrum/wizard/project_scrum_backlog_create_task.py' | |||
429 | --- project_scrum/wizard/project_scrum_backlog_create_task.py 2011-01-14 00:11:01 +0000 | |||
430 | +++ project_scrum/wizard/project_scrum_backlog_create_task.py 2011-02-15 12:38:08 +0000 | |||
431 | @@ -34,7 +34,9 @@ | |||
432 | 34 | document_pool = self.pool.get('ir.attachment') | 34 | document_pool = self.pool.get('ir.attachment') |
433 | 35 | ids_task = [] | 35 | ids_task = [] |
434 | 36 | 36 | ||
436 | 37 | data = self.read(cr, uid, ids, [], context=context)[0] | 37 | record = self.browse(cr, uid, ids, context=context)[0] |
437 | 38 | user = record.user_id and record.user_id.id or False | ||
438 | 39 | |||
439 | 38 | backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context) | 40 | backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context) |
440 | 39 | result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form') | 41 | result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form') |
441 | 40 | id = mod_obj.read(cr, uid, result, ['res_id']) | 42 | id = mod_obj.read(cr, uid, result, ['res_id']) |
442 | @@ -45,7 +47,7 @@ | |||
443 | 45 | 'name': backlog.name, | 47 | 'name': backlog.name, |
444 | 46 | 'description': backlog.note, | 48 | 'description': backlog.note, |
445 | 47 | 'project_id': backlog.project_id.id, | 49 | 'project_id': backlog.project_id.id, |
447 | 48 | 'user_id': data['user_id'] or False, | 50 | 'user_id': user, |
448 | 49 | 'planned_hours': backlog.expected_hours, | 51 | 'planned_hours': backlog.expected_hours, |
449 | 50 | 'remaining_hours':backlog.expected_hours, | 52 | 'remaining_hours':backlog.expected_hours, |
450 | 51 | 'sequence':backlog.sequence, | 53 | 'sequence':backlog.sequence, |
451 | 52 | 54 | ||
452 | === modified file 'project_scrum/wizard/project_scrum_backlog_sprint.py' | |||
453 | --- project_scrum/wizard/project_scrum_backlog_sprint.py 2011-01-14 00:11:01 +0000 | |||
454 | +++ project_scrum/wizard/project_scrum_backlog_sprint.py 2011-02-15 12:38:08 +0000 | |||
455 | @@ -42,6 +42,9 @@ | |||
456 | 42 | if context is None: | 42 | if context is None: |
457 | 43 | context = {} | 43 | context = {} |
458 | 44 | data = self.read(cr, uid, ids, [], context=context)[0] | 44 | data = self.read(cr, uid, ids, [], context=context)[0] |
459 | 45 | if isinstance(data['sprint_id'], tuple): | ||
460 | 46 | data['sprint_id'] = data['sprint_id'][0] | ||
461 | 47 | |||
462 | 45 | for backlog in backlog_obj.browse(cr, uid, context['active_ids'], context=context): | 48 | for backlog in backlog_obj.browse(cr, uid, context['active_ids'], context=context): |
463 | 46 | backlog_ids.append(backlog.id) | 49 | backlog_ids.append(backlog.id) |
464 | 47 | if data['convert_to_task']: | 50 | if data['convert_to_task']: |
465 | 48 | 51 | ||
466 | === modified file 'purchase/purchase.py' | |||
467 | --- purchase/purchase.py 2011-02-15 05:48:34 +0000 | |||
468 | +++ purchase/purchase.py 2011-02-15 12:38:08 +0000 | |||
469 | @@ -665,7 +665,6 @@ | |||
470 | 665 | 'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}} | 665 | 'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}} |
471 | 666 | res = {} | 666 | res = {} |
472 | 667 | prod= self.pool.get('product.product').browse(cr, uid, product) | 667 | prod= self.pool.get('product.product').browse(cr, uid, product) |
473 | 668 | |||
474 | 669 | product_uom_pool = self.pool.get('product.uom') | 668 | product_uom_pool = self.pool.get('product.uom') |
475 | 670 | lang=False | 669 | lang=False |
476 | 671 | if partner_id: | 670 | if partner_id: |
477 | @@ -681,6 +680,11 @@ | |||
478 | 681 | date_order = time.strftime('%Y-%m-%d') | 680 | date_order = time.strftime('%Y-%m-%d') |
479 | 682 | qty = qty or 1.0 | 681 | qty = qty or 1.0 |
480 | 683 | seller_delay = 0 | 682 | seller_delay = 0 |
481 | 683 | if uom: | ||
482 | 684 | uom1_cat = prod.uom_id.category_id.id | ||
483 | 685 | uom2_cat = product_uom_pool.browse(cr, uid, uom).category_id.id | ||
484 | 686 | if uom1_cat != uom2_cat: | ||
485 | 687 | uom = False | ||
486 | 684 | 688 | ||
487 | 685 | prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1] | 689 | prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1] |
488 | 686 | res = {} | 690 | res = {} |
489 | @@ -707,14 +711,13 @@ | |||
490 | 707 | 'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id), | 711 | 'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id), |
491 | 708 | 'date_planned': date_planned or dt,'notes': notes or prod.description_purchase, | 712 | 'date_planned': date_planned or dt,'notes': notes or prod.description_purchase, |
492 | 709 | 'product_qty': qty, | 713 | 'product_qty': qty, |
494 | 710 | 'product_uom': uom}}) | 714 | 'product_uom': prod.uom_id.id}}) |
495 | 711 | domain = {} | 715 | domain = {} |
496 | 712 | 716 | ||
497 | 713 | taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id)) | 717 | taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id)) |
498 | 714 | fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False | 718 | fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False |
499 | 715 | res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes) | 719 | res['value']['taxes_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes) |
502 | 716 | 720 | res2 = self.pool.get('product.uom').read(cr, uid, [prod.uom_id.id], ['category_id']) | |
501 | 717 | res2 = self.pool.get('product.uom').read(cr, uid, [uom], ['category_id']) | ||
503 | 718 | res3 = prod.uom_id.category_id.id | 721 | res3 = prod.uom_id.category_id.id |
504 | 719 | domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]} | 722 | domain = {'product_uom':[('category_id','=',res2[0]['category_id'][0])]} |
505 | 720 | if res2[0]['category_id'][0] != res3: | 723 | if res2[0]['category_id'][0] != res3: |
506 | 721 | 724 | ||
507 | === modified file 'purchase_requisition/wizard/purchase_requisition_partner.py' | |||
508 | --- purchase_requisition/wizard/purchase_requisition_partner.py 2011-01-14 00:11:01 +0000 | |||
509 | +++ purchase_requisition/wizard/purchase_requisition_partner.py 2011-02-15 12:38:08 +0000 | |||
510 | @@ -67,19 +67,18 @@ | |||
511 | 67 | context = {} | 67 | context = {} |
512 | 68 | record_ids = context and context.get('active_ids', False) | 68 | record_ids = context and context.get('active_ids', False) |
513 | 69 | if record_ids: | 69 | if record_ids: |
515 | 70 | data = self.read(cr, uid, ids) | 70 | data = self.browse(cr, uid, ids, context=context)[0] |
516 | 71 | |||
517 | 71 | company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id | 72 | company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id |
518 | 72 | order_obj = self.pool.get('purchase.order') | 73 | order_obj = self.pool.get('purchase.order') |
519 | 73 | order_line_obj = self.pool.get('purchase.order.line') | 74 | order_line_obj = self.pool.get('purchase.order.line') |
520 | 74 | partner_obj = self.pool.get('res.partner') | 75 | partner_obj = self.pool.get('res.partner') |
521 | 75 | tender_line_obj = self.pool.get('purchase.requisition.line') | ||
522 | 76 | pricelist_obj = self.pool.get('product.pricelist') | 76 | pricelist_obj = self.pool.get('product.pricelist') |
523 | 77 | prod_obj = self.pool.get('product.product') | 77 | prod_obj = self.pool.get('product.product') |
524 | 78 | tender_obj = self.pool.get('purchase.requisition') | 78 | tender_obj = self.pool.get('purchase.requisition') |
525 | 79 | acc_pos_obj = self.pool.get('account.fiscal.position') | 79 | acc_pos_obj = self.pool.get('account.fiscal.position') |
529 | 80 | partner_id = data[0]['partner_id'] | 80 | partner_id = data.partner_id and data.partner_id.id or False |
530 | 81 | 81 | supplier_data = data.partner_id | |
528 | 82 | supplier_data = partner_obj.browse(cr, uid, partner_id, context=context) | ||
531 | 83 | 82 | ||
532 | 84 | address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery'] | 83 | address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery'] |
533 | 85 | list_line=[] | 84 | list_line=[] |
534 | 86 | 85 | ||
535 | === modified file 'stock/i18n/stock.pot' | |||
536 | --- stock/i18n/stock.pot 2011-01-14 00:11:01 +0000 | |||
537 | +++ stock/i18n/stock.pot 2011-02-15 12:38:08 +0000 | |||
538 | @@ -1114,7 +1114,6 @@ | |||
539 | 1114 | #: view:stock.invoice.onshipping:0 | 1114 | #: view:stock.invoice.onshipping:0 |
540 | 1115 | #: view:stock.location.product:0 | 1115 | #: view:stock.location.product:0 |
541 | 1116 | #: view:stock.move:0 | 1116 | #: view:stock.move:0 |
542 | 1117 | #: view:stock.move.track:0 | ||
543 | 1118 | #: view:stock.picking:0 | 1117 | #: view:stock.picking:0 |
544 | 1119 | #: view:stock.split.into:0 | 1118 | #: view:stock.split.into:0 |
545 | 1120 | msgid "_Cancel" | 1119 | msgid "_Cancel" |
546 | @@ -1693,7 +1692,6 @@ | |||
547 | 1693 | msgstr "" | 1692 | msgstr "" |
548 | 1694 | 1693 | ||
549 | 1695 | #. module: stock | 1694 | #. module: stock |
550 | 1696 | #: field:stock.move.track,quantity:0 | ||
551 | 1697 | msgid "Quantity per lot" | 1695 | msgid "Quantity per lot" |
552 | 1698 | msgstr "" | 1696 | msgstr "" |
553 | 1699 | 1697 | ||
554 | @@ -1920,7 +1918,6 @@ | |||
555 | 1920 | 1918 | ||
556 | 1921 | #. module: stock | 1919 | #. module: stock |
557 | 1922 | #: model:ir.actions.act_window,name:stock.track_line_old | 1920 | #: model:ir.actions.act_window,name:stock.track_line_old |
558 | 1923 | #: view:stock.move.track:0 | ||
559 | 1924 | msgid "Tracking a move" | 1921 | msgid "Tracking a move" |
560 | 1925 | msgstr "" | 1922 | msgstr "" |
561 | 1926 | 1923 | ||
562 | @@ -2461,7 +2458,6 @@ | |||
563 | 2461 | msgstr "" | 2458 | msgstr "" |
564 | 2462 | 2459 | ||
565 | 2463 | #. module: stock | 2460 | #. module: stock |
566 | 2464 | #: field:stock.move.track,tracking_prefix:0 | ||
567 | 2465 | msgid "Tracking prefix" | 2461 | msgid "Tracking prefix" |
568 | 2466 | msgstr "" | 2462 | msgstr "" |
569 | 2467 | 2463 | ||
570 | @@ -2901,7 +2897,6 @@ | |||
571 | 2901 | #: view:stock.move.consume:0 | 2897 | #: view:stock.move.consume:0 |
572 | 2902 | #: view:stock.move.scrap:0 | 2898 | #: view:stock.move.scrap:0 |
573 | 2903 | #: view:stock.move.split:0 | 2899 | #: view:stock.move.split:0 |
574 | 2904 | #: view:stock.move.track:0 | ||
575 | 2905 | #: view:stock.split.into:0 | 2900 | #: view:stock.split.into:0 |
576 | 2906 | msgid "Ok" | 2901 | msgid "Ok" |
577 | 2907 | msgstr "" | 2902 | msgstr "" |
578 | 2908 | 2903 | ||
579 | === modified file 'stock/wizard/stock_move.py' | |||
580 | --- stock/wizard/stock_move.py 2011-02-15 12:13:39 +0000 | |||
581 | +++ stock/wizard/stock_move.py 2011-02-15 12:38:08 +0000 | |||
582 | @@ -21,35 +21,6 @@ | |||
583 | 21 | 21 | ||
584 | 22 | from osv import fields, osv | 22 | from osv import fields, osv |
585 | 23 | 23 | ||
586 | 24 | class stock_move_track(osv.osv_memory): | ||
587 | 25 | _name = "stock.move.track" | ||
588 | 26 | _description = "Track moves" | ||
589 | 27 | |||
590 | 28 | _columns = { | ||
591 | 29 | 'tracking_prefix': fields.char('Tracking prefix', size=64), | ||
592 | 30 | 'quantity': fields.float("Quantity per lot") | ||
593 | 31 | } | ||
594 | 32 | |||
595 | 33 | _defaults = { | ||
596 | 34 | 'quantity': lambda *x: 1 | ||
597 | 35 | } | ||
598 | 36 | |||
599 | 37 | def track_lines(self, cr, uid, ids, context=None): | ||
600 | 38 | """ To track stock moves lines | ||
601 | 39 | @param self: The object pointer. | ||
602 | 40 | @param cr: A database cursor | ||
603 | 41 | @param uid: ID of the user currently logged in | ||
604 | 42 | @param ids: An ID or list of IDs if we want more than one | ||
605 | 43 | @param context: A standard dictionary | ||
606 | 44 | @return: | ||
607 | 45 | """ | ||
608 | 46 | datas = self.read(cr, uid, ids)[0] | ||
609 | 47 | move_obj = self.pool.get('stock.move') | ||
610 | 48 | move_obj._track_lines(cr, uid, context['active_id'], datas, context=context) | ||
611 | 49 | return {'type': 'ir.actions.act_window_close'} | ||
612 | 50 | |||
613 | 51 | stock_move_track() | ||
614 | 52 | |||
615 | 53 | class stock_move_consume(osv.osv_memory): | 24 | class stock_move_consume(osv.osv_memory): |
616 | 54 | _name = "stock.move.consume" | 25 | _name = "stock.move.consume" |
617 | 55 | _description = "Consume Products" | 26 | _description = "Consume Products" |
618 | 56 | 27 | ||
619 | === modified file 'stock/wizard/stock_move_view.xml' | |||
620 | --- stock/wizard/stock_move_view.xml 2011-01-14 00:11:01 +0000 | |||
621 | +++ stock/wizard/stock_move_view.xml 2011-02-15 12:38:08 +0000 | |||
622 | @@ -2,34 +2,6 @@ | |||
623 | 2 | <openerp> | 2 | <openerp> |
624 | 3 | <data> | 3 | <data> |
625 | 4 | 4 | ||
626 | 5 | <record id="view_stock_move_track_wizard" model="ir.ui.view"> | ||
627 | 6 | <field name="name">Tracking a move</field> | ||
628 | 7 | <field name="model">stock.move.track</field> | ||
629 | 8 | <field name="type">form</field> | ||
630 | 9 | <field name="arch" type="xml"> | ||
631 | 10 | <form string="Tracking a move"> | ||
632 | 11 | <field name="tracking_prefix" colspan="4"/> | ||
633 | 12 | <field name="quantity" colspan="4"/> | ||
634 | 13 | <newline/> | ||
635 | 14 | <separator string="" colspan="4" /> | ||
636 | 15 | <button icon='gtk-cancel' special="cancel" | ||
637 | 16 | string="_Cancel" /> | ||
638 | 17 | <button name="track_lines" string="Ok" | ||
639 | 18 | type="object" icon="gtk-ok" /> | ||
640 | 19 | </form> | ||
641 | 20 | </field> | ||
642 | 21 | </record> | ||
643 | 22 | |||
644 | 23 | <record id="track_line_old" model="ir.actions.act_window"> | ||
645 | 24 | <field name="name">Tracking a move</field> | ||
646 | 25 | <field name="type">ir.actions.act_window</field> | ||
647 | 26 | <field name="res_model">stock.move.track</field> | ||
648 | 27 | <field name="view_type">form</field> | ||
649 | 28 | <field name="view_mode">form</field> | ||
650 | 29 | <field name="target">new</field> | ||
651 | 30 | </record> | ||
652 | 31 | |||
653 | 32 | |||
654 | 33 | <!-- Consume, scrap move --> | 5 | <!-- Consume, scrap move --> |
655 | 34 | 6 | ||
656 | 35 | <record id="view_stock_move_consume_wizard" model="ir.ui.view"> | 7 | <record id="view_stock_move_consume_wizard" model="ir.ui.view"> |
657 | 36 | 8 | ||
658 | === modified file 'stock/wizard/stock_split_move.py' | |||
659 | --- stock/wizard/stock_split_move.py 2011-02-09 07:18:57 +0000 | |||
660 | +++ stock/wizard/stock_split_move.py 2011-02-15 12:38:08 +0000 | |||
661 | @@ -107,7 +107,7 @@ | |||
662 | 107 | record_id = context and context.get('active_id', False) or False | 107 | record_id = context and context.get('active_id', False) or False |
663 | 108 | pick_obj = self.pool.get('stock.picking') | 108 | pick_obj = self.pool.get('stock.picking') |
664 | 109 | pick = pick_obj.browse(cr, uid, record_id, context=context) | 109 | pick = pick_obj.browse(cr, uid, record_id, context=context) |
666 | 110 | data = self.read(cr, uid, ids[0]) | 110 | data = self.read(cr, uid, ids[0], context=context) |
667 | 111 | for move in pick.move_lines: | 111 | for move in pick.move_lines: |
668 | 112 | quantity = data['move%s' % move.id] | 112 | quantity = data['move%s' % move.id] |
669 | 113 | if 0 < quantity < move.product_qty: | 113 | if 0 < quantity < move.product_qty: |
670 | 114 | 114 | ||
671 | === modified file 'survey/wizard/survey_browse_answer.py' | |||
672 | --- survey/wizard/survey_browse_answer.py 2011-02-09 07:18:57 +0000 | |||
673 | +++ survey/wizard/survey_browse_answer.py 2011-02-15 12:38:08 +0000 | |||
674 | @@ -61,14 +61,13 @@ | |||
675 | 61 | @return : Dictionary value for Open the browse answer wizard. | 61 | @return : Dictionary value for Open the browse answer wizard. |
676 | 62 | """ | 62 | """ |
677 | 63 | if context is None: context = {} | 63 | if context is None: context = {} |
686 | 64 | record = self.read(cr, uid, ids, []) | 64 | sur_response_obj = self.pool.get('survey.response') |
687 | 65 | record = record and record[0] or {} | 65 | for record in self.browse(cr, uid, ids,context=context): |
688 | 66 | if record['response_id']: | 66 | if record.response_id.id: |
689 | 67 | res_id = [(record['response_id'])] | 67 | res_id = record.response_id.id |
690 | 68 | else: | 68 | else: |
691 | 69 | sur_response_obj = self.pool.get('survey.response') | 69 | res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',record.survey_id)])[0] |
692 | 70 | res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))]) | 70 | context.update({'active' : True,'survey_id' : record.survey_id, 'response_id' : [res_id], 'response_no' : 0}) |
685 | 71 | context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0}) | ||
693 | 72 | search_obj = self.pool.get('ir.ui.view') | 71 | search_obj = self.pool.get('ir.ui.view') |
694 | 73 | search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')]) | 72 | search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')]) |
695 | 74 | return { | 73 | return { |
696 | 75 | 74 | ||
697 | === modified file 'survey/wizard/survey_print.py' | |||
698 | --- survey/wizard/survey_print.py 2011-02-09 07:18:57 +0000 | |||
699 | +++ survey/wizard/survey_print.py 2011-02-15 12:38:08 +0000 | |||
700 | @@ -55,10 +55,9 @@ | |||
701 | 55 | @param context: A standard dictionary for contextual values | 55 | @param context: A standard dictionary for contextual values |
702 | 56 | @return : Dictionary value for print survey form. | 56 | @return : Dictionary value for print survey form. |
703 | 57 | """ | 57 | """ |
706 | 58 | 58 | datas = {'ids' : self.read(cr, uid, ids, ['survey_ids'], context=context)[0]['survey_ids']} | |
705 | 59 | datas = {'ids' : self.read(cr, uid, ids, [], context)[0]['survey_ids']} | ||
707 | 60 | res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size',\ | 59 | res = self.read(cr, uid, ids, ['survey_title', 'orientation', 'paper_size',\ |
709 | 61 | 'page_number', 'without_pagebreak'], context) | 60 | 'page_number', 'without_pagebreak'], context=context) |
710 | 62 | res = res and res[0] or {} | 61 | res = res and res[0] or {} |
711 | 63 | datas['form'] = res | 62 | datas['form'] = res |
712 | 64 | datas['model'] = 'survey.print' | 63 | datas['model'] = 'survey.print' |
713 | 65 | 64 | ||
714 | === modified file 'survey/wizard/survey_print_answer.py' | |||
715 | --- survey/wizard/survey_print_answer.py 2011-02-09 07:18:57 +0000 | |||
716 | +++ survey/wizard/survey_print_answer.py 2011-02-15 12:38:08 +0000 | |||
717 | @@ -59,7 +59,7 @@ | |||
718 | 59 | context = {} | 59 | context = {} |
719 | 60 | datas = {'ids': context.get('active_ids', [])} | 60 | datas = {'ids': context.get('active_ids', [])} |
720 | 61 | res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size',\ | 61 | res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size',\ |
722 | 62 | 'page_number', 'without_pagebreak'], context) | 62 | 'page_number', 'without_pagebreak'], context=context) |
723 | 63 | res = res and res[0] or {} | 63 | res = res and res[0] or {} |
724 | 64 | datas['form'] = res | 64 | datas['form'] = res |
725 | 65 | datas['model'] = 'survey.print.answer' | 65 | datas['model'] = 'survey.print.answer' |
726 | 66 | 66 | ||
727 | === modified file 'survey/wizard/survey_print_statistics.py' | |||
728 | --- survey/wizard/survey_print_statistics.py 2011-02-09 07:18:57 +0000 | |||
729 | +++ survey/wizard/survey_print_statistics.py 2011-02-15 12:38:08 +0000 | |||
730 | @@ -44,7 +44,7 @@ | |||
731 | 44 | if context is None: | 44 | if context is None: |
732 | 45 | context = {} | 45 | context = {} |
733 | 46 | datas = {'ids': context.get('active_ids', [])} | 46 | datas = {'ids': context.get('active_ids', [])} |
735 | 47 | res = self.read(cr, uid, ids, ['survey_ids'], context) | 47 | res = self.read(cr, uid, ids, ['survey_ids'], context=context) |
736 | 48 | res = res and res[0] or {} | 48 | res = res and res[0] or {} |
737 | 49 | datas['form'] = res | 49 | datas['form'] = res |
738 | 50 | datas['model'] = 'survey.print.statistics' | 50 | datas['model'] = 'survey.print.statistics' |
739 | 51 | 51 | ||
740 | === modified file 'survey/wizard/survey_selection.py' | |||
741 | --- survey/wizard/survey_selection.py 2011-02-09 07:18:57 +0000 | |||
742 | +++ survey/wizard/survey_selection.py 2011-02-15 12:38:08 +0000 | |||
743 | @@ -122,7 +122,7 @@ | |||
744 | 122 | search_obj = self.pool.get('ir.ui.view') | 122 | search_obj = self.pool.get('ir.ui.view') |
745 | 123 | if context is None: context = {} | 123 | if context is None: context = {} |
746 | 124 | 124 | ||
748 | 125 | sur_id = self.read(cr, uid, ids, [])[0] | 125 | sur_id = self.read(cr, uid, ids, ['survey_id'], context=context)[0] |
749 | 126 | survey_id = sur_id['survey_id'] | 126 | survey_id = sur_id['survey_id'] |
750 | 127 | context.update({'survey_id': survey_id, 'sur_name_id': sur_id['id']}) | 127 | context.update({'survey_id': survey_id, 'sur_name_id': sur_id['id']}) |
751 | 128 | cr.execute('select count(id) from survey_history where user_id=%s\ | 128 | cr.execute('select count(id) from survey_history where user_id=%s\ |
752 | @@ -133,8 +133,8 @@ | |||
753 | 133 | if user_limit and res >= user_limit: | 133 | if user_limit and res >= user_limit: |
754 | 134 | raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit)) | 134 | raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit)) |
755 | 135 | 135 | ||
758 | 136 | sur_rec = survey_obj.read(cr,uid,self.read(cr,uid,ids)[0]['survey_id']) | 136 | sur_rec = survey_obj.browse(cr,uid,ids,context=context)[0] |
759 | 137 | if sur_rec['max_response_limit'] and sur_rec['max_response_limit'] <= sur_rec['tot_start_survey']: | 137 | if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey: |
760 | 138 | raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance.")) | 138 | raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance.")) |
761 | 139 | 139 | ||
762 | 140 | search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')]) | 140 | search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')]) |
763 | 141 | 141 | ||
764 | === modified file 'survey/wizard/survey_send_invitation.py' | |||
765 | --- survey/wizard/survey_send_invitation.py 2011-02-09 07:18:57 +0000 | |||
766 | +++ survey/wizard/survey_send_invitation.py 2011-02-15 12:38:08 +0000 | |||
767 | @@ -96,7 +96,7 @@ | |||
768 | 96 | def action_send(self, cr, uid, ids, context=None): | 96 | def action_send(self, cr, uid, ids, context=None): |
769 | 97 | if context is None: | 97 | if context is None: |
770 | 98 | context = {} | 98 | context = {} |
772 | 99 | record = self.read(cr, uid, ids, []) | 99 | record = self.read(cr, uid, ids, [],context=context) |
773 | 100 | survey_ids = context.get('active_ids', []) | 100 | survey_ids = context.get('active_ids', []) |
774 | 101 | record = record and record[0] | 101 | record = record and record[0] |
775 | 102 | partner_ids = record['partner_ids'] | 102 | partner_ids = record['partner_ids'] |
Again. .Purchase: [PS] Purchase order line_ Unit of measure