Merge lp:~domsense/domsense-agilebg-addons/adding_causali into lp:domsense-agilebg-addons/6.0
- adding_causali
- Merge into 6.0
Proposed by
Davide Corio
Status: | Rejected |
---|---|
Rejected by: | Lorenzo Battistini |
Proposed branch: | lp:~domsense/domsense-agilebg-addons/adding_causali |
Merge into: | lp:domsense-agilebg-addons/6.0 |
Diff against target: |
550 lines (+519/-0) 6 files modified
account_recurring_model/AUTHORS.txt (+1/-0) account_recurring_model/__init__.py (+22/-0) account_recurring_model/__openerp__.py (+35/-0) account_recurring_model/account_model.py (+231/-0) account_recurring_model/account_model_view.xml (+89/-0) account_recurring_model/i18n/it.po (+141/-0) |
To merge this branch: | bzr merge lp:~domsense/domsense-agilebg-addons/adding_causali |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lorenzo Battistini | Needs Information | ||
Review via email:
|
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message

Davide Corio (enlightx-deactivatedaccount) wrote : | # |
ad occhio direi di no, ma sarei felice di essere smentito
Revision history for this message

Lorenzo Battistini (elbati) wrote : | # |
Lo consideriamo sostituito da account_
Unmerged revisions
- 22. By Davide Corio
-
[ADD] new reg wizard
- 21. By Davide Corio
-
[FIX] missing import
- 20. By Davide Corio
-
[IMP] dedicated menu item and translations
- 19. By Davide Corio
-
[FIX] pdb removed
- 18. By Davide Corio
-
[IMP] tax computation
- 17. By Davide Corio
-
[IMP] added tax_code on model line
- 16. By Lorenzo Battistini
-
[DEL] account_
voucher_ template - 15. By Lorenzo Battistini
-
[FIX] varie
- 14. By Lorenzo Battistini
-
[FIX] mandatory field
- 13. By Lorenzo Battistini
-
[add] account_
recurring_ model account_ voucher_ template
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory 'account_recurring_model' | |||
2 | === added file 'account_recurring_model/AUTHORS.txt' | |||
3 | --- account_recurring_model/AUTHORS.txt 1970-01-01 00:00:00 +0000 | |||
4 | +++ account_recurring_model/AUTHORS.txt 2011-09-03 19:18:23 +0000 | |||
5 | @@ -0,0 +1,1 @@ | |||
6 | 1 | Davide Corio <davide.corio@agilebg.com> | ||
7 | 0 | 2 | ||
8 | === added file 'account_recurring_model/__init__.py' | |||
9 | --- account_recurring_model/__init__.py 1970-01-01 00:00:00 +0000 | |||
10 | +++ account_recurring_model/__init__.py 2011-09-03 19:18:23 +0000 | |||
11 | @@ -0,0 +1,22 @@ | |||
12 | 1 | # -*- encoding: utf-8 -*- | ||
13 | 2 | ############################################################################## | ||
14 | 3 | # | ||
15 | 4 | # OpenERP, Open Source Management Solution | ||
16 | 5 | # Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>). | ||
17 | 6 | # | ||
18 | 7 | # This program is free software: you can redistribute it and/or modify | ||
19 | 8 | # it under the terms of the GNU Affero General Public License as | ||
20 | 9 | # published by the Free Software Foundation, either version 3 of the | ||
21 | 10 | # License, or (at your option) any later version. | ||
22 | 11 | # | ||
23 | 12 | # This program is distributed in the hope that it will be useful, | ||
24 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
25 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
26 | 15 | # GNU Affero General Public License for more details. | ||
27 | 16 | # | ||
28 | 17 | # You should have received a copy of the GNU Affero General Public License | ||
29 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
30 | 19 | # | ||
31 | 20 | ############################################################################## | ||
32 | 21 | |||
33 | 22 | import account_model | ||
34 | 0 | 23 | ||
35 | === added file 'account_recurring_model/__openerp__.py' | |||
36 | --- account_recurring_model/__openerp__.py 1970-01-01 00:00:00 +0000 | |||
37 | +++ account_recurring_model/__openerp__.py 2011-09-03 19:18:23 +0000 | |||
38 | @@ -0,0 +1,35 @@ | |||
39 | 1 | # -*- encoding: utf-8 -*- | ||
40 | 2 | ############################################################################## | ||
41 | 3 | # | ||
42 | 4 | # OpenERP, Open Source Management Solution | ||
43 | 5 | # Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>). | ||
44 | 6 | # | ||
45 | 7 | # This program is free software: you can redistribute it and/or modify | ||
46 | 8 | # it under the terms of the GNU Affero General Public License as | ||
47 | 9 | # published by the Free Software Foundation, either version 3 of the | ||
48 | 10 | # License, or (at your option) any later version. | ||
49 | 11 | # | ||
50 | 12 | # This program is distributed in the hope that it will be useful, | ||
51 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
52 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
53 | 15 | # GNU Affero General Public License for more details. | ||
54 | 16 | # | ||
55 | 17 | # You should have received a copy of the GNU Affero General Public License | ||
56 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
57 | 19 | # | ||
58 | 20 | ############################################################################## | ||
59 | 21 | { | ||
60 | 22 | 'name': 'Account Recurring Models', | ||
61 | 23 | 'version': '0.1', | ||
62 | 24 | 'category': 'Generic Modules/Accounting', | ||
63 | 25 | 'description': """Account Recurring Models (Improvements)""", | ||
64 | 26 | 'author': 'Agile Business Group & Domsense', | ||
65 | 27 | 'website': 'http://www.agilebg.com', | ||
66 | 28 | 'license': 'AGPL-3', | ||
67 | 29 | "depends" : ['account'], | ||
68 | 30 | "init_xml" : ['account_model_view.xml'], | ||
69 | 31 | "update_xml" : [], | ||
70 | 32 | "demo_xml" : [], | ||
71 | 33 | "active": False, | ||
72 | 34 | "installable": True | ||
73 | 35 | } | ||
74 | 0 | 36 | ||
75 | === added file 'account_recurring_model/account_model.py' | |||
76 | --- account_recurring_model/account_model.py 1970-01-01 00:00:00 +0000 | |||
77 | +++ account_recurring_model/account_model.py 2011-09-03 19:18:23 +0000 | |||
78 | @@ -0,0 +1,231 @@ | |||
79 | 1 | # -*- encoding: utf-8 -*- | ||
80 | 2 | ############################################################################## | ||
81 | 3 | # | ||
82 | 4 | # OpenERP, Open Source Management Solution | ||
83 | 5 | # Copyright (C) 2011 Domsense s.r.l. (<http://www.domsense.com>). | ||
84 | 6 | # | ||
85 | 7 | # This program is free software: you can redistribute it and/or modify | ||
86 | 8 | # it under the terms of the GNU Affero General Public License as | ||
87 | 9 | # published by the Free Software Foundation, either version 3 of the | ||
88 | 10 | # License, or (at your option) any later version. | ||
89 | 11 | # | ||
90 | 12 | # This program is distributed in the hope that it will be useful, | ||
91 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
92 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
93 | 15 | # GNU Affero General Public License for more details. | ||
94 | 16 | # | ||
95 | 17 | # You should have received a copy of the GNU Affero General Public License | ||
96 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
97 | 19 | # | ||
98 | 20 | ############################################################################## | ||
99 | 21 | |||
100 | 22 | import datetime | ||
101 | 23 | import time | ||
102 | 24 | import decimal_precision as dp | ||
103 | 25 | |||
104 | 26 | from osv import fields, osv | ||
105 | 27 | from tools.translate import _ | ||
106 | 28 | |||
107 | 29 | |||
108 | 30 | class account_model_line(osv.osv): | ||
109 | 31 | |||
110 | 32 | _inherit = 'account.model.line' | ||
111 | 33 | _columns = { | ||
112 | 34 | 'type':fields.selection([ | ||
113 | 35 | ('cr','Credit'), | ||
114 | 36 | ('dr','Debit'), | ||
115 | 37 | ], 'Type'), | ||
116 | 38 | 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), | ||
117 | 39 | 'value_type': fields.selection([ | ||
118 | 40 | ('amount','Amount'), | ||
119 | 41 | ('percentage','Percentage'), | ||
120 | 42 | ], 'Value Type'), | ||
121 | 43 | 'account_tax_id': fields.many2one('account.tax','Tax'), | ||
122 | 44 | } | ||
123 | 45 | |||
124 | 46 | def compute_amount(self,vals,amount): | ||
125 | 47 | if vals['type']=='cr' and vals['value_type']=='amount': | ||
126 | 48 | vals['credit']=vals['amount'] | ||
127 | 49 | elif vals['type']=='cr' and vals['value_type']=='percentage': | ||
128 | 50 | vals['credit']=(amount/100)*vals['amount'] | ||
129 | 51 | elif vals['type']=='dr' and vals['value_type']=='amount': | ||
130 | 52 | vals['debit']=vals['amount'] | ||
131 | 53 | elif vals['type']=='dr' and vals['value_type']=='percentage': | ||
132 | 54 | vals['debit']=(amount/100)*vals['amount'] | ||
133 | 55 | return vals | ||
134 | 56 | |||
135 | 57 | def create(self, cr, uid, vals, context=None): | ||
136 | 58 | amount = self.pool.get('account.model').browse(cr,uid,vals['model_id']).amount | ||
137 | 59 | vals = self.compute_amount(vals,amount) | ||
138 | 60 | return super(account_model_line, self).create(cr, uid, vals, context) | ||
139 | 61 | |||
140 | 62 | def write(self, cr, uid, ids, vals, context=None): | ||
141 | 63 | amount = self.pool.get('account.model.line').browse(cr,uid,ids[0]).model_id.amount | ||
142 | 64 | vals = self.compute_amount(vals,amount) | ||
143 | 65 | return super(account_model_line, self).write(cr, uid, ids, vals, context=context) | ||
144 | 66 | |||
145 | 67 | account_model_line() | ||
146 | 68 | |||
147 | 69 | class account_model(osv.osv): | ||
148 | 70 | |||
149 | 71 | _inherit = 'account.model' | ||
150 | 72 | _columns = { | ||
151 | 73 | 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), | ||
152 | 74 | } | ||
153 | 75 | |||
154 | 76 | def generate(self, cr, uid, ids, datas={}, context=None): | ||
155 | 77 | move_ids = [] | ||
156 | 78 | entry = {} | ||
157 | 79 | account_move_obj = self.pool.get('account.move') | ||
158 | 80 | account_move_line_obj = self.pool.get('account.move.line') | ||
159 | 81 | pt_obj = self.pool.get('account.payment.term') | ||
160 | 82 | |||
161 | 83 | if context is None: | ||
162 | 84 | context = {} | ||
163 | 85 | |||
164 | 86 | if datas.get('date', False): | ||
165 | 87 | context.update({'date': datas['date']}) | ||
166 | 88 | |||
167 | 89 | period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False)) | ||
168 | 90 | if not period_id: | ||
169 | 91 | raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !')) | ||
170 | 92 | period_id = period_id[0] | ||
171 | 93 | |||
172 | 94 | for model in self.browse(cr, uid, ids, context=context): | ||
173 | 95 | entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')} | ||
174 | 96 | move_id = account_move_obj.create(cr, uid, { | ||
175 | 97 | 'ref': entry['name'], | ||
176 | 98 | 'period_id': period_id, | ||
177 | 99 | 'journal_id': model.journal_id.id, | ||
178 | 100 | 'date': context.get('date',time.strftime('%Y-%m-%d')) | ||
179 | 101 | }) | ||
180 | 102 | move_ids.append(move_id) | ||
181 | 103 | for line in model.lines_id: | ||
182 | 104 | analytic_account_id = False | ||
183 | 105 | if line.analytic_account_id: | ||
184 | 106 | if not model.journal_id.analytic_journal_id: | ||
185 | 107 | raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,)) | ||
186 | 108 | analytic_account_id = line.analytic_account_id.id | ||
187 | 109 | val = { | ||
188 | 110 | 'move_id': move_id, | ||
189 | 111 | 'journal_id': model.journal_id.id, | ||
190 | 112 | 'period_id': period_id, | ||
191 | 113 | 'analytic_account_id': analytic_account_id | ||
192 | 114 | } | ||
193 | 115 | |||
194 | 116 | date_maturity = time.strftime('%Y-%m-%d') | ||
195 | 117 | if line.date_maturity == 'partner': | ||
196 | 118 | if not line.partner_id: | ||
197 | 119 | raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \ | ||
198 | 120 | "\nPlease define partner on it!")%(line.name, model.name)) | ||
199 | 121 | if line.partner_id.property_payment_term: | ||
200 | 122 | payment_term_id = line.partner_id.property_payment_term.id | ||
201 | 123 | pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity) | ||
202 | 124 | if pterm_list: | ||
203 | 125 | pterm_list = [l[0] for l in pterm_list] | ||
204 | 126 | pterm_list.sort() | ||
205 | 127 | date_maturity = pterm_list[-1] | ||
206 | 128 | |||
207 | 129 | val.update({ | ||
208 | 130 | 'name': line.name, | ||
209 | 131 | 'quantity': line.quantity, | ||
210 | 132 | 'debit': line.debit, | ||
211 | 133 | 'credit': line.credit, | ||
212 | 134 | 'account_id': line.account_id.id, | ||
213 | 135 | 'move_id': move_id, | ||
214 | 136 | 'partner_id': line.partner_id.id, | ||
215 | 137 | 'date': context.get('date',time.strftime('%Y-%m-%d')), | ||
216 | 138 | 'date_maturity': date_maturity, | ||
217 | 139 | 'account_tax_id': line.account_tax_id.id, | ||
218 | 140 | }) | ||
219 | 141 | c = context.copy() | ||
220 | 142 | c.update({'journal_id': model.journal_id.id,'period_id': period_id}) | ||
221 | 143 | account_move_line_obj.create(cr, uid, val, context=c) | ||
222 | 144 | |||
223 | 145 | return move_ids | ||
224 | 146 | |||
225 | 147 | account_model() | ||
226 | 148 | |||
227 | 149 | class account_use_model(osv.osv_memory): | ||
228 | 150 | |||
229 | 151 | _inherit = 'account.use.model' | ||
230 | 152 | |||
231 | 153 | def create_entries(self, cr, uid, ids, context=None): | ||
232 | 154 | account_model_obj = self.pool.get('account.model') | ||
233 | 155 | account_period_obj = self.pool.get('account.period') | ||
234 | 156 | account_move_obj = self.pool.get('account.move') | ||
235 | 157 | account_move_line_obj = self.pool.get('account.move.line') | ||
236 | 158 | pt_obj = self.pool.get('account.payment.term') | ||
237 | 159 | mod_obj = self.pool.get('ir.model.data') | ||
238 | 160 | if context is None: | ||
239 | 161 | context = {} | ||
240 | 162 | move_ids = [] | ||
241 | 163 | entry = {} | ||
242 | 164 | data = self.read(cr, uid, ids, context=context)[0] | ||
243 | 165 | record_id = context and context.get('model_line', False) or False | ||
244 | 166 | if record_id: | ||
245 | 167 | data_model = account_model_obj.browse(cr, uid, data['model'], context=context) | ||
246 | 168 | else: | ||
247 | 169 | data_model = account_model_obj.browse(cr, uid, context['active_ids'], context=context) | ||
248 | 170 | for model in data_model: | ||
249 | 171 | entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%d')} | ||
250 | 172 | period_id = account_period_obj.find(cr, uid, context=context) | ||
251 | 173 | if not period_id: | ||
252 | 174 | raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !')) | ||
253 | 175 | period_id = period_id[0] | ||
254 | 176 | move_id = account_move_obj.create(cr, uid, { | ||
255 | 177 | 'ref': entry['name'], | ||
256 | 178 | 'period_id': period_id, | ||
257 | 179 | 'journal_id': model.journal_id.id, | ||
258 | 180 | }) | ||
259 | 181 | move_ids.append(move_id) | ||
260 | 182 | for line in model.lines_id: | ||
261 | 183 | analytic_account_id = False | ||
262 | 184 | if line.analytic_account_id: | ||
263 | 185 | if not model.journal_id.analytic_journal_id: | ||
264 | 186 | raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,)) | ||
265 | 187 | analytic_account_id = line.analytic_account_id.id | ||
266 | 188 | val = { | ||
267 | 189 | 'move_id': move_id, | ||
268 | 190 | 'journal_id': model.journal_id.id, | ||
269 | 191 | 'period_id': period_id, | ||
270 | 192 | 'analytic_account_id': analytic_account_id | ||
271 | 193 | } | ||
272 | 194 | date_maturity = time.strftime('%Y-%m-%d') | ||
273 | 195 | if line.date_maturity == 'partner' and line.partner_id and line.partner_id.property_payment_term: | ||
274 | 196 | payment_term_id = line.partner_id.property_payment_term.id | ||
275 | 197 | pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity) | ||
276 | 198 | if pterm_list: | ||
277 | 199 | pterm_list = [l[0] for l in pterm_list] | ||
278 | 200 | pterm_list.sort() | ||
279 | 201 | date_maturity = pterm_list[-1] | ||
280 | 202 | val.update({ | ||
281 | 203 | 'name': line.name, | ||
282 | 204 | 'quantity': line.quantity, | ||
283 | 205 | 'debit': line.debit, | ||
284 | 206 | 'credit': line.credit, | ||
285 | 207 | 'account_id': line.account_id.id, | ||
286 | 208 | 'move_id': move_id, | ||
287 | 209 | 'partner_id': line.partner_id.id, | ||
288 | 210 | 'date': time.strftime('%Y-%m-%d'), | ||
289 | 211 | 'date_maturity': date_maturity, | ||
290 | 212 | 'account_tax_id': line.account_tax_id.id, | ||
291 | 213 | }) | ||
292 | 214 | c = context.copy() | ||
293 | 215 | c.update({'journal_id': model.journal_id.id,'period_id': period_id}) | ||
294 | 216 | id_line = account_move_line_obj.create(cr, uid, val, context=c) | ||
295 | 217 | |||
296 | 218 | context.update({'move_ids':move_ids}) | ||
297 | 219 | model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_move_form')], context=context) | ||
298 | 220 | resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] | ||
299 | 221 | return { | ||
300 | 222 | 'domain': "[('id','in', ["+','.join(map(str,context['move_ids']))+"])]", | ||
301 | 223 | 'name': 'Entries', | ||
302 | 224 | 'view_type': 'form', | ||
303 | 225 | 'view_mode': 'tree,form', | ||
304 | 226 | 'res_model': 'account.move', | ||
305 | 227 | 'views': [(False,'tree'),(resource_id,'form')], | ||
306 | 228 | 'type': 'ir.actions.act_window', | ||
307 | 229 | } | ||
308 | 230 | |||
309 | 231 | account_use_model() | ||
310 | 0 | 232 | ||
311 | === added file 'account_recurring_model/account_model_view.xml' | |||
312 | --- account_recurring_model/account_model_view.xml 1970-01-01 00:00:00 +0000 | |||
313 | +++ account_recurring_model/account_model_view.xml 2011-09-03 19:18:23 +0000 | |||
314 | @@ -0,0 +1,89 @@ | |||
315 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
316 | 2 | <openerp> | ||
317 | 3 | <data> | ||
318 | 4 | |||
319 | 5 | <record id="view_model_line_form_type" model="ir.ui.view"> | ||
320 | 6 | <field name="name">account.model.line.form.type</field> | ||
321 | 7 | <field name="model">account.model.line</field> | ||
322 | 8 | <field name="inherit_id" ref="account.view_model_line_form"/> | ||
323 | 9 | <field name="arch" type="xml"> | ||
324 | 10 | <field name="partner_id" position="after"> | ||
325 | 11 | <field name="type"/> | ||
326 | 12 | </field> | ||
327 | 13 | </field> | ||
328 | 14 | </record> | ||
329 | 15 | |||
330 | 16 | <record id="view_model_form_amount" model="ir.ui.view"> | ||
331 | 17 | <field name="name">account.model.form.amount</field> | ||
332 | 18 | <field name="model">account.model</field> | ||
333 | 19 | <field name="inherit_id" ref="account.view_model_form"/> | ||
334 | 20 | <field name="arch" type="xml"> | ||
335 | 21 | <field name="name" position="after"> | ||
336 | 22 | <field name="amount"/> | ||
337 | 23 | </field> | ||
338 | 24 | </field> | ||
339 | 25 | </record> | ||
340 | 26 | |||
341 | 27 | <record id="view_model_line_tree_type" model="ir.ui.view"> | ||
342 | 28 | <field name="name">account.model.line.tree.type</field> | ||
343 | 29 | <field name="model">account.model.line</field> | ||
344 | 30 | <field name="inherit_id" ref="account.view_model_line_tree"/> | ||
345 | 31 | <field name="arch" type="xml"> | ||
346 | 32 | <field name="partner_id" position="after"> | ||
347 | 33 | <field name="type"/> | ||
348 | 34 | </field> | ||
349 | 35 | </field> | ||
350 | 36 | </record> | ||
351 | 37 | |||
352 | 38 | <record id="view_model_line_tree_amount_1" model="ir.ui.view"> | ||
353 | 39 | <field name="name">account.model.line.tree.amount.1</field> | ||
354 | 40 | <field name="model">account.model.line</field> | ||
355 | 41 | <field name="inherit_id" ref="account.view_model_line_tree"/> | ||
356 | 42 | <field name="arch" type="xml"> | ||
357 | 43 | <field name="credit" position="replace"> | ||
358 | 44 | </field> | ||
359 | 45 | </field> | ||
360 | 46 | </record> | ||
361 | 47 | |||
362 | 48 | <record id="view_model_line_tree_amount_2" model="ir.ui.view"> | ||
363 | 49 | <field name="name">account.model.line.tree.amount.2</field> | ||
364 | 50 | <field name="model">account.model.line</field> | ||
365 | 51 | <field name="inherit_id" ref="account.view_model_line_tree"/> | ||
366 | 52 | <field name="arch" type="xml"> | ||
367 | 53 | <field name="debit" position="replace"> | ||
368 | 54 | <field name="value_type"/> | ||
369 | 55 | <field name="amount"/> | ||
370 | 56 | <field name="account_tax_id"/> | ||
371 | 57 | </field> | ||
372 | 58 | </field> | ||
373 | 59 | </record> | ||
374 | 60 | |||
375 | 61 | <record id="view_model_line_form_amount_1" model="ir.ui.view"> | ||
376 | 62 | <field name="name">account.model.line.form.amount.1</field> | ||
377 | 63 | <field name="model">account.model.line</field> | ||
378 | 64 | <field name="inherit_id" ref="account.view_model_line_form"/> | ||
379 | 65 | <field name="arch" type="xml"> | ||
380 | 66 | <field name="credit" position="replace"> | ||
381 | 67 | </field> | ||
382 | 68 | </field> | ||
383 | 69 | </record> | ||
384 | 70 | |||
385 | 71 | <record id="view_model_line_form_amount_2" model="ir.ui.view"> | ||
386 | 72 | <field name="name">account.model.line.form.amount.2</field> | ||
387 | 73 | <field name="model">account.model.line</field> | ||
388 | 74 | <field name="inherit_id" ref="account.view_model_line_form"/> | ||
389 | 75 | <field name="arch" type="xml"> | ||
390 | 76 | <field name="debit" position="replace"> | ||
391 | 77 | <field name="value_type"/> | ||
392 | 78 | <field name="amount"/> | ||
393 | 79 | <field name="account_tax_id"/> | ||
394 | 80 | </field> | ||
395 | 81 | </field> | ||
396 | 82 | </record> | ||
397 | 83 | |||
398 | 84 | <menuitem | ||
399 | 85 | action="account.action_model_form" name="Recurring Models" id="menu_action_recurring_model_form" sequence="5" parent="account.menu_finance_entries" groups="base.group_extended"/> | ||
400 | 86 | <menuitem name="Create Entries from Model" action="account.action_view_account_use_model" id="menu_action_manual_recurring" sequence="10" parent="account.menu_finance_entries"/> | ||
401 | 87 | |||
402 | 88 | </data> | ||
403 | 89 | </openerp> | ||
404 | 0 | 90 | ||
405 | === added directory 'account_recurring_model/i18n' | |||
406 | === added file 'account_recurring_model/i18n/it.po' | |||
407 | --- account_recurring_model/i18n/it.po 1970-01-01 00:00:00 +0000 | |||
408 | +++ account_recurring_model/i18n/it.po 2011-09-03 19:18:23 +0000 | |||
409 | @@ -0,0 +1,141 @@ | |||
410 | 1 | # Translation of OpenERP Server. | ||
411 | 2 | # This file contains the translation of the following modules: | ||
412 | 3 | # * account_recurring_model | ||
413 | 4 | # | ||
414 | 5 | msgid "" | ||
415 | 6 | msgstr "" | ||
416 | 7 | "Project-Id-Version: OpenERP Server 6.0.2\n" | ||
417 | 8 | "Report-Msgid-Bugs-To: support@openerp.com\n" | ||
418 | 9 | "POT-Creation-Date: 2011-09-03 15:29+0000\n" | ||
419 | 10 | "PO-Revision-Date: 2011-09-03 15:29+0000\n" | ||
420 | 11 | "Last-Translator: <>\n" | ||
421 | 12 | "Language-Team: \n" | ||
422 | 13 | "MIME-Version: 1.0\n" | ||
423 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
424 | 15 | "Content-Transfer-Encoding: \n" | ||
425 | 16 | "Plural-Forms: \n" | ||
426 | 17 | |||
427 | 18 | #. module: account_recurring_model | ||
428 | 19 | #: code:addons/account_recurring_model/account_model.py:107 | ||
429 | 20 | #: code:addons/account_recurring_model/account_model.py:186 | ||
430 | 21 | #, python-format | ||
431 | 22 | msgid "You have to define an analytic journal on the '%s' journal!" | ||
432 | 23 | msgstr "E' necessario definire un giornale analitico sul sezionale '%s'!" | ||
433 | 24 | |||
434 | 25 | #. module: account_recurring_model | ||
435 | 26 | #: selection:account.model.line,type:0 | ||
436 | 27 | msgid "Debit" | ||
437 | 28 | msgstr "Dare" | ||
438 | 29 | |||
439 | 30 | #. module: account_recurring_model | ||
440 | 31 | #: model:ir.ui.menu,name:account_recurring_model.menu_action_manual_recurring | ||
441 | 32 | msgid "Create Entries from Model" | ||
442 | 33 | msgstr "Crea registrazioni da causale" | ||
443 | 34 | |||
444 | 35 | #. module: account_recurring_model | ||
445 | 36 | #: field:account.model.line,type:0 | ||
446 | 37 | msgid "Type" | ||
447 | 38 | msgstr "Tipo" | ||
448 | 39 | |||
449 | 40 | #. module: account_recurring_model | ||
450 | 41 | #: selection:account.model.line,value_type:0 | ||
451 | 42 | msgid "Percentage" | ||
452 | 43 | msgstr "Percentuale" | ||
453 | 44 | |||
454 | 45 | #. module: account_recurring_model | ||
455 | 46 | #: code:addons/account_recurring_model/account_model.py:119 | ||
456 | 47 | #, python-format | ||
457 | 48 | msgid "Error !" | ||
458 | 49 | msgstr "Errore !" | ||
459 | 50 | |||
460 | 51 | #. module: account_recurring_model | ||
461 | 52 | #: model:ir.module.module,description:account_recurring_model.module_meta_information | ||
462 | 53 | msgid "Account Recurring Models (Improvements)" | ||
463 | 54 | msgstr "Account Recurring Models (Improvements)" | ||
464 | 55 | |||
465 | 56 | #. module: account_recurring_model | ||
466 | 57 | #: code:addons/account_recurring_model/account_model.py:119 | ||
467 | 58 | #, python-format | ||
468 | 59 | msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n" | ||
469 | 60 | "Please define partner on it!" | ||
470 | 61 | msgstr "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n" | ||
471 | 62 | "Please define partner on it!" | ||
472 | 63 | |||
473 | 64 | #. module: account_recurring_model | ||
474 | 65 | #: model:ir.ui.menu,name:account_recurring_model.menu_action_recurring_model_form | ||
475 | 66 | msgid "Recurring Models" | ||
476 | 67 | msgstr "Modelli Causale" | ||
477 | 68 | |||
478 | 69 | #. module: account_recurring_model | ||
479 | 70 | #: model:ir.model,name:account_recurring_model.model_account_model | ||
480 | 71 | msgid "Account Model" | ||
481 | 72 | msgstr "Modello Causale" | ||
482 | 73 | |||
483 | 74 | #. module: account_recurring_model | ||
484 | 75 | #: sql_constraint:account.model.line:0 | ||
485 | 76 | msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!" | ||
486 | 77 | msgstr "Errato valore per il credito od il debito nel modello (uno dei due deve essere \"0\") !" | ||
487 | 78 | |||
488 | 79 | #. module: account_recurring_model | ||
489 | 80 | #: sql_constraint:account.model.line:0 | ||
490 | 81 | msgid "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!" | ||
491 | 82 | msgstr "Valore del credito o debito errato (credito+debito deve essere maggiore di \"0\")!" | ||
492 | 83 | |||
493 | 84 | #. module: account_recurring_model | ||
494 | 85 | #: model:ir.model,name:account_recurring_model.model_account_model_line | ||
495 | 86 | msgid "Account Model Entries" | ||
496 | 87 | msgstr "Voci Modello Causale" | ||
497 | 88 | |||
498 | 89 | #. module: account_recurring_model | ||
499 | 90 | #: selection:account.model.line,type:0 | ||
500 | 91 | msgid "Credit" | ||
501 | 92 | msgstr "Avere" | ||
502 | 93 | |||
503 | 94 | #. module: account_recurring_model | ||
504 | 95 | #: field:account.model,amount:0 | ||
505 | 96 | #: field:account.model.line,amount:0 | ||
506 | 97 | #: selection:account.model.line,value_type:0 | ||
507 | 98 | msgid "Amount" | ||
508 | 99 | msgstr "Importo" | ||
509 | 100 | |||
510 | 101 | #. module: account_recurring_model | ||
511 | 102 | #: model:ir.model,name:account_recurring_model.model_account_use_model | ||
512 | 103 | msgid "Use model" | ||
513 | 104 | msgstr "Usa il modello" | ||
514 | 105 | |||
515 | 106 | #. module: account_recurring_model | ||
516 | 107 | #: model:ir.module.module,shortdesc:account_recurring_model.module_meta_information | ||
517 | 108 | msgid "Account Recurring Models" | ||
518 | 109 | msgstr "Account Recurring Models" | ||
519 | 110 | |||
520 | 111 | #. module: account_recurring_model | ||
521 | 112 | #: code:addons/account_recurring_model/account_model.py:91 | ||
522 | 113 | #: code:addons/account_recurring_model/account_model.py:174 | ||
523 | 114 | #, python-format | ||
524 | 115 | msgid "Unable to find a valid period !" | ||
525 | 116 | msgstr "Impossibile trovare un periodo valido!" | ||
526 | 117 | |||
527 | 118 | #. module: account_recurring_model | ||
528 | 119 | #: field:account.model.line,value_type:0 | ||
529 | 120 | msgid "Value Type" | ||
530 | 121 | msgstr "Tipo Valore" | ||
531 | 122 | |||
532 | 123 | #. module: account_recurring_model | ||
533 | 124 | #: code:addons/account_recurring_model/account_model.py:107 | ||
534 | 125 | #: code:addons/account_recurring_model/account_model.py:186 | ||
535 | 126 | #, python-format | ||
536 | 127 | msgid "No Analytic Journal !" | ||
537 | 128 | msgstr "No Analytic Journal !" | ||
538 | 129 | |||
539 | 130 | #. module: account_recurring_model | ||
540 | 131 | #: field:account.model.line,account_tax_id:0 | ||
541 | 132 | msgid "Tax" | ||
542 | 133 | msgstr "Tassa" | ||
543 | 134 | |||
544 | 135 | #. module: account_recurring_model | ||
545 | 136 | #: code:addons/account_recurring_model/account_model.py:91 | ||
546 | 137 | #: code:addons/account_recurring_model/account_model.py:174 | ||
547 | 138 | #, python-format | ||
548 | 139 | msgid "No period found !" | ||
549 | 140 | msgstr "No period found !" | ||
550 | 141 |
Non si riesce a usare 'super' nei metodi 'generate' e 'create_entries' ?