Merge lp:~akretion-team/account-financial-tools/account-financial-tools-check-deposit into lp:~account-core-editors/account-financial-tools/7.0
- account-financial-tools-check-deposit
- Merge into 7.0
Status: | Rejected |
---|---|
Rejected by: | Nicolas Bessi - Camptocamp |
Proposed branch: | lp:~akretion-team/account-financial-tools/account-financial-tools-check-deposit |
Merge into: | lp:~account-core-editors/account-financial-tools/7.0 |
Diff against target: |
1506 lines (+1433/-0) 14 files modified
account_check_deposit/__init__.py (+23/-0) account_check_deposit/__openerp__.py (+48/-0) account_check_deposit/account_deposit.py (+245/-0) account_check_deposit/account_deposit_sequence.xml (+26/-0) account_check_deposit/account_deposit_view.xml (+131/-0) account_check_deposit/account_type_data.xml (+20/-0) account_check_deposit/i18n/account_check_deposit.pot (+236/-0) account_check_deposit/i18n/fr.po (+236/-0) account_check_deposit/report/.directory (+6/-0) account_check_deposit/report/.mako (+275/-0) account_check_deposit/report/__init__.py (+32/-0) account_check_deposit/report/check_deposit.mako (+112/-0) account_check_deposit/report/report_webkit_html.py (+41/-0) account_check_deposit/security/ir.model.access.csv (+2/-0) |
To merge this branch: | bzr merge lp:~akretion-team/account-financial-tools/account-financial-tools-check-deposit |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nicolas JEUDY (community) | code reading | Disapprove | |
Frederic Clementi - Camptocamp | Pending | ||
Review via email: mp+210315@code.launchpad.net |
Commit message
Description of the change
Add module for check deposit. The "check" account should have the type "receivable check" then you are able to create a deposit and add the check unreconcile.
- 186. By Sébastien BEAU - http://www.akretion.com
-
[FIX] fix wrong spelling
- 187. By Sébastien BEAU - http://www.akretion.com
-
[REF] V7 clean up
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote : | # |
Nicolas JEUDY (njeudy) wrote : | # |
Hello,
As nicolas said, can you move this MP to github ?
I will test this module this week end and write my comment. Thanks for the work
Nicolas JEUDY (njeudy) : | # |
Unmerged revisions
- 190. By Benoit Guillot - http://www.akretion.com
-
[FIX] fix move line name
- 189. By Alexis de Lattre
-
Update field definition
- 188. By Alexis de Lattre
-
Add support for multi-currency
Works with a single account journal
Usability and many other enhancements - 187. By Sébastien BEAU - http://www.akretion.com
-
[REF] V7 clean up
- 186. By Sébastien BEAU - http://www.akretion.com
-
[FIX] fix wrong spelling
- 185. By Sébastien BEAU - http://www.akretion.com
-
[REF] clean remove useless code, default value are called during the create
- 184. By Sébastien BEAU - http://www.akretion.com
-
[CLEAN] pep8 cleanup no code change
- 183. By Sébastien BEAU - http://www.akretion.com
-
[REF] remove dependency on sale_quick_payment as check can be registred in various way like native voucher
- 182. By Sébastien BEAU - http://www.akretion.com
-
[FIX] fix error when replaying commit
- 181. By Sébastien BEAU - http://www.akretion.com
-
[IMP] add total amount and flag to know if the deposit have been reconcile, the best will be to add a workflow
Preview Diff
1 | === added directory 'account_check_deposit' | |||
2 | === added file 'account_check_deposit/__init__.py' | |||
3 | --- account_check_deposit/__init__.py 1970-01-01 00:00:00 +0000 | |||
4 | +++ account_check_deposit/__init__.py 2014-03-10 23:55:30 +0000 | |||
5 | @@ -0,0 +1,23 @@ | |||
6 | 1 | # -*- coding: utf-8 -*- | ||
7 | 2 | ############################################################################### | ||
8 | 3 | # # | ||
9 | 4 | # account_check_deposit for OpenERP # | ||
10 | 5 | # Copyright (C) 2012 Akretion Benoît GUILLOT <benoit.guillot@akretion.com> # | ||
11 | 6 | # # | ||
12 | 7 | # This program is free software: you can redistribute it and/or modify # | ||
13 | 8 | # it under the terms of the GNU Affero General Public License as # | ||
14 | 9 | # published by the Free Software Foundation, either version 3 of the # | ||
15 | 10 | # License, or (at your option) any later version. # | ||
16 | 11 | # # | ||
17 | 12 | # This program is distributed in the hope that it will be useful, # | ||
18 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of # | ||
19 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # | ||
20 | 15 | # GNU Affero General Public License for more details. # | ||
21 | 16 | # # | ||
22 | 17 | # You should have received a copy of the GNU Affero General Public License # | ||
23 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. # | ||
24 | 19 | # # | ||
25 | 20 | ############################################################################### | ||
26 | 21 | |||
27 | 22 | import account_deposit | ||
28 | 23 | |||
29 | 0 | 24 | ||
30 | === added file 'account_check_deposit/__openerp__.py' | |||
31 | --- account_check_deposit/__openerp__.py 1970-01-01 00:00:00 +0000 | |||
32 | +++ account_check_deposit/__openerp__.py 2014-03-10 23:55:30 +0000 | |||
33 | @@ -0,0 +1,48 @@ | |||
34 | 1 | # -*- coding: utf-8 -*- | ||
35 | 2 | ############################################################################### | ||
36 | 3 | # # | ||
37 | 4 | # account_check_deposit for OpenERP # | ||
38 | 5 | # Copyright (C) 2012 Akretion Benoît GUILLOT <benoit.guillot@akretion.com> # | ||
39 | 6 | # Copyright (C) 2013 Akretion Chafique DELLI <chafique.delli@akretion.com> # | ||
40 | 7 | # # | ||
41 | 8 | # This program is free software: you can redistribute it and/or modify # | ||
42 | 9 | # it under the terms of the GNU Affero General Public License as # | ||
43 | 10 | # published by the Free Software Foundation, either version 3 of the # | ||
44 | 11 | # License, or (at your option) any later version. # | ||
45 | 12 | # # | ||
46 | 13 | # This program is distributed in the hope that it will be useful, # | ||
47 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of # | ||
48 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # | ||
49 | 16 | # GNU Affero General Public License for more details. # | ||
50 | 17 | # # | ||
51 | 18 | # You should have received a copy of the GNU Affero General Public License # | ||
52 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. # | ||
53 | 20 | # # | ||
54 | 21 | ############################################################################### | ||
55 | 22 | |||
56 | 23 | { | ||
57 | 24 | 'name': 'account_check_deposit', | ||
58 | 25 | 'version': '0.1', | ||
59 | 26 | 'category': 'Generic Modules/Others', | ||
60 | 27 | 'license': 'AGPL-3', | ||
61 | 28 | 'description': """This module allows you to use check deposits. | ||
62 | 29 | With a new model : account_check_deposit you can select all | ||
63 | 30 | the checks payments and create a global deposit for the selected checks. | ||
64 | 31 | You may have to create an account for "received checks" and a | ||
65 | 32 | journal for payment by checks.""", | ||
66 | 33 | 'author': 'Akretion', | ||
67 | 34 | 'website': 'http://www.akretion.com/', | ||
68 | 35 | 'depends': [ | ||
69 | 36 | 'account_accountant', | ||
70 | 37 | 'report_webkit', | ||
71 | 38 | ], | ||
72 | 39 | 'data': [ | ||
73 | 40 | 'account_deposit_view.xml', | ||
74 | 41 | 'account_deposit_sequence.xml', | ||
75 | 42 | 'account_type_data.xml', | ||
76 | 43 | 'security/ir.model.access.csv', | ||
77 | 44 | ], | ||
78 | 45 | 'installable': True, | ||
79 | 46 | 'application': True, | ||
80 | 47 | 'active': False, | ||
81 | 48 | } | ||
82 | 0 | 49 | ||
83 | === added file 'account_check_deposit/account_deposit.py' | |||
84 | --- account_check_deposit/account_deposit.py 1970-01-01 00:00:00 +0000 | |||
85 | +++ account_check_deposit/account_deposit.py 2014-03-10 23:55:30 +0000 | |||
86 | @@ -0,0 +1,245 @@ | |||
87 | 1 | # -*- coding: utf-8 -*- | ||
88 | 2 | ############################################################################### | ||
89 | 3 | # # | ||
90 | 4 | # account_check_deposit for OpenERP # | ||
91 | 5 | # Copyright (C) 2012 Akretion Benoît GUILLOT <benoit.guillot@akretion.com> # | ||
92 | 6 | # Copyright (C) 2013 Akretion Chafique DELLI <chafique.delli@akretion.com> # | ||
93 | 7 | # # | ||
94 | 8 | # This program is free software: you can redistribute it and/or modify # | ||
95 | 9 | # it under the terms of the GNU Affero General Public License as # | ||
96 | 10 | # published by the Free Software Foundation, either version 3 of the # | ||
97 | 11 | # License, or (at your option) any later version. # | ||
98 | 12 | # # | ||
99 | 13 | # This program is distributed in the hope that it will be useful, # | ||
100 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of # | ||
101 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # | ||
102 | 16 | # GNU Affero General Public License for more details. # | ||
103 | 17 | # # | ||
104 | 18 | # You should have received a copy of the GNU Affero General Public License # | ||
105 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. # | ||
106 | 20 | # # | ||
107 | 21 | ############################################################################### | ||
108 | 22 | |||
109 | 23 | from openerp.osv import fields, osv, orm | ||
110 | 24 | from openerp.tools.translate import _ | ||
111 | 25 | |||
112 | 26 | |||
113 | 27 | class account_check_deposit(orm.Model): | ||
114 | 28 | _name = "account.check.deposit" | ||
115 | 29 | _description = "Account Check Deposit" | ||
116 | 30 | |||
117 | 31 | def sum_amount(self, cr, uid, ids, name, args, context=None): | ||
118 | 32 | res = {} | ||
119 | 33 | for deposit in self.browse(cr, uid, ids, context=context): | ||
120 | 34 | total = 0 | ||
121 | 35 | for line in deposit.check_payment_ids: | ||
122 | 36 | total += line.debit | ||
123 | 37 | res[deposit.id] = total | ||
124 | 38 | return res | ||
125 | 39 | |||
126 | 40 | def _is_reconcile(self, cr, uid, ids, name, args, context=None): | ||
127 | 41 | res = {} | ||
128 | 42 | for deposit in self.browse(cr, uid, ids, context=context): | ||
129 | 43 | res[deposit.id] = False | ||
130 | 44 | if deposit.move_id: | ||
131 | 45 | for line in deposit.move_id.line_id: | ||
132 | 46 | if line.debit > 0 and line.reconcile_id: | ||
133 | 47 | res[deposit.id] = True | ||
134 | 48 | return res | ||
135 | 49 | |||
136 | 50 | _columns = { | ||
137 | 51 | 'name': fields.char( | ||
138 | 52 | 'Name', | ||
139 | 53 | size=64, | ||
140 | 54 | required=True, | ||
141 | 55 | readonly=True, | ||
142 | 56 | states={'draft': [('readonly', '=', False)]}), | ||
143 | 57 | 'check_payment_ids': fields.one2many( | ||
144 | 58 | 'account.move.line', | ||
145 | 59 | 'check_deposit_id', | ||
146 | 60 | 'Check Payments', | ||
147 | 61 | readonly=True, | ||
148 | 62 | states={'draft': [('readonly', '=', False)]}), | ||
149 | 63 | 'deposit_date': fields.date( | ||
150 | 64 | 'Deposit Date', | ||
151 | 65 | readonly=True, | ||
152 | 66 | states={'draft': [('readonly', '=', False)]}), | ||
153 | 67 | 'journal_id': fields.many2one( | ||
154 | 68 | 'account.journal', | ||
155 | 69 | 'Journal', | ||
156 | 70 | required=True, | ||
157 | 71 | readonly=True, | ||
158 | 72 | states={'draft': [('readonly', '=', False)]}), | ||
159 | 73 | 'state': fields.selection([ | ||
160 | 74 | ('draft', 'Draft'), | ||
161 | 75 | ('done', 'Done'), | ||
162 | 76 | ], 'Status', | ||
163 | 77 | readonly=True), | ||
164 | 78 | 'move_id': fields.many2one( | ||
165 | 79 | 'account.move', | ||
166 | 80 | 'Journal Entry', | ||
167 | 81 | readonly=True, | ||
168 | 82 | states={'draft': [('readonly', '=', False)]}), | ||
169 | 83 | 'bank_id': fields.many2one( | ||
170 | 84 | 'res.partner.bank', | ||
171 | 85 | 'Bank', | ||
172 | 86 | required=True, | ||
173 | 87 | readonly=True, | ||
174 | 88 | domain="[('partner_id', '=', partner_id)]", | ||
175 | 89 | states={'draft': [('readonly', '=', False)]}), | ||
176 | 90 | 'line_ids': fields.related( | ||
177 | 91 | 'move_id', | ||
178 | 92 | 'line_id', | ||
179 | 93 | relation='account.move.line', | ||
180 | 94 | type='one2many', | ||
181 | 95 | string='Lines', | ||
182 | 96 | readonly=True), | ||
183 | 97 | 'partner_id': fields.related( | ||
184 | 98 | 'company_id', | ||
185 | 99 | 'partner_id', | ||
186 | 100 | type="many2one", | ||
187 | 101 | relation="res.partner", | ||
188 | 102 | string="Partner", | ||
189 | 103 | readonly=True), | ||
190 | 104 | 'company_id': fields.many2one( | ||
191 | 105 | 'res.company', | ||
192 | 106 | 'Company', | ||
193 | 107 | required=True, | ||
194 | 108 | change_default=True, | ||
195 | 109 | readonly=True, | ||
196 | 110 | states={'draft': [('readonly', '=', False)]}), | ||
197 | 111 | 'total_amount': fields.function( | ||
198 | 112 | sum_amount, | ||
199 | 113 | string="total amount", | ||
200 | 114 | type="float"), | ||
201 | 115 | 'is_reconcile': fields.function( | ||
202 | 116 | _is_reconcile, | ||
203 | 117 | string="Reconcile", | ||
204 | 118 | type="boolean"), | ||
205 | 119 | } | ||
206 | 120 | |||
207 | 121 | _defaults = { | ||
208 | 122 | 'name': lambda self, cr, uid, context: '/', | ||
209 | 123 | 'deposit_date': fields.date.context_today, | ||
210 | 124 | 'state': 'draft', | ||
211 | 125 | 'company_id': lambda self, cr, uid, c: self.pool.get('res.company').\ | ||
212 | 126 | _company_default_get(cr, uid, 'account.check.deposit', context=c), | ||
213 | 127 | } | ||
214 | 128 | |||
215 | 129 | def unlink(self, cr, uid, ids, context=None): | ||
216 | 130 | for deposit in self.browse(cr, uid, ids, context=context): | ||
217 | 131 | if deposit.state == 'done': | ||
218 | 132 | raise osv.except_osv(_('User Error!'), | ||
219 | 133 | _('You cannot delete a validad deposit, cancel it before')) | ||
220 | 134 | return super(account_check_deposit, self).unlink(cr, uid, ids, context=context) | ||
221 | 135 | |||
222 | 136 | def cancel(self, cr, uid, ids, context=None): | ||
223 | 137 | for deposit in self.browse(cr, uid, ids, context=context): | ||
224 | 138 | if not deposit.journal_id.update_posted: | ||
225 | 139 | raise osv.except_osv( | ||
226 | 140 | _('Error!'), | ||
227 | 141 | _('You cannot modify a posted entry of this journal.\n' | ||
228 | 142 | 'First you should set the journal to allow cancelling ' | ||
229 | 143 | 'entries.')) | ||
230 | 144 | for line in deposit.check_payment_ids: | ||
231 | 145 | if line.reconcile_id: | ||
232 | 146 | line.reconcile_id.unlink() | ||
233 | 147 | if deposit.move_id: | ||
234 | 148 | deposit.move_id.button_cancel() | ||
235 | 149 | deposit.move_id.unlink() | ||
236 | 150 | deposit.write({'state': 'draft'}) | ||
237 | 151 | return True | ||
238 | 152 | |||
239 | 153 | def create(self, cr, uid, vals, context=None): | ||
240 | 154 | if vals.get('name', '/') == '/': | ||
241 | 155 | vals['name'] = self.pool.get('ir.sequence').\ | ||
242 | 156 | get(cr, uid, 'account.check.deposit') | ||
243 | 157 | return super(account_check_deposit, self).\ | ||
244 | 158 | create(cr, uid, vals, context=context) | ||
245 | 159 | |||
246 | 160 | def _prepare_account_move_vals(self, cr, uid, deposit, context=None): | ||
247 | 161 | date = deposit.deposit_date | ||
248 | 162 | move_vals = { | ||
249 | 163 | 'journal_id': deposit.journal_id.id, | ||
250 | 164 | 'date': date, | ||
251 | 165 | } | ||
252 | 166 | period_obj = self.pool['account.period'] | ||
253 | 167 | period_ids = period_obj.find(cr, uid, dt=date, context=context) | ||
254 | 168 | if period_ids: | ||
255 | 169 | move_vals['period_id'] = period_ids[0] | ||
256 | 170 | sum_move_line = self._prepare_sum_move_line_vals( | ||
257 | 171 | cr, uid, deposit, move_vals, context=context) | ||
258 | 172 | move_lines = [[0, 0, sum_move_line]] | ||
259 | 173 | |||
260 | 174 | for line in deposit.check_payment_ids: | ||
261 | 175 | move_line = self._prepare_move_line_vals( | ||
262 | 176 | cr, uid, line, move_vals, context=context) | ||
263 | 177 | move_lines.append([0, 0, move_line]) | ||
264 | 178 | |||
265 | 179 | move_vals.update({'line_id': move_lines}) | ||
266 | 180 | return move_vals | ||
267 | 181 | |||
268 | 182 | def _prepare_move_line_vals(self, cr, uid, line, move_vals, context=None): | ||
269 | 183 | return { | ||
270 | 184 | 'name': line.ref, | ||
271 | 185 | 'credit': line.debit, | ||
272 | 186 | 'account_id': line.account_id.id, | ||
273 | 187 | 'partner_id': line.partner_id.id, | ||
274 | 188 | 'check_line_id': line.id, | ||
275 | 189 | } | ||
276 | 190 | |||
277 | 191 | def _prepare_sum_move_line_vals(self, cr, uid, deposit, move_vals, context=None): | ||
278 | 192 | debit = 0.0 | ||
279 | 193 | for line in deposit.check_payment_ids: | ||
280 | 194 | debit += line.debit | ||
281 | 195 | return { | ||
282 | 196 | 'name': deposit.name, | ||
283 | 197 | 'debit': debit, | ||
284 | 198 | 'ref': deposit.name, | ||
285 | 199 | } | ||
286 | 200 | |||
287 | 201 | def _reconcile_checks(self, cr, uid, move_id, context=None): | ||
288 | 202 | move_line_obj = self.pool['account.move.line'] | ||
289 | 203 | move_obj = self.pool['account.move'] | ||
290 | 204 | move = move_obj.browse(cr, uid, move_id, context=context) | ||
291 | 205 | for line in move.line_id: | ||
292 | 206 | if line.check_line_id: | ||
293 | 207 | move_line_obj.reconcile(cr, uid, [ | ||
294 | 208 | line.id, | ||
295 | 209 | line.check_line_id.id, | ||
296 | 210 | ], context=context) | ||
297 | 211 | return True | ||
298 | 212 | |||
299 | 213 | def onchange_company_id(self, cr, uid, ids, company_id, context=None): | ||
300 | 214 | vals = {} | ||
301 | 215 | if company_id: | ||
302 | 216 | company = self.pool.get('res.company').\ | ||
303 | 217 | browse(cr, uid, company_id, context=context) | ||
304 | 218 | vals['partner_id'] = company.partner_id.id | ||
305 | 219 | return {'value': vals} | ||
306 | 220 | |||
307 | 221 | def validate_deposit(self, cr, uid, ids, context=None): | ||
308 | 222 | move_obj = self.pool.get('account.move') | ||
309 | 223 | if context is None: | ||
310 | 224 | context = {} | ||
311 | 225 | for deposit in self.browse(cr, uid, ids, context=context): | ||
312 | 226 | context['journal_id'] = deposit.journal_id.id | ||
313 | 227 | move_vals = self._prepare_account_move_vals(cr, uid, deposit, context=context) | ||
314 | 228 | move_id = move_obj.create(cr, uid, move_vals, context=context) | ||
315 | 229 | move_obj.post(cr, uid, [move_id], context=context) | ||
316 | 230 | self._reconcile_checks(cr, uid, move_id, context=context) | ||
317 | 231 | deposit.write({'state': 'done', 'move_id': move_id}) | ||
318 | 232 | return True | ||
319 | 233 | |||
320 | 234 | |||
321 | 235 | class account_move_line(orm.Model): | ||
322 | 236 | _inherit = "account.move.line" | ||
323 | 237 | |||
324 | 238 | _columns = { | ||
325 | 239 | 'check_deposit_id': fields.many2one( | ||
326 | 240 | 'account.check.deposit', | ||
327 | 241 | 'Check Deposit'), | ||
328 | 242 | 'check_line_id': fields.many2one( | ||
329 | 243 | 'account.move.line', | ||
330 | 244 | 'Check Receive Move line'), | ||
331 | 245 | } | ||
332 | 0 | 246 | ||
333 | === added file 'account_check_deposit/account_deposit_sequence.xml' | |||
334 | --- account_check_deposit/account_deposit_sequence.xml 1970-01-01 00:00:00 +0000 | |||
335 | +++ account_check_deposit/account_deposit_sequence.xml 2014-03-10 23:55:30 +0000 | |||
336 | @@ -0,0 +1,26 @@ | |||
337 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
338 | 2 | <!-- | ||
339 | 3 | account_check_deposit for OpenERP | ||
340 | 4 | Copyright (C) 2012 Akretion Benoît GUILLOT <benoit.guillot@akretion.com> | ||
341 | 5 | The licence is in the file __openerp__.py | ||
342 | 6 | --> | ||
343 | 7 | |||
344 | 8 | <openerp> | ||
345 | 9 | <data noupdate="1"> | ||
346 | 10 | |||
347 | 11 | <!-- Sequences for account.check.deposit --> | ||
348 | 12 | <record id="seq_type_account_check_deposit" model="ir.sequence.type"> | ||
349 | 13 | <field name="name">Account Check Deposit</field> | ||
350 | 14 | <field name="code">account.check.deposit</field> | ||
351 | 15 | </record> | ||
352 | 16 | |||
353 | 17 | <record id="seq_account_check_deposit" model="ir.sequence"> | ||
354 | 18 | <field name="name">Account Check Deposit</field> | ||
355 | 19 | <field name="code">account.check.deposit</field> | ||
356 | 20 | <field name="prefix">DEP</field> | ||
357 | 21 | <field name="padding">3</field> | ||
358 | 22 | <field name="company_id" eval="False"/> | ||
359 | 23 | </record> | ||
360 | 24 | |||
361 | 25 | </data> | ||
362 | 26 | </openerp> | ||
363 | 0 | 27 | ||
364 | === added file 'account_check_deposit/account_deposit_view.xml' | |||
365 | --- account_check_deposit/account_deposit_view.xml 1970-01-01 00:00:00 +0000 | |||
366 | +++ account_check_deposit/account_deposit_view.xml 2014-03-10 23:55:30 +0000 | |||
367 | @@ -0,0 +1,131 @@ | |||
368 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
369 | 2 | <!-- | ||
370 | 3 | account_check_deposit for OpenERP | ||
371 | 4 | Copyright (C) 2012 Akretion Benoît GUILLOT <benoit.guillot@akretion.com> | ||
372 | 5 | Copyright (C) 2013 Akretion Chafique DELLI <chafique.delli@akretion.com> | ||
373 | 6 | The licence is in the file __openerp__.py | ||
374 | 7 | --> | ||
375 | 8 | |||
376 | 9 | <openerp> | ||
377 | 10 | <data> | ||
378 | 11 | <report | ||
379 | 12 | auto="False" | ||
380 | 13 | file="account_check_deposit/report/check_deposit.mako" | ||
381 | 14 | id="check_deposit_webkit" | ||
382 | 15 | model="account.check.deposit" | ||
383 | 16 | name="check.deposit.webkit" | ||
384 | 17 | report_type="webkit" | ||
385 | 18 | string="Print Checks Deposit"/> | ||
386 | 19 | |||
387 | 20 | <!-- INHERITED VIEW FOR THE OBJECT : account_check_deposit --> | ||
388 | 21 | |||
389 | 22 | <record id="account_check_deposit_view_form" model="ir.ui.view"> | ||
390 | 23 | <field name="name">account_check_deposit.account_check_deposit.view_form</field> | ||
391 | 24 | <field name="model">account.check.deposit</field> | ||
392 | 25 | <field name="type">form</field> | ||
393 | 26 | <field name="arch" type="xml"> | ||
394 | 27 | <form string="Checks Deposit" version="7.0"> | ||
395 | 28 | <header> | ||
396 | 29 | <button name="validate_deposit" states="draft" | ||
397 | 30 | string="Validate Deposit" | ||
398 | 31 | type="object" class="oe_highlight"/> | ||
399 | 32 | <button name="cancel" states="done" | ||
400 | 33 | string="Cancel" type="object" /> | ||
401 | 34 | <field name="state" widget="statusbar" | ||
402 | 35 | statusbar_visible="draft,done" | ||
403 | 36 | statusbar_colors='{"draft":"blue"}'/> | ||
404 | 37 | </header> | ||
405 | 38 | <sheet> | ||
406 | 39 | <h1> | ||
407 | 40 | <label string="Deposit N°" /> | ||
408 | 41 | <field name="name" class="oe_inline" /> | ||
409 | 42 | </h1> | ||
410 | 43 | <group name="deposit_fields"> | ||
411 | 44 | <field name="deposit_date" /> | ||
412 | 45 | <field name="journal_id" /> | ||
413 | 46 | <field name="move_id" /> | ||
414 | 47 | <field name="company_id" | ||
415 | 48 | on_change="onchange_company_id(company_id, context)"/> | ||
416 | 49 | <field name="partner_id" invisible="1"/> | ||
417 | 50 | <field name="bank_id"/> | ||
418 | 51 | </group> | ||
419 | 52 | <notebook colspan="4"> | ||
420 | 53 | <page string="Check Payments"> | ||
421 | 54 | <field name="check_payment_ids" nolabel="1" | ||
422 | 55 | colspan="4" widget="many2many" | ||
423 | 56 | domain="[('reconcile_id','=',False), | ||
424 | 57 | ('account_id.user_type.code','=','received_check')]"> | ||
425 | 58 | <tree string="Check Payment"> | ||
426 | 59 | <field name="journal_id" /> | ||
427 | 60 | <field name="period_id" /> | ||
428 | 61 | <field name="date"/> | ||
429 | 62 | <field name="name"/> | ||
430 | 63 | <field name="ref"/> | ||
431 | 64 | <field name="partner_id" /> | ||
432 | 65 | <field name="account_id" /> | ||
433 | 66 | <field name="move_id" /> | ||
434 | 67 | <field name="debit" sum="Total Debit"/> | ||
435 | 68 | <field name="credit" sum="Total Credit"/> | ||
436 | 69 | <field name="reconcile"/> | ||
437 | 70 | </tree> | ||
438 | 71 | </field> | ||
439 | 72 | </page> | ||
440 | 73 | <page string="Move Line"> | ||
441 | 74 | <field name="line_ids" nolabel="1"/> | ||
442 | 75 | </page> | ||
443 | 76 | </notebook> | ||
444 | 77 | </sheet> | ||
445 | 78 | </form> | ||
446 | 79 | </field> | ||
447 | 80 | </record> | ||
448 | 81 | |||
449 | 82 | <record id="account_check_deposit_view_tree" model="ir.ui.view"> | ||
450 | 83 | <field name="name">account_check_deposit.account_check_deposit.view_tree</field> | ||
451 | 84 | <field name="model">account.check.deposit</field> | ||
452 | 85 | <field name="type">tree</field> | ||
453 | 86 | <field name="arch" type="xml"> | ||
454 | 87 | <tree string="Checks Deposit"> | ||
455 | 88 | <field name="name"/> | ||
456 | 89 | <field name="deposit_date"/> | ||
457 | 90 | <field name="state"/> | ||
458 | 91 | <field name="move_id"/> | ||
459 | 92 | <field name="total_amount"/> | ||
460 | 93 | <field name="is_reconcile"/> | ||
461 | 94 | </tree> | ||
462 | 95 | </field> | ||
463 | 96 | </record> | ||
464 | 97 | |||
465 | 98 | <record id="view_check_deposit_search" model="ir.ui.view"> | ||
466 | 99 | <field name="name">account.check.deposit.search</field> | ||
467 | 100 | <field name="model">account.check.deposit</field> | ||
468 | 101 | <field name="arch" type="xml"> | ||
469 | 102 | <search string="Checks Deposit Search"> | ||
470 | 103 | <field name="name" string="Checks Deposit"/> | ||
471 | 104 | <field name="deposit_date" string="Date"/> | ||
472 | 105 | <field name="state"/> | ||
473 | 106 | <field name="move_id"/> | ||
474 | 107 | <group expand="0" string="Group By..."> | ||
475 | 108 | </group> | ||
476 | 109 | </search> | ||
477 | 110 | </field> | ||
478 | 111 | </record> | ||
479 | 112 | |||
480 | 113 | <record id="action_check_deposit_tree" model="ir.actions.act_window"> | ||
481 | 114 | <field name="name">Checks Deposit</field> | ||
482 | 115 | <field name="res_model">account.check.deposit</field> | ||
483 | 116 | <field name="view_type">form</field> | ||
484 | 117 | <field name="view_mode">tree,form,graph</field> | ||
485 | 118 | <field name="domain">[]</field> | ||
486 | 119 | <field name="context">{}</field> | ||
487 | 120 | <field name="search_view_id" ref="view_check_deposit_search"/> | ||
488 | 121 | <field name="help" type="html"></field> | ||
489 | 122 | </record> | ||
490 | 123 | |||
491 | 124 | <menuitem string="Checks Deposit" | ||
492 | 125 | action="action_check_deposit_tree" | ||
493 | 126 | id="menu_check_deposit_tree" | ||
494 | 127 | parent="account.menu_finance_bank_and_cash" | ||
495 | 128 | sequence="20"/> | ||
496 | 129 | |||
497 | 130 | </data> | ||
498 | 131 | </openerp> | ||
499 | 0 | 132 | ||
500 | === added file 'account_check_deposit/account_type_data.xml' | |||
501 | --- account_check_deposit/account_type_data.xml 1970-01-01 00:00:00 +0000 | |||
502 | +++ account_check_deposit/account_type_data.xml 2014-03-10 23:55:30 +0000 | |||
503 | @@ -0,0 +1,20 @@ | |||
504 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
505 | 2 | <!-- | ||
506 | 3 | account_check_deposit for OpenERP | ||
507 | 4 | Copyright (C) 2012 Akretion Benoît GUILLOT <benoit.guillot@akretion.com> | ||
508 | 5 | The licence is in the file __openerp__.py | ||
509 | 6 | --> | ||
510 | 7 | |||
511 | 8 | <openerp> | ||
512 | 9 | <data noupdate="1"> | ||
513 | 10 | |||
514 | 11 | <!-- New account.account.type --> | ||
515 | 12 | |||
516 | 13 | <record model="account.account.type" id="data_account_type_received_check"> | ||
517 | 14 | <field name="name">Received Checks</field> | ||
518 | 15 | <field name="code">received_check</field> | ||
519 | 16 | <field name="close_method">none</field> | ||
520 | 17 | </record> | ||
521 | 18 | |||
522 | 19 | </data> | ||
523 | 20 | </openerp> | ||
524 | 0 | 21 | ||
525 | === added directory 'account_check_deposit/i18n' | |||
526 | === added file 'account_check_deposit/i18n/account_check_deposit.pot' | |||
527 | --- account_check_deposit/i18n/account_check_deposit.pot 1970-01-01 00:00:00 +0000 | |||
528 | +++ account_check_deposit/i18n/account_check_deposit.pot 2014-03-10 23:55:30 +0000 | |||
529 | @@ -0,0 +1,236 @@ | |||
530 | 1 | # Translation of OpenERP Server. | ||
531 | 2 | # This file contains the translation of the following modules: | ||
532 | 3 | # * account_check_deposit | ||
533 | 4 | # | ||
534 | 5 | msgid "" | ||
535 | 6 | msgstr "" | ||
536 | 7 | "Project-Id-Version: OpenERP Server 7.0\n" | ||
537 | 8 | "Report-Msgid-Bugs-To: \n" | ||
538 | 9 | "POT-Creation-Date: 2013-02-21 10:01+0000\n" | ||
539 | 10 | "PO-Revision-Date: 2013-02-21 10:01+0000\n" | ||
540 | 11 | "Last-Translator: <>\n" | ||
541 | 12 | "Language-Team: \n" | ||
542 | 13 | "MIME-Version: 1.0\n" | ||
543 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
544 | 15 | "Content-Transfer-Encoding: \n" | ||
545 | 16 | "Plural-Forms: \n" | ||
546 | 17 | |||
547 | 18 | #. module: account_check_deposit | ||
548 | 19 | #: code:addons/account_check_deposit/account_deposit.py:76 | ||
549 | 20 | #, python-format | ||
550 | 21 | msgid "You cannot modify a posted entry of this journal.\n" | ||
551 | 22 | "First you should set the journal to allow cancelling entries." | ||
552 | 23 | msgstr "" | ||
553 | 24 | |||
554 | 25 | #. module: account_check_deposit | ||
555 | 26 | #: report:addons/account_check_deposit/report/check_deposit.mako:58 | ||
556 | 27 | msgid "Beneficiary" | ||
557 | 28 | msgstr "" | ||
558 | 29 | |||
559 | 30 | #. module: account_check_deposit | ||
560 | 31 | #: view:account.check.deposit:0 | ||
561 | 32 | msgid "Group By..." | ||
562 | 33 | msgstr "" | ||
563 | 34 | |||
564 | 35 | #. module: account_check_deposit | ||
565 | 36 | #: model:ir.actions.report.xml,name:account_check_deposit.check_deposit_webkit | ||
566 | 37 | msgid "WebKit Checks Deposit" | ||
567 | 38 | msgstr "" | ||
568 | 39 | |||
569 | 40 | #. module: account_check_deposit | ||
570 | 41 | #: report:addons/account_check_deposit/report/check_deposit.mako:79 | ||
571 | 42 | msgid "Designation" | ||
572 | 43 | msgstr "" | ||
573 | 44 | |||
574 | 45 | #. module: account_check_deposit | ||
575 | 46 | #: field:account.check.deposit,state:0 | ||
576 | 47 | msgid "Status" | ||
577 | 48 | msgstr "" | ||
578 | 49 | |||
579 | 50 | #. module: account_check_deposit | ||
580 | 51 | #: report:addons/account_check_deposit/report/check_deposit.mako:78 | ||
581 | 52 | msgid "Description" | ||
582 | 53 | msgstr "" | ||
583 | 54 | |||
584 | 55 | #. module: account_check_deposit | ||
585 | 56 | #: field:account.move.line,check_deposit_id:0 | ||
586 | 57 | msgid "Check Deposit" | ||
587 | 58 | msgstr "" | ||
588 | 59 | |||
589 | 60 | #. module: account_check_deposit | ||
590 | 61 | #: field:account.check.deposit,company_id:0 | ||
591 | 62 | msgid "Company" | ||
592 | 63 | msgstr "" | ||
593 | 64 | |||
594 | 65 | #. module: account_check_deposit | ||
595 | 66 | #: report:addons/account_check_deposit/report/check_deposit.mako:65 | ||
596 | 67 | msgid "RIB Key" | ||
597 | 68 | msgstr "" | ||
598 | 69 | |||
599 | 70 | #. module: account_check_deposit | ||
600 | 71 | #: field:account.check.deposit,deposit_date:0 | ||
601 | 72 | #: report:addons/account_check_deposit/report/check_deposit.mako:53 | ||
602 | 73 | msgid "Deposit Date" | ||
603 | 74 | msgstr "" | ||
604 | 75 | |||
605 | 76 | #. module: account_check_deposit | ||
606 | 77 | #: report:addons/account_check_deposit/report/check_deposit.mako:63 | ||
607 | 78 | msgid "Account to crediting" | ||
608 | 79 | msgstr "" | ||
609 | 80 | |||
610 | 81 | #. module: account_check_deposit | ||
611 | 82 | #: report:addons/account_check_deposit/report/check_deposit.mako:76 | ||
612 | 83 | msgid "Payment Date" | ||
613 | 84 | msgstr "" | ||
614 | 85 | |||
615 | 86 | #. module: account_check_deposit | ||
616 | 87 | #: view:account.check.deposit:0 | ||
617 | 88 | msgid "Date" | ||
618 | 89 | msgstr "" | ||
619 | 90 | |||
620 | 91 | #. module: account_check_deposit | ||
621 | 92 | #: view:account.check.deposit:0 | ||
622 | 93 | msgid "Total Credit" | ||
623 | 94 | msgstr "" | ||
624 | 95 | |||
625 | 96 | #. module: account_check_deposit | ||
626 | 97 | #: field:account.check.deposit,bank_id:0 | ||
627 | 98 | msgid "Bank" | ||
628 | 99 | msgstr "" | ||
629 | 100 | |||
630 | 101 | #. module: account_check_deposit | ||
631 | 102 | #: field:account.check.deposit,name:0 | ||
632 | 103 | msgid "Name" | ||
633 | 104 | msgstr "" | ||
634 | 105 | |||
635 | 106 | #. module: account_check_deposit | ||
636 | 107 | #: view:account.check.deposit:0 | ||
637 | 108 | msgid "Checks Deposit Search" | ||
638 | 109 | msgstr "" | ||
639 | 110 | |||
640 | 111 | #. module: account_check_deposit | ||
641 | 112 | #: model:account.account.type,name:account_check_deposit.data_account_type_received_check | ||
642 | 113 | msgid "Recieved Checks" | ||
643 | 114 | msgstr "" | ||
644 | 115 | |||
645 | 116 | #. module: account_check_deposit | ||
646 | 117 | #: view:account.check.deposit:0 | ||
647 | 118 | #: report:addons/account_check_deposit/report/check_deposit.mako:49 | ||
648 | 119 | msgid "Deposit N°" | ||
649 | 120 | msgstr "" | ||
650 | 121 | |||
651 | 122 | #. module: account_check_deposit | ||
652 | 123 | #: view:account.check.deposit:0 | ||
653 | 124 | msgid "Total Debit" | ||
654 | 125 | msgstr "" | ||
655 | 126 | |||
656 | 127 | #. module: account_check_deposit | ||
657 | 128 | #: code:addons/account_check_deposit/account_deposit.py:76 | ||
658 | 129 | #, python-format | ||
659 | 130 | msgid "Error!" | ||
660 | 131 | msgstr "" | ||
661 | 132 | |||
662 | 133 | #. module: account_check_deposit | ||
663 | 134 | #: report:addons/account_check_deposit/report/check_deposit.mako:80 | ||
664 | 135 | msgid "Amount" | ||
665 | 136 | msgstr "" | ||
666 | 137 | |||
667 | 138 | #. module: account_check_deposit | ||
668 | 139 | #: view:account.check.deposit:0 | ||
669 | 140 | #: model:ir.actions.act_window,name:account_check_deposit.action_check_deposit_tree | ||
670 | 141 | #: model:ir.ui.menu,name:account_check_deposit.menu_check_deposit_tree | ||
671 | 142 | msgid "Checks Deposit" | ||
672 | 143 | msgstr "" | ||
673 | 144 | |||
674 | 145 | #. module: account_check_deposit | ||
675 | 146 | #: field:account.check.deposit,total_amount:0 | ||
676 | 147 | msgid "total amount" | ||
677 | 148 | msgstr "" | ||
678 | 149 | |||
679 | 150 | #. module: account_check_deposit | ||
680 | 151 | #: field:account.check.deposit,partner_id:0 | ||
681 | 152 | msgid "Partner" | ||
682 | 153 | msgstr "" | ||
683 | 154 | |||
684 | 155 | #. module: account_check_deposit | ||
685 | 156 | #: selection:account.check.deposit,state:0 | ||
686 | 157 | msgid "Cancelled" | ||
687 | 158 | msgstr "" | ||
688 | 159 | |||
689 | 160 | #. module: account_check_deposit | ||
690 | 161 | #: view:account.check.deposit:0 | ||
691 | 162 | msgid "Validate Deposit" | ||
692 | 163 | msgstr "" | ||
693 | 164 | |||
694 | 165 | #. module: account_check_deposit | ||
695 | 166 | #: view:account.check.deposit:0 | ||
696 | 167 | #: field:account.check.deposit,check_payment_ids:0 | ||
697 | 168 | #: report:addons/account_check_deposit/report/check_deposit.mako:70 | ||
698 | 169 | msgid "Check Payments" | ||
699 | 170 | msgstr "" | ||
700 | 171 | |||
701 | 172 | #. module: account_check_deposit | ||
702 | 173 | #: report:addons/account_check_deposit/report/check_deposit.mako:41 | ||
703 | 174 | msgid "Deposit Slip of Checks(\\u20acuros)" | ||
704 | 175 | msgstr "" | ||
705 | 176 | |||
706 | 177 | #. module: account_check_deposit | ||
707 | 178 | #: report:addons/account_check_deposit/report/check_deposit.mako:55 | ||
708 | 179 | msgid "Bank Code" | ||
709 | 180 | msgstr "" | ||
710 | 181 | |||
711 | 182 | #. module: account_check_deposit | ||
712 | 183 | #: report:addons/account_check_deposit/report/check_deposit.mako:77 | ||
713 | 184 | msgid "Reference" | ||
714 | 185 | msgstr "" | ||
715 | 186 | |||
716 | 187 | #. module: account_check_deposit | ||
717 | 188 | #: model:ir.model,name:account_check_deposit.model_account_check_deposit | ||
718 | 189 | msgid "Account Check Deposit" | ||
719 | 190 | msgstr "" | ||
720 | 191 | |||
721 | 192 | #. module: account_check_deposit | ||
722 | 193 | #: report:addons/account_check_deposit/report/check_deposit.mako:60 | ||
723 | 194 | msgid "Office Code" | ||
724 | 195 | msgstr "" | ||
725 | 196 | |||
726 | 197 | #. module: account_check_deposit | ||
727 | 198 | #: view:account.check.deposit:0 | ||
728 | 199 | msgid "Check Payment" | ||
729 | 200 | msgstr "" | ||
730 | 201 | |||
731 | 202 | #. module: account_check_deposit | ||
732 | 203 | #: selection:account.check.deposit,state:0 | ||
733 | 204 | msgid "Done" | ||
734 | 205 | msgstr "" | ||
735 | 206 | |||
736 | 207 | #. module: account_check_deposit | ||
737 | 208 | #: view:account.check.deposit:0 | ||
738 | 209 | msgid "Cancel" | ||
739 | 210 | msgstr "" | ||
740 | 211 | |||
741 | 212 | #. module: account_check_deposit | ||
742 | 213 | #: selection:account.check.deposit,state:0 | ||
743 | 214 | msgid "Draft" | ||
744 | 215 | msgstr "" | ||
745 | 216 | |||
746 | 217 | #. module: account_check_deposit | ||
747 | 218 | #: report:addons/account_check_deposit/report/check_deposit.mako:99 | ||
748 | 219 | msgid "Total:" | ||
749 | 220 | msgstr "" | ||
750 | 221 | |||
751 | 222 | #. module: account_check_deposit | ||
752 | 223 | #: field:account.check.deposit,move_id:0 | ||
753 | 224 | msgid "Journal Entry" | ||
754 | 225 | msgstr "" | ||
755 | 226 | |||
756 | 227 | #. module: account_check_deposit | ||
757 | 228 | #: field:account.check.deposit,journal_id:0 | ||
758 | 229 | msgid "Journal" | ||
759 | 230 | msgstr "" | ||
760 | 231 | |||
761 | 232 | #. module: account_check_deposit | ||
762 | 233 | #: model:ir.model,name:account_check_deposit.model_account_move_line | ||
763 | 234 | msgid "Journal Items" | ||
764 | 235 | msgstr "" | ||
765 | 236 | |||
766 | 0 | 237 | ||
767 | === added file 'account_check_deposit/i18n/fr.po' | |||
768 | --- account_check_deposit/i18n/fr.po 1970-01-01 00:00:00 +0000 | |||
769 | +++ account_check_deposit/i18n/fr.po 2014-03-10 23:55:30 +0000 | |||
770 | @@ -0,0 +1,236 @@ | |||
771 | 1 | # Translation of OpenERP Server. | ||
772 | 2 | # This file contains the translation of the following modules: | ||
773 | 3 | # * account_check_deposit | ||
774 | 4 | # | ||
775 | 5 | msgid "" | ||
776 | 6 | msgstr "" | ||
777 | 7 | "Project-Id-Version: OpenERP Server 7.0\n" | ||
778 | 8 | "Report-Msgid-Bugs-To: \n" | ||
779 | 9 | "POT-Creation-Date: 2013-02-21 10:01+0000\n" | ||
780 | 10 | "PO-Revision-Date: 2013-02-21 10:01+0000\n" | ||
781 | 11 | "Last-Translator: <>\n" | ||
782 | 12 | "Language-Team: \n" | ||
783 | 13 | "MIME-Version: 1.0\n" | ||
784 | 14 | "Content-Type: text/plain; charset=UTF-8\n" | ||
785 | 15 | "Content-Transfer-Encoding: \n" | ||
786 | 16 | "Plural-Forms: \n" | ||
787 | 17 | |||
788 | 18 | #. module: account_check_deposit | ||
789 | 19 | #: code:addons/account_check_deposit/account_deposit.py:76 | ||
790 | 20 | #, python-format | ||
791 | 21 | msgid "You cannot modify a posted entry of this journal.\n" | ||
792 | 22 | "First you should set the journal to allow cancelling entries." | ||
793 | 23 | msgstr "" | ||
794 | 24 | |||
795 | 25 | #. module: account_check_deposit | ||
796 | 26 | #: report:addons/account_check_deposit/report/check_deposit.mako:58 | ||
797 | 27 | msgid "Beneficiary" | ||
798 | 28 | msgstr "Bénéficiaire" | ||
799 | 29 | |||
800 | 30 | #. module: account_check_deposit | ||
801 | 31 | #: view:account.check.deposit:0 | ||
802 | 32 | msgid "Group By..." | ||
803 | 33 | msgstr "Regrouper par..." | ||
804 | 34 | |||
805 | 35 | #. module: account_check_deposit | ||
806 | 36 | #: model:ir.actions.report.xml,name:account_check_deposit.check_deposit_webkit | ||
807 | 37 | msgid "Print Checks Deposit" | ||
808 | 38 | msgstr "Imprimer Remise de Chèques" | ||
809 | 39 | |||
810 | 40 | #. module: account_check_deposit | ||
811 | 41 | #: report:addons/account_check_deposit/report/check_deposit.mako:79 | ||
812 | 42 | msgid "Designation" | ||
813 | 43 | msgstr "Désignation" | ||
814 | 44 | |||
815 | 45 | #. module: account_check_deposit | ||
816 | 46 | #: field:account.check.deposit,state:0 | ||
817 | 47 | msgid "Status" | ||
818 | 48 | msgstr "Etat" | ||
819 | 49 | |||
820 | 50 | #. module: account_check_deposit | ||
821 | 51 | #: report:addons/account_check_deposit/report/check_deposit.mako:78 | ||
822 | 52 | msgid "Description" | ||
823 | 53 | msgstr "Description" | ||
824 | 54 | |||
825 | 55 | #. module: account_check_deposit | ||
826 | 56 | #: field:account.move.line,check_deposit_id:0 | ||
827 | 57 | msgid "Check Deposit" | ||
828 | 58 | msgstr "Remise de Chèque" | ||
829 | 59 | |||
830 | 60 | #. module: account_check_deposit | ||
831 | 61 | #: field:account.check.deposit,company_id:0 | ||
832 | 62 | msgid "Company" | ||
833 | 63 | msgstr "Société" | ||
834 | 64 | |||
835 | 65 | #. module: account_check_deposit | ||
836 | 66 | #: report:addons/account_check_deposit/report/check_deposit.mako:65 | ||
837 | 67 | msgid "BIS Key" | ||
838 | 68 | msgstr "Clé RIB" | ||
839 | 69 | |||
840 | 70 | #. module: account_check_deposit | ||
841 | 71 | #: field:account.check.deposit,deposit_date:0 | ||
842 | 72 | #: report:addons/account_check_deposit/report/check_deposit.mako:53 | ||
843 | 73 | msgid "Deposit Date" | ||
844 | 74 | msgstr "Date du Versement" | ||
845 | 75 | |||
846 | 76 | #. module: account_check_deposit | ||
847 | 77 | #: report:addons/account_check_deposit/report/check_deposit.mako:63 | ||
848 | 78 | msgid "Account to crediting" | ||
849 | 79 | msgstr "Compte à Créditer" | ||
850 | 80 | |||
851 | 81 | #. module: account_check_deposit | ||
852 | 82 | #: report:addons/account_check_deposit/report/check_deposit.mako:76 | ||
853 | 83 | msgid "Payment Date" | ||
854 | 84 | msgstr "Date de Paiement" | ||
855 | 85 | |||
856 | 86 | #. module: account_check_deposit | ||
857 | 87 | #: view:account.check.deposit:0 | ||
858 | 88 | msgid "Date" | ||
859 | 89 | msgstr "Date" | ||
860 | 90 | |||
861 | 91 | #. module: account_check_deposit | ||
862 | 92 | #: view:account.check.deposit:0 | ||
863 | 93 | msgid "Total Credit" | ||
864 | 94 | msgstr "Crédit Total" | ||
865 | 95 | |||
866 | 96 | #. module: account_check_deposit | ||
867 | 97 | #: field:account.check.deposit,bank_id:0 | ||
868 | 98 | msgid "Bank" | ||
869 | 99 | msgstr "Banque" | ||
870 | 100 | |||
871 | 101 | #. module: account_check_deposit | ||
872 | 102 | #: field:account.check.deposit,name:0 | ||
873 | 103 | msgid "Name" | ||
874 | 104 | msgstr "Nom" | ||
875 | 105 | |||
876 | 106 | #. module: account_check_deposit | ||
877 | 107 | #: view:account.check.deposit:0 | ||
878 | 108 | msgid "Checks Deposit Search" | ||
879 | 109 | msgstr "Rechercher une Remise de Chèques" | ||
880 | 110 | |||
881 | 111 | #. module: account_check_deposit | ||
882 | 112 | #: model:account.account.type,name:account_check_deposit.data_account_type_received_check | ||
883 | 113 | msgid "Recieved Checks" | ||
884 | 114 | msgstr "Chèques Reçus" | ||
885 | 115 | |||
886 | 116 | #. module: account_check_deposit | ||
887 | 117 | #: view:account.check.deposit:0 | ||
888 | 118 | #: report:addons/account_check_deposit/report/check_deposit.mako:49 | ||
889 | 119 | msgid "Deposit N°" | ||
890 | 120 | msgstr "Versement N°" | ||
891 | 121 | |||
892 | 122 | #. module: account_check_deposit | ||
893 | 123 | #: view:account.check.deposit:0 | ||
894 | 124 | msgid "Total Debit" | ||
895 | 125 | msgstr "Débit Total" | ||
896 | 126 | |||
897 | 127 | #. module: account_check_deposit | ||
898 | 128 | #: code:addons/account_check_deposit/account_deposit.py:76 | ||
899 | 129 | #, python-format | ||
900 | 130 | msgid "Error!" | ||
901 | 131 | msgstr "Erreur!" | ||
902 | 132 | |||
903 | 133 | #. module: account_check_deposit | ||
904 | 134 | #: report:addons/account_check_deposit/report/check_deposit.mako:80 | ||
905 | 135 | msgid "Amount" | ||
906 | 136 | msgstr "Montant" | ||
907 | 137 | |||
908 | 138 | #. module: account_check_deposit | ||
909 | 139 | #: view:account.check.deposit:0 | ||
910 | 140 | #: model:ir.actions.act_window,name:account_check_deposit.action_check_deposit_tree | ||
911 | 141 | #: model:ir.ui.menu,name:account_check_deposit.menu_check_deposit_tree | ||
912 | 142 | msgid "Checks Deposit" | ||
913 | 143 | msgstr "Remise de Chèques" | ||
914 | 144 | |||
915 | 145 | #. module: account_check_deposit | ||
916 | 146 | #: field:account.check.deposit,total_amount:0 | ||
917 | 147 | msgid "total amount" | ||
918 | 148 | msgstr "montant total" | ||
919 | 149 | |||
920 | 150 | #. module: account_check_deposit | ||
921 | 151 | #: field:account.check.deposit,partner_id:0 | ||
922 | 152 | msgid "Partner" | ||
923 | 153 | msgstr "Partenaire" | ||
924 | 154 | |||
925 | 155 | #. module: account_check_deposit | ||
926 | 156 | #: selection:account.check.deposit,state:0 | ||
927 | 157 | msgid "Cancelled" | ||
928 | 158 | msgstr "Annulé" | ||
929 | 159 | |||
930 | 160 | #. module: account_check_deposit | ||
931 | 161 | #: view:account.check.deposit:0 | ||
932 | 162 | msgid "Validate Deposit" | ||
933 | 163 | msgstr "Valider Versement" | ||
934 | 164 | |||
935 | 165 | #. module: account_check_deposit | ||
936 | 166 | #: view:account.check.deposit:0 | ||
937 | 167 | #: field:account.check.deposit,check_payment_ids:0 | ||
938 | 168 | #: report:addons/account_check_deposit/report/check_deposit.mako:70 | ||
939 | 169 | msgid "Check Payments" | ||
940 | 170 | msgstr "Paiements par Chèque" | ||
941 | 171 | |||
942 | 172 | #. module: account_check_deposit | ||
943 | 173 | #: report:addons/account_check_deposit/report/check_deposit.mako:41 | ||
944 | 174 | msgid "Deposit Slip of Checks(Euros)" | ||
945 | 175 | msgstr "Bordereau de Remise de Chèques(Euros)" | ||
946 | 176 | |||
947 | 177 | #. module: account_check_deposit | ||
948 | 178 | #: report:addons/account_check_deposit/report/check_deposit.mako:55 | ||
949 | 179 | msgid "Bank Code" | ||
950 | 180 | msgstr "Code Banque" | ||
951 | 181 | |||
952 | 182 | #. module: account_check_deposit | ||
953 | 183 | #: report:addons/account_check_deposit/report/check_deposit.mako:77 | ||
954 | 184 | msgid "Reference" | ||
955 | 185 | msgstr "Référence" | ||
956 | 186 | |||
957 | 187 | #. module: account_check_deposit | ||
958 | 188 | #: model:ir.model,name:account_check_deposit.model_account_check_deposit | ||
959 | 189 | msgid "Account Check Deposit" | ||
960 | 190 | msgstr "Compte Remise de Chèque" | ||
961 | 191 | |||
962 | 192 | #. module: account_check_deposit | ||
963 | 193 | #: report:addons/account_check_deposit/report/check_deposit.mako:60 | ||
964 | 194 | msgid "Office Code" | ||
965 | 195 | msgstr "Code Guichet" | ||
966 | 196 | |||
967 | 197 | #. module: account_check_deposit | ||
968 | 198 | #: view:account.check.deposit:0 | ||
969 | 199 | msgid "Check Payment" | ||
970 | 200 | msgstr "Paiement par Chèque" | ||
971 | 201 | |||
972 | 202 | #. module: account_check_deposit | ||
973 | 203 | #: selection:account.check.deposit,state:0 | ||
974 | 204 | msgid "Done" | ||
975 | 205 | msgstr "Terminé" | ||
976 | 206 | |||
977 | 207 | #. module: account_check_deposit | ||
978 | 208 | #: view:account.check.deposit:0 | ||
979 | 209 | msgid "Cancel" | ||
980 | 210 | msgstr "Annuler" | ||
981 | 211 | |||
982 | 212 | #. module: account_check_deposit | ||
983 | 213 | #: selection:account.check.deposit,state:0 | ||
984 | 214 | msgid "Draft" | ||
985 | 215 | msgstr "Brouillon" | ||
986 | 216 | |||
987 | 217 | #. module: account_check_deposit | ||
988 | 218 | #: report:addons/account_check_deposit/report/check_deposit.mako:99 | ||
989 | 219 | msgid "Total:" | ||
990 | 220 | msgstr "Total:" | ||
991 | 221 | |||
992 | 222 | #. module: account_check_deposit | ||
993 | 223 | #: field:account.check.deposit,move_id:0 | ||
994 | 224 | msgid "Journal Entry" | ||
995 | 225 | msgstr "Pièce Comptable" | ||
996 | 226 | |||
997 | 227 | #. module: account_check_deposit | ||
998 | 228 | #: field:account.check.deposit,journal_id:0 | ||
999 | 229 | msgid "Journal" | ||
1000 | 230 | msgstr "Journal" | ||
1001 | 231 | |||
1002 | 232 | #. module: account_check_deposit | ||
1003 | 233 | #: model:ir.model,name:account_check_deposit.model_account_move_line | ||
1004 | 234 | msgid "Journal Items" | ||
1005 | 235 | msgstr "Écritures comptables" | ||
1006 | 236 | |||
1007 | 0 | 237 | ||
1008 | === added directory 'account_check_deposit/report' | |||
1009 | === added file 'account_check_deposit/report/.directory' | |||
1010 | --- account_check_deposit/report/.directory 1970-01-01 00:00:00 +0000 | |||
1011 | +++ account_check_deposit/report/.directory 2014-03-10 23:55:30 +0000 | |||
1012 | @@ -0,0 +1,6 @@ | |||
1013 | 1 | [Dolphin] | ||
1014 | 2 | AdditionalInfoV2=Details_Size,Details_Date,CustomizedDetails | ||
1015 | 3 | Sorting=2 | ||
1016 | 4 | Timestamp=2012,3,5,14,27,49 | ||
1017 | 5 | Version=2 | ||
1018 | 6 | ViewMode=1 | ||
1019 | 0 | 7 | ||
1020 | === added file 'account_check_deposit/report/.mako' | |||
1021 | --- account_check_deposit/report/.mako 1970-01-01 00:00:00 +0000 | |||
1022 | +++ account_check_deposit/report/.mako 2014-03-10 23:55:30 +0000 | |||
1023 | @@ -0,0 +1,275 @@ | |||
1024 | 1 | <html> | ||
1025 | 2 | <head> | ||
1026 | 3 | <style type="text/css"> | ||
1027 | 4 | ${css} | ||
1028 | 5 | pre {font-family:helvetica; font-size:12;} | ||
1029 | 6 | </style> | ||
1030 | 7 | </head> | ||
1031 | 8 | <body> | ||
1032 | 9 | <style type="text/css"> | ||
1033 | 10 | table { | ||
1034 | 11 | width: 100%; | ||
1035 | 12 | page-break-after:auto; | ||
1036 | 13 | border-collapse: collapse; | ||
1037 | 14 | cellspacing="0"; | ||
1038 | 15 | font-size:10px; | ||
1039 | 16 | } | ||
1040 | 17 | td { margin: 0px; padding: 3px; border: 1px solid lightgrey; vertical-align: top; } | ||
1041 | 18 | pre {font-family:helvetica; font-size:12;} | ||
1042 | 19 | </style> | ||
1043 | 20 | |||
1044 | 21 | <% | ||
1045 | 22 | def carriage_returns(text): | ||
1046 | 23 | return text.replace('\n', '<br />') | ||
1047 | 24 | %> | ||
1048 | 25 | |||
1049 | 26 | %for order in objects : | ||
1050 | 27 | <br> | ||
1051 | 28 | <% setLang(order.partner_id.lang) %> | ||
1052 | 29 | <table > | ||
1053 | 30 | %if order.company_id.address_label_position == 'left': | ||
1054 | 31 | <tr> | ||
1055 | 32 | <td style="width:50%"> | ||
1056 | 33 | ${_("Shipping Address")} | ||
1057 | 34 | <hr> | ||
1058 | 35 | <pre> | ||
1059 | 36 | ${order.partner_shipping_id.address_label} | ||
1060 | 37 | <pre> | ||
1061 | 38 | </td> | ||
1062 | 39 | <td style="width:50%"> | ||
1063 | 40 | %if order.partner_id.address_label != order.partner_shipping_id.address_label: | ||
1064 | 41 | <b>${_("Ordering Contact")}</b><br> | ||
1065 | 42 | ${order.partner_id.address_label|carriage_returns} | ||
1066 | 43 | %endif | ||
1067 | 44 | %if order.partner_id.phone : | ||
1068 | 45 | ${_("Phone")}: ${order.partner_id.phone|entity} <br> | ||
1069 | 46 | %endif | ||
1070 | 47 | %if order.partner_id.fax : | ||
1071 | 48 | ${_("Fax")}: ${order.partner_id.fax|entity} <br> | ||
1072 | 49 | %endif | ||
1073 | 50 | %if order.partner_id.email : | ||
1074 | 51 | ${_("Mail")}: ${order.partner_id.email|entity} <br> | ||
1075 | 52 | %endif | ||
1076 | 53 | %if order.partner_invoice_id.address_label != order.partner_shipping_id.address_label: | ||
1077 | 54 | <br> | ||
1078 | 55 | <b>${_("Invoice Address")}</b><br> | ||
1079 | 56 | ${order.partner_invoice_id.address_label|carriage_returns} | ||
1080 | 57 | %endif | ||
1081 | 58 | %if order.partner_invoice_id.partner_id.vat : | ||
1082 | 59 | ${_("VAT")}: ${order.partner_invoice_id.partner_id.vat|entity} <br> | ||
1083 | 60 | %endif | ||
1084 | 61 | |||
1085 | 62 | </td> | ||
1086 | 63 | |||
1087 | 64 | </tr> | ||
1088 | 65 | %endif | ||
1089 | 66 | |||
1090 | 67 | %if order.company_id.address_label_position == 'right' or not order.company_id.address_label_position: | ||
1091 | 68 | <tr> | ||
1092 | 69 | <td style="width:50%"> | ||
1093 | 70 | %if order.partner_id.address_label != order.partner_shipping_id.address_label: | ||
1094 | 71 | <b>${_("Ordering Contact")}</b><br> | ||
1095 | 72 | <hr> | ||
1096 | 73 | ${order.partner_id.address_label|carriage_returns} | ||
1097 | 74 | %endif | ||
1098 | 75 | %if order.partner_id.phone : | ||
1099 | 76 | ${_("Tel")}: ${order.partner_id.phone|entity} <br> | ||
1100 | 77 | %endif | ||
1101 | 78 | %if order.partner_id.fax : | ||
1102 | 79 | ${_("Fax")}: ${order.partner_id.fax|entity} <br> | ||
1103 | 80 | %endif | ||
1104 | 81 | %if order.partner_id.email : | ||
1105 | 82 | ${_("E-mail")}: ${order.partner_id.email|entity} <br> | ||
1106 | 83 | %endif | ||
1107 | 84 | %if order.partner_invoice_id.address_label != order.partner_shipping_id.address_label: | ||
1108 | 85 | <br> | ||
1109 | 86 | <hr> | ||
1110 | 87 | <b>${_("Invoice Address")}</b><br> | ||
1111 | 88 | <hr> | ||
1112 | 89 | ${order.partner_invoice_id.address_label|carriage_returns} | ||
1113 | 90 | %endif | ||
1114 | 91 | %if order.partner_invoice_id.vat : | ||
1115 | 92 | ${_("VAT")}: ${order.partner_invoice_id.vat|entity} <br> | ||
1116 | 93 | %endif | ||
1117 | 94 | |||
1118 | 95 | </td> | ||
1119 | 96 | <td style="width:50%"> | ||
1120 | 97 | <b>${_("Shipping Address")}</b><br> | ||
1121 | 98 | <hr> | ||
1122 | 99 | <pre> | ||
1123 | 100 | ${order.partner_shipping_id.address_label} | ||
1124 | 101 | <pre> | ||
1125 | 102 | </td> | ||
1126 | 103 | </tr> | ||
1127 | 104 | %endif | ||
1128 | 105 | </table> | ||
1129 | 106 | |||
1130 | 107 | <br /> | ||
1131 | 108 | <br /> | ||
1132 | 109 | |||
1133 | 110 | %if order.state == 'draft' : | ||
1134 | 111 | <span class="title">${_("Quotation N°")} ${order.name or ''|entity}</span> | ||
1135 | 112 | %elif order.state == 'cancel' : | ||
1136 | 113 | <span class="title">${_("Sale Order Canceled")} ${order.name or ''|entity}</span> | ||
1137 | 114 | %else : | ||
1138 | 115 | <span class="title">${_("Order N°")} ${order.name or ''|entity}</span> | ||
1139 | 116 | %endif | ||
1140 | 117 | <br/> | ||
1141 | 118 | <table style="width:100%"> | ||
1142 | 119 | <tr> | ||
1143 | 120 | %if order.client_order_ref: | ||
1144 | 121 | <td>${_("Reference")}</td> | ||
1145 | 122 | %endif | ||
1146 | 123 | %if order.project_id: | ||
1147 | 124 | <td>${_("Projekt")}</td> | ||
1148 | 125 | %endif | ||
1149 | 126 | <td style="text-align:center;white-space:nowrap"><b>${_("Order Date")}</b></td> | ||
1150 | 127 | %if order.carrier_id: | ||
1151 | 128 | <td style="text-align:center;white-space:nowrap"><b>${_("Carrier")}</b></td> | ||
1152 | 129 | %endif | ||
1153 | 130 | %if order.user_id: | ||
1154 | 131 | <td style="text-align:center;white-space:nowrap"><b>${_("Salesman")}</b></td> | ||
1155 | 132 | %endif | ||
1156 | 133 | %if order.payment_term : | ||
1157 | 134 | <td style="text-align:center;white-space:nowrap"><b>${_("Payment Term")}</b></td> | ||
1158 | 135 | %endif | ||
1159 | 136 | %if order.incoterm: | ||
1160 | 137 | <td style="text-align:center;white-space:nowrap"><b>${_("Incoterm")}</b></td> | ||
1161 | 138 | %endif | ||
1162 | 139 | |||
1163 | 140 | <td style="text-align:center;white-space:nowrap"><b>${_("Curr")}</b></td> | ||
1164 | 141 | </tr> | ||
1165 | 142 | <tr> | ||
1166 | 143 | %if order.client_order_ref: | ||
1167 | 144 | <td> | ||
1168 | 145 | ${order.client_order_ref} | ||
1169 | 146 | </td> | ||
1170 | 147 | %endif | ||
1171 | 148 | %if order.project_id: | ||
1172 | 149 | <td>${order.project_id.name}</td> | ||
1173 | 150 | %endif | ||
1174 | 151 | %if order.date_order: | ||
1175 | 152 | <td> | ||
1176 | 153 | ${order.date_order or ''}</td> | ||
1177 | 154 | %endif | ||
1178 | 155 | %if order.carrier_id: | ||
1179 | 156 | <td> | ||
1180 | 157 | ${order.carrier_id.name } | ||
1181 | 158 | </td> | ||
1182 | 159 | %endif | ||
1183 | 160 | %if order.user_id : | ||
1184 | 161 | <td>${order.user_id.name or ''}</td> | ||
1185 | 162 | %endif | ||
1186 | 163 | %if order.payment_term : | ||
1187 | 164 | <td>${order.payment_term.name}</td> | ||
1188 | 165 | %endif | ||
1189 | 166 | %if order.incoterm: | ||
1190 | 167 | <td>${order.incoterm.name}</td> | ||
1191 | 168 | %endif | ||
1192 | 169 | |||
1193 | 170 | <td style="white-space:nowrap">${order.pricelist_id.currency_id.name} </td> | ||
1194 | 171 | </table> | ||
1195 | 172 | <h1><br /></h1> | ||
1196 | 173 | <table style="width:100%"> | ||
1197 | 174 | <thead> | ||
1198 | 175 | <tr> | ||
1199 | 176 | %if order.print_code: | ||
1200 | 177 | <td style="text-align:center;white-space:nowrap"><b>${_("Code")}</b></td> | ||
1201 | 178 | <td style="text-align:center;white-space:nowrap"><b>${_("Description")}</b></td> | ||
1202 | 179 | %else: | ||
1203 | 180 | <td style="text-align:center;white-space:nowrap"><b>${_("Description")}</b></td> | ||
1204 | 181 | %endif | ||
1205 | 182 | <td style="text-align:center;white-space:nowrap"><b>${_("Tax")}</b></td> | ||
1206 | 183 | %if order.print_uom: | ||
1207 | 184 | <td style="text-align:center;white-space:nowrap"><b>${_("Quantity")}</b></td><td style="text-align:center;white-space:nowrap"><b>${_("UoM")}</b></td> | ||
1208 | 185 | %endif | ||
1209 | 186 | %if order.print_uos: | ||
1210 | 187 | <th style="text-align:center;white-space:nowrap">${_("UoS Qty")}</th><th style="text-align:center;white-space:nowrap;">${_("UoS")}</th> | ||
1211 | 188 | %endif | ||
1212 | 189 | %if order.print_ean: | ||
1213 | 190 | <td style="text-align:center;white-space:nowrap"><b>${_("EAN")}</b></td> | ||
1214 | 191 | %endif | ||
1215 | 192 | %if order.print_packing: | ||
1216 | 193 | <td style="text-align:center;white-space:nowrap"><b>${_("Pack")}</b></td> | ||
1217 | 194 | <td style="text-align:center;white-space:nowrap"><b>${_("Packaging")}</b></td> | ||
1218 | 195 | %endif | ||
1219 | 196 | <td style="text-align:center;white-space:nowrap"><b>${_("Price Unit")}</b></td> | ||
1220 | 197 | %if order.print_discount: | ||
1221 | 198 | <td style="text-align:center;white-space:nowrap"><b>${_("Discount")}</b></td> | ||
1222 | 199 | %endif | ||
1223 | 200 | <td style="text-align:center;white-space:nowrap"><b>${_("Sub Total")}</b></td> | ||
1224 | 201 | </tr> | ||
1225 | 202 | </thead> | ||
1226 | 203 | %for line in order.order_line_sorted : | ||
1227 | 204 | <tbody> | ||
1228 | 205 | <tr> | ||
1229 | 206 | %if order.print_code: | ||
1230 | 207 | <td>${line.product_id.default_code or ''|entity}</td> | ||
1231 | 208 | <td> | ||
1232 | 209 | ${line.product_id.name or line.name|entity} | ||
1233 | 210 | |||
1234 | 211 | |||
1235 | 212 | </td> | ||
1236 | 213 | %else: | ||
1237 | 214 | <td>${line.name|entity} | ||
1238 | 215 | |||
1239 | 216 | </td | ||
1240 | 217 | %endif | ||
1241 | 218 | <td>${ ', '.join([tax.name or '' for tax in line.tax_id]) }</td> | ||
1242 | 219 | %if order.print_uom: | ||
1243 | 220 | <td style="white-space:nowrap;text-align:right;">${str(line.product_uom_qty).replace(',000','') or '0'}</td> | ||
1244 | 221 | <td style="white-space:nowrap;text-align:left;">${line.product_uom.name or ''}</td> | ||
1245 | 222 | %endif | ||
1246 | 223 | %if order.print_uos: | ||
1247 | 224 | <td style="white-space:nowrap;text-align:right;">${str(line.product_uos_qty).replace(',000','') or '0'}</td> | ||
1248 | 225 | <td style="white-space:nowrap;text-align:left;">${line.product_uos.name or ''}</td> | ||
1249 | 226 | %endif | ||
1250 | 227 | %if order.print_ean: | ||
1251 | 228 | <td style="white-space:nowrap;text-align:left;">${line.product_packaging.ean or line.product_id.ean13 or ''}</td> | ||
1252 | 229 | %endif | ||
1253 | 230 | %if order.print_packing: | ||
1254 | 231 | <td style="white-space:normal;text-align:left;">${line.product_packaging.qty and line.product_uom_qty/line.product_packaging.qty or ''}</td> | ||
1255 | 232 | <td style="white-space:normal;text-align:left;">${line.product_packaging and line.product_packaging.ul.name or ''} ${line.product_packaging and _(" / " or '')} ${line.product_packaging and line.product_packaging.qty or ''} ${line.product_packaging and line.product_id.uom_id.name or ''}</td> | ||
1256 | 233 | %endif | ||
1257 | 234 | <td style="white-space:nowrap;text-align:right;">${line.price_unit or ''}</td> | ||
1258 | 235 | %if order.print_discount: | ||
1259 | 236 | <td style="text-align:right;">${line.discount}</th> | ||
1260 | 237 | %endif | ||
1261 | 238 | <td style="white-space:nowrap;text-align:right;">${line.price_subtotal or ''}</td> | ||
1262 | 239 | </tr> | ||
1263 | 240 | %endfor | ||
1264 | 241 | </tbody> | ||
1265 | 242 | <tfoot> | ||
1266 | 243 | <tr> | ||
1267 | 244 | <td colspan="${order.cols}" style="border-style:none"/> | ||
1268 | 245 | <td style="border-top: 2px solid"><b>${_("Net Total:")}</b></td> | ||
1269 | 246 | <td class="amount" style="border-top:2px solid;text-align:right;">${formatLang(order.amount_untaxed, get_digits(dp='Sale Price'))} </td> | ||
1270 | 247 | </tr> | ||
1271 | 248 | <tr> | ||
1272 | 249 | <td colspan="${order.cols}" style="border-style:none"/> | ||
1273 | 250 | <td style="border-style:none"><b>${_("Taxes:")}</b></td> | ||
1274 | 251 | <td class="amount" style="text-align:right;">${formatLang(order.amount_tax, get_digits(dp='Sale Price'))} </td> | ||
1275 | 252 | </tr> | ||
1276 | 253 | <tr> | ||
1277 | 254 | <td colspan="${order.cols}" style="border-style:none"/> | ||
1278 | 255 | <td style="border-top:2px solid"><b>${_("Total:")}</b></td> | ||
1279 | 256 | <td class="amount" style="border-top:2px solid;text-align:right;">${formatLang(order.amount_total, get_digits(dp='Sale Price'))} </td> | ||
1280 | 257 | </tr> | ||
1281 | 258 | </tfoot> | ||
1282 | 259 | |||
1283 | 260 | </table> | ||
1284 | 261 | |||
1285 | 262 | %if order.note and 'note_print' not in order._columns: | ||
1286 | 263 | <br> | ||
1287 | 264 | <pre>${order.note}</pre> | ||
1288 | 265 | %endif: | ||
1289 | 266 | %if 'note_print' in order._columns and order.note_print: | ||
1290 | 267 | <br> | ||
1291 | 268 | <pre>${order.note_print}</pre> | ||
1292 | 269 | %endif: | ||
1293 | 270 | |||
1294 | 271 | |||
1295 | 272 | <p style="page-break-after:always"></p> | ||
1296 | 273 | %endfor | ||
1297 | 274 | </body> | ||
1298 | 275 | </html> | ||
1299 | 0 | 276 | ||
1300 | === added file 'account_check_deposit/report/__init__.py' | |||
1301 | --- account_check_deposit/report/__init__.py 1970-01-01 00:00:00 +0000 | |||
1302 | +++ account_check_deposit/report/__init__.py 2014-03-10 23:55:30 +0000 | |||
1303 | @@ -0,0 +1,32 @@ | |||
1304 | 1 | #-*- coding: utf-8 -*- | ||
1305 | 2 | ############################################################################## | ||
1306 | 3 | # | ||
1307 | 4 | # Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) | ||
1308 | 5 | # All Right Reserved | ||
1309 | 6 | # | ||
1310 | 7 | # Author : Ferdinand Gassauer (Camptocamp Austria) | ||
1311 | 8 | # | ||
1312 | 9 | # WARNING: This program as such is intended to be used by professional | ||
1313 | 10 | # programmers who take the whole responsability of assessing all potential | ||
1314 | 11 | # consequences resulting from its eventual inadequacies and bugs | ||
1315 | 12 | # End users who are looking for a ready-to-use solution with commercial | ||
1316 | 13 | # garantees and support are strongly adviced to contract a Free Software | ||
1317 | 14 | # Service Company | ||
1318 | 15 | # | ||
1319 | 16 | # This program is Free Software; you can redistribute it and/or | ||
1320 | 17 | # modify it under the terms of the GNU General Public License | ||
1321 | 18 | # as published by the Free Software Foundation; either version 2 | ||
1322 | 19 | # of the License, or (at your option) any later version. | ||
1323 | 20 | # | ||
1324 | 21 | # This program is distributed in the hope that it will be useful, | ||
1325 | 22 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1326 | 23 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1327 | 24 | # GNU General Public License for more details. | ||
1328 | 25 | # | ||
1329 | 26 | # You should have received a copy of the GNU General Public License | ||
1330 | 27 | # along with this program; if not, write to the Free Software | ||
1331 | 28 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
1332 | 29 | # | ||
1333 | 30 | ############################################################################## | ||
1334 | 31 | |||
1335 | 32 | import report_webkit_html | ||
1336 | 0 | 33 | ||
1337 | === added file 'account_check_deposit/report/check_deposit.mako' | |||
1338 | --- account_check_deposit/report/check_deposit.mako 1970-01-01 00:00:00 +0000 | |||
1339 | +++ account_check_deposit/report/check_deposit.mako 2014-03-10 23:55:30 +0000 | |||
1340 | @@ -0,0 +1,112 @@ | |||
1341 | 1 | # -*- coding: utf-8 -*- | ||
1342 | 2 | <html> | ||
1343 | 3 | <head> | ||
1344 | 4 | <style type="text/css"> | ||
1345 | 5 | |||
1346 | 6 | table { | ||
1347 | 7 | width: 100%; | ||
1348 | 8 | page-break-after:auto; | ||
1349 | 9 | border-collapse: collapse; | ||
1350 | 10 | cellspacing="0"; | ||
1351 | 11 | font-size:14px; | ||
1352 | 12 | } | ||
1353 | 13 | td { margin: 0px; padding: 3px; border: 1px solid lightgrey; vertical-align: top; } | ||
1354 | 14 | .valign_up1, .valign_up2, .halign, .vtrait1, .vtrait2{ | ||
1355 | 15 | position:absolute; | ||
1356 | 16 | } | ||
1357 | 17 | .valign_up1 { left:200px; font-weight: lighter; color:MediumSlateBlue ; | ||
1358 | 18 | } | ||
1359 | 19 | .valign_up2 { left:650px; font-weight: lighter; color:MediumSlateBlue ; | ||
1360 | 20 | } | ||
1361 | 21 | .halign { left:500px} | ||
1362 | 22 | .vtrait1 { left:185px; font-weight: lighter; color:MediumSlateBlue ; } | ||
1363 | 23 | .vtrait2 { left:630px; font-weight: lighter; color:MediumSlateBlue ; } | ||
1364 | 24 | .entete_tab {text-align:center; white-space:nowrap; border-bottom:1px solid;} | ||
1365 | 25 | .cellule_tab {white-space:nowrap; text-align:center;} | ||
1366 | 26 | .amount {white-space:nowrap; text-align:right;} | ||
1367 | 27 | .total {border-top:2px solid;} | ||
1368 | 28 | .titre {text-align:center; font-family:helvetica; font-size:35px; background:lightgrey} | ||
1369 | 29 | |||
1370 | 30 | pre {font-family:helvetica; font-size:12px;} | ||
1371 | 31 | h1 {font-family:helvetica; font-size:18px;} | ||
1372 | 32 | h2 {font-family:helvetica; font-size:25px; border-bottom:1px solid} | ||
1373 | 33 | h3 {font-family:helvetica; font-size:22px; color: MediumSlateBlue ; margin-bottom: auto;} | ||
1374 | 34 | |||
1375 | 35 | |||
1376 | 36 | </style> | ||
1377 | 37 | </head> | ||
1378 | 38 | <body> | ||
1379 | 39 | %for deposit in objects : | ||
1380 | 40 | <% setLang(deposit.partner_id.lang) %> | ||
1381 | 41 | <b><span class="titre">${_("Deposit Slip of Checks(Euros)")}</span></b> | ||
1382 | 42 | <br> | ||
1383 | 43 | <br> | ||
1384 | 44 | <br> | ||
1385 | 45 | <br> | ||
1386 | 46 | <br> | ||
1387 | 47 | <br> | ||
1388 | 48 | <h2> | ||
1389 | 49 | <b>${_("Deposit N°")} ${deposit.name}</b> | ||
1390 | 50 | </h2> | ||
1391 | 51 | |||
1392 | 52 | <h1> | ||
1393 | 53 | <b>${_("Deposit Date")}</b><span class="vtrait1">${_("|")}</span> | ||
1394 | 54 | <span class="valign_up1"> ${deposit.deposit_date}</span> | ||
1395 | 55 | <b><span class="halign">${_("Bank Code")}</span></b> | ||
1396 | 56 | <span class="vtrait2">${_("|")}</span><span class="valign_up2"> ${deposit.bank_id.bank_code}</span> | ||
1397 | 57 | <br> | ||
1398 | 58 | <b>${_("Beneficiary")}</b><span class="vtrait1">${_("|")}</span> | ||
1399 | 59 | <span class="valign_up1"> ${company.partner_id.name}</span> | ||
1400 | 60 | <b><span class="halign">${_("Office Code")}</span></b> | ||
1401 | 61 | <span class="vtrait2">${_("|")}</span><span class="valign_up2"> ${deposit.bank_id.office}</span> | ||
1402 | 62 | <br> | ||
1403 | 63 | <b>${_("Account to crediting")}</b><span class="vtrait1">${_("|")}</span> | ||
1404 | 64 | <span class="valign_up1"> ${deposit.bank_id.rib_acc_number}</span> | ||
1405 | 65 | <b><span class="halign">${_("BIS Key")}</span></b><span class="vtrait2">${_("|")}</span> | ||
1406 | 66 | <span class="valign_up2"> ${deposit.bank_id.key}</span> | ||
1407 | 67 | </h1> | ||
1408 | 68 | <br> | ||
1409 | 69 | <h3> | ||
1410 | 70 | <b>${_("Check Payments")}</b> | ||
1411 | 71 | </h3> | ||
1412 | 72 | |||
1413 | 73 | <table style="width:100%"> | ||
1414 | 74 | <thead> | ||
1415 | 75 | <tr> | ||
1416 | 76 | <th class="entete_tab">${_("Payment Date")}</th> | ||
1417 | 77 | <th class="entete_tab">${_("Reference")}</th> | ||
1418 | 78 | <th class="entete_tab">${_("Description")}</th> | ||
1419 | 79 | <th class="entete_tab">${_("Designation")}</th> | ||
1420 | 80 | <th class="entete_tab">${_("Amount")}</th> | ||
1421 | 81 | </thead> | ||
1422 | 82 | </tr> | ||
1423 | 83 | |||
1424 | 84 | <br> | ||
1425 | 85 | %for move_line in deposit.check_payment_ids : | ||
1426 | 86 | <tbody> | ||
1427 | 87 | <tr> | ||
1428 | 88 | <td class="cellule_tab">${move_line.date or ''}</td> | ||
1429 | 89 | <td class="cellule_tab">${move_line.ref or ''}</td> | ||
1430 | 90 | <td class="cellule_tab">${move_line.name or ''}</td> | ||
1431 | 91 | <td class="cellule_tab">${move_line.partner_id.name or ''}</td> | ||
1432 | 92 | <td class="amount">${move_line.debit or '0'}</td> | ||
1433 | 93 | </tr> | ||
1434 | 94 | </tbody> | ||
1435 | 95 | %endfor | ||
1436 | 96 | %endfor | ||
1437 | 97 | <tfoot> | ||
1438 | 98 | <tr> | ||
1439 | 99 | <td colspan=4 class="amount total"><b>${_("Total:")}</b></td> | ||
1440 | 100 | <td colspan=5 class="amount total"><b>${deposit.total_amount or '0'}</b></td> | ||
1441 | 101 | </tr> | ||
1442 | 102 | </tfoot> | ||
1443 | 103 | </table> | ||
1444 | 104 | |||
1445 | 105 | |||
1446 | 106 | |||
1447 | 107 | |||
1448 | 108 | |||
1449 | 109 | |||
1450 | 110 | |||
1451 | 111 | </body> | ||
1452 | 112 | </html> | ||
1453 | 0 | 113 | ||
1454 | === added file 'account_check_deposit/report/report_webkit_html.py' | |||
1455 | --- account_check_deposit/report/report_webkit_html.py 1970-01-01 00:00:00 +0000 | |||
1456 | +++ account_check_deposit/report/report_webkit_html.py 2014-03-10 23:55:30 +0000 | |||
1457 | @@ -0,0 +1,41 @@ | |||
1458 | 1 | # -*- coding: utf-8 -*- | ||
1459 | 2 | ############################################################################## | ||
1460 | 3 | # | ||
1461 | 4 | # OpenERP, Open Source Management Solution | ||
1462 | 5 | # Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). | ||
1463 | 6 | # Copyright (C) 2010-2012 Camptocamp Austria (<http://www.camptocamp.at>) | ||
1464 | 7 | # Copyright (C) 2013 AKRETION (<http://www.akretion.com>) | ||
1465 | 8 | # | ||
1466 | 9 | # This program is free software: you can redistribute it and/or modify | ||
1467 | 10 | # it under the terms of the GNU Affero General Public License as | ||
1468 | 11 | # published by the Free Software Foundation, either version 3 of the | ||
1469 | 12 | # License, or (at your option) any later version. | ||
1470 | 13 | # | ||
1471 | 14 | # This program is distributed in the hope that it will be useful, | ||
1472 | 15 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1473 | 16 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1474 | 17 | # GNU Affero General Public License for more details. | ||
1475 | 18 | # | ||
1476 | 19 | # You should have received a copy of the GNU Affero General Public License | ||
1477 | 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1478 | 21 | # | ||
1479 | 22 | ############################################################################## | ||
1480 | 23 | |||
1481 | 24 | import time | ||
1482 | 25 | from report import report_sxw | ||
1483 | 26 | |||
1484 | 27 | |||
1485 | 28 | class report_webkit_html(report_sxw.rml_parse): | ||
1486 | 29 | |||
1487 | 30 | def __init__(self, cr, uid, name, context): | ||
1488 | 31 | super(report_webkit_html, self).__init__(cr, uid, name, context=context) | ||
1489 | 32 | self.localcontext.update({ | ||
1490 | 33 | 'time': time, | ||
1491 | 34 | 'cr': cr, | ||
1492 | 35 | 'uid': uid, | ||
1493 | 36 | }) | ||
1494 | 37 | |||
1495 | 38 | report_sxw.report_sxw('report.account.check.deposit', | ||
1496 | 39 | 'account.check.deposit', | ||
1497 | 40 | 'addons/account_check_deposit/report/check_deposit.mako', | ||
1498 | 41 | parser=report_webkit_html) | ||
1499 | 0 | 42 | ||
1500 | === added directory 'account_check_deposit/security' | |||
1501 | === added file 'account_check_deposit/security/ir.model.access.csv' | |||
1502 | --- account_check_deposit/security/ir.model.access.csv 1970-01-01 00:00:00 +0000 | |||
1503 | +++ account_check_deposit/security/ir.model.access.csv 2014-03-10 23:55:30 +0000 | |||
1504 | @@ -0,0 +1,2 @@ | |||
1505 | 1 | "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" | ||
1506 | 2 | "access_account_check_deposit_account_check_deposit_group_manager","account_check_deposit_account_check_deposit_group_manager","model_account_check_deposit","account.group_account_user",1,1,1,1 |
The project has moved to Github https:/ /github. com/OCA/ account- financial- tools. /github. com/OCA/ maintainers- tools/wiki/ How-to- move-a- Merge-Proposal- to-GitHub.
Please resubmit your MP on github using following procedure https:/
I put this MP in rejected in the meanwhile.
Regards